Port Extract Method fixes from master #18518
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
|
@amcasey, |
|
Hold off on reviewing this - I have to rebase away #18516. |
amcasey
force-pushed
the
ExtractMethodFixes25
branch
from
68ae415
to
30ac684
Compare
|
I dropped everything about type parameters, but kept the fourslash changes to make merging easier. |
mhegazy
approved these changes
Sep 20, 2017
|
Turns out it was merged in in 387fc20. I'll rebase and fix it. |
Partial port of ea4fdc5
Check `scope.name` when trying to extract from an anon class (cherry picked from commit c7b4ed3)
Handle the combination of a write and a void return (cherry picked from commit 02cfb81)
Simplify and correct PermittedJumps computation (cherry picked from commit deefb01)
Improve insertion position of extracted methods (cherry picked from commit 40e4591)
Call getShorthandAssignmentValueSymbol rather than getSymbolAtLocation (cherry picked from commit aade971)
Only introduce return properties at the top level (cherry picked from commit 288a57c)
Forbid extraction of empty spans (cherry picked from commit be5c00f)
Re-enable extraction of a single token (cherry picked from commit 47b61ac)
selection Fixes microsoft#18546 (cherry picked from commit af49c60)
amcasey
force-pushed
the
ExtractMethodFixes25
branch
from
c354e51
to
27bede8
Compare
RyanCavanaugh
approved these changes
Sep 20, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Built on top of #18516. If we don't merge that PR, this one will have to be redone since there are merge conflicts and one of these fixes is specific to type parameters.