- Support non-identifier keys

- Move main logic onto tryGetGlobalSymbols function

Author: tiagovtristao

src/services/completions.ts

@@ -153,11 +153,6 @@ namespace ts.Completions {
             return stringCompletions;
         }
 
-        const objectTypeLiteralCompletions = getObjectTypeLiteralInTypeArgumentCompletions(sourceFile, position, contextToken, typeChecker, compilerOptions, log, preferences);
-        if (objectTypeLiteralCompletions) {
-            return objectTypeLiteralCompletions;
-        }
-
         if (contextToken && isBreakOrContinueStatement(contextToken.parent)
             && (contextToken.kind === SyntaxKind.BreakKeyword || contextToken.kind === SyntaxKind.ContinueKeyword || contextToken.kind === SyntaxKind.Identifier)) {
             return getLabelCompletionAtPosition(contextToken.parent);
@@ -988,53 +983,6 @@ namespace ts.Completions {
         return !!symbol.declarations?.some(d => d.kind === SyntaxKind.SourceFile);
     }
 
-    function getObjectTypeLiteralInTypeArgumentCompletions(sourceFile: SourceFile, position: number, contextToken: Node | undefined, checker: TypeChecker, options: CompilerOptions, log: Log, preferences: UserPreferences): CompletionInfo | undefined{
-        if (!contextToken) return undefined;
-
-        const typeLiteralNode = tryGetTypeLiteralNode(contextToken);
-        if (!typeLiteralNode) return undefined;
-
-        const intersectionTypeNode = isIntersectionTypeNode(typeLiteralNode.parent) ? typeLiteralNode.parent : undefined;
-        const containerTypeNode = intersectionTypeNode || typeLiteralNode;
-
-        const containerExpectedType = tryGetTypeArgumentSubType(containerTypeNode, checker);
-        if (!containerExpectedType) return undefined;
-
-        const containerActualType = checker.getTypeFromTypeNode(containerTypeNode);
-
-        const members = getPropertiesForCompletion(containerExpectedType, checker);
-        const existingMembers = getPropertiesForCompletion(containerActualType, checker);
-
-        const existingMemberEscapedNames: Set<__String> = new Set();
-        forEach(existingMembers, s => existingMemberEscapedNames.add(s.escapedName));
-
-        const missingMembers = filter(members, s => !existingMemberEscapedNames.has(s.escapedName));
-
-        const location = getTouchingToken(sourceFile, position);
-
-        const entries: CompletionEntry[] = [];
-        getCompletionEntriesFromSymbols(
-            missingMembers,
-            entries,
-            /* contextToken */ undefined,
-            location,
-            sourceFile,
-            checker,
-            options.target!,
-            log,
-            CompletionKind.MemberLike,
-            preferences,
-            options
-        );
-
-        return {
-            isGlobalCompletion: false,
-            isMemberCompletion: true,
-            isNewIdentifierLocation: false,
-            entries
-        };
-    }
-
     function getCompletionData(
         program: Program,
         log: (message: string) => void,
@@ -1561,7 +1509,8 @@ namespace ts.Completions {
         }
 
         function tryGetGlobalSymbols(): boolean {
-            const result: GlobalsSearch = tryGetObjectLikeCompletionSymbols()
+            const result: GlobalsSearch = tryGetObjectTypeLiteralInTypeArgumentCompletionSymbols()
+                || tryGetObjectLikeCompletionSymbols()
                 || tryGetImportCompletionSymbols()
                 || tryGetImportOrExportClauseCompletionSymbols()
                 || tryGetLocalNamedExportCompletionSymbols()
@@ -1963,6 +1912,32 @@ namespace ts.Completions {
                 position === contextToken.end && (!!contextToken.isUnterminated || isRegularExpressionLiteral(contextToken)));
         }
 
+        function tryGetObjectTypeLiteralInTypeArgumentCompletionSymbols(): GlobalsSearch | undefined {
+            const typeLiteralNode = tryGetTypeLiteralNode(contextToken);
+            if (!typeLiteralNode) return GlobalsSearch.Continue;
+
+            const intersectionTypeNode = isIntersectionTypeNode(typeLiteralNode.parent) ? typeLiteralNode.parent : undefined;
+            const containerTypeNode = intersectionTypeNode || typeLiteralNode;
+
+            const containerExpectedType = getConstraintOfTypeArgumentProperty(containerTypeNode, typeChecker);
+            if (!containerExpectedType) return GlobalsSearch.Continue;
+
+            const containerActualType = typeChecker.getTypeFromTypeNode(containerTypeNode);
+
+            const members = getPropertiesForCompletion(containerExpectedType, typeChecker);
+            const existingMembers = getPropertiesForCompletion(containerActualType, typeChecker);
+
+            const existingMemberEscapedNames: Set<__String> = new Set();
+            existingMembers.forEach(s => existingMemberEscapedNames.add(s.escapedName));
+
+            symbols = filter(members, s => !existingMemberEscapedNames.has(s.escapedName));
+
+            completionKind = CompletionKind.ObjectPropertyDeclaration;
+            isNewIdentifierLocation = true;
+
+            return GlobalsSearch.Success;
+        }
+
         /**
          * Aggregates relevant symbols for completion in object literals and object binding patterns.
          * Relevant symbols are stored in the captured 'symbols' variable.
@@ -2910,6 +2885,8 @@ namespace ts.Completions {
     }
 
     function tryGetTypeLiteralNode(node: Node): TypeLiteralNode | undefined {
+        if (!node) return undefined;
+
         const parent = node.parent;
 
         switch (node.kind) {
@@ -2930,14 +2907,14 @@ namespace ts.Completions {
         return undefined;
     }
 
-    function tryGetTypeArgumentSubType(node: Node, checker: TypeChecker): Type | undefined {
+    function getConstraintOfTypeArgumentProperty(node: Node, checker: TypeChecker): Type | undefined {
         if (!node) return undefined;
 
         if (isTypeNode(node) && isTypeReferenceType(node.parent)) {
             return checker.getTypeArgumentConstraint(node);
         }
 
-        const t = tryGetTypeArgumentSubType(node.parent, checker);
+        const t = getConstraintOfTypeArgumentProperty(node.parent, checker);
         if (!t) return undefined;
 
         switch (node.kind) {

tests/cases/fourslash/completionListInTypeLiteralInTypeParameter1.ts

@@ -3,6 +3,11 @@
 ////interface Foo {
 ////    one: string;
 ////    two: number;
+////    333: symbol;
+////    '4four': boolean;
+////    '5 five': object;
+////    number: string;
+////    Object: number;
 ////}
 ////
 ////interface Bar<T extends Foo> {
@@ -11,4 +16,8 @@
 ////
 ////var foobar: Bar<{/**/
 
-verify.completions({ marker: "", exact: ["one", "two"] });
+verify.completions({
+    marker: "",
+    exact: ["one", "two", "\"333\"", "\"4four\"", "\"5 five\"", "number", "Object"],
+    isNewIdentifierLocation: true
+});

tests/cases/fourslash/completionListInTypeLiteralInTypeParameter2.ts

@@ -11,4 +11,4 @@
 ////
 ////var foobar: Bar<{ on/**/
 
-verify.completions({ marker: "", exact: ["one", "two"] });
+verify.completions({ marker: "", exact: ["one", "two"], isNewIdentifierLocation: true });

tests/cases/fourslash/completionListInTypeLiteralInTypeParameter3.ts

@@ -11,4 +11,4 @@
 ////
 ////var foobar: Bar<{ one: string, /**/
 
-verify.completions({ marker: "", exact: "two" });
+verify.completions({ marker: "", exact: "two", isNewIdentifierLocation: true });

tests/cases/fourslash/completionListInTypeLiteralInTypeParameter4.ts

@@ -11,4 +11,4 @@
 ////
 ////var foobar: Bar<{ one: string } & {/**/
 
-verify.completions({ marker: "", exact: "two" });
+verify.completions({ marker: "", exact: "two", isNewIdentifierLocation: true });

tests/cases/fourslash/completionListInTypeLiteralInTypeParameter5.ts

@@ -11,4 +11,4 @@
 ////
 ////var foobar: Bar<{ prop1: string } & {/**/
 
-verify.completions({ marker: "", exact: ["one", "two"] });
+verify.completions({ marker: "", exact: ["one", "two"], isNewIdentifierLocation: true });

tests/cases/fourslash/completionListInTypeLiteralInTypeParameter6.ts

@@ -11,4 +11,4 @@
 ////
 ////var foobar: Bar<{ one: string } | {/**/
 
-verify.completions({ marker: "", exact: ["one", "two"] });
+verify.completions({ marker: "", exact: ["one", "two"], isNewIdentifierLocation: true });

tests/cases/fourslash/completionListInTypeLiteralInTypeParameter7.ts

@@ -14,4 +14,4 @@
 ////var foobar: Bar<{
 ////    two: {/**/
 
-verify.completions({ marker: "", exact: "three" });
+verify.completions({ marker: "", exact: "three", isNewIdentifierLocation: true });

tests/cases/fourslash/completionListInTypeLiteralInTypeParameter8.ts

@@ -26,8 +26,8 @@
 ////}>;
 
 verify.completions(
-    { marker: "4", exact: "four" },
-    { marker: "0", exact: [] },
-    { marker: "1", exact: "one" },
+    { marker: "4", exact: "four", isNewIdentifierLocation: true },
+    { marker: "0", exact: [], isNewIdentifierLocation: true },
+    { marker: "1", exact: "one", isNewIdentifierLocation: true },
 );
 

tests/cases/fourslash/completionListInTypeLiteralInTypeParameter9.ts

@@ -21,5 +21,5 @@
 ////}>;
 
 verify.completions({ marker: "g", includes: ["Foo", "Bar", ...completion.globalTypes] });
-verify.completions({ marker: "4", exact: "four" });
+verify.completions({ marker: "4", exact: "four", isNewIdentifierLocation: true });