Issue an error on cross-file merges we can't emit#38148
Merged
weswigham merged 1 commit intomicrosoft:masterfrom Apr 24, 2020
Merged
Issue an error on cross-file merges we can't emit#38148weswigham merged 1 commit intomicrosoft:masterfrom
weswigham merged 1 commit intomicrosoft:masterfrom
Conversation
sandersn
approved these changes
Apr 23, 2020
Member
sandersn
left a comment
sandersn
left a comment
There was a problem hiding this comment.
Looks good, although it's a little weird that tracker and reportNonlocalAugmentation might be optional.
| const localName = getInternalSymbolName(s, name); | ||
| const aliasDecl = s.declarations && getDeclarationOfAliasSymbol(s); | ||
| if (containingFile && (aliasDecl ? containingFile !== getSourceFileOfNode(aliasDecl) : !some(s.declarations, d => getSourceFileOfNode(d) === containingFile))) { | ||
| context.tracker?.reportNonlocalAugmentation?.(containingFile, symbol, s); |
Member
There was a problem hiding this comment.
that is an impressive number of ?. there
Member
|
Is this PR relevant to #37896? |
andrewbranch
approved these changes
Apr 23, 2020
sheetalkamat
approved these changes
Apr 23, 2020
Member
Author
Don't think so - this is mostly just possible because we allow |
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
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 #34994
I asked @sandersn and he was more comfortable issuing an error (at least for now) than attempting a fix that automatically wrote augmentation declarations.