From cf52482b8b2054e16f6aef61dc3784c6b4c34216 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 1 Mar 2016 08:43:54 +0000 Subject: [PATCH 1/2] Revert "disable codeintel until shared space is deployed" This reverts commit ad924b7cab25b3d2858fec0c5b4d3d4dc30555fb. --- configs/client-default.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/client-default.js b/configs/client-default.js index f83b1026..8a6c8c25 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -320,7 +320,7 @@ module.exports = function(options) { "plugins/c9.ide.language.generic/generic", "plugins/c9.ide.language.css/css", "plugins/c9.ide.language.html/html", - // "plugins/c9.ide.language.codeintel/codeintel", + "plugins/c9.ide.language.codeintel/codeintel", "plugins/c9.ide.language.javascript/javascript", "plugins/c9.ide.language.javascript.immediate/immediate", "plugins/c9.ide.language.javascript.infer/jsinfer", From 22c2cd0b63fb845a729c29ab3a31ebf127260929 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Fri, 4 Mar 2016 10:53:00 +0000 Subject: [PATCH 2/2] Enable codeintel only when not on Windows --- configs/client-default.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/client-default.js b/configs/client-default.js index 8a6c8c25..7ad72e12 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -320,7 +320,6 @@ module.exports = function(options) { "plugins/c9.ide.language.generic/generic", "plugins/c9.ide.language.css/css", "plugins/c9.ide.language.html/html", - "plugins/c9.ide.language.codeintel/codeintel", "plugins/c9.ide.language.javascript/javascript", "plugins/c9.ide.language.javascript.immediate/immediate", "plugins/c9.ide.language.javascript.infer/jsinfer", @@ -899,6 +898,9 @@ module.exports = function(options) { staticPrefix: staticPrefix + "/plugins/c9.ide.collab/chat" }); } + + if (options.platform !== "win32") + plugins.push("plugins/c9.ide.language.codeintel/codeintel"); return plugins; };