Skip to content

Add check for nil symbol in getJSDocOrTag #2763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahejlsberg merged 3 commits into from
Feb 12, 2026
+79 −1
Merged

Add check for nil symbol in getJSDocOrTag #2763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c454fd
Add missing check for nil symbol
ahejlsberg Feb 11, 2026
4b374ef
Add regression test
ahejlsberg Feb 12, 2026
5074a29
Formatting
ahejlsberg Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions internal/fourslash/tests/hoverNilBaseSymbolIntersection_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package fourslash_test

import (
"testing"

"github.com/microsoft/typescript-go/internal/fourslash"
"github.com/microsoft/typescript-go/internal/testutil"
)

func TestHoverNilBaseSymbolIntersection(t *testing.T) {
t.Parallel()
defer testutil.RecoverAndFail(t, "Panic on fourslash test")

const content = `
// @strict: true
// @filename: main.ts

class Base {}

declare const BaseFactory: new() => Base & { c: string };

class Derived extends BaseFactory {
static /*1*/idField = "id" as const;
}
`
f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content)
defer done()

// We only care that hover/quickinfo does not crash (panic) when baseType.Symbol() is nil.
// Pre-fix (#2763), hovering on the static property could panic in getJSDocOrTag.
f.VerifyBaselineHover(t)
}
2 changes: 1 addition & 1 deletion internal/ls/hover.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ func getJSDocOrTag(c *checker.Checker, node *ast.Node) *ast.Node {
isStatic := ast.HasStaticModifier(node)
for _, baseType := range c.GetBaseTypes(c.GetDeclaredTypeOfSymbol(node.Parent.Symbol())) {
t := baseType
if isStatic {
if isStatic && baseType.Symbol() != nil {
t = c.GetTypeOfSymbol(baseType.Symbol())
Comment on lines 511 to 513
Copy link

Copilot AI Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a regression test for this panic. getJSDocOrTag is invoked during hover, and this change is specifically preventing a nil-deref crash; having a focused test (e.g., in internal/ls/hover_test.go) that exercises the static-member + base type with nil Symbol() path would help ensure it doesn’t regress again.

Copilot generated this review using guidance from repository custom instructions.
Comment on lines +512 to 513
Copy link

Copilot AI Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor: this calls baseType.Symbol() twice on the same value. Consider assigning it to a local (e.g., baseSym := baseType.Symbol()) to make the nil-check and subsequent use clearer and avoid duplicate calls.

Suggested change
if isStatic && baseType.Symbol() != nil {
t = c.GetTypeOfSymbol(baseType.Symbol())
baseSym := baseType.Symbol()
if isStatic && baseSym != nil {
t = c.GetTypeOfSymbol(baseSym)

Copilot uses AI. Check for mistakes.
}
if prop := c.GetPropertyOfType(t, symbol.Name); prop != nil && prop.ValueDeclaration != nil {
Expand Down
46 changes: 46 additions & 0 deletions testdata/baselines/reference/fourslash/quickInfo/hoverNilBaseSymbolIntersection.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
// === QuickInfo ===
=== /main.ts ===
// class Base {}
//
// declare const BaseFactory: new() => Base & { c: string };
//
// class Derived extends BaseFactory {
// static idField = "id" as const;
// ^^^^^^^
// | ----------------------------------------------------------------------
// | ```tsx
// | (property) Derived.idField: "id"
// | ```
// |
// | ----------------------------------------------------------------------
// }
//
[
{
"marker": {
"Position": 119,
"LSPosition": {
"line": 5,
"character": 9
},
"Name": "1",
"Data": {}
},
"item": {
"contents": {
"kind": "markdown",
"value": "```tsx\n(property) Derived.idField: \"id\"\n```\n"
},
"range": {
"start": {
"line": 5,
"character": 9
},
"end": {
"line": 5,
"character": 16
}
}
}
}
]