fix #43 default values inside var() function

SublimeText · Nov 26, 2018 · a408ee7 · a408ee7
1 parent 1966c84
commit a408ee7
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 17 deletions.
diff --git a/Syntaxes/SCSS.sublime-syntax b/Syntaxes/SCSS.sublime-syntax
@@ -1776,14 +1776,14 @@ contexts:
           - meta_scope: meta.group.css
           - match: '(?=\))'
             pop: true
-          - include: comma-delimiter
-          - include: sass-variables
-          - include: sass-functions
           - match: '(--)({{nmchar}}+)'
             captures:
               0: meta.property-name.css support.type.custom-property.css
               1: punctuation.definition.custom-property.css
               2: support.type.custom-property.name.css
+          - include: comma-delimiter
+          - include: property-values
+          - include: sass-script-expression
 
   filter-functions:
     - match: '\b(blur)(?=\()'

diff --git a/Syntaxes/Sass.sublime-syntax b/Syntaxes/Sass.sublime-syntax
@@ -1814,14 +1814,14 @@ contexts:
           - meta_scope: meta.group.css
           - match: '(?=\))'
             pop: true
-          - include: comma-delimiter
-          - include: sass-variables
-          - include: sass-functions
           - match: '(--)({{nmchar}}+)'
             captures:
               0: meta.property-name.css support.type.custom-property.css
               1: punctuation.definition.custom-property.css
               2: support.type.custom-property.name.css
+          - include: comma-delimiter
+          - include: property-values
+          - include: sass-script-expression
 
   filter-functions:
     - match: '\b(blur)(?=\()'

diff --git a/Tests/syntax_test_sass.sass b/Tests/syntax_test_sass.sass
@@ -54,6 +54,28 @@ input:not([type="radio"]):not(h1):not(custom-element):not(%placeholder), select,
 //            ^ - meta.selector
 //                   ^ - keyword.operator
 //                         ^ - keyword.operator
+    background-color: color(var(--background, blue) blend(var(--foreground, change-color($var, $blue: 5)) 80%))
+//  ^^^^^^^^^^^^^^^^ support.type.property-name.css
+//                  ^ punctuation.separator.key-value.css
+//                    ^^^^^ support.function.color.css
+//                         ^ punctuation.definition.group.begin.css
+//                          ^^^ support.function.var.css
+//                             ^ punctuation.definition.group.begin.css
+//                              ^^^^^^^^^^^^ support.type.custom-property
+//                                          ^ punctuation.separator
+//                                                ^ punctuation.definition.group.end.css
+//                                                  ^^^^^ support.function.color.css
+//                                                       ^ punctuation.definition.group.begin.css
+//                                                        ^^^ support.function.var.css
+//                                                           ^ punctuation.definition.group.begin.css
+//                                                            ^^^^^^^^^^^^ support.type.custom-property.css
+//                                                                                              ^ variable.other
+//                                                                                                  ^ punctuation.separator
+//                                                                                                      ^ punctuation.definition.group.end.css
+//                                                                                                        ^^^ constant.numeric.css
+//                                                                                                           ^^ punctuation.definition.group.end.css
+
+
   background: url('../assets/photo1-blue.jpg') center/cover no-repeat
 //                                             ^ support.constant.property-value.css
 //                                                    ^ support.constant.property-value.css

diff --git a/Tests/syntax_test_scss.scss b/Tests/syntax_test_scss.scss
@@ -1211,24 +1211,27 @@ $gutter-width: 10px;
 //                  ^^^     constant.numeric.css
 //                      ^^^ keyword.other.color-space.css
 
-    background-color: color(var(--background) blend(var(--foreground) 80%));
+    background-color: color(var(--background, blue) blend(var(--foreground, change-color($var, $blue: 5)) 80%));
 //  ^^^^^^^^^^^^^^^^ support.type.property-name.css
 //                  ^ punctuation.separator.key-value.css
 //                    ^^^^^ support.function.color.css
 //                         ^ punctuation.definition.group.begin.css
 //                          ^^^ support.function.var.css
 //                             ^ punctuation.definition.group.begin.css
 //                              ^^^^^^^^^^^^ support.type.custom-property
-//                                          ^ punctuation.definition.group.end.css
-//                                            ^^^^^ support.function.color.css
-//                                                 ^ punctuation.definition.group.begin.css
-//                                                  ^^^ support.function.var.css
-//                                                     ^ punctuation.definition.group.begin.css
-//                                                      ^^^^^^^^^^^^ support.type.custom-property.css
-//                                                                  ^ punctuation.definition.group.end.css
-//                                                                    ^^^ constant.numeric.css
-//                                                                       ^^ punctuation.definition.group.end.css
-//                                                                         ^ punctuation.terminator.rule.css
+//                                          ^ punctuation.separator
+//                                                ^ punctuation.definition.group.end.css
+//                                                  ^^^^^ support.function.color.css
+//                                                       ^ punctuation.definition.group.begin.css
+//                                                        ^^^ support.function.var.css
+//                                                           ^ punctuation.definition.group.begin.css
+//                                                            ^^^^^^^^^^^^ support.type.custom-property.css
+//                                                                                              ^ variable.other
+//                                                                                                  ^ punctuation.separator
+//                                                                                                      ^ punctuation.definition.group.end.css
+//                                                                                                        ^^^ constant.numeric.css
+//                                                                                                           ^^ punctuation.definition.group.end.css
+//                                                                                                             ^ punctuation.terminator.rule.css
 }
 
 .test-transform-functions {