Merge pull request #3398 from bclothier/next

TokenExtensions hotfix

Author: retailcoder

Rubberduck.Parsing/TokenExtensions.cs

@@ -15,9 +15,13 @@ public static class TokenExtensions
         /// <returns>Zero-based column position</returns>
         public static int EndColumn(this IToken token)
         {
-            if (token.Text.Contains(Environment.NewLine))
+            if (token.Text == Environment.NewLine)
             {
-                var splitStrings = token.Text.Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
+                return token.Column;
+            }
+            else if (token.Text.Contains(Environment.NewLine))
+            {
+                var splitStrings = token.Text.Split(new string[] { Environment.NewLine }, StringSplitOptions.None);
                 var lastOccupiedLine = splitStrings[splitStrings.Length - 1];
 
                 return lastOccupiedLine.Length;
@@ -37,9 +41,9 @@ public static int EndColumn(this IToken token)
         /// <returns>One-based line position</returns>
         public static int EndLine(this IToken token)
         {
-            if (token.Text.Contains(Environment.NewLine))
+            if (token.Text != Environment.NewLine && token.Text.Contains(Environment.NewLine))
             {
-                var splitStrings = token.Text.Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
+                var splitStrings = token.Text.Split(new string[] { Environment.NewLine }, StringSplitOptions.None);
 
                 return token.Line + (splitStrings.Length - 1);
             }

RubberduckTests/Grammar/SelectionExtensionsTests.cs

@@ -2,6 +2,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.Grammar;
+using Rubberduck.Parsing.Symbols;
 using static Rubberduck.Parsing.Grammar.VBAParser;
 using Rubberduck.VBEditor;
 using RubberduckTests.Mocks;
@@ -637,5 +638,103 @@ End If
             Assert.IsFalse(selection.Contains(contexts.ElementAt(1)));  // first outer if block
             Assert.IsTrue(selection.Contains(contexts.ElementAt(2)));   // second outer If block
         }
+
+        [TestMethod]
+        [TestCategory("Grammar")]
+        [TestCategory("Selection")]
+        public void GivenOnlyBlankLines_EndColumn_Works()
+        {
+            const string inputCode = @"
+
+
+
+";
+
+            var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component);
+            var pane = component.CodeModule.CodePane;
+            var state = MockParser.CreateAndParse(vbe.Object);
+
+
+            var tree = (Antlr4.Runtime.ParserRuleContext)state.GetParseTree(new QualifiedModuleName(component));
+            var startToken = tree.Start;
+            var endToken = tree.Stop;
+
+            // Reminder: token columns are zero-based but lines are one-based
+            Assert.IsTrue(startToken.EndColumn() == 0);
+            Assert.IsTrue(endToken.EndColumn() == 0);
+        }
+
+        [TestMethod]
+        [TestCategory("Grammar")]
+        [TestCategory("Selection")]
+        public void GivenOnlyBlankLines_EndLine_Works()
+        {
+            const string inputCode = @"
+
+
+
+";
+
+            var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component);
+            var pane = component.CodeModule.CodePane;
+            var state = MockParser.CreateAndParse(vbe.Object);
+
+
+            var tree = (Antlr4.Runtime.ParserRuleContext)state.GetParseTree(new QualifiedModuleName(component));
+            var startToken = tree.Start;
+            var endToken = tree.Stop;
+
+            // Reminder: token columns are zero-based but lines are one-based
+            Assert.IsTrue(startToken.EndLine() == 1);
+            Assert.IsTrue(endToken.EndLine() == 4);
+        }
+
+        [TestMethod]
+        [TestCategory("Grammar")]
+        [TestCategory("Selection")]
+        public void GivenBlankLinesWithLeadingSpaces_EndColumn_Works()
+        {
+            const string inputCode = @"
+
+   
+";
+
+            var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component);
+            var pane = component.CodeModule.CodePane;
+            var state = MockParser.CreateAndParse(vbe.Object);
+
+
+            var tree = (Antlr4.Runtime.ParserRuleContext)state.GetParseTree(new QualifiedModuleName(component));
+            var startToken = tree.Start;
+            var endToken = tree.Stop;
+
+            // Reminder: token columns are zero-based but lines are one-based
+            Assert.IsTrue(startToken.EndColumn() == 0);
+            Assert.IsTrue(endToken.EndColumn() == 3);
+        }
+
+        [TestMethod]
+        [TestCategory("Grammar")]
+        [TestCategory("Selection")]
+        public void GivenBlankLinesWithLeadingSpaces_EndLine_Works()
+        {
+            const string inputCode = @"
+
+   
+";
+
+            var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component);
+            var pane = component.CodeModule.CodePane;
+            var state = MockParser.CreateAndParse(vbe.Object);
+
+
+            var tree = (Antlr4.Runtime.ParserRuleContext)state.GetParseTree(new QualifiedModuleName(component));
+            var startToken = tree.Start;
+            var endToken = tree.Stop;
+
+            // Reminder: token columns are zero-based but lines are one-based
+            Assert.IsTrue(startToken.EndLine() == 1);
+            Assert.IsTrue(endToken.EndLine() == 3);
+        }
     }
 }