Skip to content

Commit e4b50f1

Browse files
committed
Use Length on Arrays instead of Count()
1 parent ed91d65 commit e4b50f1

File tree

8 files changed

+13
-15
lines changed

8 files changed

+13
-15
lines changed

RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersRefactoring.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ private void RewriteCall(VBAParser.ArgumentListContext argList, ICodeModule modu
151151
var args = argList.argument().Select((s, i) => new { Index = i, Text = s.GetText() }).ToList();
152152
for (var i = 0; i < _model.Parameters.Count; i++)
153153
{
154-
if (argList.argument().Count() <= i)
154+
if (argList.argument().Length <= i)
155155
{
156156
break;
157157
}

Rubberduck.Inspections/Concrete/MultipleDeclarationsInspection.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ public void ClearContexts()
4545

4646
public override void ExitVariableListStmt([NotNull] VBAParser.VariableListStmtContext context)
4747
{
48-
if (context.variableSubStmt().Count() > 1)
48+
if (context.variableSubStmt().Length > 1)
4949
{
5050
_contexts.Add(new QualifiedContext<ParserRuleContext>(CurrentModuleName, context));
5151
}
5252
}
5353

5454
public override void ExitConstStmt([NotNull] VBAParser.ConstStmtContext context)
5555
{
56-
if (context.constSubStmt().Count() > 1)
56+
if (context.constSubStmt().Length > 1)
5757
{
5858
_contexts.Add(new QualifiedContext<ParserRuleContext>(CurrentModuleName, context));
5959
}

Rubberduck.Parsing/Preprocessing/VBAPreprocessorVisitor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ private IExpression Visit(VBAConditionalCompilationParser.CcExpressionContext co
152152
{
153153
return Visit(context.ccExpression()[0]);
154154
}
155-
else if (context.MINUS() != null && context.ccExpression().Count() == 1)
155+
else if (context.MINUS() != null && context.ccExpression().Length == 1)
156156
{
157157
return VisitUnaryMinus(context);
158158
}
@@ -164,7 +164,7 @@ private IExpression Visit(VBAConditionalCompilationParser.CcExpressionContext co
164164
{
165165
return VisitPlus(context);
166166
}
167-
else if (context.MINUS() != null && context.ccExpression().Count() == 2)
167+
else if (context.MINUS() != null && context.ccExpression().Length == 2)
168168
{
169169
return VisitMinus(context);
170170
}

Rubberduck.Parsing/Rewriter/RewriterInfo/ArgumentRewriterInfoFinder.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ private static RewriterInfo GetRewriterInfo(VBAParser.ArgumentContext arg, VBAPa
2121

2222
var items = argList.argument();
2323
var itemIndex = items.ToList().IndexOf(arg);
24-
var count = items.Count();
2524

26-
if (count == 1)
25+
if (items.Length == 1)
2726
{
2827
return new RewriterInfo(argList.Start.TokenIndex, argList.Stop.TokenIndex);
2928
}

Rubberduck.Parsing/Rewriter/RewriterInfo/ConstantRewriterInfoFinder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ private static RewriterInfo GetRewriterInfo(VBAParser.ConstSubStmtContext target
2222

2323
var items = context.constSubStmt();
2424
var itemIndex = items.ToList().IndexOf(target);
25-
var count = items.Count();
25+
var count = items.Length;
2626

2727
var element = context.Parent as VBAParser.ModuleDeclarationsElementContext;
2828
if (element != null)

Rubberduck.Parsing/Rewriter/RewriterInfo/ParameterRewriterInfoFinder.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ private static RewriterInfo GetRewriterInfo(VBAParser.ArgContext arg, VBAParser.
2121

2222
var items = context.arg();
2323
var itemIndex = items.ToList().IndexOf(arg);
24-
var count = items.Count();
2524

26-
if (count == 1)
25+
if (items.Length == 1)
2726
{
2827
return new RewriterInfo(context.LPAREN().Symbol.TokenIndex + 1, context.RPAREN().Symbol.TokenIndex - 1);
2928
}

Rubberduck.Parsing/Rewriter/RewriterInfo/VariableRewriterInfoFinder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ private static RewriterInfo GetRewriterInfo(VBAParser.VariableSubStmtContext var
2222

2323
var items = context.variableSubStmt();
2424
var itemIndex = items.ToList().IndexOf(variable);
25-
var count = items.Count();
25+
var count = items.Length;
2626

2727
if (context.Parent.Parent is VBAParser.ModuleDeclarationsElementContext element)
2828
{

Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public void Resolve(VBAParser.GoToStmtContext context)
221221
public void Resolve(VBAParser.OnGoToStmtContext context)
222222
{
223223
ResolveDefault(context.expression()[0]);
224-
for (int labelIndex = 1; labelIndex < context.expression().Count(); labelIndex++)
224+
for (int labelIndex = 1; labelIndex < context.expression().Length; labelIndex++)
225225
{
226226
ResolveLabel(context.expression()[labelIndex], context.expression()[labelIndex].GetText());
227227
}
@@ -235,7 +235,7 @@ public void Resolve(VBAParser.GoSubStmtContext context)
235235
public void Resolve(VBAParser.OnGoSubStmtContext context)
236236
{
237237
ResolveDefault(context.expression()[0]);
238-
for (int labelIndex = 1; labelIndex < context.expression().Count(); labelIndex++)
238+
for (int labelIndex = 1; labelIndex < context.expression().Length; labelIndex++)
239239
{
240240
ResolveLabel(context.expression()[labelIndex], context.expression()[labelIndex].GetText());
241241
}
@@ -644,7 +644,7 @@ public void Resolve(VBAParser.ForNextStmtContext context)
644644
_qualifiedModuleName,
645645
_currentScope,
646646
_currentParent);
647-
for (int exprIndex = 1; exprIndex < context.expression().Count(); exprIndex++)
647+
for (int exprIndex = 1; exprIndex < context.expression().Length; exprIndex++)
648648
{
649649
ResolveDefault(context.expression()[exprIndex]);
650650
}
@@ -682,7 +682,7 @@ public void Resolve(VBAParser.ForEachStmtContext context)
682682
// _currentScope,
683683
// _currentParent);
684684
}
685-
for (int exprIndex = 1; exprIndex < context.expression().Count(); exprIndex++)
685+
for (int exprIndex = 1; exprIndex < context.expression().Length; exprIndex++)
686686
{
687687
ResolveDefault(context.expression()[exprIndex]);
688688
}

0 commit comments

Comments
 (0)