Merge pull request #49 from rchl/fix/separate-tfvars

Split the tfvars handling into a separate syntax file

Comments.tmPreferences

@@ -5,7 +5,7 @@
 	<key>name</key>
 	<string>Comments</string>
 	<key>scope</key>
-	<string>source.terraform</string>
+	<string>source.terraform, source.terraform-vars</string>
 	<key>settings</key>
 	<dict>
 		<key>shellVariables</key>

Terraform-vars.sublime-settings

@@ -0,0 +1,4 @@
+{
+	"tab_size": 2,
+	"translate_tabs_to_spaces": true
+}

Terraform-vars.sublime-syntax

@@ -0,0 +1,28 @@
+%YAML 1.2
+#
+# This syntax definition is based on the Terraform guide:
+# https://www.terraform.io/docs/configuration/index.html
+#
+# As well as the HCL Native Syntax Spec:
+# https://github.com/hashicorp/hcl2/blob/master/hcl/hclsyntax/spec.md
+#
+# For documentation on the .subline-syntax format:
+# https://www.sublimetext.com/docs/syntax.html
+#
+# Regex's in this file support the Oniguruma regex engine:
+# https://raw.githubusercontent.com/kkos/oniguruma/5.9.6/doc/RE
+#
+---
+name: Terraform (variables)
+
+# File Extensions:
+#
+# - ".tfvars": variables definitions file
+#   https://www.terraform.io/docs/configuration/variables.html#variable-definitions-tfvars-files
+file_extensions:
+  - tfvars
+scope: source.terraform-vars
+
+contexts:
+  main:
+    - include: scope:source.terraform

Terraform.sublime-syntax

@@ -7,7 +7,7 @@
 # https://github.com/hashicorp/hcl2/blob/master/hcl/hclsyntax/spec.md
 #
 # For documentation on the .subline-syntax format:
-# https://www.sublimetext.com/docs/3/syntax.html
+# https://www.sublimetext.com/docs/syntax.html
 #
 # Regex's in this file support the Oniguruma regex engine:
 # https://raw.githubusercontent.com/kkos/oniguruma/5.9.6/doc/RE
@@ -20,14 +20,10 @@ name: Terraform
 # - ".tf": the standard file extension
 #   https://www.terraform.io/docs/configuration/index.html#code-organization
 #
-# - ".tfvars": variables definitions file
-#   https://www.terraform.io/docs/configuration/variables.html#variable-definitions-tfvars-files
-#
 # - ".hcl": non-terraform tools often use this HCL syntax, i.e. Vault
 #   https://www.vaultproject.io/docs/configuration/
 file_extensions:
   - tf
-  - tfvars
   - hcl
 scope: source.terraform
 
@@ -549,4 +545,4 @@ contexts:
             - include: main
             - match: \}
               scope: punctuation.section.block.end.terraform
-              pop: true
+              pop: true