🐛 Fix svg color not detected if preceded with >

Fixes abe33#162
richrad · Mar 22, 2016 · 941fc7a · 941fc7a
1 parent 323ec2b
commit 941fc7a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/lib/regexes.coffee b/lib/regexes.coffee
@@ -3,7 +3,7 @@ decimal = "\\.#{int}"
 float = "(?:#{int}#{decimal}|#{int}|#{decimal})"
 percent = "#{float}%"
 variables = '(?:@[a-zA-Z0-9\\-_]+|\\$[a-zA-Z0-9\\-_]+|[a-zA-Z_][a-zA-Z0-9\\-_]*)'
-namePrefixes = '^| |\\t|:|=|,|\\n|\'|"|\\(|\\[|\\{'
+namePrefixes = '^| |\\t|:|=|,|\\n|\'|"|\\(|\\[|\\{|>'
 
 module.exports =
   int: int

diff --git a/spec/color-parser-spec.coffee b/spec/color-parser-spec.coffee
@@ -238,6 +238,7 @@ describe 'ColorParser', ->
   itParses('YellowGreen').asColor('#9acd32')
   itParses('yellow_green').asColor('#9acd32')
   itParses('YELLOW_GREEN').asColor('#9acd32')
+  itParses('>YELLOW_GREEN').asColor('#9acd32')
 
   itParses('darken(cyan, 20%)').asColor(0, 153, 153)
   itParses('darken(cyan, 20)').asColor(0, 153, 153)

diff --git a/spec/color-scanner-spec.coffee b/spec/color-scanner-spec.coffee
@@ -129,3 +129,12 @@ describe 'ColorScanner', ->
           doSearch()
 
           expect(result.color).toBeDefined()
+
+      withScannerForTextEditor 'color-in-tag-content.html', ->
+        it 'finds both colors', ->
+          result = lastIndex: 0
+          doSearch = -> result = scanner.search(text, 'html', result.lastIndex)
+
+          expect(doSearch()).toBeDefined()
+          expect(doSearch()).toBeDefined()
+          expect(doSearch()).toBeUndefined()
diff --git a/spec/fixtures/color-in-tag-content.html b/spec/fixtures/color-in-tag-content.html
@@ -0,0 +1 @@
+<div>Blue White</div>