ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 15:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve truncated verbose line error

Browse Source
This commit is contained in:
gingerBill
2023-02-22 22:57:11 +00:00
parent 6226c2978d
commit 245a6697ef
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/error.cpp
+5 -2
View File
@@ -268,6 +268,8 @@ gb_internal bool show_error_on_line(TokenPos const &pos, TokenPos end) {
terminal_set_colours(TerminalStyle_Bold, TerminalColour_White); terminal_set_colours(TerminalStyle_Bold, TerminalColour_White);
isize squiggle_extra = 0;
if (line.len+MAX_TAB_WIDTH+ELLIPSIS_PADDING > MAX_LINE_LENGTH) { if (line.len+MAX_TAB_WIDTH+ELLIPSIS_PADDING > MAX_LINE_LENGTH) {
i32 const half_width = MAX_LINE_LENGTH/2; i32 const half_width = MAX_LINE_LENGTH/2;
i32 left = cast(i32)(offset); i32 left = cast(i32)(offset);
@@ -280,6 +282,7 @@ gb_internal bool show_error_on_line(TokenPos const &pos, TokenPos end) {
line = string_trim_whitespace(line); line = string_trim_whitespace(line);
squiggle_extra = ELLIPSIS_PADDING/2 + 1;
offset = left + ELLIPSIS_PADDING/2; offset = left + ELLIPSIS_PADDING/2;
error_out("... %.*s ...", LIT(line)); error_out("... %.*s ...", LIT(line));
@@ -302,10 +305,10 @@ gb_internal bool show_error_on_line(TokenPos const &pos, TokenPos end) {
} }
} else if (end.line == pos.line && end.column > pos.column) { } else if (end.line == pos.line && end.column > pos.column) {
i32 length = gb_min(end.offset - pos.offset, cast(i32)(line.len-offset)); i32 length = gb_min(end.offset - pos.offset, cast(i32)(line.len-offset));
for (i32 i = 1; i < length-1; i++) { for (i32 i = 1; i < length-1+squiggle_extra; i++) {
error_out("~"); error_out("~");
} }
if (length > 1) { if (length > 1 && squiggle_extra == 0) {
error_out("^"); error_out("^");
} }
} }