Skip to content

Commit ae1442f

Browse files
committed
Clean up selection handling vie ISelectionService in Core and Parsing
1 parent f0ebc26 commit ae1442f

File tree

6 files changed

+6
-20
lines changed

6 files changed

+6
-20
lines changed

Rubberduck.Core/Navigation/RegexSearchReplace/RegexSearchReplace.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,7 @@ private IEnumerable<RegexSearchResult> GetResultsFromModule(ICodeModule module,
9292

9393
private void SetSelection(RegexSearchResult item)
9494
{
95-
var module = item.Module.QualifiedModuleName;
96-
_selectionService.TrySetSelection(module, item.Selection);
97-
_selectionService.TryActivate(module);
95+
_selectionService.TrySetActiveSelection(item.Module.QualifiedModuleName, item.Selection);
9896
}
9997

10098
private List<RegexSearchResult> SearchSelection(string searchPattern)

Rubberduck.Core/UI/Command/NavigateCommand.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Runtime.InteropServices;
22
using NLog;
33
using Rubberduck.Interaction.Navigation;
4+
using Rubberduck.VBEditor;
45
using Rubberduck.VBEditor.Utility;
56

67
namespace Rubberduck.UI.Command
@@ -28,10 +29,7 @@ protected override void OnExecute(object parameter)
2829
return;
2930
}
3031

31-
if (_selectionService.TrySetSelection(param.QualifiedName, param.Selection))
32-
{
33-
_selectionService.TryActivate(param.QualifiedName);
34-
}
32+
_selectionService.TrySetActiveSelection(param.QualifiedName, param.Selection);
3533
}
3634
}
3735
}

Rubberduck.Core/UI/IdentifierReferences/IdentifierReferencesListDockablePresenter.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@ private void BindTarget(Declaration target)
3232

3333
private void OnNavigateIdentifierReference(IdentifierReference reference)
3434
{
35-
if(_selectionService.TrySetSelection(reference.QualifiedModuleName, reference.Selection))
36-
{
37-
_selectionService.TryActivate(reference.QualifiedModuleName);
38-
}
35+
_selectionService.TrySetActiveSelection(reference.QualifiedModuleName, reference.Selection);
3936
}
4037

4138
private void ControlNavigate(object sender, ListItemActionEventArgs e)

Rubberduck.Core/UI/IdentifierReferences/ImplementationsListDockablePresenter.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ private void BindTarget(IEnumerable<Declaration> implementations)
3333

3434
private void OnNavigateImplementation(Declaration implementation)
3535
{
36-
if (_selectionService.TrySetSelection(implementation.QualifiedModuleName, implementation.Selection))
37-
{
38-
_selectionService.TryActivate(implementation.QualifiedModuleName);
39-
}
36+
_selectionService.TrySetActiveSelection(implementation.QualifiedModuleName, implementation.Selection);
4037
}
4138

4239
private void ControlNavigate(object sender, ListItemActionEventArgs e)

Rubberduck.Parsing/VBA/ParseErrorEventArgs.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ public ParseErrorEventArgs(SyntaxErrorException exception, QualifiedModuleName m
2323
public void Navigate(ISelectionService selectionService)
2424
{
2525
var selection = new Selection(Exception.LineNumber, Exception.Position, Exception.LineNumber, Exception.Position + Exception.OffendingSymbol.Text.Length - 1);
26-
if (selectionService.TrySetSelection(_moduleName, selection))
27-
{
28-
selectionService.TryActivate(_moduleName);
29-
}
26+
selectionService.TrySetActiveSelection(_moduleName, selection);
3027
}
3128
}
3229
}

Rubberduck.VBEEditor/SourceCodeHandling/CodePaneSourceCodeHandler.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using System.Linq;
44
using Rubberduck.VBEditor.ComManagement;
55
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
6-
using System.Reflection;
76
using System.Diagnostics;
87

98
namespace Rubberduck.VBEditor.SourceCodeHandling

0 commit comments

Comments
 (0)