Skip to content

Commit 4a402f8

Browse files
retailcoderretailcoder
committed
Merge pull request #1357 from autoboosh/exprparser
Allow valueStmts in "Implements" directive
2 parents 57acde0 + f3ce43f commit 4a402f8

File tree

97 files changed

+15881
-4715
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+15881
-4715
lines changed

‎RetailCoder.VBE/App.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,12 @@ private void RegisterComponentsEventSink(DispatcherEventArgs<VBProject> e, VBPro
212212
componentsSink.ComponentRemoved += sink_ComponentRemoved;
213213
componentsSink.ComponentRenamed += sink_ComponentRenamed;
214214
componentsSink.ComponentSelected += sink_ComponentSelected;
215-
_componentsEventSinks.Add(sink, componentsSink);
215+
//_componentsEventSinks.Add(sink, componentsSink);
216216

217-
int cookie;
218-
connectionPoint.Advise(componentsSink, out cookie);
217+
//int cookie;
218+
//connectionPoint.Advise(componentsSink, out cookie);
219219

220-
_componentsEventsConnectionPoints.Add(sink, Tuple.Create(connectionPoint, cookie));
220+
//_componentsEventsConnectionPoints.Add(sink, Tuple.Create(connectionPoint, cookie));
221221
}
222222

223223
async void sink_ComponentSelected(object sender, DispatcherEventArgs<VBComponent> e)

