xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the lint_errors a range-specs option in lint.kak

Browse Source 
lint_errors are now maintained up to date with buffer changes.
This commit is contained in:
Maxime Coste 2017-05-25 19:31:56 +01:00
parent 26298e8f7b
commit f2f04d55fc
1 changed files with 52 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
rc/base/lint.kak
View File

@ -4,7 +4,7 @@ The output returned by this command is expected to comply with the following for
str lintcmd str lintcmd
decl -hidden line-specs lint_flags decl -hidden line-specs lint_flags
decl -hidden str lint_errors decl -hidden range-specs lint_errors
def lint -docstring 'Parse the current buffer with a linter' %{ def lint -docstring 'Parse the current buffer with a linter' %{
%sh{ %sh{
@ -42,16 +42,16 @@ def lint -docstring 'Parse the current buffer with a linter' %{
} }
} }
/:[0-9]+:[0-9]+:/ { /:[0-9]+:[0-9]+:/ {
errors = errors $2 "," $3 "," substr($4,2) ":" errors = errors ":" $2 "." $3 "," $2 "." $3 "|" substr($4,2)
# fix case where $5 is not the last field because of extra :s in the message # fix case where $5 is not the last field because of extra :s in the message
for (i=5; i<=NF; i++) errors = errors $i ":" for (i=5; i<=NF; i++) errors = errors "\\:" $i
errors = substr(errors, 1, length(errors)-1) " (col " $3 ")\n" errors = substr(errors, 1, length(errors)-1) " (col " $3 ")"
} }
END { END {
print "set \"buffer=" file "\" lint_flags %{" stamp ":" substr(flags, 1, length(flags)-1) "}" print "set \"buffer=" file "\" lint_flags %{" stamp ":" substr(flags, 1, length(flags)-1) "}"
errors = substr(errors, 1, length(errors)-1) errors = substr(errors, 1, length(errors)-1)
gsub("~", "\\~", errors) gsub("~", "\\~", errors)
print "set \"buffer=" file "\" lint_errors %~" errors "~" print "set \"buffer=" file "\" lint_errors %~" stamp errors "~"
} }
' "$dir"/stderr | kak -p "$kak_session" ' "$dir"/stderr | kak -p "$kak_session"
@ -61,12 +61,15 @@ def lint -docstring 'Parse the current buffer with a linter' %{
} }
} }
def -hidden lint-show %{ %sh{ def -hidden lint-show %{
desc=$(printf '%s\n' "$kak_opt_lint_errors" | sed -ne "/^$kak_cursor_line,.*/ { s/^[[:digit:]]*,[[:digit:]]*,//g; s/'/\\\\'/g; p; }") update-option buffer lint_errors
%sh{
desc=$(printf '%s\n' "$kak_opt_lint_errors" | sed -e 's/\([^\\]\):/\1\n/g' | tail -n +2 |
sed -ne "/^$kak_cursor_line\.[^|]\+|.*/ { s/^[^|]\+|//g; s/'/\\\\'/g; s/\\\\:/:/g; p; }")
if [ -n "$desc" ]; then if [ -n "$desc" ]; then
printf '%s\n' "info -anchor $kak_cursor_line.$kak_cursor_column '$desc'" printf '%s\n' "info -anchor $kak_cursor_line.$kak_cursor_column '$desc'"
fi fi
}} } }
def lint-enable -docstring "Activate automatic diagnostics of the code" %{ def lint-enable -docstring "Activate automatic diagnostics of the code" %{
add-highlighter flag_lines default lint_flags add-highlighter flag_lines default lint_flags
@ -78,48 +81,44 @@ def lint-disable -docstring "Disable automatic diagnostics of the code" %{
remove-hooks window lint-diagnostics remove-hooks window lint-diagnostics
} }
def lint-next -docstring "Jump to the next line that contains an error" %{ %sh{ def lint-next -docstring "Jump to the next line that contains an error" %{
printf '%s\n' "$kak_opt_lint_errors" | { update-option buffer lint_errors
while read -r line %sh{
printf '%s\n' "$kak_opt_lint_errors" | sed -e 's/\([^\\]\):/\1\n/g' | tail -n +2 | {
while IFS='|' read -r candidate rest
do do
# get line,column pair first_range=${first_range-$candidate}
coords=$(printf %s "$line" | cut -d, -f1,2) if [ "${candidate%%.*}" -gt "$kak_cursor_line" ]; then
candidate="${coords%,*}" range=$candidate
if [ "$candidate" -gt "$kak_cursor_line" ]
then
break break
fi fi
done done
if [ "$candidate" -gt "$kak_cursor_line" ] range=${range-$first_range}
then if [ -n "$range" ]; then
col="${coords#*,}" printf '%s\n' "select $range"
else else
candidate="${kak_opt_lint_errors%%,*}" printf 'echo -color Error no lint diagnostics\n'
col=$(printf '%s\n' "$kak_opt_lint_errors" | head -n1 | cut -d, -f2)
fi fi
printf '%s\n' "select $candidate.$col,$candidate.$col"
} }
}} }}
def lint-prev -docstring "Jump to the previous line that contains an error" %{ %sh{ def lint-prev -docstring "Jump to the previous line that contains an error" %{
printf '%s\n' "$kak_opt_lint_errors" | sort -t, -k1,1 -rn | { update-option buffer lint_errors
while read -r line %sh{
printf '%s\n' "$kak_opt_lint_errors" | sed -e 's/\([^\\]\):/\1\n/g' | tail -n +2 | sort -t. -k1,1 -rn | {
while IFS='|' read -r candidate rest
do do
coords=$(printf %s "$line" | cut -d, -f1,2) first_range=${first_range-$candidate}
candidate="${coords%,*}" if [ "${candidate%%.*}" -lt "$kak_cursor_line" ]; then
if [ "$candidate" -lt "$kak_cursor_line" ] range=$candidate
then
break break
fi fi
done done
if [ "$candidate" -lt "$kak_cursor_line" ] range=${range-$first_range}
then if [ -n "$range" ]; then
col="${coords#*,}" printf '%s\n' "select $range"
else else
last=$(printf '%s\n' "$kak_opt_lint_errors" | tail -n1) printf 'echo -color Error no lint diagnostics\n'
candidate=$(printf '%s\n' "$last" | cut -d, -f1)
col=$(printf '%s\n' "$last" | cut -d, -f2)
fi fi
printf '%s\n' "select $candidate.$col,$candidate.$col"
} }
}} }}