From 57d1e7275161b7d609b7a06815f5aba0c2cedcc6 Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Tue, 3 Apr 2012 22:45:56 -0700 Subject: [PATCH] Improve multiline string rules --- lib/ace/mode/php_highlight_rules.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/ace/mode/php_highlight_rules.js b/lib/ace/mode/php_highlight_rules.js index 9c37f3e6..846cfbab 100644 --- a/lib/ace/mode/php_highlight_rules.js +++ b/lib/ace/mode/php_highlight_rules.js @@ -952,14 +952,14 @@ var PhpHighlightRules = function() { regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]' }, { token : "string", // multi line string start - regex : '["].*\\\\$', + regex : '["][\\s\\S]*', next : "qqstring" }, { token : "string", // single line regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']" }, { token : "string", // multi line string start - regex : "['].*\\\\$", + regex : "['][\\s\\S]+", next : "qstring" }, { token : "constant.numeric", // hex @@ -1041,21 +1041,21 @@ var PhpHighlightRules = function() { "qqstring" : [ { token : "string", - regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"', + regex : '"', next : "start" }, { token : "string", - regex : '.+' - } + regex : '[^"]+' + }, ], "qstring" : [ { token : "string", - regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'", + regex : "'", next : "start" }, { token : "string", - regex : '.+' + regex : "[^']+" } ], "htmlcomment" : [