From d7f57845b5ef82b7388f4674a6a049d625ccf10d Mon Sep 17 00:00:00 2001 From: Ilya Trapashko Date: Tue, 24 Feb 2026 12:04:03 +0300 Subject: [PATCH 1/5] Fix formatting after override keyword --- internal/format/rules.go | 1 + .../tests/gen/formattingOverride_test.go | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 internal/fourslash/tests/gen/formattingOverride_test.go diff --git a/internal/format/rules.go b/internal/format/rules.go index 2d80fea624c..f33ec523f95 100644 --- a/internal/format/rules.go +++ b/internal/format/rules.go @@ -216,6 +216,7 @@ func getAllRules() []ruleSpec { ast.KindInterfaceKeyword, ast.KindModuleKeyword, ast.KindNamespaceKeyword, + ast.OverrideKeyword, ast.KindPrivateKeyword, ast.KindPublicKeyword, ast.KindProtectedKeyword, diff --git a/internal/fourslash/tests/gen/formattingOverride_test.go b/internal/fourslash/tests/gen/formattingOverride_test.go new file mode 100644 index 00000000000..4f2dc3ce2ca --- /dev/null +++ b/internal/fourslash/tests/gen/formattingOverride_test.go @@ -0,0 +1,22 @@ +package fourslash_test + +import ( + "testing" + + "github.com/microsoft/typescript-go/internal/fourslash" + "github.com/microsoft/typescript-go/internal/testutil" +) + +func TestFormattingOverride(t *testing.T) { + fourslash.SkipIfFailing(t) + t.Parallel() + defer testutil.RecoverAndFail(t, "Panic on fourslash test") + const content = `class MyClass { + override myMethod() { };/*1*/ +}` + f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content) + defer done() + f.FormatDocument(t, "") + f.GoToMarker(t, "1") + f.VerifyCurrentLineContent(t, ` override myMethod() { };`) +} From 293813af27b56aef8b4715ee59301e8e4e7417ac Mon Sep 17 00:00:00 2001 From: Ilya Trapashko Date: Tue, 24 Feb 2026 12:08:10 +0300 Subject: [PATCH 2/5] Wrong kind --- internal/format/rules.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/format/rules.go b/internal/format/rules.go index f33ec523f95..343de805a1b 100644 --- a/internal/format/rules.go +++ b/internal/format/rules.go @@ -216,7 +216,7 @@ func getAllRules() []ruleSpec { ast.KindInterfaceKeyword, ast.KindModuleKeyword, ast.KindNamespaceKeyword, - ast.OverrideKeyword, + ast.KindOverrideKeyword, ast.KindPrivateKeyword, ast.KindPublicKeyword, ast.KindProtectedKeyword, From 3414b5bac6a94e4bd3a6e27f0eb5dc7728c4bb9f Mon Sep 17 00:00:00 2001 From: Ilya Trapashko Date: Tue, 24 Feb 2026 16:24:31 +0300 Subject: [PATCH 3/5] Delete test (should be autogenerated) --- .../tests/gen/formattingOverride_test.go | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 internal/fourslash/tests/gen/formattingOverride_test.go diff --git a/internal/fourslash/tests/gen/formattingOverride_test.go b/internal/fourslash/tests/gen/formattingOverride_test.go deleted file mode 100644 index 4f2dc3ce2ca..00000000000 --- a/internal/fourslash/tests/gen/formattingOverride_test.go +++ /dev/null @@ -1,22 +0,0 @@ -package fourslash_test - -import ( - "testing" - - "github.com/microsoft/typescript-go/internal/fourslash" - "github.com/microsoft/typescript-go/internal/testutil" -) - -func TestFormattingOverride(t *testing.T) { - fourslash.SkipIfFailing(t) - t.Parallel() - defer testutil.RecoverAndFail(t, "Panic on fourslash test") - const content = `class MyClass { - override myMethod() { };/*1*/ -}` - f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content) - defer done() - f.FormatDocument(t, "") - f.GoToMarker(t, "1") - f.VerifyCurrentLineContent(t, ` override myMethod() { };`) -} From 0b2d69217a73b1ec10615b9e1b8ee78c1a70e688 Mon Sep 17 00:00:00 2001 From: Ilya Trapashko Date: Tue, 24 Feb 2026 16:55:35 +0300 Subject: [PATCH 4/5] Add manual test --- internal/fourslash/_scripts/manualTests.txt | 1 + .../manual/formattingOverrideKeyword_test.go | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 internal/fourslash/tests/manual/formattingOverrideKeyword_test.go diff --git a/internal/fourslash/_scripts/manualTests.txt b/internal/fourslash/_scripts/manualTests.txt index ffc7df9c2ff..b787c383104 100644 --- a/internal/fourslash/_scripts/manualTests.txt +++ b/internal/fourslash/_scripts/manualTests.txt @@ -49,6 +49,7 @@ exhaustiveCaseCompletions7 exhaustiveCaseCompletions8 formatOnEnterInComment formattingFatArrowFunctions +formattingOverrideKeyword getOutliningSpans importNameCodeFix_uriStyleNodeCoreModules1 importNameCodeFixDefaultExport7 diff --git a/internal/fourslash/tests/manual/formattingOverrideKeyword_test.go b/internal/fourslash/tests/manual/formattingOverrideKeyword_test.go new file mode 100644 index 00000000000..b50d1943a14 --- /dev/null +++ b/internal/fourslash/tests/manual/formattingOverrideKeyword_test.go @@ -0,0 +1,21 @@ +package fourslash_test + +import ( + "testing" + + "github.com/microsoft/typescript-go/internal/fourslash" + "github.com/microsoft/typescript-go/internal/testutil" +) + +func TestFormattingOverrideKeyword(t *testing.T) { + t.Parallel() + defer testutil.RecoverAndFail(t, "Panic on fourslash test") + const content = `class MyClass { + override myMethod() { };/*1*/ +}` + f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content) + defer done() + f.FormatDocument(t, "") + f.GoToMarker(t, "1") + f.VerifyCurrentLineContent(t, ` override myMethod() { };`) +} From 07e07630c19e4fd327c7b95c8d17ff38d469188f Mon Sep 17 00:00:00 2001 From: Ilya Trapashko Date: Tue, 24 Feb 2026 17:19:45 +0300 Subject: [PATCH 5/5] Move test to fourslash/tests --- internal/fourslash/_scripts/manualTests.txt | 1 - .../tests/{manual => }/formattingOverrideKeyword_test.go | 0 2 files changed, 1 deletion(-) rename internal/fourslash/tests/{manual => }/formattingOverrideKeyword_test.go (100%) diff --git a/internal/fourslash/_scripts/manualTests.txt b/internal/fourslash/_scripts/manualTests.txt index b787c383104..ffc7df9c2ff 100644 --- a/internal/fourslash/_scripts/manualTests.txt +++ b/internal/fourslash/_scripts/manualTests.txt @@ -49,7 +49,6 @@ exhaustiveCaseCompletions7 exhaustiveCaseCompletions8 formatOnEnterInComment formattingFatArrowFunctions -formattingOverrideKeyword getOutliningSpans importNameCodeFix_uriStyleNodeCoreModules1 importNameCodeFixDefaultExport7 diff --git a/internal/fourslash/tests/manual/formattingOverrideKeyword_test.go b/internal/fourslash/tests/formattingOverrideKeyword_test.go similarity index 100% rename from internal/fourslash/tests/manual/formattingOverrideKeyword_test.go rename to internal/fourslash/tests/formattingOverrideKeyword_test.go