astro-vscode 2.8.1 → 2.8.3

package/package.json

@@ -24,7 +24,7 @@
     "color": "#17191E",
     "theme": "dark"
   },
-  "version": "2.8.1",
+  "version": "2.8.3",
   "author": "withastro",
   "license": "MIT",
   "publisher": "astro-build",
@@ -208,7 +208,7 @@
     ]
   },
   "devDependencies": {
-    "@astrojs/language-server": "^2.8.1",
+    "@astrojs/language-server": "^2.8.3",
     "@astrojs/ts-plugin": "^1.6.0",
     "@types/glob": "^8.1.0",
     "@types/mocha": "^10.0.1",

package/syntaxes/astro.tmLanguage.json

@@ -175,6 +175,9 @@
     },
     {
       "include": "#frontmatter"
+    },
+    {
+      "include": "#text"
     }
   ],
   "repository": {
@@ -211,16 +214,6 @@
         },
         {
           "include": "#entities"
-        },
-        {
-          "begin": "(?<=>|})",
-          "end": "(?=<|{)",
-          "name": "text.astro",
-          "patterns": [
-            {
-              "include": "#entities"
-            }
-          ]
         }
       ]
     },
@@ -823,6 +816,20 @@
         }
       },
       "name": "meta.scope.tag.$2.astro"
+    },
+    "text": {
+      "patterns": [
+        {
+          "begin": "(?<=^|---|>|})",
+          "end": "(?=<|{|$)",
+          "name": "text.astro",
+          "patterns": [
+            {
+              "include": "#entities"
+            }
+          ]
+        }
+      ]
     }
   }
 }

package/syntaxes/astro.tmLanguage.src.yaml

@@ -165,6 +165,7 @@ injections:
 patterns:
   - include: '#scope'
   - include: '#frontmatter'
+  - include: '#text'
 
 # Contains all of our patterns.
 repository:
@@ -193,13 +194,6 @@ repository:
       - include: '#tags'
       - include: '#interpolation'
       - include: '#entities'
-      # Content text.
-      # This matches only in-between all the nodes - nothing inside of them.
-      - begin: (?<=>|})
-        end: (?=<|{)
-        name: text.astro
-        patterns:
-          - include: '#entities'
 
   # ----------
   #  COMMENTS
@@ -516,3 +510,17 @@ repository:
     endCaptures:
       1: { name: meta.tag.end.astro punctuation.definition.tag.end.astro }
     name: meta.scope.tag.$2.astro
+
+  # ------
+  # TEXT
+  # This will match any text outside frontmatter and scopes patterns.
+
+  text:
+    patterns:
+      # Content text.
+      # This matches nothing inside of tags, only in-between them and at the beginning/end of the file.
+      - begin: (?<=^|---|>|})
+        end: (?=<|{|$)
+        name: text.astro
+        patterns:
+          - include: '#entities'