Release refactoring presenters on the UI thread

MDoerner · MDoerner · commit b3b0a7c67b20 · 2019-11-24T01:40:05.000+01:00
This seems to fix an issue with unclean exits of Excel after canceling a refactoring dialog. The change guarantees that the dialog saved in the presenter gets disposed on the UI thread, no matter how the refactoring is called or exits.
diff --git a/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldRefactoring.cs b/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldRefactoring.cs
@@ -5,6 +5,7 @@
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Rewriter;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Parsing.UIContext;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Exceptions;
 using Rubberduck.VBEditor;
@@ -26,8 +27,9 @@ public EncapsulateFieldRefactoring(
             IRefactoringPresenterFactory factory, 
             IRewritingManager rewritingManager,
             ISelectionProvider selectionProvider,
-            ISelectedDeclarationProvider selectedDeclarationProvider)
-        :base(rewritingManager, selectionProvider, factory)
+            ISelectedDeclarationProvider selectedDeclarationProvider,
+            IUiDispatcher uiDispatcher)
+        :base(rewritingManager, selectionProvider, factory, uiDispatcher)
         {
             _declarationFinderProvider = declarationFinderProvider;
             _selectedDeclarationProvider = selectedDeclarationProvider;
diff --git a/Rubberduck.Refactorings/ExtractInterface/ExtractInterfaceRefactoring.cs b/Rubberduck.Refactorings/ExtractInterface/ExtractInterfaceRefactoring.cs
@@ -5,6 +5,7 @@
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Rewriter;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Parsing.UIContext;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Exceptions;
 using Rubberduck.Refactorings.ImplementInterface;
@@ -28,8 +29,9 @@ public ExtractInterfaceRefactoring(
             IParseManager parseManager, 
             IRefactoringPresenterFactory factory, 
             IRewritingManager rewritingManager,
-            ISelectionProvider selectionProvider)
-        :base(rewritingManager, selectionProvider, factory)
+            ISelectionProvider selectionProvider,
+            IUiDispatcher uiDispatcher)
+        :base(rewritingManager, selectionProvider, factory, uiDispatcher)
         {
             _declarationFinderProvider = declarationFinderProvider;
             _parseManager = parseManager;
diff --git a/Rubberduck.Refactorings/InteractiveRefactoringBase.cs b/Rubberduck.Refactorings/InteractiveRefactoringBase.cs
@@ -2,6 +2,7 @@
 using Rubberduck.VBEditor.Utility;
 using System;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Parsing.UIContext;
 using Rubberduck.Refactorings.Exceptions;
 
 namespace Rubberduck.Refactorings
@@ -15,10 +16,12 @@ public abstract class InteractiveRefactoringBase<TPresenter, TModel> : Refactori
         protected InteractiveRefactoringBase(
             IRewritingManager rewritingManager, 
             ISelectionProvider selectionProvider, 
-            IRefactoringPresenterFactory factory) 
+            IRefactoringPresenterFactory factory,
+            IUiDispatcher uiDispatcher) 
         :base(rewritingManager, selectionProvider)
         {
-            _presenterFactory = ((model) => DisposalActionContainer.Create(factory.Create<TPresenter, TModel>(model), factory.Release));
+            Action<TPresenter> presenterDisposalAction = (TPresenter presenter) => uiDispatcher.Invoke(() => factory.Release(presenter)); 
+            _presenterFactory = ((model) => DisposalActionContainer.Create(factory.Create<TPresenter, TModel>(model), presenterDisposalAction));
         }
 
         public override void Refactor(Declaration target)
@@ -47,9 +50,9 @@ protected void Refactor(TModel initialModel)
                 {
                     throw new InvalidRefactoringModelException();
                 }
-
-                RefactorImpl(model);
             }
+
+            RefactorImpl(model);
         }
 
         protected abstract TModel InitializeModel(Declaration target);
diff --git a/Rubberduck.Refactorings/RemoveParameters/RemoveParametersRefactoring.cs b/Rubberduck.Refactorings/RemoveParameters/RemoveParametersRefactoring.cs
@@ -6,6 +6,7 @@
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Rewriter;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Parsing.UIContext;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Exceptions;
 using Rubberduck.Refactorings.Exceptions.RemoveParameter;
