Implement MarkerNames() in fourslash (#1450)

Author: DanielRosenwasser

internal/core/core.go

@@ -95,6 +95,18 @@ func MapNonNil[T any, U comparable](slice []T, f func(T) U) []U {
 	return result
 }
 
+func MapFiltered[T any, U any](slice []T, f func(T) (U, bool)) []U {
+	var result []U
+	for _, value := range slice {
+		mapped, ok := f(value)
+		if !ok {
+			continue
+		}
+		result = append(result, mapped)
+	}
+	return result
+}
+
 func FlatMap[T any, U comparable](slice []T, f func(T) []U) []U {
 	var result []U
 	for _, value := range slice {

internal/fourslash/_scripts/convertFourslash.mts

@@ -660,6 +660,9 @@ function parseBaselineFindAllReferencesArgs(args: readonly ts.Expression[]): Ver
         if (ts.isStringLiteral(arg)) {
             newArgs.push(getGoStringLiteral(arg.text));
         }
+        else if (arg.getText() === "...test.markerNames()") {
+            newArgs.push("f.MarkerNames()...");
+        }
         else if (arg.getText() === "...test.ranges()") {
             return {
                 kind: "verifyBaselineFindAllReferences",
@@ -681,6 +684,9 @@ function parseBaselineGoToDefinitionArgs(args: readonly ts.Expression[]): Verify
         if (ts.isStringLiteral(arg)) {
             newArgs.push(getGoStringLiteral(arg.text));
         }
+        else if (arg.getText() === "...test.markerNames()") {
+            newArgs.push("f.MarkerNames()...");
+        }
         else if (arg.getText() === "...test.ranges()") {
             return {
                 kind: "verifyBaselineGoToDefinition",

internal/fourslash/_scripts/failingTests.txt

@@ -202,9 +202,6 @@ TestGetJavaScriptCompletions8
 TestGetJavaScriptCompletions9
 TestGetJavaScriptGlobalCompletions1
 TestGetJavaScriptQuickInfo8
-TestGoToDefinitionBuiltInTypes
-TestGoToDefinitionBuiltInValues
-TestGoToDefinitionUndefinedSymbols
 TestImportCompletionsPackageJsonExportsSpecifierEndsInTs
 TestImportCompletionsPackageJsonExportsTrailingSlash1
 TestImportCompletionsPackageJsonImportsConditions1

internal/fourslash/fourslash.go

@@ -414,6 +414,15 @@ func (f *FourslashTest) Markers() []*Marker {
 	return f.testData.Markers
 }
 
+func (f *FourslashTest) MarkerNames() []string {
+	return core.MapFiltered(f.testData.Markers, func(marker *Marker) (string, bool) {
+		if marker.Name == nil {
+			return "", false
+		}
+		return *marker.Name, true
+	})
+}
+
 func (f *FourslashTest) Ranges() []*RangeMarker {
 	return f.testData.Ranges
 }

internal/fourslash/tests/gen/goToDefinitionBuiltInTypes_test.go

@@ -9,12 +9,12 @@ import (
 
 func TestGoToDefinitionBuiltInTypes(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `var n: /*number*/number;
 var s: /*string*/string;
 var b: /*boolean*/boolean;
 var v: /*void*/void;`
 	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
-	f.VerifyBaselineGoToDefinition(t)
+	f.VerifyBaselineGoToDefinition(t, f.MarkerNames()...)
 }

internal/fourslash/tests/gen/goToDefinitionBuiltInValues_test.go

@@ -9,13 +9,13 @@ import (
 
 func TestGoToDefinitionBuiltInValues(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `var u = /*undefined*/undefined;
 var n = /*null*/null;
 var a = function() { return /*arguments*/arguments; };
 var t = /*true*/true;
 var f = /*false*/false;`
 	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
-	f.VerifyBaselineGoToDefinition(t)
+	f.VerifyBaselineGoToDefinition(t, f.MarkerNames()...)
 }

internal/fourslash/tests/gen/goToDefinitionUndefinedSymbols_test.go

@@ -9,12 +9,12 @@ import (
 
 func TestGoToDefinitionUndefinedSymbols(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `some/*undefinedValue*/Variable;
 var a: some/*undefinedType*/Type;
 var x = {}; x.some/*undefinedProperty*/Property;
 var a: any; a.some/*unkownProperty*/Property;`
 	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
-	f.VerifyBaselineGoToDefinition(t)
+	f.VerifyBaselineGoToDefinition(t, f.MarkerNames()...)
 }

testdata/baselines/reference/fourslash/goToDef/GoToDefinitionBuiltInTypes.baseline.jsonc

@@ -0,0 +1,40 @@
+// === goToDefinition ===
+// === /goToDefinitionBuiltInTypes.ts ===
+
+// var n: /*GO TO DEFINITION*/number;
+// var s: string;
+// var b: boolean;
+// var v: void;
+
+
+
+
+// === goToDefinition ===
+// === /goToDefinitionBuiltInTypes.ts ===
+
+// var n: number;
+// var s: /*GO TO DEFINITION*/string;
+// var b: boolean;
+// var v: void;
+
+
+
+
+// === goToDefinition ===
+// === /goToDefinitionBuiltInTypes.ts ===
+
+// var n: number;
+// var s: string;
+// var b: /*GO TO DEFINITION*/boolean;
+// var v: void;
+
+
+
+
+// === goToDefinition ===
+// === /goToDefinitionBuiltInTypes.ts ===
+
+// var n: number;
+// var s: string;
+// var b: boolean;
+// var v: /*GO TO DEFINITION*/void;

testdata/baselines/reference/fourslash/goToDef/GoToDefinitionBuiltInValues.baseline.jsonc

@@ -0,0 +1,56 @@
+// === goToDefinition ===
+// === /goToDefinitionBuiltInValues.ts ===
+
+// var u = /*GO TO DEFINITION*/undefined;
+// var n = null;
+// var a = function() { return arguments; };
+// var t = true;
+// var f = false;
+
+
+
+
+// === goToDefinition ===
+// === /goToDefinitionBuiltInValues.ts ===
+
+// var u = undefined;
+// var n = /*GO TO DEFINITION*/null;
+// var a = function() { return arguments; };
+// var t = true;
+// var f = false;
+
+
+
+
+// === goToDefinition ===
+// === /goToDefinitionBuiltInValues.ts ===
+
+// var u = undefined;
+// var n = null;
+// var a = function() { return /*GO TO DEFINITION*/arguments; };
+// var t = true;
+// var f = false;
+
+
+
+
+// === goToDefinition ===
+// === /goToDefinitionBuiltInValues.ts ===
+
+// var u = undefined;
+// var n = null;
+// var a = function() { return arguments; };
+// var t = /*GO TO DEFINITION*/true;
+// var f = false;
+
+
+
+
+// === goToDefinition ===
+// === /goToDefinitionBuiltInValues.ts ===
+
+// var u = undefined;
+// var n = null;
+// var a = function() { return arguments; };
+// var t = true;
+// var f = /*GO TO DEFINITION*/false;

testdata/baselines/reference/fourslash/goToDef/GoToDefinitionUndefinedSymbols.baseline.jsonc

@@ -0,0 +1,40 @@
+// === goToDefinition ===
+// === /goToDefinitionUndefinedSymbols.ts ===
+
+// some/*GO TO DEFINITION*/Variable;
+// var a: someType;
+// var x = {}; x.someProperty;
+// var a: any; a.someProperty;
+
+
+
+
+// === goToDefinition ===
+// === /goToDefinitionUndefinedSymbols.ts ===
+
+// someVariable;
+// var a: some/*GO TO DEFINITION*/Type;
+// var x = {}; x.someProperty;
+// var a: any; a.someProperty;
+
+
+
+
+// === goToDefinition ===
+// === /goToDefinitionUndefinedSymbols.ts ===
+
+// someVariable;
+// var a: someType;
+// var x = {}; x.some/*GO TO DEFINITION*/Property;
+// var a: any; a.someProperty;
+
+
+
+
+// === goToDefinition ===
+// === /goToDefinitionUndefinedSymbols.ts ===
+
+// someVariable;
+// var a: someType;
+// var x = {}; x.someProperty;
+// var a: any; a.some/*GO TO DEFINITION*/Property;