Merge branch '4ops:master' into master

Author: hariscodes

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.2.3
+
+- Added syntax hightlighting and snippet for `moved` blocks ([#18](https://github.com/4ops/vscode-language-terraform/pull/18)). Thanks to [@hariscodes](https://github.com/hariscodes)
+- Added syntax highlighting for multiple include blocks in `terragrunt.hcl` ([#15](https://github.com/4ops/vscode-language-terraform/pull/15)). Thanks to [@cruftyoldsysadmin](https://github.com/cruftyoldsysadmin)
+
 ## 0.2.2
 
 - Added sensitive variable support

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright © 2020 Anton Kulikov
+Copyright © 2022 Anton Kulikov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the “Software”), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

grammars/terragrunt.yaml

@@ -133,6 +133,35 @@ patterns:
           2: { name: keyword.operator.assignment.terragrunt }
       - include: "#definition-right"
 
+  - name: "meta.multipleinclude.terragrunt"
+    begin: '\b(include)([\w\-\"$])?(?:\s+)?(")?([^\"\n]+)?(")?(?:\s+)?({)'
+    beginCaptures:
+      1: { name: keyword.declaration.$1.terragrunt }
+      2: { name: invalid.illegal.keyword.$1.terragrunt }
+      3: { name: string.quoted.double.terragrunt punctuation.definition.string.begin.terragrunt }
+      4: { name: string.quoted.double.terragrunt entity.name.$1.terragrunt }
+      5: { name: string.quoted.double.terragrunt punctuation.definition.string.end.terragrunt }
+      6: { name: punctuation.declaration.block.begin.terragrunt }
+    end: "}"
+    endCaptures:
+      0: { name: punctuation.declaration.block.end.terragrunt }
+    patterns:
+      - include: "#comments"
+      - match: '\b(path)(?:\s+)?(=)(?:\s+)?'
+        captures:
+          1: { name: support.output.attribute.terragrunt }
+          2: { name: keyword.operator.assignment.terragrunt }
+      - match: '\b(expose)(?:\s+)?(=)(?:\s+)?'
+        captures:
+          1: { name: support.output.attribute.terragrunt }
+          2: { name: keyword.operator.assignment.terragrunt }
+      - match: '\b(merge_strategy)(?:\s+)?(=)(?:\s+)?'
+        captures:
+          1: { name: support.output.attribute.terragrunt }
+          2: { name: keyword.operator.assignment.terragrunt }
+
+      - include: "#definition-right"
+
   - name: "meta.inputs.terragrunt"
     begin: '\b(inputs)([\w\-\"$])?(?:\s+)?(=)(?:\s+)?({)'
     beginCaptures:

package-lock.json

@@ -2,7 +2,7 @@
 	"name": "terraform",
 	"displayName": "Terraform",
 	"description": "Terraform configuration language support (includes Terragrunt)",
-	"version": "0.2.2",
+	"version": "0.2.3",
 	"icon": "icon.png",
 	"keywords": [
 		"terraform",