Merge pull request #4372 from Vogel612/whoopsies-cleanup

retailcoder · web-flow · commit 6d4087b79e99 · 2018-09-19T11:02:51.000-04:00
Clean up the whoopsies that snuck into prerelease 3782
diff --git a/Rubberduck.Core/UI/Command/CodeExplorerCommand.cs b/Rubberduck.Core/UI/Command/CodeExplorerCommand.cs
@@ -1,5 +1,6 @@
 using System.Runtime.InteropServices;
 using NLog;
+using Rubberduck.UI.CodeExplorer;
 
 namespace Rubberduck.UI.Command
 {
@@ -9,9 +10,9 @@ namespace Rubberduck.UI.Command
     [ComVisible(false)]
     public class CodeExplorerCommand : CommandBase
     {
-        private readonly IDockablePresenter _presenter;
+        private readonly CodeExplorerDockablePresenter _presenter;
 
-        public CodeExplorerCommand(IDockablePresenter presenter)
+        public CodeExplorerCommand(CodeExplorerDockablePresenter presenter)
             : base(LogManager.GetCurrentClassLogger())
         {
             _presenter = presenter;
diff --git a/Rubberduck.Core/UI/Command/CodeMetricsCommand.cs b/Rubberduck.Core/UI/Command/CodeMetricsCommand.cs
@@ -1,14 +1,15 @@
 ﻿using NLog;
+using Rubberduck.UI.CodeMetrics;
 using System.Runtime.InteropServices;
 
 namespace Rubberduck.UI.Command
 {
     [ComVisible(false)]
     public class CodeMetricsCommand : CommandBase
     {
-        private readonly IDockablePresenter _presenter;
+        private readonly CodeMetricsDockablePresenter _presenter;
 
-        public CodeMetricsCommand(IDockablePresenter presenter)
+        public CodeMetricsCommand(CodeMetricsDockablePresenter presenter)
             : base(LogManager.GetCurrentClassLogger())
         {
             _presenter = presenter;
diff --git a/Rubberduck.Core/UI/Command/InspectionResultsCommand.cs b/Rubberduck.Core/UI/Command/InspectionResultsCommand.cs
@@ -1,5 +1,6 @@
 ﻿using System.Runtime.InteropServices;
 using NLog;
+using Rubberduck.UI.Inspections;
 
 namespace Rubberduck.UI.Command
 {
@@ -9,9 +10,9 @@ namespace Rubberduck.UI.Command
     [ComVisible(false)]
     public class InspectionResultsCommand : CommandBase
     {
-        private readonly IDockablePresenter _presenter;
+        private readonly InspectionResultsDockablePresenter _presenter;
 
-        public InspectionResultsCommand(IDockablePresenter presenter)
+        public InspectionResultsCommand(InspectionResultsDockablePresenter presenter)
             : base(LogManager.GetCurrentClassLogger())
         {
             _presenter = presenter;
diff --git a/Rubberduck.Core/UI/Command/MenuItems/CommandBars/ReparseCommandMenuItem.cs b/Rubberduck.Core/UI/Command/MenuItems/CommandBars/ReparseCommandMenuItem.cs
@@ -7,7 +7,7 @@ namespace Rubberduck.UI.Command.MenuItems.CommandBars
 {
     public class ReparseCommandMenuItem : CommandMenuItemBase
     {
-        public ReparseCommandMenuItem(CommandBase command) : base(command)
+        public ReparseCommandMenuItem(ReparseCommand command) : base(command)
         {
         }
 
diff --git a/Rubberduck.Core/UI/Command/MenuItems/CommandBars/SerializeDeclarationsCommandMenuItem.cs b/Rubberduck.Core/UI/Command/MenuItems/CommandBars/SerializeDeclarationsCommandMenuItem.cs
@@ -11,7 +11,7 @@ namespace Rubberduck.UI.Command.MenuItems.CommandBars
 {
     public class SerializeDeclarationsCommandMenuItem : CommandMenuItemBase
     {
-        public SerializeDeclarationsCommandMenuItem(CommandBase command) : base(command)
+        public SerializeDeclarationsCommandMenuItem(SerializeDeclarationsCommand command) : base(command)
         {
         }
 
diff --git a/Rubberduck.Core/UI/Command/MenuItems/CommandBars/ShowParserErrorsCommandMenuItem.cs b/Rubberduck.Core/UI/Command/MenuItems/CommandBars/ShowParserErrorsCommandMenuItem.cs
@@ -9,7 +9,7 @@ namespace Rubberduck.UI.Command.MenuItems.CommandBars
 {
     public class ShowParserErrorsCommandMenuItem : CommandMenuItemBase
     {
-        public ShowParserErrorsCommandMenuItem(CommandBase command) : base(command)
+        public ShowParserErrorsCommandMenuItem(ShowParserErrorsCommand command) : base(command)
         {
         }
 
diff --git a/Rubberduck.Core/UI/Command/MenuItems/FormDesignerFindAllReferencesCommandMenuItem.cs b/Rubberduck.Core/UI/Command/MenuItems/FormDesignerFindAllReferencesCommandMenuItem.cs
@@ -5,7 +5,7 @@ namespace Rubberduck.UI.Command.MenuItems
 {
     public class FormDesignerFindAllReferencesCommandMenuItem : CommandMenuItemBase
     {
-        public FormDesignerFindAllReferencesCommandMenuItem(CommandBase command)
+        public FormDesignerFindAllReferencesCommandMenuItem(FormDesignerFindAllReferencesCommand command)
             : base(command)
         {
         }
diff --git a/Rubberduck.Core/UI/Command/MenuItems/RunAllTestsCommandMenuItem.cs b/Rubberduck.Core/UI/Command/MenuItems/RunAllTestsCommandMenuItem.cs
@@ -15,10 +15,5 @@ public RunAllTestsCommandMenuItem(RunAllTestsCommand command)
         public override int DisplayOrder => (int)UnitTestingMenuItemDisplayOrder.RunAllTests;
         public override Image Image => Resources.CommandBarIcons.AllLoadedTests;
         public override Image Mask => Resources.CommandBarIcons.AllLoadedTestsMask;
-
-        public override bool EvaluateCanExecute(RubberduckParserState state)
-        {
-            return state != null && state.Status >= ParserState.ResolvedDeclarations && state.Status < ParserState.Error;
-        }
     }
 }
diff --git a/Rubberduck.Core/UI/Command/MenuItems/TestExplorerCommandMenuItem.cs b/Rubberduck.Core/UI/Command/MenuItems/TestExplorerCommandMenuItem.cs
@@ -2,7 +2,7 @@
 
 namespace Rubberduck.UI.Command.MenuItems
 {
-    public class TestExplorerCommandMenuItem : CommandMenuItemBase
+    internal class TestExplorerCommandMenuItem : CommandMenuItemBase
     {
         public TestExplorerCommandMenuItem(TestExplorerCommand command)
             : base(command)
diff --git a/Rubberduck.Core/UI/Command/TestExplorerCommand.cs b/Rubberduck.Core/UI/Command/TestExplorerCommand.cs
@@ -1,14 +1,15 @@
 using System.Runtime.InteropServices;
 using NLog;
+using Rubberduck.UI.UnitTesting;
 
 namespace Rubberduck.UI.Command
 {
     [ComVisible(false)]
-    public class TestExplorerCommand : CommandBase
+    internal class TestExplorerCommand : CommandBase
     {
-        private readonly IDockablePresenter _presenter;
+        private readonly TestExplorerDockablePresenter _presenter;
 
-        public TestExplorerCommand(IDockablePresenter presenter)
+        public TestExplorerCommand(TestExplorerDockablePresenter presenter)
             : base(LogManager.GetCurrentClassLogger())
         {
             _presenter = presenter;
diff --git a/Rubberduck.Core/UI/Command/ToDoExplorerCommand.cs b/Rubberduck.Core/UI/Command/ToDoExplorerCommand.cs
@@ -1,5 +1,6 @@
 ﻿using System.Runtime.InteropServices;
 using NLog;
+using Rubberduck.UI.ToDoItems;
 
 namespace Rubberduck.UI.Command
 {
@@ -9,9 +10,9 @@ namespace Rubberduck.UI.Command
     [ComVisible(false)]
     public class ToDoExplorerCommand : CommandBase
     {
-        private readonly IDockablePresenter _presenter;
+        private readonly ToDoExplorerDockablePresenter _presenter;
 
-        public ToDoExplorerCommand(IDockablePresenter presenter)
+        public ToDoExplorerCommand(ToDoExplorerDockablePresenter presenter)
             : base(LogManager.GetCurrentClassLogger())
         {
             _presenter = presenter;
diff --git a/Rubberduck.Main/Root/RubberduckIoCInstaller.cs b/Rubberduck.Main/Root/RubberduckIoCInstaller.cs
@@ -142,8 +142,6 @@ public void Install(IWindsorContainer container, IConfigurationStore store)
             RegisterCommandMenuItems(container);
             RegisterParentMenus(container);
 
-            
-
             RegisterRubberduckCommandBar(container);
             RegisterRubberduckMenu(container);
             RegisterCodePaneContextMenu(container);
@@ -155,7 +153,8 @@ public void Install(IWindsorContainer container, IConfigurationStore store)
 
             container.Register(Component.For<HotkeyFactory>()
                 .LifestyleSingleton());
-            container.Register(Component.For<ITestEngine>().ImplementedBy<TestEngine>()
+            container.Register(Component.For<ITestEngine>()
+                .ImplementedBy<TestEngine>()
                 .LifestyleSingleton());
 
             var assembliesToRegister = AssembliesToRegister().ToArray();
@@ -622,10 +621,6 @@ private void RegisterCommandMenuItems(IWindsorContainer container)
 
         private void RegisterCommands(IWindsorContainer container)
         {
-            //note: convention: the registration name for commands is the type name, not the full type name.
-            //Otherwise, namespaces would get in the way when binding to the menu items.
-            RegisterCommandsWithPresenters(container);
-
             // assumption: All Commands are in the same assembly as CommandBase
             container.Register(Classes.FromAssemblyContaining(typeof(CommandBase))
                 .IncludeNonPublicTypes()
@@ -638,46 +633,6 @@ private void RegisterCommands(IWindsorContainer container)
                 .LifestyleTransient());
         }
 
-        private void RegisterCommandsWithPresenters(IWindsorContainer container)
-        {
-            // FIXME these registrations shouldn't be IoC's business. the presenters should require those themselves!
-            // Possible solution: Property Injection
-            container.Register(Component.For<CommandBase>()
-                .ImplementedBy<RunAllTestsCommand>()
-                .DependsOn(Dependency.OnComponent<IDockablePresenter, TestExplorerDockablePresenter>())
-                .LifestyleTransient()
-                .Named(typeof(RunAllTestsCommand).Name));
-            container.Register(Component.For<CommandBase>()
-                .ImplementedBy<TestExplorerCommand>()
-                .DependsOn(Dependency.OnComponent<IDockablePresenter, TestExplorerDockablePresenter>())
-                .LifestyleTransient()
-                .Named(typeof(TestExplorerCommand).Name));
-
-            container.Register(Component.For<CommandBase>()
-                .ImplementedBy<InspectionResultsCommand>()
-                .DependsOn(Dependency.OnComponent<IDockablePresenter, InspectionResultsDockablePresenter>())
-                .LifestyleTransient()
-                .Named(typeof(InspectionResultsCommand).Name));
-
-            container.Register(Component.For<CommandBase>()
-                .ImplementedBy<CodeExplorerCommand>()
-                .DependsOn(Dependency.OnComponent<IDockablePresenter, CodeExplorerDockablePresenter>())
-                .LifestyleTransient()
-                .Named(typeof(CodeExplorerCommand).Name));
-
-            container.Register(Component.For<CommandBase>()
-                .ImplementedBy<CodeMetricsCommand>()
-                .DependsOn(Dependency.OnComponent<IDockablePresenter, CodeMetricsDockablePresenter>())
-                .LifestyleSingleton()
-                .Named(typeof(CodeMetricsCommand).Name));
-
-            container.Register(Component.For<CommandBase>()
-                .ImplementedBy<ToDoExplorerCommand>()
-                .DependsOn(Dependency.OnComponent<IDockablePresenter, ToDoExplorerDockablePresenter>())
-                .LifestyleTransient()
-                .Named(typeof(ToDoExplorerCommand).Name));
-        }
-
         private void RegisterSmartIndenter(IWindsorContainer container)
         {
             container.Register(Component.For<IIndenter, Indenter>()
@@ -712,17 +667,11 @@ private void RegisterDockableUserControls(IWindsorContainer container)
 
         private void RegisterDockablePresenters(IWindsorContainer container)
         {
-            container.Register(Component.For<IDockablePresenter>()
-                .ImplementedBy<TestExplorerDockablePresenter>()
-                .LifestyleSingleton());
-            container.Register(Component.For<IDockablePresenter>()
-                .ImplementedBy<InspectionResultsDockablePresenter>()
-                .LifestyleSingleton());
-            container.Register(Component.For<IDockablePresenter>()
-                .ImplementedBy<CodeExplorerDockablePresenter>()
-                .LifestyleSingleton());
-            container.Register(Component.For<IDockablePresenter>()
-                .ImplementedBy<ToDoExplorerDockablePresenter>()
+            container.Register(Classes.FromAssemblyContaining<IDockablePresenter>()
+                .IncludeNonPublicTypes()
+                .BasedOn<IDockablePresenter>()
+                .WithServiceSelf()
+                .WithServices(new[] { typeof(IDockablePresenter) })
                 .LifestyleSingleton());
         }
 
diff --git a/Rubberduck.UnitTesting/UnitTesting/TestEngine.cs b/Rubberduck.UnitTesting/UnitTesting/TestEngine.cs
@@ -37,7 +37,7 @@ internal class TestEngine : ITestEngine
         private readonly List<TestMethod> LastRun = new List<TestMethod>();
         private readonly Dictionary<TestOutcome, List<TestMethod>> resultsByOutcome = new Dictionary<TestOutcome, List<TestMethod>>();
         public IEnumerable<TestMethod> Tests { get; private set; }
-        public bool CanRun => AllowedRunStates.Contains(_state.Status);// && !_vbe.IsInDesignMode;
+        public bool CanRun => AllowedRunStates.Contains(_state.Status) && _vbe.IsInDesignMode;
         public bool CanRepeatLastRun => LastRun.Any();
         
         private bool refreshBackoff;
@@ -126,7 +126,7 @@ public void RepeatLastRun()
 
         private void RunInternal(IEnumerable<TestMethod> tests)
         {
-            if (!CanRun || _vbe.IsInDesignMode)
+            if (!CanRun)
             {
                 return;
             }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System.Runtime.InteropServices;`
`2`	`2`	`using NLog;`
	`3`	`+using Rubberduck.UI.CodeExplorer;`
`3`	`4`
`4`	`5`	`namespace Rubberduck.UI.Command`
`5`	`6`	`{`
`@@ -9,9 +10,9 @@ namespace Rubberduck.UI.Command`
`9`	`10`	`[ComVisible(false)]`
`10`	`11`	`public class CodeExplorerCommand : CommandBase`
`11`	`12`	`{`
`12`		`- private readonly IDockablePresenter _presenter;`
	`13`	`+ private readonly CodeExplorerDockablePresenter _presenter;`
`13`	`14`
`14`		`- public CodeExplorerCommand(IDockablePresenter presenter)`
	`15`	`+ public CodeExplorerCommand(CodeExplorerDockablePresenter presenter)`
`15`	`16`	`: base(LogManager.GetCurrentClassLogger())`
`16`	`17`	`{`
`17`	`18`	`_presenter = presenter;`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,15 @@`
`1`	`1`	`using NLog;`
	`2`	`+using Rubberduck.UI.CodeMetrics;`
`2`	`3`	`using System.Runtime.InteropServices;`
`3`	`4`
`4`	`5`	`namespace Rubberduck.UI.Command`
`5`	`6`	`{`
`6`	`7`	`[ComVisible(false)]`
`7`	`8`	`public class CodeMetricsCommand : CommandBase`
`8`	`9`	`{`
`9`		`- private readonly IDockablePresenter _presenter;`
	`10`	`+ private readonly CodeMetricsDockablePresenter _presenter;`
`10`	`11`
`11`		`- public CodeMetricsCommand(IDockablePresenter presenter)`
	`12`	`+ public CodeMetricsCommand(CodeMetricsDockablePresenter presenter)`
`12`	`13`	`: base(LogManager.GetCurrentClassLogger())`
`13`	`14`	`{`
`14`	`15`	`_presenter = presenter;`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace Rubberduck.UI.Command.MenuItems.CommandBars`
`7`	`7`	`{`
`8`	`8`	`public class ReparseCommandMenuItem : CommandMenuItemBase`
`9`	`9`	`{`
`10`		`- public ReparseCommandMenuItem(CommandBase command) : base(command)`
	`10`	`+ public ReparseCommandMenuItem(ReparseCommand command) : base(command)`
`11`	`11`	`{`
`12`	`12`	`}`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace Rubberduck.UI.Command.MenuItems.CommandBars`
`11`	`11`	`{`
`12`	`12`	`public class SerializeDeclarationsCommandMenuItem : CommandMenuItemBase`
`13`	`13`	`{`
`14`		`- public SerializeDeclarationsCommandMenuItem(CommandBase command) : base(command)`
	`14`	`+ public SerializeDeclarationsCommandMenuItem(SerializeDeclarationsCommand command) : base(command)`
`15`	`15`	`{`
`16`	`16`	`}`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace Rubberduck.UI.Command.MenuItems.CommandBars`
`9`	`9`	`{`
`10`	`10`	`public class ShowParserErrorsCommandMenuItem : CommandMenuItemBase`
`11`	`11`	`{`
`12`		`- public ShowParserErrorsCommandMenuItem(CommandBase command) : base(command)`
	`12`	`+ public ShowParserErrorsCommandMenuItem(ShowParserErrorsCommand command) : base(command)`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace Rubberduck.UI.Command.MenuItems`
`5`	`5`	`{`
`6`	`6`	`public class FormDesignerFindAllReferencesCommandMenuItem : CommandMenuItemBase`
`7`	`7`	`{`
`8`		`- public FormDesignerFindAllReferencesCommandMenuItem(CommandBase command)`
	`8`	`+ public FormDesignerFindAllReferencesCommandMenuItem(FormDesignerFindAllReferencesCommand command)`
`9`	`9`	`: base(command)`
`10`	`10`	`{`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,5 @@ public RunAllTestsCommandMenuItem(RunAllTestsCommand command)`
`15`	`15`	`public override int DisplayOrder => (int)UnitTestingMenuItemDisplayOrder.RunAllTests;`
`16`	`16`	`public override Image Image => Resources.CommandBarIcons.AllLoadedTests;`
`17`	`17`	`public override Image Mask => Resources.CommandBarIcons.AllLoadedTestsMask;`
`18`		`-`
`19`		`- public override bool EvaluateCanExecute(RubberduckParserState state)`
`20`		`- {`
`21`		`- return state != null && state.Status >= ParserState.ResolvedDeclarations && state.Status < ParserState.Error;`
`22`		`- }`
`23`	`18`	`}`
`24`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Rubberduck.UI.Command.MenuItems`
`4`	`4`	`{`
`5`		`- public class TestExplorerCommandMenuItem : CommandMenuItemBase`
	`5`	`+ internal class TestExplorerCommandMenuItem : CommandMenuItemBase`
`6`	`6`	`{`
`7`	`7`	`public TestExplorerCommandMenuItem(TestExplorerCommand command)`
`8`	`8`	`: base(command)`