Warn when documents do not exist (only when loading the repo/switching branches). Retry loading document-type components every time the repo is refreshed in case the component is added (we don't track document-type components by default).

Hosch250 · Hosch250 · commit 89b963900b21 · 2016-07-21T16:16:16.000-05:00
diff --git a/RetailCoder.VBE/UI/SourceControl/BranchesViewViewModel.cs b/RetailCoder.VBE/UI/SourceControl/BranchesViewViewModel.cs
@@ -140,7 +140,7 @@ public string CurrentBranch
                     }
                     catch (SourceControlException ex)
                     {
-                        RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);
+                        RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);
                     }
                     catch
                     {
@@ -324,7 +324,7 @@ private void CreateBranchOk()
             }
             catch (SourceControlException ex)
             {
-                RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);
+                RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);
             }
             catch
             {
@@ -358,7 +358,7 @@ private void MergeBranchOk()
             }
             catch (SourceControlException ex)
             {
-                RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);
+                RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);
                 Provider.NotifyExternalFileChanges = true;
                 Provider.HandleVbeSinkEvents = true;
                 return;
@@ -394,7 +394,7 @@ private void DeleteBranch(bool isBranchPublished)
             }
             catch (SourceControlException ex)
             {
-                RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);
+                RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);
             }
             catch
             {
@@ -422,7 +422,7 @@ private void PublishBranch()
             }
             catch (SourceControlException ex)
             {
-                RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);
+                RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);
             }
             catch
             {
@@ -443,7 +443,7 @@ private void UnpublishBranch()
             }
             catch (SourceControlException ex)
             {
-                RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);
+                RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);
             }
             catch
             {
@@ -531,12 +531,21 @@ public CommandBase UnpublishBranchToolbarButtonCommand
         }
 
         public event EventHandler<ErrorEventArgs> ErrorThrown;
-        private void RaiseErrorEvent(string message, string innerMessage, NotificationType notificationType)
+        private void RaiseErrorEvent(string message, Exception innerException, NotificationType notificationType)
         {
             var handler = ErrorThrown;
             if (handler != null)
             {
-                handler(this, new ErrorEventArgs(message, innerMessage, notificationType));
+                handler(this, new ErrorEventArgs(message, innerException, notificationType));
+            }
+        }
+
+        private void RaiseErrorEvent(string title, string message, NotificationType notificationType)
+        {
+            var handler = ErrorThrown;
+            if (handler != null)
+            {
+                handler(this, new ErrorEventArgs(title, message, notificationType));
             }
         }
     }
diff --git a/RetailCoder.VBE/UI/SourceControl/ChangesViewViewModel.cs b/RetailCoder.VBE/UI/SourceControl/ChangesViewViewModel.cs
@@ -158,7 +158,7 @@ private void UndoChanges(IFileStatusEntry fileStatusEntry)
             }
             catch (SourceControlException ex)
             {
-                RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);
+                RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);
             }
             catch
             {
@@ -213,7 +213,7 @@ private void Commit()
             }
             catch (SourceControlException ex)
             {
-                RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);
+                RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);
             }
             catch
             {
@@ -274,12 +274,21 @@ public CommandBase IncludeChangesToolbarButtonCommand
         }
 
         public event EventHandler<ErrorEventArgs> ErrorThrown;
-        private void RaiseErrorEvent(string message, string innerMessage, NotificationType notificationType)
+        private void RaiseErrorEvent(string message, Exception innerException, NotificationType notificationType)
         {
             var handler = ErrorThrown;
             if (handler != null)
             {
-                handler(this, new ErrorEventArgs(message, innerMessage, notificationType));
+                handler(this, new ErrorEventArgs(message, innerException, notificationType));
+            }
+        }
+
+        private void RaiseErrorEvent(string title, string message, NotificationType notificationType)
+        {
+            var handler = ErrorThrown;
+            if (handler != null)
+            {
+                handler(this, new ErrorEventArgs(title, message, notificationType));
             }
         }
     }
