Skip to content

Commit 367f26e

Browse files
author
Andrin Meier
committed
remove ambiguousidentifier/certainidientifier/ambiguouskeyword + fix empty alternation bug
1 parent 7477951 commit 367f26e

30 files changed

+4972
-5748
lines changed

‎RetailCoder.VBE/Inspections/ConstantNotUsedInspection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
2222
declaration.DeclarationType == DeclarationType.Constant && !declaration.References.Any());
2323

2424
return results.Select(issue =>
25-
new IdentifierNotUsedInspectionResult(this, issue, ((dynamic)issue.Context).ambiguousIdentifier(), issue.QualifiedName.QualifiedModuleName)).Cast<InspectionResultBase>();
25+
new IdentifierNotUsedInspectionResult(this, issue, ((dynamic)issue.Context).identifier(), issue.QualifiedName.QualifiedModuleName)).Cast<InspectionResultBase>();
2626
}
2727
}
2828
}

‎RetailCoder.VBE/Inspections/ConvertToProcedureQuickFix.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public override void Fix()
4545
: Tokens.Property;
4646

4747
string visibility = context.visibility() == null ? string.Empty : context.visibility().GetText() + ' ';
48-
string name = ' ' + context.ambiguousIdentifier().GetText();
48+
string name = ' ' + context.identifier().GetText();
4949
bool hasTypeHint = context.typeHint() != null;
5050

5151
string args = context.argList().GetText();

‎RetailCoder.VBE/Inspections/ImplicitByRefParameterInspection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
3333
let arg = item.Context as VBAParser.ArgContext
3434
where arg != null && arg.BYREF() == null && arg.BYVAL() == null
3535
select new QualifiedContext<VBAParser.ArgContext>(item.QualifiedName, arg))
36-
.Select(issue => new ImplicitByRefParameterInspectionResult(this, issue.Context.ambiguousIdentifier().GetText(), issue));
36+
.Select(issue => new ImplicitByRefParameterInspectionResult(this, issue.Context.identifier().GetText(), issue));
3737

3838

3939
return issues;

‎RetailCoder.VBE/Inspections/ImplicitVariantReturnTypeInspectionResult.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ private ProcedureNode GetNode(VBAParser.FunctionStmtContext context)
7171
}
7272

7373
var scope = Selection.QualifiedName.ToString();
74-
var localScope = scope + "." + context.ambiguousIdentifier().GetText();
74+
var localScope = scope + "." + context.identifier().GetText();
7575
return new ProcedureNode(context, scope, localScope);
7676
}
7777

@@ -83,7 +83,7 @@ private ProcedureNode GetNode(VBAParser.PropertyGetStmtContext context)
8383
}
8484

8585
var scope = Selection.QualifiedName.ToString();
86-
var localScope = scope + "." + context.ambiguousIdentifier().GetText();
86+
var localScope = scope + "." + context.identifier().GetText();
8787
return new ProcedureNode(context, scope, localScope);
8888
}
8989
}

‎RetailCoder.VBE/Inspections/ParameterCanBeByValInspection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
7171
&& ((VBAParser.ArgContext) declaration.Context).BYVAL() == null
7272
&& !IsUsedAsByRefParam(declarations, declaration)
7373
&& !declaration.References.Any(reference => reference.IsAssignment))
74-
.Select(issue => new ParameterCanBeByValInspectionResult(this, issue, ((dynamic)issue.Context).ambiguousIdentifier(), issue.QualifiedName));
74+
.Select(issue => new ParameterCanBeByValInspectionResult(this, issue, ((dynamic)issue.Context).identifier(), issue.QualifiedName));
7575

7676
return issues;
7777
}

