Merge pull request #2390 from retailcoder/next

fix in COM wrappers for CodeModule.Clear

Author: retailcoder

Rubberduck.SourceControl/GitProvider.cs

@@ -495,13 +495,17 @@ public override IEnumerable<IFileStatusEntry> Status()
             try
             {
                 base.Status();
-                return _repo.RetrieveStatus(new StatusOptions {IncludeUnaltered = true, DetectRenamesInWorkDir = true })
-                        .Select(item => new FileStatusEntry(item));
+                return _repo.RetrieveStatus(new StatusOptions {IncludeUnaltered = true, DetectRenamesInWorkDir = true})
+                    .Select(item => new FileStatusEntry(item));
             }
             catch (LibGit2SharpException ex)
             {
                 throw new SourceControlException(SourceControlText.GitRepoStatusFailed, ex);
             }
+            catch (SEHException ex)
+            {
+                throw new SourceControlException(SourceControlText.GitRepoStatusFailed, ex);
+            }
         }
 
         public override IEnumerable<IFileStatusEntry> LastKnownStatus()

Rubberduck.VBEEditor/SafeComWrappers/VB6/CodeModule.cs

@@ -87,7 +87,10 @@ public string Content()
 
         public void Clear()
         {
-            Target.DeleteLines(1, CountOfLines);
+            if (Target.CountOfLines > 0)
+            {
+                Target.DeleteLines(1, CountOfLines);
+            }
         }
 
         /// <summary>

Rubberduck.VBEEditor/SafeComWrappers/VBA/CodeModule.cs

@@ -87,7 +87,10 @@ public string Content()
 
         public void Clear()
         {
-            Target.DeleteLines(1, CountOfLines);
+            if (Target.CountOfLines > 0)
+            {
+                Target.DeleteLines(1, CountOfLines);
+            }
         }
 
         private string _previousContentHash;

Rubberduck.VBEEditor/SafeComWrappers/VBA/VBComponents.cs

@@ -116,17 +116,17 @@ public void ImportSourceFile(string path)
             if (ext == ComponentTypeExtensions.DocClassExtension)
             {
                 var component = this[name];
+                if (component.IsWrappingNullReference)
+                {
+                    throw new IndexOutOfRangeException(string.Format("Could not find document component named '{0}'.", name));
+                }
                 component.CodeModule.Clear();
                 component.CodeModule.AddFromString(codeString);
             }
             else if (ext == ComponentTypeExtensions.FormExtension)
             {
-                IVBComponent component;
-                try
-                {
-                    component = this[name];
-                }
-                catch
+                var component = this[name];
+                if (component.IsWrappingNullReference)
                 {
                     component = Add(ComponentType.UserForm);
                     component.Properties["Caption"].Value = name;