diff --git a/RetailCoder.VBE/UI/SourceControl/IControlViewModel.cs b/RetailCoder.VBE/UI/SourceControl/IControlViewModel.cs
@@ -3,18 +3,34 @@
 
 namespace Rubberduck.UI.SourceControl
 {
+    using System.Linq;
+
     public class ErrorEventArgs
     {
-        public readonly string Message;
+        public readonly string Title;
         public readonly string InnerMessage;
         public readonly NotificationType NotificationType;
 
-        public ErrorEventArgs(string message, string innerMessage, NotificationType notificationType)
+        public ErrorEventArgs(string title, Exception innerException, NotificationType notificationType)
+        {
+            Title = title;
+            InnerMessage = GetInnerExceptionMessage(innerException);
+            NotificationType = notificationType;
+        }
+
+        public ErrorEventArgs(string title, string message, NotificationType notificationType)
         {
-            Message = message;
-            InnerMessage = innerMessage;
+            Title = title;
+            InnerMessage = message;
             NotificationType = notificationType;
         }
+
+        private string GetInnerExceptionMessage(Exception ex)
+        {
+            return ex is AggregateException
+                ? string.Join(Environment.NewLine, ((AggregateException) ex).InnerExceptions.Select(s => s.Message))
+                : ex.Message;
+        }
     }
 
     public interface IControlViewModel
diff --git a/RetailCoder.VBE/UI/SourceControl/SettingsViewViewModel.cs b/RetailCoder.VBE/UI/SourceControl/SettingsViewViewModel.cs
@@ -241,12 +241,21 @@ public CommandBase ShowGitAttributesCommand
         }
 
         public event EventHandler<ErrorEventArgs> ErrorThrown;
-        private void RaiseErrorEvent(string message, string innerMessage, NotificationType notificationType)
+        private void RaiseErrorEvent(string message, Exception innerException, NotificationType notificationType)
         {
             var handler = ErrorThrown;
             if (handler != null)
             {
-                handler(this, new ErrorEventArgs(message, innerMessage, notificationType));
+                handler(this, new ErrorEventArgs(message, innerException, notificationType));
+            }
+        }
+
+        private void RaiseErrorEvent(string title, string message, NotificationType notificationType)
+        {
+            var handler = ErrorThrown;
+            if (handler != null)
+            {
+                handler(this, new ErrorEventArgs(title, message, notificationType));
             }
         }
 
diff --git a/RetailCoder.VBE/UI/SourceControl/SourceControlViewViewModel.cs b/RetailCoder.VBE/UI/SourceControl/SourceControlViewViewModel.cs
@@ -586,9 +586,9 @@ private void ViewModel_ErrorThrown(object sender, ErrorEventArgs e)
             }
             else
             {
-                Logger.Trace("Displaying {0} with title '{1}' and message '{2}'", e.NotificationType, e.Message, e.InnerMessage);
+                Logger.Trace("Displaying {0} with title '{1}' and message '{2}'", e.NotificationType, e.Title, e.InnerMessage);
 
-                ErrorTitle = e.Message;
+                ErrorTitle = e.Title;
                 ErrorMessage = e.InnerMessage;
 
                 IconMappings.TryGetValue(e.NotificationType, out _errorIcon);
@@ -643,7 +643,7 @@ private void InitRepo()
                 catch (SourceControlException ex)
                 {
                     ViewModel_ErrorThrown(this,
-                        new ErrorEventArgs(ex.Message, ex.InnerException.Message, NotificationType.Error));
+                        new ErrorEventArgs(ex.Message, ex.InnerException, NotificationType.Error));
                 }
                 catch
                 {
@@ -722,7 +722,7 @@ private void OpenRepo()
                 catch (SourceControlException ex)
                 {
                     _sinks.IsEnabled = true;
-                    ViewModel_ErrorThrown(null, new ErrorEventArgs(ex.Message, ex.InnerException.Message, NotificationType.Error));
+                    ViewModel_ErrorThrown(null, new ErrorEventArgs(ex.Message, ex.InnerException, NotificationType.Error));
                     return;
                 }
                 catch
@@ -769,7 +769,7 @@ private void CloneRepo(SecureCredentials credentials = null)
                     _isCloning = false;
                 }
 
