fix(2260): preserve inherited jsdoc details

Author: a-tarasyuk

internal/ls/hover.go

@@ -75,8 +75,15 @@ func (l *LanguageService) getDocumentationFromDeclaration(c *checker.Checker, de
 		return ""
 	}
 	isMarkdown := contentFormat == lsproto.MarkupKindMarkdown
+
 	var b strings.Builder
-	if jsdoc := getJSDocOrTag(c, declaration); jsdoc != nil && !containsTypedefTag(jsdoc) {
+	for _, jsdoc := range []*ast.Node{
+		getInheritedJSDocOrTag(c, declaration),
+		getJSDocOrTag(c, declaration),
+	} {
+		if jsdoc == nil || containsTypedefTag(jsdoc) {
+			continue
+		}
 		l.writeComments(&b, c, jsdoc.Comments(), isMarkdown)
 		if jsdoc.Kind == ast.KindJSDoc {
 			if tags := jsdoc.AsJSDoc().Tags; tags != nil {
@@ -425,17 +432,26 @@ func getJSDocOrTag(c *checker.Checker, node *ast.Node) *ast.Node {
 		(ast.IsVariableDeclaration(node.Parent) || ast.IsPropertyDeclaration(node.Parent) || ast.IsPropertyAssignment(node.Parent)) && node.Parent.Initializer() == node:
 		return getJSDocOrTag(c, node.Parent)
 	}
+	return nil
+}
+
+func getInheritedJSDocOrTag(c *checker.Checker, node *ast.Node) *ast.Node {
+	if ast.IsGetAccessorDeclaration(node) || ast.IsSetAccessorDeclaration(node) {
+		return nil
+	}
 	if symbol := node.Symbol(); symbol != nil && node.Parent != nil && ast.IsClassOrInterfaceLike(node.Parent) {
 		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())
 			}
 			if prop := c.GetPropertyOfType(t, symbol.Name); prop != nil && prop.ValueDeclaration != nil {
-				if jsDoc := getJSDocOrTag(c, prop.ValueDeclaration); jsDoc != nil {
-					return jsDoc
+				jsDoc := getJSDocOrTag(c, prop.ValueDeclaration)
+				if jsDoc == nil {
+					return getInheritedJSDocOrTag(c, prop.ValueDeclaration)
 				}
+				return jsDoc
 			}
 		}
 	}

testdata/baselines/reference/fourslash/quickInfo/quickInfoInheritDoc.baseline

@@ -40,6 +40,9 @@
 // | ```tsx
 // | (method) SubClass.doSomethingUseful(mySpecificStuff?: { tiger: string; lion: string; }): string
 // | ```
+// | Useful description always applicable
+// | 
+// | *@returns* — Useful description of return value always applicable.
 // | 
 // | 
 // | *@inheritDoc*
@@ -65,6 +68,12 @@
 // | ```tsx
 // | (method) SubClass.func1(stuff1: any): void
 // | ```
+// | BaseClass.func1
+// | 
+// | *@param* `stuff1` — BaseClass.func1.stuff1
+// | 
+// | 
+// | *@returns* — BaseClass.func1.returns
 // | 
 // | 
 // | *@inheritDoc*
@@ -88,7 +97,7 @@
 // | ```tsx
 // | (property) SubClass.someProperty: string
 // | ```
-// | text over tag
+// | Applicable description always.text over tag
 // | 
 // | *@inheritDoc* — text after tag
 // | 
@@ -108,7 +117,7 @@
     "item": {
       "contents": {
         "kind": "markdown",
-        "value": "```tsx\n(method) SubClass.doSomethingUseful(mySpecificStuff?: { tiger: string; lion: string; }): string\n```\n\n\n*@inheritDoc*\n\n*@param* `mySpecificStuff` — Description of my specific parameter.\n"
+        "value": "```tsx\n(method) SubClass.doSomethingUseful(mySpecificStuff?: { tiger: string; lion: string; }): string\n```\nUseful description always applicable\n\n*@returns* — Useful description of return value always applicable.\n\n\n*@inheritDoc*\n\n*@param* `mySpecificStuff` — Description of my specific parameter.\n"
       },
       "range": {
         "start": {
@@ -135,7 +144,7 @@
     "item": {
       "contents": {
         "kind": "markdown",
-        "value": "```tsx\n(method) SubClass.func1(stuff1: any): void\n```\n\n\n*@inheritDoc*\n\n*@param* `stuff1` — SubClass.func1.stuff1\n\n\n*@returns* — SubClass.func1.returns\n"
+        "value": "```tsx\n(method) SubClass.func1(stuff1: any): void\n```\nBaseClass.func1\n\n*@param* `stuff1` — BaseClass.func1.stuff1\n\n\n*@returns* — BaseClass.func1.returns\n\n\n*@inheritDoc*\n\n*@param* `stuff1` — SubClass.func1.stuff1\n\n\n*@returns* — SubClass.func1.returns\n"
       },
       "range": {
         "start": {
@@ -162,7 +171,7 @@
     "item": {
       "contents": {
         "kind": "markdown",
-        "value": "```tsx\n(property) SubClass.someProperty: string\n```\ntext over tag\n\n*@inheritDoc* — text after tag\n"
+        "value": "```tsx\n(property) SubClass.someProperty: string\n```\nApplicable description always.text over tag\n\n*@inheritDoc* — text after tag\n"
       },
       "range": {
         "start": {

testdata/baselines/reference/fourslash/quickInfo/quickInfoInheritDoc2.baseline

@@ -18,7 +18,7 @@
 // | ```tsx
 // | (property) SubClass.prop: T
 // | ```
-// | 
+// | Base.prop
 // | 
 // | *@inheritdoc* — SubClass.prop
 // | 
@@ -38,7 +38,7 @@
     "item": {
       "contents": {
         "kind": "markdown",
-        "value": "```tsx\n(property) SubClass.prop: T\n```\n\n\n*@inheritdoc* — SubClass.prop\n"
+        "value": "```tsx\n(property) SubClass.prop: T\n```\nBase.prop\n\n*@inheritdoc* — SubClass.prop\n"
       },
       "range": {
         "start": {

testdata/baselines/reference/fourslash/quickInfo/quickInfoInheritDoc3.baseline

@@ -19,7 +19,7 @@
 // | ```tsx
 // | (property) SubClass.prop: string
 // | ```
-// | 
+// | Base.prop
 // | 
 // | *@inheritdoc* — SubClass.prop
 // | 
@@ -39,7 +39,7 @@
     "item": {
       "contents": {
         "kind": "markdown",
-        "value": "```tsx\n(property) SubClass.prop: string\n```\n\n\n*@inheritdoc* — SubClass.prop\n"
+        "value": "```tsx\n(property) SubClass.prop: string\n```\nBase.prop\n\n*@inheritdoc* — SubClass.prop\n"
       },
       "range": {
         "start": {

testdata/baselines/reference/fourslash/quickInfo/quickInfoJsDocTags6.baseline

@@ -22,6 +22,21 @@
 // | ```tsx
 // | (method) Bar.method(x: any, y: any): number
 // | ```
+// | comment
+// | 
+// | *@author* — Me <me@domain.tld>
+// | 
+// | 
+// | *@see* `x` — (the parameter)
+// | 
+// | 
+// | *@param* `x` - x comment
+// | 
+// | 
+// | *@param* `y` - y comment
+// | 
+// | 
+// | *@returns* — The result
 // | 
 // | 
 // | *@inheritDoc*
@@ -44,7 +59,7 @@
     "item": {
       "contents": {
         "kind": "markdown",
-        "value": "```tsx\n(method) Bar.method(x: any, y: any): number\n```\n\n\n*@inheritDoc*"
+        "value": "```tsx\n(method) Bar.method(x: any, y: any): number\n```\ncomment\n\n*@author* — Me <me@domain.tld>\n\n\n*@see* `x` — (the parameter)\n\n\n*@param* `x` - x comment\n\n\n*@param* `y` - y comment\n\n\n*@returns* — The result\n\n\n*@inheritDoc*"
       },
       "range": {
         "start": {