From: Bart Schaefer <schaefer@brasslantern.com>
To: zsh workers <zsh-workers@zsh.org>
Subject: Re: Completion of prefix redirections is -command- instead of -redirect-
Date: Wed, 26 Aug 2015 22:14:13 -0700 [thread overview]
Message-ID: <150826221413.ZM25355@torch.brasslantern.com> (raw)
In-Reply-To: <CAHYJk3TT8A1Lqu6gv0JRxxACwCOigYSsF+3CwBHNd_UdT8B5NQ@mail.gmail.com>
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) ||
next prev parent reply other threads:[~2015-08-27 5:14 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-26 5:39 Daniel Shahaf
2015-08-26 18:18 ` Bart Schaefer
2015-08-27 0:16 ` Mikael Magnusson
2015-08-27 4:35 ` Bart Schaefer
2015-08-27 4:47 ` Bart Schaefer
2015-08-27 4:54 ` Mikael Magnusson
2015-08-27 5:14 ` Bart Schaefer [this message]
2015-08-27 6:22 ` Mikael Magnusson
2015-08-27 16:47 ` Bart Schaefer
2015-08-27 18:54 ` Mikael Magnusson
2015-08-27 19:00 ` Mikael Magnusson
2015-08-27 23:20 ` Bart Schaefer
2015-08-27 8:42 ` Peter Stephenson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=150826221413.ZM25355@torch.brasslantern.com \
--to=schaefer@brasslantern.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).