-                ViewModel_ErrorThrown(this, new ErrorEventArgs(ex.Message, ex.InnerException.Message, NotificationType.Error));
+                ViewModel_ErrorThrown(this, new ErrorEventArgs(ex.Message, ex.InnerException, NotificationType.Error));
                 return;
             }
             catch
@@ -805,7 +805,7 @@ private void PublishRepo()
             }
             catch (SourceControlException ex)
             {
-                ViewModel_ErrorThrown(null, new ErrorEventArgs(ex.Message, ex.InnerException.Message, NotificationType.Error));
+                ViewModel_ErrorThrown(null, new ErrorEventArgs(ex.Message, ex.InnerException, NotificationType.Error));
             }
             catch
             {
@@ -876,7 +876,7 @@ private void OpenRepoAssignedToProject()
             }
             catch (SourceControlException ex)
             {
-                ViewModel_ErrorThrown(null, new ErrorEventArgs(ex.Message, ex.InnerException.Message, NotificationType.Error));
+                ViewModel_ErrorThrown(null, new ErrorEventArgs(ex.Message, ex.InnerException, NotificationType.Error));
                 Status = RubberduckUI.Offline;
 
                 _config.Repositories.Remove(_config.Repositories.FirstOrDefault(repo => repo.Id == _vbe.ActiveVBProject.HelpFile));
diff --git a/RetailCoder.VBE/UI/SourceControl/UnsyncedCommitsViewViewModel.cs b/RetailCoder.VBE/UI/SourceControl/UnsyncedCommitsViewViewModel.cs
@@ -115,7 +115,7 @@ private void FetchCommits()
             }
             catch (SourceControlException ex)
             {
-                RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);
+                RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);
             }
             catch
             {
@@ -136,7 +136,7 @@ private void PullCommits()
             }
             catch (SourceControlException ex)
             {
-                RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);
+                RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);
             }
             catch
             {
@@ -157,7 +157,7 @@ private void PushCommits()
             }
             catch (SourceControlException ex)
             {
-                RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);
+                RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);
             }
             catch
             {
@@ -179,7 +179,7 @@ private void SyncCommits()
             }
             catch (SourceControlException ex)
             {
-                RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);
+                RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);
             }
             catch
             {
@@ -226,12 +226,21 @@ public CommandBase SyncCommitsCommand
         }
 
         public event EventHandler<ErrorEventArgs> ErrorThrown;
-        private void RaiseErrorEvent(string message, string innerMessage, NotificationType notificationType)
+        private void RaiseErrorEvent(string message, Exception innerException, NotificationType notificationType)
         {
             var handler = ErrorThrown;
             if (handler != null)
             {
-                handler(this, new ErrorEventArgs(message, innerMessage, notificationType));
+                handler(this, new ErrorEventArgs(message, innerException, notificationType));
+            }
+        }
+
+        private void RaiseErrorEvent(string title, string message, NotificationType notificationType)
+        {
+            var handler = ErrorThrown;
+            if (handler != null)
+            {
+                handler(this, new ErrorEventArgs(title, message, notificationType));
             }
         }
     }
