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

Re: Regression affecting completion with NO_CASE_GLOB

On Thu, Jun 2, 2022 at 7:34 PM Bart Schaefer <schaefer@xxxxxxxxxxxxxxxx> wrote:
> There are two ways to go here:  Revert the pattern_match_equivalence()
> change and alter cfp_matcher_range() to add one to the index that it
> passes, or change the other two callers to decrement their indices by
> one.  I tested the latter and it works as expected, but I think the
> former might be the more sensible approach.

In fact pattern_match1() calls PATMATCHRANGE() and then returns ind+1,
whereas cfp_matcher_range() calls PATMATCHRANGE() and then uses ind
directly, so it's pretty clear that reverting and fixing
cfp_matcher_range() is the right way to go.

diff --git a/Src/Zle/compmatch.c b/Src/Zle/compmatch.c
index bb8359f1d..56e5509a4 100644
--- a/Src/Zle/compmatch.c
+++ b/Src/Zle/compmatch.c
@@ -1319,7 +1319,7 @@ pattern_match_equivalence(Cpattern lp,
convchar_t wind, int wmtp,
     convchar_t lchr;
     int lmtp;

-    if (!PATMATCHINDEX(lp->u.str, wind, &lchr, &lmtp)) {
+    if (!PATMATCHINDEX(lp->u.str, wind-1, &lchr, &lmtp)) {
         * No equivalent.  No possible match; give up.
diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c
index 59abb4cc4..77ccdebf7 100644
--- a/Src/Zle/computil.c
+++ b/Src/Zle/computil.c
@@ -4383,7 +4383,7 @@ cfp_matcher_range(Cmatcher *ms, char *add)
                         * word pattern.
                        if ((ind = pattern_match_equivalence
-                            (m->word, ind, mt, addc)) != CHR_INVALID) {
+                            (m->word, ind+1, mt, addc)) != CHR_INVALID) {
                            if (ret) {
                                if (imeta(ind)) {
                                    *p++ = Meta;

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