Fix microsoft#40279 - rewrite php grammar rule to avoid regex that hangs vscode-textmate

roblourens · roblourens · commit 390a5295b034 · 2018-01-29T10:04:28.000-08:00
diff --git a/extensions/php/build/update-grammar.js b/extensions/php/build/update-grammar.js
@@ -20,6 +20,21 @@ function adaptInjectionScope(grammar) {
 	injections[newInjectionKey] = injection;
 }
 
-updateGrammar.update('atom/language-php', 'grammars/php.cson', './syntaxes/php.tmLanguage.json', undefined);
+// Workaround for https://github.com/Microsoft/vscode/issues/40279
+// and https://github.com/Microsoft/vscode-textmate/issues/59
+function fixBadRegex(grammar) {
+	const scopeResolution = grammar.repository['scope-resolution'];
+	if (scopeResolution) {
+		const match = scopeResolution.patterns[0].match;
+		if (match === '(?i)([a-z_\\x{7f}-\\x{7fffffff}\\\\][a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]*)(?=\\s*::)') {
+			scopeResolution.patterns[0].match = '([A-Za-z_\\x{7f}-\\x{7fffffff}\\\\][A_Za-z0-9_\\x{7f}-\\x{7fffffff}\\\\]*)(?=\\s*::)';
+			return;
+		}
+	}
+
+	throw new Error(`fixBadRegex callback couldn't patch the regex. It may be obsolete`);
+}
+
+updateGrammar.update('atom/language-php', 'grammars/php.cson', './syntaxes/php.tmLanguage.json', fixBadRegex);
 updateGrammar.update('atom/language-php', 'grammars/html.cson', './syntaxes/html.tmLanguage.json', adaptInjectionScope);
 
diff --git a/extensions/php/syntaxes/php.tmLanguage.json b/extensions/php/syntaxes/php.tmLanguage.json
@@ -2430,7 +2430,7 @@
 		"scope-resolution": {
 			"patterns": [
 				{
-					"match": "(?i)([a-z_\\x{7f}-\\x{7fffffff}\\\\][a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]*)(?=\\s*::)",
+					"match": "([A-Za-z_\\x{7f}-\\x{7fffffff}\\\\][A_Za-z0-9_\\x{7f}-\\x{7fffffff}\\\\]*)(?=\\s*::)",
 					"captures": {
 						"1": {
 							"patterns": [

Original file line number	Diff line number	Diff line change
`@@ -2430,7 +2430,7 @@`
`2430`	`2430`	`"scope-resolution": {`
`2431`	`2431`	`"patterns": [`
`2432`	`2432`	`{`
`2433`		`- "match": "(?i)([a-z_\\x{7f}-\\x{7fffffff}\\\\][a-z0-9_\\x{7f}-\\x{7fffffff}\\\\])(?=\\s::)",`
	`2433`	`+ "match": "([A-Za-z_\\x{7f}-\\x{7fffffff}\\\\][A_Za-z0-9_\\x{7f}-\\x{7fffffff}\\\\])(?=\\s::)",`
`2434`	`2434`	`"captures": {`
`2435`	`2435`	`"1": {`
`2436`	`2436`	`"patterns": [`