diff --git a/Rubberduck.SourceControl/SourceControlProviderBase.cs b/Rubberduck.SourceControl/SourceControlProviderBase.cs
@@ -120,8 +120,6 @@ public virtual void Checkout(string branch)
 
         public virtual void Undo(string filePath)
         {
-            var componentName = Path.GetFileNameWithoutExtension(filePath);
-
             if (File.Exists(filePath))
             {
                 var component = Project.VBComponents.OfType<VBComponent>().FirstOrDefault(f => f.Name == filePath.Split('.')[0]);
@@ -142,6 +140,7 @@ public virtual IEnumerable<IFileStatusEntry> Status()
         {
             NotifyExternalFileChanges = false;
             Project.ExportSourceFiles(CurrentRepository.LocalLocation);
+            Project.ImportDocumentTypeSourceFiles(CurrentRepository.LocalLocation);
             NotifyExternalFileChanges = true;
             return null;
         }
diff --git a/Rubberduck.VBEEditor/Extensions/VBComponentsExtensions.cs b/Rubberduck.VBEEditor/Extensions/VBComponentsExtensions.cs
@@ -47,13 +47,9 @@ public static void ImportSourceFile(this VBComponents components, string filePat
             var codeLines = codeString.Split(new []{Environment.NewLine}, StringSplitOptions.None);
             if (ext == VBComponentExtensions.DocClassExtension)
             {
-                try
-                {
-                    var component = components.Item(name);
-                    component.CodeModule.Clear();
-                    component.CodeModule.AddFromString(codeString);
-                }
-                catch (IndexOutOfRangeException) { }    // component doesn't exist
+                var component = components.Item(name);
+                component.CodeModule.Clear();
+                component.CodeModule.AddFromString(codeString);
             }
             else if (ext == VBComponentExtensions.FormExtension)
             {
diff --git a/Rubberduck.VBEEditor/Extensions/VbProjectExtensions.cs b/Rubberduck.VBEEditor/Extensions/VbProjectExtensions.cs
diff --git a/RubberduckTests/SourceControl/ChangesViewModelTests.cs b/RubberduckTests/SourceControl/ChangesViewModelTests.cs

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public string CurrentBranch`
`140`	`140`	`}`
`141`	`141`	`catch (SourceControlException ex)`
`142`	`142`	`{`
`143`		`- RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);`
	`143`	`+ RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);`
`144`	`144`	`}`
`145`	`145`	`catch`
`146`	`146`	`{`
`@@ -324,7 +324,7 @@ private void CreateBranchOk()`
`324`	`324`	`}`
`325`	`325`	`catch (SourceControlException ex)`
`326`	`326`	`{`
`327`		`- RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);`
	`327`	`+ RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);`
`328`	`328`	`}`
`329`	`329`	`catch`
`330`	`330`	`{`
`@@ -358,7 +358,7 @@ private void MergeBranchOk()`
`358`	`358`	`}`
`359`	`359`	`catch (SourceControlException ex)`
`360`	`360`	`{`
`361`		`- RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);`
	`361`	`+ RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);`
`362`	`362`	`Provider.NotifyExternalFileChanges = true;`
`363`	`363`	`Provider.HandleVbeSinkEvents = true;`
`364`	`364`	`return;`
`@@ -394,7 +394,7 @@ private void DeleteBranch(bool isBranchPublished)`
`394`	`394`	`}`
`395`	`395`	`catch (SourceControlException ex)`
`396`	`396`	`{`
`397`		`- RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);`
	`397`	`+ RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);`
`398`	`398`	`}`
`399`	`399`	`catch`
`400`	`400`	`{`
`@@ -422,7 +422,7 @@ private void PublishBranch()`
`422`	`422`	`}`
`423`	`423`	`catch (SourceControlException ex)`
`424`	`424`	`{`
`425`		`- RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);`
	`425`	`+ RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);`
`426`	`426`	`}`
`427`	`427`	`catch`
`428`	`428`	`{`
`@@ -443,7 +443,7 @@ private void UnpublishBranch()`
`443`	`443`	`}`
`444`	`444`	`catch (SourceControlException ex)`
`445`	`445`	`{`
`446`		`- RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);`
	`446`	`+ RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);`
`447`	`447`	`}`
`448`	`448`	`catch`
`449`	`449`	`{`
`@@ -531,12 +531,21 @@ public CommandBase UnpublishBranchToolbarButtonCommand`
`531`	`531`	`}`
`532`	`532`
`533`	`533`	`public event EventHandler<ErrorEventArgs> ErrorThrown;`
`534`		`- private void RaiseErrorEvent(string message, string innerMessage, NotificationType notificationType)`
	`534`	`+ private void RaiseErrorEvent(string message, Exception innerException, NotificationType notificationType)`
`535`	`535`	`{`
`536`	`536`	`var handler = ErrorThrown;`
`537`	`537`	`if (handler != null)`
`538`	`538`	`{`
`539`		`- handler(this, new ErrorEventArgs(message, innerMessage, notificationType));`
	`539`	`+ handler(this, new ErrorEventArgs(message, innerException, notificationType));`
	`540`	`+ }`
	`541`	`+ }`
	`542`	`+`
	`543`	`+ private void RaiseErrorEvent(string title, string message, NotificationType notificationType)`
	`544`	`+ {`
	`545`	`+ var handler = ErrorThrown;`
	`546`	`+ if (handler != null)`
	`547`	`+ {`
	`548`	`+ handler(this, new ErrorEventArgs(title, message, notificationType));`
`540`	`549`	`}`
`541`	`550`	`}`
`542`	`551`	`}`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ private void UndoChanges(IFileStatusEntry fileStatusEntry)`
`158`	`158`	`}`
`159`	`159`	`catch (SourceControlException ex)`
`160`	`160`	`{`
`161`		`- RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);`
	`161`	`+ RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);`
