add support for env in extension

Author: pchalamet

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+# 0.0.41
+- add support for `env` subblock in `extension` block
+
 # 0.0.40
 - remove `dependencies` on `project` block
 

package-lock.json

@@ -3,7 +3,7 @@
   "name": "terrabuild",
   "displayName": "Terrabuild",
   "description": "Syntax highlighting for Terrabuild",
-  "version": "0.0.40",
+  "version": "0.0.41",
   "publisher": "MagnusOpera",
   "license": "FSL-1.1-Apache-2.0",
   "repository": {

package.json

@@ -18,15 +18,15 @@
     },
     "property": {
       "begin": "\\.(?!\\*)",
-      "end": "\\^?[a-z](_?[a-z0-9]+)*|\\d+",
+      "end": "\\^?[a-zA-Z](_?[a-zA-Z0-9]+)*|\\d+",
       "beginCaptures": {
         "0": { "name": "keyword.operator.accessor" }
       },
       "endCaptures": {
         "0": {
           "patterns": [
             {
-              "match": "\\^?[a-z](_?[a-z0-9]+)*",
+              "match": "\\^?[a-zA-Z](_?[a-zA-Z0-9]+)*",
               "name": "variable.other.constant.property"
             },
             {
@@ -57,7 +57,7 @@
           "begin": "\\{",
           "end": "\\}",
           "patterns": [
-            { "name": "variable.other.constant", "match": "\\b(\\^?[a-z](_?[a-z0-9]+)*)\\b(?=\\s*:)" },
+            { "name": "variable.other.constant", "match": "\\b(\\^?[a-zA-Z](_?[a-zA-Z0-9]+)*)\\b(?=\\s*:)" },
             { "name": "punctuation.separator.key-value", "match": ":" },
             { "name": "punctuation.separator.sequence", "match": "," },
             { "include": "#expression" }        
@@ -67,7 +67,7 @@
     },
     "block": {
         "name": "meta.block",
-        "begin": "(@?[a-z](_?[a-z0-9]+)*)(?:\\s+([a-z](_?[a-z0-9]+)*))?\\s*(\\{)",
+        "begin": "(@?[a-zA-Z](_?[a-zA-Z0-9]+)*)(?:\\s+([a-zA-Z](_?[a-zA-Z0-9]+)*))?\\s*(\\{)",
         "end": "\\}",
         "beginCaptures": {
             "1": { "name": "entity.name.type.class" },
@@ -107,7 +107,7 @@
     },
     "attribute": {
       "name": "meta.attribute.assignment",
-      "begin": "([a-z](_?[a-z0-9]+)*)\\s*=",
+      "begin": "([a-zA-Z](_?[a-zA-Z0-9]+)*)\\s*=",
       "beginCaptures": {
         "1": { "name": "variable.parameter" }
       },
@@ -134,7 +134,7 @@
       "patterns": [
         {
           "name": "constant.other.symbol.enum",
-          "match": "~[a-z](_?[a-z0-9]+)*"
+          "match": "~[a-zA-Z](_?[a-zA-Z0-9]+)*"
         }
       ]
     },
@@ -201,7 +201,7 @@
     },
     "function": {
       "name": "meta.function-call",
-      "begin": "([a-z](_?[a-z0-9]+)*)(\\()",
+      "begin": "([a-zA-Z](_?[a-zA-Z0-9]+)*)(\\()",
       "end": "\\)",
       "beginCaptures": {
         "1": {

syntaxes/terrabuild-lang.tmLanguage.json

@@ -26,7 +26,7 @@
         },
         {
           "name": "meta.block.target",
-          "begin": "\\b(target)\\s+([a-z](_?[a-z0-9]+)*)\\s*\\{",
+          "begin": "\\b(target)\\s+([a-zA-Z](_?[a-zA-Z0-9]+)*)\\s*\\{",
           "beginCaptures": {
             "1": { "name": "keyword.control" },
             "2": { "name": "variable.language" }
@@ -40,7 +40,7 @@
         },
         {
           "name": "meta.block.extension",
-          "begin": "\\b(extension)\\s+(@?[a-z](_?[a-z0-9]+)*)\\s*\\{",
+          "begin": "\\b(extension)\\s+(@?[a-zA-Z](_?[a-zA-Z0-9]+)*)\\s*\\{",
           "beginCaptures": {
             "1": { "name": "keyword.control" },
             "2": { "name": "variable.language" }
@@ -49,6 +49,7 @@
           "patterns": [
             { "include": "#extension-attributes" },
             { "include": "#defaults-block" },
+            { "include": "#env-block" },
             { "include": "source.terrabuild.lang#comments" }
           ]
         },
@@ -125,6 +126,21 @@
           ]
         }
       ]
+    },
+    "env-block": {
+      "patterns": [
+        {
+          "name": "meta.block.env",
+          "begin": "\\b(env)\\s*\\{",
+          "beginCaptures": {
+            "1": { "name": "keyword.control" }
+          },
+          "end": "\\}",
+          "patterns": [
+            { "include": "source.terrabuild.lang#attribute" }
+          ]
+        }
+      ]
     }
   }
 }

syntaxes/terrabuild-project.tmLanguage.json

@@ -24,7 +24,7 @@
         },
         {
           "name": "meta.block.target",
-          "begin": "\\b(target)\\s+([a-z](_?[a-z0-9]+)*)\\s*\\{",
+          "begin": "\\b(target)\\s+([a-zA-Z](_?[a-zA-Z0-9]+)*)\\s*\\{",
           "beginCaptures": {
             "1": { "name": "keyword.control" },
             "2": { "name": "variable.language" }
@@ -37,7 +37,7 @@
         },
         {
           "name": "meta.block.extension",
-          "begin": "\\b(extension)\\s+(@?[a-z](_?[a-z0-9]+)*)\\s*\\{",
+          "begin": "\\b(extension)\\s+(@?[a-zA-Z](_?[a-zA-Z0-9]+)*)\\s*\\{",
           "beginCaptures": {
             "1": { "name": "keyword.control" },
             "2": { "name": "variable.language" }
@@ -46,12 +46,13 @@
           "patterns": [
             { "include": "#extension-attributes" },
             { "include": "#defaults-block" },
+            { "include": "#env-block" },
             { "include": "source.terrabuild.lang#comments" }
           ]
         },
         {
           "name": "meta.block.variable",
-          "begin": "\\b(variable)\\s+([a-z](_?[a-z0-9]+)*)\\s*\\{",
+          "begin": "\\b(variable)\\s+([a-zA-Z](_?[a-zA-Z0-9]+)*)\\s*\\{",
           "beginCaptures": {
             "1": { "name": "keyword.control" },
             "2": { "name": "variable.language" }
@@ -150,6 +151,21 @@
           ]
         }
       ]
+    },
+    "env-block": {
+      "patterns": [
+        {
+          "name": "meta.block.env",
+          "begin": "\\b(env)\\s*\\{",
+          "beginCaptures": {
+            "1": { "name": "keyword.control" }
+          },
+          "end": "\\}",
+          "patterns": [
+            { "include": "source.terrabuild.lang#attribute" }
+          ]
+        }
+      ]
     }
   }
 }

syntaxes/terrabuild-workspace.tmLanguage.json

@@ -52,6 +52,10 @@ extension @dotnet {
         runtime = local.runtimes.dotnet
         configuration = local.dotnet.config
     }
+
+    env {
+        DOTNET_CLI_TELEMETRY_OPTOUT = true
+    }
 }
 
 # locals

tests/PROJECT

@@ -37,6 +37,10 @@ extension @dotnet {
         runtime = local.runtimes.dotnet
         configuration = local.dotnet.config
     }
+
+    env {
+        DOTNET_CLI_TELEMETRY_OPTOUT = true
+    }
 }
 
 # variable