Fix further indirect conflicts from merge

- DeclarationInspectionBase
- FunctionReturnValueDiscardedInspection
- ImplicitlyTypedConstInspection

Author: MDoerner

Rubberduck.CodeAnalysis/Inspections/Abstract/DeclarationInspectionBase.cs

@@ -10,13 +10,11 @@ namespace Rubberduck.Inspections.Abstract
 {
     public abstract class DeclarationInspectionBase : InspectionBase
     {
-        protected readonly IDeclarationFinderProvider DeclarationFinderProvider;
         protected readonly DeclarationType[] RelevantDeclarationTypes;
 
         protected DeclarationInspectionBase(RubberduckParserState state, params DeclarationType[] relevantDeclarationTypes)
             : base(state)
         {
-            DeclarationFinderProvider = state;
             RelevantDeclarationTypes = relevantDeclarationTypes;
         }
 

Rubberduck.CodeAnalysis/Inspections/Concrete/FunctionReturnValueDiscardedInspection.cs

@@ -6,6 +6,7 @@
 using Rubberduck.Resources.Inspections;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.Parsing.VBA.DeclarationCaching;
 
 namespace Rubberduck.Inspections.Concrete
 {
@@ -46,7 +47,7 @@ public FunctionReturnValueDiscardedInspection(RubberduckParserState state)
             Severity = CodeInspectionSeverity.Suggestion;
         }
 
-        protected override bool IsResultReference(IdentifierReference reference)
+        protected override bool IsResultReference(IdentifierReference reference, DeclarationFinder finder)
         {
             return reference?.Declaration != null
                 && !reference.IsAssignment
@@ -85,7 +86,7 @@ private static bool IsCalledAsProcedure(ParserRuleContext context)
             return true;
         }
 
-        protected override string ResultDescription(IdentifierReference reference)
+        protected override string ResultDescription(IdentifierReference reference, dynamic properties = null)
         {
             var functionName = reference.Declaration.QualifiedName.ToString();
             return string.Format(InspectionResults.FunctionReturnValueDiscardedInspection, functionName);

Rubberduck.CodeAnalysis/Inspections/Concrete/ImplicitlyTypedConstInspection.cs

@@ -16,7 +16,7 @@ public ImplicitlyTypedConstInspection(RubberduckParserState state)
 
         protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
         {
-            var declarationFinder = State.DeclarationFinder;
+            var declarationFinder = DeclarationFinderProvider.DeclarationFinder;
 
             var implicitlyTypedConsts = declarationFinder.UserDeclarations(DeclarationType.Constant)
                 .Where(declaration => !declaration.IsTypeSpecified);