mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-05-12 02:26:14 +02:00
Code

40026: Fix for completion after redirection. 

This could get confused about where we were in the command
line word array e.g. after the > of "!> .".  Also take more care
if does confused, with debug output. Also neaten up one
obscure test.
This commit is contained in:
Peter Stephenson 2016-11-29 17:08:56 +00:00
parent 3a83e481ab
commit 32daf2a0aa
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2016-11-29 Peter Stephenson <p.stephenson@samsung.com>
* 40026: Src/Zle/zle_tricky.c: More care with redirection
completion. Fixes for completion after > in "!> ." that
should add to sanity.
2016-11-29 Daniel Shahaf <d.s@daniel.shahaf.name>
* unposted: Completion/Zsh/Context/_subscript: Complete the

24
Src/Zle/zle_tricky.c
View File

@ -1305,8 +1305,12 @@ get_comp_string(void)
zsfree(cmdstr);
cmdstr = ztrdup(tokstr);
cmdtok = tok;
/* If everything before is a redirection, don't reset the index */
if (wordpos != redirpos)
/*
* If everything before is a redirection, or anything
* complicated enough that we've seen the word the
* cursor is on, don't reset the index.
*/
if (wordpos != redirpos && clwpos == -1)
wordpos = redirpos = 0;
} else if (tok == SEPER) {
/*
@ -1414,9 +1418,17 @@ get_comp_string(void)
/* If this is the word the cursor is in and we added a `x', *
* remove it. */
if (clwpos == wordpos++ && addedx) {
int chuck_at, word_diff;
zlemetacs_qsub = zlemetacs - qsub;
chuck(&clwords[wordpos - 1][((zlemetacs_qsub - wb) >= sl) ?
(sl - 1) : (zlemetacs_qsub - wb)]);
word_diff = zlemetacs_qsub - wb;
/* Ensure we chuck within the word... */
if (word_diff >= sl)
chuck_at = sl -1;
else if (word_diff < 0)
chuck_at = 0;
else
chuck_at = word_diff;
chuck(&clwords[wordpos - 1][chuck_at]);
}
} while (tok != LEXERR && tok != ENDINPUT &&
(tok != SEPER || (lexflags && tt0 == NULLTOK)));
@ -1464,7 +1476,9 @@ get_comp_string(void)
t0 = STRING;
} else if (t0 == STRING || t0 == TYPESET) {
/* We found a simple string. */
s = ztrdup(clwords[clwpos]);
s = clwords[clwpos];
DPUTS(!s, "Completion word has disappeared!");
s = ztrdup(s ? s : "");
} else if (t0 == ENVSTRING) {
char sav;
/* The cursor was inside a parameter assignment. */