Create unified expression syntax pattern

Author: cdce8p

language/syntaxes/expressions.tmGrammar.json

@@ -3,7 +3,7 @@
   "injectionSelector": "L:source.github-actions-workflow",
   "patterns": [
     {
-      "include": "#expression"
+      "include": "#inline-expression"
     },
     {
       "include": "#block-if-expression"
@@ -13,29 +13,14 @@
     }
   ],
   "repository": {
-    "expression": {
+    "inline-expression": {
       "match": "[|-]?\\$\\{\\{(.*?)\\}\\}",
       "name": "meta.embedded.block.github-actions-expression",
       "captures": {
         "1": {
           "patterns": [
             {
-              "include": "#function-call"
-            },
-            {
-              "include": "#context"
-            },
-            {
-              "include": "#string"
-            },
-            {
-              "include": "#number"
-            },
-            {
-              "include": "#boolean"
-            },
-            {
-              "include": "#null"
+              "include": "#expression"
             }
           ]
         }
@@ -83,22 +68,7 @@
           "end": "^(?!\\1|\\s*$)",
           "patterns": [
             {
-              "include": "#function-call"
-            },
-            {
-              "include": "#context"
-            },
-            {
-              "include": "#string"
-            },
-            {
-              "include": "#number"
-            },
-            {
-              "include": "#boolean"
-            },
-            {
-              "include": "#null"
+              "include": "#expression"
             }
           ]
         }
@@ -118,27 +88,34 @@
         "2": {
           "patterns": [
             {
-              "include": "#function-call"
-            },
-            {
-              "include": "#context"
-            },
-            {
-              "include": "#string"
-            },
-            {
-              "include": "#number"
-            },
-            {
-              "include": "#boolean"
-            },
-            {
-              "include": "#null"
+              "include": "#expression"
             }
           ]
         }
       }
     },
+    "expression": {
+      "patterns": [
+        {
+          "include": "#function-call"
+        },
+        {
+          "include": "#context"
+        },
+        {
+          "include": "#string"
+        },
+        {
+          "include": "#number"
+        },
+        {
+          "include": "#boolean"
+        },
+        {
+          "include": "#null"
+        }
+      ]
+    },
     "function-call": {
       "patterns": [
         {