From a8cbc895893f4c244e54374d3bf937819fb6e2e9 Mon Sep 17 00:00:00 2001 From: Tassilo Horn Date: Wed, 11 Aug 2021 19:51:04 +0200 Subject: userdiff: improve java hunk header regex Currently, the git diff hunk headers show the wrong method signature if the method has a qualified return type, an array return type, or a generic return type because the regex doesn't allow dots (.), [], or < and > in the return type. Also, type parameter declarations couldn't be matched. Add several t4018 tests asserting the right hunk headers for different cases: - enum constant change - change in generic method with bounded type parameters - change in generic method with wildcard - field change in a nested class Signed-off-by: Tassilo Horn Signed-off-by: Junio C Hamano --- t/t4018/java-method-return-generic-bounded | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 t/t4018/java-method-return-generic-bounded (limited to 't/t4018/java-method-return-generic-bounded') diff --git a/t/t4018/java-method-return-generic-bounded b/t/t4018/java-method-return-generic-bounded new file mode 100644 index 0000000000..66dd78c379 --- /dev/null +++ b/t/t4018/java-method-return-generic-bounded @@ -0,0 +1,9 @@ +class MyExample { + public , R> Map foo(String[] RIGHT) { + someMethodCall(); + someOtherMethod() + .doThat(); + // Whatever... + return (List) Arrays.asList("ChangeMe"); + } +} -- cgit v1.2.3