Merge pull request #3516 from IvenBach/next

Author: retailcoder

Rubberduck.VBEEditor/SafeComWrappers/Office.Core/CommandBarButton.cs

@@ -33,7 +33,7 @@ public event EventHandler<CommandBarButtonClickEventArgs> Click
                     ((Microsoft.Office.Core.CommandBarButton)Target).Click += Target_Click;
                 }
                 _clickHandler += value;
-                System.Diagnostics.Debug.WriteLine("Added handler for: {0} '{1}' (tag: {2}, hashcode:{3})", Parent.Name, Target.Caption, Tag, Target.GetHashCode());
+                System.Diagnostics.Debug.WriteLine($"Added handler for: {Parent.Name} '{Target.Caption}' (tag: {Tag}, hashcode:{Target.GetHashCode()})");
             }
             remove
             {
@@ -49,7 +49,7 @@ public event EventHandler<CommandBarButtonClickEventArgs> Click
                 {
                     // he's gone, dave.
                 }
-                System.Diagnostics.Debug.WriteLine("Removed handler for: {0} '{1}' (tag: {2}, hashcode:{3})", Parent.GetType().Name, Target.Caption, Tag, Target.GetHashCode());
+                System.Diagnostics.Debug.WriteLine($"Removed handler for: {Parent.GetType().Name} '{Target.Caption}' (tag: {Tag}, hashcode:{Target.GetHashCode()})");
             }
         }
 
@@ -64,7 +64,7 @@ private void Target_Click(Microsoft.Office.Core.CommandBarButton ctrl, ref bool
             System.Diagnostics.Debug.Assert(handler.GetInvocationList().Length == 1, "Multicast delegate is registered more than once.");
 
             //note: event is fired for every parent the command exists under. not sure why.
-            System.Diagnostics.Debug.WriteLine("Executing handler for: {0} '{1}' (tag: {2}, hashcode:{3})", Parent.GetType().Name, Target.Caption, Tag, Target.GetHashCode());
+            System.Diagnostics.Debug.WriteLine($"Executing handler for: {Parent.GetType().Name} '{Target.Caption}' (tag: {Tag}, hashcode:{Target.GetHashCode()})");
 
             var button = new CommandBarButton(ctrl);
             var args = new CommandBarButtonClickEventArgs(button);

Rubberduck.VBEEditor/SafeComWrappers/VB6/Reference.cs

@@ -32,7 +32,7 @@ public int Minor
 
         public string Version
         {
-            get { return string.Format("{0}.{1}", Major, Minor); }
+            get { return string.Format($"{Major}.{Minor}"); }
         }
 
         public string Description

Rubberduck.VBEEditor/SafeComWrappers/VB6/VBProjects.cs

@@ -38,7 +38,10 @@ public IVBProject Add(ProjectType type)
 
         public void Remove(IVBProject project)
         {
-            if (IsWrappingNullReference) return;
+            if (IsWrappingNullReference)
+            {
+                return;
+            }
             Target.Remove((VB.VBProject)project.Target);
         }
 

Rubberduck.VBEEditor/SafeComWrappers/VBA/LinkedWindows.cs

@@ -22,13 +22,21 @@ public LinkedWindows(VB.LinkedWindows linkedWindows)
 
         public void Remove(IWindow window)
         {
-            if (IsWrappingNullReference) return;
+            if (IsWrappingNullReference)
+            {
+                return;
+            }
+
             Target.Remove(((Window)window).Target);
         }
 
         public void Add(IWindow window)
         {
-            if (IsWrappingNullReference) return;
+            if (IsWrappingNullReference)
+            {
+                return;
+            }
+
             Target.Add(((Window)window).Target);
         }
 

Rubberduck.VBEEditor/SafeComWrappers/VBA/Property.cs

@@ -40,7 +40,10 @@ public object GetIndexedValue(object index1, object index2 = null, object index3
 
         public void SetIndexedValue(object value, object index1, object index2 = null, object index3 = null, object index4 = null)
         {
-            if (!IsWrappingNullReference) Target.set_IndexedValue(index1, index2, index3, index4, value);
+            if (!IsWrappingNullReference)
+            {
+                Target.set_IndexedValue(index1, index2, index3, index4, value);
+            }
         }
 
         /// <summary>

Rubberduck.VBEEditor/SafeComWrappers/VBA/Reference.cs

@@ -32,7 +32,7 @@ public int Minor
 
         public string Version
         {
-            get { return string.Format("{0}.{1}", Major, Minor); }
+            get { return string.Format($"{Major}.{Minor}"); }
         }
 
         public string Description
@@ -42,7 +42,18 @@ public string Description
 
         public string FullPath
         {
-            get { return IsBroken ? string.Empty : Target.FullPath; }
+            get
+            {
+                try
+                {
+                    return IsBroken ? string.Empty : Target.FullPath;
+                }
+                catch (System.Runtime.InteropServices.COMException)
+                {
+
+                    return string.Empty;
+                }
+            }
         }
 
         public bool IsBuiltIn
@@ -92,4 +103,4 @@ public override int GetHashCode()
             return IsBroken ? 0 : HashCode.Compute(Type, Name, Guid, FullPath, Major, Minor);
         }
     }
-}
+}

Rubberduck.VBEEditor/SafeComWrappers/VBA/VBE.cs

@@ -285,7 +285,10 @@ public IWindow ActiveMDIChild()
         public bool HostSupportsUnitTests()
         {
             var host = Path.GetFileName(System.Windows.Forms.Application.ExecutablePath).ToUpperInvariant();
-            if (HostAppMap.ContainsKey(host)) return true;
+            if (HostAppMap.ContainsKey(host))
+            {
+                return true;
+            }
             //Guessing the above will work like 99.9999% of the time for supported applications.
 
             var project = ActiveVBProject;

Rubberduck.VBEEditor/SafeComWrappers/VBA/VBProjects.cs

@@ -43,7 +43,10 @@ public IVBProject Add(ProjectType type)
 
         public void Remove(IVBProject project)
         {
-            if (IsWrappingNullReference) return;
+            if (IsWrappingNullReference)
+            {
+                return;
+            }
             Target.Remove((VB.VBProject) project.Target);
         }