Merge pull request #1260 from retailcoder/next

#1231 cancellable quick-fixes shouldn't reparse when cancelled

Author: retailcoder

RetailCoder.VBE/Inspections/CodeInspectionQuickFix.cs

@@ -20,6 +20,8 @@ public CodeInspectionQuickFix(ParserRuleContext context, QualifiedSelection sele
         public ParserRuleContext Context { get { return _context; } }
         public QualifiedSelection Selection { get { return _selection; } }
 
+        public bool IsCancelled { get; protected set; }
+
         public abstract void Fix();
 
         /// <summary>

RetailCoder.VBE/Inspections/DefaultProjectNameInspectionResult.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Windows.Forms;
 using Antlr4.Runtime;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
@@ -7,6 +8,7 @@
 using Rubberduck.UI.Refactorings;
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.VBEInterfaces.RubberduckCodePane;
+using MessageBox = Rubberduck.UI.MessageBox;
 
 namespace Rubberduck.Inspections
 {
@@ -57,6 +59,7 @@ public override void Fix()
                 var factory = new RenamePresenterFactory(vbe, view, _state, new MessageBox(), _wrapperFactory);
                 var refactoring = new RenameRefactoring(factory, new ActiveCodePaneEditor(vbe, _wrapperFactory), new MessageBox(), _state);
                 refactoring.Refactor(_target);
+                IsCancelled = view.DialogResult == DialogResult.Cancel;
             }
         }
 

RetailCoder.VBE/Inspections/EncapsulatePublicFieldInspectionResult.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Windows.Forms;
 using Antlr4.Runtime;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
@@ -56,6 +57,7 @@ public override void Fix()
                 var factory = new EncapsulateFieldPresenterFactory(_parseResult, new ActiveCodePaneEditor(vbe, _wrapperFactory), view);
                 var refactoring = new EncapsulateFieldRefactoring(factory, new ActiveCodePaneEditor(vbe, _wrapperFactory));
                 refactoring.Refactor(_target);
+                IsCancelled = view.DialogResult == DialogResult.Cancel;
             }
         }
 

RetailCoder.VBE/Inspections/UseMeaningfulNameInspectionResult.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Windows.Forms;
 using Antlr4.Runtime;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
@@ -60,6 +61,7 @@ public override void Fix()
                 var factory = new RenamePresenterFactory(vbe, view, _state, _messageBox, _wrapperFactory);
                 var refactoring = new RenameRefactoring(factory, new ActiveCodePaneEditor(vbe, _wrapperFactory), _messageBox, _state);
                 refactoring.Refactor(_target);
+                IsCancelled = view.DialogResult == DialogResult.Cancel;
             }
         }
 

RetailCoder.VBE/UI/CodeInspections/InspectionResultsViewModel.cs

@@ -181,12 +181,30 @@ private async void _state_StateChanged(object sender, EventArgs e)
 
         private void ExecuteQuickFixes(IEnumerable<CodeInspectionQuickFix> quickFixes)
         {
-            foreach (var quickFix in quickFixes)
+            var fixes = quickFixes.ToList();
+            var completed = 0;
+            foreach (var quickFix in fixes)
             {
-                quickFix.Fix();
+                // if we have more than 1 fix to run, one cancelled should cancel all remaining fixes:
+                if (!fixes.Any(fix => fix.IsCancelled))
+                {
+                    quickFix.Fix();
+                    if (quickFix.IsCancelled)
+                    {
+                        completed++;
+                    }
+                }
+                else
+                {
+                    break; // no need to keep iterating
+                }
             }
 
-            Task.Run(() => ExecuteRefreshCommandAsync(null));
+            // refresh if any quickfix has completed without cancelling:
+            if (completed != 0)
+            {
+                Task.Run(() => ExecuteRefreshCommandAsync(null));
+            }
         }
 
         private void ExecuteQuickFixCommand(object parameter)