Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Parser Fix for LineNumberLovers #3217

Merged
merged 9 commits into from
Aug 3, 2017
Merged

Parser Fix for LineNumberLovers #3217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ffed155
removed unused ParserState ctor parameter, made QualifiedMemberName n…
retailcoder Jul 28, 2017
62e3aa5
Merge branch 'next' of https://github.com/rubberduck-vba/Rubberduck i…
retailcoder Jul 31, 2017
2fcebec
updated assembly version
retailcoder Aug 3, 2017
e4b673c
fixes #3216
retailcoder Aug 3, 2017
5346d3a
works with SLL prediction mode
retailcoder Aug 3, 2017
47da44b
Merge branch 'next' into rd-next
retailcoder Aug 3, 2017
a027ec2
added more tests. parses line numbers on End Sub|Function|Property.
retailcoder Aug 3, 2017
47f3063
Merge branch 'rd-next' of https://github.com/retailcoder/Rubberduck.git
retailcoder Aug 3, 2017
2c91340
revert QualifiedContext non-null MemberName for module declarations
retailcoder Aug 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions RetailCoder.VBE/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Rubberduck")]
[assembly: AssemblyProduct("Rubberduck")]
[assembly: AssemblyCopyright("Copyright © 2014-2016")]
[assembly: AssemblyCopyright("Copyright © 2014-2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.14.*")]
[assembly: AssemblyFileVersion("2.0.14.0")]
[assembly: AssemblyVersion("2.1.0.*")]
[assembly: AssemblyFileVersion("2.1.0.0")]
1 change: 0 additions & 1 deletion Rubberduck.Inspections/Concrete/EmptyElseBlockInspection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ public override IEnumerable<IInspectionResult> GetInspectionResults()
.Where(result => !IsIgnoringInspectionResultFor(result.ModuleName, result.Context.Start.Line))
.Select(result => new QualifiedContextInspectionResult(this,
InspectionsUI.EmptyElseBlockInspectionResultFormat,
State,
result));
}

Expand Down
1 change: 0 additions & 1 deletion Rubberduck.Inspections/Concrete/EmptyIfBlockInspection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ public override IEnumerable<IInspectionResult> GetInspectionResults()
.Where(result => !IsIgnoringInspectionResultFor(result.ModuleName, result.Context.Start.Line))
.Select(result => new QualifiedContextInspectionResult(this,
InspectionsUI.EmptyIfBlockInspectionResultFormat,
State,
result));
}

Expand Down
1 change: 0 additions & 1 deletion Rubberduck.Inspections/Concrete/EmptyStringLiteralInspection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ public override IEnumerable<IInspectionResult> GetInspectionResults()
.Where(result => !IsIgnoringInspectionResultFor(result.ModuleName, result.Context.Start.Line))
.Select(result => new QualifiedContextInspectionResult(this,
InspectionsUI.EmptyStringLiteralInspectionResultFormat,
State,
result));
}

Expand Down
8 changes: 6 additions & 2 deletions Rubberduck.Inspections/Concrete/IllegalAnnotationInspection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ public override IEnumerable<IInspectionResult> GetInspectionResults()
{
return Listener.Contexts.Select(context =>
new QualifiedContextInspectionResult(this,
string.Format(InspectionsUI.IllegalAnnotationInspectionResultFormat, ((VBAParser.AnnotationContext)context.Context).annotationName().GetText()),
State, context));
string.Format(InspectionsUI.IllegalAnnotationInspectionResultFormat, ((VBAParser.AnnotationContext)context.Context).annotationName().GetText()), context));
}

public class IllegalAttributeAnnotationsListener : VBAParserBaseListener, IInspectionListener
Expand Down Expand Up @@ -63,6 +62,11 @@ public IllegalAttributeAnnotationsListener(RubberduckParserState state)
public void ClearContexts()
{
_contexts.Clear();
var keys = _annotationCounts.Keys.ToList();
foreach (var key in keys)
{
_annotationCounts[key] = 0;
}
}

#region scoping
Expand Down
3 changes: 1 addition & 2 deletions Rubberduck.Inspections/Concrete/ImplicitByRefModifierInspection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ public override IEnumerable<IInspectionResult> GetInspectionResults()
string.Format(InspectionsUI.ImplicitByRefModifierInspectionResultFormat,
identifier.untypedIdentifier() != null
? identifier.untypedIdentifier().identifierValue().GetText()
: identifier.typedIdentifier().untypedIdentifier().identifierValue().GetText()),
State, issue);
: identifier.typedIdentifier().untypedIdentifier().identifierValue().GetText()), issue);
});
}

