Stylus: Fixed comments breaking declarations + minor improvements (#2372

)

Comments broke URLs in all non-greedy declarations. Comments are now matched as part of these declarations.
This also adds support for comments inside selectors.

components/prism-stylus.js

@@ -74,10 +74,6 @@
 	};
 
 	Prism.languages.stylus = {
-		'comment': {
-			pattern: /(^|[^\\])(?:\/\*[\s\S]*?\*\/|\/\/.*)/,
-			lookbehind: true
-		},
 		'atrule-declaration': {
 			pattern: /(^\s*)@.+/m,
 			lookbehind: true,
@@ -109,7 +105,6 @@
 		'property-declaration': {
 			pattern: /((?:^|\{)([ \t]*))(?:[\w-]|\{[^}\r\n]+\})+(?:\s*:\s*|[ \t]+)[^{\r\n]*(?:;|[^{\r\n,](?=$)(?!(?:\r?\n|\r)(?:\{|\2[ \t]+)))/m,
 			lookbehind: true,
-			greedy: true,
 			inside: {
 				'property': {
 					pattern: /^[^\s:]+/,
@@ -131,12 +126,18 @@
 			lookbehind: true,
 			inside: {
 				'interpolation': inside.interpolation,
+				'comment': inside.comment,
 				'punctuation': /[{},]/
 			}
 		},
 
 		'func': inside.func,
 		'string': inside.string,
+		'comment': {
+			pattern: /(^|[^\\])(?:\/\*[\s\S]*?\*\/|\/\/.*)/,
+			lookbehind: true,
+			greedy: true
+		},
 		'interpolation': inside.interpolation,
 		'punctuation': /[{}()\[\];:.]/
 	};

tests/languages/stylus/atrule-declaration_feature.test

@@ -3,6 +3,8 @@
 @font-face {
 @keyframes {
 @media (max-{foo}: bar)
+@namespace url(http://www.w3.org/1999/xhtml)	// comment
+@namespace svg url(http://www.w3.org/2000/svg)	// comment
 
 ----------------------------------------------------
 
@@ -23,6 +25,17 @@
 		["punctuation", ":"],
 		" bar",
 		["punctuation", ")"]
+	]],
+	["atrule-declaration", [
+		["atrule", "@namespace"],
+		["url", "url(http://www.w3.org/1999/xhtml)"],
+		["comment", "// comment"]
+	]],
+	["atrule-declaration", [
+		["atrule", "@namespace"],
+		" svg ",
+		["url", "url(http://www.w3.org/2000/svg)"],
+		["comment", "// comment"]
 	]]
 ]
 

tests/languages/stylus/keyword_feature.test

@@ -2,6 +2,7 @@ for i in 1..5
 if a == 3
 z-index: 1 unless @z-index;
 return pair[1] if pair[0] == key for pair in hash
+if url == "http://example.com"	// comment
 
 ----------------------------------------------------
 
@@ -36,6 +37,13 @@ return pair[1] if pair[0] == key for pair in hash
 		["operator", "=="], " key ",
 		["keyword", "for"], " pair ",
 		["operator", "in"], " hash"
+	]],
+	["statement", [
+		["keyword", "if"],
+		" url ",
+		["operator", "=="],
+		["string", "\"http://example.com\""],
+		["comment", "// comment"]
 	]]
 ]
 

tests/languages/stylus/selector_feature.test

@@ -18,6 +18,9 @@ color red
 {foo} {bar}:hover
   color red
 
+div    // comment
+	display inline-block // comment
+
 ----------------------------------------------------
 
 [
@@ -41,7 +44,9 @@ color red
 		]],
 		":hover"
 	]],
-	["property-declaration", [["property", ["color"]], ["color", "red"]]]
+	["property-declaration", [["property", ["color"]], ["color", "red"]]],
+	["selector", ["div    ", ["comment", "// comment"]]],
+	["property-declaration", [["property", ["display"]], " inline-block ", ["comment", "// comment"]]]
 ]
 
 ----------------------------------------------------

tests/languages/stylus/variable-declaration_feature.test

@@ -2,6 +2,7 @@ foo = 'bar'
 a = 4
 bar-baz = 5
 a += 8
+url = "http://example.com"	// comment
 
 ----------------------------------------------------
 
@@ -25,6 +26,12 @@ a += 8
 		["variable", "a"],
 		["operator", "+="],
 		["number", "8"]
+	]],
+	["variable-declaration", [
+		["variable", "url"],
+		["operator", "="],
+		["string", "\"http://example.com\""],
+		["comment", "// comment"]
 	]]
 ]