Distinct codespanrange

Author: tonyhallett

FineCodeCoverageTests/Editor/DynamicCoverage/ContainingCodeTrackedLinesBuilder_Tests.cs

@@ -753,24 +753,28 @@ public void Should_Deserialize_Dependent_Upon_AppOption_EditorCoverageColouringM
         }
 
         [Test]
-        public void Should_IFileCodeSpanRangeService_Using_Roslyn()
+        public void Should_IFileCodeSpanRangeService_Using_Roslyn_Distinct()
         {
             var mockTextSnapshot = new Mock<ITextSnapshot>();
             mockTextSnapshot.Setup(textSnaphot => textSnaphot.GetLineNumberFromPosition(1)).Returns(1);
-            mockTextSnapshot.Setup(textSnaphot => textSnaphot.GetLineNumberFromPosition(11)).Returns(5);
-            
+            mockTextSnapshot.Setup(textSnaphot => textSnaphot.GetLineNumberFromPosition(11)).Returns(1);
+            mockTextSnapshot.Setup(textSnaphot => textSnaphot.GetLineNumberFromPosition(15)).Returns(1);
+            mockTextSnapshot.Setup(textSnaphot => textSnaphot.GetLineNumberFromPosition(20)).Returns(1);
+            mockTextSnapshot.Setup(textSnaphot => textSnaphot.GetLineNumberFromPosition(30)).Returns(2);
+            mockTextSnapshot.Setup(textSnaphot => textSnaphot.GetLineNumberFromPosition(40)).Returns(3);
+
             var autoMoqer = new AutoMoqer();
             var mockRoslynService = autoMoqer.GetMock<IRoslynService>();
             mockRoslynService.Setup(roslynService => roslynService.GetContainingCodeSpansAsync(mockTextSnapshot.Object))
-                    .ReturnsAsync(new List<TextSpan> { new TextSpan(1, 10) });
+                    .ReturnsAsync(new List<TextSpan> { new TextSpan(1, 10), new TextSpan(15,5),new TextSpan(30,10) });
 
             autoMoqer.SetInstance<IThreadHelper>(new TestThreadHelper());
 
             var containingCodeTrackedLinesBuilder = autoMoqer.Create<ContainingCodeTrackedLinesBuilder>();
 
             var fileCodeSpanRanges = containingCodeTrackedLinesBuilder.GetFileCodeSpanRanges(mockTextSnapshot.Object);
-
-            Assert.That(fileCodeSpanRanges.Single().Equals(new CodeSpanRange(1, 5)));
+            
+            Assert.That(fileCodeSpanRanges, Is.EqualTo(new List<CodeSpanRange> { CodeSpanRange.SingleLine(1), new CodeSpanRange(2, 3) }));
         }
     }
 }

SharedProject/Editor/DynamicCoverage/TrackedLinesImpl/Construction/ContainingCodeTrackedLinesBuilder.cs

@@ -108,7 +108,7 @@ private List<IContainingCodeTracker> CreateRoslynContainingCodeTrackers(List<ILi
             void CreateSingleLineContainingCodeTrackerInCase(ILine line)
                 => containingCodeTrackers.Add(this.CreateSingleLineContainingCodeTracker(textSnapshot, line));
 
-            List<TextSpan> roslynContainingCodeSpans = this.threadHelper.JoinableTaskFactory.Run(() => this.roslynService.GetContainingCodeSpansAsync(textSnapshot));
+            List<CodeSpanRange> codeSpanRanges = this.GetRoslynCodeSpanRanges(textSnapshot);
             int currentCodeSpanIndex = -1;
             CodeSpanRange currentCodeSpanRange = null;
             SetNextCodeSpanRange();
@@ -118,13 +118,9 @@ void SetNextCodeSpanRange()
             {
                 currentCodeSpanIndex++;
                 CodeSpanRange previousCodeSpanRange = currentCodeSpanRange;
-                currentCodeSpanRange = currentCodeSpanIndex < roslynContainingCodeSpans.Count
-                    ? this.GetCodeSpanRange(roslynContainingCodeSpans[currentCodeSpanIndex], textSnapshot)
+                currentCodeSpanRange = currentCodeSpanIndex < codeSpanRanges.Count
+                    ? codeSpanRanges[currentCodeSpanIndex]
                     : null;
-                if (currentCodeSpanRange != null && previousCodeSpanRange != null && previousCodeSpanRange.Equals(currentCodeSpanRange))
-                {
-                    SetNextCodeSpanRange();
-                }
             }
 
             void TrackOtherLines()
@@ -230,7 +226,7 @@ private List<ILine> AdjustCoverageLines(List<DynamicLine> dynamicLines)
         private List<CodeSpanRange> GetRoslynCodeSpanRanges(ITextSnapshot currentSnapshot)
         {
             List<TextSpan> roslynContainingCodeSpans = this.threadHelper.JoinableTaskFactory.Run(() => this.roslynService.GetContainingCodeSpansAsync(currentSnapshot));
-            return roslynContainingCodeSpans.Select(roslynCodeSpan => this.GetCodeSpanRange(roslynCodeSpan, currentSnapshot)).ToList();
+            return roslynContainingCodeSpans.Select(roslynCodeSpan => this.GetCodeSpanRange(roslynCodeSpan, currentSnapshot)).Distinct().ToList();
         }
 
         private List<IContainingCodeTracker> RecreateContainingCodeTrackersWithUnchangedCodeSpanRange(