Close #1787

Author: Hosch250

RetailCoder.VBE/UI/Command/IndentCurrentModuleCommand.cs

@@ -1,9 +1,5 @@
-using System.Linq;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 using Microsoft.Vbe.Interop;
-using Rubberduck.Parsing.Annotations;
-using Rubberduck.Parsing.Symbols;
-using Rubberduck.Parsing.VBA;
 using Rubberduck.Settings;
 using Rubberduck.SmartIndenter;
 
@@ -13,22 +9,17 @@ namespace Rubberduck.UI.Command
     public class IndentCurrentModuleCommand : CommandBase
     {
         private readonly VBE _vbe;
-        private readonly RubberduckParserState _state;
         private readonly IIndenter _indenter;
 
-        public IndentCurrentModuleCommand(VBE vbe, RubberduckParserState state, IIndenter indenter)
+        public IndentCurrentModuleCommand(VBE vbe, IIndenter indenter)
         {
             _vbe = vbe;
-            _state = state;
             _indenter = indenter;
         }
 
         public override bool CanExecute(object parameter)
         {
-            var target = FindTarget(parameter);
-
-            return _vbe.ActiveCodePane != null && target != null &&
-                   target.Annotations.All(a => a.AnnotationType != AnnotationType.NoIndent);
+            return _vbe.ActiveCodePane != null;
         }
 
         public override void Execute(object parameter)
@@ -37,23 +28,5 @@ public override void Execute(object parameter)
         }
 
         public RubberduckHotkey Hotkey { get { return RubberduckHotkey.IndentModule; } }
-
-        private Declaration FindTarget(object parameter)
-        {
-            var declaration = parameter as Declaration;
-            if (declaration != null)
-            {
-                return declaration;
-            }
-
-            var selectedDeclaration = _state.FindSelectedDeclaration(_vbe.ActiveCodePane);
-
-            while (selectedDeclaration != null && selectedDeclaration.DeclarationType.HasFlag(DeclarationType.Module))
-            {
-                selectedDeclaration = selectedDeclaration.ParentDeclaration;
-            }
-
-            return selectedDeclaration;
-        }
     }
 }

RetailCoder.VBE/UI/Command/IndentCurrentProcedureCommand.cs

@@ -1,6 +1,5 @@
 using System.Runtime.InteropServices;
 using Microsoft.Vbe.Interop;
-using Rubberduck.Parsing.VBA;
 using Rubberduck.Settings;
 using Rubberduck.SmartIndenter;
 
@@ -10,19 +9,17 @@ namespace Rubberduck.UI.Command
     public class IndentCurrentProcedureCommand : CommandBase
     {
         private readonly VBE _vbe;
-        private readonly RubberduckParserState _state;
         private readonly IIndenter _indenter;
 
-        public IndentCurrentProcedureCommand(VBE vbe, RubberduckParserState state, IIndenter indenter)
+        public IndentCurrentProcedureCommand(VBE vbe, IIndenter indenter)
         {
             _vbe = vbe;
-            _state = state;
             _indenter = indenter;
         }
 
         public override bool CanExecute(object parameter)
         {
-            return _state.FindSelectedDeclaration(_vbe.ActiveCodePane, true) != null;
+            return _vbe.ActiveCodePane != null;
         }
 
         public override void Execute(object parameter)