From 7a3a84c8583d49f6acf5948ad6a386737fa7ee17 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Tue, 2 Sep 2014 01:16:10 +0400
Subject: [PATCH] fix error in coffeeScript mode

---
 lib/ace/mode/_test/text_coffee.txt    |  1 +
 lib/ace/mode/_test/tokens_coffee.json | 17 +++++++++++++++++
 lib/ace/mode/_test/tokens_latex.json  |  4 +++-
 lib/ace/mode/_test/tokens_php.json    |  2 +-
 lib/ace/tokenizer.js                  |  8 +++++---
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/lib/ace/mode/_test/text_coffee.txt b/lib/ace/mode/_test/text_coffee.txt
index 094e61b7..2d9ba5ad 100644
--- a/lib/ace/mode/_test/text_coffee.txt
+++ b/lib/ace/mode/_test/text_coffee.txt
@@ -42,6 +42,7 @@ class Foo extends Bar
 foo.static.function
 #!test tokenize string with interpolation
 a = "#{ 22 / 7 + {x: "#{a + b}"} + 2}"
+" #{ "" + {} } )"  
 """heredoc
    """
 do ->
diff --git a/lib/ace/mode/_test/tokens_coffee.json b/lib/ace/mode/_test/tokens_coffee.json
index 9c3967e4..b0703b37 100644
--- a/lib/ace/mode/_test/tokens_coffee.json
+++ b/lib/ace/mode/_test/tokens_coffee.json
@@ -466,6 +466,23 @@
   ["constant.numeric","2"],
   ["paren.string","}"],
   ["string.end","\""]
+],[
+   "start",
+  ["string.start","\""],
+  ["string"," "],
+  ["paren.string","#{"],
+  ["text"," "],
+  ["string.start","\""],
+  ["string.end","\""],
+  ["text"," "],
+  ["keyword.operator","+"],
+  ["text"," "],
+  ["paren","{}"],
+  ["text"," "],
+  ["paren.string","}"],
+  ["string"," )"],
+  ["string.end","\""],
+  ["text","  "]
 ],[
    "qqdoc",
   ["string","\"\"\"heredoc"]
diff --git a/lib/ace/mode/_test/tokens_latex.json b/lib/ace/mode/_test/tokens_latex.json
index 4ae69afa..52508e0d 100644
--- a/lib/ace/mode/_test/tokens_latex.json
+++ b/lib/ace/mode/_test/tokens_latex.json
@@ -92,7 +92,9 @@
 ],[
    "start",
   ["text","    E &= mc^2                              "],
-  ["constant.character.escape","\\\\"],
+  ["constant.character.escape","\\\\"]
+],[
+   "start",
   ["text","    m &= "],
   ["storage.type","\\frac"],
   ["lparen","{"],
diff --git a/lib/ace/mode/_test/tokens_php.json b/lib/ace/mode/_test/tokens_php.json
index d1458a65..2134dccb 100644
--- a/lib/ace/mode/_test/tokens_php.json
+++ b/lib/ace/mode/_test/tokens_php.json
@@ -138,7 +138,7 @@
   ["text","  "],
   ["support.php_tag","<?php"]
 ],[
-   ["php-qstring","php-start","js-start"],
+   ["#tmp","php-qstring","php-start","js-start"],
   ["support.function","echo"],
   ["text"," "],
   ["string","'"]
diff --git a/lib/ace/tokenizer.js b/lib/ace/tokenizer.js
index 85fa6c7b..e947a130 100644
--- a/lib/ace/tokenizer.js
+++ b/lib/ace/tokenizer.js
@@ -221,6 +221,10 @@ var Tokenizer = function(rules) {
         if (startState && typeof startState != "string") {
             var stack = startState.slice(0);
             startState = stack[0];
+            if (startState === "#tmp") {
+                stack.shift()
+                startState = stack.shift()
+            }
         } else
             var stack = [];
 
@@ -269,8 +273,6 @@ var Tokenizer = function(rules) {
 
                 if (rule.next) {
                     if (typeof rule.next == "string") {
-                        if (stack.length && stack[0] == currentState && stack[1] == rule.next)
-                            stack.shift();
                         currentState = rule.next;
                     } else {
                         currentState = rule.next(currentState, stack);
@@ -334,7 +336,7 @@ var Tokenizer = function(rules) {
         
         if (stack.length > 1) {
             if (stack[0] !== currentState)
-                stack.unshift(currentState);
+                stack.unshift("#tmp", currentState);
         }
         return {
             tokens : tokens,