Fix hover range issues: eliminate duplicate getNodeForQuickInfo calls and remove whitespace from ranges

Copilot · DanielRosenwasser · Copilot · commit afe2a85e0506 · 2025-07-31T08:38:16.000Z
Co-authored-by: DanielRosenwasser &lt;972891+DanielRosenwasser@users.noreply.github.com&gt;
diff --git a/internal/ls/hover.go b/internal/ls/hover.go
@@ -11,6 +11,7 @@ import (
 	"github.com/microsoft/typescript-go/internal/checker"
 	"github.com/microsoft/typescript-go/internal/core"
 	"github.com/microsoft/typescript-go/internal/lsp/lsproto"
+	"github.com/microsoft/typescript-go/internal/scanner"
 )
 
 const (
@@ -27,14 +28,20 @@ func (l *LanguageService) ProvideHover(ctx context.Context, documentURI lsproto.
 	}
 	c, done := program.GetTypeCheckerForFile(ctx, file)
 	defer done()
-	quickInfo, documentation := getQuickInfoAndDocumentation(c, node)
+	
+	// Calculate the applicable range for the hover
+	rangeNode := getNodeForQuickInfo(node)
+	quickInfo, documentation := getQuickInfoAndDocumentationWithNode(c, node, rangeNode)
 	if quickInfo == "" {
 		return lsproto.HoverOrNull{}, nil
 	}
-
-	// Calculate the applicable range for the hover
-	rangeNode := getNodeForQuickInfo(node)
-	textRange := core.NewTextRange(rangeNode.Pos(), rangeNode.End())
+	
+	// Calculate range without leading trivia to avoid including whitespace
+	sourceFile := ast.GetSourceFileOfNode(rangeNode)
+	sourceText := sourceFile.Text()
+	start := scanner.SkipTrivia(sourceText, rangeNode.Pos())
+	end := rangeNode.End()
+	textRange := core.NewTextRange(start, end)
 	hoverRange := l.converters.ToLSPRange(file, textRange)
 
 	return lsproto.HoverOrNull{
@@ -51,7 +58,11 @@ func (l *LanguageService) ProvideHover(ctx context.Context, documentURI lsproto.
 }
 
 func getQuickInfoAndDocumentation(c *checker.Checker, node *ast.Node) (string, string) {
-	return getQuickInfoAndDocumentationForSymbol(c, c.GetSymbolAtLocation(node), getNodeForQuickInfo(node))
+	return getQuickInfoAndDocumentationWithNode(c, node, getNodeForQuickInfo(node))
+}
+
+func getQuickInfoAndDocumentationWithNode(c *checker.Checker, node *ast.Node, rangeNode *ast.Node) (string, string) {
+	return getQuickInfoAndDocumentationForSymbol(c, c.GetSymbolAtLocation(node), rangeNode)
 }
 
 func getQuickInfoAndDocumentationForSymbol(c *checker.Checker, symbol *ast.Symbol, node *ast.Node) (string, string) {
diff --git a/internal/ls/hover_test.go b/internal/ls/hover_test.go
@@ -48,7 +48,7 @@ function myFunction() {
 						},
 					},
 					Range: &lsproto.Range{
-						Start: lsproto.Position{Line: 6, Character: 1},
+						Start: lsproto.Position{Line: 8, Character: 0},
 						End:   lsproto.Position{Line: 8, Character: 10},
 					},
 				},
@@ -75,7 +75,7 @@ myFunction();`,
 						},
 					},
 					Range: &lsproto.Range{
-						Start: lsproto.Position{Line: 3, Character: 8},
+						Start: lsproto.Position{Line: 3, Character: 9},
 						End:   lsproto.Position{Line: 3, Character: 19},
 					},
 				},
@@ -102,7 +102,7 @@ function myFunction(param) {
 						},
 					},
 					Range: &lsproto.Range{
-						Start: lsproto.Position{Line: 5, Character: 1},
+						Start: lsproto.Position{Line: 7, Character: 0},
 						End:   lsproto.Position{Line: 7, Character: 10},
 					},
 				},
@@ -168,7 +168,7 @@ function /*marker*/testFunction(param: string): string {
 						},
 					},
 					Range: &lsproto.Range{
-						Start: lsproto.Position{Line: 0, Character: 8},
+						Start: lsproto.Position{Line: 0, Character: 9},
 						End:   lsproto.Position{Line: 0, Character: 21},
 					},
 				},
diff --git a/testdata/baselines/reference/fourslash/hover/JsdocLink1.baseline b/testdata/baselines/reference/fourslash/hover/JsdocLink1.baseline
@@ -11,7 +11,7 @@
 //  * @see {@link C} its great
 //  */
 // function CC() {
-//         ^^^
+//          ^^
 // | ----------------------------------------------------------------------
 // | ```tsx
 // | function CC(): void
@@ -46,7 +46,7 @@
       "range": {
         "start": {
           "line": 10,
-          "character": 8
+          "character": 9
         },
         "end": {
           "line": 10,
