Merge pull request #4665 from comintern/next

retailcoder · web-flow · commit 6b306bafa8bf · 2018-12-22T13:24:55.000-05:00
Fixes broken VBIDE API Reference.IsBroken property getter... Oh, the irony!
diff --git a/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/Reference.cs b/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/Reference.cs
@@ -1,3 +1,4 @@
+using System.Runtime.InteropServices;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using VB = Microsoft.Vbe.Interop.VB6;
 
@@ -49,9 +50,8 @@ public string FullPath
                 {
                     return IsBroken ? string.Empty : Target.FullPath;
                 }
-                catch (System.Runtime.InteropServices.COMException)
+                catch (COMException)
                 {
-
                     return string.Empty;
                 }
             }
@@ -64,7 +64,19 @@ public bool IsBuiltIn
 
         public bool IsBroken
         {
-            get { return IsWrappingNullReference || Target.IsBroken; }
+            get
+            {
+                try
+                {
+                    return IsWrappingNullReference || Target.IsBroken;
+                }
+                catch (COMException ex)
+                {
+                    _logger.Trace(ex, "IsBroken is broken.");
+                }
+
+                return true;
+            }
         }
 
         public ReferenceKind Type
diff --git a/Rubberduck.VBEditor.VBA/SafeComWrappers/VB/Reference.cs b/Rubberduck.VBEditor.VBA/SafeComWrappers/VB/Reference.cs
@@ -1,3 +1,4 @@
+using System.Runtime.InteropServices;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using VB = Microsoft.Vbe.Interop;
 
@@ -49,9 +50,8 @@ public string FullPath
                 {
                     return IsBroken ? string.Empty : Target.FullPath;
                 }
-                catch (System.Runtime.InteropServices.COMException)
+                catch (COMException)
                 {
-
                     return string.Empty;
                 }
             }
@@ -64,7 +64,19 @@ public bool IsBuiltIn
 
         public bool IsBroken
         {
-            get { return IsWrappingNullReference || Target.IsBroken; }
+            get
+            {
+                try
+                {
+                    return IsWrappingNullReference || Target.IsBroken;
+                }
+                catch (COMException ex)
+                {
+                    _logger.Trace(ex, "IsBroken is broken.");
+                }
+
+                return true;
+            }
         }
 
         public ReferenceKind Type

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using System.Runtime.InteropServices;`
`1`	`2`	`using Rubberduck.VBEditor.SafeComWrappers.Abstract;`
`2`	`3`	`using VB = Microsoft.Vbe.Interop.VB6;`
`3`	`4`
`@@ -49,9 +50,8 @@ public string FullPath`
`49`	`50`	`{`
`50`	`51`	`return IsBroken ? string.Empty : Target.FullPath;`
`51`	`52`	`}`
`52`		`- catch (System.Runtime.InteropServices.COMException)`
	`53`	`+ catch (COMException)`
`53`	`54`	`{`
`54`		`-`
`55`	`55`	`return string.Empty;`
`56`	`56`	`}`
`57`	`57`	`}`
`@@ -64,7 +64,19 @@ public bool IsBuiltIn`
`64`	`64`
`65`	`65`	`public bool IsBroken`
`66`	`66`	`{`
`67`		`- get { return IsWrappingNullReference \|\| Target.IsBroken; }`
	`67`	`+ get`
	`68`	`+ {`
	`69`	`+ try`
	`70`	`+ {`
	`71`	`+ return IsWrappingNullReference \|\| Target.IsBroken;`
	`72`	`+ }`
	`73`	`+ catch (COMException ex)`
	`74`	`+ {`
	`75`	`+ _logger.Trace(ex, "IsBroken is broken.");`
	`76`	`+ }`
	`77`	`+`
	`78`	`+ return true;`
	`79`	`+ }`
`68`	`80`	`}`
`69`	`81`
`70`	`82`	`public ReferenceKind Type`