DafnyExtension: fixed bad merge

1 files changed, 5 insertions, 4 deletions

diff --git a/Util/VS2010/DafnyExtension/DafnyExtension/ProgressMargin.cs b/Util/VS2010/DafnyExtension/DafnyExtension/ProgressMargin.cs
index 648dc6fe..16ed18f4 100644
--- a/Util/VS2010/DafnyExtension/DafnyExtension/ProgressMargin.cs
+++ b/Util/VS2010/DafnyExtension/DafnyExtension/ProgressMargin.cs
@@ -197,10 +197,11 @@ namespace DafnyLanguage
           newErrors.Add(new DafnyError(aux.Tok.line - 1, aux.Tok.col - 1, ErrorCategory.AuxInformation, aux.Msg));

         }

       });

-          if (!success) {

-            newErrors.Clear();

-            newErrors.Add(new DafnyError(0, 0, ErrorCategory.InternalError, "verification process error"));

-          }

+      errorListHolder.PopulateErrorList(newErrors, true, snapshot);

+      if (!success) {

+        newErrors.Clear();

+        newErrors.Add(new DafnyError(0, 0, ErrorCategory.InternalError, "verification process error"));

+      }

 

       lock (this) {

         bufferChangesPreVerificationStart.Clear();