Skip to content

Commit ed91d65

Browse files
committed
Ignore EOF tokens in EndColumn and count lines correctly
1 parent e8048cd commit ed91d65

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

Rubberduck.Parsing/TokenExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public static class TokenExtensions
1515
/// <returns>Zero-based column position</returns>
1616
public static int EndColumn(this IToken token)
1717
{
18-
if (token.Text == Environment.NewLine)
18+
if (token.Text == Environment.NewLine || token.Type == TokenConstants.Eof)
1919
{
2020
return token.Column;
2121
}

RubberduckTests/Grammar/SelectionExtensionsTests.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,6 @@ public void GivenOnlyBlankLines_EndLine_Works()
710710
const string inputCode = @"
711711
712712
713-
714713
";
715714

716715
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component);
@@ -736,8 +735,7 @@ public void GivenBlankLinesWithLeadingSpaces_EndColumn_Works()
736735
{
737736
const string inputCode = @"
738737
739-
740-
";
738+
";
741739

742740
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component);
743741
var pane = component.CodeModule.CodePane;
@@ -762,8 +760,7 @@ public void GivenBlankLinesWithLeadingSpaces_EndLine_Works()
762760
{
763761
const string inputCode = @"
764762
765-
766-
";
763+
";
767764

768765
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component);
769766
var pane = component.CodeModule.CodePane;

0 commit comments

Comments
 (0)