Revert to ValueDeclaration approach and add test for binding element JSDoc

Co-authored-by: DanielRosenwasser <[email protected]>

Author: Copilot

internal/fourslash/tests/destructuredInterfaceJSDoc_test.go

@@ -52,3 +52,30 @@ const {foo: /*1*/myFoo, bar: /*2*/myBar} = fubar;
 	f.VerifyQuickInfoAt(t, "1", "const myFoo: number", "foo comment")
 	f.VerifyQuickInfoAt(t, "2", "const myBar: string", "bar comment")
 }
+
+func TestDestructuredWithOwnJSDoc(t *testing.T) {
+	t.Parallel()
+	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
+	const content = `
+interface Foo {
+    /** This is bar from the interface */
+    bar: string;
+    /** This is baz from the interface */
+    baz: number;
+}
+
+declare var foo: Foo;
+
+/** Comment on the variable statement. */
+const {
+    /** Comment on bar destructuring. */ /*1*/bar,
+    /** Comment on baz destructuring. */ /*2*/baz
+} = foo;
+`
+	f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content)
+	defer done()
+	// When binding elements have their own JSDoc, TypeScript doesn't currently show it in hover
+	// Instead, it falls back to the property's JSDoc from the interface
+	f.VerifyQuickInfoAt(t, "1", "const bar: string", "This is bar from the interface")
+	f.VerifyQuickInfoAt(t, "2", "const baz: number", "This is baz from the interface")
+}

internal/ls/hover.go

@@ -71,39 +71,36 @@ func (l *LanguageService) getQuickInfoAndDocumentationForSymbol(c *checker.Check
 }
 
 func (l *LanguageService) getDocumentationFromDeclaration(c *checker.Checker, symbol *ast.Symbol, declaration *ast.Node, location *ast.Node, contentFormat lsproto.MarkupKind) string {
-	// Handle binding elements specially (variables created from destructuring) - we need to get the documentation from the property type
-	// The declaration passed in might be the binding element itself, but we need the interface property declaration
-	// Check all declarations to see if any is a binding element
-	if symbol != nil && ast.IsIdentifier(location) {
-		for _, decl := range symbol.Declarations {
-			if decl != nil && ast.IsBindingElement(decl) {
-				bindingElement := decl
-				parent := bindingElement.Parent
-				name := bindingElement.PropertyName()
-				if name == nil {
-					name = bindingElement.Name()
-				}
-				if ast.IsIdentifier(name) && ast.IsObjectBindingPattern(parent) {
-					propertyName := name.Text()
-					objectType := c.GetTypeAtLocation(parent)
-					if objectType != nil {
-						propertySymbol := findPropertyInType(c, objectType, propertyName)
-						if propertySymbol != nil && propertySymbol.ValueDeclaration != nil {
-							declaration = propertySymbol.ValueDeclaration
-							break
-						}
-					}
-				}
-			}
-		}
-	}
-
 	if declaration == nil {
 		return ""
 	}
+
 	isMarkdown := contentFormat == lsproto.MarkupKindMarkdown
 	var b strings.Builder
-	if jsdoc := getJSDocOrTag(c, declaration); jsdoc != nil && !containsTypedefTag(jsdoc) {
+	jsdoc := getJSDocOrTag(c, declaration)
+	
+	// Handle binding elements specially (variables created from destructuring) - we need to get the documentation from the property type
+	// If the binding element doesn't have its own JSDoc, fall back to the property's JSDoc
+	if jsdoc == nil && symbol != nil && symbol.ValueDeclaration != nil && ast.IsBindingElement(symbol.ValueDeclaration) && ast.IsIdentifier(location) {
+		bindingElement := symbol.ValueDeclaration
+		parent := bindingElement.Parent
+		name := bindingElement.PropertyName()
+		if name == nil {
+			name = bindingElement.Name()
+		}
+		if ast.IsIdentifier(name) && ast.IsObjectBindingPattern(parent) {
+			propertyName := name.Text()
+			objectType := c.GetTypeAtLocation(parent)
+			if objectType != nil {
+				propertySymbol := findPropertyInType(c, objectType, propertyName)
+				if propertySymbol != nil && propertySymbol.ValueDeclaration != nil {
+					jsdoc = getJSDocOrTag(c, propertySymbol.ValueDeclaration)
+				}
+			}
+		}
+	}
+	
+	if jsdoc != nil && !containsTypedefTag(jsdoc) {
 		l.writeComments(&b, c, jsdoc.Comments(), isMarkdown)
 		if jsdoc.Kind == ast.KindJSDoc {
 			if tags := jsdoc.AsJSDoc().Tags; tags != nil {