From e5faebfb048135e7bed2f569c290a0e4bbd26841 Mon Sep 17 00:00:00 2001
From: Rustan Leino <leino@microsoft.com>
Date: Fri, 17 Aug 2012 23:48:19 -0700
Subject: DafnyExtension: fixed bad merge

---
 Util/VS2010/DafnyExtension/DafnyExtension/ProgressMargin.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'Util')

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();
-- 
cgit v1.2.3