Kmpl: fix 9p plumbing for addr/data reads

- Use printf (no newline) for all 9p writes
- Pipe 9p write | 9p read to keep same session
- Parse space-separated addr format (not #m,#n)
- Read filename from tag, not ctl
- Use rdsel for selection text
- Split: prefix=BOF→q0, suffix=q1→EOF
This commit is contained in:
Levi Neely 2026-05-11 15:40:33 +02:00
parent a767d2d8b9
commit 2f093f4fa6
1 changed files with 13 additions and 21 deletions

View File

@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Kmpl: acme glue for u/complete. Triggers completion and inserts at cursor. # Kmpl: acme glue for u/complete. Triggers completion and prints result to stdout.
set -euo pipefail set -euo pipefail
cmd=${0##*/} cmd=${0##*/}
@ -7,21 +7,18 @@ die() { printf '%s: %s\n' "$cmd" "$*" >&2; exit 1; }
[ -z "${winid:-}" ] || [ "$winid" = "0" ] && die "must be run from an acme window" [ -z "${winid:-}" ] || [ "$winid" = "0" ] && die "must be run from an acme window"
# Get filename for language context # Get filename from tag
filename=$(9p read acme/$winid/ctl | awk 'NR==1{print $NF}') filename=$(9p read acme/$winid/tag | awk '{print $1; exit}')
# Sync addr to current dot, read rune offsets # Read dot position (char offsets)
echo "addr=dot" | 9p write acme/$winid/ctl addr=$(printf 'addr=dot' | 9p write acme/$winid/ctl | 9p read acme/$winid/addr)
addr=$(9p read acme/$winid/addr) read -r q0 q1 <<< "$addr"
q0=$(printf '%s' "$addr" | cut -d, -f1 | tr -d '#[:space:]') [ -z "$q1" ] && q1=$q0
q1=$(printf '%s' "$addr" | cut -d, -f2 | tr -d '#[:space:]')
# Read prefix (before dot) and suffix (from dot onward) # prefix = BOF to q0, suffix = q1 to EOF, selection = rdsel
printf '#0,#%s' "$q0" | 9p write acme/$winid/addr prefix=$(printf '#0,#%s' "$q0" | 9p write acme/$winid/addr | 9p read acme/$winid/data)
prefix=$(9p read acme/$winid/data) suffix=$(printf '#%s,$' "$q1" | 9p write acme/$winid/addr | 9p read acme/$winid/data)
sel=$(9p read acme/$winid/rdsel 2>/dev/null || true)
printf '#%s,$' "$q1" | 9p write acme/$winid/addr
suffix=$(9p read acme/$winid/data)
# Compute cursor line/col for LSP calls # Compute cursor line/col for LSP calls
line=$(printf '%s' "$prefix" | wc -l) line=$(printf '%s' "$prefix" | wc -l)
@ -51,10 +48,5 @@ $(cat "$tmpdir/hover")
</hover> </hover>
" "
# Fetch completion # Debug: uncomment to verify inputs
result=$(printf '%s' "$prefix" | $OLLIE/u/complete -file "$filename" -suffix "$suffix" -context "$context" "$@") #printf '=== PREFIX ===\n%s\n=== SELECTION ===\n%s\n=== SUFFIX ===\n%s\n' "$prefix" "$sel" "$suffix"
# Insert at cursor
echo "addr=dot" | 9p write acme/$winid/ctl
#printf '%s' "$result" | 9p write acme/$winid/data
printf '%s' "$result"