Merge pull request #1835 from Hosch250/Issue1770

Correctly determine matching declaration

Author: Hosch250

RetailCoder.VBE/Inspections/ProcedureCanBeWrittenAsFunctionInspection.cs

@@ -40,9 +40,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
                 .Where(c =>
             {
                 var declaration =
-                    UserDeclarations.SingleOrDefault(d => d.DeclarationType == DeclarationType.Procedure &&
-                                                          d.IdentifierName == c.subroutineName().GetText() &&
-                                                          d.Context.GetSelection().Equals(c.GetSelection()));
+                    UserDeclarations.SingleOrDefault(d => d.Context == c);
 
                 if (UserDeclarations.FindInterfaceMembers().Contains(declaration))
                 {
@@ -63,9 +61,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
             var subStmtsNotImplementingEvents = subStmts
                 .Where(c =>
                 {
-                    var declaration = UserDeclarations.SingleOrDefault(d => d.DeclarationType == DeclarationType.Procedure &&
-                                                              d.IdentifierName == c.subroutineName().GetText() &&
-                                                              d.Context.GetSelection().Equals(c.GetSelection()));
+                    var declaration = UserDeclarations.SingleOrDefault(d => d.Context == c);
 
                     if (declaration == null) { return false; }  // rather be safe than sorry
 

Rubberduck.Parsing/ParserRuleContextExtensions.cs

@@ -29,74 +29,5 @@ public static Selection GetSelection(this ParserRuleContext context)
                 endCol
                 );
         }
-
-        public static Accessibility GetAccessibility(this VBAParser.VisibilityContext context)
-        {
-            if (context == null)
-                return Accessibility.Implicit;
-
-            return (Accessibility) Enum.Parse(typeof (Accessibility), context.GetText());
-        }
-
-        public static string Signature(this VBAParser.FunctionStmtContext context)
-        {
-            var visibility = context.visibility();
-            var visibilityText = visibility == null ? string.Empty : visibility.GetText();
-
-            var identifierText = context.functionName().identifier().GetText();
-            var argsText = context.argList().GetText();
-            
-            var asType = context.asTypeClause();
-            var asTypeText = asType == null ? string.Empty : asType.GetText();
-
-            return (visibilityText + ' ' + Tokens.Function + ' ' + identifierText + argsText + ' ' + asTypeText).Trim();
-        }
-
-        public static string Signature(this VBAParser.SubStmtContext context)
-        {
-            var visibility = context.visibility();
-            var visibilityText = visibility == null ? string.Empty : visibility.GetText();
-
-            var identifierText = context.subroutineName().GetText();
-            var argsText = context.argList().GetText();
-
-            return (visibilityText + ' ' + Tokens.Sub + ' ' + identifierText + argsText).Trim();
-        }
-
-        public static string Signature(this VBAParser.PropertyGetStmtContext context)
-        {
-            var visibility = context.visibility();
-            var visibilityText = visibility == null ? string.Empty : visibility.GetText();
-
-            var identifierText = context.functionName().identifier().GetText();
-            var argsText = context.argList().GetText();
-
-            var asType = context.asTypeClause();
-            var asTypeText = asType == null ? string.Empty : asType.GetText();
-
-            return (visibilityText + ' ' + Tokens.Property + ' ' + Tokens.Get + ' ' + identifierText + argsText + ' ' + asTypeText).Trim();
-        }
-
-        public static string Signature(this VBAParser.PropertyLetStmtContext context)
-        {
-            var visibility = context.visibility();
-            var visibilityText = visibility == null ? string.Empty : visibility.GetText();
-
-            var identifierText = context.subroutineName().GetText();
-            var argsText = context.argList().GetText();
-
-            return (visibilityText + ' ' + Tokens.Property + ' ' + Tokens.Let + ' ' + identifierText + argsText).Trim();
-        }
-
-        public static string Signature(this VBAParser.PropertySetStmtContext context)
-        {
-            var visibility = context.visibility();
-            var visibilityText = visibility == null ? string.Empty : visibility.GetText();
-
-            var identifierText = context.subroutineName().GetText();
-            var argsText = context.argList().GetText();
-
-            return (visibilityText + ' ' + Tokens.Property + ' ' + Tokens.Set + ' ' + identifierText + argsText).Trim();
-        }
     }
 }