vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

errors: column index tweaks for emacs/vim

pull/4279/head
Delyan Angelov 2020-04-06 23:15:38 +03:00
parent 7b41eaf136
commit 8da12eb8a7
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vlib/v/util/errors.v
View File

@ -54,20 +54,17 @@ pub fn formated_error(kind string /*error or warn*/, emsg string, filepath strin
} }
} }
// //
mut column := 0
mut source_context := '' mut source_context := ''
source := util.read_file(filepath) or { '' } source := util.read_file(filepath) or { '' }
source_lines := source.split_into_lines() source_lines := source.split_into_lines()
if source.len > pos.pos { mut p := util.imax(0, util.imin(source.len -1, pos.pos))
mut p := pos.pos
for ; p>=0; p-- { for ; p>=0; p-- {
if source[p] == `\r` || source[p] == `\n` { if source[p] == `\r` || source[p] == `\n` {
break break
} }
} }
column = util.imax(0, pos.pos - p - 1) column := util.imax(0, pos.pos - p - 1)
} position := '${path}:${pos.line_nr+1}:${util.imax(1,column+1)}:'
position := '${path}:${pos.line_nr+1}:$column:'
// //
bline := util.imax(0, pos.line_nr - error_context_before) bline := util.imax(0, pos.line_nr - error_context_before)
aline := util.imin(source_lines.len-1, pos.line_nr + error_context_after) aline := util.imin(source_lines.len-1, pos.line_nr + error_context_after)