Permalink
Browse files

Revert "Merge commit '8e63aab7afe33a69dc66ba40c48f83a0319b6f2d' into …

…update-tern"

This reverts commit c6830b1, reversing
changes made to 9a92c54.
  • Loading branch information...
1 parent 00cb36d commit 073fd9c324f52cc78c6e23e345de08c1de4177a7 @mortalapeman committed May 1, 2014
Showing with 449 additions and 2,230 deletions.
  1. +1 −2 node_modules/tern/README.md
  2. +8 −25 node_modules/tern/bin/tern
  3. +0 −2 node_modules/tern/bin/test
  4. +1 −313 node_modules/tern/defs/browser.json
  5. +0 −596 node_modules/tern/defs/chai.json
  6. +3 −3 node_modules/tern/defs/ecma5.json
  7. +13 −50 node_modules/tern/defs/jquery.json
  8. +8 −68 node_modules/tern/doc/manual.html
  9. +8 −63 node_modules/tern/doc/src/manual.txt
  10. +10 −11 node_modules/tern/emacs/tern-auto-complete.el
  11. +102 −113 node_modules/tern/emacs/tern.el
  12. +0 −17 node_modules/tern/index.html
  13. +31 −45 node_modules/tern/lib/condense.js
  14. +39 −55 node_modules/tern/lib/def.js
  15. +19 −58 node_modules/tern/lib/infer.js
  16. +51 −133 node_modules/tern/lib/tern.js
  17. +46 −136 node_modules/tern/lib/typescript.js
  18. +3 −3 node_modules/tern/package.json
  19. +22 −53 node_modules/tern/plugin/angular.js
  20. +4 −6 node_modules/tern/plugin/component.js
  21. +1 −1 node_modules/tern/plugin/doc_comment.js
  22. +29 −59 node_modules/tern/plugin/node.js
  23. +10 −69 node_modules/tern/plugin/requirejs.js
  24. +0 −15 node_modules/tern/test/cases/angular_service.js
  25. +0 −4 node_modules/tern/test/cases/computedprop.js
  26. +0 −4 node_modules/tern/test/cases/contextcomplete.js
  27. +0 −3 node_modules/tern/test/cases/node_origin_paths.js
  28. +1 −11 node_modules/tern/test/cases/requirejs/main.js
  29. +0 −3 node_modules/tern/test/cases/requirejs/requireme.js
  30. +0 −3 node_modules/tern/test/cases/requirejs/subdir/zap.js
  31. +10 −49 node_modules/tern/test/condense.js
  32. +1 −1 node_modules/tern/test/condense/add_to_old.json
  33. +3 −7 node_modules/tern/test/condense/angular_simple.json
  34. +0 −1 node_modules/tern/test/condense/array.js
  35. +0 −20 node_modules/tern/test/condense/array.json
  36. +1 −1 node_modules/tern/test/condense/basic.json
  37. +1 −1 node_modules/tern/test/condense/double_ref.json
  38. +0 −2 node_modules/tern/test/condense/fn.js
  39. +0 −8 node_modules/tern/test/condense/fn.json
  40. +1 −1 node_modules/tern/test/condense/generic.json
  41. +1 −1 node_modules/tern/test/condense/ignore_newer.json
  42. +0 −1 node_modules/tern/test/condense/node_export_function_a.js
  43. +3 −3 node_modules/tern/test/condense/node_fn_export.json
  44. +0 −1 node_modules/tern/test/condense/node_other_module_type_ref.js
  45. +0 −16 node_modules/tern/test/condense/node_other_module_type_ref.json
  46. +0 −3 node_modules/tern/test/condense/node_require_private.js
  47. +0 −3 node_modules/tern/test/condense/node_require_private.json
  48. +3 −3 node_modules/tern/test/condense/node_simple.json
  49. +1 −1 node_modules/tern/test/condense/proto.json
  50. +0 −2 node_modules/tern/test/condense/recursive.js
  51. +0 −10 node_modules/tern/test/condense/recursive.json
  52. +3 −2 node_modules/tern/test/condense/ref_in_type.json
  53. +1 −1 node_modules/tern/test/condense/ref_to_old.json
  54. +0 −1 node_modules/tern/test/condense/requirejs_const.js
  55. +0 −14 node_modules/tern/test/condense/requirejs_const.json
  56. +0 −3 node_modules/tern/test/condense/requirejs_dep.js
  57. +0 −18 node_modules/tern/test/condense/requirejs_dep.json
  58. +0 −3 node_modules/tern/test/condense/requirejs_empty_deps.js
  59. +0 −14 node_modules/tern/test/condense/requirejs_empty_deps.json
  60. +0 −3 node_modules/tern/test/condense/requirejs_primitive.js
  61. +0 −8 node_modules/tern/test/condense/requirejs_primitive.json
  62. +0 −3 node_modules/tern/test/condense/requirejs_setup.js
  63. +0 −14 node_modules/tern/test/condense/requirejs_setup.json
  64. +0 −44 node_modules/tern/test/reload.js
  65. +10 −23 node_modules/tern/test/runcases.js
  66. +0 −20 node_modules/tern/test/timeout.js
