From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Apr 2021 00:23:34 +0000 (-0700)
Subject: Merge branch 'ab/userdiff-tests'
X-Git-Tag: v2.32.0-rc0~73
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab99efc817d463ddcd507a6457d33cd7643ed6dd;p=thirdparty%2Fgit.git

Merge branch 'ab/userdiff-tests'

A bit of code clean-up and a lot of test clean-up around userdiff
area.

* ab/userdiff-tests:
  blame tests: simplify userdiff driver test
  blame tests: don't rely on t/t4018/ directory
  userdiff: remove support for "broken" tests
  userdiff tests: list builtin drivers via test-tool
  userdiff tests: explicitly test "default" pattern
  userdiff: add and use for_each_userdiff_driver()
  userdiff style: normalize pascal regex declaration
  userdiff style: declare patterns with consistent style
  userdiff style: re-order drivers in alphabetical order
---

ab99efc817d463ddcd507a6457d33cd7643ed6dd
diff --cc userdiff.c
index 3897317aff,a667ccaa8c..3c3bbe38b0
--- a/userdiff.c
+++ b/userdiff.c
@@@ -191,55 -238,8 +238,17 @@@ PATTERNS("rust"
  	 "[a-zA-Z_][a-zA-Z0-9_]*"
  	 "|[0-9][0-9_a-fA-Fiosuxz]*(\\.([0-9]*[eE][+-]?)?[0-9_fF]*)?"
  	 "|[-+*\\/<>%&^|=!:]=|<<=?|>>=?|&&|\\|\\||->|=>|\\.{2}=|\\.{3}|::"),
 +PATTERNS("scheme",
 +	 "^[\t ]*(\\(((define|def(struct|syntax|class|method|rules|record|proto|alias)?)[-*/ \t]|(library|module|struct|class)[*+ \t]).*)$",
 +	 /*
 +	  * R7RS valid identifiers include any sequence enclosed
 +	  * within vertical lines having no backslashes
 +	  */
 +	 "\\|([^\\\\]*)\\|"
 +	 /* All other words should be delimited by spaces or parentheses */
 +	 "|([^][)(}{[ \t])+"),
- PATTERNS("bibtex", "(@[a-zA-Z]{1,}[ \t]*\\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
- 	 "[={}\"]|[^={}\" \t]+"),
  PATTERNS("tex", "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
  	 "\\\\[a-zA-Z@]+|\\\\.|[a-zA-Z0-9\x80-\xff]+"),
- PATTERNS("cpp",
- 	 /* Jump targets or access declarations */
- 	 "!^[ \t]*[A-Za-z_][A-Za-z_0-9]*:[[:space:]]*($|/[/*])\n"
- 	 /* functions/methods, variables, and compounds at top level */
- 	 "^((::[[:space:]]*)?[A-Za-z_].*)$",
- 	 /* -- */
- 	 "[a-zA-Z_][a-zA-Z0-9_]*"
- 	 "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lLuU]*"
- 	 "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->\\*?|\\.\\*"),
- PATTERNS("csharp",
- 	 /* Keywords */
- 	 "!^[ \t]*(do|while|for|if|else|instanceof|new|return|switch|case|throw|catch|using)\n"
- 	 /* Methods and constructors */
- 	 "^[ \t]*(((static|public|internal|private|protected|new|virtual|sealed|override|unsafe|async)[ \t]+)*[][<>@.~_[:alnum:]]+[ \t]+[<>@._[:alnum:]]+[ \t]*\\(.*\\))[ \t]*$\n"
- 	 /* Properties */
- 	 "^[ \t]*(((static|public|internal|private|protected|new|virtual|sealed|override|unsafe)[ \t]+)*[][<>@.~_[:alnum:]]+[ \t]+[@._[:alnum:]]+)[ \t]*$\n"
- 	 /* Type definitions */
- 	 "^[ \t]*(((static|public|internal|private|protected|new|unsafe|sealed|abstract|partial)[ \t]+)*(class|enum|interface|struct)[ \t]+.*)$\n"
- 	 /* Namespace */
- 	 "^[ \t]*(namespace[ \t]+.*)$",
- 	 /* -- */
- 	 "[a-zA-Z_][a-zA-Z0-9_]*"
- 	 "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?"
- 	 "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"),
- IPATTERN("css",
- 	 "![:;][[:space:]]*$\n"
- 	 "^[:[@.#]?[_a-z0-9].*$",
- 	 /* -- */
- 	 /*
- 	  * This regex comes from W3C CSS specs. Should theoretically also
- 	  * allow ISO 10646 characters U+00A0 and higher,
- 	  * but they are not handled in this regex.
- 	  */
- 	 "-?[_a-zA-Z][-_a-zA-Z0-9]*" /* identifiers */
- 	 "|-?[0-9]+|\\#[0-9a-fA-F]+" /* numbers */
- ),
  { "default", NULL, -1, { NULL, 0 } },
  };
  #undef PATTERNS