Merge pull request #3985 from MDoerner/AdjustIoCInstaller

Introduces disabled attribute; experimental features extend to commands and menu items; enhances IoC configuration.

Author: retailcoder

Rubberduck.Core/UI/Command/MenuItems/RefactorExtractMethodCommandMenuItem.cs

@@ -1,10 +1,14 @@
 using System.Drawing;
+using Rubberduck.Parsing.Common;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Properties;
 using Rubberduck.UI.Command.MenuItems.ParentMenus;
 
 namespace Rubberduck.UI.Command.MenuItems
 {
+#if !DEBUG
+    [Disabled]
+#endif 
     public class RefactorExtractMethodCommandMenuItem : CommandMenuItemBase
     {
         public RefactorExtractMethodCommandMenuItem(CommandBase command) 

Rubberduck.Core/UI/Command/MenuItems/RegexSearchReplaceCommandMenuItem.cs

@@ -1,7 +1,11 @@
+using Rubberduck.Parsing.Common;
 using Rubberduck.UI.Command.MenuItems.ParentMenus;
 
 namespace Rubberduck.UI.Command.MenuItems
 {
+#if !DEBUG
+    [Disabled]
+#endif
     public class RegexSearchReplaceCommandMenuItem : CommandMenuItemBase
     {
         public RegexSearchReplaceCommandMenuItem(CommandBase command)

Rubberduck.Core/UI/Command/Refactorings/RefactorExtractMethodCommand.cs

@@ -4,10 +4,14 @@
 using Rubberduck.SmartIndenter;
 using Rubberduck.VBEditor;
 using System.Collections.Generic;
+using Rubberduck.Parsing.Common;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UI.Command.Refactorings
 {
+#if !DEBUG
+    [Disabled]
+#endif
     [ComVisible(false)]
     public class RefactorExtractMethodCommand : RefactorCommandBase
     {

Rubberduck.Core/UI/Command/RegexSearchReplaceCommand.cs

@@ -1,9 +1,13 @@
 using System.Runtime.InteropServices;
 using NLog;
 using Rubberduck.Navigation.RegexSearchReplace;
+using Rubberduck.Parsing.Common;
 
 namespace Rubberduck.UI.Command
 {
+#if !DEBUG
+    [Disabled]
+#endif
     [ComVisible(false)]
     public class RegexSearchReplaceCommand : CommandBase
     {

Rubberduck.Main/Root/RubberduckIoCInstaller.cs

@@ -1,23 +1,30 @@
 using Rubberduck.Parsing.Common;
 using Rubberduck.Settings;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Rubberduck.Root
 {
     internal static class TypeExtensions
     {
-        internal static bool NotDisabledExperimental(this Type type, GeneralSettings initialSettings)
+        internal static bool NotDisabledOrExperimental(this Type type, GeneralSettings initialSettings)
+        {
+            return type.NotDisabled() && type.NotExperimental(initialSettings);
+        }
+
+        internal static bool NotExperimental(this Type type, GeneralSettings initialSettings)
         {
             var attribute = type.CustomAttributes.FirstOrDefault(f => f.AttributeType == typeof(ExperimentalAttribute));
             var ctorArg = attribute?.ConstructorArguments.Any() == true ? (string)attribute.ConstructorArguments.First().Value : string.Empty;
 
             return attribute == null || initialSettings.EnableExperimentalFeatures.Any(a => a.Key == ctorArg && a.IsEnabled);
         }
 
+        internal static bool NotDisabled(this Type type)
+        {
+            return !Attribute.IsDefined(type, typeof(DisabledAttribute));
+        }
+
         internal static bool IsBasedOn(this Type type, Type allegedBase)
         {
             return allegedBase.IsAssignableFrom(type);

Rubberduck.Main/Root/TypeExtensions.cs

@@ -0,0 +1,16 @@
+using System;
+
+namespace Rubberduck.Parsing.Common
+{
+    [AttributeUsage(AttributeTargets.Class)]
+    public class DisabledAttribute : Attribute
+    {
+        public DisabledAttribute() : this(string.Empty)
+        {
+        }
+
+        public DisabledAttribute(string resource)
+        {
+        }
+    }
+}

Rubberduck.Parsing/Common/DisabledAttribute.cs

@@ -137,6 +137,7 @@
     <Compile Include="Binding\Bindings\ParenthesizedDefaultBinding.cs" />
     <Compile Include="Binding\TypeBindingContext.cs" />
     <Compile Include="Binding\ExpressionClassification.cs" />
+    <Compile Include="Common\DisabledAttribute.cs" />
     <Compile Include="Inspections\RequiredHostAttribute.cs" />
     <Compile Include="ProjectsProviderExtensions.cs" />
     <Compile Include="Common\ExperimentalAttribute.cs" />