fix marker position in baselines

internal/fourslash/baselineutil.go

@@ -107,8 +107,8 @@ func getBaselineOptions(command string) baseline.Options {
 
 type baselineFourslashLocationsOptions struct {
 	// markerInfo
-	marker     *Marker // location
-	markerName string  // name of the marker to be printed in baseline
+	marker     MarkerOrRange // location
+	markerName string        // name of the marker to be printed in baseline
 
 	endMarker string
 
@@ -204,7 +204,7 @@ func (f *FourslashTest) getBaselineContentForFile(
 	canDetermineContextIdInline := true
 
 	if options.marker != nil && options.marker.FileName() == fileName {
-		details = append(details, &baselineDetail{pos: options.marker.LSPosition, positionMarker: options.markerName})
+		details = append(details, &baselineDetail{pos: options.marker.LSPos(), positionMarker: options.markerName})
 	}
 
 	for _, span := range spansInFile {

internal/fourslash/fourslash.go

@@ -300,8 +300,7 @@ func (f *FourslashTest) readMsg(t *testing.T) *lsproto.Message {
 }
 
 func (f *FourslashTest) GoToMarkerOrRange(t *testing.T, markerOrRange MarkerOrRange) {
-	// GoToRangeStart
-	f.goToMarker(t, markerOrRange.GetMarker())
+	f.goToMarker(t, markerOrRange)
 }
 
 func (f *FourslashTest) GoToMarker(t *testing.T, markerName string) {
@@ -312,10 +311,10 @@ func (f *FourslashTest) GoToMarker(t *testing.T, markerName string) {
 	f.goToMarker(t, marker)
 }
 
-func (f *FourslashTest) goToMarker(t *testing.T, marker *Marker) {
-	f.ensureActiveFile(t, marker.FileName())
-	f.goToPosition(t, marker.LSPosition)
-	f.lastKnownMarkerName = marker.Name
+func (f *FourslashTest) goToMarker(t *testing.T, markerOrRange MarkerOrRange) {
+	f.ensureActiveFile(t, markerOrRange.FileName())
+	f.goToPosition(t, markerOrRange.LSPos())
+	f.lastKnownMarkerName = markerOrRange.GetName()
 }
 
 func (f *FourslashTest) GoToEOF(t *testing.T) {
@@ -796,7 +795,7 @@ func (f *FourslashTest) VerifyBaselineFindAllReferences(
 		}
 
 		f.addResultToBaseline(t, "findAllReferences", f.getBaselineForLocationsWithFileContents(*result.Locations, baselineFourslashLocationsOptions{
-			marker:     markerOrRange.GetMarker(),
+			marker:     markerOrRange,
 			markerName: "/*FIND ALL REFS*/",
 		}))
 
@@ -846,7 +845,7 @@ func (f *FourslashTest) VerifyBaselineGoToDefinition(
 		}
 
 		f.addResultToBaseline(t, "goToDefinition", f.getBaselineForLocationsWithFileContents(resultAsLocations, baselineFourslashLocationsOptions{
-			marker:     markerOrRange.GetMarker(),
+			marker:     markerOrRange,
 			markerName: "/*GO TO DEFINITION*/",
 		}))
 	}
@@ -1533,7 +1532,7 @@ func (f *FourslashTest) verifyBaselineRename(
 			f.getBaselineForGroupedLocationsWithFileContents(
 				&fileToRange,
 				baselineFourslashLocationsOptions{
-					marker:     markerOrRange.GetMarker(),
+					marker:     markerOrRange,
 					markerName: "/*RENAME*/",
 					endMarker:  "RENAME|]",
 				},

internal/fourslash/test_parser.go

@@ -22,9 +22,10 @@ import (
 //
 // is a range with `text in range` "selected".
 type RangeMarker struct {
-	*Marker
-	Range   core.TextRange
-	LSRange lsproto.Range
+	fileName string
+	Range    core.TextRange
+	LSRange  lsproto.Range
+	marker   *Marker
 }
 
 func (r *RangeMarker) LSPos() lsproto.Position {
@@ -35,16 +36,19 @@ func (r *RangeMarker) FileName() string {
 	return r.fileName
 }
 
-func (r *RangeMarker) GetMarker() *Marker {
-	return r.Marker
+func (r *RangeMarker) GetName() *string {
+	if r.marker == nil {
+		return nil
+	}
+	return r.marker.Name
 }
 
 type Marker struct {
 	fileName   string
 	Position   int
 	LSPosition lsproto.Position
 	Name       *string // `nil` for anonymous markers such as `{| "foo": "bar" |}`
-	Data       map[string]interface{}
+	Data       map[string]any
 }
 
 func (m *Marker) LSPos() lsproto.Position {
@@ -55,14 +59,14 @@ func (m *Marker) FileName() string {
 	return m.fileName
 }
 
-func (m *Marker) GetMarker() *Marker {
-	return m
+func (m *Marker) GetName() *string {
+	return m.Name
 }
 
 type MarkerOrRange interface {
 	FileName() string
 	LSPos() lsproto.Position
-	GetMarker() *Marker
+	GetName() *string
 }
 
 type TestData struct {
@@ -244,14 +248,10 @@ func parseFileContent(fileName string, content string, fileOptions map[string]st
 				rangeStart := openRanges[len(openRanges)-1]
 				openRanges = openRanges[:len(openRanges)-1]
 
-				closedRange := &RangeMarker{Range: core.NewTextRange(rangeStart.position, (i-1)-difference)}
-				if rangeStart.marker != nil {
-					closedRange.Marker = rangeStart.marker
-				} else {
-					// A default RangeMarker is not added to list of markers. If the RangeMarker was created by parsing an actual marker within the range
-					//     in the test file, then the marker should have been added to the marker list when the marker was parsed.
-					// Similarly, if the RangeMarker has a name, this means that there was a named marker parsed within the range (and has been already included in the marker list)
-					closedRange.Marker = &Marker{fileName: fileName}
+				closedRange := &RangeMarker{
+					fileName: fileName,
+					Range:    core.NewTextRange(rangeStart.position, (i-1)-difference),
+					marker:   rangeStart.marker,
 				}
 
 				rangeMarkers = append(rangeMarkers, closedRange)