git/userdiff.c, branch v2.30.2

Merge branch 've/userdiff-bash'

2020-11-02T21:17:46Z

The userdiff pattern learned to identify the function definition in POSIX shells and bash. * ve/userdiff-bash: userdiff: support Bash

Merge branch 'sd/userdiff-css-update'

2020-10-27T22:09:46Z

Userdiff for CSS update. * sd/userdiff-css-update: userdiff: expand detected chunk headers for css

Merge branch 'kb/userdiff-rust-macro-rules'

2020-10-27T22:09:46Z

Userdiff for Rust update. * kb/userdiff-rust-macro-rules: userdiff: recognize 'macro_rules!' as starting a Rust function block

userdiff: support Bash

2020-10-22T17:29:30Z

Support POSIX, bashism and mixed function declarations, all four compound command types, trailing comments and mixed whitespace. Even though Bash allows locale-dependent characters in function names , only detect function names with characters allowed by POSIX.1-2017 for simplicity. This should cover the vast majority of use cases, and produces system-agnostic results. Since a word pattern has to be specified, but there is no easy way to know the default word pattern, use the default `IFS` characters for a starter. A later patch can improve this. Signed-off-by: Victor Engmark Acked-by: Johannes Sixt Signed-off-by: Junio C Hamano

userdiff: expand detected chunk headers for css

2020-10-08T17:21:11Z

The regex used for the CSS builtin diff driver in git is only able to show chunk headers for lines that start with a number, a letter or an underscore. However, the regex fails to detect classes (starts with a .), ids (starts with a #), :root and attribute-value based selectors (for example [class*="col-"]), as well as @based block-level statements like @page,@keyframes and @media since all of them, start with a special character. Allow the selectors and block level statements to begin with these special characters. Signed-off-by: Sohom Datta Signed-off-by: Junio C Hamano

userdiff: recognize 'macro_rules!' as starting a Rust function block

2020-10-07T15:48:20Z

Signed-off-by: Konrad Borowski Signed-off-by: Junio C Hamano

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

2020-10-07T15:45:43Z

PHP permits functions to be defined like final public function foo() { } abstract protected function bar() { } but our hunk header pattern does not recognize these decorations. Add "final" and "abstract" to the list of function modifiers. Helped-by: Johannes Sixt Signed-off-by: Javier Spagnoletti Signed-off-by: Junio C Hamano

userdiff: improve Fortran xfuncname regex

2020-08-13T18:21:18Z

The third part of the Fortran xfuncname regex wants to match the beginning of a subroutine or function, so it allows for all characters except `'`, `"` or whitespace before the keyword 'function' or 'subroutine'. This is meant to match the 'recursive', 'elemental' or 'pure' keywords, as well as function return types, and to prevent matches inside strings. However, the negated set does not contain the `!` comment character, so a line with an end-of-line comment containing the keyword 'function' or 'subroutine' followed by another word is mistakenly chosen as a hunk header. Improve the regex by adding `!` to the negated set. Signed-off-by: Philippe Blain Signed-off-by: Junio C Hamano

userdiff: add tests for Fortran xfuncname regex

2020-08-13T18:21:17Z

The Fortran userdiff patterns, introduced in 909a5494f8 (userdiff.c: add builtin fortran regex patterns, 2010-09-10), predate the test infrastructure for xfuncname patterns, introduced in bfa7d01413 (t4018: an infrastructure to test hunk headers, 2014-03-21). Add tests for the Fortran xfuncname patterns. The test 't/t4018/fortran-comment-keyword' documents a shortcoming of the regex that is fixed in a subsequent commit. While at it, add descriptive comments for the different parts of the regex. Signed-off-by: Philippe Blain Signed-off-by: Junio C Hamano

Merge branch 'ah/userdiff-markdown'

2020-05-08T21:25:01Z

The userdiff patterns for Markdown documents have been added. * ah/userdiff-markdown: userdiff: support Markdown