JavaScript: Properly match every operator as a whole token. Fix #1133

PrismJS · May 8, 2017 · 9f649fb · 9f649fb
1 parent ea8a2ca
commit 9f649fb
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 17 deletions.
diff --git a/components/prism-javascript.js b/components/prism-javascript.js
@@ -3,7 +3,7 @@ Prism.languages.javascript = Prism.languages.extend('clike', {
 	'number': /\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,
 	// Allow for all non-ASCII characters (See http://stackoverflow.com/a/2008444)
 	'function': /[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*(?=\()/i,
-	'operator': /--?|\+\+?|!=?=?|<=?|>=?|==?=?|&&?|\|\|?|\?|\*\*?|\/|~|\^|%|\.{3}/
+	'operator': /-[-=]?|\+[+=]?|!=?=?|<<?=?|>>?>?=?|=(?:==?|>)?|&[&=]?|\|[|=]?|\*\*?=?|\/=?|~|\^=?|%=?|\?|\.{3}/
 });
 
 Prism.languages.insertBefore('javascript', 'keyword', {

diff --git a/components/prism-javascript.min.js b/components/prism-javascript.min.js
diff --git a/prism.js b/prism.js
@@ -671,7 +671,7 @@ Prism.languages.javascript = Prism.languages.extend('clike', {
 	'number': /\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,
 	// Allow for all non-ASCII characters (See http://stackoverflow.com/a/2008444)
 	'function': /[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*(?=\()/i,
-	'operator': /--?|\+\+?|!=?=?|<=?|>=?|==?=?|&&?|\|\|?|\?|\*\*?|\/|~|\^|%|\.{3}/
+	'operator': /-[-=]?|\+[+=]?|!=?=?|<<?=?|>>?>?=?|=(?:==?|>)?|&[&=]?|\|[|=]?|\*\*?=?|\/=?|~|\^=?|%=?|\?|\.{3}/
 });
 
 Prism.languages.insertBefore('javascript', 'keyword', {

diff --git a/tests/languages/javascript/operator_feature.test b/tests/languages/javascript/operator_feature.test
@@ -1,23 +1,31 @@
-- + -- ++
-< <= > >=
-= == ===
+- -- -=
++ ++ +=
+< <= << <<=
+> >= >> >>= >>> >>>=
+= == === =>
 ! != !==
-& && | ||
-* **
-? / ~ ^ %
-...
+& && &=
+| || |=
+* ** *= **=
+/ /= ~
+^ ^= % %=
+? ...
 
 ----------------------------------------------------
 
 [
-	["operator", "-"], ["operator", "+"], ["operator", "--"], ["operator", "++"],
-	["operator", "<"], ["operator", "<="], ["operator", ">"], ["operator", ">="],
-	["operator", "="], ["operator", "=="], ["operator", "==="],
+	["operator", "-"], ["operator", "--"], ["operator", "-="],
+	["operator", "+"], ["operator", "++"], ["operator", "+="],
+	["operator", "<"], ["operator", "<="], ["operator", "<<"], ["operator", "<<="],
+	["operator", ">"], ["operator", ">="], ["operator", ">>"], ["operator", ">>="], ["operator", ">>>"], ["operator", ">>>="],
+	["operator", "="], ["operator", "=="], ["operator", "==="], ["operator", "=>"],
 	["operator", "!"], ["operator", "!="], ["operator", "!=="],
-	["operator", "&"], ["operator", "&&"], ["operator", "|"], ["operator", "||"],
-	["operator", "*"], ["operator", "**"],
-	["operator", "?"], ["operator", "/"], ["operator", "~"], ["operator", "^"], ["operator", "%"],
-	["operator", "..."]
+	["operator", "&"], ["operator", "&&"], ["operator", "&="],
+	["operator", "|"], ["operator", "||"], ["operator", "|="],
+	["operator", "*"], ["operator", "**"], ["operator", "*="], ["operator", "**="],
+	["operator", "/"], ["operator", "/="], ["operator", "~"],
+	["operator", "^"], ["operator", "^="], ["operator", "%"], ["operator", "%="],
+	["operator", "?"], ["operator", "..."]
 ]
 
 ----------------------------------------------------