diff --git a/Syntaxes/Sass.sublime-syntax b/Syntaxes/Sass.sublime-syntax index cfdb4b3e..9a9944d4 100644 --- a/Syntaxes/Sass.sublime-syntax +++ b/Syntaxes/Sass.sublime-syntax @@ -1973,6 +1973,8 @@ contexts: - match: '(?=\))' pop: true - include: literal-string + - match: '(https?|ftp)://' + scope: string.unquoted.css - include: sass-value-expression - include: unquoted-string @@ -1991,6 +1993,8 @@ contexts: - match: '(?=\))' pop: true - include: literal-string + - match: '(https?|ftp)://' + scope: string.unquoted.css - include: sass-value-expression - include: unquoted-string @@ -2009,6 +2013,8 @@ contexts: - match: '(?=\))' pop: true - include: literal-string + - match: '(https?|ftp)://' + scope: string.unquoted.css - include: sass-value-expression - include: unquoted-string diff --git a/Tests/syntax_test_scss.scss b/Tests/syntax_test_scss.scss index 06e4a0e5..1b2f89fd 100644 --- a/Tests/syntax_test_scss.scss +++ b/Tests/syntax_test_scss.scss @@ -788,9 +788,9 @@ $gutter-width: 10px; // ^^^^ entity.name.tag.css @charset "UTF-8"; -// ^^^^^^^^^^^^^^^^ meta.at-rule.charset.css +// ^^^^^^^^^^^^^^^^ meta.at-rule.css // ^ punctuation.definition.keyword.css -// ^^^^^^^ keyword.control.at-rule.charset.css +// ^^^^^^^ keyword.control.at-rule.css @import "x" print; // ^^^^^^^^^^^^^^^^^ meta.at-rule.import.css @@ -813,7 +813,7 @@ $gutter-width: 10px; // ^ meta.group.css punctuation.definition.group.end.css @page :left {} -// ^^^^^^^^^^^^^^ meta.at-rule.page.css +// ^^^^^^^^^^^^ meta.at-rule.page.css // ^ punctuation.definition.keyword.css // ^^^^ keyword.control.at-rule.page.css @@ -921,12 +921,9 @@ $gutter-width: 10px; } @document url(http://) { } -// ^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.at-rule.document.css +// ^^^^^^^^^^^^^^^^^^^^^^^ meta.at-rule.document.css // ^ punctuation.definition.keyword.css // ^^^^^^^^^ keyword.control.at-rule.document.css -// ^^^ meta.block.css -// ^ punctuation.definition.block.begin.css -// ^ punctuation.definition.block.end.css @document url(http://www), // ^^^ support.function.url.css @@ -943,16 +940,16 @@ $gutter-width: 10px; // ^^^^^^^^^^ string.quoted.double.css { .class { -// ^^^^^^ meta.at-rule.document.css entity.other.attribute-name.class.css +// ^^^^^^ entity.other.attribute-name.class.css display: none; -// ^^^^^^^ meta.at-rule.document.css meta.property-name.css +// ^^^^^^^ meta.property-name.css } } @font-face { -// ^^^^^^^^^^^ meta.at-rule.font-face.css +// ^^^^^^^^^^^ meta.at-rule.css // ^ punctuation.definition.keyword.css -// ^^^^^^^^^ keyword.control.at-rule.font-face.css +// ^^^^^^^^^ keyword.control.at-rule.css src: local(Font), /* */ @@ -960,9 +957,9 @@ $gutter-width: 10px; } @font-face -// ^^^^^^^^^^^ meta.at-rule.font-face.css +// ^^^^^^^^^^^ meta.at-rule.css // ^ punctuation.definition.keyword.css -// ^^^^^^^^^ keyword.control.at-rule.font-face.css +// ^^^^^^^^^ keyword.control.at-rule.css { font-family: monospace, // ^^^^^^^^^^^ support.type.property-name.css @@ -972,7 +969,7 @@ $gutter-width: 10px; } @supports not ( and ( top: 2px ) ) { } -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.at-rule.supports.css +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.at-rule.supports.css // ^ punctuation.definition.keyword.css // ^^^^^^^^ keyword.control.at-rule.supports.css // ^^^ keyword.operator.logic.css @@ -984,21 +981,18 @@ $gutter-width: 10px; // ^^ constant.numeric.css keyword.other.unit.css // ^ meta.group.css punctuation.definition.group.end.css // ^ meta.group.css punctuation.definition.group.end.css -// ^^^ meta.block.css -// ^ punctuation.definition.block.begin.css -// ^ punctuation.definition.block.end.css @supports (--foo: green) { // ^^^^^ support.type.custom-property.css .class { -// ^^^^^^ meta.at-rule.supports.css entity.other.attribute-name.class.css +// ^^^^^^ entity.other.attribute-name.class.css display: none; -// ^^^^^^^ meta.at-rule.supports.css meta.property-name.css +// ^^^^^^^ meta.property-name.css } } @supports (display: grid) {span { display: grid; }} -// ^^^^ meta.at-rule.supports.css meta.selector.css +// ^^^^ meta.selector.css @counter-style {} // ^ punctuation.definition.keyword.css @@ -1015,9 +1009,9 @@ $gutter-width: 10px; // ^^^^^^^^^^^^^^ keyword.control.at-rule.counter-style.css // ^^^^ entity.other.counter-style-name.css symbols: "‣"; -// ^^^^^^^ meta.at-rule.counter-style.css support.type.property-name.css +// ^^^^^^^ support.type.property-name.css suffix: " "; -// ^^^^^^ meta.at-rule.counter-style.css support.type.property-name.css +// ^^^^^^ support.type.property-name.css // ^^^ string.quoted.double.css } @@ -1040,10 +1034,6 @@ $gutter-width: 10px; // ^^ punctuation.definition.custom-property // ^^^^^^^^ support.type.custom-property.name.css -.test-deprecated-var { var-deprecated- } -// ^^^^^^^^^^^^^^^ invalid.deprecated.custom-property.css -// ^^^^ keyword.other.custom-property.prefix.css - .test-types { top: 20; // ^^ constant.numeric.css @@ -1065,7 +1055,6 @@ $gutter-width: 10px; } .test-properties { -// ^ meta.property-list.css -webkit-transform: none; // ^^^^^^^^^^^^^^^^^ meta.property-name.css @@ -1201,11 +1190,6 @@ $gutter-width: 10px; // ^ punctuation.separator.combinator.css // ^ punctuation.separator.combinator.css -.test-invalid-combinators +>> a +++ a ~+> {} -// ^^^ invalid.illegal.combinator.css -// ^^^ invalid.illegal.combinator.css -// ^^^ invalid.illegal.combinator.css - .test-generic-font-families { font: serif; // ^^^^^ support.constant.font-name.css @@ -1749,15 +1733,12 @@ $gutter-width: 10px; .test-meta-scopes-for-completions { top: 5px; -//^^^^^^^^^^^ meta.property-list // ^^^ meta.property-name // ^^^^ meta.property-value top: ; -//^^^^^^^^^^^ meta.property-list // ^^^ meta.property-name // ^ meta.property-value top: -//^^^^^^^ meta.property-list // ^^^ meta.property-name }/* ^ meta.property-value */