Merge pull request #1100 from zeitgeist87/FixPHP

Fix the PHP language
PrismJS · May 8, 2017 · 1453fa7 · 1453fa7
2 parents 6530709 + 3ce7488
commit 1453fa7
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 70 deletions.
diff --git a/components/prism-php.js b/components/prism-php.js
@@ -16,8 +16,7 @@ Prism.languages.php = Prism.languages.extend('clike', {
 	'constant': /\b[A-Z0-9_]{2,}\b/,
 	'comment': {
 		pattern: /(^|[^\\])(?:\/\*[\s\S]*?\*\/|\/\/.*)/,
-		lookbehind: true,
-		greedy: true
+		lookbehind: true
 	}
 });
 
@@ -32,7 +31,10 @@ Prism.languages.insertBefore('php', 'class-name', {
 });
 
 Prism.languages.insertBefore('php', 'keyword', {
-	'delimiter': /\?>|<\?(?:php)?/i,
+	'delimiter': {
+		pattern: /\?>|<\?(?:php|=)?/i,
+		alias: 'important'
+	},
 	'variable': /\$\w+\b/i,
 	'package': {
 		pattern: /(\\|namespace\s+|use\s+)[\w\\]+/,
@@ -51,61 +53,54 @@ Prism.languages.insertBefore('php', 'operator', {
 	}
 });
 
-// Add HTML support of the markup language exists
+// Add HTML support if the markup language exists
 if (Prism.languages.markup) {
 
 	// Tokenize all inline PHP blocks that are wrapped in <?php ?>
 	// This allows for easy PHP + markup highlighting
 	Prism.hooks.add('before-highlight', function(env) {
-		if (env.language !== 'php') {
+		if (env.language !== 'php' || !/(?:<\?php|<\?)/ig.test(env.code)) {
 			return;
 		}
 
 		env.tokenStack = [];
 
 		env.backupCode = env.code;
-		env.code = env.code.replace(/(?:<\?php|<\?)[\s\S]*?(?:\?>)/ig, function(match) {
+		env.code = env.code.replace(/(?:<\?php|<\?)[\s\S]*?(?:\?>|$)/ig, function(match) {
 			env.tokenStack.push(match);
 
-			return '{{{PHP' + env.tokenStack.length + '}}}';
+			return '___PHP' + env.tokenStack.length + '___';
 		});
+
+		// Switch the grammar to markup
+		env.grammar = Prism.languages.markup;
 	});
 
 	// Restore env.code for other plugins (e.g. line-numbers)
 	Prism.hooks.add('before-insert', function(env) {
-		if (env.language === 'php') {
+		if (env.language === 'php' && env.backupCode) {
 			env.code = env.backupCode;
 			delete env.backupCode;
 		}
 	});
 
 	// Re-insert the tokens after highlighting
 	Prism.hooks.add('after-highlight', function(env) {
-		if (env.language !== 'php') {
+		if (env.language !== 'php' || !env.tokenStack) {
 			return;
 		}
 
+		// Switch the grammar back
+		env.grammar = Prism.languages.php;
+
 		for (var i = 0, t; t = env.tokenStack[i]; i++) {
 			// The replace prevents $$, $&, $`, $', $n, $nn from being interpreted as special patterns
-			env.highlightedCode = env.highlightedCode.replace('{{{PHP' + (i + 1) + '}}}', Prism.highlight(t, env.grammar, 'php').replace(/\$/g, '$$$$'));
+			env.highlightedCode = env.highlightedCode.replace('___PHP' + (i + 1) + '___',
+					"<span class=\"token php language-php\">" +
+					Prism.highlight(t, env.grammar, 'php').replace(/\$/g, '$$$$') +
+					"</span>");
 		}
 
 		env.element.innerHTML = env.highlightedCode;
 	});
-
-	// Wrap tokens in classes that are missing them
-	Prism.hooks.add('wrap', function(env) {
-		if (env.language === 'php' && env.type === 'markup') {
-			env.content = env.content.replace(/(\{\{\{PHP\d+\}\}\})/g, "<span class=\"token php\">$1</span>");
-		}
-	});
-
-	// Add the rules before all others
-	Prism.languages.insertBefore('php', 'comment', {
-		'markup': {
-			pattern: /<[^?]\/?(.*?)>/,
-			inside: Prism.languages.markup
-		},
-		'php': /\{\{\{PHP\d+\}\}\}/
-	});
 }
diff --git a/components/prism-php.min.js b/components/prism-php.min.js
diff --git a/tests/helper/test-case.js b/tests/helper/test-case.js
@@ -175,7 +175,7 @@ module.exports = {
 					code: code
 				};
 				Prism.hooks.run('before-highlight', env);
-				env.highlightedCode = Prism.highlight(env.code, Prism.languages[usedLanguages.mainLanguage], usedLanguages.mainLanguage);
+				env.highlightedCode = Prism.highlight(env.code, env.grammar, env.language);
 				Prism.hooks.run('before-insert', env);
 				env.element.innerHTML = env.highlightedCode;
 				Prism.hooks.run('after-highlight', env);

diff --git a/tests/languages/markup+php/markup_feature.test b/tests/languages/markup+php/markup_feature.test
diff --git a/tests/languages/markup+php/php_in_markup_feature.js b/tests/languages/markup+php/php_in_markup_feature.js
diff --git a/tests/languages/php/comment_feature.test b/tests/languages/php/comment_feature.test
@@ -3,14 +3,16 @@
 /**/
 /* foo
 bar */
+/* <me@example.com> */
 
 ----------------------------------------------------
 
 [
 	["comment", "//"],
 	["comment", "// foobar"],
 	["comment", "/**/"],
-	["comment", "/* foo\r\nbar */"]
+	["comment", "/* foo\r\nbar */"],
+	["comment", "/* <me@example.com> */"]
 ]
 
 ----------------------------------------------------

diff --git a/tests/languages/php/delimiter_feature.test b/tests/languages/php/delimiter_feature.test
@@ -1,12 +1,15 @@
 <? ?>
 <?php ?>
+<?= ?>
 
 ----------------------------------------------------
 
 [
 	["delimiter", "<?"],
 	["delimiter", "?>"],
 	["delimiter", "<?php"],
+	["delimiter", "?>"],
+	["delimiter", "<?="],
 	["delimiter", "?>"]
 ]
 

diff --git a/tests/languages/php/string_feature.test b/tests/languages/php/string_feature.test
@@ -0,0 +1,13 @@
+"https://example.com"
+" /* not a comment */ "
+
+----------------------------------------------------
+
+[
+	["string", "\"https://example.com\""],
+	["string", "\" /* not a comment */ \""]
+]
+
+----------------------------------------------------
+
+Checks for strings with comments.