Fix expando handling in getTypeReferenceType #34712
Merged
Conversation
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
getExpandoSymbol looks for the initialiser of a symbol when it is an
expando value (IIFEs, function exprs, class exprs and empty object
literals) and returns the symbol.
Previously, however, it returned the symbol of the initialiser without
merging with the declaration symbol itself. This missed, in particular,
the prototype assignment in the following pattern:
```js
var x = function x() {
this.y = 1
}
x.prototype = {
z() { }
}
/** @type {x} */
var xx;
xx.z // missed!
```
getJSDocValueReference had weird try-again code that relied on calling
getTypeOfSymbol, which *does* correctly merge the symbols. This PR
re-removes that code and instead makes getExpandoSymbol call
mergeJSSymbols itself.
sandersn
commented
Oct 24, 2019
| @@ -24997,7 +25001,7 @@ namespace ts { | |||
| } | |||
|
|
|||
| function mergeJSSymbols(target: Symbol, source: Symbol | undefined) { | |||
| if (source && (hasEntries(source.exports) || hasEntries(source.members))) { | |||
There was a problem hiding this comment.
turns out we need to merge just for the flags sometimes.
| @@ -3,14 +3,12 @@ | |||
| // @allowJs: true | |||
| // @checkJs: true | |||
|
|
|||
| // @Filename: test.js | |||
There was a problem hiding this comment.
this is now a single-file repro. It is still written in such a way that function wp is checked after p.isServiceProject.
weswigham
approved these changes
Oct 24, 2019
sandersn
deleted the
fix-expando-symbol-handling-in-getTypeReferenceType
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
getExpandoSymbol looks for the initialiser of a symbol when it is an expando value (IIFEs, function exprs, class exprs and empty object literals) and returns the symbol.
Previously, however, it returned the symbol of the initialiser without merging with the declaration symbol itself. This missed, in particular, the prototype assignment in the following pattern:
getJSDocValueReference had weird try-again code that relied on calling getTypeOfSymbol, which does correctly merge the symbols. This PR re-removes that code and instead makes getExpandoSymbol call mergeJSSymbols itself.
Fixes #34707