Misc LSP server / fourslash testing improvements

cmd/tsgo/lsp.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"os"
@@ -14,7 +15,7 @@ import (
 	"github.com/microsoft/typescript-go/internal/vfs/osvfs"
 )
 
-func runLSP(args []string) int {
+func runLSP(ctx context.Context, args []string) int {
 	flag := flag.NewFlagSet("lsp", flag.ContinueOnError)
 	stdio := flag.Bool("stdio", false, "use stdio for communication")
 	pprofDir := flag.String("pprofDir", "", "Generate pprof CPU/memory profiles to the given directory.")
@@ -51,7 +52,7 @@ func runLSP(args []string) int {
 		TypingsLocation:    typingsLocation,
 	})
 
-	if err := s.Run(); err != nil {
+	if err := s.Run(ctx); err != nil {
 		return 1
 	}
 	return 0

cmd/tsgo/main.go

@@ -1,7 +1,10 @@
 package main
 
 import (
+	"context"
 	"os"
+	"os/signal"
+	"syscall"
 
 	"github.com/microsoft/typescript-go/internal/execute"
 )
@@ -11,11 +14,14 @@ func main() {
 }
 
 func runMain() int {
+	ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
+	defer cancel()
+
 	args := os.Args[1:]
 	if len(args) > 0 {
 		switch args[0] {
 		case "--lsp":
-			return runLSP(args[1:])
+			return runLSP(ctx, args[1:])
 		case "--api":
 			return runAPI(args[1:])
 		}

internal/fourslash/fourslash.go

@@ -1,6 +1,7 @@
 package fourslash
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"maps"
@@ -128,6 +129,7 @@ func NewFourslash(t *testing.T, capabilities *lsproto.ClientCapabilities, conten
 		// Just skip this for now.
 		t.Skip("bundled files are not embedded")
 	}
+
 	fileName := getBaseFileNameFromTest(t) + tspath.ExtensionTs
 	testfs := make(map[string]string)
 	scriptInfos := make(map[string]*scriptInfo)
@@ -147,11 +149,10 @@ func NewFourslash(t *testing.T, capabilities *lsproto.ClientCapabilities, conten
 	outputReader, outputWriter := newLSPPipe()
 	fs := bundled.WrapFS(vfstest.FromMap(testfs, true /*useCaseSensitiveFileNames*/))
 
-	var err strings.Builder
 	server := lsp.NewServer(&lsp.ServerOptions{
 		In:  inputReader,
 		Out: outputWriter,
-		Err: &err,
+		Err: t.Output(),
 
 		Cwd:                "/",
 		FS:                 fs,
@@ -160,14 +161,15 @@ func NewFourslash(t *testing.T, capabilities *lsproto.ClientCapabilities, conten
 		ParseCache: &parseCache,
 	})
 
+	lspCtx, lspCancel := context.WithCancel(t.Context())
+	lspErrChan := make(chan error, 1)
+
 	go func() {
 		defer func() {
 			outputWriter.Close()
 		}()
-		err := server.Run()
-		if err != nil {
-			t.Error("server error:", err)
-		}
+		lspErrChan <- server.Run(lspCtx)
+		t.Log("LSP server exited")
 	}()
 
 	converters := ls.NewConverters(lsproto.PositionEncodingKindUTF8, func(fileName string) *ls.LSPLineMap {
@@ -199,7 +201,13 @@ func NewFourslash(t *testing.T, capabilities *lsproto.ClientCapabilities, conten
 	f.activeFilename = f.testData.Files[0].fileName
 
 	t.Cleanup(func() {
+		lspCancel()
 		inputWriter.Close()
+
+		t.Log("Waiting for LSP server to exit")
+		if err := <-lspErrChan; err != nil && lspCtx.Err() == nil {
+			t.Errorf("LSP server exited with error: %v", err)
+		}
 		f.verifyBaselines(t)
 	})
 	return f

internal/fourslash/tests/gen/aliasMergingWithNamespace_test.go

@@ -9,7 +9,7 @@ import (
 
 func TestAliasMergingWithNamespace(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `namespace bar { }
 import bar = bar/**/;`

internal/fourslash/tests/gen/ambientShorthandGotoDefinition_test.go

@@ -9,7 +9,7 @@ import (
 
 func TestAmbientShorthandGotoDefinition(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @Filename: declarations.d.ts
 declare module /*module*/"jquery"

internal/fourslash/tests/gen/argumentsAreAvailableAfterEditsAtEndOfFunction_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestArgumentsAreAvailableAfterEditsAtEndOfFunction(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `module Test1 {
 	class Person {

internal/fourslash/tests/gen/augmentedTypesClass1_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestAugmentedTypesClass1(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `class c5b { public foo() { } }
 module c5b { export var y = 2; } // should be ok

internal/fourslash/tests/gen/augmentedTypesClass3Fourslash_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestAugmentedTypesClass3Fourslash(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `class c/*1*/5b { public foo() { } }
 namespace c/*2*/5b { export var y = 2; } // should be ok

internal/fourslash/tests/gen/bestCommonTypeObjectLiterals1_test.go

@@ -9,7 +9,7 @@ import (
 
 func TestBestCommonTypeObjectLiterals1(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `var a = { name: 'bob', age: 18 };
 var b = { name: 'jim', age: 20 };

internal/fourslash/tests/gen/bestCommonTypeObjectLiterals_test.go

@@ -9,7 +9,7 @@ import (
 
 func TestBestCommonTypeObjectLiterals(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `var a = { name: 'bob', age: 18 };
 var b = { name: 'jim', age: 20 };

internal/fourslash/tests/gen/codeCompletionEscaping_test.go

@@ -12,7 +12,7 @@ import (
 
 func TestCodeCompletionEscaping(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @Filename: a.js
 // @allowJs: true

internal/fourslash/tests/gen/commentsEnumsFourslash_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestCommentsEnumsFourslash(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `/** Enum of colors*/
 enum /*1*/Colors {

internal/fourslash/tests/gen/commentsLinePreservation_test.go

@@ -9,7 +9,7 @@ import (
 
 func TestCommentsLinePreservation(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `/** This is firstLine
   * This is second Line

internal/fourslash/tests/gen/commentsUnion_test.go

@@ -9,7 +9,7 @@ import (
 
 func TestCommentsUnion(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `var a: Array<string> | Array<number>;
 a./*1*/length`

internal/fourslash/tests/gen/completionAfterQuestionDot_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestCompletionAfterQuestionDot(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @strict: true
 class User {

internal/fourslash/tests/gen/completionAutoInsertQuestionDot_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestCompletionAutoInsertQuestionDot(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @strict: true
 interface User {

internal/fourslash/tests/gen/completionCloneQuestionToken_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestCompletionCloneQuestionToken(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @Filename: /file2.ts
 type TCallback<T = any> = (options: T) => any;

internal/fourslash/tests/gen/completionEntryForArgumentConstrainedToString_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestCompletionEntryForArgumentConstrainedToString(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `declare function test<P extends "a" | "b">(p: P): void;
 

internal/fourslash/tests/gen/completionEntryForArrayElementConstrainedToString2_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestCompletionEntryForArrayElementConstrainedToString2(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `declare function test<T extends 'a' | 'b'>(a: { foo: T[] }): void
 

internal/fourslash/tests/gen/completionEntryForArrayElementConstrainedToString_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestCompletionEntryForArrayElementConstrainedToString(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `declare function test<T extends 'a' | 'b'>(a: { foo: T[] }): void
 

internal/fourslash/tests/gen/completionEntryForClassMembers_StaticWhenBaseTypeIsNotResolved_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestCompletionEntryForClassMembers_StaticWhenBaseTypeIsNotResolved(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @Filename: /node_modules/@types/react/index.d.ts
 export = React;

internal/fourslash/tests/gen/completionEntryForUnionProperty2_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestCompletionEntryForUnionProperty2(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `interface One {
     commonProperty: string;

internal/fourslash/tests/gen/completionEntryForUnionProperty_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestCompletionEntryForUnionProperty(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `interface One {
     commonProperty: number;

internal/fourslash/tests/gen/completionForComputedStringProperties_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestCompletionForComputedStringProperties(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `const p2 = "p2";
 interface A {

internal/fourslash/tests/gen/completionForMetaProperty_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestCompletionForMetaProperty(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `import./*1*/;
 new./*2*/;

internal/fourslash/tests/gen/completionForStringLiteral4_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestCompletionForStringLiteral4(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @allowJs: true
 // @Filename: in.js

internal/fourslash/tests/gen/completionForStringLiteralExport_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestCompletionForStringLiteralExport(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @typeRoots: my_typings
 // @Filename: test.ts

internal/fourslash/tests/gen/completionForStringLiteralImport1_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestCompletionForStringLiteralImport1(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @typeRoots: my_typings
 // @Filename: test.ts

internal/fourslash/tests/gen/completionForStringLiteralImport2_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestCompletionForStringLiteralImport2(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @typeRoots: my_typings
 // @Filename: test.ts

internal/fourslash/tests/gen/completionForStringLiteralNonrelativeImport12_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestCompletionForStringLiteralNonrelativeImport12(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @Filename: tests/test0.ts
 import * as foo1 from "m/*import_as0*/

internal/fourslash/tests/gen/completionForStringLiteralNonrelativeImport14_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestCompletionForStringLiteralNonrelativeImport14(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @Filename: tsconfig.json
 {

internal/fourslash/tests/gen/completionForStringLiteralNonrelativeImport16_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestCompletionForStringLiteralNonrelativeImport16(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @Filename: tsconfig.json
 {

internal/fourslash/tests/gen/completionForStringLiteralNonrelativeImport17_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestCompletionForStringLiteralNonrelativeImport17(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @Filename: tsconfig.json
 {

internal/fourslash/tests/gen/completionForStringLiteralNonrelativeImport18_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestCompletionForStringLiteralNonrelativeImport18(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @Filename: tsconfig.json
 {