Skip to content

Commit

Permalink
Cherry-pick #50724 to release-4.8 (#50760)
Browse files Browse the repository at this point in the history
Co-authored-by: Oleksandr T <oleksandr.tarasiuk@outlook.com>
  • Loading branch information
jakebailey and a-tarasyuk authored Sep 22, 2022
1 parent a3b3555 commit 5773723
Show file tree
Hide file tree
Showing 7 changed files with 94 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/compiler/parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,7 @@ namespace ts {
case SyntaxKind.JSDocProtectedTag:
case SyntaxKind.JSDocReadonlyTag:
case SyntaxKind.JSDocDeprecatedTag:
case SyntaxKind.JSDocOverrideTag:
return visitNode(cbNode, (node as JSDocTag).tagName)
|| (typeof (node as JSDoc).comment === "string" ? undefined : visitNodes(cbNode, cbNodes, (node as JSDoc).comment as NodeArray<JSDocComment> | undefined));
case SyntaxKind.PartiallyEmittedExpression:
Expand Down
2 changes: 1 addition & 1 deletion src/services/goToDefinition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace ts.GoToDefinition {
const { parent } = node;
const typeChecker = program.getTypeChecker();

if (node.kind === SyntaxKind.OverrideKeyword || (isJSDocOverrideTag(node) && rangeContainsPosition(node.tagName, position))) {
if (node.kind === SyntaxKind.OverrideKeyword || (isIdentifier(node) && isJSDocOverrideTag(parent) && parent.tagName === node)) {
return getDefinitionFromOverriddenMember(typeChecker, node) || emptyArray;
}

Expand Down
45 changes: 45 additions & 0 deletions tests/baselines/reference/jsdocLinkTag6.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
//// [a.ts]
class A {
foo() {}
}
class B extends A {
/**
* @override {@link A.foo}
*/
foo() {}
}


//// [a.js]
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
return extendStatics(d, b);
};
return function (d, b) {
if (typeof b !== "function" && b !== null)
throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
extendStatics(d, b);
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
var A = /** @class */ (function () {
function A() {
}
A.prototype.foo = function () { };
return A;
}());
var B = /** @class */ (function (_super) {
__extends(B, _super);
function B() {
return _super !== null && _super.apply(this, arguments) || this;
}
/**
* @override {@link A.foo}
*/
B.prototype.foo = function () { };
return B;
}(A));
18 changes: 18 additions & 0 deletions tests/baselines/reference/jsdocLinkTag6.symbols
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
=== /a.ts ===
class A {
>A : Symbol(A, Decl(a.ts, 0, 0))

foo() {}
>foo : Symbol(A.foo, Decl(a.ts, 0, 9))
}
class B extends A {
>B : Symbol(B, Decl(a.ts, 2, 1))
>A : Symbol(A, Decl(a.ts, 0, 0))

/**
* @override {@link A.foo}
*/
foo() {}
>foo : Symbol(B.foo, Decl(a.ts, 3, 19))
}

18 changes: 18 additions & 0 deletions tests/baselines/reference/jsdocLinkTag6.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
=== /a.ts ===
class A {
>A : A

foo() {}
>foo : () => void
}
class B extends A {
>B : B
>A : A

/**
* @override {@link A.foo}
*/
foo() {}
>foo : () => void
}

10 changes: 10 additions & 0 deletions tests/cases/conformance/jsdoc/jsdocLinkTag6.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// @filename: /a.ts
class A {
foo() {}
}
class B extends A {
/**
* @override {@link A.foo}
*/
foo() {}
}
2 changes: 1 addition & 1 deletion tests/cases/fourslash/goToDefinitionOverriddenMember11.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//// /*Foo_m*/m() {}
////}
////class Bar extends Foo {
//// /** [|@over{|"name": "1"|}ride[| se{|"name": "2"|}e {@li{|"name": "3"|}nk https://test.c{|"name": "4"|}om} {|"name": "5"|}description |]|]*/
//// /** @[|over{|"name": "1"|}ride|][| se{|"name": "2"|}e {@li{|"name": "3"|}nk https://test.c{|"name": "4"|}om} {|"name": "5"|}description |]*/
//// m() {}
////}

Expand Down

0 comments on commit 5773723

Please sign in to comment.