Merge pull request #1261 from retailcoder/next

Fixes #1231 (fixed broken logic)

Author: retailcoder

RetailCoder.VBE/Inspections/CodeInspectionQuickFix.cs

@@ -20,7 +20,7 @@ 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 bool IsCancelled { get; set; }
 
         public abstract void Fix();
 

RetailCoder.VBE/Inspections/EncapsulatePublicFieldInspectionResult.cs

@@ -57,7 +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;
+                IsCancelled = view.DialogResult != DialogResult.OK;
             }
         }
 

RetailCoder.VBE/UI/CodeInspections/InspectionResultsViewModel.cs

@@ -183,25 +183,22 @@ private void ExecuteQuickFixes(IEnumerable<CodeInspectionQuickFix> quickFixes)
         {
             var fixes = quickFixes.ToList();
             var completed = 0;
+            var cancelled = 0;
             foreach (var quickFix in fixes)
             {
-                // 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
+                quickFix.IsCancelled = false;
+                quickFix.Fix();
+                completed++;
+
+                if (quickFix.IsCancelled)
                 {
-                    break; // no need to keep iterating
+                    cancelled++;
+                    break;
                 }
             }
 
             // refresh if any quickfix has completed without cancelling:
-            if (completed != 0)
+            if (completed != 0 && cancelled < completed)
             {
                 Task.Run(() => ExecuteRefreshCommandAsync(null));
             }