@@ -25,8 +26,9 @@ public RemoveParametersRefactoring(
             IRefactoringPresenterFactory factory, 
             IRewritingManager rewritingManager,
             ISelectionProvider selectionProvider,
-            ISelectedDeclarationProvider selectedDeclarationProvider)
-        :base(rewritingManager, selectionProvider, factory)
+            ISelectedDeclarationProvider selectedDeclarationProvider,
+            IUiDispatcher uiDispatcher)
+        :base(rewritingManager, selectionProvider, factory, uiDispatcher)
         {
             _declarationFinderProvider = declarationFinderProvider;
             _selectedDeclarationProvider = selectedDeclarationProvider;
diff --git a/Rubberduck.Refactorings/Rename/RenameRefactoring.cs b/Rubberduck.Refactorings/Rename/RenameRefactoring.cs
@@ -14,6 +14,7 @@
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.Utility;
 using NLog;
+using Rubberduck.Parsing.UIContext;
 
 namespace Rubberduck.Refactorings.Rename
 {
@@ -37,8 +38,9 @@ public RenameRefactoring(
             IRewritingManager rewritingManager,
             ISelectionProvider selectionProvider,
             ISelectedDeclarationProvider selectedDeclarationProvider,
-            IParseManager parseManager)
-        :base(rewritingManager, selectionProvider, factory)
+            IParseManager parseManager,
+            IUiDispatcher uiDispatcher)
+        :base(rewritingManager, selectionProvider, factory, uiDispatcher)
         {
             _declarationFinderProvider = declarationFinderProvider;
             _selectedDeclarationProvider = selectedDeclarationProvider;
diff --git a/Rubberduck.Refactorings/ReorderParameters/ReorderParametersRefactoring.cs b/Rubberduck.Refactorings/ReorderParameters/ReorderParametersRefactoring.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using Antlr4.Runtime;
 using Rubberduck.Parsing.Binding;
+using Rubberduck.Parsing.UIContext;
 using Rubberduck.Parsing.VBA;
  using Rubberduck.Refactorings.Exceptions;
 using Rubberduck.VBEditor.Extensions;
@@ -24,8 +25,9 @@ public ReorderParametersRefactoring(
             IRefactoringPresenterFactory factory, 
             IRewritingManager rewritingManager,
             ISelectionProvider selectionProvider,
-            ISelectedDeclarationProvider selectedDeclarationProvider)
-        :base(rewritingManager, selectionProvider, factory)
+            ISelectedDeclarationProvider selectedDeclarationProvider,
+            IUiDispatcher uiDispatcher)
+        :base(rewritingManager, selectionProvider, factory, uiDispatcher)
         {
             _declarationFinderProvider = declarationFinderProvider;
             _selectedDeclarationProvider = selectedDeclarationProvider;
diff --git a/RubberduckTests/CodeExplorer/CodeExplorerViewModelTests.cs b/RubberduckTests/CodeExplorer/CodeExplorerViewModelTests.cs
@@ -265,7 +265,7 @@ public bool AddUserDocument_CanExecuteBasedOnProjectType(ProjectType projectType
         public bool RefactorExtractInterface_CanExecuteBasedOnComponentType(ComponentType componentType)
         {
             using (var explorer = new MockedCodeExplorer(ProjectType.HostProject, componentType, @"Public Sub Foo():  MsgBox """":End Sub ")
-                .ImplementExtractIntercaceCommand().SelectFirstModule())
+                .ImplementExtractInterfaceCommand().SelectFirstModule())
             {
                 return explorer.ViewModel.CodeExplorerExtractInterfaceCommand.CanExecute(explorer.ViewModel.SelectedItem);
             }
diff --git a/RubberduckTests/CodeExplorer/MockedCodeExplorer.cs b/RubberduckTests/CodeExplorer/MockedCodeExplorer.cs
@@ -460,11 +460,11 @@ public MockedCodeExplorer ImplementIndenterCommand()
             return this;
         }
 
-        public MockedCodeExplorer ImplementExtractIntercaceCommand()
+        public MockedCodeExplorer ImplementExtractInterfaceCommand()
         {
             ViewModel.CodeExplorerExtractInterfaceCommand = new CodeExplorerExtractInterfaceCommand(
                 new Rubberduck.Refactorings.ExtractInterface.ExtractInterfaceRefactoring(
-                    State, State, null, null, null),
+                    State, State, null, null, null, _uiDispatcher.Object),
                 State, null, VbeEvents.Object);
             return this;
         }
diff --git a/RubberduckTests/Commands/RefactorCommands/EncapsulateFieldCommandTests.cs b/RubberduckTests/Commands/RefactorCommands/EncapsulateFieldCommandTests.cs
@@ -1,7 +1,9 @@
-﻿using Moq;
+﻿using System;
+using Moq;
 using NUnit.Framework;
 using Rubberduck.Interaction;
 using Rubberduck.Parsing.Rewriter;
+using Rubberduck.Parsing.UIContext;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.EncapsulateField;
@@ -57,7 +59,11 @@ protected override CommandBase TestCommand(IVBE vbe, RubberduckParserState state
             var msgBox = new Mock<IMessageBox>().Object;
             var factory = new Mock<IRefactoringPresenterFactory>().Object;
             var selectedDeclarationProvider = new SelectedDeclarationProvider(selectionService, state);
-            var refactoring = new EncapsulateFieldRefactoring(state, null, factory, rewritingManager, selectionService, selectedDeclarationProvider);
+            var uiDispatcherMock = new Mock<IUiDispatcher>();
+            uiDispatcherMock
+                .Setup(m => m.Invoke(It.IsAny<Action>()))
+                .Callback((Action action) => action.Invoke());
+            var refactoring = new EncapsulateFieldRefactoring(state, null, factory, rewritingManager, selectionService, selectedDeclarationProvider, uiDispatcherMock.Object);
             var notifier = new EncapsulateFieldFailedNotifier(msgBox);
             var selectedDeclarationService = new SelectedDeclarationProvider(selectionService, state);
             return new RefactorEncapsulateFieldCommand(refactoring, notifier, state, selectionService, selectedDeclarationService);
diff --git a/RubberduckTests/Commands/RefactorCommands/ExtractInterfaceCommandTests.cs b/RubberduckTests/Commands/RefactorCommands/ExtractInterfaceCommandTests.cs
@@ -1,7 +1,9 @@
-﻿using Moq;
+﻿using System;
+using Moq;
 using NUnit.Framework;
 using Rubberduck.Interaction;
 using Rubberduck.Parsing.Rewriter;
+using Rubberduck.Parsing.UIContext;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.ExtractInterface;
@@ -164,7 +166,11 @@ protected override CommandBase TestCommand(IVBE vbe, RubberduckParserState state
         {
             var factory = new Mock<IRefactoringPresenterFactory>().Object;
             var msgBox = new Mock<IMessageBox>().Object;
-            var refactoring = new ExtractInterfaceRefactoring(state, state, factory, rewritingManager, selectionService);
+            var uiDispatcherMock = new Mock<IUiDispatcher>();
+            uiDispatcherMock
+                .Setup(m => m.Invoke(It.IsAny<Action>()))
+                .Callback((Action action) => action.Invoke());
+            var refactoring = new ExtractInterfaceRefactoring(state, state, factory, rewritingManager, selectionService, uiDispatcherMock.Object);
             var notifier = new ExtractInterfaceFailedNotifier(msgBox);
             return new RefactorExtractInterfaceCommand(refactoring, notifier, state, selectionService);
         }
diff --git a/RubberduckTests/Commands/RefactorCommands/RemoveParametersCommandTests.cs b/RubberduckTests/Commands/RefactorCommands/RemoveParametersCommandTests.cs
@@ -1,7 +1,9 @@
-﻿using Moq;
+﻿using System;
+using Moq;
 using NUnit.Framework;
 using Rubberduck.Interaction;
 using Rubberduck.Parsing.Rewriter;
+using Rubberduck.Parsing.UIContext;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.RemoveParameters;
@@ -164,7 +166,11 @@ protected override CommandBase TestCommand(IVBE vbe, RubberduckParserState state
             var msgBox = new Mock<IMessageBox>().Object;
             var factory = new Mock<IRefactoringPresenterFactory>().Object;
             var selectedDeclarationProvider = new SelectedDeclarationProvider(selectionService, state);
-            var refactoring = new RemoveParametersRefactoring(state, factory, rewritingManager, selectionService, selectedDeclarationProvider);
+            var uiDispatcherMock = new Mock<IUiDispatcher>();
+            uiDispatcherMock
+                .Setup(m => m.Invoke(It.IsAny<Action>()))
+                .Callback((Action action) => action.Invoke());
+            var refactoring = new RemoveParametersRefactoring(state, factory, rewritingManager, selectionService, selectedDeclarationProvider, uiDispatcherMock.Object);
             var notifier = new RemoveParameterFailedNotifier(msgBox);
             return new RefactorRemoveParametersCommand(refactoring, notifier, state, selectionService, selectedDeclarationProvider);
         }
diff --git a/RubberduckTests/Commands/RefactorCommands/ReorderParametersCommandTests.cs b/RubberduckTests/Commands/RefactorCommands/ReorderParametersCommandTests.cs
@@ -1,7 +1,9 @@
-﻿using Moq;
+﻿using System;
+using Moq;
 using NUnit.Framework;
 using Rubberduck.Interaction;
 using Rubberduck.Parsing.Rewriter;
+using Rubberduck.Parsing.UIContext;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.ReorderParameters;
@@ -164,7 +166,11 @@ protected override CommandBase TestCommand(IVBE vbe, RubberduckParserState state
             var factory = new Mock<IRefactoringPresenterFactory>().Object;
             var msgBox = new Mock<IMessageBox>().Object;
             var selectedDeclarationProvider = new SelectedDeclarationProvider(selectionService, state);
-            var refactoring = new ReorderParametersRefactoring(state, factory, rewritingManager, selectionService, selectedDeclarationProvider);
+            var uiDispatcherMock = new Mock<IUiDispatcher>();
+            uiDispatcherMock
+                .Setup(m => m.Invoke(It.IsAny<Action>()))
+                .Callback((Action action) => action.Invoke());
+            var refactoring = new ReorderParametersRefactoring(state, factory, rewritingManager, selectionService, selectedDeclarationProvider, uiDispatcherMock.Object);
             var notifier = new ReorderParametersFailedNotifier(msgBox);
             return new RefactorReorderParametersCommand(refactoring, notifier, state, selectionService, selectedDeclarationProvider);
         }
diff --git a/RubberduckTests/QuickFixes/RemoveUnusedParameterQuickFixTests.cs b/RubberduckTests/QuickFixes/RemoveUnusedParameterQuickFixTests.cs
@@ -1,9 +1,11 @@
-﻿using System.Linq;
+﻿using System;
+using System.Linq;
 using System.Threading;
 using NUnit.Framework;
 using Moq;
 using Rubberduck.Inspections.Concrete;
 using Rubberduck.Inspections.QuickFixes;
+using Rubberduck.Parsing.UIContext;
 using Rubberduck.Parsing.VBA;
 using RubberduckTests.Mocks;
 using Rubberduck.Refactorings;
@@ -41,7 +43,11 @@ Private Sub Foo()
 
                 var factory = new Mock<IRefactoringPresenterFactory>().Object;
                 var selectedDeclarationProvider = new SelectedDeclarationProvider(selectionService, state);
-                var refactoring = new RemoveParametersRefactoring(state, factory, rewritingManager, selectionService, selectedDeclarationProvider);
+                var uiDispatcherMock = new Mock<IUiDispatcher>();
+                uiDispatcherMock
+                    .Setup(m => m.Invoke(It.IsAny<Action>()))
+                    .Callback((Action action) => action.Invoke());
+                var refactoring = new RemoveParametersRefactoring(state, factory, rewritingManager, selectionService, selectedDeclarationProvider, uiDispatcherMock.Object);
                 new RemoveUnusedParameterQuickFix(refactoring)
                     .Fix(inspectionResults.First(), rewriteSession);
                 Assert.AreEqual(expectedCode, component.CodeModule.Content());
diff --git a/RubberduckTests/Refactoring/EncapsulateFieldTests.cs b/RubberduckTests/Refactoring/EncapsulateFieldTests.cs
@@ -3,6 +3,7 @@
 using Moq;
 using Rubberduck.Parsing.Rewriter;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Parsing.UIContext;
 using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.EncapsulateField;
 using Rubberduck.VBEditor;
@@ -667,7 +668,11 @@ protected override IRefactoring TestRefactoring(IRewritingManager rewritingManag
         {
             var indenter = CreateIndenter(); //The refactoring only uses method independent of the VBE instance.
             var selectedDeclarationProvider = new SelectedDeclarationProvider(selectionService, state);
-            return new EncapsulateFieldRefactoring(state, indenter, factory, rewritingManager, selectionService, selectedDeclarationProvider);
+            var uiDispatcherMock = new Mock<IUiDispatcher>();
+            uiDispatcherMock
+                .Setup(m => m.Invoke(It.IsAny<Action>()))
+                .Callback((Action action) => action.Invoke());
+            return new EncapsulateFieldRefactoring(state, indenter, factory, rewritingManager, selectionService, selectedDeclarationProvider, uiDispatcherMock.Object);
         }
 
         #endregion
diff --git a/RubberduckTests/Refactoring/ExtractInterfaceTests.cs b/RubberduckTests/Refactoring/ExtractInterfaceTests.cs
@@ -5,6 +5,7 @@
 using NUnit.Framework;
 using Rubberduck.Parsing.Rewriter;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Parsing.UIContext;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
@@ -419,7 +420,11 @@ End Sub
 
         protected override IRefactoring TestRefactoring(IRewritingManager rewritingManager, RubberduckParserState state, IRefactoringPresenterFactory factory, ISelectionService selectionService)
         {
-            return new ExtractInterfaceRefactoring(state, state, factory, rewritingManager, selectionService);
+            var uiDispatcherMock = new Mock<IUiDispatcher>();
+            uiDispatcherMock
+                .Setup(m => m.Invoke(It.IsAny<Action>()))
+                .Callback((Action action) => action.Invoke());
+            return new ExtractInterfaceRefactoring(state, state, factory, rewritingManager, selectionService, uiDispatcherMock.Object);
         }
     }
 }
diff --git a/RubberduckTests/Refactoring/RemoveParametersTests.cs b/RubberduckTests/Refactoring/RemoveParametersTests.cs
@@ -10,6 +10,7 @@
 using RubberduckTests.Mocks;
 using System.Collections.Generic;
 using Rubberduck.Parsing.Rewriter;
+using Rubberduck.Parsing.UIContext;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Exceptions;
 using Rubberduck.VBEditor.Utility;
@@ -1969,7 +1970,11 @@ protected override IRefactoring TestRefactoring(IRewritingManager rewritingManag
             IRefactoringPresenterFactory factory, ISelectionService selectionService)
         {
             var selectedDeclarationProvider = new SelectedDeclarationProvider(selectionService, state);
-            return new RemoveParametersRefactoring(state, factory, rewritingManager, selectionService, selectedDeclarationProvider);
+            var uiDispatcherMock = new Mock<IUiDispatcher>();
+            uiDispatcherMock
+                .Setup(m => m.Invoke(It.IsAny<Action>()))
+                .Callback((Action action) => action.Invoke());
+            return new RemoveParametersRefactoring(state, factory, rewritingManager, selectionService, selectedDeclarationProvider, uiDispatcherMock.Object);
         }
     }
 }
diff --git a/RubberduckTests/Refactoring/Rename/RenameTests.cs b/RubberduckTests/Refactoring/Rename/RenameTests.cs
@@ -13,6 +13,7 @@
 using Rubberduck.Interaction;
 using Rubberduck.Parsing.Annotations;
 using Rubberduck.Parsing.Rewriter;
+using Rubberduck.Parsing.UIContext;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
@@ -3364,7 +3365,11 @@ IRefactoringViewModel<RenameModel>  viewModel
         protected override IRefactoring TestRefactoring(IRewritingManager rewritingManager, RubberduckParserState state, IRefactoringPresenterFactory factory, ISelectionService selectionService)
         {
             var selectedDeclarationService = new SelectedDeclarationProvider(selectionService, state);
-            return new RenameRefactoring(factory, state, state?.ProjectsProvider, rewritingManager, selectionService, selectedDeclarationService, state);
+            var uiDispatcherMock = new Mock<IUiDispatcher>();
+            uiDispatcherMock
+                .Setup(m => m.Invoke(It.IsAny<Action>()))
+                .Callback((Action action) => action.Invoke());
+            return new RenameRefactoring(factory, state, state?.ProjectsProvider, rewritingManager, selectionService, selectedDeclarationService, state, uiDispatcherMock.Object);
         }
 
         #endregion
diff --git a/RubberduckTests/Refactoring/ReorderParametersTests.cs b/RubberduckTests/Refactoring/ReorderParametersTests.cs
@@ -10,6 +10,7 @@
 using RubberduckTests.Mocks;
 using Rubberduck.Parsing.Rewriter;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Parsing.UIContext;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Exceptions;
 using Rubberduck.Refactorings.Exceptions.ReorderParameters;
@@ -1343,7 +1344,11 @@ protected override IRefactoring TestRefactoring(
             ISelectionService selectionService)
         {
             var selectedDeclarationProvider = new SelectedDeclarationProvider(selectionService, state);
-            return new ReorderParametersRefactoring(state, factory, rewritingManager, selectionService, selectedDeclarationProvider);
+            var uiDispatcherMock = new Mock<IUiDispatcher>();
+            uiDispatcherMock
+                .Setup(m => m.Invoke(It.IsAny<Action>()))
+                .Callback((Action action) => action.Invoke());
+            return new ReorderParametersRefactoring(state, factory, rewritingManager, selectionService, selectedDeclarationProvider, uiDispatcherMock.Object);
         }
 
         private static Func<ReorderParametersModel, ReorderParametersModel> ReverseParameters()

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using Rubberduck.VBEditor.Utility;`
`3`	`3`	`using System;`
`4`	`4`	`using Rubberduck.Parsing.Symbols;`
	`5`	`+using Rubberduck.Parsing.UIContext;`
`5`	`6`	`using Rubberduck.Refactorings.Exceptions;`
`6`	`7`
`7`	`8`	`namespace Rubberduck.Refactorings`
`@@ -15,10 +16,12 @@ public abstract class InteractiveRefactoringBase<TPresenter, TModel> : Refactori`
`15`	`16`	`protected InteractiveRefactoringBase(`
`16`	`17`	`IRewritingManager rewritingManager,`
`17`	`18`	`ISelectionProvider selectionProvider,`
`18`		`- IRefactoringPresenterFactory factory)`
	`19`	`+ IRefactoringPresenterFactory factory,`
	`20`	`+ IUiDispatcher uiDispatcher)`
`19`	`21`	`:base(rewritingManager, selectionProvider)`
`20`	`22`	`{`
`21`		`- _presenterFactory = ((model) => DisposalActionContainer.Create(factory.Create<TPresenter, TModel>(model), factory.Release));`
	`23`	`+ Action<TPresenter> presenterDisposalAction = (TPresenter presenter) => uiDispatcher.Invoke(() => factory.Release(presenter));`
	`24`	`+ _presenterFactory = ((model) => DisposalActionContainer.Create(factory.Create<TPresenter, TModel>(model), presenterDisposalAction));`
`22`	`25`	`}`
`23`	`26`
`24`	`27`	`public override void Refactor(Declaration target)`
`@@ -47,9 +50,9 @@ protected void Refactor(TModel initialModel)`
`47`	`50`	`{`
`48`	`51`	`throw new InvalidRefactoringModelException();`
`49`	`52`	`}`
`50`		`-`
`51`		`- RefactorImpl(model);`
`52`	`53`	`}`
	`54`	`+`
	`55`	`+ RefactorImpl(model);`
`53`	`56`	`}`
`54`	`57`
`55`	`58`	`protected abstract TModel InitializeModel(Declaration target);`
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ public bool AddUserDocument_CanExecuteBasedOnProjectType(ProjectType projectType`
`265`	`265`	`public bool RefactorExtractInterface_CanExecuteBasedOnComponentType(ComponentType componentType)`
`266`	`266`	`{`
`267`	`267`	`using (var explorer = new MockedCodeExplorer(ProjectType.HostProject, componentType, @"Public Sub Foo(): MsgBox """":End Sub ")`
`268`		`- .ImplementExtractIntercaceCommand().SelectFirstModule())`
	`268`	`+ .ImplementExtractInterfaceCommand().SelectFirstModule())`
`269`	`269`	`{`
`270`	`270`	`return explorer.ViewModel.CodeExplorerExtractInterfaceCommand.CanExecute(explorer.ViewModel.SelectedItem);`
`271`	`271`	`}`
Original file line number	Diff line number	Diff line change
`@@ -460,11 +460,11 @@ public MockedCodeExplorer ImplementIndenterCommand()`
`460`	`460`	`return this;`
`461`	`461`	`}`
`462`	`462`
`463`		`- public MockedCodeExplorer ImplementExtractIntercaceCommand()`
	`463`	`+ public MockedCodeExplorer ImplementExtractInterfaceCommand()`
`464`	`464`	`{`
`465`	`465`	`ViewModel.CodeExplorerExtractInterfaceCommand = new CodeExplorerExtractInterfaceCommand(`
`466`	`466`	`new Rubberduck.Refactorings.ExtractInterface.ExtractInterfaceRefactoring(`
`467`		`- State, State, null, null, null),`
	`467`	`+ State, State, null, null, null, _uiDispatcher.Object),`
`468`	`468`	`State, null, VbeEvents.Object);`
`469`	`469`	`return this;`
`470`	`470`	`}`