Merge pull request #1151 from retailcoder/CodeExplorer

Fixed null target in VariableTypeNotDeclaredInspection (#1150)

Author: retailcoder

RetailCoder.VBE/Inspections/VariableTypeNotDeclaredInspection.cs

@@ -23,7 +23,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
                             || item.DeclarationType == DeclarationType.Constant
                             || item.DeclarationType == DeclarationType.Parameter)
                          && !item.IsTypeSpecified()
-                         select new VariableTypeNotDeclaredInspectionResult(this, item.Context, item.QualifiedName.QualifiedModuleName);
+                         select new VariableTypeNotDeclaredInspectionResult(this, item);
 
             return issues;
         }

RetailCoder.VBE/Inspections/VariableTypeNotDeclaredInspectionResult.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Antlr4.Runtime;
 using Rubberduck.Parsing.Grammar;
+using Rubberduck.Parsing.Symbols;
 using Rubberduck.VBEditor;
 
 namespace Rubberduck.Inspections
@@ -9,8 +10,8 @@ public class VariableTypeNotDeclaredInspectionResult : InspectionResultBase
     {
         private readonly IEnumerable<CodeInspectionQuickFix> _quickFixes;
 
-        public VariableTypeNotDeclaredInspectionResult(IInspection inspection, ParserRuleContext context, QualifiedModuleName qualifiedName)
-            : base(inspection, qualifiedName, context)
+        public VariableTypeNotDeclaredInspectionResult(IInspection inspection, Declaration target)
+            : base(inspection, target)
         {
             _quickFixes = new CodeInspectionQuickFix[]
             {

Rubberduck.VBEEditor/Extensions/VbeExtensions.cs

@@ -56,7 +56,7 @@ public static IHostApplication HostApplication(this VBE vbe)
             {
                 const int ctl_view_host = 106;
 
-                CommandBarControl host_app_control = vbe.CommandBars.FindControl(MsoControlType.msoControlButton, ctl_view_host);
+                var host_app_control = vbe.CommandBars.FindControl(MsoControlType.msoControlButton, ctl_view_host);
 
                 if (host_app_control == null)
                 {
@@ -79,12 +79,12 @@ public static IHostApplication HostApplication(this VBE vbe)
                         case "Microsoft Publisher":
                             return new PublisherApp();
                         case "AutoCAD":
-                            return null; //TODO - Confirm the button caption
+                            return new AutoCADApp();
                         case "CorelDRAW":
-                            return null;
+                            return new CorelDRAWApp();
                     }
                 }
-                return null;
+                return null;// new FallbackApp(vbe);
             }
 
             foreach (var reference in vbe.ActiveVBProject.References.Cast<Reference>()
@@ -111,7 +111,7 @@ public static IHostApplication HostApplication(this VBE vbe)
                 }
             }
 
-            return null;
+            return null; //new FallbackApp(vbe);
         }
     }
 }

Rubberduck.VBEEditor/Rubberduck.VBEditor.csproj

@@ -106,6 +106,7 @@
     <Compile Include="VBEHost\AccessApp.cs" />
     <Compile Include="VBEHost\CorelDRAWApp.cs" />
     <Compile Include="VBEHost\ExcelApp.cs" />
+    <Compile Include="VBEHost\FallbackApp.cs" />
     <Compile Include="VBEHost\HostApplicationBase.cs" />
     <Compile Include="VBEHost\IHostApplication.cs" />
     <Compile Include="VBEHost\OutlookApp.cs" />

Rubberduck.VBEEditor/VBEHost/FallbackApp.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Diagnostics;
+using Microsoft.Office.Core;
+using Microsoft.Vbe.Interop;
+using Rubberduck.VBEditor.VBEInterfaces.RubberduckCodePane;
+
+namespace Rubberduck.VBEditor.VBEHost
+{
+    public class FallbackApp : IHostApplication
+    {
+        private readonly VBE _vbe;
+        private readonly CommandBarButton _runButton;
+
+        private const int DebugCommandBarId = 4;
+        private const int RunMacroCommand = 186;
+
+        public FallbackApp(VBE vbe)
+        {
+            _vbe = vbe;
+            var mainCommandBar = _vbe.CommandBars[DebugCommandBarId];
+            _runButton = (CommandBarButton)mainCommandBar.FindControl(Id: RunMacroCommand);
+        }
+
+        public void Run(QualifiedMemberName qualifiedMemberName)
+        {
+            var component = qualifiedMemberName.QualifiedModuleName.Component;
+            var line = component.CodeModule.get_ProcBodyLine(qualifiedMemberName.MemberName, vbext_ProcKind.vbext_pk_Proc);
+
+            component.CodeModule.CodePane.SetSelection(line, 1, line, 1);
+            component.CodeModule.CodePane.ForceFocus();
+
+            _runButton.Execute();
+            // note: this can't work... because the .Execute() call isn't blocking, so method returns before test method actually runs.
+        }
+
+        public TimeSpan TimedMethodCall(QualifiedMemberName qualifiedMemberName)
+        {
+            var stopwatch = Stopwatch.StartNew();
+
+            Run(qualifiedMemberName);
+
+            stopwatch.Stop();
+            return stopwatch.Elapsed;
+        }
+
+        public string ApplicationName { get { return "(unknown)"; } }
+
+        public void Dispose()
+        {
+        }
+    }
+}