fix PHP comment highlighting bug (#81)

alecthomas · Feb 8, 2018 · 33dd172 · 33dd172
1 parent 205105f
commit 33dd172
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 0 deletions.
diff --git a/lexers/php.go b/lexers/php.go
@@ -13,6 +13,7 @@ var PHP = Register(MustNewLexer(
 		MimeTypes:       []string{"text/x-php"},
 		DotAll:          true,
 		CaseInsensitive: true,
+		EnsureNL:        true,
 	},
 	Rules{
 		"root": {

diff --git a/lexers/testdata/php.actual b/lexers/testdata/php.actual
@@ -0,0 +1,11 @@
+<?php
+
+$docs = $modx->getIterator('modResource', ["parent" => 84]);
+
+foreach($docs as $doc){
+    $q=$doc->content;
+    $doc->set("content", preg_replace("/Some value/i", "Replacement", $q));
+    print_r($doc->content);
+    // $doc->save();
+} 
+// some comment
diff --git a/lexers/testdata/php.expected b/lexers/testdata/php.expected
@@ -0,0 +1,72 @@
+[
+  {"type":"CommentPreproc","value":"\u003c?php"},
+  {"type":"Text","value":"\n\n"},
+  {"type":"NameVariable","value":"$docs"},
+  {"type":"Text","value":" "},
+  {"type":"Operator","value":"="},
+  {"type":"Text","value":" "},
+  {"type":"NameVariable","value":"$modx"},
+  {"type":"Operator","value":"-\u003e"},
+  {"type":"Text","value":""},
+  {"type":"NameAttribute","value":"getIterator"},
+  {"type":"Punctuation","value":"("},
+  {"type":"LiteralStringSingle","value":"'modResource'"},
+  {"type":"Punctuation","value":","},
+  {"type":"Text","value":" "},
+  {"type":"Punctuation","value":"["},
+  {"type":"LiteralStringDouble","value":"\"parent\""},
+  {"type":"Text","value":" "},
+  {"type":"Operator","value":"=\u003e"},
+  {"type":"Text","value":" "},
+  {"type":"LiteralNumberInteger","value":"84"},
+  {"type":"Punctuation","value":"]);"},
+  {"type":"Text","value":"\n\n"},
+  {"type":"Keyword","value":"foreach"},
+  {"type":"Punctuation","value":"("},
+  {"type":"NameVariable","value":"$docs"},
+  {"type":"Text","value":" "},
+  {"type":"Keyword","value":"as"},
+  {"type":"Text","value":" "},
+  {"type":"NameVariable","value":"$doc"},
+  {"type":"Punctuation","value":"){"},
+  {"type":"Text","value":"\n    "},
+  {"type":"NameVariable","value":"$q"},
+  {"type":"Operator","value":"="},
+  {"type":"NameVariable","value":"$doc"},
+  {"type":"Operator","value":"-\u003e"},
+  {"type":"Text","value":""},
+  {"type":"NameAttribute","value":"content"},
+  {"type":"Punctuation","value":";"},
+  {"type":"Text","value":"\n    "},
+  {"type":"NameVariable","value":"$doc"},
+  {"type":"Operator","value":"-\u003e"},
+  {"type":"Text","value":""},
+  {"type":"NameAttribute","value":"set"},
+  {"type":"Punctuation","value":"("},
+  {"type":"LiteralStringDouble","value":"\"content\""},
+  {"type":"Punctuation","value":","},
+  {"type":"Text","value":" "},
+  {"type":"NameOther","value":"preg_replace"},
+  {"type":"Punctuation","value":"("},
+  {"type":"LiteralStringDouble","value":"\"/Some value/i\""},
+  {"type":"Punctuation","value":","},
+  {"type":"Text","value":" "},
+  {"type":"LiteralStringDouble","value":"\"Replacement\""},
+  {"type":"Punctuation","value":","},
+  {"type":"Text","value":" "},
+  {"type":"NameVariable","value":"$q"},
+  {"type":"Punctuation","value":"));"},
+  {"type":"Text","value":"\n    "},
+  {"type":"NameOther","value":"print_r"},
+  {"type":"Punctuation","value":"("},
+  {"type":"NameVariable","value":"$doc"},
+  {"type":"Operator","value":"-\u003e"},
+  {"type":"Text","value":""},
+  {"type":"NameAttribute","value":"content"},
+  {"type":"Punctuation","value":");"},
+  {"type":"Text","value":"\n    "},
+  {"type":"CommentSingle","value":"// $doc-\u003esave();\n"},
+  {"type":"Punctuation","value":"}"},
+  {"type":"Text","value":" \n"},
+  {"type":"CommentSingle","value":"// some comment\n"}
+]