Merge branch 'st4149'

SublimeText · Jan 4, 2025 · a8f369d · a8f369d
2 parents 887869b + 3c410ee
commit a8f369d
Show file tree

Hide file tree

Showing 2 changed files with 145 additions and 79 deletions.
diff --git a/Tailwind CSS.sublime-syntax b/Tailwind CSS.sublime-syntax
@@ -22,9 +22,17 @@ contexts:
     - include: tailwind-at-screen
     - include: tailwind-at-source
     - include: tailwind-at-tailwind
+    - include: tailwind-at-theme
     - include: tailwind-at-utility
     - include: tailwind-at-variants
 
+###[ CSS PROPERTY IDENTIFIERS ]################################################
+
+  custom-property-content:
+    - meta_prepend: true
+    - match: \*
+      scope: constant.other.wildcard.asterisk.css.tailwind
+
 ###[ TAILWIND INLINE AT RULES ]################################################
 
   tailwind-at-apply:
@@ -45,32 +53,6 @@ contexts:
 
 ###[ TAILWIND TOPLEVEL AT RULES ]##############################################
 
-  tailwind-at-utility:
-    - match: (@)utility{{break}}
-      captures:
-        0: keyword.control.directive.css.tailwind
-        1: punctuation.definition.keyword.css.tailwind
-      push:
-        - tailwind-at-utility-meta
-        - maybe-stylesheet-block
-        - tailwind-at-utility-name
-
-  tailwind-at-utility-meta:
-    - meta_include_prototype: false
-    - meta_scope: meta.at-rule.utility.css.tailwind
-    - include: immediately-pop
-
-  tailwind-at-utility-name:
-    - meta_include_prototype: false
-    - match: '{{ident_begin}}'
-      set: tailwind-at-utility-name-content
-    - include: comments
-    - include: else-pop
-
-  tailwind-at-utility-name-content:
-    - meta_scope: entity.other.utility-name.css.tailwind
-    - include: identifier-content
-
   # @config "./tailwind.config.js"
   tailwind-at-config:
     - match: (@)(?i:config){{break}}
@@ -92,7 +74,7 @@ contexts:
         1: punctuation.definition.keyword.css.tailwind
       push:
         - tailwind-at-plugin-meta
-        - maybe-stylesheet-block
+        - maybe-property-list
         - tailwind-at-plugin-path
 
   tailwind-at-plugin-meta:
@@ -190,6 +172,46 @@ contexts:
     - meta_scope: entity.other.import.css.tailwind
     - include: identifier-content
 
+  tailwind-at-theme:
+    - match: (@)theme{{break}}
+      captures:
+        0: keyword.control.directive.css.tailwind
+        1: punctuation.definition.keyword.css.tailwind
+      push:
+        - tailwind-at-theme-meta
+        - maybe-property-list
+
+  tailwind-at-theme-meta:
+    - meta_include_prototype: false
+    - meta_scope: meta.at-rule.theme.css.tailwind
+    - include: immediately-pop
+
+  tailwind-at-utility:
+    - match: (@)utility{{break}}
+      captures:
+        0: keyword.control.directive.css.tailwind
+        1: punctuation.definition.keyword.css.tailwind
+      push:
+        - tailwind-at-utility-meta
+        - maybe-property-list
+        - tailwind-at-utility-name
+
+  tailwind-at-utility-meta:
+    - meta_include_prototype: false
+    - meta_scope: meta.at-rule.utility.css.tailwind
+    - include: immediately-pop
+
+  tailwind-at-utility-name:
+    - meta_include_prototype: false
+    - match: '{{ident_begin}}'
+      set: tailwind-at-utility-name-content
+    - include: comments
+    - include: else-pop
+
+  tailwind-at-utility-name-content:
+    - meta_scope: entity.other.utility-name.css.tailwind
+    - include: identifier-content
+
   tailwind-at-variants:
     - match: (@)variants{{break}}
       captures:

diff --git a/tests/syntax_test.tailwind.css b/tests/syntax_test.tailwind.css
@@ -15,12 +15,36 @@
 
 /* Tailwind CSS */
 
+.content {
+    @apply whatever;
+/*  ^^^^^^^^^^^^^^^ meta.property-list.css meta.block.css meta.at-rule.apply.css.tailwind */
+/*                 ^ meta.property-list.css meta.block.css punctuation.terminator.rule.css */
+/*  ^^^^^^ keyword.control.directive.apply.css.tailwind */
+/*         ^^^^^^^^ entity.other.attribute-name.class.css */
+    font-family: Helvetica;
+/*  ^^^^^^^^^^^ meta.property-list.css meta.block.css meta.property-name.css support.type.property-name.css */
+}
+
 @config "./tailwind.config.js";
 /* <- meta.at-rule.config.css.tailwind keyword.control.directive.css punctuation.definition.keyword.css */
 /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.at-rule.config.css.tailwind */
 /*^^^^^ keyword.control.directive.css */
 /*      ^^^^^^^^^^^^^^^^^^^^^^ string.quoted.double.css */
 
