Merge branch 'main' into cschleiden/readme-2

Author: cschleiden

language/language-configuration.json

@@ -0,0 +1,36 @@
+{
+  "comments": {
+    "lineComment": "#"
+  },
+  "brackets": [
+    ["{", "}"],
+    ["[", "]"],
+    ["(", ")"]
+  ],
+  "autoClosingPairs": [
+    ["{", "}"],
+    ["[", "]"],
+    ["(", ")"],
+    ["\"", "\""],
+    ["'", "'"]
+  ],
+  "surroundingPairs": [
+    ["{", "}"],
+    ["[", "]"],
+    ["(", ")"],
+    ["\"", "\""],
+    ["'", "'"]
+  ],
+  "colorizedBracketPairs": [["${{", "}}"]],
+  "folding": {
+    "offSide": true,
+    "markers": {
+      "start": "^\\s*#\\s*region\\b",
+      "end": "^\\s*#\\s*endregion\\b"
+    }
+  },
+  "indentationRules": {
+    "increaseIndentPattern": "^\\s*.*(:|-) ?(&\\w+)?(\\{[^}\"']*|\\([^)\"']*)?$",
+    "decreaseIndentPattern": "^\\s+\\}$"
+  }
+}

syntaxes/expressions.tmGrammar.json …uage/syntaxes/expressions.tmGrammar.jsonsyntaxes/expressions.tmGrammar.json renamed to language/syntaxes/expressions.tmGrammar.json syntaxes/expressions.tmGrammar.json renamed to language/syntaxes/expressions.tmGrammar.json

@@ -1,6 +1,6 @@
 {
-  "scopeName": "source.yaml.github-actions-expression",
-  "injectionSelector": "L:source.yaml",
+  "scopeName": "source.github-actions-workflow.github-actions-expression",
+  "injectionSelector": "L:source.github-actions-workflow",
   "patterns": [
     {
       "include": "#expression"
@@ -11,7 +11,7 @@
   ],
   "repository": {
     "expression": {
-      "match": "\\$\\{\\{(.*?)\\}\\}",
+      "match": "[|-]?\\$\\{\\{(.*?)\\}\\}",
       "name": "meta.embedded.block.github-actions-expression",
       "captures": {
         "1": {
@@ -45,7 +45,7 @@
         "1": {
           "patterns": [
             {
-              "include": "source.yaml"
+              "include": "source.github-actions-workflow"
             }
           ]
         },
@@ -89,7 +89,7 @@
       "patterns": [
         {
           "name": "variable.other.read.github-actions-expression",
-          "match": "\\b[A-Za-z][A-Za-z0-9_]*\\b"
+          "match": "\\b[A-Za-z][A-Za-z0-9_\\-]*\\b"
         }
       ]
     },