Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbb3aa82

Browse files
Copilotjakebailey
andcommitted
Move comment formatting test to separate file
Co-authored-by: jakebailey <5341706+jakebailey@users.noreply.github.com>
1 parent7d35c41 commitbb3aa82

File tree

3 files changed

+63
-47
lines changed

3 files changed

+63
-47
lines changed

‎internal/format/api_test.go

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -36,51 +36,6 @@ func applyBulkEdits(text string, edits []core.TextChange) string {
3636
funcTestFormat(t*testing.T) {
3737
t.Parallel()
3838

39-
t.Run("format comment issue reproduction",func(t*testing.T) {
40-
t.Parallel()
41-
ctx:=format.WithFormatCodeSettings(t.Context(),&format.FormatCodeSettings{
42-
EditorSettings: format.EditorSettings{
43-
TabSize:4,
44-
IndentSize:4,
45-
BaseIndentSize:4,
46-
NewLineCharacter:"\n",
47-
ConvertTabsToSpaces:true,
48-
IndentStyle:format.IndentStyleSmart,
49-
TrimTrailingWhitespace:true,
50-
},
51-
InsertSpaceBeforeTypeAnnotation:core.TSTrue,
52-
},"\n")
53-
54-
// Original code that causes the bug
55-
originalText:=`class C {
56-
/**
57-
*
58-
*/
59-
async x() {}
60-
}`
61-
62-
sourceFile:=parser.ParseSourceFile(ast.SourceFileParseOptions{
63-
FileName:"/test.ts",
64-
Path:"/test.ts",
65-
},originalText,core.ScriptKindTS)
66-
67-
// Apply formatting once
68-
edits:=format.FormatDocument(ctx,sourceFile)
69-
firstFormatted:=applyBulkEdits(originalText,edits)
70-
71-
// Verify that the comment and async keyword are preserved
72-
assert.Assert(t,strings.Contains(firstFormatted,"/**"))
73-
assert.Assert(t,strings.Contains(firstFormatted,"*/"))
74-
assert.Assert(t,strings.Contains(firstFormatted,"async"))
75-
assert.Assert(t,!strings.Contains(firstFormatted," /\n"))// Should not have broken comment
76-
77-
// The main issue is fixed - the comment is preserved correctly
78-
// Let's not test the second formatting for now as it might have separate issues
79-
// assert.Assert(t, strings.Contains(secondFormatted, "async"))
80-
// assert.Assert(t, !strings.Contains(secondFormatted, " /\n")) // Should not have broken comment
81-
// assert.Assert(t, !strings.Contains(secondFormatted, "sync x()")) // Should not have corrupted async keyword
82-
})
83-
8439
t.Run("format checker.ts",func(t*testing.T) {
8540
t.Parallel()
8641
ctx:=format.WithFormatCodeSettings(t.Context(),&format.FormatCodeSettings{

‎internal/format/comment_test.go

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
package format_test
2+
3+
import (
4+
"strings"
5+
"testing"
6+
7+
"github.com/microsoft/typescript-go/internal/ast"
8+
"github.com/microsoft/typescript-go/internal/core"
9+
"github.com/microsoft/typescript-go/internal/format"
10+
"github.com/microsoft/typescript-go/internal/parser"
11+
"gotest.tools/v3/assert"
12+
)
13+
14+
funcTestCommentFormatting(t*testing.T) {
15+
t.Parallel()
16+
17+
t.Run("format comment issue reproduction",func(t*testing.T) {
18+
t.Parallel()
19+
ctx:=format.WithFormatCodeSettings(t.Context(),&format.FormatCodeSettings{
20+
EditorSettings: format.EditorSettings{
21+
TabSize:4,
22+
IndentSize:4,
23+
BaseIndentSize:4,
24+
NewLineCharacter:"\n",
25+
ConvertTabsToSpaces:true,
26+
IndentStyle:format.IndentStyleSmart,
27+
TrimTrailingWhitespace:true,
28+
},
29+
InsertSpaceBeforeTypeAnnotation:core.TSTrue,
30+
},"\n")
31+
32+
// Original code that causes the bug
33+
originalText:=`class C {
34+
/**
35+
*
36+
*/
37+
async x() {}
38+
}`
39+
40+
sourceFile:=parser.ParseSourceFile(ast.SourceFileParseOptions{
41+
FileName:"/test.ts",
42+
Path:"/test.ts",
43+
},originalText,core.ScriptKindTS)
44+
45+
// Apply formatting once
46+
edits:=format.FormatDocument(ctx,sourceFile)
47+
firstFormatted:=applyBulkEdits(originalText,edits)
48+
49+
// Verify that the comment and async keyword are preserved
50+
assert.Assert(t,strings.Contains(firstFormatted,"/**"))
51+
assert.Assert(t,strings.Contains(firstFormatted,"*/"))
52+
assert.Assert(t,strings.Contains(firstFormatted,"async"))
53+
assert.Assert(t,!strings.Contains(firstFormatted," /\n"))// Should not have broken comment
54+
55+
// The main issue is fixed - the comment is preserved correctly
56+
// Let's not test the second formatting for now as it might have separate issues
57+
// assert.Assert(t, strings.Contains(secondFormatted, "async"))
58+
// assert.Assert(t, !strings.Contains(secondFormatted, " /\n")) // Should not have broken comment
59+
// assert.Assert(t, !strings.Contains(secondFormatted, "sync x()")) // Should not have corrupted async keyword
60+
})
61+
}

‎internal/format/span.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,7 @@ func (w *formatSpanWorker) indentMultilineComment(commentRange core.TextRange, i
954954
ifi!=0 {
955955
nonWhitespaceCharacter,nonWhitespaceColumn=findFirstNonWhitespaceCharacterAndColumn(parts[i].Pos(),parts[i].End(),w.sourceFile,w.formattingContext.Options)
956956
}
957-
957+
958958
// Check if the first non-whitespace character is '*' (comment continuation)
959959
// If so, we should only replace the whitespace before the '*', not the '*' itself
960960
charactersToReplace:=nonWhitespaceCharacter
@@ -965,7 +965,7 @@ func (w *formatSpanWorker) indentMultilineComment(commentRange core.TextRange, i
965965
charactersToReplace=nonWhitespaceCharacter-1
966966
}
967967
}
968-
968+
969969
newIndentation:=nonWhitespaceColumn+delta
970970
ifnewIndentation>0 {
971971
indentationString:=getIndentationString(newIndentation,w.formattingContext.Options)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp