implemented double-click navigation in CodeExplorer

retailcoder · retailcoder · commit 484a49e1db42 · 2016-01-26T23:03:30.000-05:00
diff --git a/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerComponentViewModel.cs b/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerComponentViewModel.cs
@@ -3,6 +3,7 @@
 using System.Windows.Media.Imaging;
 using Microsoft.Vbe.Interop;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.VBEditor;
 using resx = Rubberduck.UI.CodeExplorer.CodeExplorer;
 
 namespace Rubberduck.Navigation.CodeExplorer
@@ -54,6 +55,7 @@ public bool IsTestModule
 
         public override string Name { get { return _declaration.IdentifierName; } }
 
+        public override QualifiedSelection? QualifiedSelection { get { return _declaration.QualifiedSelection; } }
 
         private vbext_ComponentType ComponentType { get { return _declaration.QualifiedName.QualifiedModuleName.Component.Type; } }
 
diff --git a/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerCustomFolderViewModel.cs b/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerCustomFolderViewModel.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Windows.Media.Imaging;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.VBEditor;
 using resx = Rubberduck.Properties.Resources;
 
 namespace Rubberduck.Navigation.CodeExplorer
@@ -41,6 +42,8 @@ public CodeExplorerCustomFolderViewModel(string name, IEnumerable<Declaration> d
 
         public override string Name { get { return _name; } }
 
+        public override QualifiedSelection? QualifiedSelection { get { return null; } }
+
         private readonly BitmapImage _collapsedIcon;
         public override BitmapImage CollapsedIcon { get { return _collapsedIcon; } }
 
diff --git a/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerItemViewModel.cs b/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerItemViewModel.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Windows.Media.Imaging;
 using Rubberduck.UI;
+using Rubberduck.VBEditor;
 
 namespace Rubberduck.Navigation.CodeExplorer
 {
@@ -14,6 +15,8 @@ public abstract class CodeExplorerItemViewModel : ViewModelBase
         public abstract BitmapImage CollapsedIcon { get; }
         public abstract BitmapImage ExpandedIcon { get; }
 
+        public abstract QualifiedSelection? QualifiedSelection { get; }
+
         public CodeExplorerItemViewModel GetChild(string name)
         {
             foreach (var item in _items)
diff --git a/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerMemberViewModel.cs b/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerMemberViewModel.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Windows.Media.Imaging;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.VBEditor;
 using resx = Rubberduck.UI.CodeExplorer.CodeExplorer;
 
 namespace Rubberduck.Navigation.CodeExplorer
@@ -77,6 +78,8 @@ public CodeExplorerMemberViewModel(Declaration declaration, IEnumerable<Declarat
         private readonly string _name;
         public override string Name { get { return _name; } }
 
+        public override QualifiedSelection? QualifiedSelection { get { return _declaration.QualifiedSelection; } }
+
         private static string DetermineMemberName(Declaration declaration)
         {
             var type = declaration.DeclarationType;
diff --git a/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerProjectViewModel.cs b/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerProjectViewModel.cs
@@ -5,13 +5,15 @@
 using System.Windows.Media.Imaging;
 using Microsoft.Vbe.Interop;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.VBEditor;
 using resx = Rubberduck.UI.CodeExplorer.CodeExplorer;
 
 namespace Rubberduck.Navigation.CodeExplorer
 {
     public class CodeExplorerProjectViewModel : CodeExplorerItemViewModel
     {
         private readonly Declaration _declaration;
+
         private static readonly DeclarationType[] ComponentTypes =
         {
             DeclarationType.Class, 
@@ -75,5 +77,6 @@ private static IEnumerable<CodeExplorerItemViewModel> FindFolders(IEnumerable<De
         public override BitmapImage ExpandedIcon { get { return _icon; } }
 
         public override string Name { get { return _declaration.CustomFolder; } }
+        public override QualifiedSelection? QualifiedSelection { get { return _declaration.QualifiedSelection; } }
     }
 }
diff --git a/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs b/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs
@@ -14,9 +14,10 @@ public class CodeExplorerViewModel : ViewModelBase
     {
         private readonly RubberduckParserState _state;
 
-        public CodeExplorerViewModel(RubberduckParserState state)
+        public CodeExplorerViewModel(RubberduckParserState state, INavigateCommand navigateCommand)
         {
             _state = state;
+            _navigateCommand = navigateCommand;
             _state.StateChanged += ParserState_StateChanged;
             _state.ModuleStateChanged += ParserState_ModuleStateChanged;
 
@@ -26,6 +27,9 @@ public CodeExplorerViewModel(RubberduckParserState state)
         private readonly ICommand _refreshCommand;
         public ICommand RefreshCommand { get { return _refreshCommand; } }
 
+        private readonly INavigateCommand _navigateCommand;
+        public ICommand NavigateCommand { get { return _navigateCommand; } }
+
         private object _selectedItem;
         public object SelectedItem
         {
diff --git a/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml.cs b/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml.cs
@@ -13,6 +13,7 @@
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using Rubberduck.Navigation.CodeExplorer;
+using Rubberduck.VBEditor;
 
 namespace Rubberduck.UI.CodeExplorer
 {
@@ -30,7 +31,19 @@ public CodeExplorerControl()
 
         private void TreeView_OnMouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
-            // todo: execute a NavigateCommand
+            if (ViewModel == null || ViewModel.SelectedItem == null)
+            {
+                return;
+            }
+
+            var selectedResult = ViewModel.SelectedItem as CodeExplorerItemViewModel;
+            if (selectedResult == null || !selectedResult.QualifiedSelection.HasValue)
+            {
+                return;
+            }
+
+            var arg = selectedResult.QualifiedSelection.Value.GetNavitationArgs();
+            ViewModel.NavigateCommand.Execute(arg);
         }
     }
 }
diff --git a/RetailCoder.VBE/UI/CodeInspections/InspectionResultsViewModel.cs b/RetailCoder.VBE/UI/CodeInspections/InspectionResultsViewModel.cs
@@ -21,7 +21,6 @@ public class InspectionResultsViewModel : ViewModelBase
         private readonly RubberduckParserState _state;
         private readonly IInspector _inspector;
         private readonly VBE _vbe;
-        private readonly INavigateCommand _navigateCommand;
         private readonly IClipboardWriter _clipboard;
         private readonly IGeneralConfigService _configService;
 
@@ -107,6 +106,7 @@ public IInspection SelectedInspection
             }
         }
 
+        private readonly INavigateCommand _navigateCommand;
         public ICommand NavigateCommand { get { return _navigateCommand; } }
 
         private readonly ICommand _refreshCommand;

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Linq;`
`3`	`3`	`using System.Windows.Media.Imaging;`
`4`	`4`	`using Rubberduck.UI;`
	`5`	`+using Rubberduck.VBEditor;`
`5`	`6`
`6`	`7`	`namespace Rubberduck.Navigation.CodeExplorer`
`7`	`8`	`{`
`@@ -14,6 +15,8 @@ public abstract class CodeExplorerItemViewModel : ViewModelBase`
`14`	`15`	`public abstract BitmapImage CollapsedIcon { get; }`
`15`	`16`	`public abstract BitmapImage ExpandedIcon { get; }`
`16`	`17`
	`18`	`+ public abstract QualifiedSelection? QualifiedSelection { get; }`
	`19`	`+`
`17`	`20`	`public CodeExplorerItemViewModel GetChild(string name)`
`18`	`21`	`{`
`19`	`22`	`foreach (var item in _items)`
Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,15 @@`
`5`	`5`	`using System.Windows.Media.Imaging;`
`6`	`6`	`using Microsoft.Vbe.Interop;`
`7`	`7`	`using Rubberduck.Parsing.Symbols;`
	`8`	`+using Rubberduck.VBEditor;`
`8`	`9`	`using resx = Rubberduck.UI.CodeExplorer.CodeExplorer;`
`9`	`10`
`10`	`11`	`namespace Rubberduck.Navigation.CodeExplorer`
`11`	`12`	`{`
`12`	`13`	`public class CodeExplorerProjectViewModel : CodeExplorerItemViewModel`
`13`	`14`	`{`
`14`	`15`	`private readonly Declaration _declaration;`
	`16`	`+`
`15`	`17`	`private static readonly DeclarationType[] ComponentTypes =`
`16`	`18`	`{`
`17`	`19`	`DeclarationType.Class,`
`@@ -75,5 +77,6 @@ private static IEnumerable<CodeExplorerItemViewModel> FindFolders(IEnumerable<De`
`75`	`77`	`public override BitmapImage ExpandedIcon { get { return _icon; } }`
`76`	`78`
`77`	`79`	`public override string Name { get { return _declaration.CustomFolder; } }`
	`80`	`+ public override QualifiedSelection? QualifiedSelection { get { return _declaration.QualifiedSelection; } }`
`78`	`81`	`}`
`79`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,10 @@ public class CodeExplorerViewModel : ViewModelBase`
`14`	`14`	`{`
`15`	`15`	`private readonly RubberduckParserState _state;`
`16`	`16`
`17`		`- public CodeExplorerViewModel(RubberduckParserState state)`
	`17`	`+ public CodeExplorerViewModel(RubberduckParserState state, INavigateCommand navigateCommand)`
`18`	`18`	`{`
`19`	`19`	`_state = state;`
	`20`	`+ _navigateCommand = navigateCommand;`
`20`	`21`	`_state.StateChanged += ParserState_StateChanged;`
`21`	`22`	`_state.ModuleStateChanged += ParserState_ModuleStateChanged;`
`22`	`23`
`@@ -26,6 +27,9 @@ public CodeExplorerViewModel(RubberduckParserState state)`
`26`	`27`	`private readonly ICommand _refreshCommand;`
`27`	`28`	`public ICommand RefreshCommand { get { return _refreshCommand; } }`
`28`	`29`
	`30`	`+ private readonly INavigateCommand _navigateCommand;`
	`31`	`+ public ICommand NavigateCommand { get { return _navigateCommand; } }`
	`32`	`+`
`29`	`33`	`private object _selectedItem;`
`30`	`34`	`public object SelectedItem`
`31`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`using System.Windows.Navigation;`
`14`	`14`	`using System.Windows.Shapes;`
`15`	`15`	`using Rubberduck.Navigation.CodeExplorer;`
	`16`	`+using Rubberduck.VBEditor;`
`16`	`17`
`17`	`18`	`namespace Rubberduck.UI.CodeExplorer`
`18`	`19`	`{`
`@@ -30,7 +31,19 @@ public CodeExplorerControl()`
`30`	`31`
`31`	`32`	`private void TreeView_OnMouseDoubleClick(object sender, MouseButtonEventArgs e)`
`32`	`33`	`{`
`33`		`- // todo: execute a NavigateCommand`
	`34`	`+ if (ViewModel == null \|\| ViewModel.SelectedItem == null)`
	`35`	`+ {`
	`36`	`+ return;`
	`37`	`+ }`
	`38`	`+`
	`39`	`+ var selectedResult = ViewModel.SelectedItem as CodeExplorerItemViewModel;`
	`40`	`+ if (selectedResult == null \|\| !selectedResult.QualifiedSelection.HasValue)`
	`41`	`+ {`
	`42`	`+ return;`
	`43`	`+ }`
	`44`	`+`
	`45`	`+ var arg = selectedResult.QualifiedSelection.Value.GetNavitationArgs();`
	`46`	`+ ViewModel.NavigateCommand.Execute(arg);`
`34`	`47`	`}`
`35`	`48`	`}`
`36`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ public class InspectionResultsViewModel : ViewModelBase`
`21`	`21`	`private readonly RubberduckParserState _state;`
`22`	`22`	`private readonly IInspector _inspector;`
`23`	`23`	`private readonly VBE _vbe;`
`24`		`- private readonly INavigateCommand _navigateCommand;`
`25`	`24`	`private readonly IClipboardWriter _clipboard;`
`26`	`25`	`private readonly IGeneralConfigService _configService;`
`27`	`26`
`@@ -107,6 +106,7 @@ public IInspection SelectedInspection`
`107`	`106`	`}`
`108`	`107`	`}`
`109`	`108`
	`109`	`+ private readonly INavigateCommand _navigateCommand;`
`110`	`110`	`public ICommand NavigateCommand { get { return _navigateCommand; } }`
`111`	`111`
`112`	`112`	`private readonly ICommand _refreshCommand;`