From ca481dc52d86a6856abba7481bc849a864f0183d Mon Sep 17 00:00:00 2001
From: Feoramund <161657516+Feoramund@users.noreply.github.com>
Date: Fri, 14 Jun 2024 11:51:03 -0400
Subject: Fix displaying error on wrong line with token at EOL

Previously, this would get a token on text like "\n*\n" where `*`
is the token's position, and it would advance off that line.
---
 src/parser.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/parser.cpp')

diff --git a/src/parser.cpp b/src/parser.cpp
index 0cd96f5b5..468f4749f 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -51,6 +51,12 @@ gb_internal gbString get_file_line_as_string(TokenPos const &pos, i32 *offset_)
 
 	u8 *line_start = pos_offset;
 	u8 *line_end  = pos_offset;
+
+	if (offset > 0 && *line_start == '\n') {
+		// Prevent an error token that starts at the boundary of a line that
+		// leads to an empty line from advancing off its line.
+		line_start -= 1;
+	}
 	while (line_start >= start) {
 		if (*line_start == '\n') {
 			line_start += 1;
-- 
cgit v1.2.3


From 8626d38db10f134f97ea36d34ceda072a137e779 Mon Sep 17 00:00:00 2001
From: Feoramund <161657516+Feoramund@users.noreply.github.com>
Date: Fri, 14 Jun 2024 13:02:54 -0400
Subject: Fix displaying emptiness when error is on first line

---
 src/parser.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/parser.cpp')

diff --git a/src/parser.cpp b/src/parser.cpp
index 468f4749f..2f764c753 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -64,6 +64,11 @@ gb_internal gbString get_file_line_as_string(TokenPos const &pos, i32 *offset_)
 		}
 		line_start -= 1;
 	}
+	if (line_start == start - 1) {
+		// Prevent an error on the first line from stepping behind the boundary
+		// of the text.
+		line_start += 1;
+	}
 
 	while (line_end < end) {
 		if (*line_end == '\n') {
-- 
cgit v1.2.3