`162`	`162`	`}`
`163`	`163`	`catch`
`164`	`164`	`{`
`@@ -213,7 +213,7 @@ private void Commit()`
`213`	`213`	`}`
`214`	`214`	`catch (SourceControlException ex)`
`215`	`215`	`{`
`216`		`- RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);`
	`216`	`+ RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);`
`217`	`217`	`}`
`218`	`218`	`catch`
`219`	`219`	`{`
`@@ -274,12 +274,21 @@ public CommandBase IncludeChangesToolbarButtonCommand`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`public event EventHandler<ErrorEventArgs> ErrorThrown;`
`277`		`- private void RaiseErrorEvent(string message, string innerMessage, NotificationType notificationType)`
	`277`	`+ private void RaiseErrorEvent(string message, Exception innerException, NotificationType notificationType)`
`278`	`278`	`{`
`279`	`279`	`var handler = ErrorThrown;`
`280`	`280`	`if (handler != null)`
`281`	`281`	`{`
`282`		`- handler(this, new ErrorEventArgs(message, innerMessage, notificationType));`
	`282`	`+ handler(this, new ErrorEventArgs(message, innerException, notificationType));`
	`283`	`+ }`
	`284`	`+ }`
	`285`	`+`
	`286`	`+ private void RaiseErrorEvent(string title, string message, NotificationType notificationType)`
	`287`	`+ {`
	`288`	`+ var handler = ErrorThrown;`
	`289`	`+ if (handler != null)`
	`290`	`+ {`
	`291`	`+ handler(this, new ErrorEventArgs(title, message, notificationType));`
`283`	`292`	`}`
`284`	`293`	`}`
`285`	`294`	`}`
Original file line number	Diff line number	Diff line change
`@@ -241,12 +241,21 @@ public CommandBase ShowGitAttributesCommand`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`public event EventHandler<ErrorEventArgs> ErrorThrown;`
`244`		`- private void RaiseErrorEvent(string message, string innerMessage, NotificationType notificationType)`
	`244`	`+ private void RaiseErrorEvent(string message, Exception innerException, NotificationType notificationType)`
`245`	`245`	`{`
`246`	`246`	`var handler = ErrorThrown;`
`247`	`247`	`if (handler != null)`
`248`	`248`	`{`
`249`		`- handler(this, new ErrorEventArgs(message, innerMessage, notificationType));`
	`249`	`+ handler(this, new ErrorEventArgs(message, innerException, notificationType));`
	`250`	`+ }`
	`251`	`+ }`
	`252`	`+`
	`253`	`+ private void RaiseErrorEvent(string title, string message, NotificationType notificationType)`
	`254`	`+ {`
	`255`	`+ var handler = ErrorThrown;`
	`256`	`+ if (handler != null)`
	`257`	`+ {`
	`258`	`+ handler(this, new ErrorEventArgs(title, message, notificationType));`
`250`	`259`	`}`
`251`	`260`	`}`
`252`	`261`
Original file line number	Diff line number	Diff line change
`@@ -586,9 +586,9 @@ private void ViewModel_ErrorThrown(object sender, ErrorEventArgs e)`
`586`	`586`	`}`
`587`	`587`	`else`
`588`	`588`	`{`
`589`		`- Logger.Trace("Displaying {0} with title '{1}' and message '{2}'", e.NotificationType, e.Message, e.InnerMessage);`
	`589`	`+ Logger.Trace("Displaying {0} with title '{1}' and message '{2}'", e.NotificationType, e.Title, e.InnerMessage);`
