Fix/RCS1031, RCS1208 and RCS1061 #1062
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
josefpihrt
requested changes
Apr 15, 2023
src/Common/CSharp/Analysis/ReduceIfNesting/IfLocalVariableAnalysis.cs
Outdated
Show resolved
Hide resolved
src/Common/CSharp/Analysis/ReduceIfNesting/IfLocalVariableAnalysis.cs
Outdated
Show resolved
Hide resolved
src/Analyzers/CSharp/Analysis/RemoveUnnecessaryBracesInSwitchSectionAnalyzer.cs
Outdated
Show resolved
Hide resolved
src/Analyzers/CSharp/Analysis/RemoveUnnecessaryBracesInSwitchSectionAnalyzer.cs
Outdated
Show resolved
Hide resolved
src/Common/CSharp/Analysis/ReduceIfNesting/IfLocalVariableAnalysis.cs
Outdated
Show resolved
Hide resolved
|
@jamesHargreaves12 I noticed that there multiple small fixes like formatting, trailing whitespace, implicit/explicit type etc. I suggest to run script |
|
@jamesHargreaves12 I would like to release new version in about one week and I would like to include this PR in the new version. Could you let me know if you will have time to address my comments so the PR can me merged? Thanks. |
josefpihrt
requested changes
Apr 17, 2023
src/Common/CSharp/Analysis/ReduceIfNesting/IfLocalVariableAnalysis.cs
Outdated
Show resolved
Hide resolved
src/Common/CSharp/Analysis/ReduceIfNesting/IfLocalVariableAnalysis.cs
Outdated
Show resolved
Hide resolved
src/Analyzers/CSharp/Analysis/PattenMatchingAnalysis/PattenMatchingVariableDeclarationHelper.cs
Outdated
Show resolved
Hide resolved
src/Common/CSharp/Analysis/ReduceIfNesting/IfLocalVariableAnalysis.cs
Outdated
Show resolved
Hide resolved
src/Analyzers/CSharp/Analysis/RemoveUnnecessaryBracesInSwitchSectionAnalyzer.cs
Outdated
Show resolved
Hide resolved
src/Common/CSharp/Analysis/ReduceIfNesting/IfLocalVariableAnalysis.cs
Outdated
Show resolved
Hide resolved
src/Common/CSharp/Analysis/ReduceIfNesting/IfLocalVariableAnalysis.cs
Outdated
Show resolved
Hide resolved
josefpihrt
approved these changes
Apr 21, 2023
josefpihrt
force-pushed
the
fix/RCS1031-and-RCS1208
branch
from
610dc14 to
94323c7
Compare
josefpihrt
approved these changes
Apr 21, 2023
Haarmees
pushed a commit
to Haarmees/Roslynator
that referenced
this pull request
Oct 30, 2023
Co-authored-by: Josef Pihrt <josef@pihrt.net>
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.
This PR extends the local variable check from #1039 to RCS1061 and also checks variables assigned during pattern matching in the case of RCS1031.
Slightly embarrassingly, I didn't check all the ReduceIfNestingAnalysis code paths in #1039 and so I didn't realise that the AnalyzeDataFlow can only handle an argument of type ExpressionSyntax or StatementSyntax. If you pass anything else, it will throw a run time error. This PR solves this issue through the new helper function
IfStatementLocalVariableAnalysis.TryGetOuterScopewhich handles the intricacies of this. I have also added a number of new tests at the level of RCS1208 to enforce this behaviour.It is currently not trivial to test the Loop / Switch sections of ReduceIfNestingAnalysis.AnalyzeCore via the analyzer as it passes through ReduceIfNestingOptions.None. However, I manually removed the guard clause on lines 63 and 90 and confirmed that it was working correctly.