From: Junio C Hamano <gitster@pobox.com>
To: Jaydeep P Das <jaydeepjd.8914@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] userdiff: Add diff driver for Kotlin lang and tests
Date: Tue, 01 Mar 2022 01:32:30 -0800 [thread overview]
Message-ID: <xmqqy21urpap.fsf@gitster.g> (raw)
In-Reply-To: 20220301070226.2477769-2-jaydeepjd.8914@gmail.com
Jaydeep P Das <jaydeepjd.8914@gmail.com> writes:
> Subject: Re: [PATCH] userdiff: Add diff driver for Kotlin lang and tests
"Add" -> "add". "lang and tests" -> "language".
> The xfuncname pattern finds func/class declarations in diffs to
> display as a hunk header.
Yes, but an entry for a language in userdiff.c consists of the
funcname pattern AND the word_regex. And I think the patch is
adding both, not just funcname pattern.
> This patch adds xfuncname regex and some respective
> tests for Kotlin language.
>
> Also modifies `Documentation./gitattributes.txt` to state
> the same.
See Documenation/SubmittingPatches::[[imperative-mood]].
But it probably is better to leave these unsaid. The patterns,
tests and documentation updates go hand in hand.
> 11 files changed, 59 insertions(+)
> create mode 100644 t/t4018/kotlin-class
> create mode 100644 t/t4018/kotlin-enum-class
> create mode 100644 t/t4018/kotlin-fun
> create mode 100644 t/t4018/kotlin-inheritace-class
> create mode 100644 t/t4018/kotlin-inline-class
> create mode 100644 t/t4018/kotlin-interface
> create mode 100644 t/t4018/kotlin-nested-fun
> create mode 100644 t/t4018/kotlin-public-class
> create mode 100644 t/t4018/kotlin-sealed-class
>
> diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
> index a71dad2674..94d06dc337 100644
> --- a/Documentation/gitattributes.txt
> +++ b/Documentation/gitattributes.txt
> @@ -829,6 +829,8 @@ patterns are available:
>
> - `java` suitable for source code in the Java language.
>
> +- `kotlin` suitable for source code in the Kotlin language
> +
> - `markdown` suitable for Markdown documents.
The entries before and after this new one both end with a full stop,
and this new entry should do the same.
> diff --git a/userdiff.c b/userdiff.c
> index 8578cb0d12..a6cc6dc3b7 100644
> --- a/userdiff.c
> +++ b/userdiff.c
> @@ -168,6 +168,14 @@ PATTERNS("java",
> "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?"
> "|[-+*/<>%&^|=!]="
> "|--|\\+\\+|<<=?|>>>?=?|&&|\\|\\|"),
> +PATTERNS("kotlin",
> + /* fun, class, interface, declarations */
> + "^[ \t]*(([a-z]+[ \t]+)*(fun|class|interface)[ \t]+.*[ \t]*)$",
With the three keywords clearly visible in the pattern, the comment
looks somewhat redundant. I dunno.
> + /* -- */
> + "[a-zA-Z_][a-zA-Z0-9_]*"
> + "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?"
> + "|[-+*/<>%&^|=!]="
> + "|--|\\+\\+|<<=?|>>>?=?|&&|\\|\\|"),
The latter half is word regex, which is tested in t4034 to at least
ensure that it is well formed. We can also add t/t4034/$language/
to see the patterns hit the word boundary as expected.
> PATTERNS("markdown",
> "^ {0,3}#{1,6}[ \t].*",
> /* -- */
next prev parent reply other threads:[~2022-03-01 9:32 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-01 7:02 [GSoC][PATCH] userdiff: Add diff driver for Kotlin lang and tests Jaydeep P Das
2022-03-01 7:02 ` [PATCH] " Jaydeep P Das
2022-03-01 9:32 ` Junio C Hamano [this message]
2022-03-01 9:37 ` Ævar Arnfjörð Bjarmason
2022-03-01 10:27 ` jaydeepjd.8914
2022-03-01 15:54 ` [PATCH] userdiff: add builtin diff driver for Kotlin language Jaydeep P Das
2022-03-01 17:17 ` Junio C Hamano
2022-03-01 18:09 ` jaydeepjd.8914
2022-03-01 19:59 ` Johannes Sixt
2022-03-01 19:47 ` Johannes Sixt
2022-03-02 6:45 ` [GSoC][PATCHv2] userdiff: add builtin driver for kotlin language Jaydeep P Das
2022-03-02 6:45 ` [PATCH] " Jaydeep P Das
2022-03-02 8:00 ` Johannes Sixt
2022-03-02 9:09 ` jaydeepjd.8914
2022-03-02 9:28 ` jaydeepjd.8914
2022-03-02 14:26 ` [GSoC][PATCHv3] " Jaydeep P Das
2022-03-02 14:26 ` [PATCH] " Jaydeep P Das
2022-03-02 20:18 ` Johannes Sixt
2022-03-03 11:41 ` Jaydeep Das
2022-03-03 16:54 ` Ævar Arnfjörð Bjarmason
2022-03-03 19:47 ` Junio C Hamano
2022-03-03 20:04 ` Johannes Sixt
2022-03-04 12:28 ` Jaydeep Das
2022-03-04 13:59 ` Johannes Sixt
2022-03-03 18:15 ` [PATCH] userdiff: add builtin diff driver for Kotlin language Jaydeep P Das
2022-03-04 2:44 ` Junio C Hamano
2022-03-04 5:16 ` jaydeepjd.8914
2022-03-04 7:25 ` Johannes Sixt
2022-03-05 9:40 ` [PATCH v4] " Jaydeep P Das
2022-03-05 14:17 ` Johannes Sixt
2022-03-05 19:18 ` jaydeepjd.8914
2022-03-05 22:17 ` Johannes Sixt
2022-03-06 11:15 ` [PATCH v5] userdiff: add builtin diff driver for kotlin language Jaydeep P Das
2022-03-07 7:07 ` Johannes Sixt
2022-03-08 16:54 ` jaydeepjd.8914
2022-03-08 18:32 ` Johannes Sixt
2022-03-10 10:52 ` jaydeepjd.8914
2022-03-10 16:29 ` Jaydeep Das
2022-03-10 19:11 ` Johannes Sixt
2022-03-11 7:27 ` [PATCH v6] " Jaydeep P Das
2022-03-11 20:07 ` Johannes Sixt
2022-03-12 4:36 ` jaydeepjd.8914
2022-03-12 8:36 ` Johannes Sixt
2022-03-12 4:48 ` [PATCH v7] " Jaydeep P Das
2022-03-12 8:59 ` Johannes Sixt
2022-03-13 17:02 ` jaydeepjd.8914
2022-03-13 17:09 ` jaydeepjd.8914
2022-03-13 21:36 ` Johannes Sixt
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=xmqqy21urpap.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jaydeepjd.8914@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 public 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).