fix dockerfile mode

This commit is contained in:
Fabian Jakobs 2014-04-13 16:08:45 +00:00
commit 7767efe0f6
6 changed files with 65 additions and 11 deletions

View file

@ -63,6 +63,7 @@ var supportedModes = {
D: ["d|di"],
Dart: ["dart"],
Diff: ["diff|patch"],
Dockerfile: ["^Dockerfile"],
Dot: ["dot"],
Erlang: ["erl|hrl"],
EJS: ["ejs"],

View file

@ -33,11 +33,11 @@ define(function(require, exports, module) {
var oop = require("../lib/oop");
var ShMode = require("./sh").Mode;
var Dockerfile = require("./sh_highlight_rules").Dockerfile;
var DockerfileHighlightRules = require("./dockerfile_highlight_rules").DockerfileHighlightRules;
var CStyleFoldMode = require("./folding/cstyle").FoldMode;
var Mode = function() {
this.HighlightRules = Dockerfile;
this.HighlightRules = DockerfileHighlightRules;
this.foldingRules = new CStyleFoldMode();
};
oop.inherits(Mode, ShMode);

View file

@ -34,23 +34,24 @@ define(function(require, exports, module) {
var oop = require("../lib/oop");
var ShHighlightRules = require("./sh_highlight_rules").ShHighlightRules;
var SvgHighlightRules = function() {
var DockerfileHighlightRules = function() {
ShHighlightRules.call(this);
var startRules = this.$rules.start;
for (var i = 0; i < startRules.length; i++) {
if (startRules[i].token == "variable.language") {
startRules.splice(i, 0, {
token: "keyword",
regexp: "(?:FROM|MAINTAINER|RUN|CMD|EXPOSE|ENV|ADD|ENTRYPOINT|VOLUME|USER|WORKDIR|ONBUILD)",
token: "variable.language",
regex: "(?:^(?:FROM|MAINTAINER|RUN|CMD|EXPOSE|ENV|ADD|ENTRYPOINT|VOLUME|USER|WORKDIR|ONBUILD)\\b)",
caseInsensitive: true
});
break;
}
}
};
oop.inherits(SvgHighlightRules, ShHighlightRules);
oop.inherits(DockerfileHighlightRules, ShHighlightRules);
exports.SvgHighlightRules = SvgHighlightRules;
exports.DockerfileHighlightRules = DockerfileHighlightRules;
});

View file

@ -34,7 +34,6 @@ define(function(require, exports, module) {
var oop = require("../lib/oop");
var XmlMode = require("./xml").Mode;
var JavaScriptMode = require("./javascript").Mode;
var Tokenizer = require("../tokenizer").Tokenizer;
var SvgHighlightRules = require("./svg_highlight_rules").SvgHighlightRules;
var MixedFoldMode = require("./folding/mixed").FoldMode;
var XmlFoldMode = require("./folding/xml").FoldMode;

View file

@ -189,7 +189,7 @@ var TextHighlightRules = function() {
// skip included rules since they are already processed
//i += args.length - 3;
i--;
toInsert = null
toInsert = null;
}
if (rule.keywordMap) {
@ -199,7 +199,7 @@ var TextHighlightRules = function() {
delete rule.defaultToken;
}
}
};
}
Object.keys(rules).forEach(processState, this);
};
@ -223,7 +223,7 @@ var TextHighlightRules = function() {
return ignoreCase
? function(value) {return keywords[value.toLowerCase()] || defaultToken }
: function(value) {return keywords[value] || defaultToken };
}
};
this.getKeywords = function() {
return this.$keywords;