Skip to content

Commit 281ea6f

Browse files
committed
Fix many inspection declarations.
1 parent 99a3617 commit 281ea6f

18 files changed

+212
-47
lines changed

RetailCoder.VBE/Inspections/ImplicitActiveSheetReferenceInspection.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Linq;
44
using Antlr4.Runtime;
55
using Microsoft.Vbe.Interop;
6+
using Rubberduck.Parsing.Symbols;
67
using Rubberduck.Parsing.VBA;
78
using Rubberduck.VBEditor;
89
using Rubberduck.VBEditor.Extensions;
@@ -21,7 +22,7 @@ public ImplicitActiveSheetReferenceInspection(VBE vbe, RubberduckParserState sta
2122
}
2223

2324
public override string Meta { get { return InspectionsUI.ImplicitActiveSheetReferenceInspectionMeta; } }
24-
public override string Description { get { return InspectionsUI.ImplicitActiveSheetReferenceInspectionName; } }
25+
public override string Description { get { return InspectionsUI.ImplicitActiveSheetReferenceInspectionResultFormat; } }
2526
public override CodeInspectionType InspectionType { get { return CodeInspectionType.MaintainabilityAndReadabilityIssues; } }
2627

2728
private static readonly string[] Targets =
@@ -45,30 +46,30 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
4546
.SelectMany(declaration => declaration.References);
4647

4748
return issues.Select(issue =>
48-
new ImplicitActiveSheetReferenceInspectionResult(this, string.Format(Description, issue.Declaration.IdentifierName), issue.Context, issue.QualifiedModuleName));
49+
new ImplicitActiveSheetReferenceInspectionResult(this, issue));
4950
}
5051
}
5152

5253
public class ImplicitActiveSheetReferenceInspectionResult : InspectionResultBase
5354
{
54-
private readonly string _result;
55+
private readonly IdentifierReference _reference;
5556
private readonly IEnumerable<CodeInspectionQuickFix> _quickFixes;
5657

57-
public ImplicitActiveSheetReferenceInspectionResult(IInspection inspection, string result, ParserRuleContext context, QualifiedModuleName qualifiedName)
58-
: base(inspection, qualifiedName, context)
58+
public ImplicitActiveSheetReferenceInspectionResult(IInspection inspection, IdentifierReference reference)
59+
: base(inspection, reference.QualifiedModuleName, reference.Context)
5960
{
60-
_result = result;
61+
_reference = reference;
6162
_quickFixes = new CodeInspectionQuickFix[]
6263
{
63-
new IgnoreOnceQuickFix(context, QualifiedSelection, Inspection.AnnotationName),
64+
new IgnoreOnceQuickFix(reference.Context, QualifiedSelection, Inspection.AnnotationName),
6465
};
6566
}
6667

6768
public override IEnumerable<CodeInspectionQuickFix> QuickFixes { get { return _quickFixes; } }
6869

6970
public override string Description
7071
{
71-
get { return _result; }
72+
get { return string.Format(Inspection.Description, _reference.Declaration.IdentifierName); }
7273
}
7374
}
7475
}

RetailCoder.VBE/Inspections/ImplicitActiveWorkbookReferenceInspection.cs

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using Microsoft.Vbe.Interop;
5+
using Rubberduck.Parsing.Symbols;
56
using Rubberduck.Parsing.VBA;
67
using Rubberduck.VBEditor.Extensions;
78
using Rubberduck.VBEditor.VBEHost;
@@ -19,7 +20,7 @@ public ImplicitActiveWorkbookReferenceInspection(VBE vbe, RubberduckParserState
1920
}
2021

2122
public override string Meta { get { return InspectionsUI.ImplicitActiveWorkbookReferenceInspectionMeta; } }
22-
public override string Description { get { return InspectionsUI.ImplicitActiveWorkbookReferenceInspectionName; } }
23+
public override string Description { get { return InspectionsUI.ImplicitActiveWorkbookReferenceInspectionResultFormat; } }
2324
public override CodeInspectionType InspectionType { get { return CodeInspectionType.MaintainabilityAndReadabilityIssues; } }
2425

2526
private static readonly string[] Targets =
@@ -42,7 +43,30 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
4243
.SelectMany(declaration => declaration.References);
4344

4445
return issues.Select(issue =>
45-
new ImplicitActiveSheetReferenceInspectionResult(this, string.Format(Description, issue.Declaration.IdentifierName), issue.Context, issue.QualifiedModuleName));
46+
new ImplicitActiveWorkbookReferenceInspectionResult(this, issue));
47+
}
48+
}
49+
50+
public class ImplicitActiveWorkbookReferenceInspectionResult : InspectionResultBase
51+
{
52+
private readonly IdentifierReference _reference;
53+
private readonly IEnumerable<CodeInspectionQuickFix> _quickFixes;
54+
55+
public ImplicitActiveWorkbookReferenceInspectionResult(IInspection inspection, IdentifierReference reference)
56+
: base(inspection, reference.QualifiedModuleName, reference.Context)
57+
{
58+
_reference = reference;
59+
_quickFixes = new CodeInspectionQuickFix[]
60+
{
61+
new IgnoreOnceQuickFix(reference.Context, QualifiedSelection, Inspection.AnnotationName),
62+
};
63+
}
64+
65+
public override IEnumerable<CodeInspectionQuickFix> QuickFixes { get { return _quickFixes; } }
66+
67+
public override string Description
68+
{
69+
get { return string.Format(Inspection.Description, _reference.Declaration.IdentifierName); }
4670
}
4771
}
4872
}

RetailCoder.VBE/Inspections/InspectionsUI.Designer.cs

Lines changed: 107 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)