‎RetailCoder.VBE/Common/DeclarationExtensions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public static IEnumerable<Declaration> InScope(this IEnumerable<Declaration> dec
191191

192192
public static IEnumerable<Declaration> FindInterfaces(this IEnumerable<Declaration> declarations)
193193
{
194-
var classes = declarations.Where(item => item.DeclarationType == DeclarationType.Class);
194+
var classes = declarations.Where(item => item.DeclarationType == DeclarationType.ClassModule);
195195
var interfaces = classes.Where(item => item.References.Any(reference =>
196196
reference.Context.Parent is VBAParser.ImplementsStmtContext));
197197

@@ -279,7 +279,7 @@ public static IEnumerable<Declaration> FindFormEventHandlers(this IEnumerable<De
279279
{
280280
var items = declarations.ToList();
281281

282-
var forms = items.Where(item => item.DeclarationType == DeclarationType.Class
282+
var forms = items.Where(item => item.DeclarationType == DeclarationType.ClassModule
283283
&& item.QualifiedName.QualifiedModuleName.Component != null
284284
&& item.QualifiedName.QualifiedModuleName.Component.Type == vbext_ComponentType.vbext_ct_MSForm)
285285
.ToList();
@@ -318,7 +318,7 @@ public static IEnumerable<Tuple<Declaration,Declaration>> FindHandlersForEvent(t
318318
.Select(item => new
319319
{
320320
WithEventDeclaration = item,
321-
EventProvider = items.SingleOrDefault(type => type.DeclarationType == DeclarationType.Class && type.QualifiedName.QualifiedModuleName == item.QualifiedName.QualifiedModuleName)
321+
EventProvider = items.SingleOrDefault(type => type.DeclarationType == DeclarationType.ClassModule && type.QualifiedName.QualifiedModuleName == item.QualifiedName.QualifiedModuleName)
322322
})
323323
.Select(item => new
324324
{
@@ -341,7 +341,7 @@ public static IEnumerable<Declaration> FindEventProcedures(this IEnumerable<Decl
341341
}
342342

343343
var items = declarations as IList<Declaration> ?? declarations.ToList();
344-
var type = items.SingleOrDefault(item => item.DeclarationType == DeclarationType.Class
344+
var type = items.SingleOrDefault(item => item.DeclarationType == DeclarationType.ClassModule
345345
&& item.Project != null
346346
&& item.IdentifierName == withEventsDeclaration.AsTypeName.Split('.').Last());
347347

‎RetailCoder.VBE/Common/DeclarationIconCache.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ public static BitmapImage ComponentIcon(vbext_ComponentType componentType)
3535
switch (componentType)
3636
{
3737
case vbext_ComponentType.vbext_ct_StdModule:
38-
key = Tuple.Create(DeclarationType.Module, Accessibility.Public);
38+
key = Tuple.Create(DeclarationType.ProceduralModule, Accessibility.Public);
3939
break;
4040
case vbext_ComponentType.vbext_ct_ClassModule:
41-
key = Tuple.Create(DeclarationType.Class, Accessibility.Public);
41+
key = Tuple.Create(DeclarationType.ClassModule, Accessibility.Public);
4242
break;
4343
case vbext_ComponentType.vbext_ct_Document:
4444
key = Tuple.Create(DeclarationType.Document, Accessibility.Public);
@@ -61,19 +61,19 @@ private static Uri GetIconUri(DeclarationType declarationType, Accessibility acc
6161
string path;
6262
switch (declarationType)
6363
{
64-
case DeclarationType.Module:
64+
case DeclarationType.ProceduralModule:
6565
path = "VSObject_Module.png";
6666
break;
6767

68-
case DeclarationType.Document | DeclarationType.Class:
68+
case DeclarationType.Document | DeclarationType.ClassModule:
6969
path = "document.png";
7070
break;
7171

72-
case DeclarationType.UserForm | DeclarationType.Class | DeclarationType.Control:
72+
case DeclarationType.UserForm | DeclarationType.ClassModule | DeclarationType.Control:
7373
path = "VSProject_Form.png";
7474
break;
7575

76-
case DeclarationType.Class | DeclarationType.Module:
76+
case DeclarationType.ClassModule | DeclarationType.ProceduralModule:
7777
path = "VSProject_Class.png";
7878
break;
7979

‎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/MoveFieldCloserToUsageInspection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
2828
{
2929

3030
if (declaration.DeclarationType != DeclarationType.Variable ||
31-
!new[] {DeclarationType.Class, DeclarationType.Module}.Contains(declaration.ParentDeclaration.DeclarationType))
31+
!new[] {DeclarationType.ClassModule, DeclarationType.ProceduralModule}.Contains(declaration.ParentDeclaration.DeclarationType))
3232
{
3333
return false;
3434
}

‎RetailCoder.VBE/Inspections/MultipleFolderAnnotationsInspection.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ public MultipleFolderAnnotationsInspection(RubberduckParserState state)
2020
public override IEnumerable<InspectionResultBase> GetInspectionResults()
2121
{
2222
var issues = UserDeclarations.Where(declaration =>
23-
(declaration.DeclarationType == DeclarationType.Class
24-
|| declaration.DeclarationType == DeclarationType.Module)
23+
(declaration.DeclarationType == DeclarationType.ClassModule
24+
|| declaration.DeclarationType == DeclarationType.ProceduralModule)
2525
&& declaration.Annotations.Count(annotation => annotation.AnnotationType == AnnotationType.Folder) > 1);
2626
return issues.Select(issue =>
2727
new MultipleFolderAnnotationsInspectionResult(this, issue));

‎RetailCoder.VBE/Inspections/OptionExplicitInspection.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ public OptionExplicitInspection(RubberduckParserState state)
1919

2020
private static readonly DeclarationType[] ModuleTypes =
2121
{
22-
DeclarationType.Module,
23-
DeclarationType.Class
22+
DeclarationType.ProceduralModule,
23+
DeclarationType.ClassModule
2424
};
2525

2626
public override IEnumerable<InspectionResultBase> GetInspectionResults()

‎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/ProcedureNotUsedInspection.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
2424
{
2525
var declarations = UserDeclarations.ToList();
2626

27-
var classes = declarations.Where(item => item.DeclarationType == DeclarationType.Class).ToList();
28-
var modules = declarations.Where(item => item.DeclarationType == DeclarationType.Module).ToList();
27+
var classes = declarations.Where(item => item.DeclarationType == DeclarationType.ClassModule).ToList();
28+
var modules = declarations.Where(item => item.DeclarationType == DeclarationType.ProceduralModule).ToList();
2929

3030
var handlers = declarations.Where(item => item.DeclarationType == DeclarationType.Control)
3131
.SelectMany(control => declarations.FindEventHandlers(control)).ToList();
3232

3333
var withEventFields = declarations.Where(item => item.DeclarationType == DeclarationType.Variable && item.IsWithEvents);
3434
handlers.AddRange(withEventFields.SelectMany(field => declarations.FindEventProcedures(field)));
3535

36-
var forms = declarations.Where(item => item.DeclarationType == DeclarationType.Class
36+
var forms = declarations.Where(item => item.DeclarationType == DeclarationType.ClassModule
3737
&& item.QualifiedName.QualifiedModuleName.Component.Type == vbext_ComponentType.vbext_ct_MSForm)
3838
.ToList();
3939

‎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();

0 commit comments

Comments
 (0)