Fix(52604): Provide Object member completions without comma; insert a comma

src/services/completions.ts

@@ -54,6 +54,7 @@ import {
     Expression,
     ExpressionWithTypeArguments,
     factory,
+    FileTextChanges,
     filter,
     find,
     findAncestor,
@@ -293,6 +294,7 @@ import {
     Program,
     programContainsModules,
     PropertyAccessExpression,
+    PropertyAssignment,
     PropertyDeclaration,
     PropertyName,
     PropertySignature,
@@ -1346,7 +1348,7 @@ function createCompletionEntry(
         }
     }
 
-    if (origin?.kind === SymbolOriginInfoKind.TypeOnlyAlias) {
+    if ((origin?.kind === SymbolOriginInfoKind.TypeOnlyAlias) || (contextToken && contextToken.kind !== SyntaxKind.OpenBraceToken && completionKind === CompletionKind.ObjectPropertyDeclaration && preferences.includeCompletionsWithInsertText)) {
         hasAction = true;
     }
 
@@ -2464,6 +2466,29 @@ function getCompletionEntryCodeActionsAndSourceDisplay(
         return { codeActions: [codeAction], sourceDisplay: undefined };
     }
 
+    if (contextToken && isObjectLiteralExpression(contextToken.parent.parent) && previousToken?.kind !== SyntaxKind.ColonToken) {
+        let changes: FileTextChanges[];
+        if (getLineAndCharacterOfPosition(sourceFile, contextToken.getEnd()).line !== getLineAndCharacterOfPosition(sourceFile, position).line) {
+            changes = textChanges.ChangeTracker.with(
+                { host, formatContext, preferences },
+                tracker=>tracker.replacePropertyAssignment(sourceFile, contextToken.parent as PropertyAssignment ,contextToken.parent as PropertyAssignment));
+        }
+        else {
+            changes = textChanges.ChangeTracker.with(
+                { host, formatContext, preferences },
+                tracker=>tracker.replacePropertyAssignmentOnSameLine(sourceFile, contextToken.parent as PropertyAssignment ,contextToken.parent as PropertyAssignment));
+        }
+        if (changes) {
+            return {
+                sourceDisplay: undefined,
+                codeActions: [{
+                    changes,
+                    description: diagnosticToString([Diagnostics.Includes_imports_of_types_referenced_by_0, name]),
+                }],
+            };
+        }
+    }
+
     if (!origin || !(originIsExport(origin) || originIsResolvedExport(origin))) {
         return { codeActions: undefined, sourceDisplay: undefined };
     }
@@ -4500,6 +4525,10 @@ function tryGetObjectLikeCompletionContainer(contextToken: Node | undefined): Ob
             case SyntaxKind.Identifier:
                 return (contextToken as Identifier).text === "async" && isShorthandPropertyAssignment(contextToken.parent)
                     ? contextToken.parent.parent : undefined;
+            default:
+                if (parent.parent && isObjectLiteralExpression(parent.parent) && contextToken.kind !== SyntaxKind.ColonToken) {
+                    return parent.parent;
+                }
         }
     }
 

src/services/textChanges.ts

@@ -592,6 +592,11 @@ export class ChangeTracker {
         this.replaceNode(sourceFile, oldNode, newNode, { suffix });
     }
 
+    public replacePropertyAssignmentOnSameLine(sourceFile: SourceFile, oldNode: PropertyAssignment, newNode: PropertyAssignment): void {
+        const suffix = this.nextCommaToken(sourceFile, oldNode) ? "" : ",";
+        this.replaceNode(sourceFile, oldNode, newNode, { suffix });
+    }
+
     public insertNodeAt(sourceFile: SourceFile, pos: number, newNode: Node, options: InsertNodeOptions = {}): void {
         this.replaceRange(sourceFile, createRange(pos), newNode, options);
     }

tests/cases/fourslash/completionsObjectLiteralExpressions1.ts

@@ -0,0 +1,42 @@
+/// <reference path="fourslash.ts" />
+//// interface ColorPalette {
+////     primary?: string;
+////     secondary?: string;
+//// }
+
+//// let colors: ColorPalette = {
+////     primary: "red"
+////     /**/
+//// };
+
+verify.completions({
+    marker: "",
+    includes: [
+        {
+            name: "secondary",
+            sortText: completion.SortText.OptionalMember,
+            hasAction: true,
+        }],
+    preferences: {
+        allowIncompleteCompletions: true,
+        includeInsertTextCompletions: true,
+      },
+});
+
+verify.applyCodeActionFromCompletion("", {
+    name: "secondary",
+    description: `Includes imports of types referenced by 'secondary'`,
+    newFileContent:
+  `interface ColorPalette {
+    primary?: string;
+    secondary?: string;
+}
+let colors: ColorPalette = {
+    primary: "red",
+
+};`,
+    preferences: {
+      allowIncompleteCompletions: true,
+      includeInsertTextCompletions: true,
+    },
+  });

tests/cases/fourslash/completionsObjectLiteralExpressions2.ts

@@ -0,0 +1,47 @@
+/// <reference path="fourslash.ts" />
+//// interface ColorPalette {
+////   primary?: string;
+////   secondary?: string;
+//// }
+
+//// interface I {
+////  color: ColorPalette;
+//// }
+
+//// const a: I = {
+////   color: {primary: "red" /**/}
+//// }
+
+verify.completions({
+  marker: "",
+  includes: [
+      {
+          name: "secondary",
+          sortText: completion.SortText.OptionalMember,
+          hasAction: true,
+      }],
+  preferences: {
+      allowIncompleteCompletions: true,
+      includeInsertTextCompletions: true,
+  }
+});
+
+verify.applyCodeActionFromCompletion("", {
+  name: "secondary",
+  description: `Includes imports of types referenced by 'secondary'`,
+  newFileContent:
+`interface ColorPalette {
+  primary?: string;
+  secondary?: string;
+}
+interface I {
+ color: ColorPalette;
+}
+const a: I = {
+  color: {primary: "red", }
+}`,
+  preferences: {
+    allowIncompleteCompletions: true,
+    includeInsertTextCompletions: true,
+  },
+});