Check for token in quote behaviour, change style tag state prefix to style (fixes #275) #278

Merged
merged 1 commit into from May 31, 2011
@@ -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]
@@ -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"),