@@ -7,7 +7,7 @@ integration of existing editors.
Thanks to a group of generous [crowd funders][2], Tern is open-source
software, under an MIT license.
-There are currently [Emacs][emacs], [Vim][vim], [Sublime Text][st], and [Light Table][lt]
+There are currently [Emacs][emacs], [Vim][vim], and [Sublime Text][st]
plugins available, and built-in support in [Brackets][brackets] and
[Edge Code][edge_code].
@@ -21,6 +21,5 @@ For further documentation, see the [project page][1] and the
[emacs]: http://ternjs.net/doc/manual.html#emacs
[vim]: https://github.com/marijnh/tern_for_vim
[st]: https://github.com/marijnh/tern_for_sublime
-[lt]: https://github.com/mortalapeman/LT-TernJS
[brackets]: http://brackets.io
[edge_code]: http://html.adobe.com/edge/code
@@ -15,12 +15,6 @@ var maxIdleTime = 6e4 * 5; // Shut down after five minutes of inactivity
var persistent = process.argv.indexOf("--persistent") > -1;
var verbose = process.argv.indexOf("--verbose") > -1;
var noPortFile = process.argv.indexOf("--no-port-file") > -1;
-var host = "127.0.0.1";
-var hostArg = process.argv.indexOf("--host");
-if (hostArg > -1) {
- host = process.argv[hostArg + 1];
- if (host == "null" || host == "any") host = null;
-}
var port = 0;
var portArg = process.argv.indexOf("--port");
if (portArg > -1) {
@@ -44,17 +38,11 @@ var defaultConfig = {
libs: [],
loadEagerly: false,
plugins: {},
- ecmaScript: true,
- dependencyBudget: tern.defaultOptions.dependencyBudget
+ ecmaScript: true
};
-var homeDir = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;
-if (homeDir && fs.existsSync(path.resolve(homeDir, ".tern-config"))) {
- defaultConfig = readProjectFile(path.resolve(homeDir, ".tern-config"));
- console.log("default", defaultConfig.libs);
-}
-function readProjectFile(fileName) {
- var data = JSON.parse(fs.readFileSync(fileName, "utf8"));
+function readProjectFile(dir) {
+ var data = JSON.parse(fs.readFileSync(path.resolve(dir, projectFileName), "utf8"));
for (var option in defaultConfig) if (!data.hasOwnProperty(option))
data[option] = defaultConfig[option];
return data;
@@ -91,12 +79,8 @@ function loadPlugins(projectDir, plugins) {
if (!val) continue;
var found = findFile(plugin + ".js", projectDir, path.resolve(distDir, "plugin"));
if (!found) {
- try {
- found = require.resolve("tern-" + plugin);
- } catch (e) {
- process.stderr.write("Failed to find plugin " + plugin + ".\n");
- continue;
- }
+ process.stderr.write("Failed to find plugin " + plugin + ".\n");
+ continue;
}
require(found);
options[path.basename(plugin)] = val;
@@ -113,7 +97,7 @@ function loadPlugins(projectDir, plugins) {
var projectDir = findProjectDir();
if (projectDir) {
- var config = readProjectFile(path.resolve(projectDir, projectFileName));
+ var config = readProjectFile(projectDir);
} else {
projectDir = process.cwd();
var config = defaultConfig;
@@ -134,8 +118,7 @@ function startServer(dir, config) {
defs: defs,
plugins: plugins,
debug: verbose,
- projectDir: dir,
- dependencyBudget: config.dependencyBudget
+ projectDir: dir
});
if (config.loadEagerly) config.loadEagerly.forEach(function(pat) {
@@ -174,7 +157,7 @@ var httpServer = require("http").createServer(function(req, resp) {
else respondSimple(resp, 400, "Missing query document");
}
});
-httpServer.listen(port, host, function() {
+httpServer.listen(port, "127.0.0.1", function() {
var port = httpServer.address().port;
if (!noPortFile) {
var portFile = path.resolve(projectDir, portFileName);
@@ -5,5 +5,3 @@ var filter = process.argv[2];
require("../test/runcases").runTests(filter);
require("../test/fragments").runTests(filter);
require("../test/condense").runTests(filter);
-require("../test/timeout").runTests(filter);
-require("../test/reload").runTests(filter);
Oops, something went wrong.

0 comments on commit 073fd9c

Please sign in to comment.