jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'nightwing/pullreq'

Browse source 
Conflicts:
	lib/ace/mode/folding/cstyle.js
This commit is contained in:
Fabian Jakobs 2011-12-05 15:56:38 +01:00
commit 82a930053b
8 changed files with 118 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

25
demo/kitchen-sink/docs/css.css
View file

@ -2,4 +2,29 @@
font-family: Monaco, "Courier New", monospace; font-family: Monaco, "Courier New", monospace;
font-size: 12px; font-size: 12px;
cursor: text; cursor: text;
}
.blinker {
animation-duration: 1s;
animation-name: blink;
animation-iteration-count: infinite;
nimation-direction: alternate;
animation-timing-function: linear;
}
@keyframes blink {
0% {
opacity: 0;
}
40% {
opacity: 0;
}
40.5% {
opacity: 1
}
100% {
opacity: 1
}
} }

2
lib/ace/mode/css.js
View file

@ -46,7 +46,7 @@ var WorkerClient = require("../worker/worker_client").WorkerClient;
var CStyleFoldMode = require("./folding/cstyle").FoldMode; var CStyleFoldMode = require("./folding/cstyle").FoldMode;
var Mode = function() { var Mode = function() {
this.$tokenizer = new Tokenizer(new CssHighlightRules().getRules()); this.$tokenizer = new Tokenizer(new CssHighlightRules().getRules(), "i");
this.$outdent = new MatchingBraceOutdent(); this.$outdent = new MatchingBraceOutdent();
this.foldingRules = new CStyleFoldMode(); this.foldingRules = new CStyleFoldMode();
}; };

86
lib/ace/mode/css_highlight_rules.js
View file

