From f29e12c78f3e8712a2f12b12e5a46691403076c2 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sat, 28 Jul 2012 16:40:09 +0400
Subject: [PATCH] fix highlighting of multiline clojure strings

---
 lib/ace/mode/clojure_highlight_rules.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/ace/mode/clojure_highlight_rules.js b/lib/ace/mode/clojure_highlight_rules.js
index 0a42e0dc..3ac380c3 100644
--- a/lib/ace/mode/clojure_highlight_rules.js
+++ b/lib/ace/mode/clojure_highlight_rules.js
@@ -190,10 +190,7 @@ var ClojureHighlightRules = function() {
                 regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
             }, {
                 token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // multi line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?$',
+                regex : '"',
                 next: "string"
             }, {
                 token : "string", // symbol
@@ -217,12 +214,16 @@ var ClojureHighlightRules = function() {
         ],
         "string" : [
             {
-                token : "string",
+                token : "constant.language.escape",
                 merge : true,
-                regex : "\\\\."
+                regex : "\\\\.|\\\\$"
             }, {
                 token : "string",
-                regex : '[^"\\\\]*?"',
+                merge : true,
+                regex : '[^"\\\\]+'
+            }, {
+                token : "string",
+                regex : '"',
                 next : "start"
             }
         ]