Consolidate Empty(If|Else)Block into EmptyConditionBlock #3376
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using Rubberduck.Inspections.Abstract; | ||
| using Rubberduck.Parsing.Inspections.Abstract; | ||
| using Rubberduck.Parsing.Inspections.Resources; | ||
| using Antlr4.Runtime; | ||
| using Antlr4.Runtime.Misc; | ||
| using Rubberduck.Parsing.Grammar; | ||
| using Rubberduck.Parsing; | ||
| using Rubberduck.Parsing.VBA; | ||
| using Rubberduck.Inspections.Results; | ||
|
|
||
| namespace Rubberduck.Inspections.Concrete | ||
| { | ||
| [Flags] | ||
| public enum ConditionBlockToInspect | ||
| { | ||
| NA = 0x0, | ||
| If = 0x1, | ||
| ElseIf = 0x2, | ||
| Else = 0x4, | ||
| All = If | ElseIf | Else | ||
| } | ||
|
|
||
| internal class EmptyConditionBlockInspection : ParseTreeInspectionBase | ||
| { | ||
| public EmptyConditionBlockInspection(RubberduckParserState state, | ||
| ConditionBlockToInspect BlockToInspect) | ||
|
There was a problem hiding this comment. Ninject has no idea how to create the inspection instance, |
||
| : base(state, CodeInspectionSeverity.Suggestion) | ||
| { | ||
| _blockToInspect = BlockToInspect; | ||
| _listener = new EmptyConditionBlockListener(BlockToInspect); | ||
| } | ||
|
|
||
| public static ConditionBlockToInspect _blockToInspect { get; private set; } | ||
|
|
||
| public override Type Type => typeof(EmptyConditionBlockInspection); | ||
|
|
||
| public override IEnumerable<IInspectionResult> GetInspectionResults() | ||
| { | ||
| return Listener.Contexts | ||
| .Where(result => !IsIgnoringInspectionResultFor(result.ModuleName, result.Context.Start.Line)) | ||
| .Select(result => new QualifiedContextInspectionResult(this, | ||
| InspectionsUI.EmptyConditionBlockInspectionsResultFormat, | ||
| result)); | ||
| } | ||
|
|
||
| private IInspectionListener _listener; | ||
| public override IInspectionListener Listener { get { return _listener; } } | ||
|
|
||
| public class EmptyConditionBlockListener : EmptyBlockInspectionListenerBase | ||
| { | ||
| ConditionBlockToInspect _blockToInspect; | ||
|
|
||
| public EmptyConditionBlockListener(ConditionBlockToInspect blockToInspect) | ||
| { | ||
| _blockToInspect = blockToInspect; | ||
| } | ||
|
|
||
| public override void EnterIfStmt([NotNull] VBAParser.IfStmtContext context) | ||
| { | ||
| if (_blockToInspect.HasFlag(ConditionBlockToInspect.If)) | ||
| { | ||
| InspectBlockForExecutableStatements(context.block(), context); | ||
| } | ||
| } | ||
|
|
||
| public override void EnterElseIfBlock([NotNull] VBAParser.ElseIfBlockContext context) | ||
| { | ||
| if (_blockToInspect.HasFlag(ConditionBlockToInspect.ElseIf)) | ||
| { | ||
| InspectBlockForExecutableStatements(context.block(), context); | ||
| } | ||
| } | ||
|
|
||
| public override void EnterSingleLineIfStmt([NotNull] VBAParser.SingleLineIfStmtContext context) | ||
| { | ||
| if (context.ifWithEmptyThen() != null & _blockToInspect.HasFlag(ConditionBlockToInspect.If)) | ||
| { | ||
| AddResult(new QualifiedContext<ParserRuleContext>(CurrentModuleName, context.ifWithEmptyThen())); | ||
| } | ||
| } | ||
|
|
||
| public override void EnterElseBlock([NotNull] VBAParser.ElseBlockContext context) | ||
| { | ||
| if (_blockToInspect.HasFlag(ConditionBlockToInspect.Else)) | ||
| { | ||
| InspectBlockForExecutableStatements(context.block(), context); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be
ConditionBlockTypeToInspect. The current name suggests an actual code block.