Skip to content

Commit d461fad

Browse files
CopilotDanielRosenwasserjakebailey
authored
Add Range to Hover (#1489)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: DanielRosenwasser <972891+DanielRosenwasser@users.noreply.github.com> Co-authored-by: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
1 parent 0487292 commit d461fad

File tree

109 files changed

+9467
-637
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+9467
-637
lines changed

‎internal/ls/hover.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,13 @@ func (l *LanguageService) ProvideHover(ctx context.Context, documentURI lsproto.
2727
}
2828
c, done := program.GetTypeCheckerForFile(ctx, file)
2929
defer done()
30-
quickInfo, documentation := l.getQuickInfoAndDocumentation(c, node)
30+
rangeNode := getNodeForQuickInfo(node)
31+
quickInfo, documentation := l.getQuickInfoAndDocumentationForSymbol(c, c.GetSymbolAtLocation(node), rangeNode)
3132
if quickInfo == "" {
3233
return lsproto.HoverOrNull{}, nil
3334
}
35+
hoverRange := l.getRangeOfNode(rangeNode, nil, nil)
36+
3437
return lsproto.HoverOrNull{
3538
Hover: &lsproto.Hover{
3639
Contents: lsproto.MarkupContentOrStringOrMarkedStringWithLanguageOrMarkedStrings{
@@ -39,14 +42,11 @@ func (l *LanguageService) ProvideHover(ctx context.Context, documentURI lsproto.
3942
Value: formatQuickInfo(quickInfo) + documentation,
4043
},
4144
},
45+
Range: hoverRange,
4246
},
4347
}, nil
4448
}
4549

46-
func (l *LanguageService) getQuickInfoAndDocumentation(c *checker.Checker, node *ast.Node) (string, string) {
47-
return l.getQuickInfoAndDocumentationForSymbol(c, c.GetSymbolAtLocation(node), getNodeForQuickInfo(node))
48-
}
49-
5050
func (l *LanguageService) getQuickInfoAndDocumentationForSymbol(c *checker.Checker, symbol *ast.Symbol, node *ast.Node) (string, string) {
5151
quickInfo, declaration := getQuickInfoAndDeclarationAtLocation(c, symbol, node)
5252
if quickInfo == "" {

‎testdata/baselines/reference/fourslash/quickInfo/completionDetailsOfContextSensitiveParameterNoCrash.baseline‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
// ...args
8484
// ): StylingFunction => {
8585
// return curry(getStylingByKeys, 2)(mergedStyling, ...args);
86-
// ^
86+
// ^^^^
8787
// | ----------------------------------------------------------------------
8888
// | ```tsx
8989
// | (parameter) args: []
@@ -108,6 +108,16 @@
108108
"contents": {
109109
"kind": "markdown",
110110
"value": "```tsx\n(parameter) args: []\n```\n"
111+
},
112+
"range": {
113+
"start": {
114+
"line": 82,
115+
"character": 60
116+
},
117+
"end": {
118+
"line": 82,
119+
"character": 64
120+
}
111121
}
112122
}
113123
}

‎testdata/baselines/reference/fourslash/quickInfo/deprecatedInheritedJSDocOverload.baseline‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// }
2424
// declare const a: ThingWithDeprecations<void>
2525
// a.subscribe(() => {
26-
// ^
26+
// ^^^^^^^^^
2727
// | ----------------------------------------------------------------------
2828
// | ```tsx
2929
// | (method) ThingWithDeprecations.subscribe(observer?: PartialObserver<void>): Subscription
@@ -47,6 +47,16 @@
4747
"contents": {
4848
"kind": "markdown",
4949
"value": "```tsx\n(method) ThingWithDeprecations.subscribe(observer?: PartialObserver<void>): Subscription\n```\n"
50+
},
51+
"range": {
52+
"start": {
53+
"line": 22,
54+
"character": 2
55+
},
56+
"end": {
57+
"line": 22,
58+
"character": 11
59+
}
5060
}
5161
}
5262
}

‎testdata/baselines/reference/fourslash/quickInfo/jsDocTypeTagQuickInfo1.baseline‎