`590`	`590`
`591`		`- ErrorTitle = e.Message;`
	`591`	`+ ErrorTitle = e.Title;`
`592`	`592`	`ErrorMessage = e.InnerMessage;`
`593`	`593`
`594`	`594`	`IconMappings.TryGetValue(e.NotificationType, out _errorIcon);`
`@@ -643,7 +643,7 @@ private void InitRepo()`
`643`	`643`	`catch (SourceControlException ex)`
`644`	`644`	`{`
`645`	`645`	`ViewModel_ErrorThrown(this,`
`646`		`- new ErrorEventArgs(ex.Message, ex.InnerException.Message, NotificationType.Error));`
	`646`	`+ new ErrorEventArgs(ex.Message, ex.InnerException, NotificationType.Error));`
`647`	`647`	`}`
`648`	`648`	`catch`
`649`	`649`	`{`
`@@ -722,7 +722,7 @@ private void OpenRepo()`
`722`	`722`	`catch (SourceControlException ex)`
`723`	`723`	`{`
`724`	`724`	`_sinks.IsEnabled = true;`
`725`		`- ViewModel_ErrorThrown(null, new ErrorEventArgs(ex.Message, ex.InnerException.Message, NotificationType.Error));`
	`725`	`+ ViewModel_ErrorThrown(null, new ErrorEventArgs(ex.Message, ex.InnerException, NotificationType.Error));`
`726`	`726`	`return;`
`727`	`727`	`}`
`728`	`728`	`catch`
`@@ -769,7 +769,7 @@ private void CloneRepo(SecureCredentials credentials = null)`
`769`	`769`	`_isCloning = false;`
`770`	`770`	`}`
`771`	`771`
`772`		`- ViewModel_ErrorThrown(this, new ErrorEventArgs(ex.Message, ex.InnerException.Message, NotificationType.Error));`
	`772`	`+ ViewModel_ErrorThrown(this, new ErrorEventArgs(ex.Message, ex.InnerException, NotificationType.Error));`
`773`	`773`	`return;`
`774`	`774`	`}`
`775`	`775`	`catch`
`@@ -805,7 +805,7 @@ private void PublishRepo()`
`805`	`805`	`}`
`806`	`806`	`catch (SourceControlException ex)`
`807`	`807`	`{`
`808`		`- ViewModel_ErrorThrown(null, new ErrorEventArgs(ex.Message, ex.InnerException.Message, NotificationType.Error));`
	`808`	`+ ViewModel_ErrorThrown(null, new ErrorEventArgs(ex.Message, ex.InnerException, NotificationType.Error));`
`809`	`809`	`}`
`810`	`810`	`catch`
`811`	`811`	`{`
`@@ -876,7 +876,7 @@ private void OpenRepoAssignedToProject()`
`876`	`876`	`}`
`877`	`877`	`catch (SourceControlException ex)`
`878`	`878`	`{`
`879`		`- ViewModel_ErrorThrown(null, new ErrorEventArgs(ex.Message, ex.InnerException.Message, NotificationType.Error));`
	`879`	`+ ViewModel_ErrorThrown(null, new ErrorEventArgs(ex.Message, ex.InnerException, NotificationType.Error));`
