Fix race

Author: jakebailey

internal/fourslash/_scripts/failingTests.txt

@@ -1,8 +1,8 @@
 TestCompletionForStringLiteral
+TestCompletionForStringLiteralNonrelativeImport7
+TestCompletionForStringLiteralNonrelativeImportTypings2
 TestCompletionForStringLiteralNonrelativeImportTypings3
-TestCompletionForStringLiteralRelativeImport4
 TestCompletionForStringLiteralRelativeImport6
-TestCompletionForStringLiteralRelativeImportAllowJSTrue
 TestCompletionForStringLiteralWithDynamicImport
 TestCompletionForStringLiteral_details
 TestCompletionForStringLiteral_quotePreference
@@ -24,39 +24,25 @@ TestCompletionImportModuleSpecifierEndingTsxPreserve
 TestCompletionImportModuleSpecifierEndingTsxReact
 TestCompletionImportModuleSpecifierEndingUnsupportedExtension
 TestCompletionInFunctionLikeBody_includesPrimitiveTypes
-TestCompletionInJsDoc
 TestCompletionInNamedImportLocation
 TestCompletionInUncheckedJSFile
-TestIndexerReturnTypes1
-TestIndirectClassInstantiation
-TestJsDocFunctionSignatures11
-TestJsDocFunctionSignatures13
-TestJsDocFunctionSignatures7
-TestJsDocFunctionSignatures8
-TestJsDocPropertyDescription4
-TestJsDocPropertyDescription5
-TestJsDocPropertyDescription6
-TestJsDocPropertyDescription7
-TestJsDocPropertyDescription8
-TestJsDocPropertyDescription9
-TestJsDocTagsWithHyphen
-TestJsQuickInfoGenerallyAcceptableSize
-TestJsRequireQuickInfo
-TestJsdocCallbackTag
-TestJsdocLink2
-TestJsdocLink3
-TestJsdocLink6
-TestJsdocLink_findAllReferences1
-TestJsdocTypedefTag
-TestJsdocTypedefTag2
-TestJsdocTypedefTagNamespace
-TestLocalFunction
-TestMemberListInReopenedEnum
-TestMemberListInWithBlock
+TestCompletionListBuilderLocations_VariableDeclarations
+TestCompletionListForDerivedType1
+TestOverloadQuickInfo
+TestParameterWithDestructuring
+TestParameterWithNestedDestructuring
+TestPathCompletionsAllowModuleAugmentationExtensions
+TestPathCompletionsAllowTsExtensions
+TestPathCompletionsPackageJsonExportsBundlerNoNodeCondition
+TestPathCompletionsPackageJsonExportsCustomConditions
 TestPathCompletionsPackageJsonExportsWildcard1
+TestPathCompletionsPackageJsonExportsWildcard10
 TestPathCompletionsPackageJsonExportsWildcard11
 TestPathCompletionsPackageJsonExportsWildcard12
 TestPathCompletionsPackageJsonExportsWildcard2
+TestPathCompletionsPackageJsonExportsWildcard3
+TestPathCompletionsPackageJsonExportsWildcard4
+TestPathCompletionsPackageJsonExportsWildcard5
 TestPathCompletionsPackageJsonExportsWildcard6
 TestPathCompletionsPackageJsonExportsWildcard7
 TestPathCompletionsPackageJsonExportsWildcard8
@@ -87,15 +73,15 @@ TestPathCompletionsPackageJsonImportsWildcard7
 TestPathCompletionsPackageJsonImportsWildcard8
 TestPathCompletionsPackageJsonImportsWildcard9
 TestPathCompletionsTypesVersionsLocal
-TestPathCompletionsTypesVersionsWildcard1
-TestPathCompletionsTypesVersionsWildcard2
 TestPathCompletionsTypesVersionsWildcard3
-TestPathCompletionsTypesVersionsWildcard4
-TestPathCompletionsTypesVersionsWildcard5
-TestPathCompletionsTypesVersionsWildcard6
 TestProtoVarVisibleWithOuterScopeUnderscoreProto
 TestQuickInfoAlias
 TestQuickInfoAssertionNodeNotReusedWhenTypeNotEquivalent1
