From a78ceb6daff37e8777fb75d1653042fb6a54ad4a Mon Sep 17 00:00:00 2001 From: c-spencer Date: Tue, 31 May 2011 12:19:21 +0100 Subject: [PATCH] Fixes for #275 --- lib/ace/mode/behaviour/cstyle.js | 2 +- lib/ace/mode/html_highlight_rules.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ace/mode/behaviour/cstyle.js b/lib/ace/mode/behaviour/cstyle.js index d685ad06..a85f796b 100644 --- a/lib/ace/mode/behaviour/cstyle.js +++ b/lib/ace/mode/behaviour/cstyle.js @@ -186,7 +186,7 @@ var CstyleBehaviour = function () { } // Try and be smart about when we auto insert. - if (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf('"') === token.value.length-1))) { + if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf('"') === token.value.length-1)))) { return { text: '""', selection: [1,1] diff --git a/lib/ace/mode/html_highlight_rules.js b/lib/ace/mode/html_highlight_rules.js index 8a1f3e53..d02fb6f8 100644 --- a/lib/ace/mode/html_highlight_rules.js +++ b/lib/ace/mode/html_highlight_rules.js @@ -131,7 +131,7 @@ var HtmlHighlightRules = function() { }, { token : "text", regex : "\\s+" - }].concat(string("css")), + }].concat(string("style")), tag : [ { token : "text", @@ -145,8 +145,8 @@ var HtmlHighlightRules = function() { regex : "\\s+" }].concat(string("tag")), - "css-qstring": multiLineString("'", "css"), - "css-qqstring": multiLineString('"', "css"), + "style-qstring": multiLineString("'", "style"), + "style-qqstring": multiLineString('"', "style"), "script-qstring": multiLineString("'", "script"), "script-qqstring": multiLineString('"', "script"), "tag-qstring": multiLineString("'", "tag"),