Extract method cleanup #76550
Open
Extract method cleanup #76550
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
dotnet-issue-labeler
bot
added
Area-IDE
untriaged
CyrusNajmabadi
commented
Dec 22, 2024
|
|
||
| public bool IsExtractMethodOnSingleStatement() |
There was a problem hiding this comment.
moved to SelectionInfo.GetSelectionType. This should be computed once, not over and oer again.
CyrusNajmabadi
commented
Dec 22, 2024
| { | ||
| return false; | ||
| } | ||
| if (!this.ContainsValidSelection) |
There was a problem hiding this comment.
pulled out common logic from VB and C#.
CyrusNajmabadi
commented
Dec 22, 2024
| static bool CanMergeExistingSpineWithCurrent(ISyntaxFacts syntaxFacts, T existing, T current) | ||
| => syntaxFacts.AreStatementsInSameContainer(existing, current); | ||
| } | ||
| protected (TStatementSyntax firstStatement, TStatementSyntax lastStatement)? GetStatementRangeContainingSpan( |
There was a problem hiding this comment.
no need for this method to be generic, it was always being passed the TStatementSyntax type.
CyrusNajmabadi
commented
Dec 22, 2024
| } | ||
|
|
||
| return (firstStatement, lastStatement); | ||
|
|
||
| static bool CanMergeExistingSpineWithCurrent(ISyntaxFacts syntaxFacts, T existing, T current) |
There was a problem hiding this comment.
inlined this method. it no longer uses syntaxFacts, it ust calls into an abstract method on this type.
CyrusNajmabadi
commented
Dec 22, 2024
| return (firstStatement, lastStatement); | ||
| } | ||
|
|
||
| protected sealed class SelectionInfo |
There was a problem hiding this comment.
extracted to file.
CyrusNajmabadi
commented
Dec 22, 2024
| if (token1.Parent == null || token2.Parent == null) | ||
| { | ||
| return null; | ||
| } |
There was a problem hiding this comment.
these can't happen in real code. so just changed to GetrequiredParent() to ensure that.
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.
Cleanup work in the extract method codebase before doign some more major feature work. I've documented int eh PR what changes i'm making. Should be reviewed with whitespace off.