Skip to content

Commit 12dfd86

Browse files
Hosch250Hosch250
committed
Uncomment GenericProjectNameInspection working and add Name property to IInspection
1 parent f5767df commit 12dfd86

30 files changed

+109
-76
lines changed

‎RetailCoder.VBE/App.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ private void EnableCodeInspections(Configuration config)
6363
{
6464
foreach (var setting in config.UserSettings.CodeInspectionSettings.CodeInspections)
6565
{
66-
if (inspection.Name == setting.Name)
66+
if (inspection.Description == setting.Description)
6767
{
6868
inspection.Severity = setting.Severity;
6969
}

‎RetailCoder.VBE/Config/CodeInspectionSettings.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ public class CodeInspectionSetting : IInspectionModel
2626
[XmlAttribute]
2727
public string Name { get; set; }
2828

29+
[XmlAttribute]
30+
public string Description { get; set; }
31+
2932
[XmlAttribute]
3033
public CodeInspectionSeverity Severity { get; set; }
3134

@@ -39,13 +42,13 @@ public CodeInspectionSetting()
3942

4043
public CodeInspectionSetting(string name, CodeInspectionType type, CodeInspectionSeverity severity)
4144
{
42-
this.Name = name;
45+
this.Description = name;
4346
this.InspectionType = type;
4447
this.Severity = severity;
4548
}
4649

4750
public CodeInspectionSetting(IInspectionModel inspection)
48-
: this(inspection.Name, inspection.InspectionType, inspection.Severity)
51+
: this(inspection.Description, inspection.InspectionType, inspection.Severity)
4952
{ }
5053
}
5154
}

‎RetailCoder.VBE/Inspections/ConstantNotUsedInspection.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ public ConstantNotUsedInspection()
1313
Severity = CodeInspectionSeverity.Warning;
1414
}
1515

16-
public string Name { get { return RubberduckUI.ConstantNotUsed_; } }
16+
public string Name { get { return "ConstantNotUsedInspection"; } }
17+
public string Description { get { return RubberduckUI.ConstantNotUsed_; } }
1718
public CodeInspectionType InspectionType { get { return CodeInspectionType.CodeQualityIssues; } }
1819
public CodeInspectionSeverity Severity { get; set; }
1920

@@ -26,7 +27,7 @@ public IEnumerable<CodeInspectionResultBase> GetInspectionResults(VBProjectParse
2627

2728
foreach (var issue in declarations)
2829
{
29-
yield return new IdentifierNotUsedInspectionResult(string.Format(Name, issue.IdentifierName), Severity, ((dynamic)issue.Context).ambiguousIdentifier(), issue.QualifiedName.QualifiedModuleName);
30+
yield return new IdentifierNotUsedInspectionResult(string.Format(Description, issue.IdentifierName), Severity, ((dynamic)issue.Context).ambiguousIdentifier(), issue.QualifiedName.QualifiedModuleName);
3031
}
3132
}
3233
}

‎RetailCoder.VBE/Inspections/GenericProjectNameInspection.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@
77

88
namespace Rubberduck.Inspections
99
{
10-
/*class GenericProjectNameInspection : IInspection
10+
class GenericProjectNameInspection : IInspection
1111
{
1212
public GenericProjectNameInspection()
1313
{
1414
Severity = CodeInspectionSeverity.Suggestion;
1515
}
1616

17-
public string Name { get { return RubberduckUI.GenericProjectName_; } }
17+
public string Name { get { return "GenericProjectNameInspection"; } }
18+
public string Description { get { return RubberduckUI.GenericProjectName_; } }
1819
public CodeInspectionType InspectionType { get { return CodeInspectionType.MaintainabilityAndReadabilityIssues; } }
1920
public CodeInspectionSeverity Severity { get; set; }
2021

@@ -23,10 +24,10 @@ public IEnumerable<CodeInspectionResultBase> GetInspectionResults(VBProjectParse
2324
var issues = parseResult.Declarations.Items
2425
.Where(declaration => declaration.DeclarationType == DeclarationType.Project
2526
&& declaration.IdentifierName.Contains("VBAProject"))
26-
.Select(issue => new GenericProjectNameInspectionResult(Name, Severity, issue.QualifiedName.QualifiedModuleName))
27+
.Select(issue => new GenericProjectNameInspectionResult(string.Format(Description, issue.IdentifierName), Severity, issue.QualifiedName.QualifiedModuleName))
2728
.ToList();
2829

2930
return issues;
3031
}
31-
}*/
32+
}
3233
}

‎RetailCoder.VBE/Inspections/GenericProjectNameInspectionResult.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace Rubberduck.Inspections
99
{
10-
/*public class GenericProjectNameInspectionResult : CodeInspectionResultBase
10+
public class GenericProjectNameInspectionResult : CodeInspectionResultBase
1111
{
1212
public GenericProjectNameInspectionResult(string inspection, CodeInspectionSeverity type, QualifiedModuleName qualifiedName)
1313
: base(inspection, type, new CommentNode("", new QualifiedSelection(qualifiedName, Selection.Home)))
@@ -18,5 +18,5 @@ public override IDictionary<string, Action> GetQuickFixes()
1818
{
1919
return new Dictionary<string, Action>();
2020
}
21-
}*/
21+
}
2222
}

‎RetailCoder.VBE/Inspections/IInspectionModel.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,15 @@
66
public interface IInspectionModel
77
{
88
/// <summary>
9-
/// Gets a short description for the code inspection.
9+
/// Gets the inspection name.
1010
/// </summary>
1111
string Name { get; }
1212

13+
/// <summary>
14+
/// Gets a short description for the code inspection.
15+
/// </summary>
16+
string Description { get; }
17+
1318
/// <summary>
1419
/// Gets a value indicating the type of the code inspection.
1520
/// </summary>

‎RetailCoder.VBE/Inspections/ImplicitByRefParameterInspection.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ public ImplicitByRefParameterInspection()
1414
Severity = CodeInspectionSeverity.Warning;
1515
}
1616

