-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Fix js declaration emit for inherited and this-typed inherited fields #37970
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.
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
weswigham
merged 1 commit into
microsoft:master
from
weswigham:js-declaration-emit-this-and-inherited-fields
Apr 21, 2020
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| //// [index.js] | ||
| export class A { | ||
| /** @returns {this} */ | ||
| method() { | ||
| return this; | ||
| } | ||
| } | ||
| export default class Base extends A { | ||
| // This method is required to reproduce #35932 | ||
| verify() { } | ||
| } | ||
|
|
||
| //// [index.js] | ||
| "use strict"; | ||
| 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 (b.hasOwnProperty(p)) d[p] = b[p]; }; | ||
| return extendStatics(d, b); | ||
| }; | ||
| return function (d, b) { | ||
| extendStatics(d, b); | ||
| function __() { this.constructor = d; } | ||
| d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); | ||
| }; | ||
| })(); | ||
| exports.__esModule = true; | ||
| exports.A = void 0; | ||
| var A = /** @class */ (function () { | ||
| function A() { | ||
| } | ||
| /** @returns {this} */ | ||
| A.prototype.method = function () { | ||
| return this; | ||
| }; | ||
| return A; | ||
| }()); | ||
| exports.A = A; | ||
| var Base = /** @class */ (function (_super) { | ||
| __extends(Base, _super); | ||
| function Base() { | ||
| return _super !== null && _super.apply(this, arguments) || this; | ||
| } | ||
| // This method is required to reproduce #35932 | ||
| Base.prototype.verify = function () { }; | ||
| return Base; | ||
| }(A)); | ||
| exports["default"] = Base; | ||
|
|
||
|
|
||
| //// [index.d.ts] | ||
| export class A { | ||
| /** @returns {this} */ | ||
| method(): this; | ||
| } | ||
| export default class Base extends A { | ||
| verify(): void; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| === tests/cases/conformance/jsdoc/declarations/index.js === | ||
| export class A { | ||
| >A : Symbol(A, Decl(index.js, 0, 0)) | ||
|
|
||
| /** @returns {this} */ | ||
| method() { | ||
| >method : Symbol(A.method, Decl(index.js, 0, 16)) | ||
|
|
||
| return this; | ||
| >this : Symbol(A, Decl(index.js, 0, 0)) | ||
| } | ||
| } | ||
| export default class Base extends A { | ||
| >Base : Symbol(Base, Decl(index.js, 5, 1)) | ||
| >A : Symbol(A, Decl(index.js, 0, 0)) | ||
|
|
||
| // This method is required to reproduce #35932 | ||
| verify() { } | ||
| >verify : Symbol(Base.verify, Decl(index.js, 6, 37)) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| === tests/cases/conformance/jsdoc/declarations/index.js === | ||
| export class A { | ||
| >A : A | ||
|
|
||
| /** @returns {this} */ | ||
| method() { | ||
| >method : () => this | ||
|
|
||
| return this; | ||
| >this : this | ||
| } | ||
| } | ||
| export default class Base extends A { | ||
| >Base : Base | ||
| >A : A | ||
|
|
||
| // This method is required to reproduce #35932 | ||
| verify() { } | ||
| >verify : () => void | ||
| } |
17 changes: 17 additions & 0 deletions
17
tests/cases/conformance/jsdoc/declarations/jsDeclarationsThisTypes.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| // @allowJs: true | ||
| // @checkJs: true | ||
| // @outDir: /out | ||
| // @lib: es6 | ||
| // @declaration: true | ||
| // @filename: index.js | ||
|
|
||
| export class A { | ||
| /** @returns {this} */ | ||
| method() { | ||
| return this; | ||
| } | ||
| } | ||
| export default class Base extends A { | ||
| // This method is required to reproduce #35932 | ||
| verify() { } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not 100% sure what triggered these changes, but seems fine?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The intervening number got marked as potentially used when traversing the base classes, but then ultimately elided, I believe. I could put in some extra effort to keep the numbers compressed, but because it doesn't particularly matter, I saw no reason to.