Merge pull request #6106 from awb95/next

Respect @NoIndent-Annotaions for Indent current project and module

Author: retailcoder

Rubberduck.Core/UI/Command/ComCommands/IndentCurrentModuleCommand.cs

@@ -1,4 +1,8 @@
-using System.Runtime.InteropServices;
+using System.Linq;
+using System.Runtime.InteropServices;
+using Rubberduck.Interaction;
+using Rubberduck.Parsing.Annotations.Concrete;
+using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.SmartIndenter;
 using Rubberduck.VBEditor.Events;
@@ -12,17 +16,20 @@ public class IndentCurrentModuleCommand : ComCommandBase
         private readonly IVBE _vbe;
         private readonly IIndenter _indenter;
         private readonly RubberduckParserState _state;
+        private readonly IMessageBox _messageBox;
 
         public IndentCurrentModuleCommand(
             IVBE vbe, 
             IIndenter indenter, 
             RubberduckParserState state,
-            IVbeEvents vbeEvents) 
+            IVbeEvents vbeEvents,
+            IMessageBox messageBox) 
             : base(vbeEvents)
         {
             _vbe = vbe;
             _indenter = indenter;
             _state = state;
+            _messageBox = messageBox;
 
             AddToCanExecuteEvaluation(SpecialEvaluateCanExecute);
         }
@@ -36,8 +43,32 @@ private bool SpecialEvaluateCanExecute(object parameter)
         }
 
         protected override void OnExecute(object parameter)
-        {
-            _indenter.IndentCurrentModule();
+        {            
+            if (_state.IsDirty())
+            {
+                if (!_messageBox.ConfirmYesNo(
+                        Resources.RubberduckUI.Indenter_ContinueIndentWithoutAnnotations,
+                        Resources.RubberduckUI.Indenter_ContinueIndentWithoutAnnotations_DialogCaption,
+                        false))
+                    return;
+
+                _indenter.IndentCurrentModule();
+            }
+            else
+            {                                
+                var componentDeclarations = _state.AllUserDeclarations.Where(c =>
+                    c.DeclarationType.HasFlag(DeclarationType.Module) &&
+                    !c.Annotations.Any(pta => pta.Annotation is NoIndentAnnotation) &&
+                    c.ProjectId == _vbe.ActiveVBProject.ProjectId &&
+                    c.QualifiedModuleName == _vbe.ActiveCodePane.QualifiedModuleName
+                    );
+
+                foreach (var componentDeclaration in componentDeclarations)
+                {
+                    _indenter.Indent(_state.ProjectsProvider.Component(componentDeclaration.QualifiedName.QualifiedModuleName));
+                }
+            }
+
             if (_state.Status >= ParserState.Ready || _state.Status == ParserState.Pending)
             {
                 _state.OnParseRequested(this);

Rubberduck.Core/UI/Command/ComCommands/IndentCurrentProjectCommand.cs

@@ -1,4 +1,8 @@
-using System.Runtime.InteropServices;
+using System.Linq;
+using System.Runtime.InteropServices;
+using Rubberduck.Interaction;
+using Rubberduck.Parsing.Annotations.Concrete;
+using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.SmartIndenter;
 using Rubberduck.VBEditor.Events;
@@ -13,17 +17,20 @@ public class IndentCurrentProjectCommand : ComCommandBase
         private readonly IVBE _vbe;
         private readonly IIndenter _indenter;
         private readonly RubberduckParserState _state;
+        private readonly IMessageBox _messageBox;
 
         public IndentCurrentProjectCommand(
             IVBE vbe, 
             IIndenter indenter, 
             RubberduckParserState state, 
-            IVbeEvents vbeEvents) 
+            IVbeEvents vbeEvents, 
+            IMessageBox messageBox) 
             : base(vbeEvents)
         {
             _vbe = vbe;
             _indenter = indenter;
             _state = state;
+            _messageBox = messageBox;
 
             AddToCanExecuteEvaluation(SpecialEvaluateCanExecute);
         }
@@ -39,7 +46,29 @@ private bool SpecialEvaluateCanExecute(object parameter)
 
         protected override void OnExecute(object parameter)
         {
-            _indenter.IndentCurrentProject();
+            if (_state.IsDirty())
+            {
+                if (!_messageBox.ConfirmYesNo(
+                        Resources.RubberduckUI.Indenter_ContinueIndentWithoutAnnotations,
+                        Resources.RubberduckUI.Indenter_ContinueIndentWithoutAnnotations_DialogCaption,
+                        false))
+                    return;
+
+                _indenter.IndentCurrentProject();
+            }
+            else
+            {                
+                var componentDeclarations = _state.AllUserDeclarations.Where(c =>
+                    c.DeclarationType.HasFlag(DeclarationType.Module) &&
+                    !c.Annotations.Any(pta => pta.Annotation is NoIndentAnnotation) &&
+                    c.ProjectId == _vbe.ActiveVBProject.ProjectId);
+
+                foreach (var componentDeclaration in componentDeclarations)
+                {
+                    _indenter.Indent(_state.ProjectsProvider.Component(componentDeclaration.QualifiedName.QualifiedModuleName));
+                }
+            }
+
             if (_state.Status >= ParserState.Ready || _state.Status == ParserState.Pending)
             {
                 _state.OnParseRequested(this);