Add support for Union types, including completion

lib/comment.js

@@ -16,6 +16,7 @@
 
 var doctrine = require('doctrine');
 var File = require('./file'),
+    infer = require('./core').infer,
     Reason = File.Reason,
     Visibility = File.Visibility;
 
@@ -144,7 +145,7 @@ Comment.prototype.getExpressionAval =
           types.push(t);
         }
       }, this);
-      return typeManager.getUnionType(types);
+      return new infer.UnionType(types);
     case doctrine.Syntax.RestType:
       // TODO: Expose varargs #20.
       return this.getExpressionAval(

lib/typemanager.js

@@ -204,21 +204,6 @@ TypeManager.prototype.getInstanceType = function(
 };
 
 
-/**
- * Gets an AVal representing the union of the given AVals.
- * @param {!Array.<!infer.AVal>} types The types to unionize.
- * @return {!infer.AVal}
- */
-TypeManager.prototype.getUnionType = function(types) {
-  // TODO: Decide if this behaves better with a synthetic 'Union' type #18.
-  var aval = new infer.AVal();
-  for (var i = 0; i < types.length; i++) {
-    types[i].propagate(aval);
-  }
-  return aval;
-};
-
-
 /** @return {string} The name of the file currently being processed. */
 TypeManager.prototype.getCurrentOrigin = function() {
   return infer.cx().curOrigin;

package.json

@@ -29,7 +29,7 @@
     "closure"
   ],
   "scripts": {
-    "test": "node_modules/mocha/bin/mocha"
+    "test": "mocha"
   },
   "author": "Josh Giles <joshgiles@google.com>"
 }

test/cases/unimplemented.js

@@ -29,11 +29,11 @@ nonNullable;//: MyClass
 // Unions #18
 /** @type {(MyClass|YourClass)} */
 var union;
-union;//: YourClass
+union;//: (MyClass|YourClass)
 
 /** @type {(!MyClass|!YourClass|{prop:(Blah|Blam)})} */
 var nested;
-nested; //: YourClass
+nested; //: (MyClass|YourClass)
 
 // Optional parameters #19.
 /** @param {ParamType=} opt_param */

test/cases/union-types.js

@@ -0,0 +1,13 @@
+// Union Types
+// plugin=closure
+// plugin=doc_comment null
+
+/** @type {(number|string)} */
+var union;
+union; //: (number|string)
+
+
+// Observe that some completions are coming from the number type such as
+// Number.prototype.toExponential and others, such as charAt are coming
+// from String.prototype.
+union. //+ toString, toFixed, toExponential, charAt, charCodeAt, indexOf, ...

test/condense.js

@@ -0,0 +1,20 @@
+var filter = process.argv[2];
+var c = require("tern/test/condense-utils");
+var util = require("tern/test/util");
+var path = require("path");
+
+var closure = require('../closure');
+//Locate the Tern distribution installed with this repo and initialize the
+//tern-closure plugin.
+var ternDir = path.resolve(require.resolve('tern/lib/tern'), '../..');
+closure.initialize(ternDir);
+
+var closureCondenseConf = Object.create(c.condenseConf);
+closureCondenseConf.projectDir = path.resolve(__dirname, "..");
+
+exports.runTests = function(filter) {
+  function test(options) { c.testConf(closureCondenseConf, filter, options) };
+
+  test({load: ["union-types"], plugins: {closure: true}});
+
+}

test/condense/union-types.js

@@ -0,0 +1,8 @@
+// Union Types
+
+/** @type {(number|string)} */
+var varWithUnionAnnotation;
+union;
+
+var varPropagate = varWithUnionAnnotation;
+varPropagate;

test/condense/union-types.json

@@ -0,0 +1,8 @@
+{
+  "!name": "union-types.js",
+  "varPropagate": "varWithUnionAnnotation",
+  "varWithUnionAnnotation": {
+    "!span": "51[3:4]-73[3:26]",
+    "!type": "(number|string)"
+  }
+}

test/file_test.js

@@ -24,7 +24,7 @@ var chai = require('chai'),
     sinonChai = require('sinon-chai');
 chai.use(sinonChai);
 
-var File = require('lib/file'),
+var File = require('../lib/file'),
     Visibility = File.Visibility,
     Reason = File.Reason;
 

test/runcases.js

@@ -16,13 +16,16 @@ var path = require('path');
 var runcases = require('tern/test/runcases');
 var util = require('tern/test/util');
 var closure = require('../closure');
+var condense = require('./condense');
+
 // Locate the Tern distribution installed with this repo and initialize the
 // tern-closure plugin.
 var ternDir = path.resolve(require.resolve('tern/lib/tern'), '../..');
 closure.initialize(ternDir);
 
 var filter = process.argv[2];
 var caseDir = path.resolve(__dirname, 'cases');
+condense.runTests(filter);
 runcases.runTests(filter, caseDir);
 // Set non-zero exit code on failure.
 process.exit(util.hasFailed());

test/typemanager_test.js

@@ -24,11 +24,11 @@ var chai = require('chai'),
     sinonChai = require('sinon-chai');
 chai.use(sinonChai);
 
-require('lib/core').initializeForTesting();
+require('../lib/core').initializeForTesting();
 
 var infer = require('tern/lib/infer'),
-    TypeManager = require('lib/typemanager'),
-    File = require('lib/file'),
+    TypeManager = require('../lib/typemanager'),
+    File = require('../lib/file'),
     Visibility = File.Visibility,
     Reason = File.Reason,
     Server = require('tern/lib/tern').Server;