Fix incorrect formatting for comments inside multi-line argument lists and method chains

internal/format/comment_test.go

@@ -101,6 +101,72 @@ func TestCommentFormatting(t *testing.T) {
 		// Verify console.log is properly indented with tabs
 		assert.Check(t, contains(formatted, "\t\tconsole.log"), "console.log should be indented with two tabs")
 	})
+
+	t.Run("format comment inside multi-line argument list", func(t *testing.T) {
+		t.Parallel()
+		ctx := format.WithFormatCodeSettings(t.Context(), &format.FormatCodeSettings{
+			EditorSettings: format.EditorSettings{
+				TabSize:                4,
+				IndentSize:             4,
+				BaseIndentSize:         0,
+				NewLineCharacter:       "\n",
+				ConvertTabsToSpaces:    false, // Use tabs
+				IndentStyle:            format.IndentStyleSmart,
+				TrimTrailingWhitespace: true,
+			},
+			InsertSpaceBeforeTypeAnnotation: core.TSTrue,
+		}, "\n")
+
+		// Original code with proper indentation
+		originalText := "console.log(\n\t\"a\",\n\t// the second arg\n\t\"b\"\n);"
+
+		sourceFile := parser.ParseSourceFile(ast.SourceFileParseOptions{
+			FileName: "/test.ts",
+			Path:     "/test.ts",
+		}, originalText, core.ScriptKindTS)
+
+		// Apply formatting
+		edits := format.FormatDocument(ctx, sourceFile)
+		formatted := applyBulkEdits(originalText, edits)
+
+		// The comment should remain indented with a tab
+		assert.Check(t, contains(formatted, "\t// the second arg"), "comment should be indented with tab")
+		// The comment should not lose its indentation
+		assert.Check(t, !contains(formatted, "\n// the second arg"), "comment should not lose indentation")
+	})
+
+	t.Run("format comment in chained method calls", func(t *testing.T) {
+		t.Parallel()
+		ctx := format.WithFormatCodeSettings(t.Context(), &format.FormatCodeSettings{
+			EditorSettings: format.EditorSettings{
+				TabSize:                4,
+				IndentSize:             4,
+				BaseIndentSize:         0,
+				NewLineCharacter:       "\n",
+				ConvertTabsToSpaces:    false, // Use tabs
+				IndentStyle:            format.IndentStyleSmart,
+				TrimTrailingWhitespace: true,
+			},
+			InsertSpaceBeforeTypeAnnotation: core.TSTrue,
+		}, "\n")
+
+		// Original code with proper indentation
+		originalText := "foo\n\t.bar()\n\t// A second call\n\t.baz();"
+
+		sourceFile := parser.ParseSourceFile(ast.SourceFileParseOptions{
+			FileName: "/test.ts",
+			Path:     "/test.ts",
+		}, originalText, core.ScriptKindTS)
+
+		// Apply formatting
+		edits := format.FormatDocument(ctx, sourceFile)
+		formatted := applyBulkEdits(originalText, edits)
+
+		// The comment should remain indented
+		assert.Check(t, contains(formatted, "\t// A second call") || contains(formatted, "   // A second call"), "comment should be indented")
+		// The comment should not lose its indentation
+		assert.Check(t, !contains(formatted, "\n// A second call"), "comment should not lose indentation")
+	})
 }
 
 func contains(s, substr string) bool {

internal/format/span.go

@@ -1093,6 +1093,9 @@ func (i *dynamicIndenter) getIndentationForComment(kind ast.Kind, tokenIndentati
 	case ast.KindCloseBraceToken, ast.KindCloseBracketToken, ast.KindCloseParenToken:
 		return i.indentation + i.getDelta(container)
 	}
+	if tokenIndentation != -1 {
+		return tokenIndentation
+	}
 	return i.indentation
 }