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

errors: disambiguate between variable and fn source_context

pull/4639/head
Delyan Angelov 2020-04-28 16:20:50 +03:00
parent 7924b4d77c
commit 8a81aa5c93
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,6 @@ pub fn formatted_error(kind, emsg, filepath string, pos token.Position) string {
} }
} }
// //
mut source_context := ''
source := read_file(filepath) or { source := read_file(filepath) or {
'' ''
} }
@ -71,7 +70,7 @@ pub fn formatted_error(kind, emsg, filepath string, pos token.Position) string {
} }
column := imax(0, pos.pos - p - 1) column := imax(0, pos.pos - p - 1)
position := '${path}:${pos.line_nr+1}:${util.imax(1,column+1)}:' position := '${path}:${pos.line_nr+1}:${util.imax(1,column+1)}:'
source_context += source_context(source, column, pos).join('\n') scontext := source_context(source, column, pos).join('\n')
final_position := if emanager.support_color { term.bold(position) } else { position } final_position := if emanager.support_color { term.bold(position) } else { position }
mut final_kind := kind mut final_kind := kind
if emanager.support_color { if emanager.support_color {
@ -82,7 +81,7 @@ pub fn formatted_error(kind, emsg, filepath string, pos token.Position) string {
} }
} }
final_msg := emsg // if emanager.support_color { term.bold(emsg) } else { emsg } final_msg := emsg // if emanager.support_color { term.bold(emsg) } else { emsg }
final_context := if source_context.len > 0 { '\n$source_context' } else { '' } final_context := if scontext.len > 0 { '\n$scontext' } else { '' }
// //
return '$final_position $final_kind $final_msg $final_context'.trim_space() return '$final_position $final_kind $final_msg $final_context'.trim_space()
} }