@ -108,20 +108,6 @@ var CssHighlightRules = function() {
var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))"; var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
function ic(str) {
var re = [];
var chars = str.split("");
for (var i=0; i<chars.length; i++) {
re.push(
"[",
chars[i].toLowerCase(),
chars[i].toUpperCase(),
"]"
);
}
return re.join("");
}
var base_ruleset = [ var base_ruleset = [
{ {
token : "comment", // multi line comment token : "comment", // multi line comment
@ -136,61 +122,13 @@ var CssHighlightRules = function() {
regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']" regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
}, { }, {
token : "constant.numeric", token : "constant.numeric",
regex : numRe + ic("em") regex : numRe + "(?:em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)"
}, {
token : "constant.numeric",
regex : numRe + ic("ex")
}, {
token : "constant.numeric",
regex : numRe + ic("px")
}, {
token : "constant.numeric",
regex : numRe + ic("cm")
}, {
token : "constant.numeric",
regex : numRe + ic("mm")
}, {
token : "constant.numeric",
regex : numRe + ic("in")
}, {
token : "constant.numeric",
regex : numRe + ic("pt")
}, {
token : "constant.numeric",
regex : numRe + ic("pc")
}, {
token : "constant.numeric",
regex : numRe + ic("deg")
}, {
token : "constant.numeric",
regex : numRe + ic("rad")
}, {
token : "constant.numeric",
regex : numRe + ic("grad")
}, {
token : "constant.numeric",
regex : numRe + ic("ms")
}, {
token : "constant.numeric",
regex : numRe + ic("s")
}, {
token : "constant.numeric",
regex : numRe + ic("hz")
}, {
token : "constant.numeric",
regex : numRe + ic("khz")
}, {
token : "constant.numeric",
regex : numRe + "%"
}, {
token : "constant.numeric",
regex : numRe
}, { }, {
token : "constant.numeric", // hex6 color token : "constant.numeric", // hex6 color
regex : "#[a-fA-F0-9]{6}" regex : "#[a-f0-9]{6}"
}, { }, {
token : "constant.numeric", // hex3 color token : "constant.numeric", // hex3 color
regex : "#[a-fA-F0-9]{3}" regex : "#[a-f0-9]{3}"
}, { }, {
token : function(value) { token : function(value) {
if (properties.hasOwnProperty(value.toLowerCase())) { if (properties.hasOwnProperty(value.toLowerCase())) {
@ -266,20 +204,20 @@ var CssHighlightRules = function() {
next: "ruleset" next: "ruleset"
}, { }, {
token: "string", token: "string",
regex: "@media.*?{", regex: "@.*?{",
next: "media" next: "media"
},{ },{
token: "keyword", token: "keyword",
regex: "#[a-zA-Z0-9-_]+" regex: "#[a-z0-9-_]+"
},{ },{
token: "variable", token: "variable",
regex: "\\.[a-zA-Z0-9-_]+" regex: "\\.[a-z0-9-_]+"
},{ },{
token: "string", token: "string",
regex: ":[a-zA-Z0-9-_]+" regex: ":[a-z0-9-_]+"
},{ },{
token: "constant", token: "constant",
regex: "[a-zA-Z0-9-_]+" regex: "[a-z0-9-_]+"
}], }],
"media" : [ { "media" : [ {
@ -297,16 +235,16 @@ var CssHighlightRules = function() {
next: "start" next: "start"
},{ },{
token: "keyword", token: "keyword",
regex: "#[a-zA-Z0-9-_]+" regex: "#[a-z0-9-_]+"
},{ },{
token: "variable", token: "variable",
regex: "\\.[a-zA-Z0-9-_]+" regex: "\\.[a-z0-9-_]+"
},{ },{
token: "string", token: "string",
regex: ":[a-zA-Z0-9-_]+" regex: ":[a-z0-9-_]+"
},{ },{
token: "constant", token: "constant",
regex: "[a-zA-Z0-9-_]+" regex: "[a-z0-9-_]+"
}], }],
"comment" : comment, "comment" : comment,

30
lib/ace/mode/folding/cstyle.js
View file

@ -60,20 +60,23 @@ oop.inherits(FoldMode, BaseFoldMode);
var start = {row: row, column: i+1}; var start = {row: row, column: i+1};
var end = session.$findClosingBracket(match[1], start); var end = session.$findClosingBracket(match[1], start);
if (end) { if (!end)
var fw = session.foldWidgets[end.row]; return;
if (fw == null)
fw = this.getFoldWidget(session, end.row);
if (fw == "start"){ var fw = session.foldWidgets[end.row];
end.row--; if (fw == null)
end.column = session.getLine(end.row).length; fw = this.getFoldWidget(session, end.row);
}
if (fw == "start") {
end.row --;
end.column = session.getLine(end.row).length;
} }
return Range.fromPoints(start, end); return Range.fromPoints(start, end);
} }
if (foldStyle !== "markbeginend")
return;
var match = line.match(this.foldingStopMarker); var match = line.match(this.foldingStopMarker);
if (match) { if (match) {
var i = match.index + match[0].length; var i = match.index + match[0].length;
@ -84,10 +87,11 @@ oop.inherits(FoldMode, BaseFoldMode);
var end = {row: row, column: i}; var end = {row: row, column: i};
var start = session.$findOpeningBracket(match[1], end); var start = session.$findOpeningBracket(match[1], end);
if (start) { if (!start)
start.column++; return;
end.column--;
} start.column++;
end.column--;
return Range.fromPoints(start, end); return Range.fromPoints(start, end);
} }

55
lib/ace/mode/javascript_highlight_rules.js
View file

@ -205,10 +205,9 @@ var JavaScriptHighlightRules = function() {
regex : "\\/\\/.*$" regex : "\\/\\/.*$"
}, { }, {
token: "string.regexp", token: "string.regexp",
regex: "\\/(?:(?:\\[(?:\\\\]|[^\\]])+\\])" regex: "\\/",
+ "|(?:\\\\/|[^\\]/]))*" next: "regex",
+ "[/]\\w*", merge: true
next: "start"
}, { }, {
token : "text", token : "text",
regex : "\\s+" regex : "\\s+"
@ -220,6 +219,54 @@ var JavaScriptHighlightRules = function() {
next: "start" next: "start"
} }
], ],
"regex": [
{
token: "regexp.keyword.operator",
regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
next: "regex"
}, {
// flag
token: "string.regexp",
regex: "/\\w*",
next: "start",
merge: true
}, {
token: "string.regexp",
regex: "[^\\\\/\\[]+",
next: "regex",
merge: true
}, {
token: "string.regexp.charachterclass",
regex: "\\[",
next: "regex_character_class",
merge: true
}, {
token: "empty",
regex: "",
next: "start"
}
],
"regex_character_class": [
{
token: "regexp.keyword.operator",
regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
next: "regex_character_class"
}, {
token: "string.regexp.charachterclass",
regex: "]",
next: "regex",
merge: true
}, {
token: "string.regexp.charachterclass",
regex: "[^\\\\\\]]+",
next: "regex_character_class",
merge: true
}, {
token: "empty",
regex: "",
next: "start"
}
],
"comment_regex_allowed" : [ "comment_regex_allowed" : [
{ {
token : "comment", // closing comment token : "comment", // closing comment

2
lib/ace/mode/scss.js
View file

@ -45,7 +45,7 @@ var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutd
var CStyleFoldMode = require("./folding/cstyle").FoldMode; var CStyleFoldMode = require("./folding/cstyle").FoldMode;
var Mode = function() { var Mode = function() {
this.$tokenizer = new Tokenizer(new ScssHighlightRules().getRules()); this.$tokenizer = new Tokenizer(new ScssHighlightRules().getRules(), "i");
this.$outdent = new MatchingBraceOutdent(); this.$outdent = new MatchingBraceOutdent();
this.foldingRules = new CStyleFoldMode(); this.foldingRules = new CStyleFoldMode();
}; };

78
lib/ace/mode/scss_highlight_rules.js
View file

@ -171,21 +171,6 @@ var ScssHighlightRules = function() {
var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))"; var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
function ic(str) {
var re = [];
var chars = str.split("");
for (var i=0; i<chars.length; i++) {
re.push(
"[",
chars[i].toLowerCase(),
chars[i].toUpperCase(),
"]"
);
}
return re.join("");
}
// regexp must not have capturing parentheses. Use (?:) instead. // regexp must not have capturing parentheses. Use (?:) instead.
// regexps are ordered -> the first match is used // regexps are ordered -> the first match is used
@ -218,58 +203,13 @@ var ScssHighlightRules = function() {
next : "qstring" next : "qstring"
}, { }, {
token : "constant.numeric", token : "constant.numeric",
regex : numRe + ic("em") regex : numRe + "(?:em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)"
}, {
token : "constant.numeric",
regex : numRe + ic("ex")
}, {
token : "constant.numeric",
regex : numRe + ic("px")
}, {
token : "constant.numeric",
regex : numRe + ic("cm")
}, {
token : "constant.numeric",
regex : numRe + ic("mm")
}, {
token : "constant.numeric",
regex : numRe + ic("in")
}, {
token : "constant.numeric",
regex : numRe + ic("pt")
}, {
token : "constant.numeric",
regex : numRe + ic("pc")
}, {
token : "constant.numeric",
regex : numRe + ic("deg")
}, {
token : "constant.numeric",
regex : numRe + ic("rad")
}, {
token : "constant.numeric",
regex : numRe + ic("grad")
}, {
token : "constant.numeric",
regex : numRe + ic("ms")
}, {
token : "constant.numeric",
regex : numRe + ic("s")
}, {
token : "constant.numeric",
regex : numRe + ic("hz")
}, {
token : "constant.numeric",
regex : numRe + ic("khz")
}, {
token : "constant.numeric",
regex : numRe + "%"
}, { }, {
token : "constant.numeric", // hex6 color token : "constant.numeric", // hex6 color
regex : "#[a-fA-F0-9]{6}" regex : "#[a-f0-9]{6}"
}, { }, {
token : "constant.numeric", // hex3 color token : "constant.numeric", // hex3 color
regex : "#[a-fA-F0-9]{3}" regex : "#[a-f0-9]{3}"
}, { }, {
token : "constant.numeric", token : "constant.numeric",
regex : numRe regex : numRe
@ -290,22 +230,22 @@ var ScssHighlightRules = function() {
else else
return "text"; return "text";
}, },
regex : "\\-?[@a-zA-Z_][@a-zA-Z0-9_\\-]*" regex : "\\-?[@a-z_][@a-z0-9_\\-]*"
}, { }, {
token : "variable", token : "variable",
regex : "[a-zA-Z_\\-$][a-zA-Z0-9_\\-$]*\\b" regex : "[a-z_\\-$][a-z0-9_\\-$]*\\b"
}, { }, {
token: "variable.language", token: "variable.language",
regex: "#[a-zA-Z0-9-_]+" regex: "#[a-z0-9-_]+"
}, { }, {
token: "variable.language", token: "variable.language",
regex: "\\.[a-zA-Z0-9-_]+" regex: "\\.[a-z0-9-_]+"
}, { }, {
token: "variable.language", token: "variable.language",
regex: ":[a-zA-Z0-9-_]+" regex: ":[a-z0-9-_]+"
}, { }, {
token: "constant", token: "constant",
regex: "[a-zA-Z0-9-_]+" regex: "[a-z0-9-_]+"
}, { }, {
token : "keyword.operator", token : "keyword.operator",
regex : "<|>|<=|>=|==|!=|-|%|#|\\+|\\$|\\+|\\*" regex : "<|>|<=|>=|==|!=|-|%|#|\\+|\\$|\\+|\\*"

3
lib/ace/tokenizer.js
View file

@ -42,6 +42,7 @@ var Tokenizer = function(rules) {
this.regExps = {}; this.regExps = {};
this.matchMappings = {}; this.matchMappings = {};
var flag = flag ? "g" + flag : "g";
for ( var key in this.rules) { for ( var key in this.rules) {
var rule = this.rules[key]; var rule = this.rules[key];
var state = rule; var state = rule;
@ -68,7 +69,7 @@ var Tokenizer = function(rules) {
ruleRegExps.push(adjustedregex); ruleRegExps.push(adjustedregex);
} }
this.regExps[key] = new RegExp("(?:(" + ruleRegExps.join(")|(") + ")|(.))", "g"); this.regExps[key] = new RegExp("(?:(" + ruleRegExps.join(")|(") + ")|(.))", flag);
} }
}; };