+@layer base {
+/* <- meta.at-rule.layer.css keyword.control.directive.css punctuation.definition.keyword.css */
+/*^^^^^^^^^^ meta.at-rule.layer.css - meta.block */
+/*          ^^ meta.at-rule.layer.css meta.block.css */
+/*^^^^ keyword.control.directive.css */
+/*     ^^^^ entity.other.layer.css */
+/*          ^ punctuation.section.block.begin.css */
+    .bg {
+        @apply font-bold py-2 px-4 rounded !important;
+/*      ^^^^^^ meta.at-rule.apply.css.tailwind keyword.control.directive.apply.css.tailwind */
+    }
+/*  ^ punctuation.section.block.end.css */
+}
+
 @plugin "daisyui";
 /*^^^^^^^^^^^^^^^ meta.at-rule.plugin.css.tailwind */
 /*^^^^^ keyword.control.directive.css.tailwind */
@@ -55,43 +79,6 @@
 }
 /* <- meta.at-rule.plugin.css.tailwind meta.block.css punctuation.section.block.end.css */
 
-@source "./app/views/**/*.rb";
-/*^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.at-rule.source.css.tailwind */
-/*^^^^^ keyword.control.directive.css.tailwind */
-/*      ^^^^^^^^^^^^^^^^^^^^^ meta.string.css string.quoted.double.css */
-/*      ^ punctuation.definition.string.begin.css */
-/*                          ^ punctuation.definition.string.end.css */
-/*                           ^ punctuation.terminator.rule.css */
-
-@tailwind base;
-/* <- meta.at-rule.tailwind.css.tailwind keyword.control.directive.css.tailwind punctuation.definition.keyword.css.tailwind */
-/*^^^^^^^^^^^^ meta.at-rule.tailwind.css.tailwind */
-/*^^^^^^^ keyword.control.directive.css.tailwind */
-/*        ^^^^ entity.other.import.css.tailwind */
-/*            ^ punctuation.terminator.rule.css */
-@tailwind compontent;
-/* <- meta.at-rule.tailwind.css.tailwind keyword.control.directive.css.tailwind punctuation.definition.keyword.css.tailwind */
-/*^^^^^^^^^^^^^^^^^^ meta.at-rule.tailwind.css.tailwind */
-/*^^^^^^^ keyword.control.directive.css.tailwind */
-/*        ^^^^^^^^^^ entity.other.import.css.tailwind */
-/*                  ^ punctuation.terminator.rule.css */
-@tailwind utilities;
-/* <- meta.at-rule.tailwind.css.tailwind keyword.control.directive.css.tailwind punctuation.definition.keyword.css.tailwind */
-/*^^^^^^^^^^^^^^^^^ meta.at-rule.tailwind.css.tailwind */
-/*^^^^^^^ keyword.control.directive.css.tailwind */
-/*        ^^^^^^^^^ entity.other.import.css.tailwind */
-/*                 ^ punctuation.terminator.rule.css */
-
-.content {
-    @apply whatever;
-/*  ^^^^^^^^^^^^^^^ meta.property-list.css meta.block.css meta.at-rule.apply.css.tailwind */
-/*                 ^ meta.property-list.css meta.block.css punctuation.terminator.rule.css */
-/*  ^^^^^^ keyword.control.directive.apply.css.tailwind */
-/*         ^^^^^^^^ entity.other.attribute-name.class.css */
-    font-family: Helvetica;
-/*  ^^^^^^^^^^^ meta.property-list.css meta.block.css meta.property-name.css support.type.property-name.css */
-}
-
 @responsive {
 /* <- meta.at-rule.responsive.css.tailwind keyword.control.directive.css.tailwind punctuation.definition.keyword.css.tailwind */
 /*^^^^^^^^^^ meta.at-rule.responsive.css.tailwind - meta.block */
@@ -107,20 +94,6 @@
 }
 /* <- meta.at-rule.responsive.css.tailwind meta.block.css punctuation.section.block.end.css */
 
-@layer base {
-/* <- meta.at-rule.layer.css keyword.control.directive.css punctuation.definition.keyword.css */
-/*^^^^^^^^^^ meta.at-rule.layer.css - meta.block */
-/*          ^^ meta.at-rule.layer.css meta.block.css */
-/*^^^^ keyword.control.directive.css */
-/*     ^^^^ entity.other.layer.css */
-/*          ^ punctuation.section.block.begin.css */
-    .bg {
-        @apply font-bold py-2 px-4 rounded !important;
-/*      ^^^^^^ meta.at-rule.apply.css.tailwind keyword.control.directive.apply.css.tailwind */
-    }
-/*  ^ punctuation.section.block.end.css */
-}
-
 @screen base {
 /* <- meta.at-rule.screen.css.tailwind keyword.control.directive.css.tailwind punctuation.definition.keyword.css.tailwind */
 /*^^^^^^^^^^^ meta.at-rule.screen.css.tailwind - meta.block */
@@ -151,6 +124,68 @@
 /*  ^ punctuation.section.block.end.css */
 }
 
