Set selections via the ISelectionService in Core and Parsing

MDoerner · MDoerner · commit c66ac4ca216c · 2019-02-10T19:29:18.000+01:00
diff --git a/Rubberduck.Core/Navigation/RegexSearchReplace/RegexSearchReplace.cs b/Rubberduck.Core/Navigation/RegexSearchReplace/RegexSearchReplace.cs
@@ -8,18 +8,21 @@
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+using Rubberduck.VBEditor.Utility;
 
 namespace Rubberduck.Navigation.RegexSearchReplace
 {
     public class RegexSearchReplace : IRegexSearchReplace
     {
         private readonly IVBE _vbe;
         private readonly IParseCoordinator _parser;
+        private readonly ISelectionService _selectionService;
 
-        public RegexSearchReplace(IVBE vbe, IParseCoordinator parser)
+        public RegexSearchReplace(IVBE vbe, IParseCoordinator parser, ISelectionService selectionService)
         {
             _vbe = vbe;
             _parser = parser;
+            _selectionService = selectionService;
             _search = new Dictionary<RegexSearchReplaceScope, Func<string, IEnumerable<RegexSearchResult>>>
             {
                 { RegexSearchReplaceScope.Selection, SearchSelection},
@@ -89,11 +92,9 @@ private IEnumerable<RegexSearchResult> GetResultsFromModule(ICodeModule module,
 
         private void SetSelection(RegexSearchResult item)
         {
-            var module = item.Module;
-            using (var codePane = module.CodePane)
-            {
-                codePane.Selection = item.Selection;
-            }
+            var module = item.Module.QualifiedModuleName;
+            _selectionService.TrySetSelection(module, item.Selection);
+            _selectionService.TryActivate(module);
         }
 
         private List<RegexSearchResult> SearchSelection(string searchPattern)
diff --git a/Rubberduck.Core/UI/Command/FindSymbolCommand.cs b/Rubberduck.Core/UI/Command/FindSymbolCommand.cs
@@ -5,6 +5,7 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI.FindSymbol;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+using Rubberduck.VBEditor.Utility;
 
 namespace Rubberduck.UI.Command
 {
@@ -19,13 +20,13 @@ public class FindSymbolCommand : CommandBase
         private readonly DeclarationIconCache _iconCache;
         private readonly NavigateCommand _navigateCommand;
 
-        public FindSymbolCommand(IVBE vbe, RubberduckParserState state, DeclarationIconCache iconCache) : base(LogManager.GetCurrentClassLogger())
+        public FindSymbolCommand(IVBE vbe, RubberduckParserState state, ISelectionService selectionService, DeclarationIconCache iconCache) : base(LogManager.GetCurrentClassLogger())
         {
             _vbe = vbe;
             _state = state;
             _iconCache = iconCache;
 
-            _navigateCommand = new NavigateCommand(_state.ProjectsProvider);
+            _navigateCommand = new NavigateCommand(selectionService);
         }
 
         protected override void OnExecute(object parameter)
diff --git a/Rubberduck.Core/UI/Command/NavigateCommand.cs b/Rubberduck.Core/UI/Command/NavigateCommand.cs
@@ -1,8 +1,7 @@
 ﻿using System.Runtime.InteropServices;
-using System.Windows.Input;
 using NLog;
 using Rubberduck.Interaction.Navigation;
-using Rubberduck.VBEditor.ComManagement;
+using Rubberduck.VBEditor.Utility;
 
 namespace Rubberduck.UI.Command
 {
@@ -13,12 +12,12 @@ namespace Rubberduck.UI.Command
     [ComVisible(false)]
     public class NavigateCommand : CommandBase, INavigateCommand
     {
-        private readonly IProjectsProvider _projectsProvider;
+        private readonly ISelectionService _selectionService;
 
-        public NavigateCommand(IProjectsProvider projectsProvider)
+        public NavigateCommand(ISelectionService selectionService)
             : base(LogManager.GetCurrentClassLogger())
         {
-            _projectsProvider = projectsProvider;
+            _selectionService = selectionService;
         }
 
         protected override void OnExecute(object parameter)
@@ -29,19 +28,9 @@ protected override void OnExecute(object parameter)
                 return;
             }
 
-            try
-            {
-                var component = _projectsProvider.Component(param.QualifiedName);
-                using (var codeModule = component.CodeModule)
-                {
-                    using (var codePane = codeModule.CodePane)
-                    {
-                        codePane.Selection = param.Selection;
-                    }
-                }
-            }
-            catch (COMException)
+            if (_selectionService.TrySetSelection(param.QualifiedName, param.Selection))
             {
+                _selectionService.TryActivate(param.QualifiedName);
             }
         }
     }
diff --git a/Rubberduck.Core/UI/IdentifierReferences/IdentifierReferencesListDockablePresenter.cs b/Rubberduck.Core/UI/IdentifierReferences/IdentifierReferencesListDockablePresenter.cs
@@ -2,17 +2,18 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.VBEditor.ComManagement;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+using Rubberduck.VBEditor.Utility;
 
 namespace Rubberduck.UI.IdentifierReferences
 {
     public class IdentifierReferencesListDockablePresenter : DockableToolwindowPresenter
     {
-        private readonly IProjectsProvider _projectsProvider;
+        private readonly ISelectionService _selectionService;
 
-        public IdentifierReferencesListDockablePresenter(IVBE vbe, IAddIn addin, SimpleListControl control, IProjectsProvider projectsProvider, Declaration target)
+        public IdentifierReferencesListDockablePresenter(IVBE vbe, IAddIn addin, SimpleListControl control, ISelectionService selectionService, Declaration target)
             : base(vbe, addin, control, null)
         {
-            _projectsProvider = projectsProvider;
+            _selectionService = selectionService;
 
             BindTarget(target);
         }
@@ -31,13 +32,9 @@ private void BindTarget(Declaration target)
 
         private void OnNavigateIdentifierReference(IdentifierReference reference)
         {
-            var component = _projectsProvider.Component(reference.QualifiedModuleName);
-            using (var codeModule = component.CodeModule)
+            if(_selectionService.TrySetSelection(reference.QualifiedModuleName, reference.Selection))
             {
-                using (var codePane = codeModule.CodePane)
-                {
-                    codePane.Selection = reference.Selection;
-                }
+                _selectionService.TryActivate(reference.QualifiedModuleName);
             }
         }
 
diff --git a/Rubberduck.Core/UI/IdentifierReferences/ImplementationsListDockablePresenter.cs b/Rubberduck.Core/UI/IdentifierReferences/ImplementationsListDockablePresenter.cs
@@ -2,19 +2,19 @@
 using System.Diagnostics;
 using System.Linq;
 using Rubberduck.Parsing.Symbols;
-using Rubberduck.VBEditor.ComManagement;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+using Rubberduck.VBEditor.Utility;
 
 namespace Rubberduck.UI.IdentifierReferences
 {
     public class ImplementationsListDockablePresenter : DockableToolwindowPresenter
     {
-        private readonly IProjectsProvider _projectsProvider;
+        private readonly ISelectionService _selectionService;
 
-        public ImplementationsListDockablePresenter(IVBE vbe, IAddIn addin, IDockableUserControl control, IProjectsProvider projectsProvider, IEnumerable<Declaration> implementations)
+        public ImplementationsListDockablePresenter(IVBE vbe, IAddIn addin, IDockableUserControl control, ISelectionService selectionService, IEnumerable<Declaration> implementations)
             : base(vbe, addin, control, null)
         {
-            _projectsProvider = projectsProvider;
+            _selectionService = selectionService;
 
             BindTarget(implementations);
         }
@@ -33,13 +33,9 @@ private void BindTarget(IEnumerable<Declaration> implementations)
 
         private void OnNavigateImplementation(Declaration implementation)
         {
-            var component = _projectsProvider.Component(implementation.QualifiedName.QualifiedModuleName);
-            using (var codeModule = component.CodeModule)
+            if (_selectionService.TrySetSelection(implementation.QualifiedModuleName, implementation.Selection))
             {
-                using (var codePane = codeModule.CodePane)
-                {
-                    codePane.Selection = implementation.Selection;
-                }
+                _selectionService.TryActivate(implementation.QualifiedModuleName);
             }
         }
 
diff --git a/Rubberduck.Core/UI/ParserErrors/ParseErrorListItem.cs b/Rubberduck.Core/UI/ParserErrors/ParseErrorListItem.cs
@@ -1,5 +1,5 @@
 using Rubberduck.Parsing.VBA;
-using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+using Rubberduck.VBEditor.Utility;
 
 namespace Rubberduck.UI.ParserErrors
 {
@@ -21,9 +21,9 @@ public ParseErrorListItem(ParseErrorEventArgs error)
 
         public string Value => ToString();
 
-        public void Navigate(IVBE vbe)
+        public void Navigate(ISelectionService selectionService)
         {
-            _error.Navigate(vbe);
+            _error.Navigate(selectionService);
         }
 
         public override string ToString()
diff --git a/Rubberduck.Core/UI/ParserErrors/ParserErrorsPresenter.cs b/Rubberduck.Core/UI/ParserErrors/ParserErrorsPresenter.cs
@@ -5,6 +5,7 @@
 using Rubberduck.UI.IdentifierReferences;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using Rubberduck.Resources;
+using Rubberduck.VBEditor.Utility;
 
 namespace Rubberduck.UI.ParserErrors
 {
@@ -17,12 +18,12 @@ public interface IParserErrorsPresenter
 
     public class ParserErrorsPresenter : DockableToolwindowPresenter, IParserErrorsPresenter
     {
-        private readonly IVBE _vbe;
+        private readonly ISelectionService _selectionService;
 
-        public ParserErrorsPresenter(IVBE vbe, IAddIn addin) 
+        public ParserErrorsPresenter(IVBE vbe, IAddIn addin, ISelectionService selectionService) 
             : base(vbe, addin, new SimpleListControl(RubberduckUI.ParseErrors_Caption), null)
         {
-            _vbe = vbe;
+            _selectionService = selectionService;
             _source = new BindingList<ParseErrorListItem>();
             var control = UserControl as SimpleListControl;
             Debug.Assert(control != null);
@@ -32,7 +33,7 @@ public ParserErrorsPresenter(IVBE vbe, IAddIn addin)
         private void Control_Navigate(object sender, ListItemActionEventArgs e)
         {
             var selection = (ParseErrorListItem) e.SelectedItem;
-            selection.Navigate(_vbe);
+            selection.Navigate(_selectionService);
         }
 
         private readonly IBindingList _source;
diff --git a/Rubberduck.Core/UI/ToDoItems/ToDoExplorerViewModel.cs b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerViewModel.cs
@@ -15,6 +15,7 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Resources.ToDoExplorer;
 using Rubberduck.Interaction.Navigation;
+using Rubberduck.VBEditor.Utility;
 
 namespace Rubberduck.UI.ToDoItems
 {
@@ -24,13 +25,15 @@ public sealed class ToDoExplorerViewModel : ViewModelBase, INavigateSelection, I
         private readonly IGeneralConfigService _configService;
         private readonly ISettingsFormFactory _settingsFormFactory;
 
-        public ToDoExplorerViewModel(RubberduckParserState state, IGeneralConfigService configService, ISettingsFormFactory settingsFormFactory)
+        public ToDoExplorerViewModel(RubberduckParserState state, IGeneralConfigService configService, ISettingsFormFactory settingsFormFactory, ISelectionService selectionService)
         {
             _state = state;
             _configService = configService;
             _settingsFormFactory = settingsFormFactory;
             _state.StateChanged += HandleStateChanged;
 
+            _navigateCommand = new Lazy<NavigateCommand>(() => new NavigateCommand(selectionService));
+
             SetMarkerGroupingCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), param =>
             {
                 GroupByMarker = (bool)param;
@@ -233,18 +236,8 @@ public CommandBase OpenTodoSettings
             }
         }
 
-        private NavigateCommand _navigateCommand;
-        public INavigateCommand NavigateCommand
-        {
-            get
-            {
-                if (_navigateCommand != null)
-                {
-                    return _navigateCommand;
-                }
-                return _navigateCommand = new NavigateCommand(_state.ProjectsProvider);
-            }
-        }
+        private readonly Lazy<NavigateCommand> _navigateCommand;
+        public INavigateCommand NavigateCommand => _navigateCommand.Value;
 
         private IEnumerable<ToDoItem> GetToDoMarkers(CommentNode comment)
         {
diff --git a/Rubberduck.Core/UI/UnitTesting/TestExplorerViewModel.cs b/Rubberduck.Core/UI/UnitTesting/TestExplorerViewModel.cs
@@ -15,6 +15,7 @@
 using Rubberduck.UI.UnitTesting.ViewModels;
 using Rubberduck.UnitTesting;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+using Rubberduck.VBEditor.Utility;
 
 namespace Rubberduck.UI.UnitTesting
 {
@@ -35,7 +36,8 @@ public TestExplorerViewModel(IVBE vbe,
              IGeneralConfigService configService,
              ISettingsFormFactory settingsFormFactory,
              IMessageBox messageBox,
-             ReparseCommand reparseCommand)
+             ReparseCommand reparseCommand,
+             ISelectionService selectionService)
         {
             _vbe = vbe;
             _state = state;
@@ -46,7 +48,7 @@ public TestExplorerViewModel(IVBE vbe,
             _settingsFormFactory = settingsFormFactory;
             _messageBox = messageBox;
 
-            _navigateCommand = new NavigateCommand(_state.ProjectsProvider);
+            _navigateCommand = new NavigateCommand(selectionService);
             
             RunSelectedTestCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteSelectedTestCommand, CanExecuteSelectedTestCommand);
             RunSelectedCategoryTestsCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRunSelectedCategoryTestsCommand, CanExecuteRunSelectedCategoryTestsCommand);
diff --git a/Rubberduck.Parsing/VBA/ParseErrorEventArgs.cs b/Rubberduck.Parsing/VBA/ParseErrorEventArgs.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using Rubberduck.Parsing.VBA.Parsing.ParsingExceptions;
 using Rubberduck.VBEditor;
-using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+using Rubberduck.VBEditor.Utility;
 
 namespace Rubberduck.Parsing.VBA
 {
@@ -20,20 +20,12 @@ public ParseErrorEventArgs(SyntaxErrorException exception, QualifiedModuleName m
         public string ComponentName => _moduleName.ComponentName;
         public string ProjectName => _moduleName.ProjectName;
 
-        public void Navigate(IVBE vbe)
+        public void Navigate(ISelectionService selectionService)
         {
             var selection = new Selection(Exception.LineNumber, Exception.Position, Exception.LineNumber, Exception.Position + Exception.OffendingSymbol.Text.Length - 1);
-            
-            if (!_moduleName.TryGetComponent(vbe, out var component))
+            if (selectionService.TrySetSelection(_moduleName, selection))
             {
-                return;
-            }
-
-            using (component)
-            using (var module = component.CodeModule)
-            using (var pane = module.CodePane)
-            {
-                pane.Selection = selection;
+                selectionService.TryActivate(_moduleName);
             }
         }
     }
diff --git a/RubberduckTests/TodoExplorer/TodoExplorerTests.cs b/RubberduckTests/TodoExplorer/TodoExplorerTests.cs

Original file line number	Diff line number	Diff line change
`@@ -8,18 +8,21 @@`
`8`	`8`	`using Rubberduck.VBEditor;`
`9`	`9`	`using Rubberduck.VBEditor.SafeComWrappers;`
`10`	`10`	`using Rubberduck.VBEditor.SafeComWrappers.Abstract;`
	`11`	`+using Rubberduck.VBEditor.Utility;`
`11`	`12`
`12`	`13`	`namespace Rubberduck.Navigation.RegexSearchReplace`
`13`	`14`	`{`
`14`	`15`	`public class RegexSearchReplace : IRegexSearchReplace`
`15`	`16`	`{`
`16`	`17`	`private readonly IVBE _vbe;`
`17`	`18`	`private readonly IParseCoordinator _parser;`
	`19`	`+ private readonly ISelectionService _selectionService;`
`18`	`20`
`19`		`- public RegexSearchReplace(IVBE vbe, IParseCoordinator parser)`
	`21`	`+ public RegexSearchReplace(IVBE vbe, IParseCoordinator parser, ISelectionService selectionService)`
`20`	`22`	`{`
`21`	`23`	`_vbe = vbe;`
`22`	`24`	`_parser = parser;`
	`25`	`+ _selectionService = selectionService;`
`23`	`26`	`_search = new Dictionary<RegexSearchReplaceScope, Func<string, IEnumerable<RegexSearchResult>>>`
`24`	`27`	`{`
`25`	`28`	`{ RegexSearchReplaceScope.Selection, SearchSelection},`
`@@ -89,11 +92,9 @@ private IEnumerable<RegexSearchResult> GetResultsFromModule(ICodeModule module,`
`89`	`92`
`90`	`93`	`private void SetSelection(RegexSearchResult item)`
`91`	`94`	`{`
`92`		`- var module = item.Module;`
`93`		`- using (var codePane = module.CodePane)`
`94`		`- {`
`95`		`- codePane.Selection = item.Selection;`
`96`		`- }`
	`95`	`+ var module = item.Module.QualifiedModuleName;`
	`96`	`+ _selectionService.TrySetSelection(module, item.Selection);`
	`97`	`+ _selectionService.TryActivate(module);`
`97`	`98`	`}`
`98`	`99`
`99`	`100`	`private List<RegexSearchResult> SearchSelection(string searchPattern)`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using Rubberduck.Parsing.VBA;`
`6`	`6`	`using Rubberduck.UI.FindSymbol;`
`7`	`7`	`using Rubberduck.VBEditor.SafeComWrappers.Abstract;`
	`8`	`+using Rubberduck.VBEditor.Utility;`
`8`	`9`
`9`	`10`	`namespace Rubberduck.UI.Command`
`10`	`11`	`{`
`@@ -19,13 +20,13 @@ public class FindSymbolCommand : CommandBase`
`19`	`20`	`private readonly DeclarationIconCache _iconCache;`
`20`	`21`	`private readonly NavigateCommand _navigateCommand;`
`21`	`22`
`22`		`- public FindSymbolCommand(IVBE vbe, RubberduckParserState state, DeclarationIconCache iconCache) : base(LogManager.GetCurrentClassLogger())`
	`23`	`+ public FindSymbolCommand(IVBE vbe, RubberduckParserState state, ISelectionService selectionService, DeclarationIconCache iconCache) : base(LogManager.GetCurrentClassLogger())`
`23`	`24`	`{`
`24`	`25`	`_vbe = vbe;`
`25`	`26`	`_state = state;`
`26`	`27`	`_iconCache = iconCache;`
`27`	`28`
`28`		`- _navigateCommand = new NavigateCommand(_state.ProjectsProvider);`
	`29`	`+ _navigateCommand = new NavigateCommand(selectionService);`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`protected override void OnExecute(object parameter)`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`using System.Runtime.InteropServices;`
`2`		`-using System.Windows.Input;`
`3`	`2`	`using NLog;`
`4`	`3`	`using Rubberduck.Interaction.Navigation;`
`5`		`-using Rubberduck.VBEditor.ComManagement;`
	`4`	`+using Rubberduck.VBEditor.Utility;`
`6`	`5`
`7`	`6`	`namespace Rubberduck.UI.Command`
`8`	`7`	`{`
`@@ -13,12 +12,12 @@ namespace Rubberduck.UI.Command`
`13`	`12`	`[ComVisible(false)]`
`14`	`13`	`public class NavigateCommand : CommandBase, INavigateCommand`
`15`	`14`	`{`
`16`		`- private readonly IProjectsProvider _projectsProvider;`
	`15`	`+ private readonly ISelectionService _selectionService;`
`17`	`16`
`18`		`- public NavigateCommand(IProjectsProvider projectsProvider)`
	`17`	`+ public NavigateCommand(ISelectionService selectionService)`
`19`	`18`	`: base(LogManager.GetCurrentClassLogger())`
`20`	`19`	`{`
`21`		`- _projectsProvider = projectsProvider;`
	`20`	`+ _selectionService = selectionService;`
`22`	`21`	`}`
`23`	`22`
`24`	`23`	`protected override void OnExecute(object parameter)`
`@@ -29,19 +28,9 @@ protected override void OnExecute(object parameter)`
`29`	`28`	`return;`
`30`	`29`	`}`
`31`	`30`
`32`		`- try`
`33`		`- {`
`34`		`- var component = _projectsProvider.Component(param.QualifiedName);`
`35`		`- using (var codeModule = component.CodeModule)`
`36`		`- {`
`37`		`- using (var codePane = codeModule.CodePane)`
`38`		`- {`
`39`		`- codePane.Selection = param.Selection;`
`40`		`- }`
`41`		`- }`
`42`		`- }`
`43`		`- catch (COMException)`
	`31`	`+ if (_selectionService.TrySetSelection(param.QualifiedName, param.Selection))`
`44`	`32`	`{`
	`33`	`+ _selectionService.TryActivate(param.QualifiedName);`
`45`	`34`	`}`
`46`	`35`	`}`
`47`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,17 +2,18 @@`
`2`	`2`	`using Rubberduck.Parsing.Symbols;`
`3`	`3`	`using Rubberduck.VBEditor.ComManagement;`
`4`	`4`	`using Rubberduck.VBEditor.SafeComWrappers.Abstract;`
	`5`	`+using Rubberduck.VBEditor.Utility;`
`5`	`6`
`6`	`7`	`namespace Rubberduck.UI.IdentifierReferences`
`7`	`8`	`{`
`8`	`9`	`public class IdentifierReferencesListDockablePresenter : DockableToolwindowPresenter`
`9`	`10`	`{`
`10`		`- private readonly IProjectsProvider _projectsProvider;`
	`11`	`+ private readonly ISelectionService _selectionService;`
`11`	`12`
`12`		`- public IdentifierReferencesListDockablePresenter(IVBE vbe, IAddIn addin, SimpleListControl control, IProjectsProvider projectsProvider, Declaration target)`
	`13`	`+ public IdentifierReferencesListDockablePresenter(IVBE vbe, IAddIn addin, SimpleListControl control, ISelectionService selectionService, Declaration target)`
`13`	`14`	`: base(vbe, addin, control, null)`
`14`	`15`	`{`
`15`		`- _projectsProvider = projectsProvider;`
	`16`	`+ _selectionService = selectionService;`
`16`	`17`
`17`	`18`	`BindTarget(target);`
`18`	`19`	`}`
`@@ -31,13 +32,9 @@ private void BindTarget(Declaration target)`
`31`	`32`
`32`	`33`	`private void OnNavigateIdentifierReference(IdentifierReference reference)`
`33`	`34`	`{`
`34`		`- var component = _projectsProvider.Component(reference.QualifiedModuleName);`
`35`		`- using (var codeModule = component.CodeModule)`
	`35`	`+ if(_selectionService.TrySetSelection(reference.QualifiedModuleName, reference.Selection))`
`36`	`36`	`{`
`37`		`- using (var codePane = codeModule.CodePane)`
`38`		`- {`
`39`		`- codePane.Selection = reference.Selection;`
`40`		`- }`
	`37`	`+ _selectionService.TryActivate(reference.QualifiedModuleName);`
`41`	`38`	`}`
`42`	`39`	`}`
`43`	`40`
Original file line number	Diff line number	Diff line change
`@@ -2,19 +2,19 @@`
`2`	`2`	`using System.Diagnostics;`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using Rubberduck.Parsing.Symbols;`
`5`		`-using Rubberduck.VBEditor.ComManagement;`
`6`	`5`	`using Rubberduck.VBEditor.SafeComWrappers.Abstract;`
	`6`	`+using Rubberduck.VBEditor.Utility;`
`7`	`7`
`8`	`8`	`namespace Rubberduck.UI.IdentifierReferences`
`9`	`9`	`{`
`10`	`10`	`public class ImplementationsListDockablePresenter : DockableToolwindowPresenter`
`11`	`11`	`{`
`12`		`- private readonly IProjectsProvider _projectsProvider;`
	`12`	`+ private readonly ISelectionService _selectionService;`
`13`	`13`
`14`		`- public ImplementationsListDockablePresenter(IVBE vbe, IAddIn addin, IDockableUserControl control, IProjectsProvider projectsProvider, IEnumerable<Declaration> implementations)`
	`14`	`+ public ImplementationsListDockablePresenter(IVBE vbe, IAddIn addin, IDockableUserControl control, ISelectionService selectionService, IEnumerable<Declaration> implementations)`
`15`	`15`	`: base(vbe, addin, control, null)`
`16`	`16`	`{`
`17`		`- _projectsProvider = projectsProvider;`
	`17`	`+ _selectionService = selectionService;`
`18`	`18`
`19`	`19`	`BindTarget(implementations);`
`20`	`20`	`}`
`@@ -33,13 +33,9 @@ private void BindTarget(IEnumerable<Declaration> implementations)`
`33`	`33`
`34`	`34`	`private void OnNavigateImplementation(Declaration implementation)`
`35`	`35`	`{`
`36`		`- var component = _projectsProvider.Component(implementation.QualifiedName.QualifiedModuleName);`
`37`		`- using (var codeModule = component.CodeModule)`
	`36`	`+ if (_selectionService.TrySetSelection(implementation.QualifiedModuleName, implementation.Selection))`
`38`	`37`	`{`
`39`		`- using (var codePane = codeModule.CodePane)`
`40`		`- {`
`41`		`- codePane.Selection = implementation.Selection;`
`42`		`- }`
	`38`	`+ _selectionService.TryActivate(implementation.QualifiedModuleName);`
`43`	`39`	`}`
`44`	`40`	`}`
`45`	`41`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`using Rubberduck.Parsing.VBA;`
`2`		`-using Rubberduck.VBEditor.SafeComWrappers.Abstract;`
	`2`	`+using Rubberduck.VBEditor.Utility;`
`3`	`3`
`4`	`4`	`namespace Rubberduck.UI.ParserErrors`
`5`	`5`	`{`
`@@ -21,9 +21,9 @@ public ParseErrorListItem(ParseErrorEventArgs error)`
`21`	`21`
`22`	`22`	`public string Value => ToString();`
`23`	`23`
`24`		`- public void Navigate(IVBE vbe)`
	`24`	`+ public void Navigate(ISelectionService selectionService)`
`25`	`25`	`{`
`26`		`- _error.Navigate(vbe);`
	`26`	`+ _error.Navigate(selectionService);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public override string ToString()`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using Rubberduck.UI.IdentifierReferences;`
`6`	`6`	`using Rubberduck.VBEditor.SafeComWrappers.Abstract;`
`7`	`7`	`using Rubberduck.Resources;`
	`8`	`+using Rubberduck.VBEditor.Utility;`
`8`	`9`
`9`	`10`	`namespace Rubberduck.UI.ParserErrors`
`10`	`11`	`{`
`@@ -17,12 +18,12 @@ public interface IParserErrorsPresenter`
`17`	`18`
`18`	`19`	`public class ParserErrorsPresenter : DockableToolwindowPresenter, IParserErrorsPresenter`
`19`	`20`	`{`
`20`		`- private readonly IVBE _vbe;`
	`21`	`+ private readonly ISelectionService _selectionService;`
`21`	`22`
`22`		`- public ParserErrorsPresenter(IVBE vbe, IAddIn addin)`
	`23`	`+ public ParserErrorsPresenter(IVBE vbe, IAddIn addin, ISelectionService selectionService)`
`23`	`24`	`: base(vbe, addin, new SimpleListControl(RubberduckUI.ParseErrors_Caption), null)`
`24`	`25`	`{`
`25`		`- _vbe = vbe;`
	`26`	`+ _selectionService = selectionService;`
`26`	`27`	`_source = new BindingList<ParseErrorListItem>();`
`27`	`28`	`var control = UserControl as SimpleListControl;`
`28`	`29`	`Debug.Assert(control != null);`
`@@ -32,7 +33,7 @@ public ParserErrorsPresenter(IVBE vbe, IAddIn addin)`
`32`	`33`	`private void Control_Navigate(object sender, ListItemActionEventArgs e)`
`33`	`34`	`{`
`34`	`35`	`var selection = (ParseErrorListItem) e.SelectedItem;`
`35`		`- selection.Navigate(_vbe);`
	`36`	`+ selection.Navigate(_selectionService);`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`private readonly IBindingList _source;`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using Rubberduck.Parsing.VBA.Parsing.ParsingExceptions;`
`3`	`3`	`using Rubberduck.VBEditor;`
`4`		`-using Rubberduck.VBEditor.SafeComWrappers.Abstract;`
	`4`	`+using Rubberduck.VBEditor.Utility;`
`5`	`5`
`6`	`6`	`namespace Rubberduck.Parsing.VBA`
`7`	`7`	`{`
`@@ -20,20 +20,12 @@ public ParseErrorEventArgs(SyntaxErrorException exception, QualifiedModuleName m`
`20`	`20`	`public string ComponentName => _moduleName.ComponentName;`
`21`	`21`	`public string ProjectName => _moduleName.ProjectName;`
`22`	`22`
`23`		`- public void Navigate(IVBE vbe)`
	`23`	`+ public void Navigate(ISelectionService selectionService)`
`24`	`24`	`{`
`25`	`25`	`var selection = new Selection(Exception.LineNumber, Exception.Position, Exception.LineNumber, Exception.Position + Exception.OffendingSymbol.Text.Length - 1);`
`26`		`-`
`27`		`- if (!_moduleName.TryGetComponent(vbe, out var component))`
	`26`	`+ if (selectionService.TrySetSelection(_moduleName, selection))`
`28`	`27`	`{`
`29`		`- return;`
`30`		`- }`
`31`		`-`
`32`		`- using (component)`
`33`		`- using (var module = component.CodeModule)`
`34`		`- using (var pane = module.CodePane)`
`35`		`- {`
`36`		`- pane.Selection = selection;`
	`28`	`+ selectionService.TryActivate(_moduleName);`
`37`	`29`	`}`
`38`	`30`	`}`
`39`	`31`	`}`