feat(hcl,terraform): split terraform from hcl, add specialized queries for tf

This enables us to have different queries for
terraform and general hcl. It solve the situation
where other dialects of hcl (nomad, packer, etc)
might use a terraform keyword and get highlighted
out of place.

5 files changed, 30 insertions, 9 deletions

diff --git a/queries/hcl/highlights.scm b/queries/hcl/highlights.scm
index 658369292..4f2eb2300 100644
--- a/queries/hcl/highlights.scm
+++ b/queries/hcl/highlights.scm
@@ -81,7 +81,8 @@
 (comment) @comment @spell
 (identifier) @variable
 
-(block (identifier) @type)
+(body (block (identifier) @keyword))
+(body (block (body (block (identifier) @type))))
 (function_call (identifier) @function)
 (attribute (identifier) @field)
 
@@ -90,13 +91,9 @@
 ; highlight identifier keys as though they were block attributes
 (object_elem key: (expression (variable_expr (identifier) @field)))
 
-((identifier) @keyword (#any-of? @keyword "module" "root" "cwd" "resource" "variable" "data" "locals" "terraform" "provider" "output"))
-((identifier) @type.builtin (#any-of? @type.builtin "bool" "string" "number" "object" "tuple" "list" "map" "set" "any"))
-(variable_expr (identifier) @variable.builtin (#any-of? @variable.builtin "var" "local" "path"))
-(get_attr (identifier) @variable.builtin (#any-of? @variable.builtin  "root" "cwd" "module"))
-
-(object_elem val: (expression
-  (variable_expr
-    (identifier) @type.builtin (#any-of? @type.builtin "bool" "string" "number" "object" "tuple" "list" "map" "set" "any"))))
+; var.foo, data.bar
+;
+; first element in get_attr is a keyword or a reference to a keyword
+(expression (variable_expr (identifier) @keyword) (get_attr (identifier) @field))
 
 (ERROR) @error
diff --git a/queries/terraform/folds.scm b/queries/terraform/folds.scm
new file mode 100644
index 000000000..0e5ffc2db
--- /dev/null
+++ b/queries/terraform/folds.scm
@@ -0,0 +1 @@
+; inherits: hcl
diff --git a/queries/terraform/highlights.scm b/queries/terraform/highlights.scm
new file mode 100644
index 000000000..d31b83c82
--- /dev/null
+++ b/queries/terraform/highlights.scm
@@ -0,0 +1,21 @@
+; inherits: hcl
+
+; Terraform specific references
+;
+;
+; local/module/data/var/output
+(expression (variable_expr (identifier) @type.builtin (#any-of? @type.builtin "data" "var" "local" "module" "output")) (get_attr (identifier) @field))
+
+; path.root/cwd/module
+(expression (variable_expr (identifier) @type.builtin (#eq? @type.builtin "path")) (get_attr (identifier) @variable.builtin (#any-of? @variable.builtin "root" "cwd" "module")))
+
+; terraform.workspace
+(expression (variable_expr (identifier) @type.builtin (#eq? @type.builtin "terraform")) (get_attr (identifier) @variable.builtin (#any-of? @variable.builtin "workspace")))
+
+; Terraform specific keywords
+
+; FIXME: ideally only for identifiers under a `variable` block to minimize false positives
+((identifier) @type.builtin (#any-of? @type.builtin "bool" "string" "number" "object" "tuple" "list" "map" "set" "any"))
+(object_elem val: (expression
+  (variable_expr
+    (identifier) @type.builtin (#any-of? @type.builtin "bool" "string" "number" "object" "tuple" "list" "map" "set" "any"))))
diff --git a/queries/terraform/indents.scm b/queries/terraform/indents.scm
new file mode 100644
index 000000000..0e5ffc2db
--- /dev/null
+++ b/queries/terraform/indents.scm
@@ -0,0 +1 @@
+; inherits: hcl
diff --git a/queries/terraform/injections.scm b/queries/terraform/injections.scm
new file mode 100644
index 000000000..0e5ffc2db
--- /dev/null
+++ b/queries/terraform/injections.scm
@@ -0,0 +1 @@
+; inherits: hcl