Expand Down
1 change: 0 additions & 1 deletion Rubberduck.Inspections/Concrete/MissingAnnotationArgumentInspection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ where context.annotationName().GetText() == AnnotationType.Ignore.ToString()
select new QualifiedContextInspectionResult(this,
string.Format(InspectionsUI.MissingAnnotationArgumentInspectionResultFormat,
((VBAParser.AnnotationContext)result.Context).annotationName().GetText()),
State,
result));
}

Expand Down
2 changes: 1 addition & 1 deletion Rubberduck.Inspections/Concrete/MissingAnnotationInspection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public override IEnumerable<IInspectionResult> GetInspectionResults()
var name = string.Format(InspectionsUI.MissingAnnotationInspectionResultFormat,
member, ((VBAParser.AttributeStmtContext) context.Context).AnnotationType().ToString());

return new QualifiedContextInspectionResult(this, name, State, context);
return new QualifiedContextInspectionResult(this, name, context);
});
}

Expand Down
10 changes: 7 additions & 3 deletions Rubberduck.Inspections/Concrete/MissingAttributeInspection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ public override IEnumerable<IInspectionResult> GetInspectionResults()
{
return Listener.Contexts.Select(context =>
{
var name = string.Format(InspectionsUI.MissingAttributeInspectionResultFormat, context.MemberName,
var name = string.Format(InspectionsUI.MissingAttributeInspectionResultFormat, context.MemberName.MemberName,
((VBAParser.AnnotationContext) context.Context).annotationName().GetText());
return new QualifiedContextInspectionResult(this, name, State, context);
return new QualifiedContextInspectionResult(this, name, context);
});
}

Expand Down Expand Up @@ -61,7 +61,7 @@ public override void ExitAnnotation(VBAParser.AnnotationContext context)
AddContext(new QualifiedContext<ParserRuleContext>(CurrentModuleName, context));
}
}
else
else if (isMemberAnnotation)
{
// member-level annotation is above the context for the first member in the module..
if (isModuleScope)
Expand All @@ -75,6 +75,10 @@ public override void ExitAnnotation(VBAParser.AnnotationContext context)
AddContext(new QualifiedContext<ParserRuleContext>(CurrentModuleName, context));
}
}
else
{
// annotation is illegal. ignore.
}
}
}
}
Expand Down
1 change: 0 additions & 1 deletion Rubberduck.Inspections/Concrete/ModuleScopeDimKeywordInspection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ public override IEnumerable<IInspectionResult> GetInspectionResults()
.Select(r => new QualifiedContext<ParserRuleContext>(result.ModuleName, r)))
.Select(result => new QualifiedContextInspectionResult(this,
string.Format(InspectionsUI.ModuleScopeDimKeywordInspectionResultFormat, ((VBAParser.VariableSubStmtContext)result.Context).identifier().GetText()),
State,
result));
}

Expand Down
1 change: 0 additions & 1 deletion Rubberduck.Inspections/Concrete/MultilineParameterInspection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ public override IEnumerable<IInspectionResult> GetInspectionResults()
string.Format(context.Context.GetSelection().LineCount > 3
? RubberduckUI.EasterEgg_Continuator
: InspectionsUI.MultilineParameterInspectionResultFormat, ((VBAParser.ArgContext)context.Context).unrestrictedIdentifier().ToString()),
State,
context));
}

Expand Down
1 change: 0 additions & 1 deletion Rubberduck.Inspections/Concrete/MultipleDeclarationsInspection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public override IEnumerable<IInspectionResult> GetInspectionResults()
.Where(result => !IsIgnoringInspectionResultFor(result.ModuleName, result.Context.Start.Line))
.Select(context => new QualifiedContextInspectionResult(this,
InspectionsUI.MultipleDeclarationsInspectionResultFormat,
State,
context));
}

Expand Down
1 change: 0 additions & 1 deletion Rubberduck.Inspections/Concrete/ObsoleteCallStatementInspection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ public override IEnumerable<IInspectionResult> GetInspectionResults()
{
results.Add(new QualifiedContextInspectionResult(this,
InspectionsUI.ObsoleteCallStatementInspectionResultFormat,
State,
context));
}
}
Expand Down
2 changes: 1 addition & 1 deletion Rubberduck.Inspections/Concrete/ObsoleteCommentSyntaxInspection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public ObsoleteCommentSyntaxInspection(RubberduckParserState state)
public override IEnumerable<IInspectionResult> GetInspectionResults()
{
return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName, context.Context.Start.Line))
.Select(context => new QualifiedContextInspectionResult(this, InspectionsUI.ObsoleteCommentSyntaxInspectionResultFormat, State, context));
.Select(context => new QualifiedContextInspectionResult(this, InspectionsUI.ObsoleteCommentSyntaxInspectionResultFormat, context));
}