+TestQuickInfoBindingPatternInJsdocNoCrash1
+TestQuickInfoClassKeyword
+TestQuickInfoContextualTyping
+TestQuickInfoContextuallyTypedSignatureOptionalParameterFromIntersection1
+TestQuickInfoDisplayPartsIife
 TestQuickInfoElementAccessDeclaration
 TestQuickInfoForConstTypeReference
 TestQuickInfoForContextuallyTypedArrowFunctionInSuperCall
@@ -116,9 +102,33 @@ TestQuickInfoForTypeofParameter
 TestQuickInfoForUMDModuleAlias
 TestQuickInfoFromContextualType
 TestQuickInfoFunctionKeyword
-TestQuickInfoJsPropertyAssignedAfterMethodDeclaration
-TestQuickInfoJsdocTypedefMissingType
-TestQuickInfoMappedSpreadTypes
+TestQuickInfoGenerics
+TestQuickInfoGetterSetter
+TestQuickInfoImportNonunicodePath
+TestQuickInfoInInvalidIndexSignature
+TestQuickInfoInJsdocInTsFile1
+TestQuickInfoInOptionalChain
+TestQuickInfoInWithBlock
+TestQuickInfoJSDocBackticks
+TestQuickInfoJSDocFunctionNew
+TestQuickInfoJSDocFunctionThis
+TestQuickInfoJSExport
+TestQuickInfoJsDocGetterSetterNoCrash1
+TestQuickInfoJsDocNonDiscriminatedUnionSharedProp
+TestQuickInfoOnCatchVariable
+TestQuickInfoOnClosingJsx
+TestQuickInfoOnElementAccessInWriteLocation1
+TestQuickInfoOnElementAccessInWriteLocation2
+TestQuickInfoOnElementAccessInWriteLocation3
+TestQuickInfoOnElementAccessInWriteLocation4
+TestQuickInfoOnElementAccessInWriteLocation5
+TestQuickInfoOnErrorTypes1
+TestQuickInfoOnFunctionPropertyReturnedFromGenericFunction1
+TestQuickInfoOnFunctionPropertyReturnedFromGenericFunction2
+TestQuickInfoOnFunctionPropertyReturnedFromGenericFunction3
+TestQuickInfoOnGenericWithConstraints1
+TestQuickInfoOnInternalAliases
+TestQuickInfoOnMethodOfImportEquals
 TestQuickInfoOnNarrowedType
 TestQuickInfoOnNarrowedTypeInModule
 TestQuickInfoOnNewKeyword01
@@ -131,9 +141,12 @@ TestQuickInfoOnPropertyAccessInWriteLocation2
 TestQuickInfoOnPropertyAccessInWriteLocation3
 TestQuickInfoOnPropertyAccessInWriteLocation4
 TestQuickInfoOnPropertyAccessInWriteLocation5
+TestQuickInfoOnThis
 TestQuickInfoOnThis2
 TestQuickInfoOnThis3
 TestQuickInfoOnThis4
+TestQuickInfoOnUndefined
+TestQuickInfoOnVarInArrowExpression
 TestQuickInfoPrivateIdentifierInTypeReferenceNoCrash1
 TestQuickInfoPropertyTag
 TestQuickInfoSignatureOptionalParameterFromUnion1
@@ -158,7 +171,6 @@ TestQuickinfoForNamespaceMergeWithClassConstrainedToSelf
 TestQuickinfoForUnionProperty
 TestQuickinfoWrongComment
 TestRecursiveInternalModuleImport
-TestReferencesForExportedValues
 TestReferencesForStatementKeywords
 TestReferencesInComment
 TestReferencesInEmptyFile
@@ -167,26 +179,8 @@ TestRegexDetection
 TestReverseMappedTypeQuickInfo
 TestSelfReferencedExternalModule
 TestSignatureHelpInferenceJsDocImportTag