`880`	`880`	`Status = RubberduckUI.Offline;`
`881`	`881`
`882`	`882`	`_config.Repositories.Remove(_config.Repositories.FirstOrDefault(repo => repo.Id == _vbe.ActiveVBProject.HelpFile));`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ private void FetchCommits()`
`115`	`115`	`}`
`116`	`116`	`catch (SourceControlException ex)`
`117`	`117`	`{`
`118`		`- RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);`
	`118`	`+ RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);`
`119`	`119`	`}`
`120`	`120`	`catch`
`121`	`121`	`{`
`@@ -136,7 +136,7 @@ private void PullCommits()`
`136`	`136`	`}`
`137`	`137`	`catch (SourceControlException ex)`
`138`	`138`	`{`
`139`		`- RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);`
	`139`	`+ RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);`
`140`	`140`	`}`
`141`	`141`	`catch`
`142`	`142`	`{`
`@@ -157,7 +157,7 @@ private void PushCommits()`
`157`	`157`	`}`
`158`	`158`	`catch (SourceControlException ex)`
`159`	`159`	`{`
`160`		`- RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);`
	`160`	`+ RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);`
`161`	`161`	`}`
`162`	`162`	`catch`
`163`	`163`	`{`
`@@ -179,7 +179,7 @@ private void SyncCommits()`
`179`	`179`	`}`
`180`	`180`	`catch (SourceControlException ex)`
`181`	`181`	`{`
`182`		`- RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);`
	`182`	`+ RaiseErrorEvent(ex.Message, ex.InnerException, NotificationType.Error);`
`183`	`183`	`}`
`184`	`184`	`catch`
`185`	`185`	`{`
`@@ -226,12 +226,21 @@ public CommandBase SyncCommitsCommand`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`public event EventHandler<ErrorEventArgs> ErrorThrown;`
`229`		`- private void RaiseErrorEvent(string message, string innerMessage, NotificationType notificationType)`
	`229`	`+ private void RaiseErrorEvent(string message, Exception innerException, NotificationType notificationType)`
`230`	`230`	`{`
`231`	`231`	`var handler = ErrorThrown;`
`232`	`232`	`if (handler != null)`
`233`	`233`	`{`
`234`		`- handler(this, new ErrorEventArgs(message, innerMessage, notificationType));`
	`234`	`+ handler(this, new ErrorEventArgs(message, innerException, notificationType));`
	`235`	`+ }`
	`236`	`+ }`
	`237`	`+`
	`238`	`+ private void RaiseErrorEvent(string title, string message, NotificationType notificationType)`
	`239`	`+ {`
	`240`	`+ var handler = ErrorThrown;`
	`241`	`+ if (handler != null)`
	`242`	`+ {`
	`243`	`+ handler(this, new ErrorEventArgs(title, message, notificationType));`
`235`	`244`	`}`
`236`	`245`	`}`
`237`	`246`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,6 @@ public virtual void Checkout(string branch)`
`120`	`120`
`121`	`121`	`public virtual void Undo(string filePath)`
`122`	`122`	`{`
`123`		`- var componentName = Path.GetFileNameWithoutExtension(filePath);`
`124`		`-`
`125`	`123`	`if (File.Exists(filePath))`
`126`	`124`	`{`
`127`	`125`	`var component = Project.VBComponents.OfType<VBComponent>().FirstOrDefault(f => f.Name == filePath.Split('.')[0]);`
`@@ -142,6 +140,7 @@ public virtual IEnumerable<IFileStatusEntry> Status()`
`142`	`140`	`{`
`143`	`141`	`NotifyExternalFileChanges = false;`
`144`	`142`	`Project.ExportSourceFiles(CurrentRepository.LocalLocation);`
	`143`	`+ Project.ImportDocumentTypeSourceFiles(CurrentRepository.LocalLocation);`
`145`	`144`	`NotifyExternalFileChanges = true;`
`146`	`145`	`return null;`
`147`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,13 +47,9 @@ public static void ImportSourceFile(this VBComponents components, string filePat`
`47`	`47`	`var codeLines = codeString.Split(new []{Environment.NewLine}, StringSplitOptions.None);`
`48`	`48`	`if (ext == VBComponentExtensions.DocClassExtension)`
`49`	`49`	`{`
`50`		`- try`
`51`		`- {`
`52`		`- var component = components.Item(name);`
`53`		`- component.CodeModule.Clear();`
`54`		`- component.CodeModule.AddFromString(codeString);`
`55`		`- }`
`56`		`- catch (IndexOutOfRangeException) { } // component doesn't exist`
	`50`	`+ var component = components.Item(name);`
	`51`	`+ component.CodeModule.Clear();`
	`52`	`+ component.CodeModule.AddFromString(codeString);`
`57`	`53`	`}`
`58`	`54`	`else if (ext == VBComponentExtensions.FormExtension)`
`59`	`55`	`{`