ParameterNotUsedInspection now ignores Event and Declare statements

retailcoder · Mar 23, 2015 · a2d2e0a · a2d2e0a
1 parent 1545bc1
commit a2d2e0a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/RetailCoder.VBE/Inspections/ParameterCanBeByValInspection.cs b/RetailCoder.VBE/Inspections/ParameterCanBeByValInspection.cs
@@ -27,7 +27,7 @@ public IEnumerable<CodeInspectionResultBase> GetInspectionResults(VBProjectParse
 
             foreach (var issue in declarations)
             {
-                yield return new ParameterCanBeByValInspectionResult(string.Format(Name, issue.Context.GetText()), Severity, issue.Context, issue.QualifiedName);
+                yield return new ParameterCanBeByValInspectionResult(string.Format(Name, issue.IdentifierName), Severity, issue.Context, issue.QualifiedName);
             }
         }
     }

diff --git a/RetailCoder.VBE/Inspections/ParameterNotUsedInspection.cs b/RetailCoder.VBE/Inspections/ParameterNotUsedInspection.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Rubberduck.Parsing;
+using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
 
 namespace Rubberduck.Inspections
@@ -20,11 +21,13 @@ public IEnumerable<CodeInspectionResultBase> GetInspectionResults(VBProjectParse
         {
             var declarations = parseResult.Declarations.Items.Where(declaration =>
                 declaration.DeclarationType == DeclarationType.Parameter
+                && !(declaration.Context.Parent.Parent is VBAParser.EventStmtContext)
+                && !(declaration.Context.Parent.Parent is VBAParser.DeclareStmtContext)
                 && !declaration.References.Any());
 
             foreach (var issue in declarations)
             {
-                yield return new ParameterNotUsedInspectionResult(string.Format(Name, issue.Context.GetText()), Severity, issue.Context, issue.QualifiedName);
+                yield return new ParameterNotUsedInspectionResult(string.Format(Name, issue.IdentifierName), Severity, issue.Context, issue.QualifiedName);
             }
         }
     }

diff --git a/Rubberduck.Parsing/Symbols/Declaration.cs b/Rubberduck.Parsing/Symbols/Declaration.cs
@@ -119,13 +119,13 @@ public string Scope
                 {
                     case DeclarationType.Class:
                     case DeclarationType.Module:
-                        return _projectName;
+                        return _projectName + "." + _componentName;
                     case DeclarationType.Procedure:
                     case DeclarationType.Function:
                     case DeclarationType.PropertyGet:
                     case DeclarationType.PropertyLet:
                     case DeclarationType.PropertySet:
-                        return _projectName + "." + _componentName;
+                        return _projectName + "." + _componentName + "." + _identifierName;
                     default:
                         return _parentScope;
                 }