From f981445f8fa42d6e096d69f3c9ec7899bbd45eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= Date: Fri, 11 Feb 2022 21:39:16 +0100 Subject: [PATCH] Fix last bug --- pmd-java/etc/grammar/Java.jjt | 2 +- .../ast/jdkversiontests/jdk9_try_with_resources.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pmd-java/etc/grammar/Java.jjt b/pmd-java/etc/grammar/Java.jjt index aee40b0ff7..ed32a5bae5 100644 --- a/pmd-java/etc/grammar/Java.jjt +++ b/pmd-java/etc/grammar/Java.jjt @@ -2406,7 +2406,7 @@ void Resources() : void Resource() : {} { - LOOKAHEAD("this" | Name() ")") ( + LOOKAHEAD("this" | Name() (")" | ";")) ( {checkForBadConciseTryWithResourcesUsage();} Name() // replaced with Expression in PMD 7, do the bare minimum diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/jdk9_try_with_resources.java b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/jdk9_try_with_resources.java index 888c79a3d6..fdc0d8fe60 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/jdk9_try_with_resources.java +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/jdk9_try_with_resources.java @@ -2,6 +2,13 @@ public class InputJava9TryWithResources { public static void main() { MyResource resource1 = new MyResource(); MyResource resource2 = new MyResource(); + try (resource1) { } + try (resource1;) { } try (resource1; resource2) { } + try (resource1.foo) { } + try (resource1.foo.a) { } + try (resource1.foo.Type v = null) { } + try (this.foo.aa) { } + try (this.foo) { } } -} \ No newline at end of file +}