Consistently name VS types with prefix VS (#4173)

Author: jakebailey

internal/fourslash/fourslash.go

@@ -2334,7 +2334,7 @@ func (f *FourslashTest) VerifyBaselineFindAllReferences(
 	}
 }
 
-func (f *FourslashTest) VerifyBaselineVsFindAllReferences(
+func (f *FourslashTest) VerifyBaselineVSFindAllReferences(
 	t *testing.T,
 	markers ...string,
 ) {
@@ -2354,9 +2354,9 @@ func (f *FourslashTest) VerifyBaselineVsFindAllReferences(
 		}
 		result := sendRequest(t, f, lsproto.TextDocumentVSReferencesInfo, params)
 		// Sort cross-project results for deterministic baselines
-		if result.VsReferenceItems != nil && len(*result.VsReferenceItems) > 0 {
-			items := *result.VsReferenceItems
-			slices.SortStableFunc(items, func(a, b *lsproto.VsReferenceItem) int {
+		if result.VSReferenceItems != nil && len(*result.VSReferenceItems) > 0 {
+			items := *result.VSReferenceItems
+			slices.SortStableFunc(items, func(a, b *lsproto.VSReferenceItem) int {
 				ap, bp := "", ""
 				if a.VSProjectName != nil {
 					ap = *a.VSProjectName
@@ -2396,8 +2396,8 @@ func (f *FourslashTest) VerifyBaselineVsFindAllReferences(
 		}
 		// Include file contents with markers
 		var locations []lsproto.Location
-		if result.VsReferenceItems != nil {
-			for _, item := range *result.VsReferenceItems {
+		if result.VSReferenceItems != nil {
+			for _, item := range *result.VSReferenceItems {
 				locations = append(locations, item.VSLocation)
 			}
 		}
@@ -3960,7 +3960,7 @@ func (f *FourslashTest) VerifyQuickInfoIs(t *testing.T, expectedText string, exp
 func (f *FourslashTest) VerifyJsxClosingTag(t *testing.T, markersToNewText map[string]*string) {
 	for marker, expectedText := range markersToNewText {
 		f.GoToMarker(t, marker)
-		params := &lsproto.VsOnAutoInsertParams{
+		params := &lsproto.VSOnAutoInsertParams{
 			VSTextDocument: lsproto.TextDocumentIdentifier{
 				Uri: lsconv.FileNameToDocumentURI(f.activeFilename),
 			},
@@ -3971,7 +3971,7 @@ func (f *FourslashTest) VerifyJsxClosingTag(t *testing.T, markersToNewText map[s
 		requestResult := sendRequest(t, f, lsproto.TextDocumentVSOnAutoInsertInfo, params)
 
 		var actualText *string
-		if item := requestResult.VsOnAutoInsertResponseItem; item != nil && item.VSTextEdit != nil {
+		if item := requestResult.VSOnAutoInsertResponseItem; item != nil && item.VSTextEdit != nil {
 			newText := item.VSTextEdit.NewText
 			if item.VSTextEditFormat == lsproto.InsertTextFormatSnippet {
 				var ok bool
@@ -3990,12 +3990,12 @@ func (f *FourslashTest) VerifyJsxClosingTag(t *testing.T, markersToNewText map[s
 func (f *FourslashTest) VerifyBaselineClosingTags(t *testing.T) {
 	t.Helper()
 
-	markersAndItems := core.MapFiltered(f.Markers(), func(marker *Marker) (markerAndItem[*lsproto.VsOnAutoInsertResponseItem], bool) {
+	markersAndItems := core.MapFiltered(f.Markers(), func(marker *Marker) (markerAndItem[*lsproto.VSOnAutoInsertResponseItem], bool) {
 		if marker.Name == nil {
-			return markerAndItem[*lsproto.VsOnAutoInsertResponseItem]{}, false
+			return markerAndItem[*lsproto.VSOnAutoInsertResponseItem]{}, false
 		}
 
-		params := &lsproto.VsOnAutoInsertParams{
+		params := &lsproto.VSOnAutoInsertParams{
 			VSTextDocument: lsproto.TextDocumentIdentifier{
 				Uri: lsconv.FileNameToDocumentURI(marker.FileName()),
 			},
@@ -4004,17 +4004,17 @@ func (f *FourslashTest) VerifyBaselineClosingTags(t *testing.T) {
 		}
 
 		result := sendRequest(t, f, lsproto.TextDocumentVSOnAutoInsertInfo, params)
-		return markerAndItem[*lsproto.VsOnAutoInsertResponseItem]{Marker: marker, Item: result.VsOnAutoInsertResponseItem}, true
+		return markerAndItem[*lsproto.VSOnAutoInsertResponseItem]{Marker: marker, Item: result.VSOnAutoInsertResponseItem}, true
 	})
 
-	getRange := func(item *lsproto.VsOnAutoInsertResponseItem) *lsproto.Range {
+	getRange := func(item *lsproto.VSOnAutoInsertResponseItem) *lsproto.Range {
 		// Returning nil lets annotateContentWithTooltips render the caret marker at
 		// the marker position. The text edit's range is zero-width at the cursor,
 		// which would render as an empty underline.
 		return nil
 	}
 
-	getTooltipLines := func(item, _prev *lsproto.VsOnAutoInsertResponseItem) []string {
+	getTooltipLines := func(item, _prev *lsproto.VSOnAutoInsertResponseItem) []string {
 		if item == nil || item.VSTextEdit == nil {
 			return []string{"No closing tag"}
 		}

internal/fourslash/tests/constructorFindAllReferences1VS_test.go

@@ -19,5 +19,5 @@ func TestConstructorFindAllReferences1VS(t *testing.T) {
 new C().foo();`
 	f, done := fourslash.NewFourslash(t, &lsproto.ClientCapabilities{VSSupportsVisualStudioExtensions: new(true)}, content)
 	defer done()
-	f.VerifyBaselineVsFindAllReferences(t, "")
+	f.VerifyBaselineVSFindAllReferences(t, "")
 }

internal/fourslash/tests/findAllRefsForDefaultExportVS_test.go

@@ -20,5 +20,5 @@ import /*deg*/g from "./a";
 import { f } from "./a";`
 	f, done := fourslash.NewFourslash(t, &lsproto.ClientCapabilities{VSSupportsVisualStudioExtensions: new(true)}, content)
 	defer done()
-	f.VerifyBaselineVsFindAllReferences(t, "def", "deg")
+	f.VerifyBaselineVSFindAllReferences(t, "def", "deg")
 }

internal/fourslash/tests/findAllRefsInheritedProperties1VS_test.go

@@ -21,5 +21,5 @@ v./*3*/doStuff();
 v./*4*/propName;`
 	f, done := fourslash.NewFourslash(t, &lsproto.ClientCapabilities{VSSupportsVisualStudioExtensions: new(true)}, content)
 	defer done()
-	f.VerifyBaselineVsFindAllReferences(t, "1", "2", "3", "4")
+	f.VerifyBaselineVSFindAllReferences(t, "1", "2", "3", "4")
 }

internal/fourslash/tests/findReferencesAcrossMultipleProjectsVS_test.go

@@ -21,5 +21,5 @@ func TestFindReferencesAcrossMultipleProjectsVS(t *testing.T) {
 /*4*/x++;`
 	f, done := fourslash.NewFourslash(t, &lsproto.ClientCapabilities{VSSupportsVisualStudioExtensions: new(true)}, content)
 	defer done()
-	f.VerifyBaselineVsFindAllReferences(t, "1", "2", "3", "4")
+	f.VerifyBaselineVSFindAllReferences(t, "1", "2", "3", "4")
 }

internal/fourslash/tests/tsxFindAllReferences1VS_test.go

@@ -25,5 +25,5 @@ declare namespace JSX {
 var x = /*2*/</*3*/div />;`
 	f, done := fourslash.NewFourslash(t, &lsproto.ClientCapabilities{VSSupportsVisualStudioExtensions: new(true)}, content)
 	defer done()
-	f.VerifyBaselineVsFindAllReferences(t, "1", "2", "3")
+	f.VerifyBaselineVSFindAllReferences(t, "1", "2", "3")
 }

internal/ls/autoinsert.go

@@ -9,17 +9,17 @@ import (
 	"github.com/microsoft/typescript-go/internal/scanner"
 )
 
-func (l *LanguageService) ProvideOnAutoInsert(ctx context.Context, params *lsproto.VsOnAutoInsertParams) (lsproto.VsOnAutoInsertResponse, error) {
+func (l *LanguageService) ProvideOnAutoInsert(ctx context.Context, params *lsproto.VSOnAutoInsertParams) (lsproto.VSOnAutoInsertResponse, error) {
 	if params.VSCh != ">" {
-		return lsproto.VsOnAutoInsertResponse{}, nil
+		return lsproto.VSOnAutoInsertResponse{}, nil
 	}
 
 	_, sourceFile := l.getProgramAndFile(params.VSTextDocument.Uri)
 	position := l.converters.LineAndCharacterToPosition(sourceFile, params.VSPosition)
 
 	token := astnav.FindPrecedingToken(sourceFile, int(position))
 	if token == nil {
-		return lsproto.VsOnAutoInsertResponse{}, nil
+		return lsproto.VSOnAutoInsertResponse{}, nil
 	}
 
 	var closingText string
@@ -48,11 +48,11 @@ func (l *LanguageService) ProvideOnAutoInsert(ctx context.Context, params *lspro
 	}
 
 	if closingText == "" {
-		return lsproto.VsOnAutoInsertResponse{}, nil
+		return lsproto.VSOnAutoInsertResponse{}, nil
 	}
 
-	return lsproto.VsOnAutoInsertResponse{
-		VsOnAutoInsertResponseItem: &lsproto.VsOnAutoInsertResponseItem{
+	return lsproto.VSOnAutoInsertResponse{
+		VSOnAutoInsertResponseItem: &lsproto.VSOnAutoInsertResponseItem{
 			VSTextEditFormat: lsproto.InsertTextFormatSnippet,
 			VSTextEdit: &lsproto.TextEdit{
 				Range: lsproto.Range{Start: params.VSPosition, End: params.VSPosition},

internal/ls/crossproject.go

@@ -308,17 +308,17 @@ func combineReferences(results iter.Seq[lsproto.ReferencesResponse]) lsproto.Ref
 	return lsproto.LocationsOrNull{Locations: combineResponseLocations(results)}
 }
 
-func combineVsReferences(results iter.Seq[lsproto.VsReferencesResponse]) lsproto.VsReferencesResponse {
-	var combined []*lsproto.VsReferenceItem
+func combineVSReferences(results iter.Seq[lsproto.VSReferencesResponse]) lsproto.VSReferencesResponse {
+	var combined []*lsproto.VSReferenceItem
 	// Re-number IDs across projects to maintain unique IDs and correct definition references
 	nextId := int32(0)
 	for resp := range results {
-		if resp.VsReferenceItems == nil {
+		if resp.VSReferenceItems == nil {
 			continue
 		}
 		// Map old IDs to new IDs for this batch
 		idMap := make(map[int32]int32)
-		for _, item := range *resp.VsReferenceItems {
+		for _, item := range *resp.VSReferenceItems {
 			oldId := item.VSId
 			newId := nextId
 			idMap[oldId] = newId
@@ -333,7 +333,7 @@ func combineVsReferences(results iter.Seq[lsproto.VsReferencesResponse]) lsproto
 			combined = append(combined, &newItem)
 		}
 	}
-	return lsproto.VsReferencesResponse{VsReferenceItems: &combined}
+	return lsproto.VSReferencesResponse{VSReferenceItems: &combined}
 }
 
 func combineImplementations(results iter.Seq[lsproto.ImplementationResponse]) lsproto.ImplementationResponse {

internal/ls/displaypartswriter.go

@@ -18,7 +18,7 @@ var _ printer.EmitTextWriter = &displayPartsWriter{}
 // When vsCapability is false, only the plain string is built; runs are skipped.
 type displayPartsWriter struct {
 	builder      strings.Builder
-	runs         []*lsproto.ClassifiedTextRun
+	runs         []*lsproto.VSClassifiedTextRun
 	vsCapability bool
 	lastWritten  string
 }
@@ -32,7 +32,7 @@ func (w *displayPartsWriter) addRun(classification lsproto.ClassificationTypeNam
 		return
 	}
 	if w.vsCapability {
-		w.runs = append(w.runs, &lsproto.ClassifiedTextRun{
+		w.runs = append(w.runs, &lsproto.VSClassifiedTextRun{
 			ClassificationTypeName: string(classification),
 			Text:                   text,
 		})
@@ -57,7 +57,7 @@ func (w *displayPartsWriter) WriteFrom(other *displayPartsWriter) {
 	}
 }
 
-func (w *displayPartsWriter) GetRuns() []*lsproto.ClassifiedTextRun {
+func (w *displayPartsWriter) GetRuns() []*lsproto.VSClassifiedTextRun {
 	return w.runs
 }
 

internal/ls/findallreferences.go

@@ -669,14 +669,14 @@ func (l *LanguageService) ProvideReferences(ctx context.Context, params *lsproto
 	)
 }
 
-func (l *LanguageService) ProvideVsReferences(ctx context.Context, params *lsproto.ReferenceParams, orchestrator CrossProjectOrchestrator) (lsproto.VsReferencesResponse, error) {
+func (l *LanguageService) ProvideVSReferences(ctx context.Context, params *lsproto.ReferenceParams, orchestrator CrossProjectOrchestrator) (lsproto.VSReferencesResponse, error) {
 	return handleCrossProject(
 		l,
 		ctx,
 		params,
 		orchestrator,
-		(*LanguageService).symbolAndEntriesToVsReferences,
-		combineVsReferences,
+		(*LanguageService).symbolAndEntriesToVSReferences,
+		combineVSReferences,
 		false, /*isRename*/
 		false, /*implementations*/
 		symbolEntryTransformOptions{},
@@ -691,10 +691,10 @@ func (l *LanguageService) symbolAndEntriesToReferences(ctx context.Context, para
 	return lsproto.LocationsOrNull{Locations: &locations}, nil
 }
 
-func (l *LanguageService) symbolAndEntriesToVsReferences(ctx context.Context, params *lsproto.ReferenceParams, data SymbolAndEntriesData, options symbolEntryTransformOptions) (lsproto.VsReferencesResponse, error) {
+func (l *LanguageService) symbolAndEntriesToVSReferences(ctx context.Context, params *lsproto.ReferenceParams, data SymbolAndEntriesData, options symbolEntryTransformOptions) (lsproto.VSReferencesResponse, error) {
 	caps := lsproto.GetClientCapabilities(ctx)
 	vsCapability := caps.VSSupportsVisualStudioExtensions
-	var items []*lsproto.VsReferenceItem
+	var items []*lsproto.VSReferenceItem
 	id := int32(0)
 	projectName := string(l.projectPath)
 
@@ -712,11 +712,11 @@ func (l *LanguageService) symbolAndEntriesToVsReferences(ctx context.Context, pa
 		// Create the definition item
 		definitionId := id
 		emptyStr := ""
-		defItem := &lsproto.VsReferenceItem{
+		defItem := &lsproto.VSReferenceItem{
 			VSId:             definitionId,
 			VSLocation:       defInfo.location,
 			VSDefinitionText: defInfo.displayText,
-			VSKind:           &[]lsproto.VsReferenceKind{lsproto.VsReferenceKindUnknown},
+			VSKind:           &[]lsproto.VSReferenceKind{lsproto.VSReferenceKindUnknown},
 			VSProjectName:    &projectName,
 			VSContainingType: &emptyStr,
 		}
@@ -733,31 +733,31 @@ func (l *LanguageService) symbolAndEntriesToVsReferences(ctx context.Context, pa
 			refLocation := l.getLocationOfEntry(ref)
 
 			// Determine read/write kind
-			kind := lsproto.VsReferenceKindRead
+			kind := lsproto.VSReferenceKindRead
 			if ref.kind != entryKindRange && ref.node != nil && ast.IsWriteAccessForReference(ref.node) {
-				kind = lsproto.VsReferenceKindWrite
+				kind = lsproto.VSReferenceKindWrite
 			}
 
-			refItem := &lsproto.VsReferenceItem{
+			refItem := &lsproto.VSReferenceItem{
 				VSId:           id,
 				VSDefinitionId: &definitionId,
 				VSLocation:     refLocation,
-				VSKind:         &[]lsproto.VsReferenceKind{kind},
+				VSKind:         &[]lsproto.VSReferenceKind{kind},
 				VSProjectName:  &projectName,
 			}
 			items = append(items, refItem)
 			id++
 		}
 	}
 
-	return lsproto.VsReferencesResponse{VsReferenceItems: &items}, nil
+	return lsproto.VSReferencesResponse{VSReferenceItems: &items}, nil
 }
 
 // referencedSymbolDefinitionInfo holds the computed info for a definition
 type referencedSymbolDefinitionInfo struct {
 	node        *ast.Node
 	location    lsproto.Location
-	displayText *lsproto.ClassifiedTextElement
+	displayText *lsproto.VSClassifiedTextElement
 }
 
 // definitionToReferencedSymbolDefinitionInfo converts a Definition to display info
@@ -796,8 +796,8 @@ func (l *LanguageService) definitionToReferencedSymbolDefinitionInfo(ctx context
 		return &referencedSymbolDefinitionInfo{
 			node:     node,
 			location: loc,
-			displayText: &lsproto.ClassifiedTextElement{
-				Runs: []*lsproto.ClassifiedTextRun{{Text: node.Text(), ClassificationTypeName: string(lsproto.ClassificationTypeNameText)}},
+			displayText: &lsproto.VSClassifiedTextElement{
+				Runs: []*lsproto.VSClassifiedTextRun{{Text: node.Text(), ClassificationTypeName: string(lsproto.ClassificationTypeNameText)}},
 			},
 		}
 
@@ -811,8 +811,8 @@ func (l *LanguageService) definitionToReferencedSymbolDefinitionInfo(ctx context
 		return &referencedSymbolDefinitionInfo{
 			node:     node,
 			location: loc,
-			displayText: &lsproto.ClassifiedTextElement{
-				Runs: []*lsproto.ClassifiedTextRun{{Text: name, ClassificationTypeName: string(lsproto.ClassificationTypeNameKeyword)}},
+			displayText: &lsproto.VSClassifiedTextElement{
+				Runs: []*lsproto.VSClassifiedTextRun{{Text: name, ClassificationTypeName: string(lsproto.ClassificationTypeNameKeyword)}},
 			},
 		}
 
@@ -842,8 +842,8 @@ func (l *LanguageService) definitionToReferencedSymbolDefinitionInfo(ctx context
 		return &referencedSymbolDefinitionInfo{
 			node:     node,
 			location: loc,
-			displayText: &lsproto.ClassifiedTextElement{
-				Runs: []*lsproto.ClassifiedTextRun{{Text: node.Text(), ClassificationTypeName: string(lsproto.ClassificationTypeNameString)}},
+			displayText: &lsproto.VSClassifiedTextElement{
+				Runs: []*lsproto.VSClassifiedTextRun{{Text: node.Text(), ClassificationTypeName: string(lsproto.ClassificationTypeNameString)}},
 			},
 		}
 
@@ -856,8 +856,8 @@ func (l *LanguageService) definitionToReferencedSymbolDefinitionInfo(ctx context
 		return &referencedSymbolDefinitionInfo{
 			node:     node,
 			location: loc,
-			displayText: &lsproto.ClassifiedTextElement{
-				Runs: []*lsproto.ClassifiedTextRun{{Text: `"` + def.tripleSlashFileRef.reference.FileName + `"`, ClassificationTypeName: string(lsproto.ClassificationTypeNameString)}},
+			displayText: &lsproto.VSClassifiedTextElement{
+				Runs: []*lsproto.VSClassifiedTextRun{{Text: `"` + def.tripleSlashFileRef.reference.FileName + `"`, ClassificationTypeName: string(lsproto.ClassificationTypeNameString)}},
 			},
 		}
 
@@ -867,7 +867,7 @@ func (l *LanguageService) definitionToReferencedSymbolDefinitionInfo(ctx context
 }
 
 // getDefinitionKindAndDisplayParts returns the classified display text for a symbol definition.
-func (l *LanguageService) getDefinitionKindAndDisplayParts(ctx context.Context, symbol *ast.Symbol, originalNode *ast.Node, vsCapability bool) *lsproto.ClassifiedTextElement {
+func (l *LanguageService) getDefinitionKindAndDisplayParts(ctx context.Context, symbol *ast.Symbol, originalNode *ast.Node, vsCapability bool) *lsproto.VSClassifiedTextElement {
 	program := l.GetProgram()
 	c, done := program.GetTypeChecker(ctx)
 	defer done()
@@ -877,12 +877,12 @@ func (l *LanguageService) getDefinitionKindAndDisplayParts(ctx context.Context,
 	info := getQuickInfoAndDeclarationAtLocation(c, symbol, originalNode, nil, vsCapability, meaning)
 
 	if vsCapability {
-		return &lsproto.ClassifiedTextElement{Runs: info.displayParts.GetRuns()}
+		return &lsproto.VSClassifiedTextElement{Runs: info.displayParts.GetRuns()}
 	}
 	// Fallback: single unclassified run with the full text
 	text := info.displayParts.String()
-	return &lsproto.ClassifiedTextElement{
-		Runs: []*lsproto.ClassifiedTextRun{{Text: text, ClassificationTypeName: string(lsproto.ClassificationTypeNameText)}},
+	return &lsproto.VSClassifiedTextElement{
+		Runs: []*lsproto.VSClassifiedTextRun{{Text: text, ClassificationTypeName: string(lsproto.ClassificationTypeNameText)}},
 	}
 }