From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-42038-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 1894 invoked by alias); 19 Nov 2017 22:55:54 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
List-Unsubscribe: <mailto:zsh-workers-unsubscribe@zsh.org>
X-Seq: 42038
Received: (qmail 17391 invoked by uid 1010); 19 Nov 2017 22:55:54 -0000
X-Qmail-Scanner-Diagnostics: from mail-oi0-f53.google.com by f.primenet.com.au (envelope-from <evanunderscore@gmail.com>, uid 7791) with qmail-scanner-2.11 
 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1.  
 Clear:RC:0(209.85.218.53):SA:0(-1.9/5.0):. 
 Processed in 5.451619 secs); 19 Nov 2017 22:55:54 -0000
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM,
	HTML_MESSAGE,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS,
	T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.1
X-Envelope-From: evanunderscore@gmail.com
X-Qmail-Scanner-Mime-Attachments: |
X-Qmail-Scanner-Zip-Files: |
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20161025;
        h=mime-version:sender:in-reply-to:references:from:date:message-id
         :subject:to:cc;
        bh=kOa5jufZox/lYNTWksCeEgsBavsLyJsLEJTT7W+IomA=;
        b=RO0OmyEzLNRR6tWKYI5jw1GhaxtncVfrf8GdRoTGVMu+CvnANDLbCYg1MKt55Sqthu
         DmMW3ltPP2oqMceWJVcHOqW680pzQ3fATszlpptmkon3IRrUz3K2blDOEtvFlw3W0jyp
         IDAb/3y5+kejYHufSWAv00xP1shDmqcS44UTDogq3SqcGKeuSoplSWX+P7QB/igX8spX
         Zr10dYgdkzq3Ib/ZJbbdraej5tb9cUTgYjuVDUnoRKKA2jUv8CgCcyjSYFpbezTejrnY
         D4hAR/meAunska8+x8HSezhh36wFAsXIBMu5dq7x1H1OY2NYQ6KfIu204Ld3yDtqfT5Y
         9MfQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:mime-version:sender:in-reply-to:references:from
         :date:message-id:subject:to:cc;
        bh=kOa5jufZox/lYNTWksCeEgsBavsLyJsLEJTT7W+IomA=;
        b=OHt1lGjCmHFCdAo1sWP3qWYel4MoEOr9C6U3IL9ZiMR5kpSIRyy2w/ahNF5+9IVIap
         zRyH5GYBsjd2MdMedQKFar0D+r9CydRu0WJA1332MkciLxynmgnvADLDuOyF0LgSnO+0
         1xBo/FdTYPWyy/sNDFhM/Q/LFff/o8YI9stPuLdNeco2w2kpVg9PGBU7GcXZuqu02nzT
         Ug7YkwjJrFra5NL3dxZdU+raCzdJokmCZmL1jqHbImP0AsAgyptxACr06pXUpVJBHIKo
         nCtdfiN63TcC1oSUDv50yQompD58PFbysLVBajONgXxzh83nv1WV0SVA8PgX/tgI55bG
         vqAA==
X-Gm-Message-State: AJaThX43PoHxC8Q8WRp4tUV7r7yW6+kXryGu7WHVUfCrc1e9h2eGUd6/
	ZJIXA7Vc8W3jKx5hYorNJPnhyLgloAo9GacMp2I=
X-Google-Smtp-Source: AGs4zMajq0uVN040NsG9W3oja8qiIFpb5GIH9cJPhvd0YaiBdAdYc5bCJngbAFQ7WHIgIjhhck7hO0Xf4DshNeL4zSs=
X-Received: by 10.202.166.14 with SMTP id p14mr6258533oie.48.1511132145577;
 Sun, 19 Nov 2017 14:55:45 -0800 (PST)
MIME-Version: 1.0
Sender: evan.andrews.au@gmail.com
X-Google-Sender-Delegation: evan.andrews.au@gmail.com
In-Reply-To: <20171119194940.74dd8cea@ntlworld.com>
References: <CACiQ9RGKzNXY+bpnGdXxvjUvvpnm+NipOiyxpOL2Ua-Wcv6sSw@mail.gmail.com>
 <20171119194940.74dd8cea@ntlworld.com>
From: Evan Underscore <evanunderscore@gmail.com>
Date: Mon, 20 Nov 2017 09:55:45 +1100
X-Google-Sender-Auth: gkTDg3kr-f-bftl8RDv2tfNXOWA
Message-ID: <CACiQ9RFt5N3j9Jwt=pq0Esk5KoLsxxBtNyqexdOvNkh67Pj8Sg@mail.gmail.com>
Subject: Re: bashcompinit incorrectly calculates COMP_LINE (proposed fix included)
To: Peter Stephenson <p.w.stephenson@ntlworld.com>
Cc: zsh-workers@zsh.org
Content-Type: multipart/alternative; boundary="001a114054dabef10e055e5dde27"

--001a114054dabef10e055e5dde27
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Yes, that patch works for me for the following test cases:

./demo.py new test[tab] (COMP_POINT=3D18)
./demo.py new test [tab] (COMP_POINT=3D19)
./demo.py new =E4=BD=A0=E5=A5=BD=E5=98=9A=E7=91=9F[tab] (COMP_POINT=3D18)
./demo.py new =E4=BD=A0=E5=A5=BD=E5=98=9A=E7=91=9F [tab] (COMP_POINT=3D19)

Thanks.

On Mon, Nov 20, 2017 at 6:49 AM, Peter Stephenson <
p.w.stephenson@ntlworld.com> wrote:

> On Fri, 17 Nov 2017 20:19:25 +1100
> Evan Underscore <evanunderscore@gmail.com> wrote:
> > Reverting this line (i.e. using CURRENT-1 instead of CURRENT, as it was
> > before this commit) fixes the bug for me, causing zsh to report 18 and =
19
> > for the two test lines respectively, matching Bash.
>
> So I think so suggesting the following patch gives the correct behaviour
> under all circumstances you aware of?
>
> pws
>
>
> diff --git a/Completion/bashcompinit b/Completion/bashcompinit
> index 902fa88..02290a1 100644
> --- a/Completion/bashcompinit
> +++ b/Completion/bashcompinit
> @@ -8,7 +8,7 @@ _bash_complete() {
>    local -x COMP_LINE=3D"$words"
>    local -A savejobstates savejobtexts
>
> -  (( COMP_POINT =3D 1 + ${#${(j. .)words[1,CURRENT]}} + $#QIPREFIX +
> $#IPREFIX + $#PREFIX ))
> +  (( COMP_POINT =3D 1 + ${#${(j. .)words[1,CURRENT-1]}} + $#QIPREFIX +
> $#IPREFIX + $#PREFIX ))
>    (( COMP_CWORD =3D CURRENT - 1))
>    COMP_WORDS=3D( $words )
>    BASH_VERSINFO=3D( 2 05b 0 1 release )
>

--001a114054dabef10e055e5dde27--