Fix @layer syntax highlighting (#637)

bradlc · web-flow · commit 6c4778024286 · 2022-10-20T11:44:33.000+01:00
diff --git a/packages/vscode-tailwindcss/syntaxes/at-rules.postcss.tmLanguage.json b/packages/vscode-tailwindcss/syntaxes/at-rules.postcss.tmLanguage.json
@@ -91,7 +91,7 @@
           "name": "punctuation.definition.keyword.css"
         }
       },
-      "end": "(?<=})(?!\\G)",
+      "end": "(?<=}|;)(?!\\G)",
       "patterns": [
         {
           "include": "source.css#comment-block"
@@ -100,9 +100,17 @@
           "include": "source.css.postcss#double-slash"
         },
         {
-          "match": "[^\\s{]+?",
+          "match": "[^\\s{;,]+?",
           "name": "variable.parameter.layer.tailwind"
         },
+        {
+          "match": ",",
+          "name": "punctuation.separator.list.comma.css"
+        },
+        {
+          "match": ";",
+          "name": "punctuation.terminator.rule.css"
+        },
         {
           "begin": "{",
           "beginCaptures": {
diff --git a/packages/vscode-tailwindcss/syntaxes/at-rules.scss.tmLanguage.json b/packages/vscode-tailwindcss/syntaxes/at-rules.scss.tmLanguage.json
@@ -65,14 +65,22 @@
           "name": "punctuation.definition.keyword.css"
         }
       },
-      "end": "\\s*(?={)",
+      "end": "\\s*(?={|;)",
       "patterns": [
         {
           "include": "source.css#comment-block"
         },
         {
-          "match": "[^\\s{]+?",
+          "match": "[^\\s{;,]+?",
           "name": "entity.name.function.scss"
+        },
+        {
+          "match": ",",
+          "name": "punctuation.separator.delimiter.scss"
+        },
+        {
+          "match": ";",
+          "name": "punctuation.terminator.rule.scss"
         }
       ]
     },
diff --git a/packages/vscode-tailwindcss/syntaxes/at-rules.tmLanguage.json b/packages/vscode-tailwindcss/syntaxes/at-rules.tmLanguage.json
@@ -85,15 +85,23 @@
           "name": "punctuation.definition.keyword.css"
         }
       },
-      "end": "(?<=})(?!\\G)",
+      "end": "(?<=}|;)(?!\\G)",
       "patterns": [
         {
           "include": "source.css#comment-block"
         },
         {
-          "match": "[^\\s{]+?",
+          "match": "[^\\s{;,]+?",
           "name": "variable.parameter.layer.tailwind"
         },
+        {
+          "match": ",",
+          "name": "punctuation.separator.list.comma.css"
+        },
+        {
+          "match": ";",
+          "name": "punctuation.terminator.rule.css"
+        },
         {
           "begin": "{",
           "beginCaptures": {

Original file line number	Diff line number	Diff line change
`@@ -65,14 +65,22 @@`
`65`	`65`	`"name": "punctuation.definition.keyword.css"`
`66`	`66`	`}`
`67`	`67`	`},`
`68`		`- "end": "\\s*(?={)",`
	`68`	`+ "end": "\\s*(?={\|;)",`
`69`	`69`	`"patterns": [`
`70`	`70`	`{`
`71`	`71`	`"include": "source.css#comment-block"`
`72`	`72`	`},`
`73`	`73`	`{`
`74`		`- "match": "[^\\s{]+?",`
	`74`	`+ "match": "[^\\s{;,]+?",`
`75`	`75`	`"name": "entity.name.function.scss"`
	`76`	`+ },`
	`77`	`+ {`
	`78`	`+ "match": ",",`
	`79`	`+ "name": "punctuation.separator.delimiter.scss"`
	`80`	`+ },`
	`81`	`+ {`
	`82`	`+ "match": ";",`
	`83`	`+ "name": "punctuation.terminator.rule.scss"`
`76`	`84`	`}`
`77`	`85`	`]`
`78`	`86`	`},`