Skip to content

Commit 39da090

Browse files
committed
Minor ctor mod
1 parent 56d38fe commit 39da090

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

Rubberduck.Inspections/Concrete/UnreachableCaseInspection/UnreachableCaseInspectionRange.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,19 @@ public UnreachableCaseInspectionRange(VBAParser.RangeClauseContext context, IUCI
3737
AsFilter = FilterFactory.Create(Tokens.Long, ValueFactory);
3838
}
3939

40+
public UnreachableCaseInspectionRange(VBAParser.RangeClauseContext context, string evalTypeName, IUCIValueResults inspValues, IUnreachableCaseInspectionFactoryFactory factoryFactory)
41+
: base(context, inspValues, factoryFactory)
42+
{
43+
_isValueRange = Context.HasChildToken(Tokens.To);
44+
_isLTorGT = Context.HasChildToken(Tokens.Is);
45+
_isRelationalOp = Context.TryGetChildContext<VBAParser.RelationalOpContext>(out _);
46+
_isSingleValue = !(_isValueRange || _isLTorGT || _isRelationalOp);
47+
IsUnreachable = false;
48+
AsFilter = FilterFactory.Create(evalTypeName, ValueFactory);
49+
_evalTypeName = evalTypeName;
50+
AsFilter = AddFilterContent();
51+
}
52+
4053
public string EvaluationTypeName
4154
{
4255
set

Rubberduck.Inspections/Concrete/UnreachableCaseInspection/UnreachableCaseInspectionRangeFactory.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Rubberduck.Inspections.Concrete.UnreachableCaseInspection
55
public interface IUnreachableCaseInspectionRangeFactory
66
{
77
IUnreachableCaseInspectionRange Create(VBAParser.RangeClauseContext range, IUCIValueResults results);
8-
IUnreachableCaseInspectionRange Create(string typeName, VBAParser.RangeClauseContext range, IUCIValueResults results);
8+
IUnreachableCaseInspectionRange Create(VBAParser.RangeClauseContext range, string typeName, IUCIValueResults results);
99
IUnreachableCaseInspectionFactoryFactory FactoryFactory { set; get; }
1010
}
1111

@@ -16,12 +16,9 @@ public IUnreachableCaseInspectionRange Create(VBAParser.RangeClauseContext range
1616
return new UnreachableCaseInspectionRange(range, results, FactoryFactory);
1717
}
1818

19-
public IUnreachableCaseInspectionRange Create(string typeName, VBAParser.RangeClauseContext range, IUCIValueResults results)
19+
public IUnreachableCaseInspectionRange Create(VBAParser.RangeClauseContext range, string typeName, IUCIValueResults results)
2020
{
21-
return new UnreachableCaseInspectionRange(range, results, FactoryFactory)
22-
{
23-
EvaluationTypeName = typeName
24-
};
21+
return new UnreachableCaseInspectionRange(range, typeName, results, FactoryFactory);
2522
}
2623

2724
public IUnreachableCaseInspectionFactoryFactory FactoryFactory { set; get; }

Rubberduck.Inspections/Concrete/UnreachableCaseInspection/UnreachableCaseInspectionSelectStmt.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void InspectForUnreachableCases()
5151
var inspectedRanges = new List<IUnreachableCaseInspectionRange>();
5252
foreach (var range in caseClause.rangeClause())
5353
{
54-
var inspectionRange = _inspectionRangeFactory.Create(EvaluationTypeName, range, _inspValues);
54+
var inspectionRange = _inspectionRangeFactory.Create(range, EvaluationTypeName, _inspValues);
5555
if (inspectionRange.IsReachable(cummulativeRangeFilter))
5656
{
5757
cummulativeRangeFilter.Add(inspectionRange.AsFilter);

0 commit comments

Comments
 (0)