Fix to issue 23326 for completions on new.target (microsoft#24342)

elizabethdinella · web-flow · commit b745ea059e9b · 2018-05-24T14:12:33.000-07:00
* Fix to issue 23326 for completions on new.target

* Fixed linting issues - whitespace in if statements

* Removed debug statement in test case and consolidated and cleaned up code in switch statement for completions

* Added support for import.meta completion
diff --git a/src/services/completions.ts b/src/services/completions.ts
@@ -895,6 +895,7 @@ namespace ts.Completions {
                         node = (parent as QualifiedName).left;
                         break;
                     case SyntaxKind.ImportType:
+                    case SyntaxKind.MetaProperty:
                         node = parent;
                         break;
                     default:
@@ -1061,6 +1062,12 @@ namespace ts.Completions {
                 }
             }
 
+            if (isMetaProperty(node) && (node.keywordToken === SyntaxKind.NewKeyword || node.keywordToken === SyntaxKind.ImportKeyword)) {
+                const completion = (node.keywordToken === SyntaxKind.NewKeyword) ? "target" : "meta";
+                symbols.push(typeChecker.createSymbol(SymbolFlags.Property, escapeLeadingUnderscores(completion)));
+                return;
+            }
+
             if (!isTypeLocation) {
                 addTypeProperties(typeChecker.getTypeAtLocation(node)!);
             }
diff --git a/tests/cases/fourslash/completionImportMeta.ts b/tests/cases/fourslash/completionImportMeta.ts
@@ -0,0 +1,6 @@
+/// <reference path='fourslash.ts' />
+
+////import./**/
+
+goTo.marker("");
+verify.completionListContains("meta");
diff --git a/tests/cases/fourslash/completionsNewTarget.ts b/tests/cases/fourslash/completionsNewTarget.ts
@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts' />
+
+////class C {
+////    constructor() {
+////        if (C === new./**/)
+////    }
+////}
+
+goTo.marker("");
+verify.completionListContains("target");

Original file line number	Diff line number	Diff line change
`@@ -895,6 +895,7 @@ namespace ts.Completions {`
`895`	`895`	`node = (parent as QualifiedName).left;`
`896`	`896`	`break;`
`897`	`897`	`case SyntaxKind.ImportType:`
	`898`	`+ case SyntaxKind.MetaProperty:`
`898`	`899`	`node = parent;`
`899`	`900`	`break;`
`900`	`901`	`default:`
`@@ -1061,6 +1062,12 @@ namespace ts.Completions {`
`1061`	`1062`	`}`
`1062`	`1063`	`}`
`1063`	`1064`
	`1065`	`+ if (isMetaProperty(node) && (node.keywordToken === SyntaxKind.NewKeyword \|\| node.keywordToken === SyntaxKind.ImportKeyword)) {`
	`1066`	`+ const completion = (node.keywordToken === SyntaxKind.NewKeyword) ? "target" : "meta";`
	`1067`	`+ symbols.push(typeChecker.createSymbol(SymbolFlags.Property, escapeLeadingUnderscores(completion)));`
	`1068`	`+ return;`
	`1069`	`+ }`
	`1070`	`+`
`1064`	`1071`	`if (!isTypeLocation) {`
`1065`	`1072`	`addTypeProperties(typeChecker.getTypeAtLocation(node)!);`
`1066`	`1073`	`}`