From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.2 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A, RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 4B1721F9FF for ; Fri, 26 Feb 2021 08:01:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229618AbhBZH7W (ORCPT ); Fri, 26 Feb 2021 02:59:22 -0500 Received: from [93.83.142.38] ([93.83.142.38]:44794 "EHLO localhost" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S229541AbhBZH7W (ORCPT ); Fri, 26 Feb 2021 02:59:22 -0500 Received: from [IPv6:::1] (localhost [IPv6:::1]) by localhost (Postfix) with ESMTP id 12A5C2C639; Fri, 26 Feb 2021 08:59:00 +0100 (CET) Subject: Re: [PATCH v3 31/35] userdiff golang: don't over-match intented constructs To: =?UTF-8?B?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , git@vger.kernel.org Cc: Junio C Hamano , Jeff King , Jonathan Nieder , Philippe Blain , Adam Spiers , Eric Sunshine , Chris Torek References: <20210215154427.32693-1-avarab@gmail.com> <20210224195129.4004-32-avarab@gmail.com> From: Johannes Sixt Message-ID: Date: Fri, 26 Feb 2021 08:59:00 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20210224195129.4004-32-avarab@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Am 24.02.21 um 20:51 schrieb Ævar Arnfjörð Bjarmason: > Fix a bug introduced when the "golang" driver was added in > 1dbf0c0ad6c (userdiff: add built-in pattern for golang, 2018-03-01). > > Unlike the default def_ff() driver in xemit.c it would match "type" > declarations inside functions. Let's make it mandatory that a "func" > or "type" must be at the beginning of the line with no whitespace to > get around this. > > Go is such a regularly formatted language that I think this can be > counted on. I think the whitespace matching was probably copy/pasted > from an earlier userdiff.c pattern. > > Signed-off-by: Ævar Arnfjörð Bjarmason > --- > t/t4018/golang | 20 ++++++++++++++++++++ > userdiff.c | 4 ++-- > 2 files changed, 22 insertions(+), 2 deletions(-) > > diff --git a/t/t4018/golang b/t/t4018/golang > index 72a35d66008..252b6049da4 100644 > --- a/t/t4018/golang > +++ b/t/t4018/golang > @@ -51,3 +51,23 @@ type some struct { // comment > a Type > b ChangeMe > } > + > +t4018 description: func combined with type > +t4018 header: func myfunc() { > +func myfunc() { > + type mystruct struct { > + a Foo > + b Bar > + } > + ChangeMe > + > +t4018 description: anonymous indented func() > +t4018 header: func SomeThing() bool { > +func SomeThing() bool { > + func() { Wait! With the unmodified pattern, this indented "func()" cannot match because it is not followed by a space. So, this test case does not demonstrate that the modified pattern makes a difference. In the commit message of 30/35 you say that "we should always get whitespace after 'func'", but here you show a case where that is not true. Did you forget to write a name after "func"? > + defer func() { > + fmt.Println("hello") > + }() > + }() > + > + ChangeMe > diff --git a/userdiff.c b/userdiff.c > index 698eca5ad35..704af241e44 100644 > --- a/userdiff.c > +++ b/userdiff.c > @@ -129,9 +129,9 @@ IPATTERN("fountain", > "[^ \t-]+"), > PATTERNS("golang", > /* Functions */ > - "^[ \t]*(func[ \t].*)\n" > + "^(func[ \t].*)\n" > /* Structs and interfaces */ > - "^[ \t]*(type[ \t].*(struct|interface)[ \t].*)", > + "^(type[ \t].*[ \t](struct|interface)[ \t].*)", > /* -- */ > "[a-zA-Z_][a-zA-Z0-9_]*" > "|[-+0-9.eE]+i?|0[xX]?[0-9a-fA-F]+i?" >