diff options
| -rw-r--r-- | pretty_errors.lua | 13 | ||||
| -rw-r--r-- | pretty_errors.moon | 17 |
2 files changed, 14 insertions, 16 deletions
diff --git a/pretty_errors.lua b/pretty_errors.lua index 6a248d1..ecc6cd2 100644 --- a/pretty_errors.lua +++ b/pretty_errors.lua @@ -19,13 +19,8 @@ format_error = function(err) local err_size = math.min((err.stop - err.start), (#err_line - err_linepos) + 1) local nl_indicator = (err_linepos > #err_line) and " " or "" local fmt_str = " %" .. tostring(#tostring(err_linenum + context)) .. "d|" - local pointer - if err_size >= 2 then - pointer = (" "):rep(err_linepos + #fmt_str:format(0) - 1) .. "╚" .. tostring(("═"):rep(err_size - 2)) .. "╝" - else - pointer = (" "):rep(err_linepos + #fmt_str:format(0) - 1) .. "⬆" - end - local err_msg = "\027[33;41;1m" .. tostring(err.title or "Error") .. " at " .. tostring(err.filename or '???') .. ":" .. tostring(err_linenum) .. "," .. tostring(err_linepos) .. "\027[0m" + local pointer = (" "):rep(err_linepos + #fmt_str:format(0) - 1) .. ("^"):rep(err_size) + local err_msg = "\027[31;1m" .. tostring(err.title or "Error") .. " at " .. tostring(err.filename or '???') .. ":" .. tostring(err_linenum) .. "," .. tostring(err_linepos) .. "\027[0m" local lines = err.source:lines() for i = err_linenum - context, err_linenum - 1 do do @@ -66,9 +61,9 @@ format_error = function(err) end end local box_width = 70 - local err_text = "\027[47;31;1m" .. tostring(" " .. err.error:wrapped_to(box_width, 16):gsub("\n", "\n\027[47;31;1m ")) + local err_text = "\027[47;30;1m" .. tostring(" " .. err.error:wrapped_to(box_width, 16):gsub("\n", "\n\027[47;30;1m ")) if err.hint then - err_text = err_text .. "\n\027[47;30m" .. tostring((" Suggestion: " .. tostring(err.hint)):wrapped_to(box_width, 16):gsub("\n", "\n\027[47;30m ")) + err_text = err_text .. "\n\027[47;30;3m" .. tostring((" Suggestion: " .. tostring(err.hint)):wrapped_to(box_width, 16):gsub("\n", "\n\027[47;30;3m ")) end err_msg = err_msg .. ("\n\027[33;1m " .. box(err_text):gsub("\n", "\n ")) for i = err_linenum_end + 1, err_linenum_end + context do diff --git a/pretty_errors.moon b/pretty_errors.moon index 6b0d561..bb8f63f 100644 --- a/pretty_errors.moon +++ b/pretty_errors.moon @@ -19,11 +19,14 @@ format_error = (err)-> err_size = math.min((err.stop - err.start), (#err_line-err_linepos) + 1) nl_indicator = (err_linepos > #err_line) and " " or "" fmt_str = " %#{#tostring(err_linenum+context)}d|" - pointer = if err_size >= 2 - (" ")\rep(err_linepos+#fmt_str\format(0)-1).."╚#{("═")\rep(err_size-2)}╝" - else - (" ")\rep(err_linepos+#fmt_str\format(0)-1).."⬆" - err_msg = "\027[33;41;1m#{err.title or "Error"} at #{err.filename or '???'}:#{err_linenum},#{err_linepos}\027[0m" + + pointer = (" ")\rep(err_linepos+#fmt_str\format(0)-1)..("^")\rep(err_size) + --pointer = if err_size >= 2 + -- (" ")\rep(err_linepos+#fmt_str\format(0)-1).."╚#{("═")\rep(err_size-2)}╝" + --else + -- (" ")\rep(err_linepos+#fmt_str\format(0)-1).."⬆" + + err_msg = "\027[31;1m#{err.title or "Error"} at #{err.filename or '???'}:#{err_linenum},#{err_linepos}\027[0m" lines = err.source\lines! for i=err_linenum-context,err_linenum-1 if line = lines[i] @@ -51,9 +54,9 @@ format_error = (err)-> break box_width = 70 - err_text = "\027[47;31;1m#{" "..err.error\wrapped_to(box_width, 16)\gsub("\n", "\n\027[47;31;1m ")}" + err_text = "\027[47;30;1m#{" "..err.error\wrapped_to(box_width, 16)\gsub("\n", "\n\027[47;30;1m ")}" if err.hint - err_text ..= "\n\027[47;30m#{(" Suggestion: #{err.hint}")\wrapped_to(box_width, 16)\gsub("\n", "\n\027[47;30m ")}" + err_text ..= "\n\027[47;30;3m#{(" Suggestion: #{err.hint}")\wrapped_to(box_width, 16)\gsub("\n", "\n\027[47;30;3m ")}" err_msg ..= "\n\027[33;1m "..box(err_text)\gsub("\n", "\n ") for i=err_linenum_end+1,err_linenum_end+context |