From: Moumita <dhar61595@gmail.com>
To: git@vger.kernel.org
Cc: Moumita <dhar61595@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Junio C Hamano" <gitster@pobox.com>,
"René Scharfe" <l.s.r@web.de>,
"Atharva Raykar" <raykar.ath@gmail.com>,
"D. Ben Knoble" <ben.knoble@gmail.com>
Subject: [PATCH 1/1] Added built in function recognition for shell
Date: Tue, 11 Feb 2025 17:16:10 +0530 [thread overview]
Message-ID: <20250211114611.9334-2-dhar61595@gmail.com> (raw)
In-Reply-To: <20250211114611.9334-1-dhar61595@gmail.com>
Introduced a built-in userdiff driver for shell scripts, enabling
accurate function name recognition in `git diff` hunk headers.
Enhancements include:
- Function name detection for both POSIX and Bash/Ksh-style functions:
- `function_name() { ... }`
- `function function_name { ... }`
- Exclusion of shell keywords that can resemble function names,
preventing false matches (e.g., `if`, `for`, `while`, `return`, etc.).
- Improved tokenization support for:
- Identifiers (variable and function names)
- Numeric constants (integers and decimals)
- Shell variables (`$VAR`, `${VAR}`)
- Logical (`&&`, `||`, `==`, `!=`, `<=`, `>=`) and arithmetic operators
- Assignment and redirection operators
- Brackets and grouping symbols
This update improves Git’s diff readability for shell scripts,
bringing it in line with existing built-in userdiff drivers.
Signed-off-by: Moumita <dhar61595@gmail.com>
---
userdiff.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/userdiff.c b/userdiff.c
index 340c4eb4f7..a8c14807c6 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -334,6 +334,26 @@ PATTERNS("scheme",
"\\|([^\\\\]*)\\|"
/* All other words should be delimited by spaces or parentheses */
"|([^][)(}{[ \t])+"),
+PATTERNS("shell",
+ /* Negate shell keywords that can look like functions */
+ "!^[ \t]*(if|elif|else|fi|for|while|until|case|esac|then|do|done|return|break|continue)\\b\n"
+ /* POSIX-style shell functions: function_name() { ... } */
+ "^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*)[ \t]*\\(\\)[ \t]*\\{\n"
+ /* Bash/Ksh-style functions: function function_name { ... } */
+ "^[ \t]*function[ \t]+([a-zA-Z_][a-zA-Z0-9_]*)[ \t]*\\{\n",
+ /* -- */
+ /* Identifiers: variable and function names */
+ "[a-zA-Z_][a-zA-Z0-9_]*"
+ /* Numeric constants: integers and decimals */
+ "|[-+]?[0-9]+(\\.[0-9]*)?"
+ /* Shell variables: $VAR and ${VAR} */
+ "|\\$[a-zA-Z_][a-zA-Z0-9_]*|\\$\\{[^}]+\\}"
+ /* Logical and comparison operators */
+ "|\\|\\||&&|<<|>>|==|!=|<=|>="
+ /* Assignment and arithmetic operators */
+ "|[-+*/%&|^!=<>]=?"
+ /* Brackets and grouping symbols */
+ "|\\(|\\)|\\{|\\}|\\[|\\]"),
PATTERNS("tex", "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
"\\\\[a-zA-Z@]+|\\\\.|([a-zA-Z0-9]|[^\x01-\x7f])+"),
{ .name = "default", .binary = -1 },
--
2.48.0
next prev parent reply other threads:[~2025-02-11 11:47 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-11 11:46 [PATCH 0/1] [GSOC 2025] [Newbie] userdiff: add built-in pattern for shell scripts Moumita
2025-02-11 11:46 ` Moumita [this message]
2025-02-15 14:37 ` [PATCH 1/1] Added built in function recognition for shell Johannes Sixt
2025-02-18 15:35 ` [PATCH v2 0/1] [PATCH v2 0/1] [GSOC 2025] [Newbie] userdiff: add built-in pattern for shell scripts Moumita
2025-02-18 15:35 ` [PATCH v2 1/1] userdiff: extend Bash pattern to cover more shell function forms Moumita
2025-02-18 19:30 ` Junio C Hamano
2025-02-22 18:15 ` Johannes Sixt
2025-02-24 16:28 ` Junio C Hamano
2025-02-18 23:38 ` Junio C Hamano
2025-02-22 18:14 ` Johannes Sixt
2025-02-18 17:30 ` [PATCH v2 0/1] [PATCH v2 0/1] [GSOC 2025] [Newbie] userdiff: add built-in pattern for shell scripts Eric Sunshine
2025-03-28 20:05 ` [PATCH v3 0/1] userdiff: improve Bash function and word regex patterns Moumita
2025-03-28 20:05 ` [PATCH v3 1/1] userdiff: extend Bash pattern to cover more shell function forms Moumita
2025-03-29 19:26 ` [PATCH v3 0/1] userdiff: improve Bash function and word regex patterns Junio C Hamano
2025-03-30 12:28 ` MOUMITA DHAR
2025-03-30 13:39 ` [PATCH v4 0/1][GSOC] userdiff:Added newlines at the end of the test cases Moumita
2025-03-30 13:39 ` [PATCH v4 1/1][GSOC] userdiff: extend Bash pattern to cover more shell function forms Moumita
2025-05-02 21:27 ` Junio C Hamano
2025-05-06 16:30 ` Johannes Sixt
2025-05-10 11:37 ` MOUMITA DHAR
2025-05-10 12:40 ` Johannes Sixt
2025-05-11 12:58 ` [PATCH v5 0/1] Added the closing ")" to make sure is not unbalanced and corrected the tests for word diff Moumita
2025-05-11 12:58 ` [PATCH v5 1/1] userdiff: extend Bash pattern to cover more shell function forms Moumita
2025-05-11 13:28 ` Moumita
2025-05-11 13:28 ` Moumita
2025-05-11 13:37 ` Moumita
2025-05-11 14:11 ` [PATCH v6 0/1] Added the newline after the test in t/4018 Moumita
2025-05-11 14:11 ` [PATCH v6 1/1] userdiff: extend Bash pattern to cover more shell function forms Moumita
2025-05-13 18:50 ` Junio C Hamano
2025-05-14 6:33 ` MOUMITA DHAR
2025-05-16 7:25 ` Johannes Sixt
2025-05-17 13:09 ` Junio C Hamano
2025-05-18 7:41 ` Johannes Sixt
2025-05-16 14:45 ` [PATCH v7 0/1] Updated the word diff regex for Bash scripts Moumita
2025-05-16 14:45 ` [PATCH v7 1/1] userdiff: extend Bash pattern to cover more shell function forms Moumita
2025-05-16 17:45 ` Johannes Sixt
2025-05-16 21:56 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250211114611.9334-2-dhar61595@gmail.com \
--to=dhar61595@gmail.com \
--cc=ben.knoble@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--cc=raykar.ath@gmail.com \
--cc=sunshine@sunshineco.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.
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 NNTP newsgroup(s).