+@source "./app/views/**/*.rb";
+/*^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.at-rule.source.css.tailwind */
+/*^^^^^ keyword.control.directive.css.tailwind */
+/*      ^^^^^^^^^^^^^^^^^^^^^ meta.string.css string.quoted.double.css */
+/*      ^ punctuation.definition.string.begin.css */
+/*                          ^ punctuation.definition.string.end.css */
+/*                           ^ punctuation.terminator.rule.css */
+
+@tailwind base;
+/* <- meta.at-rule.tailwind.css.tailwind keyword.control.directive.css.tailwind punctuation.definition.keyword.css.tailwind */
+/*^^^^^^^^^^^^ meta.at-rule.tailwind.css.tailwind */
+/*^^^^^^^ keyword.control.directive.css.tailwind */
+/*        ^^^^ entity.other.import.css.tailwind */
+/*            ^ punctuation.terminator.rule.css */
+@tailwind compontent;
+/* <- meta.at-rule.tailwind.css.tailwind keyword.control.directive.css.tailwind punctuation.definition.keyword.css.tailwind */
+/*^^^^^^^^^^^^^^^^^^ meta.at-rule.tailwind.css.tailwind */
+/*^^^^^^^ keyword.control.directive.css.tailwind */
+/*        ^^^^^^^^^^ entity.other.import.css.tailwind */
+/*                  ^ punctuation.terminator.rule.css */
+@tailwind utilities;
+/* <- meta.at-rule.tailwind.css.tailwind keyword.control.directive.css.tailwind punctuation.definition.keyword.css.tailwind */
+/*^^^^^^^^^^^^^^^^^ meta.at-rule.tailwind.css.tailwind */
+/*^^^^^^^ keyword.control.directive.css.tailwind */
+/*        ^^^^^^^^^ entity.other.import.css.tailwind */
+/*                 ^ punctuation.terminator.rule.css */
+
+@theme {
+/*^^^^^^ meta.at-rule.theme.css.tailwind */
+/*^^^^ keyword.control.directive.css.tailwind */
+/*     ^ meta.block.css punctuation.section.block.begin.css */
+
+  --*: initial;
+/*^^^^^^^^^^^^^ meta.at-rule.theme.css.tailwind meta.block.css */
+/*^^^ meta.property-name.css entity.other.custom-property.css */
+/*  ^ constant.other.wildcard.asterisk.css.tailwind */
+/*   ^ punctuation.separator.key-value.css */
+/*    ^^^^^^^^ meta.property-value.css */
+/*     ^^^^^^^ support.constant.property-value.css */
+/*            ^ punctuation.terminator.rule.css */
+
+  --font-*: initial;
+/*^^^^^^^^^^^^^^^^^^ meta.at-rule.theme.css.tailwind meta.block.css */
+/*^^^^^^^^ meta.property-name.css entity.other.custom-property.css */
+/*       ^ constant.other.wildcard.asterisk.css.tailwind */
+/*        ^ punctuation.separator.key-value.css */
+/*         ^^^^^^^^ meta.property-value.css */
+/*          ^^^^^^^ support.constant.property-value.css */
+/*                 ^ punctuation.terminator.rule.css */
+
+  --font-display: "Satoshi", "sans-serif";
+/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.at-rule.theme.css.tailwind meta.block.css */
+/*^^^^^^^^^^^^^^ meta.property-name.css entity.other.custom-property.css */
+/*              ^ punctuation.separator.key-value.css */
+/*               ^^^^^^^^^^^^^^^^^^^^^^^^ meta.property-value.css */
+/*                ^^^^^^^^^ meta.string.css string.quoted.double.css */
+/*                         ^ punctuation.separator.sequence.css */
+/*                           ^^^^^^^^^^^^ meta.string.css string.quoted.double.css */
+/*                                       ^ punctuation.terminator.rule.css */
+}
+/* <- meta.at-rule.theme.css.tailwind meta.block.css punctuation.section.block.end.css */
+
 @utility utility {
 /*^^^^^^^^^^^^^^^^ meta.at-rule.utility.css.tailwind */
 /*^^^^^^ keyword.control.directive.css.tailwind */
@@ -161,8 +196,17 @@
 /*  ^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.at-rule.apply.css.tailwind */
 /*  ^^^^^^ keyword.control.directive.apply.css.tailwind */
 /*  ^ punctuation.definition.keyword.css.tailwind */
-/*         ^^^^^^^^^^^^^^^^^^^ entity.other.attribute-name.class.css */
+/*         ^^^^ entity.other.attribute-name.class.css */
+/*              ^^^^^^^^^^^^^^ entity.other.attribute-name.class.css */
 /*                            ^ punctuation.terminator.rule.css */
+
+    font-family: Helvetica;
+/*^^^^^^^^^^^^^^^^^^^^^^^^^ meta.at-rule.utility.css.tailwind meta.block.css */
+/*  ^^^^^^^^^^^ meta.property-name.css support.type.property-name.css */
+/*             ^ punctuation.separator.key-value.css */
+/*              ^^^^^^^^^^ meta.property-value.css */
+/*               ^^^^^^^^^ meta.string.css string.unquoted.css */
+/*                        ^ punctuation.terminator.rule.css */
 }
 /* <- meta.at-rule.utility.css.tailwind meta.block.css punctuation.section.block.end.css */