17-
public string Name { get { return RubberduckUI.ImplicitByRef_; } }
17+
public string Name { get { return "ImplicitByRefParameterInspection"; } }
18+
public string Description { get { return RubberduckUI.ImplicitByRef_; } }
1819
public CodeInspectionType InspectionType { get { return CodeInspectionType.CodeQualityIssues; } }
1920
public CodeInspectionSeverity Severity { get; set; }
2021

@@ -28,7 +29,7 @@ public IEnumerable<CodeInspectionResultBase> GetInspectionResults(VBProjectParse
2829
let arg = item.Context.Parent as VBAParser.ArgContext
2930
where arg != null && arg.BYREF() == null && arg.BYVAL() == null
3031
select new QualifiedContext<VBAParser.ArgContext>(item.QualifiedName, arg))
31-
.Select(issue => new ImplicitByRefParameterInspectionResult(string.Format(Name, issue.Context.ambiguousIdentifier().GetText()), Severity, issue));
32+
.Select(issue => new ImplicitByRefParameterInspectionResult(string.Format(Description, issue.Context.ambiguousIdentifier().GetText()), Severity, issue));
3233

3334
return issues;
3435
}

‎RetailCoder.VBE/Inspections/ImplicitPublicMemberInspection.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ public ImplicitPublicMemberInspection()
1414
Severity = CodeInspectionSeverity.Warning;
1515
}
1616

17-
public string Name { get { return RubberduckUI.ImplicitPublicMember_; } }
17+
public string Name { get { return "ImplicitPublicMemberInspection"; } }
18+
public string Description { get { return RubberduckUI.ImplicitPublicMember_; } }
1819
public CodeInspectionType InspectionType { get { return CodeInspectionType.MaintainabilityAndReadabilityIssues; } }
1920
public CodeInspectionSeverity Severity { get; set; }
2021

@@ -34,7 +35,7 @@ public IEnumerable<CodeInspectionResultBase> GetInspectionResults(VBProjectParse
3435
&& ProcedureTypes.Contains(item.DeclarationType)
3536
&& item.Accessibility == Accessibility.Implicit
3637
let context = new QualifiedContext<ParserRuleContext>(item.QualifiedName, item.Context)
37-
select new ImplicitPublicMemberInspectionResult(string.Format(Name, ((dynamic)context.Context).ambiguousIdentifier().GetText()), Severity, context);
38+
select new ImplicitPublicMemberInspectionResult(string.Format(Description, ((dynamic)context.Context).ambiguousIdentifier().GetText()), Severity, context);
3839
return issues;
3940
}
4041
}

‎RetailCoder.VBE/Inspections/ImplicitVariantReturnTypeInspection.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ public ImplicitVariantReturnTypeInspection()
1616
Severity = CodeInspectionSeverity.Warning;
1717
}
1818

19-
public string Name { get { return RubberduckUI.ImplicitVariantReturnType_; } }
19+
public string Name { get { return "ImplicitVariantReturnTypeInspection"; } }
20+
public string Description { get { return RubberduckUI.ImplicitVariantReturnType_; } }
2021
public CodeInspectionType InspectionType { get { return CodeInspectionType.CodeQualityIssues; } }
2122
public CodeInspectionSeverity Severity { get; set; }
2223

@@ -34,7 +35,7 @@ public IEnumerable<CodeInspectionResultBase> GetInspectionResults(VBProjectParse
3435
&& ProcedureTypes.Contains(item.DeclarationType)
3536
&& !item.IsTypeSpecified()
3637
let issue = new {Declaration = item, QualifiedContext = new QualifiedContext<ParserRuleContext>(item.QualifiedName, item.Context)}
37-
select new ImplicitVariantReturnTypeInspectionResult(string.Format(Name, issue.Declaration.IdentifierName), Severity, issue.QualifiedContext);
38+
select new ImplicitVariantReturnTypeInspectionResult(string.Format(Description, issue.Declaration.IdentifierName), Severity, issue.QualifiedContext);
3839
return issues;
3940
}
4041

‎RetailCoder.VBE/Inspections/MultilineParameterInspection.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ public MultilineParameterInspection()
1616
Severity = CodeInspectionSeverity.Warning;
1717
}
1818

19-
public string Name { get { return RubberduckUI.MultilineParameter_; } }
19+
public string Name { get { return "MultilineParameterInspection"; } }
20+
public string Description { get { return RubberduckUI.MultilineParameter_; } }
2021
public CodeInspectionType InspectionType { get { return CodeInspectionType.MaintainabilityAndReadabilityIssues; } }
2122
public CodeInspectionSeverity Severity { get; set; }
2223

@@ -28,7 +29,7 @@ where p.Context.GetSelection().LineCount > 1
2829
select p;
2930

3031
var issues = multilineParameters
31-
.Select(param => new MultilineParameterInspectionResult(string.Format(param.Context.GetSelection().LineCount > 3 ? RubberduckUI.EasterEgg_Continuator : Name, param.IdentifierName), Severity, param.Context, param.QualifiedName));
32+
.Select(param => new MultilineParameterInspectionResult(string.Format(param.Context.GetSelection().LineCount > 3 ? RubberduckUI.EasterEgg_Continuator : Description, param.IdentifierName), Severity, param.Context, param.QualifiedName));
3233

3334
return issues;
3435
}

0 commit comments

Comments
 (0)