Commit b2763e7d85826882bbb25cd97a1970bfade03a6b
2015-09-21T09:01:18
Sass: Highlight "-" as operator only if surrounded by spaces, in order to not break hyphenated values (e.g. "ease-in-out")
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 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
diff --git a/components/prism-sass.js b/components/prism-sass.js
index 4609ac0..0a34c00 100644
--- a/components/prism-sass.js
+++ b/components/prism-sass.js
@@ -21,7 +21,13 @@
var variable = /((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i;
- var operator = /[-+*\/%]|[=!]=|<=?|>=?|\b(?:and|or|not)\b/;
+ var operator = [
+ /[+*\/%]|[=!]=|<=?|>=?|\b(?:and|or|not)\b/,
+ {
+ pattern: /(\s+)-(?=\s)/,
+ lookbehind: true
+ }
+ ];
Prism.languages.insertBefore('sass', 'property', {
// We want to consume the whole line
diff --git a/components/prism-sass.min.js b/components/prism-sass.min.js
index 085ead8..326df18 100644
--- a/components/prism-sass.min.js
+++ b/components/prism-sass.min.js
@@ -1 +1 @@
-!function(e){e.languages.sass=e.languages.extend("css",{comment:{pattern:/^([ \t]*)\/[\/*].*(?:(?:\r?\n|\r)\1[ \t]+.+)*/m,lookbehind:!0}}),e.languages.insertBefore("sass","atrule",{"atrule-line":{pattern:/^(?:[ \t]*)[@+=].+/m,inside:{atrule:/(?:@[\w-]+|[+=])/m}}}),delete e.languages.sass.atrule;var a=/((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i,t=/[-+*\/%]|[=!]=|<=?|>=?|\b(?:and|or|not)\b/;e.languages.insertBefore("sass","property",{"variable-line":{pattern:/^[ \t]*\$.+/m,inside:{punctuation:/:/,variable:a,operator:t}},"property-line":{pattern:/^[ \t]*(?:[^:\s]+ *:.*|:[^:\s]+.*)/m,inside:{property:[/[^:\s]+(?=\s*:)/,{pattern:/(:)[^:\s]+/,lookbehind:!0}],punctuation:/:/,variable:a,operator:t,important:e.languages.sass.important}}}),delete e.languages.sass.property,delete e.languages.sass.important,delete e.languages.sass.selector,e.languages.insertBefore("sass","punctuation",{selector:{pattern:/([ \t]*)\S(?:,?[^,\r\n]+)*(?:,(?:\r?\n|\r)\1[ \t]+\S(?:,?[^,\r\n]+)*)*/,lookbehind:!0}})}(Prism);
\ No newline at end of file
+!function(e){e.languages.sass=e.languages.extend("css",{comment:{pattern:/^([ \t]*)\/[\/*].*(?:(?:\r?\n|\r)\1[ \t]+.+)*/m,lookbehind:!0}}),e.languages.insertBefore("sass","atrule",{"atrule-line":{pattern:/^(?:[ \t]*)[@+=].+/m,inside:{atrule:/(?:@[\w-]+|[+=])/m}}}),delete e.languages.sass.atrule;var a=/((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i,t=[/[+*\/%]|[=!]=|<=?|>=?|\b(?:and|or|not)\b/,{pattern:/(\s+)-(?=\s)/,lookbehind:!0}];e.languages.insertBefore("sass","property",{"variable-line":{pattern:/^[ \t]*\$.+/m,inside:{punctuation:/:/,variable:a,operator:t}},"property-line":{pattern:/^[ \t]*(?:[^:\s]+ *:.*|:[^:\s]+.*)/m,inside:{property:[/[^:\s]+(?=\s*:)/,{pattern:/(:)[^:\s]+/,lookbehind:!0}],punctuation:/:/,variable:a,operator:t,important:e.languages.sass.important}}}),delete e.languages.sass.property,delete e.languages.sass.important,delete e.languages.sass.selector,e.languages.insertBefore("sass","punctuation",{selector:{pattern:/([ \t]*)\S(?:,?[^,\r\n]+)*(?:,(?:\r?\n|\r)\1[ \t]+\S(?:,?[^,\r\n]+)*)*/,lookbehind:!0}})}(Prism);
\ No newline at end of file
diff --git a/tests/languages/sass/property-line_feature.test b/tests/languages/sass/property-line_feature.test
index 077f19a..499f223 100644
--- a/tests/languages/sass/property-line_feature.test
+++ b/tests/languages/sass/property-line_feature.test
@@ -1,6 +1,7 @@
foo: bar
color: $color !important
-moz-border-radius: 10px
+transition-timing-function: ease-in-out
:color #{$color}
:font-size 0.5em + 3em
@@ -25,6 +26,11 @@ foo: bar
" 10px"
]],
["property-line", [
+ ["property", "transition-timing-function"],
+ ["punctuation", ":"],
+ " ease-in-out"
+ ]],
+ ["property-line", [
["punctuation", ":"],
["property", "color"],
["variable", "#{$color}"]