aboutsummaryrefslogtreecommitdiffstats
path: root/t/t4018/java-method-return-generic-bounded
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-08-30 16:06:05 -0700
committerJunio C Hamano <gitster@pobox.com>2021-08-30 16:06:05 -0700
commita8960868518aaee85da308f394503dada14bfcbc (patch)
tree2cada2d55a98a882044a9849998c439bdc4755cd /t/t4018/java-method-return-generic-bounded
parentMerge branch 'jk/range-diff-fixes' (diff)
parentuserdiff: improve java hunk header regex (diff)
downloadgit-a8960868518aaee85da308f394503dada14bfcbc.tar.gz
git-a8960868518aaee85da308f394503dada14bfcbc.zip
Merge branch 'th/userdiff-more-java'
The userdiff pattern for "java" language has been updated. * th/userdiff-more-java: userdiff: improve java hunk header regex
Diffstat (limited to 't/t4018/java-method-return-generic-bounded')
-rw-r--r--t/t4018/java-method-return-generic-bounded9
1 files changed, 9 insertions, 0 deletions
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 <T extends Bar & Foo<T>, R> Map<T, R[]> foo(String[] RIGHT) {
+ someMethodCall();
+ someOtherMethod()
+ .doThat();
+ // Whatever...
+ return (List<T>) Arrays.asList("ChangeMe");
+ }
+}