ugit

Home

https://git.jolheiser.com/tailwind-ctp-intellisense.git

Tailwind intellisense + Catppuccin

Fix `@layer` syntax highlighting (#637)

Signature

2 years ago

3 changed files, 30 additions(+), 6 deletions(-)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31


diff --git a/packages/vscode-tailwindcss/syntaxes/at-rules.postcss.tmLanguage.json b/packages/vscode-tailwindcss/syntaxes/at-rules.postcss.tmLanguage.json
index 749db63bf0b1b21d41da4e6371950b5f7f10aad8..1a09a6db4b17960f2191c6d8e057755cbb500a2c 100644
--- a/packages/vscode-tailwindcss/syntaxes/at-rules.postcss.tmLanguage.json
+++ b/packages/vscode-tailwindcss/syntaxes/at-rules.postcss.tmLanguage.json
@@ -91,7 +91,7 @@         "2": {
           "name": "punctuation.definition.keyword.css"
         }
       },
-      "end": "(?<=})(?!\\G)",
+      "end": "(?<=}|;)(?!\\G)",
       "patterns": [
         {
           "include": "source.css#comment-block"
@@ -100,8 +100,16 @@         {
           "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": "{",

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29


diff --git a/packages/vscode-tailwindcss/syntaxes/at-rules.scss.tmLanguage.json b/packages/vscode-tailwindcss/syntaxes/at-rules.scss.tmLanguage.json
index f29de6489aff77b82c743e48eaca3c6ddfa7865c..aede5e167864200e05a9ba9e6432fead1e13ad88 100644
--- a/packages/vscode-tailwindcss/syntaxes/at-rules.scss.tmLanguage.json
+++ b/packages/vscode-tailwindcss/syntaxes/at-rules.scss.tmLanguage.json
@@ -65,14 +65,22 @@         "2": {
           "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"
         }
       ]
     },

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29


diff --git a/packages/vscode-tailwindcss/syntaxes/at-rules.tmLanguage.json b/packages/vscode-tailwindcss/syntaxes/at-rules.tmLanguage.json
index 5933e54ee4cca6135c9b6fab11446cb76958f923..fd1e707653d58324bb88a3659b90bc11f28a7a8f 100644
--- a/packages/vscode-tailwindcss/syntaxes/at-rules.tmLanguage.json
+++ b/packages/vscode-tailwindcss/syntaxes/at-rules.tmLanguage.json
@@ -85,14 +85,22 @@         "2": {
           "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": "{",