Merge pull request #2379 from retailcoder/next

Prevent null ProjectId from wrecking Sinks.RegisterComponentsEventSink

Author: retailcoder

Rubberduck.Parsing/VBA/RubberduckParser.cs

@@ -382,6 +382,7 @@ private string GetReferenceProjectId(IReference reference, IReadOnlyList<IVBProj
         private void SyncComReferences(IReadOnlyList<IVBProject> projects)
         {
             var loadTasks = new List<Task>();
+            var unmapped = new List<IReference>();
 
             foreach (var vbProject in projects)
             {
@@ -397,8 +398,8 @@ private void SyncComReferences(IReadOnlyList<IVBProject> projects)
                         // skip loading Rubberduck.tlb (GUID is defined in AssemblyInfo.cs)
                         if (reference.Guid == "{E07C841C-14B4-4890-83E9-8C80B06DD59D}")
                         {
-                            // todo: figure out why Rubberduck.tlb can't be loaded that way
-                            continue;
+                            // todo: figure out why Rubberduck.tlb *sometimes* throws
+                            //continue;
                         }
                         var referencedProjectId = GetReferenceProjectId(reference, projects);
 
@@ -442,6 +443,7 @@ private void SyncComReferences(IReadOnlyList<IVBProject> projects)
                                     }
                                     catch (Exception exception)
                                     {
+                                        unmapped.Add(reference);
                                         Logger.Warn(string.Format("Types were not loaded from referenced type library '{0}'.", reference.Name));
                                         Logger.Error(exception);
                                     }
@@ -458,7 +460,6 @@ private void SyncComReferences(IReadOnlyList<IVBProject> projects)
                 mappedIds.Add(item.ReferencedProjectId);
             }
 
-            var unmapped = new List<IReference>();
             foreach (var project in projects)
             {
                 var references = project.References;

Rubberduck.VBEEditor/Events/Sinks.cs

@@ -56,7 +56,7 @@ public void Stop()
 
         private void RegisterComponentsEventSink(IVBComponents components, string projectId)
         {
-            if (_componentsEventsSinks.ContainsKey(projectId))
+            if (projectId == null || _componentsEventsSinks.ContainsKey(projectId))
             {
                 // already registered - this is caused by the initial load+rename of a project in the VBE
                 return;
@@ -77,7 +77,7 @@ private void RegisterComponentsEventSink(IVBComponents components, string projec
 
         private void UnregisterComponentsEventSink(string projectId)
         {
-            if (!_componentsEventsSinks.ContainsKey(projectId)) { return; }
+            if (projectId == null || !_componentsEventsSinks.ContainsKey(projectId)) { return; }
 
             var componentEventSink = _componentsEventsSinks[projectId];
             var info = _componentEventsInfo[projectId];

Rubberduck.VBEEditor/SafeComWrappers/VBA/CodePane.cs

@@ -88,7 +88,7 @@ private Selection GetSelection()
             return new QualifiedSelection(moduleName, selection);
         }
 
-        public void SetSelection(int startLine, int startColumn, int endLine, int endColumn)
+        private void SetSelection(int startLine, int startColumn, int endLine, int endColumn)
         {
             Target.SetSelection(startLine, startColumn, endLine, endColumn);
             ForceFocus();
@@ -110,6 +110,10 @@ private void ForceFocus()
             {
                 NativeMethods.ActivateWindow(handle, mainWindowHandle);
             }
+            else
+            {
+                System.Diagnostics.Debug.WriteLine("CodePane.ForceFocus() failed to get a handle on the MainWindow.");
+            }
         }
 
         public void Show()