parser: fix Line method that always return non-empty line

In case of content end without new line, for example "a\nb", the Line()
method always return "b, 0" on the last line.

2 files changed, 45 insertions, 0 deletions

diff --git a/lib/parser/parser.go b/lib/parser/parser.go
index cebf033a..33897ba7 100644
--- a/lib/parser/parser.go
+++ b/lib/parser/parser.go
@@ -175,6 +175,7 @@ func (p *Parser) Line() (string, rune) {
 		}
 		p.token = append(p.token, r)
 	}
+	p.x = len(p.v)
 	return string(p.token), 0
 }
 
diff --git a/lib/parser/parser_test.go b/lib/parser/parser_test.go
index cdb66b4f..35477717 100644
--- a/lib/parser/parser_test.go
+++ b/lib/parser/parser_test.go
@@ -34,6 +34,50 @@ func TestParser_AddDelimiters(t *testing.T) {
 	}
 }
 
+type expLine struct {
+	line string
+	c    rune
+}
+
+func TestParser_Line(t *testing.T) {
+	p := New("", "\n")
+
+	cases := []struct {
+		content string
+		exp     []expLine
+	}{{
+		content: ``,
+		exp:     []expLine{{}},
+	}, {
+		content: `a
+`,
+		exp: []expLine{
+			{"a", '\n'},
+			{"", 0},
+		},
+	}, {
+		content: `a
+
+b`,
+		exp: []expLine{
+			{"a", '\n'},
+			{"", '\n'},
+			{"b", 0},
+			{"", 0},
+		},
+	}}
+
+	for _, c := range cases {
+		p.Load(c.content, "\n")
+
+		for x := 0; x < len(c.exp); x++ {
+			gotLine, gotC := p.Line()
+			test.Assert(t, "", c.exp[x].line, gotLine, true)
+			test.Assert(t, "", c.exp[x].c, gotC, true)
+		}
+	}
+}
+
 func TestParser_Lines(t *testing.T) {
 	cases := []struct {
 		desc    string