KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix zsh kitty completion when the matching style includes anchor based matchers

Browse Source 
Debian apparently adds these by default.
This commit is contained in:
Kovid Goyal 2021-11-28 11:02:03 +05:30
parent 0a5c73dee4
commit daefb926d9
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kitty/complete.py
View File

@ -45,6 +45,7 @@ them into something your shell will understand.
parsers: Dict[str, 'ParserFunc'] = {} parsers: Dict[str, 'ParserFunc'] = {}
serializers: Dict[str, 'SerializerFunc'] = {} serializers: Dict[str, 'SerializerFunc'] = {}
shell_state: Dict[str, str] = {}
class MatchGroup: class MatchGroup:
@ -201,6 +202,18 @@ def output_serializer(func: SerializerFunc) -> SerializerFunc:
@input_parser @input_parser
def zsh_input_parser(data: str) -> ParseResult: def zsh_input_parser(data: str) -> ParseResult:
matcher = shell_state.get('_matcher', '')
q = matcher.lower().split(':', maxsplit=1)[0]
if q in ('l', 'r', 'b', 'e'):
# this is zsh anchor based matching
# https://zsh.sourceforge.io/Doc/Release/Completion-Widgets.html#Completion-Matching-Control
# can be specified with matcher-list and some systems do it by default,
# for example, Debian, which adds the following to zshrc
# zstyle ':completion:*' matcher-list '' 'm:{a-z}={A-Z}' 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=* l:|=*'
# For some reason that I dont have the
# time/interest to figure out, returning completion candidates for
# these matcher types break completion, so just abort in this case.
raise SystemExit(1)
new_word = data.endswith('\n\n') new_word = data.endswith('\n\n')
words = data.rstrip().splitlines() words = data.rstrip().splitlines()
return words, new_word return words, new_word
@ -714,6 +727,11 @@ def main(args: Sequence[str], entry_points: Iterable[str], namespaced_entry_poin
if cstyle == 'setup': if cstyle == 'setup':
return setup(args[1]) return setup(args[1])
data = sys.stdin.read() data = sys.stdin.read()
shell_state.clear()
for x in args[1:]:
parts = x.split('=', maxsplit=1)
if len(parts) == 2:
shell_state[parts[0]] = parts[1]
try: try:
parser = parsers[cstyle] parser = parsers[cstyle]
serializer = serializers[cstyle] serializer = serializers[cstyle]

2
shell-integration/zsh/kitty.zsh
View File

@ -139,7 +139,7 @@
_ksi_complete() { _ksi_complete() {
local src local src
# Send all words up to the word the cursor is currently on # Send all words up to the word the cursor is currently on
src=$(printf "%s\n" "${(@)words[1,$CURRENT]}" | kitty +complete zsh) src=$(printf "%s\n" "${(@)words[1,$CURRENT]}" | kitty +complete zsh "_matcher=$_matcher")
if [[ $? == 0 ]]; then if [[ $? == 0 ]]; then
eval ${src} eval ${src}
fi fi