‎RetailCoder.VBE/Inspections/ParameterNotUsedInspection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
5656
&& !builtInHandlers.Contains(parameter.ParentDeclaration))
5757
let isInterfaceImplementationMember = IsInterfaceMemberImplementationParameter(issue, interfaceImplementationMemberScopes)
5858
select new ParameterNotUsedInspectionResult(this, issue,
59-
((dynamic) issue.Context).ambiguousIdentifier(), issue.QualifiedName,
59+
((dynamic) issue.Context).identifier(), issue.QualifiedName,
6060
isInterfaceImplementationMember, quickFixRefactoring, State);
6161

6262
return issues.ToList();

‎RetailCoder.VBE/Inspections/ProcedureCanBeWrittenAsFunctionInspection.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
3131
{
3232
var declaration =
3333
UserDeclarations.SingleOrDefault(d => d.DeclarationType == DeclarationType.Procedure &&
34-
d.IdentifierName == c.ambiguousIdentifier().GetText() &&
34+
d.IdentifierName == c.identifier().GetText() &&
3535
d.Context.GetSelection().Equals(c.GetSelection()));
3636

3737
var interfaceImplementation = UserDeclarations.FindInterfaceImplementationMembers().SingleOrDefault(m => m.Equals(declaration));
@@ -46,7 +46,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
4646
.Where(c =>
4747
{
4848
var declaration = UserDeclarations.SingleOrDefault(d => d.DeclarationType == DeclarationType.Procedure &&
49-
d.IdentifierName == c.ambiguousIdentifier().GetText() &&
49+
d.IdentifierName == c.identifier().GetText() &&
5050
d.Context.GetSelection().Equals(c.GetSelection()));
5151

5252
if (declaration == null) { return false; } // rather be safe than sorry

‎RetailCoder.VBE/Inspections/ProcedureShouldBeFunctionInspectionResult.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class ProcedureShouldBeFunctionInspectionResult : InspectionResultBase
1616
public ProcedureShouldBeFunctionInspectionResult(IInspection inspection, RubberduckParserState state, QualifiedContext<VBAParser.ArgListContext> argListQualifiedContext, QualifiedContext<VBAParser.SubStmtContext> subStmtQualifiedContext)
1717
: base(inspection,
1818
subStmtQualifiedContext.ModuleName,
19-
subStmtQualifiedContext.Context.ambiguousIdentifier())
19+
subStmtQualifiedContext.Context.identifier())
2020
{
2121
_target = state.AllUserDeclarations.Single(declaration =>
2222
declaration.DeclarationType == DeclarationType.Procedure
@@ -100,8 +100,8 @@ private void UpdateSignature()
100100

101101
var newfunctionWithReturn = newFunctionWithoutReturn
102102
.Insert(newFunctionWithoutReturn.LastIndexOf(Environment.NewLine, StringComparison.Ordinal),
103-
Environment.NewLine + " " + _subStmtQualifiedContext.Context.ambiguousIdentifier().GetText() +
104-
" = " + _argQualifiedContext.Context.ambiguousIdentifier().GetText());
103+
Environment.NewLine + " " + _subStmtQualifiedContext.Context.identifier().GetText() +
104+
" = " + _argQualifiedContext.Context.identifier().GetText());
105105

106106
_lineOffset = newfunctionWithReturn.Split(new[] {Environment.NewLine}, StringSplitOptions.None).Length -
107107
subStmtText.Split(new[] {Environment.NewLine}, StringSplitOptions.None).Length;
@@ -115,7 +115,7 @@ private void UpdateSignature()
115115

116116
private void UpdateCalls()
117117
{
118-
var procedureName = _subStmtQualifiedContext.Context.ambiguousIdentifier().GetText();
118+
var procedureName = _subStmtQualifiedContext.Context.identifier().GetText();
119119

120120
var procedure =
121121
_state.AllDeclarations.SingleOrDefault(d =>
@@ -142,7 +142,7 @@ d.Context is VBAParser.SubStmtContext &&
142142

143143
var referenceText = reference.Context.Parent.GetText();
144144
var newCall = referenceParent.argsCall().argCall().ToList().ElementAt(_argListQualifiedContext.Context.arg().ToList().IndexOf(_argQualifiedContext.Context)).GetText() +
145-
" = " + _subStmtQualifiedContext.Context.ambiguousIdentifier().GetText() +
145+
" = " + _subStmtQualifiedContext.Context.identifier().GetText() +
146146
"(" + referenceParent.argsCall().GetText() + ")";
147147

148148
var oldLines = module.Lines[startLine, reference.Selection.LineCount];

‎RetailCoder.VBE/Inspections/RemoveExplicitCallStatmentQuickFix.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ public override void Fix()
2727
VBAParser.ArgsCallContext arguments;
2828
if (context.eCS_MemberProcedureCall() != null)
2929
{
30-
procedure = context.eCS_MemberProcedureCall().ambiguousIdentifier().GetText();
30+
procedure = context.eCS_MemberProcedureCall().identifier().GetText();
3131
arguments = context.eCS_MemberProcedureCall().argsCall();
3232
}
3333
else
3434
{
35-
procedure = context.eCS_ProcedureCall().ambiguousIdentifier().GetText();
35+
procedure = context.eCS_ProcedureCall().identifier().GetText();
3636
arguments = context.eCS_ProcedureCall().argsCall();
3737
}
3838

‎RetailCoder.VBE/Inspections/VariableNotUsedInspection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
2424
&& declaration.References.All(reference => reference.IsAssignment));
2525

2626
return declarations.Select(issue =>
27-
new IdentifierNotUsedInspectionResult(this, issue, ((dynamic)issue.Context).ambiguousIdentifier(), issue.QualifiedName.QualifiedModuleName));
27+
new IdentifierNotUsedInspectionResult(this, issue, ((dynamic)issue.Context).identifier(), issue.QualifiedName.QualifiedModuleName));
2828
}
2929
}
3030
}

