From 05b875d359da1d83a798e722e563774862b890cf Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 15 Apr 2015 01:46:06 +0400 Subject: [PATCH] fix loading outline plugins --- package.json | 4 ++-- plugins/c9.ide.plugins/debug.js | 6 +++--- .../mock/c9.ide.example3/outline/{python => python.outline} | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename plugins/c9.ide.plugins/mock/c9.ide.example3/outline/{python => python.outline} (100%) diff --git a/package.json b/package.json index e3d43b1c..4de6ffed 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ }, "licenses": [], "c9plugins": { - "c9.ide.language": "#d6f468f4e0", + "c9.ide.language": "#3a8040d0c5", "c9.ide.language.css": "#ef8a28943e", "c9.ide.language.generic": "#8a3be4533a", "c9.ide.language.html": "#bbe81afed1", @@ -59,7 +59,7 @@ "c9.ide.language.javascript.eslint": "#8832423ad1", "c9.ide.language.javascript.tern": "#7aab8b0b6a", "c9.ide.language.javascript.infer": "#393d215e96", - "c9.ide.language.jsonalyzer": "#7261f47b26", + "c9.ide.language.jsonalyzer": "#a1057f20db", "c9.ide.collab": "#7b09419b5c", "c9.ide.local": "#cf624506cc", "c9.ide.find": "#4db399c1de", diff --git a/plugins/c9.ide.plugins/debug.js b/plugins/c9.ide.plugins/debug.js index 7457367c..92456944 100644 --- a/plugins/c9.ide.plugins/debug.js +++ b/plugins/c9.ide.plugins/debug.js @@ -262,6 +262,7 @@ define(function(require, exports, module) { function addStaticPlugin(type, pluginName, filename, data, plugin) { var services = architect.services; + var path = "plugins/" + pluginName + "/" + type + "/" + filename.replace(/\.js$/, ""); switch (type) { case "builders": data = util.safeParseJson(data, function() {}); @@ -285,17 +286,16 @@ define(function(require, exports, module) { }); services.ace.defineSyntax({ - name: join(pluginName, "modes", filename.replace(/\.js$/, "")), + name: join(pluginName, "modes", path), caption: mode.caption, extensions: (mode.extensions || "").trim() .replace(/\s*,\s*/g, "|") }); break; case "outline": - data = util.safeParseJson(data, function() {}); if (!data) return; - services.outline.addOutlinePlugin(filename, data, plugin); + services.outline.addOutlinePlugin(path, data, plugin); break; case "runners": data = util.safeParseJson(data, function() {}); diff --git a/plugins/c9.ide.plugins/mock/c9.ide.example3/outline/python b/plugins/c9.ide.plugins/mock/c9.ide.example3/outline/python.outline similarity index 100% rename from plugins/c9.ide.plugins/mock/c9.ide.example3/outline/python rename to plugins/c9.ide.plugins/mock/c9.ide.example3/outline/python.outline