Skip to content

Commit 8910e45

Browse files
BZngrBZngr
committed
Initial refactoring
Files not included in prior checkin
1 parent ff8b7cf commit 8910e45

22 files changed

+79
-64
lines changed

‎RetailCoder.VBE/Common/DeclarationExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ public static Declaration FindInterface(this IEnumerable<Declaration> declaratio
573573
{
574574
foreach (var reference in declaration.References)
575575
{
576-
var implementsStmt = ParserRuleContextHelper.GetParent<VBAParser.ImplementsStmtContext>(reference.Context);
576+
var implementsStmt = reference.Context.GetParent<VBAParser.ImplementsStmtContext>();
577577

578578
if (implementsStmt == null) { continue; }
579579

‎RetailCoder.VBE/Refactorings/RemoveParameters/RemoveParametersRefactoring.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
using System.Diagnostics;
44
using System.Linq;
55
using Rubberduck.Common;
6+
using Rubberduck.Parsing;
67
using Rubberduck.Parsing.Grammar;
78
using Rubberduck.Parsing.Rewriter;
89
using Rubberduck.Parsing.Symbols;
910
using Rubberduck.Parsing.VBA;
1011
using Rubberduck.UI;
1112
using Rubberduck.VBEditor;
1213
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
14+
using Antlr4.Runtime;
1315

1416
namespace Rubberduck.Refactorings.RemoveParameters
1517
{
@@ -121,7 +123,7 @@ private void AdjustReferences(IEnumerable<IdentifierReference> references, Decla
121123
foreach (var reference in references.Where(item => item.Context != method.Context))
122124
{
123125
VBAParser.ArgumentListContext argumentList = null;
124-
var callStmt = ParserRuleContextHelper.GetParent<VBAParser.CallStmtContext>(reference.Context);
126+
var callStmt = reference.Context.GetParent<VBAParser.CallStmtContext>();
125127
if (callStmt != null)
126128
{
127129
argumentList = CallStatement.GetArgumentList(callStmt);
@@ -130,10 +132,10 @@ private void AdjustReferences(IEnumerable<IdentifierReference> references, Decla
130132
if (argumentList == null)
131133
{
132134
var indexExpression =
133-
ParserRuleContextHelper.GetParent<VBAParser.IndexExprContext>(reference.Context);
135+
reference.Context.GetParent<VBAParser.IndexExprContext>();
134136
if (indexExpression != null)
135137
{
136-
argumentList = ParserRuleContextHelper.GetChild<VBAParser.ArgumentListContext>(indexExpression);
138+
argumentList = indexExpression.GetChild<VBAParser.ArgumentListContext>();
137139
}
138140
}
139141

‎RetailCoder.VBE/Refactorings/Rename/RenameRefactoring.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Linq;
22
using System.Windows.Forms;
3+
using Rubberduck.Parsing;
34
using Rubberduck.Parsing.Symbols;
45
using Rubberduck.Parsing.VBA;
56
using Rubberduck.UI;
@@ -422,7 +423,7 @@ private void RenameModule()
422423
{
423424
foreach (var reference in _model.Target.References)
424425
{
425-
var ctxt = ParserRuleContextHelper.GetParent<VBAParser.ImplementsStmtContext>(reference.Context);
426+
var ctxt = reference.Context.GetParent<VBAParser.ImplementsStmtContext>();
426427
if (ctxt != null)
427428
{
428429
RenameDefinedFormatMembers(_state.DeclarationFinder.FindInterfaceMembersForImplementsContext(ctxt), _appendUnderscoreFormat);

‎RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersRefactoring.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Rubberduck.Common;
2+
using Rubberduck.Parsing;
23
using Rubberduck.Parsing.Grammar;
34
using Rubberduck.Parsing.Symbols;
45
using Rubberduck.UI;
@@ -123,18 +124,18 @@ private void AdjustReferences(IEnumerable<IdentifierReference> references)
123124
{
124125
var module = reference.QualifiedModuleName.Component.CodeModule;
125126
VBAParser.ArgumentListContext argumentList = null;
126-
var callStmt = ParserRuleContextHelper.GetParent<VBAParser.CallStmtContext>(reference.Context);
127+
var callStmt = reference.Context.GetParent<VBAParser.CallStmtContext>();
127128
if (callStmt != null)
128129
{
129130
argumentList = CallStatement.GetArgumentList(callStmt);
130131
}
131132

132133
if (argumentList == null)
133134
{
134-
var indexExpression = ParserRuleContextHelper.GetParent<VBAParser.IndexExprContext>(reference.Context);
135+
var indexExpression = reference.Context.GetParent<VBAParser.IndexExprContext>();
135136
if (indexExpression != null)
136137
{
137-
argumentList = ParserRuleContextHelper.GetChild<VBAParser.ArgumentListContext>(indexExpression);
138+
argumentList = indexExpression.GetChild<VBAParser.ArgumentListContext>();
138139
}
139140
}
140141

‎RetailCoder.VBE/UI/Command/Refactorings/RefactorExtractInterfaceCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ protected override bool EvaluateCanExecute(object parameter)
6161
}
6262

6363
var parseTree = _state.GetParseTree(interfaceClass.QualifiedName.QualifiedModuleName);
64-
var context = ((ParserRuleContext)parseTree).FindChildren<VBAParser.ImplementsStmtContext>();
64+
var context = ((ParserRuleContext)parseTree).GetDescendents<VBAParser.ImplementsStmtContext>();
6565

6666
// true if active code pane is for a class/document/form module
6767
return !context.Any();

‎Rubberduck.Inspections/Concrete/BooleanAssignedInIfElseInspection.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
2929
.Where(result => !IsIgnoringInspectionResultFor(result.ModuleName, result.Context.Start.Line))
3030
.Select(result => new QualifiedContextInspectionResult(this,
3131
string.Format(InspectionsUI.BooleanAssignedInIfElseInspectionResultFormat,
32-
ParserRuleContextHelper.GetDescendent<VBAParser.LetStmtContext>(((VBAParser.IfStmtContext)result.Context).block()).lExpression().GetText().Trim()),
32+
(((VBAParser.IfStmtContext)result.Context).block().GetDescendent<VBAParser.LetStmtContext>()).lExpression().GetText().Trim()),
3333
result));
3434
}
3535

@@ -65,14 +65,14 @@ public override void ExitIfStmt(VBAParser.IfStmtContext context)
6565

6666
// make sure the assignments are the opposite
6767

68-
if (!(ParserRuleContextHelper.GetDescendent<VBAParser.BooleanLiteralIdentifierContext>(context.block()).GetText() == Tokens.True ^
69-
ParserRuleContextHelper.GetDescendent<VBAParser.BooleanLiteralIdentifierContext>(context.elseBlock().block()).GetText() == Tokens.True))
68+
if (!(context.block().GetDescendent<VBAParser.BooleanLiteralIdentifierContext>().GetText() == Tokens.True ^
69+
context.elseBlock().block().GetDescendent<VBAParser.BooleanLiteralIdentifierContext>().GetText() == Tokens.True))
7070
{
7171
return;
7272
}
7373

74-
if (ParserRuleContextHelper.GetDescendent<VBAParser.LetStmtContext>(context.block()).lExpression().GetText().ToLowerInvariant() !=
75-
ParserRuleContextHelper.GetDescendent<VBAParser.LetStmtContext>(context.elseBlock().block()).lExpression().GetText().ToLowerInvariant())
74+
if (context.block().GetDescendent<VBAParser.LetStmtContext>().lExpression().GetText().ToLowerInvariant() !=
75+
context.elseBlock().block().GetDescendent<VBAParser.LetStmtContext>().lExpression().GetText().ToLowerInvariant())
7676
{
7777
return;
7878
}
@@ -87,12 +87,11 @@ private bool IsSingleBooleanAssignment(VBAParser.BlockContext block)
8787
return false;
8888
}
8989

90-
var mainBlockStmtContext =
91-
ParserRuleContextHelper.GetDescendent<VBAParser.MainBlockStmtContext>(block);
90+
var mainBlockStmtContext = block.GetDescendent<VBAParser.MainBlockStmtContext>();
9291

9392
return mainBlockStmtContext.children.FirstOrDefault() is VBAParser.LetStmtContext letStmt &&
9493
letStmt.expression() is VBAParser.LiteralExprContext literal &&
95-
ParserRuleContextHelper.GetDescendent<VBAParser.BooleanLiteralIdentifierContext>(literal) != null;
94+
literal.GetDescendent<VBAParser.BooleanLiteralIdentifierContext>() != null;
9695
}
9796
}
9897
}

‎Rubberduck.Inspections/Concrete/FunctionReturnValueNotUsedInspection.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Rubberduck.Common;
55
using Rubberduck.Inspections.Abstract;
66
using Rubberduck.Inspections.Results;
7+
using Rubberduck.Parsing;
78
using Rubberduck.Parsing.Grammar;
89
using Rubberduck.Parsing.Inspections;
910
using Rubberduck.Parsing.Inspections.Abstract;
@@ -87,12 +88,12 @@ private bool IsReturnValueUsed(Declaration function)
8788

8889
private bool IsAddressOfCall(IdentifierReference usage)
8990
{
90-
return ParserRuleContextHelper.HasParent<VBAParser.AddressOfExpressionContext>(usage.Context);
91+
return usage.Context.HasParent<VBAParser.AddressOfExpressionContext>();
9192
}
9293

9394
private bool IsTypeOfExpression(IdentifierReference usage)
9495
{
95-
return ParserRuleContextHelper.HasParent<VBAParser.TypeofexprContext>(usage.Context);
96+
return usage.Context.HasParent<VBAParser.TypeofexprContext>();
9697
}
9798

9899
private bool IsReturnStatement(Declaration function, IdentifierReference assignment)
@@ -107,7 +108,7 @@ private bool IsIndexExprOrCallStmt(IdentifierReference usage)
107108

108109
private bool IsCallStmt(IdentifierReference usage)
109110
{
110-
var callStmt = ParserRuleContextHelper.GetParent<VBAParser.CallStmtContext>(usage.Context);
111+
var callStmt = usage.Context.GetParent<VBAParser.CallStmtContext>();
111112
if (callStmt == null)
112113
{
113114
return false;
@@ -117,12 +118,12 @@ private bool IsCallStmt(IdentifierReference usage)
117118
{
118119
return true;
119120
}
120-
return !ParserRuleContextHelper.HasParent(usage.Context, argumentList);
121+
return !usage.Context.HasParent(argumentList);
121122
}
122123

123124
private bool IsIndexExprContext(IdentifierReference usage)
124125
{
125-
var indexExpr = ParserRuleContextHelper.GetParent<VBAParser.IndexExprContext>(usage.Context);
126+
var indexExpr = usage.Context.GetParent<VBAParser.IndexExprContext>();
126127
if (indexExpr == null)
127128
{
128129
return false;
@@ -132,19 +133,19 @@ private bool IsIndexExprContext(IdentifierReference usage)
132133
{
133134
return true;
134135
}
135-
return !ParserRuleContextHelper.HasParent(usage.Context, argumentList);
136+
return !usage.Context.HasParent(argumentList);
136137
}
137138

138139
private bool IsLet(IdentifierReference usage)
139140
{
140-
var letStmt = ParserRuleContextHelper.GetParent<VBAParser.LetStmtContext>(usage.Context);
141+
var letStmt = usage.Context.GetParent<VBAParser.LetStmtContext>();
141142

142143
return letStmt != null && letStmt == usage.Context;
143144
}
144145

145146
private bool IsSet(IdentifierReference usage)
146147
{
147-
var setStmt = ParserRuleContextHelper.GetParent<VBAParser.SetStmtContext>(usage.Context);
148+
var setStmt = usage.Context.GetParent<VBAParser.SetStmtContext>();
148149

149150
return setStmt != null && setStmt == usage.Context;
150151
}

‎Rubberduck.Inspections/Concrete/ImplicitDefaultMemberAssignmentInspection.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Linq;
33
using Rubberduck.Inspections.Abstract;
44
using Rubberduck.Inspections.Results;
5+
using Rubberduck.Parsing;
56
using Rubberduck.Parsing.Grammar;
67
using Rubberduck.Parsing.Inspections.Abstract;
78
using Rubberduck.Parsing.Inspections.Resources;
@@ -26,7 +27,7 @@ protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
2627
.SelectMany(declaration => declaration.References)
2728
.Where(reference =>
2829
{
29-
var letStmtContext = ParserRuleContextHelper.GetParent<VBAParser.LetStmtContext>(reference.Context);
30+
var letStmtContext = reference.Context.GetParent<VBAParser.LetStmtContext>();
3031
return reference.IsAssignment && letStmtContext != null && letStmtContext.LET() == null;
3132
});
3233

‎Rubberduck.Inspections/Concrete/ModuleScopeDimKeywordInspection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
2626
{
2727
return Listener.Contexts
2828
.Where(result => !IsIgnoringInspectionResultFor(result.ModuleName, result.Context.Start.Line))
29-
.SelectMany(result => result.Context.FindChildren<VBAParser.VariableSubStmtContext>()
29+
.SelectMany(result => result.Context.GetDescendents<VBAParser.VariableSubStmtContext>()
3030
.Select(r => new QualifiedContext<ParserRuleContext>(result.ModuleName, r)))
3131
.Select(result => new QualifiedContextInspectionResult(this,
3232
string.Format(InspectionsUI.ModuleScopeDimKeywordInspectionResultFormat, ((VBAParser.VariableSubStmtContext)result.Context).identifier().GetText()),

‎Rubberduck.Inspections/Concrete/ObjectVariableNotSetInspection.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Linq;
44
using Rubberduck.Inspections.Abstract;
55
using Rubberduck.Inspections.Results;
6+
using Rubberduck.Parsing;
67
using Rubberduck.Parsing.Grammar;
78
using Rubberduck.Parsing.Inspections.Abstract;
89
using Rubberduck.Parsing.Inspections.Resources;
@@ -44,10 +45,10 @@ protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
4445
private bool FlagIfObjectVariableNotSet(IdentifierReference reference)
4546
{
4647
var allrefs = reference.Declaration.References;
47-
var letStmtContext = ParserRuleContextHelper.GetParent<VBAParser.LetStmtContext>(reference.Context);
48+
var letStmtContext = reference.Context.GetParent<VBAParser.LetStmtContext>();
4849

49-
return reference.IsAssignment && (letStmtContext != null
50-
|| allrefs.Where(r => r.IsAssignment).All(r => ParserRuleContextHelper.GetParent<VBAParser.SetStmtContext>(r.Context)?.expression()?.GetText().Equals(Tokens.Nothing, StringComparison.InvariantCultureIgnoreCase) ?? false));
50+
return reference.IsAssignment && (letStmtContext != null
51+
|| allrefs.Where(r => r.IsAssignment).All(r => r.Context.GetParent<VBAParser.SetStmtContext>()?.expression()?.GetText().Equals(Tokens.Nothing, StringComparison.InvariantCultureIgnoreCase) ?? false));
5152
}
5253
}
5354
}

0 commit comments

Comments
 (0)