VBComponents:

mansellan · mansellan · commit 7a8f42001288 · 2017-10-06T16:42:23.000+01:00
- Changes following CR
diff --git a/Rubberduck.VBEEditor/SafeComWrappers/VBA/VBComponents.cs b/Rubberduck.VBEEditor/SafeComWrappers/VBA/VBComponents.cs
@@ -99,9 +99,11 @@ public override int GetHashCode()
 
         public void ImportSourceFile(string path)
         {
+            if (IsWrappingNullReference) { return; }
+
             var ext = Path.GetExtension(path);
             var name = Path.GetFileNameWithoutExtension(path);
-            if (!File.Exists(path) || this[name] == null)
+            if (!File.Exists(path))
             {
                 return;
             }
@@ -152,8 +154,7 @@ public void ImportSourceFile(string path)
 
         public void RemoveSafely(IVBComponent component)
         {
-            if (component == null)
-                { return; }
+            if (component.IsWrappingNullReference) { return; }
 
             switch (component.Type)
             {

Original file line number	Diff line number	Diff line change
`@@ -99,9 +99,11 @@ public override int GetHashCode()`
`99`	`99`
`100`	`100`	`public void ImportSourceFile(string path)`
`101`	`101`	`{`
	`102`	`+ if (IsWrappingNullReference) { return; }`
	`103`	`+`
`102`	`104`	`var ext = Path.GetExtension(path);`
`103`	`105`	`var name = Path.GetFileNameWithoutExtension(path);`
`104`		`- if (!File.Exists(path) \|\| this[name] == null)`
	`106`	`+ if (!File.Exists(path))`
`105`	`107`	`{`
`106`	`108`	`return;`
`107`	`109`	`}`
`@@ -152,8 +154,7 @@ public void ImportSourceFile(string path)`
`152`	`154`
`153`	`155`	`public void RemoveSafely(IVBComponent component)`
`154`	`156`	`{`
`155`		`- if (component == null)`
`156`		`- { return; }`
	`157`	`+ if (component.IsWrappingNullReference) { return; }`
`157`	`158`
`158`	`159`	`switch (component.Type)`
`159`	`160`	`{`