public class ObsoleteCommentSyntaxListener : VBAParserBaseListener, IInspectionListener
Expand Down
2 changes: 1 addition & 1 deletion Rubberduck.Inspections/Concrete/ObsoleteLetStatementInspection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public ObsoleteLetStatementInspection(RubberduckParserState state)
public override IEnumerable<IInspectionResult> GetInspectionResults()
{
return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName, context.Context.Start.Line))
.Select(context => new QualifiedContextInspectionResult(this, InspectionsUI.ObsoleteLetStatementInspectionResultFormat, State, context));
.Select(context => new QualifiedContextInspectionResult(this, InspectionsUI.ObsoleteLetStatementInspectionResultFormat, context));
}

public class ObsoleteLetStatementListener : VBAParserBaseListener, IInspectionListener
Expand Down
1 change: 0 additions & 1 deletion Rubberduck.Inspections/Concrete/OptionBaseInspection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ public override IEnumerable<IInspectionResult> GetInspectionResults()
return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName, context.Context.Start.Line))
.Select(context => new QualifiedContextInspectionResult(this,
string.Format(InspectionsUI.OptionBaseInspectionResultFormat, context.ModuleName.ComponentName),
State,
context));
}

Expand Down
1 change: 0 additions & 1 deletion Rubberduck.Inspections/Concrete/OptionExplicitInspection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ public override IEnumerable<IInspectionResult> GetInspectionResults()
{
return Listener.Contexts.Select(context => new QualifiedContextInspectionResult(this,
string.Format(InspectionsUI.OptionExplicitInspectionResultFormat, context.ModuleName.ComponentName),
State,
context));
}

Expand Down
3 changes: 1 addition & 2 deletions Rubberduck.Inspections/Concrete/RedundantByRefModifierInspection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ public override IEnumerable<IInspectionResult> GetInspectionResults()
string.Format(InspectionsUI.RedundantByRefModifierInspectionResultFormat,
identifier.untypedIdentifier() != null
? identifier.untypedIdentifier().identifierValue().GetText()
: identifier.typedIdentifier().untypedIdentifier().identifierValue().GetText()),
State, issue);
: identifier.typedIdentifier().untypedIdentifier().identifierValue().GetText()), issue);
});
}

Expand Down
1 change: 0 additions & 1 deletion Rubberduck.Inspections/Concrete/RedundantOptionInspection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public override IEnumerable<IInspectionResult> GetInspectionResults()
return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName, context.Context.Start.Line))
.Select(context => new QualifiedContextInspectionResult(this,
string.Format(InspectionsUI.RedundantOptionInspectionResultFormat, context.Context.GetText()),
State,
context));
}

Expand Down
6 changes: 1 addition & 5 deletions Rubberduck.Inspections/QuickFixes/SynchronizeAttributesQuickFix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public SynchronizeAttributesQuickFix(RubberduckParserState state)
public void Fix(IInspectionResult result)
{
var context = result.Context;
// bug: this needs to assume member name is null for module-level stuff...
if (result.QualifiedMemberName?.MemberName != null)
{
FixMember(result, context);
Expand Down Expand Up @@ -86,11 +87,6 @@ private void FixMember(IInspectionResult result, ParserRuleContext context)
}
}

/// <summary>
/// Adds an annotation to match given attribute.
/// </summary>
/// <param name="memberName"></param>
/// <param name="context"></param>
private void Fix(QualifiedMemberName memberName, VBAParser.AttributeStmtContext context)
{
if (context.AnnotationType() == AnnotationType.Description)
Expand Down
9 changes: 1 addition & 8 deletions Rubberduck.Inspections/Results/QualifiedContextInspectionResult.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
using Rubberduck.Inspections.Abstract;
using Rubberduck.Parsing;
using Rubberduck.Parsing.Inspections.Abstract;
using Rubberduck.Parsing.VBA;
using Rubberduck.VBEditor;

namespace Rubberduck.Inspections.Results
{
class QualifiedContextInspectionResult : InspectionResultBase
{
public QualifiedContextInspectionResult(IInspection inspection, string description, RubberduckParserState state, QualifiedContext context, Dictionary<string, string> properties = null) :
public QualifiedContextInspectionResult(IInspection inspection, string description, QualifiedContext context, Dictionary<string, string> properties = null) :
base(inspection,
description,
context.ModuleName,
Expand All @@ -21,11 +20,5 @@ class QualifiedContextInspectionResult : InspectionResultBase
properties)
{
}

private static QualifiedMemberName? GetQualifiedMemberName(RubberduckParserState state, QualifiedContext context)
{
var members = state.DeclarationFinder.Members(context.ModuleName);
return members.SingleOrDefault(m => m.Selection.Contains(context.Context.GetSelection()))?.QualifiedName;
}
}
}