Merge branch 'master' into st4107

SublimeText · Oct 31, 2024 · 9fb2531 · 9fb2531
2 parents 7a71f3c + 768ed86
commit 9fb2531
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ SCSS extends Sublime Text's CSS syntax definition as of ST4149.
 
 If SCSS syntax highlighting doesn't work and console displays syntax errors, 
 
-1. check if CSS package enabled.
+1. check if CSS package is enabled.
 2. remove any out-dated syntax override.
 
 ### Enable CSS package

diff --git a/Syntaxes/SCSS.sublime-settings b/Syntaxes/SCSS.sublime-settings
@@ -4,7 +4,7 @@
 
     // Controls what scopes default completions will be provided in.
     // Can be a list of strings which are joined before matching.
-    "default_completions_selector": "source.scss",
+    "default_completions_selector": "source.scss - source.scss comment - source.scss meta.embedded - source.scss source - source.scss text",
 
     // Default separators except `-`
     "word_separators": "/\\()\"':,.;<>~!@#$%^&*|+=[]{}`?",

diff --git a/Syntaxes/Sass.sublime-settings b/Syntaxes/Sass.sublime-settings
@@ -4,7 +4,7 @@
 
     // Controls what scopes default completions will be provided in.
     // Can be a list of strings which are joined before matching.
-    "default_completions_selector": "source.sass",
+    "default_completions_selector": "source.sass - source.sass comment - source.sass meta.embedded - source.sass source - source.sass text",
 
     // Default separators except `-`
     "word_separators": "/\\()\"':,.;<>~!@#$%^&*|+=[]{}`?",

diff --git a/Syntaxes/Sass.sublime-syntax b/Syntaxes/Sass.sublime-syntax
@@ -1363,27 +1363,29 @@ contexts:
     - match: '{{combinators}}{2,}|\|{3,}'
       scope: invalid.illegal.combinator.css
 
-    # CSS modules
-    - match: '\s*(:)(local|global)(?=\()'
-      scope: meta.selector.css entity.other.pseudo-class.css-modules.css
+    # CSS modules: global, local
+    # also used by various other frameworks
+    - match: '\s*((:)(?i:global|local))(?=\()'
       captures:
-        1: punctuation.definition.entity.css
+        1: entity.other.pseudo-class.css
+        2: punctuation.definition.entity.css
       push:
-        - meta_scope: meta.selector.css meta.function-call.css
+        - meta_scope: meta.function-call.css
         - match: '\('
           scope: punctuation.section.group.begin.css
           push:
             - meta_scope: meta.group.css
+            - meta_content_scope: meta.selector.css
             - match: '\)'
               scope: punctuation.section.group.end.css
               pop: 1
-            - include: quoted-strings
+            - include: selector-content
         - match: ''
           pop: 1
-    - match: '\s*(:)(local|global)'
-      scope: meta.selector.css entity.other.pseudo-class.css-modules.css
+    - match: '\s*((:)(?i:global|local))\b'
       captures:
-        1: punctuation.definition.entity.css
+        1: entity.other.pseudo-class.css
+        2: punctuation.definition.entity.css
 
   selector-end:
     - match: (?=\s*[;@(){}]|$)

diff --git a/Tests/syntax_test_sass.sass b/Tests/syntax_test_sass.sass
@@ -276,17 +276,23 @@ input:not([type="radio"]):not(h1):not(custom-element):not(%placeholder), select,
      Global vs. local scope: https://github.com/css-modules/css-modules#exceptions
   */
   .localA :global .global-b .global-c :local(.localD.localE::before) .global-d
-  //      ^^^^^^^ entity.other.pseudo-class.css-modules
-  //                                  ^^^^^^ entity.other.pseudo-class.css-modules
-  //                                        ^ meta.function-call.css meta.group.css punctuation.section.group.begin.css
-  //                                         ^^^^^^^^^^^^^^^^^^^^^^ meta.selector
+  // <- meta.selector.css - meta.selector meta.selector
+  //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.selector.css - meta.selector meta.selector
+  //                                         ^^^^^^^^^^^^^^^^^^^^^^ meta.selector.css meta.selector.css
+  //                                                               ^^^^^^^^^^^ meta.selector.css - meta.selector meta.selector
+  //      ^^^^^^^ entity.other.pseudo-class
+  //                                  ^^^^^^ entity.other.pseudo-class
+  //                                        ^ punctuation.section.group.begin.css
+  //                                         ^^^^^^^^^^^^^^ entity.other.attribute-name.class.css
+  //                                                       ^^ punctuation.definition.pseudo-element.css
+  //                                                         ^^^^^^ entity.other.pseudo-element.css
   //                                                               ^ punctuation.section.group.end.css
   :global  // global blocks
-  // ^^^^ entity.other.pseudo-class.css-modules
+  // ^^^^ entity.other.pseudo-class
     .global-class-name
       color: green
   :local  // local blocks
-  // ^^^ entity.other.pseudo-class.css-modules
+  // ^^^ entity.other.pseudo-class
     .global-class-name
       color: green