JS: Added support for logical assignment operators (#2378)

PrismJS · May 29, 2020 · b28f21b · b28f21b
1 parent ba5ac1d
commit b28f21b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/components/prism-javascript.js b/components/prism-javascript.js
@@ -19,7 +19,7 @@ Prism.languages.javascript = Prism.languages.extend('clike', {
 	'number': /\b(?:(?:0[xX](?:[\dA-Fa-f](?:_[\dA-Fa-f])?)+|0[bB](?:[01](?:_[01])?)+|0[oO](?:[0-7](?:_[0-7])?)+)n?|(?:\d(?:_\d)?)+n|NaN|Infinity)\b|(?:\b(?:\d(?:_\d)?)+\.?(?:\d(?:_\d)?)*|\B\.(?:\d(?:_\d)?)+)(?:[Ee][+-]?(?:\d(?:_\d)?)+)?/,
 	// Allow for all non-ASCII characters (See http://stackoverflow.com/a/2008444)
 	'function': /#?[_$a-zA-Z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*(?:\.\s*(?:apply|bind|call)\s*)?\()/,
-	'operator': /--|\+\+|\*\*=?|=>|&&|\|\||[!=]==|<<=?|>>>?=?|[-+*/%&|^!=<>]=?|\.{3}|\?[.?]?|[~:]/
+	'operator': /--|\+\+|\*\*=?|=>|&&=?|\|\|=?|[!=]==|<<=?|>>>?=?|[-+*/%&|^!=<>]=?|\.{3}|\?\?=?|\?\.?|[~:]/
 });
 
 Prism.languages.javascript['class-name'][0].pattern = /(\b(?:class|interface|extends|implements|instanceof|new)\s+)[\w.\\]+/;

diff --git a/components/prism-javascript.min.js b/components/prism-javascript.min.js
diff --git a/prism.js b/prism.js
@@ -996,7 +996,7 @@ Prism.languages.javascript = Prism.languages.extend('clike', {
 	'number': /\b(?:(?:0[xX](?:[\dA-Fa-f](?:_[\dA-Fa-f])?)+|0[bB](?:[01](?:_[01])?)+|0[oO](?:[0-7](?:_[0-7])?)+)n?|(?:\d(?:_\d)?)+n|NaN|Infinity)\b|(?:\b(?:\d(?:_\d)?)+\.?(?:\d(?:_\d)?)*|\B\.(?:\d(?:_\d)?)+)(?:[Ee][+-]?(?:\d(?:_\d)?)+)?/,
 	// Allow for all non-ASCII characters (See http://stackoverflow.com/a/2008444)
 	'function': /#?[_$a-zA-Z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*(?:\.\s*(?:apply|bind|call)\s*)?\()/,
-	'operator': /--|\+\+|\*\*=?|=>|&&|\|\||[!=]==|<<=?|>>>?=?|[-+*/%&|^!=<>]=?|\.{3}|\?[.?]?|[~:]/
+	'operator': /--|\+\+|\*\*=?|=>|&&=?|\|\|=?|[!=]==|<<=?|>>>?=?|[-+*/%&|^!=<>]=?|\.{3}|\?\?=?|\?\.?|[~:]/
 });
 
 Prism.languages.javascript['class-name'][0].pattern = /(\b(?:class|interface|extends|implements|instanceof|new)\s+)[\w.\\]+/;

diff --git a/tests/languages/javascript/operator_feature.test b/tests/languages/javascript/operator_feature.test
@@ -4,13 +4,13 @@
 > >= >> >>= >>> >>>=
 = == === =>
 ! != !==
-& && &=
-| || |=
+& && &= &&=
+| || |= ||=
 * ** *= **=
 / /= ~
 ^ ^= % %=
 ? : ...
-?? ?.
+?? ?. ??=
 
 ----------------------------------------------------
 
@@ -21,13 +21,13 @@
 	["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", "??="]
 ]
 
 ----------------------------------------------------