Strip trailing spaces and fix word boundary in JS regex

PrismJS · Jul 12, 2018 · e7afc73 · e7afc73
1 parent 7205979
commit e7afc73
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/components/prism-javascript.js b/components/prism-javascript.js
@@ -19,7 +19,7 @@ Prism.languages.insertBefore('javascript', 'keyword', {
 	},
 	'parameter': [
 		{
-			pattern: /(function(?:\s+[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*)?\s*\(\s*)\S[^()]*(?=\s*\))/,
+			pattern: /(function(?:\s+[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*)?\s*\(\s*)[^\s()][^()]*?(?=\s*\))/,
 			lookbehind: true,
 			inside: Prism.languages.javascript
 		},
@@ -28,12 +28,12 @@ Prism.languages.insertBefore('javascript', 'keyword', {
 			inside: Prism.languages.javascript
 		},
 		{
-			pattern: /(\()[^()]+(?=\)\s*=>)/,
+			pattern: /(\(\s*)[^\s()][^()]*?(?=\s*\)\s*=>)/,
 			lookbehind: true,
 			inside: Prism.languages.javascript
 		},
 		{
-			pattern: /(\b(?!await|delete|export|for|if|new|return|switch|throw|typeof|while|yield)(?:[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*\s*)\(\s*)\S[^()]*(?=\s*\)\s*\{)/,
+			pattern: /((?:\b|\s|^)(?!(?:await|delete|export|for|if|new|return|switch|throw|typeof|while|yield)(?![$\w\xA0-\uFFFF]))(?:[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*\s*)\(\s*)[^\s()][^()]*?(?=\s*\)\s*\{)/,
 			lookbehind: true,
 			inside: Prism.languages.javascript
 		}

diff --git a/components/prism-javascript.min.js b/components/prism-javascript.min.js
diff --git a/prism.js b/prism.js
@@ -742,7 +742,7 @@ Prism.languages.insertBefore('javascript', 'keyword', {
 	},
 	'parameter': [
 		{
-			pattern: /(function(?:\s+[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*)?\s*\(\s*)\S[^()]*(?=\s*\))/,
+			pattern: /(function(?:\s+[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*)?\s*\(\s*)[^\s()][^()]*?(?=\s*\))/,
 			lookbehind: true,
 			inside: Prism.languages.javascript
 		},
@@ -751,12 +751,12 @@ Prism.languages.insertBefore('javascript', 'keyword', {
 			inside: Prism.languages.javascript
 		},
 		{
-			pattern: /(\()[^()]+(?=\)\s*=>)/,
+			pattern: /(\(\s*)[^\s()][^()]*?(?=\s*\)\s*=>)/,
 			lookbehind: true,
 			inside: Prism.languages.javascript
 		},
 		{
-			pattern: /(\b(?!await|delete|export|for|if|new|return|switch|throw|typeof|while|yield)(?:[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*\s*)\(\s*)\S[^()]*(?=\s*\)\s*\{)/,
+			pattern: /((?:\b|\s|^)(?!(?:await|delete|export|for|if|new|return|switch|throw|typeof|while|yield)(?![$\w\xA0-\uFFFF]))(?:[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*\s*)\(\s*)[^\s()][^()]*?(?=\s*\)\s*\{)/,
 			lookbehind: true,
 			inside: Prism.languages.javascript
 		}

diff --git a/tests/languages/javascript/class-method_feature.test b/tests/languages/javascript/class-method_feature.test
@@ -1,7 +1,8 @@
 class Test {
-	foo(x, y = 0) {}
-	async bar(x, y = 0) {}
-	_ ( ) {}
+	foo( x, y = 0) {}
+	async bar(x, y = 0 ) {}
+	$ ( ) {}
+	asyncFoo(){}
 }
 
 ----------------------------------------------------
@@ -38,7 +39,13 @@ class Test {
 	["punctuation", "{"],
 	["punctuation", "}"],
 
-	["function", "_"],
+	["function", "$"],
+	["punctuation", "("],
+	["punctuation", ")"],
+	["punctuation", "{"],
+	["punctuation", "}"],
+
+	["function", "asyncFoo"],
 	["punctuation", "("],
 	["punctuation", ")"],
 	["punctuation", "{"],

diff --git a/tests/languages/javascript/function-variable_feature.test b/tests/languages/javascript/function-variable_feature.test
@@ -2,7 +2,7 @@ foo = function ( x, y) {}
 bar = async function baz (x ) {}
 baz = async(x) => x
 fooBar = x => x
-fooBar = (x, y) => x
+fooBar = ( x, y ) => x
 ಠ_ಠ = () => {}
 Ƞȡ_҇ = async (ಠ, Ƞ = 2) => {}
 
@@ -29,7 +29,7 @@ fooBar = (x, y) => x
 	["function", "baz"],
 	["punctuation", "("],
 	["parameter", [
-		"x "
+		"x"
 	]],
 	["punctuation", ")"],
 	["punctuation", "{"],