‎RetailCoder.VBE/Inspections/VariableTypeNotDeclaredInspectionResult.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ private string DeclareExplicitVariant(VBAParser.ConstSubStmtContext context, out
105105
instruction = parent.GetText();
106106

107107
var constant = context.GetText();
108-
var replacement = context.ambiguousIdentifier().GetText() + ' '
108+
var replacement = context.identifier().GetText() + ' '
109109
+ Tokens.As + ' ' + Tokens.Variant + ' '
110110
+ context.EQ().GetText() + ' '
111111
+ context.valueStmt().GetText();

‎RetailCoder.VBE/Refactorings/ExtractMethod/ExtractMethodRefactoring.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public static string GetExtractedMethod(ExtractMethodModel model)
135135
.Where(e => model.Method.Parameters.All(param => param.Name != e.IdentifierName))
136136
.Select(e => e.Context)
137137
.Cast<VBAParser.VariableSubStmtContext>()
138-
.Select(e => " " + Tokens.Dim + ' ' + e.ambiguousIdentifier().GetText() +
138+
.Select(e => " " + Tokens.Dim + ' ' + e.identifier().GetText() +
139139
(e.LPAREN() == null
140140
? string.Empty
141141
: e.LPAREN().GetText() + (e.subscripts() == null ? string.Empty : e.subscripts().GetText()) + e.RPAREN().GetText()) + ' ' +

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ private string GetReplacementLine(CodeModule module, Declaration target, string
393393
{
394394
var argContext = (VBAParser.ArgContext)target.Context;
395395
var rewriter = _model.ParseResult.GetRewriter(target.QualifiedName.QualifiedModuleName.Component);
396-
rewriter.Replace(argContext.ambiguousIdentifier().Start.TokenIndex, _model.NewName);
396+
rewriter.Replace(argContext.identifier().Start.TokenIndex, _model.NewName);
397397

398398
// Target.Context is an ArgContext, its parent is an ArgsListContext;
399399
// the ArgsListContext's parent is the procedure context and it includes the body.

0 commit comments

Comments
 (0)