Fix#48281 - Indentation not respected when executing various refactorings (TypeScript/JavaScript) (#48340)

* fix(48281) - Preserve indentation when adding missing properties

* fix(48281) - Fix object literal indentation like block

* fix(48281) - Indentation for object literal started with curly brace similar to block

Author: Minh Quy

src/services/codefixes/fixAddMissingMember.ts

@@ -171,15 +171,16 @@ namespace ts.codefix {
 
             const properties = arrayFrom(checker.getUnmatchedProperties(checker.getTypeAtLocation(parent), checker.getTypeAtLocation(param), /* requireOptionalProperties */ false, /* matchDiscriminantProperties */ false));
             if (!length(properties)) return undefined;
-            return { kind: InfoKind.ObjectLiteral, token: param.name, properties, indentation: 0, parentDeclaration: parent };
+            return { kind: InfoKind.ObjectLiteral, token: param.name, properties, parentDeclaration: parent };
         }
 
         if (!isMemberName(token)) return undefined;
 
         if (isIdentifier(token) && hasInitializer(parent) && parent.initializer && isObjectLiteralExpression(parent.initializer)) {
             const properties = arrayFrom(checker.getUnmatchedProperties(checker.getTypeAtLocation(parent.initializer), checker.getTypeAtLocation(token), /* requireOptionalProperties */ false, /* matchDiscriminantProperties */ false));
             if (!length(properties)) return undefined;
-            return { kind: InfoKind.ObjectLiteral, token, properties, indentation: undefined, parentDeclaration: parent.initializer };
+
+            return { kind: InfoKind.ObjectLiteral, token, properties, parentDeclaration: parent.initializer };
         }
 
         if (isIdentifier(token) && isJsxOpeningLikeElement(token.parent)) {
@@ -235,6 +236,7 @@ namespace ts.codefix {
         if (enumDeclaration && !isPrivateIdentifier(token) && !isSourceFileFromLibrary(program, enumDeclaration.getSourceFile())) {
             return { kind: InfoKind.Enum, token, parentDeclaration: enumDeclaration };
         }
+
         return undefined;
     }
 

src/services/formatting/smartIndenter.ts

@@ -55,7 +55,28 @@ namespace ts.formatting {
             // indentation is first non-whitespace character in a previous line
             // for block indentation, we should look for a line which contains something that's not
             // whitespace.
-            if (options.indentStyle === IndentStyle.Block) {
+            const currentToken = getTokenAtPosition(sourceFile, position);
+            // for object literal, we want to the indentation work like block
+            // if { starts in any position (can be in the middle of line)
+            // the following indentation should treat { as starting of that line (including leading whitespace)
+            // ```
+            //     const a: { x: undefined, y: undefined } = {}       // leading 4 whitespaces and { starts in the middle of line
+            // ->
+            //     const a: { x: undefined, y: undefined } = {
+            //         x: undefined,
+            //         y: undefined,
+            //     }
+            // ---------------------
+            //     const a: {x : undefined, y: undefined } =
+            //      {}
+            // ->
+            //     const a: { x: undefined, y: undefined } =
+            //      {                                                  // leading 5 whitespaces and { starts at 6 column
+            //          x: undefined,
+            //          y: undefined,
+            //      }
+            // ```
+            if (options.indentStyle === IndentStyle.Block || currentToken.kind === SyntaxKind.OpenBraceToken) {
                 return getBlockIndent(sourceFile, position, options);
             }
 

src/services/textChanges.ts

@@ -116,10 +116,6 @@ namespace ts.textChanges {
          * Text of inserted node will be formatted with this delta, otherwise delta will be inferred from the new node kind
          */
         delta?: number;
-        /**
-         * Do not trim leading white spaces in the edit range
-         */
-        preserveLeadingWhitespace?: boolean;
     }
 
     export interface ReplaceWithMultipleNodesOptions extends InsertNodeOptions {
@@ -492,7 +488,7 @@ namespace ts.textChanges {
             }
             const startPosition = getPrecedingNonSpaceCharacterPosition(sourceFile.text, fnStart - 1);
             const indent = sourceFile.text.slice(startPosition, fnStart);
-            this.insertNodeAt(sourceFile, fnStart, tag, { preserveLeadingWhitespace: false, suffix: this.newLineCharacter + indent });
+            this.insertNodeAt(sourceFile, fnStart, tag, { suffix: this.newLineCharacter + indent });
         }
 
         private createJSDocText(sourceFile: SourceFile, node: HasJSDoc) {
@@ -1068,7 +1064,7 @@ namespace ts.textChanges {
                 ? change.nodes.map(n => removeSuffix(format(n), newLineCharacter)).join(change.options?.joiner || newLineCharacter)
                 : format(change.node);
             // strip initial indentation (spaces or tabs) if text will be inserted in the middle of the line
-            const noIndent = (options.preserveLeadingWhitespace || options.indentation !== undefined || getLineStartPositionForPosition(pos, sourceFile) === pos) ? text : text.replace(/^\s+/, "");
+            const noIndent = (options.indentation !== undefined || getLineStartPositionForPosition(pos, sourceFile) === pos) ? text : text.replace(/^\s+/, "");
             return (options.prefix || "") + noIndent
                  + ((!options.suffix || endsWith(noIndent, options.suffix))
                     ? "" : options.suffix);

tests/cases/fourslash/codeFixAddMissingProperties_PreserveIndent.ts

@@ -0,0 +1,50 @@
+/// <reference path='fourslash.ts' />
+
+////interface Test {
+////    foo: string;
+////    bar(a: string): void;
+////}
+////function f (_spec: any) {}
+////function g (_spec: Test) {}
+////[|f(() => {
+////    g({});
+////    g(
+////    {});
+////    g(
+////      {}
+////    );
+////});|]
+
+verify.codeFixAll({
+    fixId: "fixMissingProperties",
+    fixAllDescription: ts.Diagnostics.Add_all_missing_properties.message,
+    newFileContent: `interface Test {
+    foo: string;
+    bar(a: string): void;
+}
+function f (_spec: any) {}
+function g (_spec: Test) {}
+f(() => {
+    g({
+        foo: "",
+        bar: function(a: string): void {
+            throw new Error("Function not implemented.");
+        }
+    });
+    g(
+    {
+        foo: "",
+        bar: function(a: string): void {
+            throw new Error("Function not implemented.");
+        }
+    });
+    g(
+      {
+          foo: "",
+          bar: function(a: string): void {
+              throw new Error("Function not implemented.");
+          }
+      }
+    );
+});`,
+});