diff options
| author | Maxime Coste <mawww@kakoune.org> | 2018-09-27 18:55:50 +1000 |
|---|---|---|
| committer | Maxime Coste <mawww@kakoune.org> | 2018-09-27 18:55:50 +1000 |
| commit | f3d6586df2fcf01c31d8966e58d950317efae745 (patch) | |
| tree | bc13fb3909781b87adb4a87350f51a6eaed7a6ab | |
| parent | 93f913705abafbd7341e4fdd897bef5f6ef4c0dd (diff) | |
| parent | 7e15f200b118833aea9c884c130b646fa5ae94e3 (diff) | |
Merge remote-tracking branch 'laelath/clang-format-fixes'
| -rw-r--r-- | rc/extra/clang.kak | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/rc/extra/clang.kak b/rc/extra/clang.kak index 7b880515..3386073b 100644 --- a/rc/extra/clang.kak +++ b/rc/extra/clang.kak @@ -54,7 +54,7 @@ The syntaxic errors detected during parsing are shown when auto-diagnostics are gsub(/#]/, " ", $3) gsub(/:: /, "::", $3) gsub(/ +$/, "", $3) - desc=$4 ? $3 "\\n" $4 : $3 + desc=$4 ? $3 "\n" $4 : $3 gsub(/~/, "~~", desc) gsub(/\|/, "\\|", desc) @@ -134,13 +134,14 @@ define-command -hidden clang-show-error-info %{ evaluate-commands %sh{ eval "set -- ${kak_opt_clang_errors}" shift # skip timestamp - for error in "$@"; do + desc=$(for error in "$@"; do if [ "${error%%|*}" = "$kak_cursor_line" ]; then - desc=$(printf '%s%s\n' "$desc" "${error##*|}") + printf '%s\n' "${error##*|}" fi - done + done) if [ -n "$desc" ]; then - printf %s\\n "info -anchor ${kak_cursor_line}.${kak_cursor_column} \"$desc\"" + desc=$(printf %s "${desc}" | sed "s/'/''/g") + printf "info -anchor %d.%d '%s'\n" "${kak_cursor_line}" "${kak_cursor_column}" "${desc}" fi } } |