Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: Completion of prefix redirections is -command- instead of -redirect-

On Aug 27,  6:54am, Mikael Magnusson wrote:
} < ; <tab> gives commands (correct)

This is better than 5.0.7, which gives files here.

} foo < ; <tab> gives files (wrong-ish)

Hasn't changed from 5.0.7.

} ; < <tab> gives commands (wrong)

This has changed, 5.0.7 gets it right.

} foo=bar; < <tab> gives commands (wrong, presumably same case as the above)

Hasn't changed since 5.0.7.

} Is there any reason we can't just reset state to 'this is a new
} command' when we see an unquoted solo semicolon? Or is determining
} that this is the case in fact the trouble?

My recollection of all of this is that it has to do with completing
in the middle of for/while/repeat type constructs, where the ";" may
be followed by "do" after which you have to stay in command position,
or you may be in shortloops syntax, etc.  But I don't recall (and
likely never really understood Sven's explanation of) all the details.

The below seems to make it better, the only case that is still wrong
after this is "foo < ; <tab>".  But I haven't more than minimally
checked that completing in e.g. "for" loops still works properly.

diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c
index cb17bde..97bdcc0 100644
--- a/Src/Zle/zle_tricky.c
+++ b/Src/Zle/zle_tricky.c
@@ -1185,7 +1185,7 @@ get_comp_string(void)
 	 * relatively harmless by itself, it's probably incomplete.
 	linredir = (inredir && !ins);
-	lincmd = !linredir &&
+	lincmd = !inredir &&
 	    ((incmdpos && !ins && !incond) ||
 	     (oins == 2 && wordpos == 2) ||
 	     (ins == 3 && wordpos == 1) ||

Messages sorted by: Reverse Date, Date, Thread, Author