fix loading of modes from bundles

This commit is contained in:
nightwing 2015-04-18 01:12:13 +04:00
parent e69a78dd40
commit 0cf55559e2
2 changed files with 8 additions and 4 deletions

View File

@ -1223,8 +1223,11 @@ define(function(require, exports, module) {
tabs.getTabs().forEach(function(tab) {
if (tab.editorType == "ace") {
var c9Session = tab.document.getSession();
if (c9Session && c9Session.session)
detectSyntax(c9Session, tab.path);
if (c9Session && c9Session.session) {
var syntax = getSyntax(c9Session, tab.path);
if (syntax)
c9Session.setOption("syntax", syntax);
}
}
});
}, 50);
@ -1239,6 +1242,7 @@ define(function(require, exports, module) {
modes.byCaption[opts.caption] = opts;
modes.byName[name] = opts;
opts.order = opts.order || 0;
if (!opts.extensions)
opts.extensions = "";

View File

@ -327,10 +327,10 @@ define(function(require, exports, module) {
});
services.ace.defineSyntax({
name: join(pluginName, "modes", path),
name: path,
caption: mode.caption,
extensions: (mode.extensions || "").trim()
.replace(/\s*,\s*/g, "|")
.replace(/\s*,\s*/g, "|").replace(/(^|\|)\./g, "$1")
});
break;
case "outline":