Simplify the simplification code.#59864
Merged
CyrusNajmabadi merged 3 commits intodotnet:mainfrom Mar 3, 2022
Merged
Conversation
CyrusNajmabadi
commented
Mar 2, 2022
| public readonly SyntaxNodeOrToken NodeOrToken; | ||
| public readonly bool SimplifyAllDescendants; | ||
| public readonly SyntaxNodeOrToken OriginalNodeOrToken; | ||
| public readonly bool CanBeSpeculated; |
Contributor
Author
There was a problem hiding this comment.
canbespeculated was never used. removed.
CyrusNajmabadi
commented
Mar 2, 2022
| private readonly Func<SyntaxNodeOrToken, bool> _isNodeOrTokenOutsideSimplifySpans; | ||
|
|
||
| private static readonly Func<SyntaxNode, bool> s_containsAnnotations = n => n.ContainsAnnotations; | ||
| private static readonly Func<SyntaxNodeOrToken, bool> s_hasSimplifierAnnotation = n => n.HasAnnotation(Simplifier.Annotation); |
Contributor
Author
There was a problem hiding this comment.
moved up and shared between c# and vb.
CyrusNajmabadi
commented
Mar 2, 2022
| protected static readonly Func<SyntaxNode, bool> s_containsAnnotations = n => n.ContainsAnnotations; | ||
| protected static readonly Func<SyntaxNodeOrToken, bool> s_hasSimplifierAnnotation = n => n.HasAnnotation(Simplifier.Annotation); | ||
|
|
||
| private readonly ImmutableArray<AbstractReducer> _reducers; |
Contributor
Author
There was a problem hiding this comment.
made readonly.
CyrusNajmabadi
commented
Mar 2, 2022
| Return VisitMethodBlockBaseSyntax(node, | ||
| Function(n, b, s, e) | ||
| Return DirectCast(n, MethodBlockSyntax).Update(node.Kind, DirectCast(b, MethodStatementSyntax), s, e) | ||
| End Function |
Contributor
Author
There was a problem hiding this comment.
inlined lambdas.
CyrusNajmabadi
commented
Mar 2, 2022
| IsNodeVariableDeclaratorOfFieldDeclaration(node) AndAlso | ||
| Me._simplifyAllDescendants Then | ||
| Me._nodesAndTokensToReduce.Add(New NodeOrTokenToReduce(node, False, node, False)) | ||
| Me._nodesAndTokensToReduce.Add(New NodeOrTokenToReduce(node, False, node)) |
Contributor
Author
There was a problem hiding this comment.
that last parameter was passed, but never read. removed.
akhera99
approved these changes
Mar 2, 2022
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
No description provided.