diff --git a/configs/client-default.js b/configs/client-default.js index 60cb1598..cf5e4e8c 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -321,7 +321,45 @@ module.exports = function(options) { "plugins/c9.ide.language.javascript/javascript", "plugins/c9.ide.language.javascript.immediate/immediate", "plugins/c9.ide.language.javascript.infer/jsinfer", - "plugins/c9.ide.language.javascript.tern/tern", + { + packagePath: "plugins/c9.ide.language.javascript.tern/tern", + tern: { + plugins: { + // UNDONE: doesn't normally exist; should be added by config + // smartface: "plugins/smartface/loadInclude.js", + angular: "tern/plugin/angular", + commonjs: "tern/plugin/commonjs", + doc_comment: "tern/plugin/doc_comment", + es_modules: "tern/plugin/es_modules", + modules: "tern/plugin/modules", + node: "tern/plugin/node", + node_resolve: "tern/plugin/node_resolve", + requirejs: "tern/plugin/requirejs", + architect_resolver: "./architect_resolver_worker", + }, + defs: [{ + name: "ecma5", + enabled: true, + path: "lib/tern/defs/ecma5.json" + }, { + name: "jQuery", + enabled: true, + path: "lib/tern/defs/jquery.json" + }, { + name: "browser", + enabled: true, + path: "lib/tern/defs/browser.json" + }, { + name: "underscore", + enabled: false, + path: "lib/tern/defs/underscore.json" + }, { + name: "chai", + enabled: false, + path: "tern/defs/chai.json" + }] + } + }, "plugins/c9.ide.language.javascript.tern/ui", "plugins/c9.ide.language.javascript.tern/architect_resolver", "plugins/c9.ide.language.javascript.eslint/eslint", diff --git a/package.json b/package.json index 79ca32af..2f907c22 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "c9.ide.language.javascript": "#2b77bdb96a", "c9.ide.language.javascript.immediate": "#0535804ada", "c9.ide.language.javascript.eslint": "#3ec4557969", - "c9.ide.language.javascript.tern": "#abc7a61836", + "c9.ide.language.javascript.tern": "#9dbb4f1943", "c9.ide.language.javascript.infer": "#b15bdb1744", "c9.ide.language.jsonalyzer": "#45453961d9", "c9.ide.collab": "#30efed939e",