Lines changed: 136 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
// | ----------------------------------------------------------------------
4848
// /** @type {Null} */
4949
// var Nl;
50-
// ^
50+
// ^^
5151
// | ----------------------------------------------------------------------
5252
// | ```tsx
5353
// | var Nl: Null
@@ -74,7 +74,7 @@
7474
// | ----------------------------------------------------------------------
7575
// /** @type {Object} */
7676
// var Obj;
77-
// ^
77+
// ^^^
7878
// | ----------------------------------------------------------------------
7979
// | ```tsx
8080
// | var Obj: Object
@@ -83,7 +83,7 @@
8383
// | ----------------------------------------------------------------------
8484
// /** @type {Function} */
8585
// var Func;
86-
// ^
86+
// ^^^^
8787
// | ----------------------------------------------------------------------
8888
// | ```tsx
8989
// | var Func: Function
@@ -92,7 +92,7 @@
9292
// | ----------------------------------------------------------------------
9393
// /** @type {*} */
9494
// var AnyType;
95-
// ^
95+
// ^^^^^^^
9696
// | ----------------------------------------------------------------------
9797
// | ```tsx
9898
// | var AnyType: any
@@ -101,7 +101,7 @@
101101
// | ----------------------------------------------------------------------
102102
// /** @type {?} */
103103
// var QType;
104-
// ^
104+
// ^^^^^
105105
// | ----------------------------------------------------------------------
106106
// | ```tsx
107107
// | var QType: any
@@ -110,7 +110,7 @@
110110
// | ----------------------------------------------------------------------
111111
// /** @type {String|Number} */
112112
// var SOrN;
113-
// ^
113+
// ^^^^
114114
// | ----------------------------------------------------------------------
115115
// | ```tsx
116116
// | var SOrN: Number | String
@@ -132,6 +132,16 @@
132132
"contents": {
133133
"kind": "markdown",
134134
"value": "```tsx\nvar S: String\n```\n"
135+
},
136+
"range": {
137+
"start": {
138+
"line": 1,
139+
"character": 4
140+
},
141+
"end": {
142+
"line": 1,
143+
"character": 5
144+
}
135145
}
136146
}
137147
},
@@ -149,6 +159,16 @@
149159
"contents": {
150160
"kind": "markdown",
151161
"value": "```tsx\nvar N: Number\n```\n"
162+
},
163+
"range": {
164+
"start": {
165+
"line": 3,
166+
"character": 4
167+
},
168+
"end": {
169+
"line": 3,
170+
"character": 5
171+
}
152172
}
153173
}
154174
},
@@ -166,6 +186,16 @@
166186
"contents": {
167187
"kind": "markdown",
168188
"value": "```tsx\nvar B: Boolean\n```\n"
189+
},
190+
"range": {
191+
"start": {
192+
"line": 5,
193+
"character": 4
194+
},
195+
"end": {
196+
"line": 5,
197+
"character": 5
198+
}
169199
}
170200
}
171201
},
@@ -183,6 +213,16 @@
183213
"contents": {
184214
"kind": "markdown",
185215
"value": "```tsx\nvar V: Void\n```\n"
216+
},
217+
"range": {
218+
"start": {
219+
"line": 7,
220+
"character": 4
221+
},
222+
"end": {
223+
"line": 7,
224+
"character": 5
225+
}
186226
}
187227
}
188228
},
@@ -200,6 +240,16 @@
200240
"contents": {
201241
"kind": "markdown",
202242
"value": "```tsx\nvar U: Undefined\n```\n"
243+
},
244+
"range": {
245+
"start": {
246+
"line": 9,
247+
"character": 4
248+
},
249+
"end": {
250+
"line": 9,
251+
"character": 5
252+
}
203253
}
204254
}
205255
},
@@ -217,6 +267,16 @@
217267
"contents": {
218268
"kind": "markdown",
219269
"value": "```tsx\nvar Nl: Null\n```\n"
270+
},
271+
"range": {
272+
"start": {
273+
"line": 11,
274+
"character": 4
275+
},
276+
"end": {
277+
"line": 11,
278+
"character": 6
279+
}
220280
}
221281
}
222282
},
@@ -234,6 +294,16 @@
234294
"contents": {
235295
"kind": "markdown",
236296
"value": "```tsx\nvar A: any[]\n```\n"
297+
},
298+
"range": {
299+
"start": {
300+
"line": 13,
301+
"character": 4
302+
},
303+
"end": {
304+
"line": 13,
305+
"character": 5
306+
}
237307
}
238308
}
239309
},
@@ -251,6 +321,16 @@
251321
"contents": {
252322
"kind": "markdown",
253323
"value": "```tsx\nvar P: Promise<any>\n```\n"
324+
},
325+
"range": {
326+
"start": {
327+
"line": 15,
328+
"character": 4
329+
},
330+
"end": {
331+
"line": 15,
332+
"character": 5
333+
}
254334
}
255335
}
256336
},
@@ -268,6 +348,16 @@
268348
"contents": {
269349
"kind": "markdown",
270350
"value": "```tsx\nvar Obj: Object\n```\n"
351+
},
352+
"range": {
353+
"start": {
354+
"line": 17,
355+
"character": 4
356+
},
357+
"end": {
358+
"line": 17,
359+
"character": 7
360+
}
271361
}
272362
}
273363
},
@@ -285,6 +375,16 @@
285375
"contents": {
286376
"kind": "markdown",
287377
"value": "```tsx\nvar Func: Function\n```\n"
378+
},
379+
"range": {
380+
"start": {
381+
"line": 19,
382+
"character": 4
383+
},
384+
"end": {
385+
"line": 19,
386+
"character": 8
387+
}
288388
}
289389
}
290390
},
@@ -302,6 +402,16 @@
302402
"contents": {
303403
"kind": "markdown",
304404
"value": "```tsx\nvar AnyType: any\n```\n"
405+
},
406+
"range": {
407+
"start": {
408+
"line": 21,
409+
"character": 4
410+
},
411+
"end": {
412+
"line": 21,
413+
"character": 11
414+
}
305415
}
306416
}
307417
},
@@ -319,6 +429,16 @@
319429
"contents": {
320430
"kind": "markdown",
321431
"value": "```tsx\nvar QType: any\n```\n"
432+
},
433+
"range": {
434+
"start": {
435+
"line": 23,
436+
"character": 4
437+
},
438+
"end": {
439+
"line": 23,
440+
"character": 9
441+
}
322442
}
323443
}
324444
},
@@ -336,6 +456,16 @@
336456
"contents": {
337457
"kind": "markdown",
338458
"value": "```tsx\nvar SOrN: Number | String\n```\n"
459+
},
460+
"range": {
461+
"start": {
462+
"line": 25,
463+
"character": 4
464+
},
465+
"end": {
466+
"line": 25,
467+
"character": 8
468+
}
339469
}
340470
}
341471
}

0 commit comments

Comments
 (0)