-TestSyntheticImportFromBabelGeneratedFile1
-TestSyntheticImportFromBabelGeneratedFile2
-TestThisBindingInLambda
-TestThisPredicateFunctionQuickInfo01
-TestThisPredicateFunctionQuickInfo02
-TestTripleSlashRefPathCompletionAbsolutePaths
-TestTripleSlashRefPathCompletionContext
-TestTripleSlashRefPathCompletionExtensionsAllowJSFalse
-TestTripleSlashRefPathCompletionExtensionsAllowJSTrue
-TestTripleSlashRefPathCompletionHiddenFile
-TestTripleSlashRefPathCompletionRootdirs
-TestTslibFindAllReferencesOnRuntimeImportWithPaths1
-TestTsxCompletion12
-TestTsxCompletion13
-TestTsxCompletion14
-TestTsxCompletion15
-TestTsxCompletionNonTagLessThan
+TestStringCompletionsImportOrExportSpecifier
+TestStringCompletionsVsEscaping
 TestTsxQuickInfo1
-TestTsxQuickInfo4
-TestTsxQuickInfo5
-TestTsxQuickInfo6
 TestTsxQuickInfo7
 TestTypeOperatorNodeBuilding

internal/fourslash/fourslash.go

@@ -141,7 +141,6 @@ func NewFourslash(t *testing.T, capabilities *lsproto.ClientCapabilities, conten
 		// Just skip this for now.
 		t.Skip("bundled files are not embedded")
 	}
-	ctx := t.Context()
 
 	fileName := getFileNameFromTest(t)
 	testfs := make(map[string]string)
@@ -174,14 +173,15 @@ func NewFourslash(t *testing.T, capabilities *lsproto.ClientCapabilities, conten
 		ParsedFileCache: &parsedFileCache{},
 	})
 
-	lspCtx, lspCancel := context.WithCancel(ctx)
+	lspCtx, lspCancel := context.WithCancel(t.Context())
 	lspErrChan := make(chan error, 1)
 
 	go func() {
 		defer func() {
 			outputWriter.Close()
 		}()
 		lspErrChan <- server.Run(lspCtx)
+		t.Log("LSP server exited")
 	}()
 
 	converters := ls.NewConverters(lsproto.PositionEncodingKindUTF8, func(fileName string) *ls.LineMap {
@@ -215,13 +215,9 @@ func NewFourslash(t *testing.T, capabilities *lsproto.ClientCapabilities, conten
 		lspCancel()
 		inputWriter.Close()
 
-		select {
-		case <-ctx.Done():
-			// do nothing
-		case err := <-lspErrChan:
-			if err != nil && lspCtx.Err() == nil {
-				t.Errorf("LSP server exited with error: %v", err)
-			}
+		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)
 		}
 	})
 	return f

internal/fourslash/tests/gen/completionForStringLiteralNonrelativeImport7_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestCompletionForStringLiteralNonrelativeImport7(t *testing.T) {
 	t.Parallel()
-
+	t.Skip()
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @baseUrl: tests/cases/fourslash/modules
 // @Filename: tests/test0.ts

internal/fourslash/tests/gen/completionForStringLiteralNonrelativeImportTypings2_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestCompletionForStringLiteralNonrelativeImportTypings2(t *testing.T) {
 	t.Parallel()
-
+	t.Skip()
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @typeRoots: my_typings,my_other_typings
 // @types: module-x,module-z

internal/fourslash/tests/gen/completionForStringLiteralRelativeImport4_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestCompletionForStringLiteralRelativeImport4(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @rootDirs: /sub/src1,/src2
 // @Filename: /src2/test0.ts

internal/fourslash/tests/gen/completionForStringLiteralRelativeImportAllowJSTrue_test.go

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

internal/fourslash/tests/gen/completionInJsDoc_test.go

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

internal/fourslash/tests/gen/completionListBuilderLocations_VariableDeclarations_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestCompletionListBuilderLocations_VariableDeclarations(t *testing.T) {
 	t.Parallel()
-
+	t.Skip()
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `var x = a/*var1*/
 var x = (b/*var2*/

internal/fourslash/tests/gen/completionListForDerivedType1_test.go

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

internal/fourslash/tests/gen/indexerReturnTypes1_test.go

@@ -9,7 +9,7 @@ import (
 
 func TestIndexerReturnTypes1(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `interface Numeric {
     [x: number]: Date;