I didn't need to DI the ArgListContext through two classes...

Author: Hosch250

RetailCoder.VBE/Inspections/ProcedureShouldBeFunctionInspection.cs

@@ -28,10 +28,7 @@ public IEnumerable<CodeInspectionResultBase> GetInspectionResults(RubberduckPars
                     new QualifiedContext<VBAParser.ArgListContext>(context.ModuleName,
                         context.Context as VBAParser.ArgListContext),
                     new QualifiedContext<VBAParser.SubStmtContext>(context.ModuleName,
-                        context.Context.Parent as VBAParser.SubStmtContext),
-                    new QualifiedContext<VBAParser.ArgContext>(context.ModuleName,
-                        ((VBAParser.ArgListContext) context.Context).arg()
-                            .First(a => a.BYREF() != null || (a.BYREF() == null && a.BYVAL() == null)))));
+                        context.Context.Parent as VBAParser.SubStmtContext)));
         }
     }
 }

RetailCoder.VBE/Inspections/ProcedureShouldBeFunctionInspectionResult.cs

@@ -12,15 +12,15 @@ public class ProcedureShouldBeFunctionInspectionResult : CodeInspectionResultBas
     {
        private readonly IEnumerable<CodeInspectionQuickFix> _quickFixes;
 
-       public ProcedureShouldBeFunctionInspectionResult(IInspection inspection, RubberduckParserState state, QualifiedContext<VBAParser.ArgListContext> argListQualifiedContext, QualifiedContext<VBAParser.SubStmtContext> subStmtQualifiedContext, QualifiedContext<VBAParser.ArgContext> argQualifiedContext)
+       public ProcedureShouldBeFunctionInspectionResult(IInspection inspection, RubberduckParserState state, QualifiedContext<VBAParser.ArgListContext> argListQualifiedContext, QualifiedContext<VBAParser.SubStmtContext> subStmtQualifiedContext)
            : base(inspection,
                 string.Format(inspection.Description, subStmtQualifiedContext.Context.ambiguousIdentifier().GetText()),
                 subStmtQualifiedContext.ModuleName,
                 subStmtQualifiedContext.Context.ambiguousIdentifier())
         {
             _quickFixes = new[]
             {
-                new ChangeProcedureToFunction(state, argListQualifiedContext, subStmtQualifiedContext, argQualifiedContext, QualifiedSelection), 
+                new ChangeProcedureToFunction(state, argListQualifiedContext, subStmtQualifiedContext, QualifiedSelection), 
             };
         }
 
@@ -37,14 +37,15 @@ public class ChangeProcedureToFunction : CodeInspectionQuickFix
         public ChangeProcedureToFunction(RubberduckParserState state,
                                          QualifiedContext<VBAParser.ArgListContext> argListQualifiedContext,
                                          QualifiedContext<VBAParser.SubStmtContext> subStmtQualifiedContext,
-                                         QualifiedContext<VBAParser.ArgContext> argQualifiedContext,
                                          QualifiedSelection selection)
             : base(subStmtQualifiedContext.Context, selection, InspectionsUI.ProcedureShouldBeFunctionInspectionQuickFix)
         {
             _state = state;
             _argListQualifiedContext = argListQualifiedContext;
             _subStmtQualifiedContext = subStmtQualifiedContext;
-            _argQualifiedContext = argQualifiedContext;
+            _argQualifiedContext = new QualifiedContext<VBAParser.ArgContext>(_argListQualifiedContext.ModuleName,
+                _argListQualifiedContext.Context.arg()
+                    .First(a => a.BYREF() != null || (a.BYREF() == null && a.BYVAL() == null)));
         }
 
         public override void Fix()