git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[GSOC][PATCH v2 3/3]userdiff: remove trailing whitespaces, fix multiline comments

From
SNSergius Nyah <sergiusnyah@gmail.com>
Date
Mar 12, 2024, 13:14 UTC
Message-ID
<20240312131448.638472-3-sergiusnyah@gmail.com>
In-Reply-To
<20240312131448.638472-1-sergiusnyah@gmail.com>

This patch removes trailing whitespaces and fixes multiline comments in the `userdiff.c` file to match Gits coding standards as seen in [1].

Signed-off-by: Sergius Nyah <sergiusnyah@gmail.com>
---
 userdiff.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/userdiff.c b/userdiff.c
index bbe2bcb9a3..15342c8662 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -184,17 +184,18 @@ PATTERNS("java",
 	 "|[-+*/<>%&^|=!]="
 	 "|--|\\+\\+|<<=?|>>>?=?|&&|\\|\\|"),
 PATTERNS("javascript",
-      /* Looks for lines that start with optional whitespace, followed
-      * by 'function'* and any characters (for function declarations),
-      * or valid JavaScript identifiers, equals sign '=', 'function' keyword
-      * and any characters (for function expressions).
-      * Also considers functions defined inside blocks with '{...}'.
-      */
-      "^[ \t]*(function[ \t]*.*|[a-zA-Z_$][0-9a-zA-Z_$]*[ \t]*=[ \t]*function[ \t]*.*|(\\{[ \t]*)?)\n",
-      /* This pattern matches JavaScript identifiers */
-      "[a-zA-Z_$][0-9a-zA-Z_$]*"
-      "|[-+0-9.eE]+|0[xX][0-9a-fA-F]+"
-      "|[-+*/<>%&^|=!:]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\|"),
+	/*
+	 * Look for lines that start with optional whitespace, followed
+	 * by 'function' and any characters (for function declarations),
+	 * or valid JavaScript identifiers, equals sign '=', 'function' keyword
+	 * and any characters (for function expressions).
+	 * Also consider functions defined inside blocks with '{...}'.
+	 */
+	 "^[ \t]*(function[ \t]*.*|[a-zA-Z_$][0-9a-zA-Z_$]*[ \t]*=[ \t]*function[ \t]*.*|(\\{[ \t]*)?)\n",
+	 /* Match JavaScript identifiers with this pattern */
+	 "[a-zA-Z_$][0-9a-zA-Z_$]*"
+	 "|[-+0-9.eE]+|0[xX][0-9a-fA-F]+"
+	 "|[-+*/<>%&^|=!:]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\|"),
 PATTERNS("kotlin",
 	 "^[ \t]*(([a-z]+[ \t]+)*(fun|class|interface)[ \t]+.*)$",
 	 /* -- */
--
2.43.2

[1]:
https://github.com/git/git/blob/master/Documentation/CodingGuidelines
Previous: Sergius NyahNext: Sergius Nyah
Message 31 of 33 in “[GSOC][RFC] Add more builtin patterns for userdiff, as Mircroproject.”
  1. Sergius NyahJan 9, 2024
  2. Christian CouderJan 10, 2024
  3. Fwd: [GSOC][RFC] Add more builtin patterns for userdiff, as Mircroproject.Sergius Nyah, Jan 11, 2024
  4. Christian CouderJan 11, 2024
  5. Sergius NyahJan 11, 2024
  6. [GSOC][PATCH 0/2] Add builtin patterns for userdiff in JavaScript, as Microproject.Sergius Nyah, Feb 27, 2024
  7. 1/2 Subject: [GSOC][RFC PATCH 1/2] Add builtin patterns for JavaScript function detection in userdiff.Sergius Nyah, Feb 27, 2024
  8. 2/2 Subject:[GSOC] [RFC PATCH 2/2] Add test for JavaScript function detection in Git diffsSergius Nyah, Feb 27, 2024
  9. [GSOC][PATCH 0/2] Add builtin patterns for userdiff in JavaScript, as Microproject.Sergius Nyah, Feb 27, 2024
  10. 1/2 Subject: [GSOC][RFC PATCH 1/2] Add builtin patterns for JavaScript function detection in userdiff.Sergius Nyah, Feb 27, 2024
  11. 2/2 Subject:[GSOC] [RFC PATCH 2/2] Add test for JavaScript function detection in Git diffsSergius Nyah, Feb 27, 2024
  12. [GSOC][PATCH 0/2] Add builtin patterns for userdiff in JavaScript, as Microproject.Sergius Nyah, Feb 27, 2024
  13. 1/2 Subject: [GSOC][RFC PATCH 1/2] Add builtin patterns for JavaScript function detection in userdiff.Sergius Nyah, Feb 27, 2024
  14. 2/2 Subject:[GSOC] [RFC PATCH 2/2] Add test for JavaScript function detection in Git diffsSergius Nyah, Feb 27, 2024
  15. [GSOC][PATCH 0/2] Add builtin patterns for userdiff in JavaScript, as Microproject.Sergius Nyah, Feb 27, 2024
  16. 1/2 Subject: [GSOC][RFC PATCH 1/2] Add builtin patterns for JavaScript function detection in userdiff.Sergius Nyah, Feb 27, 2024
  17. Ghanshyam ThakkarFeb 27, 2024
  18. Sergius NyahFeb 27, 2024
  19. 2/2 Subject:[GSOC] [RFC PATCH 2/2] Add test for JavaScript function detection in Git diffsSergius Nyah, Feb 27, 2024
  20. [GSOC][PATCH] Userdiff: add builtin patterns for JavaScript.Sergius Nyah, Feb 28, 2024
  21. Junio C HamanoFeb 28, 2024
  22. [GSOC][PATCH] userdiff: add builtin patterns for JavaScript.Sergius Nyah, Feb 29, 2024
  23. Ghanshyam ThakkarFeb 29, 2024
  24. [GSOC][PATCH] userdiff: Add JavaScript function patternsSergius Nyah, Mar 1, 2024
  25. Christian CouderMar 2, 2024
  26. Christian CouderMar 2, 2024
  27. Junio C HamanoMar 2, 2024
  28. Patrick SteinhardtMar 4, 2024
  29. [GSOC][PATCH v2 1/3]t4018-diff-funcname: use test_grep instead of test_i18ngrepSergius Nyah, Mar 12, 2024
  30. [GSOC][PATCH v2 2/3]t4034-diff-words: add javascript language driverSergius Nyah, Mar 12, 2024
  31. [GSOC][PATCH v2 3/3]userdiff: remove trailing whitespaces, fix multiline commentsSergius Nyah, Mar 12, 2024
  32. [GSOC][PATCH v2]userdiff: improve code quality and add JavaScript language driver.Sergius Nyah, Mar 19, 2024
  33. Junio C HamanoMar 19, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.