From d65c99a4483887de09c0510ae11e8d4a565f3969 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Mon, 10 Sep 2018 21:22:32 +1000 Subject: [PATCH] Further fixes in go-tools.kak to improve its robustness --- rc/extra/go-tools.kak | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rc/extra/go-tools.kak b/rc/extra/go-tools.kak index cdeec130..ee26698e 100644 --- a/rc/extra/go-tools.kak +++ b/rc/extra/go-tools.kak @@ -30,10 +30,14 @@ define-command go-complete -docstring "Complete the current selection with gocod ( gocode_data=$(gocode -f=godit --in=${dir}/buf autocomplete ${kak_cursor_byte_offset}) rm -r ${dir} - column_offset=$(echo "${gocode_data}" | head -n1 | cut -d, -f1) + column_offset=$(printf %s "${gocode_data}" | head -n1 | cut -d, -f1) header="${kak_cursor_line}.$((${kak_cursor_column} - $column_offset))@${kak_timestamp}" - compl=$(echo "${gocode_data}" | sed 1d | awk -F ",," '{print "%~" $2 "||" $1 "~"}' | paste -s -) + compl=$(echo "${gocode_data}" | sed 1d | awk -F ",," '{ + gsub(/~/, "~~", $1) + gsub(/~/, "~~", $2) + print "%~" $2 "||" $1 "~" + }' | paste -s -) printf %s\\n "evaluate-commands -client '${kak_client}' %{ set-option 'buffer=${kak_bufname}' gocode_completions ${header} ${compl} }" | kak -p ${kak_session}