Merge pull request #8 from chaitanyagurrapu/lastLine

Modify Extensions so that when the last line is empty, the 'GetLastLi…

Author: jaredpar

Src/EditorUtils/Extensions.cs

@@ -41,6 +41,16 @@ public static ITextSnapshotLine GetStartLine(this SnapshotSpan span)
         /// </summary>
         public static ITextSnapshotLine GetLastLine(this SnapshotSpan span)
         {
+           var snapshot = span.Snapshot;
+            var snapshotEndPoint = new SnapshotPoint(snapshot, snapshot.Length);
+            if (snapshotEndPoint == span.End)
+            {
+                var line = span.End.GetContainingLine();
+                if (line.Length == 0)
+                {
+                    return line;
+                }
+            }
             return span.Length > 0
                 ? span.End.Subtract(1).GetContainingLine()
                 : GetStartLine(span);

Test/EditorUtilsTest/ExtensionsTest.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.VisualStudio.Text.Projection;
+using System.Linq;
 using Microsoft.VisualStudio.Utilities;
 using Xunit;
 
@@ -80,5 +78,26 @@ public void TryGetPropertySafe_WrongType()
             string value;
             Assert.False(col.TryGetPropertySafe(key, out value));
         }
+
+        [Fact]
+        public void GetLastLine_WithNonEmptyLastLine_ReturnsCorrectLastLine()
+        {
+            var textBuffer = CreateTextBuffer("hello","World", "Foo");
+            var lastLine = textBuffer.GetSpan(0, textBuffer.CurrentSnapshot.Length).GetLastLine();
+
+            Assert.True(lastLine.LineNumber == 2);
+        }
+
+        [Fact]
+        public void GetLastLine_WithEmptyLastLine_ReturnsCorrectLastLine()
+        {
+            var textBuffer = CreateTextBuffer("hello","World", "");
+            var lastLine = textBuffer.GetSpan(0, textBuffer.CurrentSnapshot.Length).GetLastLine();
+
+            Assert.True(lastLine.LineNumber == 2);
+        }
+
+
+
     }
 }