From 5102ad28d88436e06540e455a31d3de504b7328b Mon Sep 17 00:00:00 2001
From: wuestholz <unknown>
Date: Fri, 7 Jun 2013 11:15:00 -0700
Subject: DafnyExtension: Fixed an issue (InvalidOperationException).

---
 Source/DafnyExtension/ProgressMargin.cs | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

(limited to 'Source/DafnyExtension/ProgressMargin.cs')

diff --git a/Source/DafnyExtension/ProgressMargin.cs b/Source/DafnyExtension/ProgressMargin.cs
index 1705e3ed..0a83bcc0 100644
--- a/Source/DafnyExtension/ProgressMargin.cs
+++ b/Source/DafnyExtension/ProgressMargin.cs
@@ -1,23 +1,21 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.Diagnostics.Contracts;
+using System.Linq;
 using System.Threading;
-using System.Windows.Threading;
 using System.Windows;
-using System.Windows.Shapes;
 using System.Windows.Media;
-using System.Windows.Controls;
-using System.ComponentModel.Composition;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Formatting;
 using Microsoft.VisualStudio.Text.Tagging;
-using Microsoft.VisualStudio.Text.Classification;
-using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Utilities;
-using System.Diagnostics.Contracts;
 using Dafny = Microsoft.Dafny;
-using Bpl = Microsoft.Boogie;
 
 
 namespace DafnyLanguage
@@ -315,24 +313,14 @@ namespace DafnyLanguage
       }
 
       // If the requested snapshot isn't the same as the one our words are on, translate our spans to the expected snapshot
-      NormalizedSnapshotSpanCollection chs;
-      chs = new NormalizedSnapshotSpanCollection(Map(pre, span => span.TranslateTo(targetSnapshot, SpanTrackingMode.EdgeExclusive)));
+      var chs = new NormalizedSnapshotSpanCollection(pre.Select(span => span.TranslateTo(targetSnapshot, SpanTrackingMode.EdgeExclusive)));      
       foreach (SnapshotSpan span in NormalizedSnapshotSpanCollection.Overlap(spans, chs)) {
         yield return new TagSpan<ProgressGlyphTag>(span, new ProgressGlyphTag(0));
       }
-      chs = new NormalizedSnapshotSpanCollection(Map(post, span => span.TranslateTo(targetSnapshot, SpanTrackingMode.EdgeExclusive)));
+      chs = new NormalizedSnapshotSpanCollection(post.Select(span => span.TranslateTo(targetSnapshot, SpanTrackingMode.EdgeExclusive)));
       foreach (SnapshotSpan span in NormalizedSnapshotSpanCollection.Overlap(spans, chs)) {
         yield return new TagSpan<ProgressGlyphTag>(span, new ProgressGlyphTag(1));
       }
     }
-
-    /// <summary>
-    /// (Why the firetruck isn't an extension method like this already in the standard library?)
-    /// </summary>
-    public static IEnumerable<TOut> Map<TIn, TOut>(IEnumerable<TIn> coll, System.Func<TIn, TOut> fn) {
-      foreach (var e in coll) {
-        yield return fn(e);
-      }
-    }
   }
 }
-- 
cgit v1.2.3