Don't include class getter in spread type #26287
Merged
Conversation
This file contains 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
ghost
force-pushed
the
spreadClassGetter
branch
from
718e66b to
7dded40
Compare
sandersn
reviewed
Aug 8, 2018
src/compiler/checker.ts
Outdated
| @@ -9694,6 +9687,13 @@ namespace ts { | |||
| return spread; | |||
| } | |||
|
|
|||
| function isSpreadableProperty(prop: Symbol): boolean { | |||
| // We approximate own properties as non-methods plus methods that are inside the object literal | |||
src/compiler/checker.ts
Outdated
| const isPrivate = getDeclarationModifierFlagsFromSymbol(prop) & (ModifierFlags.Private | ModifierFlags.Protected); | ||
| const isSetOnlyAccessor = prop.flags & SymbolFlags.SetAccessor && !(prop.flags & SymbolFlags.GetAccessor); | ||
| if (!inNamesToRemove && !isPrivate && !isClassMethod(prop) && !isSetOnlyAccessor) { | ||
| if (!names.has(prop.escapedName) && !(getDeclarationModifierFlagsFromSymbol(prop) & (ModifierFlags.Private | ModifierFlags.Protected)) && isSpreadableProperty(prop)) { |
There was a problem hiding this comment.
It would be nice to wrap this line. It’s not readable on github’s default style sheet.
ajafff
reviewed
Aug 9, 2018
src/compiler/checker.ts
Outdated
| // We approximate own properties as non-methods plus methods that are inside the object literal | ||
| return prop.flags & (SymbolFlags.Method | SymbolFlags.GetAccessor) | ||
| ? !prop.declarations.some(decl => isClassLike(decl.parent)) | ||
| : !(prop.flags & SymbolFlags.SetAccessor); // Setter without getter is not spreadable |
There was a problem hiding this comment.
A Setter is actually spreadable and results in undefined:
({
foo: 1,
...{set foo(v) {}}
}).foo === undefined;There was a problem hiding this comment.
Can you open a new issue for that? It’s different from skipping things that come from classes.
There was a problem hiding this comment.
Will do. It seemed to me like this condition was added in this PR
There was a problem hiding this comment.
No, I thought so too, but it's just adding accessors to the list of things that are skipped when they come from a class declaration.
This was referenced Aug 9, 2018
sandersn
approved these changes
Aug 9, 2018
errendir
added a commit
to errendir/TypeScript
that referenced
this pull request
Aug 11, 2018
* origin/master: (283 commits) Don't error on destructure of private property with computed property syntax (microsoft#26360) getDefaultExportInfo: Use `getImmediateAliasedSymbol` instead of `getAliasedSymbol` (microsoft#26364) review comments restore old algorithm Dont use baseURL relative absolute paths in declaration emit, use absolute paths in bundle emit (microsoft#26341) Update user baselines (microsoft#26358) Don't store @template constraint in a TypeParameterDeclaration node (microsoft#26283) fixAddMissingMember: Support interface and don't crash on type parameter (microsoft#25995) Don't include class getter in spread type (microsoft#26287) Don't crash on computed property in destructure (microsoft#26334) Check the ambientness of a symbol name before attempting to trim it (microsoft#26312) Still generate signatures in SkipContextSensitive mode just to match on return types (microsoft#25937) fix handling if there is no commonPrefix Actually add sorting of elaboration text to user baselines Ping ryan instead of mohammed for user PRs now handle failed lookups make it work for root directory really, really fix test(?) add test fix commonPrefix handling ...
This pull request was closed.
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.
Fixes #26279