Merge pull request #628 from Hosch250/next

Fix #602 for Office 2013 x64

Author: rubberduck203

RetailCoder.VBE/UI/CodeExplorer/CodeExplorerDockablePresenter.cs

@@ -241,7 +241,7 @@ private void NavigateExplorerTreeNode(object sender, TreeNodeNavigateCodeEventAr
             var declaration = e.Declaration;
             if (declaration != null)
             {
-                VBE.SetSelection(declaration.QualifiedSelection);
+                VBE.SetSelection(declaration.QualifiedName.QualifiedModuleName.Project, declaration.Selection, declaration.QualifiedName.QualifiedModuleName.Component.Name);
             }
         }
 

RetailCoder.VBE/UI/CodeInspections/CodeInspectionsDockablePresenter.cs

@@ -187,9 +187,8 @@ private async void Refresh()
             {
                 Control.SetIssuesStatus(_issues, true);
                 Control.EnableRefresh();
+                Control.Cursor = Cursors.Default;
             }
-
-            Control.Cursor = Cursors.Default;
         }
 
         private async Task RefreshAsync(CancellationToken token)

RetailCoder.VBE/UI/IdentifierReferences/IdentifierReferencesListDockablePresenter.cs

@@ -25,7 +25,7 @@ private void BindTarget(Declaration target)
 
         public static void OnNavigateIdentifierReference(VBE vbe, IdentifierReference reference)
         {
-            vbe.SetSelection(new QualifiedSelection(reference.QualifiedModuleName, reference.Selection));
+            vbe.SetSelection(reference.QualifiedModuleName.Project, reference.Selection, reference.QualifiedModuleName.Component.Name);
         }
 
         private void ControlNavigate(object sender, ListItemActionEventArgs e)

RetailCoder.VBE/UI/IdentifierReferences/ImplementationsListDockablePresenter.cs

@@ -26,7 +26,7 @@ private void BindTarget(IEnumerable<Declaration> implementations)
 
         public static void OnNavigateImplementation(VBE vbe, Declaration implementation)
         {
-            vbe.SetSelection(new QualifiedSelection(implementation.QualifiedName.QualifiedModuleName, implementation.Selection));
+            vbe.SetSelection(implementation.QualifiedName.QualifiedModuleName.Project, implementation.Selection, implementation.QualifiedName.QualifiedModuleName.Component.Name);
         }
 
         private void ControlNavigate(object sender, ListItemActionEventArgs e)

RetailCoder.VBE/UI/ToDoItems/ToDoExplorerDockablePresenter.cs

@@ -49,10 +49,10 @@ public async void Refresh()
                 Cursor.Current = Cursors.WaitCursor;
                 _view.TodoItems = await GetItems();
             }
-            //wtf? why are we catching everything without even so much as leaving a comment as to why?
-            catch { }
-
-            Cursor.Current = Cursors.Default;
+            finally
+            {
+                Cursor.Current = Cursors.Default;
+            }
         }
 
         private void RefreshToDoList(object sender, EventArgs e)

Rubberduck.SourceControl/SourceControlProviderBase.cs

@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using Microsoft.Vbe.Interop;
+using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.Extensions;
 
 namespace Rubberduck.SourceControl
@@ -119,11 +120,12 @@ private void Refresh()
             //Because refreshing removes all components, we need to store the current selection,
             // so we can correctly reset it once the files are imported from the repository.
             var selection = Project.VBE.ActiveCodePane.GetSelection();
+            var name = selection.QualifiedName.Component.Name;
 
             Project.RemoveAllComponents();
             Project.ImportSourceFiles(CurrentRepository.LocalLocation);
 
-            Project.VBE.SetSelection(selection);
+            Project.VBE.SetSelection(selection.QualifiedName.Project, selection.Selection, name);
         }
     }
 }

Rubberduck.VBEEditor/Extensions/VbeExtensions.cs

@@ -6,25 +6,25 @@ namespace Rubberduck.VBEditor.Extensions
 {
     public static class VbeExtensions
     {
-        public static void SetSelection(this VBE vbe, QualifiedSelection selection)
+        public static void SetSelection(this VBE vbe, VBProject vbProject, Selection selection, string name)
         {
             var project = vbe.VBProjects.Cast<VBProject>()
                              .SingleOrDefault(p => p.Protection != vbext_ProjectProtection.vbext_pp_locked 
-                                               && ReferenceEquals(p, selection.QualifiedName.Project));
+                                               && ReferenceEquals(p, vbProject));
 
             VBComponent component = null;
             if (project != null)
             {
                 component = project.VBComponents.Cast<VBComponent>()
-                                   .SingleOrDefault(c => c.Name == selection.QualifiedName.Component.Name);
+                    .SingleOrDefault(c => c.Name == name);
             }
 
             if (component == null)
             {
                 return;
             }
 
-            component.CodeModule.CodePane.SetSelection(selection.Selection);
+            component.CodeModule.CodePane.SetSelection(selection);
         }
 
         public static CodeModuleSelection FindInstruction(this VBE vbe, QualifiedModuleName qualifiedModuleName, Selection selection)