microsoft · sheetalkamat · Jun 14, 2017 · May 24, 2017 · Jun 14, 2017 · Jun 6, 2017
diff --git a/Gulpfile.ts b/Gulpfile.ts
@@ -747,7 +747,7 @@ declare module "convert-source-map" {
     export function fromSource(source: string, largeSource?: boolean): SourceMapConverter;
 }
 
-gulp.task("browserify", "Runs browserify on run.js to produce a file suitable for running tests in the browser", [servicesFile], (done) => {
+gulp.task("browserify", "Runs browserify on run.js to produce a file suitable for running tests in the browser", [servicesFile, run], (done) => {
     const testProject = tsc.createProject("src/harness/tsconfig.json", getCompilerSettings({ outFile: "../../built/local/bundle.js" }, /*useBuiltCompiler*/ true));
     return testProject.src()
         .pipe(newer("built/local/bundle.js"))

diff --git a/Jakefile.js b/Jakefile.js
@@ -959,7 +959,7 @@ var nodeServerInFile = "tests/webTestServer.ts";
 compileFile(nodeServerOutFile, [nodeServerInFile], [builtLocalDirectory, tscFile], [], /*useBuiltCompiler:*/ true, { noOutFile: true, lib: "es6" });
 
 desc("Runs browserify on run.js to produce a file suitable for running tests in the browser");
-task("browserify", ["tests", builtLocalDirectory, nodeServerOutFile], function() {
+task("browserify", ["tests", run, builtLocalDirectory, nodeServerOutFile], function() {
     var cmd = 'browserify built/local/run.js -t ./scripts/browserify-optional -d -o built/local/bundle.js';
     exec(cmd);
 }, { async: true });

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -14590,12 +14590,31 @@ namespace ts {
                 ? (<PropertyAccessExpression>node).expression
                 : (<QualifiedName>node).left;
 
-            const type = checkExpression(left);
+            return isValidPropertyAccessWithType(node, left, propertyName, getWidenedType(checkExpression(left)));
+        }
+
+        function isValidPropertyAccessWithType(
+            node: PropertyAccessExpression | QualifiedName,
+            left: LeftHandSideExpression | QualifiedName,
+            propertyName: string,
+            type: Type): boolean {
+
             if (type !== unknownType && !isTypeAny(type)) {
-                const prop = getPropertyOfType(getWidenedType(type), propertyName);
+                const prop = getPropertyOfType(type, propertyName);
                 if (prop) {
                     return checkPropertyAccessibility(node, left, type, prop);
                 }
+
+                // In js files properties of unions are allowed in completion
+                if (isInJavaScriptFile(left) && (type.flags & TypeFlags.Union)) {
+                    for (const elementType of (<UnionType>type).types) {
+                        if (isValidPropertyAccessWithType(node, left, propertyName, elementType)) {
+                            return true;
+                        }
+                    }
+                }
+
+                return false;
             }
             return true;
         }

diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -814,8 +814,8 @@ namespace FourSlash {
 
             function filterByTextOrDocumentation(entry: ts.CompletionEntry) {
                 const details = that.getCompletionEntryDetails(entry.name);
-                const documentation = ts.displayPartsToString(details.documentation);
-                const text = ts.displayPartsToString(details.displayParts);
+                const documentation = details && ts.displayPartsToString(details.documentation);
+                const text = details && ts.displayPartsToString(details.displayParts);
 
                 // If any of the expected values are undefined, assume that users don't
                 // care about them.
@@ -852,6 +852,9 @@ namespace FourSlash {
                     if (expectedKind) {
                         error += "Expected kind: " + expectedKind + " to equal: " + filterCompletions[0].kind + ".";
                     }
+                    else {
+                        error += "kind: " + filterCompletions[0].kind + ".";
+                    }
                     if (replacementSpan) {
                         const spanText = filterCompletions[0].replacementSpan ? stringify(filterCompletions[0].replacementSpan) : undefined;
                         error += "Expected replacement span: " + stringify(replacementSpan) + " to equal: " + spanText + ".";

diff --git a/src/services/completions.ts b/src/services/completions.ts
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
@@ -82,7 +82,7 @@ namespace ts {
         else if (node.parent.kind === SyntaxKind.ExportAssignment) {
             return SemanticMeaning.All;
         }
-        else if (isInRightSideOfImport(node)) {
+        else if (isInRightSideOfInternalImportEqualsDeclaration(node)) {
             return getMeaningFromRightHandSideOfImportEquals(node);
         }
         else if (isDeclarationName(node)) {
@@ -118,7 +118,7 @@ namespace ts {
         return SemanticMeaning.Namespace;
     }
 
-    function isInRightSideOfImport(node: Node) {
+    export function isInRightSideOfInternalImportEqualsDeclaration(node: Node) {
         while (node.parent.kind === SyntaxKind.QualifiedName) {
             node = node.parent;
         }
@@ -745,7 +745,7 @@ namespace ts {
                 // NOTE: JsxText is a weird kind of node that can contain only whitespaces (since they are not counted as trivia).
                 // if this is the case - then we should assume that token in question is located in previous child.
                 if (position < child.end && (nodeHasTokens(child) || child.kind === SyntaxKind.JsxText)) {
-                    const start = (includeJsDoc && child.jsDoc ? child.jsDoc[0] : child).getStart(sourceFile);
+                    const start = child.getStart(sourceFile, includeJsDoc);
                     const lookInPreviousChild =
                         (start >= position) || // cursor in the leading trivia
                         (child.kind === SyntaxKind.JsxText && start === child.end); // whitespace only JsxText

diff --git a/tests/cases/fourslash/commentsInheritance.ts b/tests/cases/fourslash/commentsInheritance.ts
@@ -346,7 +346,7 @@ verify.quickInfos({
 });
 
 goTo.marker('16');
-verify.completionListContains("i1", "interface i1", "i1 is interface with properties");
+verify.not.completionListContains("i1", "interface i1", "i1 is interface with properties");
 verify.completionListContains("i1_i", "var i1_i: i1", "");
 verify.completionListContains("c1", "class c1", "");
 verify.completionListContains("c1_i", "var c1_i: c1", "");
@@ -603,9 +603,9 @@ verify.quickInfos({
 });
 
 goTo.marker('51');
-verify.completionListContains("i2", "interface i2", "");
+verify.not.completionListContains("i2", "interface i2", "");
 verify.completionListContains("i2_i", "var i2_i: i2", "");
-verify.completionListContains("i3", "interface i3", "");
+verify.not.completionListContains("i3", "interface i3", "");
 verify.completionListContains("i3_i", "var i3_i: i3", "");
 
 goTo.marker('51i');

diff --git a/tests/cases/fourslash/commentsInterface.ts b/tests/cases/fourslash/commentsInterface.ts
@@ -163,11 +163,11 @@ verify.currentParameterHelpArgumentDocCommentIs("");
 verify.quickInfoAt("33q", "(method) i2.nc_fnfoo(b: number): string");
 
 goTo.marker('34');
-verify.completionListContains("i1", "interface i1", "this is interface 1");
+verify.not.completionListContains("i1", "interface i1", "this is interface 1");
 verify.completionListContains("i1_i", "var i1_i: i1", "");
-verify.completionListContains("nc_i1", "interface nc_i1", "");
+verify.not.completionListContains("nc_i1", "interface nc_i1", "");
 verify.completionListContains("nc_i1_i", "var nc_i1_i: nc_i1", "");
-verify.completionListContains("i2", "interface i2", "this is interface 2 with memebers");
+verify.not.completionListContains("i2", "interface i2", "this is interface 2 with memebers");
 verify.completionListContains("i2_i", "var i2_i: i2", "");
 verify.completionListContains("i2_i_x", "var i2_i_x: number", "");
 verify.completionListContains("i2_i_foo", "var i2_i_foo: (b: number) => string", "");
@@ -194,7 +194,7 @@ verify.completionListContains("a", "(parameter) a: number", "i3_i a");
 
 verify.quickInfoAt("40q", "var i3_i: i3");
 goTo.marker('40');
-verify.completionListContains("i3", "interface i3", "");
+verify.not.completionListContains("i3", "interface i3", "");
 verify.completionListContains("i3_i", "var i3_i: i3", "");
 
 goTo.marker('41');

diff --git a/tests/cases/fourslash/commentsOverloads.ts b/tests/cases/fourslash/commentsOverloads.ts
@@ -295,13 +295,13 @@ verify.completionListContains('f3', 'function f3(a: number): number (+1 overload
 verify.completionListContains('f4', 'function f4(a: number): number (+1 overload)', 'this is signature 4 - with number parameter');
 
 goTo.marker('18');
-verify.completionListContains('i1', 'interface i1', '');
+verify.not.completionListContains('i1', 'interface i1', '');
 verify.completionListContains('i1_i', 'var i1_i: new i1(b: number) => any (+1 overload)', '');
-verify.completionListContains('i2', 'interface i2', '');
+verify.not.completionListContains('i2', 'interface i2', '');
 verify.completionListContains('i2_i', 'var i2_i: new i2(a: string) => any (+1 overload)', '');
-verify.completionListContains('i3', 'interface i3', '');
+verify.not.completionListContains('i3', 'interface i3', '');
 verify.completionListContains('i3_i', 'var i3_i: new i3(a: string) => any (+1 overload)', 'new 1');
-verify.completionListContains('i4', 'interface i4', '');
+verify.not.completionListContains('i4', 'interface i4', '');
 verify.completionListContains('i4_i', 'var i4_i: new i4(a: string) => any (+1 overload)', '');
 
 goTo.marker('19');

diff --git a/tests/cases/fourslash/completionListAfterFunction2.ts b/tests/cases/fourslash/completionListAfterFunction2.ts
@@ -9,5 +9,6 @@ goTo.marker("1");
 verify.not.completionListContains("a");
 
 goTo.marker("2");
+verify.not.completionListContains("b");
+edit.insert("typeof ");
 verify.completionListContains("b");
-
diff --git a/tests/cases/fourslash/completionListCladule.ts b/tests/cases/fourslash/completionListCladule.ts
@@ -8,7 +8,7 @@
 ////    export var x: number;
 ////}
 ////Foo/*c1*/; // should get "x", "prototype"
-////var s: Foo/*c2*/; // should get "x" and "prototype"
+////var s: Foo/*c2*/; // no types, in Foo, so shouldnt have anything
 ////var f = new Foo();
 ////f/*c3*/;
 
@@ -20,9 +20,7 @@ verify.completionListContains("staticMethod");
 
 goTo.marker("c2");
 edit.insert(".");
-verify.completionListContains("x");
-verify.completionListContains("staticMethod");
-verify.completionListContains("prototype");
+verify.completionListIsEmpty();
 
 goTo.marker("c3");
 edit.insert(".");

diff --git a/tests/cases/fourslash/completionListInClassExpressionWithTypeParameter.ts b/tests/cases/fourslash/completionListInClassExpressionWithTypeParameter.ts
@@ -1,13 +1,16 @@
-///<reference path="fourslash.ts" />
+///<reference path="fourslash.ts" />
 
 //// var x = class myClass <TypeParam> {
 ////    getClassName (){
 ////        /*0*/
+////        var tmp: /*0Type*/;
 ////    }
 ////    prop: Ty/*1*/
 //// }
 
 goTo.marker("0");
+verify.not.completionListContains("TypeParam", "(type parameter) TypeParam in myClass<TypeParam>", /*documentation*/ undefined, "type parameter");
+goTo.marker("0Type");
 verify.completionListContains("TypeParam", "(type parameter) TypeParam in myClass<TypeParam>", /*documentation*/ undefined, "type parameter");
 
 goTo.marker("1");

diff --git a/tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature01.ts b/tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature01.ts
@@ -14,5 +14,5 @@ verify.completionListContains("TString");
 verify.completionListContains("TNumber");
 
 // Ideally the following shouldn't show up since they're not types.
-verify.completionListContains("foo");
-verify.completionListContains("obj");
+verify.not.completionListContains("foo");
+verify.not.completionListContains("obj");
diff --git a/tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature02.ts b/tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature02.ts
@@ -14,5 +14,5 @@ verify.completionListContains("TString");
 verify.completionListContains("TNumber");  // REVIEW: Is this intended behavior?
 
 // Ideally the following shouldn't show up since they're not types.
-verify.completionListContains("foo");
-verify.completionListContains("obj");
+verify.not.completionListContains("foo");
+verify.not.completionListContains("obj");
diff --git a/tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature03.ts b/tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature03.ts
@@ -14,5 +14,5 @@ verify.completionListContains("TString");
 verify.completionListContains("TNumber");  // REVIEW: Is this intended behavior?
 
 // Ideally the following shouldn't show up since they're not types.
-verify.completionListContains("foo");
-verify.completionListContains("obj");
+verify.not.completionListContains("foo");
+verify.not.completionListContains("obj");
diff --git a/tests/cases/fourslash/completionListInExtendsClause.ts b/tests/cases/fourslash/completionListInExtendsClause.ts
@@ -27,4 +27,4 @@ goTo.marker("3");
 verify.completionListIsEmpty();
 
 goTo.marker("4");
-verify.not.completionListIsEmpty();
+verify.completionListIsEmpty();
diff --git a/tests/cases/fourslash/completionListInScope.ts b/tests/cases/fourslash/completionListInScope.ts
@@ -85,11 +85,11 @@ verify.completionListContains("exportedInterface");
 verify.completionListContains("localClass");
 verify.completionListContains("exportedClass");
 
-verify.completionListContains("localModule");
-verify.completionListContains("exportedModule");
+verify.not.completionListContains("localModule");
+verify.not.completionListContains("exportedModule");
 
 verify.completionListContains("exportedClass2");
-verify.completionListContains("exportedModule2");
+verify.not.completionListContains("exportedModule2");
 
 goTo.marker("insideMethod");
 verify.not.completionListContains("property");

diff --git a/tests/cases/fourslash/completionListInTypeParameterOfTypeAlias1.ts b/tests/cases/fourslash/completionListInTypeParameterOfTypeAlias1.ts
@@ -1,4 +1,4 @@
-/// <reference path='fourslash.ts'/>
+/// <reference path='fourslash.ts'/>
 
 ////type List1</*0*/
 ////type List2</*1*/T> = T[];
@@ -8,7 +8,7 @@
 goTo.marker("0");
 verify.completionListIsEmpty();
 goTo.marker("1");
-verify.not.completionListIsEmpty();
+verify.completionListIsEmpty();
 goTo.marker("2");
 verify.completionListContains("T");
 goTo.marker("3");

diff --git a/tests/cases/fourslash/completionListInTypeParameterOfTypeAlias2.ts b/tests/cases/fourslash/completionListInTypeParameterOfTypeAlias2.ts
@@ -1,4 +1,4 @@
-/// <reference path='fourslash.ts'/>
+/// <reference path='fourslash.ts'/>
 
 ////type Map1<K, /*0*/
 ////type Map1<K, /*1*/V> = [];
@@ -8,12 +8,12 @@
 goTo.marker("0");
 verify.completionListIsEmpty();
 goTo.marker("1");
-verify.completionListContains("V");
+verify.completionListIsEmpty();
 goTo.marker("2");
 verify.completionListContains("K");
 verify.completionListContains("V");
 goTo.marker("3");
 verify.not.completionListContains("K");
 verify.not.completionListContains("V");
-verify.completionListContains("K1");
-verify.completionListContains("V1");
+verify.not.completionListContains("K1");
+verify.not.completionListContains("V1");
diff --git a/tests/cases/fourslash/completionListInTypeParameterOfTypeAlias3.ts b/tests/cases/fourslash/completionListInTypeParameterOfTypeAlias3.ts
@@ -1,13 +1,13 @@
-/// <reference path='fourslash.ts'/>
+/// <reference path='fourslash.ts'/>
 
 //// type constructorType<T1, T2> = new <T/*1*/, /*2*/
 
 goTo.marker("1");
-verify.completionListContains("T");
-verify.completionListContains("T1");
-verify.completionListContains("T2");
+verify.not.completionListContains("T");
+verify.not.completionListContains("T1");
+verify.not.completionListContains("T2");
 
 goTo.marker("2");
-verify.completionListContains("T");
-verify.completionListContains("T1");
-verify.completionListContains("T2");
+verify.not.completionListContains("T");
+verify.not.completionListContains("T1");
+verify.not.completionListContains("T2");
diff --git a/tests/cases/fourslash/completionListInUnclosedIndexSignature02.ts b/tests/cases/fourslash/completionListInUnclosedIndexSignature02.ts
@@ -7,7 +7,7 @@
 
 goTo.marker("1");
 verify.completionListContains("C");
-verify.completionListContains("foo"); // ideally this shouldn't show up for a type
+verify.not.completionListContains("foo"); // ideally this shouldn't show up for a type
 edit.insert("typeof ");
 verify.completionListContains("C");
 verify.completionListContains("foo");
diff --git a/tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature01.ts b/tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature01.ts
@@ -14,5 +14,5 @@ verify.completionListContains("TString");
 verify.completionListContains("TNumber");
 
 // Ideally the following shouldn't show up since they're not types.
-verify.completionListContains("foo");
-verify.completionListContains("obj");
+verify.not.completionListContains("foo");
+verify.not.completionListContains("obj");
diff --git a/tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature02.ts b/tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature02.ts
@@ -14,5 +14,5 @@ verify.completionListContains("TString");
 verify.completionListContains("TNumber"); // REVIEW: Is this intended behavior?
 
 // Ideally the following shouldn't show up since they're not types.
-verify.completionListContains("foo");
-verify.completionListContains("obj");
+verify.not.completionListContains("foo");
+verify.not.completionListContains("obj");
diff --git a/tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature03.ts b/tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature03.ts
@@ -14,5 +14,5 @@ verify.completionListContains("TString");
 verify.completionListContains("TNumber"); // REVIEW: Is this intended behavior?
 
 // Ideally the following shouldn't show up since they're not types.
-verify.completionListContains("foo");
-verify.completionListContains("obj");
+verify.not.completionListContains("foo");
+verify.not.completionListContains("obj");