JavaScript: Add support for constants. Fix #1348

PrismJS · Mar 26, 2018 · 9084481 · paladox · Mar 31, 2018 · Golmote
1 parent 0414a2d
commit 9084481
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 6 deletions.
diff --git a/components/prism-javascript.js b/components/prism-javascript.js
@@ -16,7 +16,8 @@ Prism.languages.insertBefore('javascript', 'keyword', {
 	'function-variable': {
 		pattern: /[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*=\s*(?:function\b|(?:\([^()]*\)|[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*)\s*=>))/i,
 		alias: 'function'
-	}
+	},
+	'constant': /\b[A-Z][A-Z\d_]*\b/
 });
 
 Prism.languages.insertBefore('javascript', 'string', {

diff --git a/components/prism-javascript.min.js b/components/prism-javascript.min.js
diff --git a/components/prism-n4js.js b/components/prism-n4js.js
@@ -3,7 +3,7 @@ Prism.languages.n4js = Prism.languages.extend('javascript', {
 	'keyword': /\b(?:any|Array|boolean|break|case|catch|class|const|constructor|continue|debugger|declare|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|module|new|null|number|package|private|protected|public|return|set|static|string|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/
 });
 
-Prism.languages.insertBefore('n4js', 'function', {
+Prism.languages.insertBefore('n4js', 'constant', {
 	// Annotations in N4JS spec: https://numberfour.github.io/n4js/spec/N4JSSpec.html#_annotations
 	'annotation': {
 		pattern: /@+\w+/,

diff --git a/components/prism-n4js.min.js b/components/prism-n4js.min.js
diff --git a/prism.js b/prism.js
@@ -742,7 +742,8 @@ Prism.languages.insertBefore('javascript', 'keyword', {
 	'function-variable': {
 		pattern: /[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*=\s*(?:function\b|(?:\([^()]*\)|[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*)\s*=>))/i,
 		alias: 'function'
-	}
+	},
+	'constant': /\b[A-Z][A-Z\d_]*\b/
 });
 
 Prism.languages.insertBefore('javascript', 'string', {

diff --git a/tests/languages/javascript/constant_feature.test b/tests/languages/javascript/constant_feature.test
@@ -0,0 +1,21 @@
+var FOO;
+const FOO_BAR;
+const BAZ42;
+
+----------------------------------------------------
+
+[
+	["keyword", "var"],
+	["constant", "FOO"],
+	["punctuation", ";"],
+	["keyword", "const"],
+	["constant", "FOO_BAR"],
+	["punctuation", ";"],
+	["keyword", "const"],
+	["constant", "BAZ42"],
+	["punctuation", ";"]
+]
+
+----------------------------------------------------
+
+Checks for constants.
diff --git a/tests/languages/markup+actionscript/xml_feature.test b/tests/languages/markup+actionscript/xml_feature.test
@@ -9,7 +9,7 @@ var employees:XML =
 	["keyword", "var"],
 	" employees",
 	["punctuation", ":"],
-	"XML ",
+	["constant", "XML"],
 	["operator", "="],
 	["xml", [
 		["tag", [