git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Johannes Sixt <j6t@kdbg.org>
To: Javier Spagnoletti via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Javier Spagnoletti <phansys@gmail.com>
Subject: Re: [PATCH] Improve diff pattern for PHP files
Date: Tue, 6 Oct 2020 20:27:06 +0200	[thread overview]
Message-ID: <d262c797-29eb-1e08-8de0-6a2dd2a5d47f@kdbg.org> (raw)
In-Reply-To: <pull.864.git.git.1601980656554.gitgitgadget@gmail.com>

Please choose a commit summary line of the form "area: summary", for
example:

   userdiff: PHP: catch "abstract" and "final" functions

Am 06.10.20 um 12:37 schrieb Javier Spagnoletti via GitGitGadget:
> From: Javier Spagnoletti <phansys@gmail.com>
> 
> Improve the output diff readability for php files by taking into account some missing function modifiers.

"Improve" is a noise word and need not be mentioned; a non-improvement
would not be accepted. Also, wrap long lines to at most 72 characters.
Perhaps:

   PHP permits functions to be defined like

       public final function foo() { }
       protected abstract function bar() { }

   but our hunk header pattern does not recognize these decorations.
   Add "final" and "abstract" to the list of function modifiers.

I am not a PHP expert, so I cannot tell whether what I have written
above makes sense.

> 
> Signed-off-by: Javier Spagnoletti <phansys@gmail.com>
> ---
>     Improve diff pattern for PHP files
>     
>     Improve the output diff readability for php files by taking into account
>     some missing function modifiers.
> 
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-864%2Fphansys%2Fuserdiff_php-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-864/phansys/userdiff_php-v1
> Pull-Request: https://github.com/git/git/pull/864
> 
>  userdiff.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/userdiff.c b/userdiff.c
> index 1df884ef0b..a99d84a7e3 100644
> --- a/userdiff.c
> +++ b/userdiff.c
> @@ -143,7 +143,7 @@ PATTERNS("perl",
>  	 "|=~|!~"
>  	 "|<<|<>|<=>|>>"),
>  PATTERNS("php",
> -	 "^[\t ]*(((public|protected|private|static)[\t ]+)*function.*)$\n"
> +	 "^[\t ]*(((public|protected|private|static|abstract|final)[\t ]+)*function.*)$\n"
>  	 "^[\t ]*((((final|abstract)[\t ]+)?class|interface|trait).*)$",
>  	 /* -- */
>  	 "[a-zA-Z_][a-zA-Z0-9_]*"

It would be great if you could add test cases to t/4018/ that
demonstrate how these new keywords are handled.

-- Hannes

  reply	other threads:[~2020-10-06 18:27 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-06 10:37 Javier Spagnoletti via GitGitGadget
2020-10-06 18:27 ` Johannes Sixt [this message]
2020-10-06 18:55   ` Junio C Hamano
2020-10-07  3:38 ` [PATCH v2] " Javier Spagnoletti via GitGitGadget
2020-10-07  6:12   ` Junio C Hamano
2020-10-07 18:47     ` Junio C Hamano
2020-10-07 18:07   ` [PATCH v3] userdiff: php: Add "final" and "abstract" to the list of function modifiers Javier Spagnoletti via GitGitGadget

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d262c797-29eb-1e08-8de0-6a2dd2a5d47f@kdbg.org \
    --to=j6t@kdbg.org \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=phansys@gmail.com \
    /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 inbox:

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).