diff options
author | rnveach <rveach02@gmail.com> | 2016-06-03 09:04:14 -0400 |
---|---|---|
committer | Roman Ivanov <romani@users.noreply.github.com> | 2016-06-03 06:04:14 -0700 |
commit | 5d1b87c2a2c3af12aa9d3f984007f596a55deba2 (patch) | |
tree | a6dcb7d859220847aa215732f402d585f26bbeab /src/test | |
parent | 9dbd6a73efb40ecd01505ca7b124b5f5c63ccd7d (diff) | |
download | checkstyle-5d1b87c2a2c3af12aa9d3f984007f596a55deba2.tar.gz |
Issue #3237: added secondary throws annotation to java grammar (#3244)
Diffstat (limited to 'src/test')
3 files changed, 385 insertions, 364 deletions
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/InputRegressionJava8Class1.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/InputRegressionJava8Class1.java index 2203c45e2..5e4f369ed 100644 --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/InputRegressionJava8Class1.java +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/InputRegressionJava8Class1.java @@ -22,6 +22,7 @@ public class InputRegressionJava8Class1 { public static void sm() {} void m1() throws @Nullable Exception {} public static <T> void m2(T @Nullable [] array) {} + public void m3() throws NullPointerException, @Nullable ArrayIndexOutOfBoundsException {} { List<String> vlist = new ArrayList<String>(); diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/InputRegressionJava8Class1Ast.txt b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/InputRegressionJava8Class1Ast.txt index 1f65a7108..b1e1f344d 100644 --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/InputRegressionJava8Class1Ast.txt +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/InputRegressionJava8Class1Ast.txt @@ -239,388 +239,407 @@ CLASS_DEF -> CLASS_DEF [17:0] | |--RPAREN -> ) [24:50] | `--SLIST -> { [24:52] | `--RCURLY -> } [24:53] - |--INSTANCE_INIT -> INSTANCE_INIT [26:4] - | `--SLIST -> { [26:4] - | |--VARIABLE_DEF -> VARIABLE_DEF [27:8] - | | |--MODIFIERS -> MODIFIERS [27:8] - | | |--TYPE -> TYPE [27:8] - | | | |--IDENT -> List [27:8] - | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [27:12] - | | | |--GENERIC_START -> < [27:12] - | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [27:13] - | | | | `--IDENT -> String [27:13] - | | | `--GENERIC_END -> > [27:19] - | | |--IDENT -> vlist [27:21] - | | `--ASSIGN -> = [27:27] - | | `--EXPR -> EXPR [27:29] - | | `--LITERAL_NEW -> new [27:29] - | | |--IDENT -> ArrayList [27:33] - | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [27:42] - | | | |--GENERIC_START -> < [27:42] - | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [27:43] - | | | | `--IDENT -> String [27:43] - | | | `--GENERIC_END -> > [27:49] - | | |--LPAREN -> ( [27:50] - | | |--ELIST -> ELIST [27:51] - | | `--RPAREN -> ) [27:51] - | |--SEMI -> ; [27:52] - | `--RCURLY -> } [28:4] - |--METHOD_DEF -> METHOD_DEF [30:4] - | |--MODIFIERS -> MODIFIERS [30:4] - | | `--LITERAL_PUBLIC -> public [30:4] - | |--TYPE -> TYPE [30:11] - | | `--LITERAL_VOID -> void [30:11] - | |--IDENT -> instructions [30:16] - | |--LPAREN -> ( [30:28] - | |--PARAMETERS -> PARAMETERS [30:29] - | |--RPAREN -> ) [30:29] - | `--SLIST -> { [30:31] - | |--VARIABLE_DEF -> VARIABLE_DEF [32:8] - | | |--MODIFIERS -> MODIFIERS [32:8] - | | |--TYPE -> TYPE [32:8] - | | | `--LITERAL_BOOLEAN -> boolean [32:8] - | | |--IDENT -> b [32:16] - | | `--ASSIGN -> = [32:18] - | | `--EXPR -> EXPR [32:34] - | | `--GT -> > [32:34] - | | |--METHOD_CALL -> ( [32:31] - | | | |--DOT -> . [32:24] - | | | | |--IDENT -> Math [32:20] - | | | | `--IDENT -> random [32:25] - | | | |--ELIST -> ELIST [32:32] - | | | `--RPAREN -> ) [32:32] - | | `--NUM_INT -> 0 [32:36] - | |--SEMI -> ; [32:37] - | |--VARIABLE_DEF -> VARIABLE_DEF [34:8] - | | |--MODIFIERS -> MODIFIERS [34:8] - | | |--TYPE -> TYPE [34:8] - | | | `--LITERAL_INT -> int [34:8] - | | `--IDENT -> vint [34:12] - | |--SEMI -> ; [34:16] + |--METHOD_DEF -> METHOD_DEF [25:4] + | |--MODIFIERS -> MODIFIERS [25:4] + | | `--LITERAL_PUBLIC -> public [25:4] + | |--TYPE -> TYPE [25:11] + | | `--LITERAL_VOID -> void [25:11] + | |--IDENT -> m3 [25:16] + | |--LPAREN -> ( [25:18] + | |--PARAMETERS -> PARAMETERS [25:19] + | |--RPAREN -> ) [25:19] + | |--LITERAL_THROWS -> throws [25:21] + | | |--IDENT -> NullPointerException [25:28] + | | |--COMMA -> , [25:48] + | | |--ANNOTATIONS -> ANNOTATIONS [25:50] + | | | `--ANNOTATION -> ANNOTATION [25:50] + | | | |--AT -> @ [25:50] + | | | `--IDENT -> Nullable [25:51] + | | `--IDENT -> ArrayIndexOutOfBoundsException [25:60] + | `--SLIST -> { [25:91] + | `--RCURLY -> } [25:92] + |--INSTANCE_INIT -> INSTANCE_INIT [27:4] + | `--SLIST -> { [27:4] + | |--VARIABLE_DEF -> VARIABLE_DEF [28:8] + | | |--MODIFIERS -> MODIFIERS [28:8] + | | |--TYPE -> TYPE [28:8] + | | | |--IDENT -> List [28:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [28:12] + | | | |--GENERIC_START -> < [28:12] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [28:13] + | | | | `--IDENT -> String [28:13] + | | | `--GENERIC_END -> > [28:19] + | | |--IDENT -> vlist [28:21] + | | `--ASSIGN -> = [28:27] + | | `--EXPR -> EXPR [28:29] + | | `--LITERAL_NEW -> new [28:29] + | | |--IDENT -> ArrayList [28:33] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [28:42] + | | | |--GENERIC_START -> < [28:42] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [28:43] + | | | | `--IDENT -> String [28:43] + | | | `--GENERIC_END -> > [28:49] + | | |--LPAREN -> ( [28:50] + | | |--ELIST -> ELIST [28:51] + | | `--RPAREN -> ) [28:51] + | |--SEMI -> ; [28:52] + | `--RCURLY -> } [29:4] + |--METHOD_DEF -> METHOD_DEF [31:4] + | |--MODIFIERS -> MODIFIERS [31:4] + | | `--LITERAL_PUBLIC -> public [31:4] + | |--TYPE -> TYPE [31:11] + | | `--LITERAL_VOID -> void [31:11] + | |--IDENT -> instructions [31:16] + | |--LPAREN -> ( [31:28] + | |--PARAMETERS -> PARAMETERS [31:29] + | |--RPAREN -> ) [31:29] + | `--SLIST -> { [31:31] + | |--VARIABLE_DEF -> VARIABLE_DEF [33:8] + | | |--MODIFIERS -> MODIFIERS [33:8] + | | |--TYPE -> TYPE [33:8] + | | | `--LITERAL_BOOLEAN -> boolean [33:8] + | | |--IDENT -> b [33:16] + | | `--ASSIGN -> = [33:18] + | | `--EXPR -> EXPR [33:34] + | | `--GT -> > [33:34] + | | |--METHOD_CALL -> ( [33:31] + | | | |--DOT -> . [33:24] + | | | | |--IDENT -> Math [33:20] + | | | | `--IDENT -> random [33:25] + | | | |--ELIST -> ELIST [33:32] + | | | `--RPAREN -> ) [33:32] + | | `--NUM_INT -> 0 [33:36] + | |--SEMI -> ; [33:37] | |--VARIABLE_DEF -> VARIABLE_DEF [35:8] | | |--MODIFIERS -> MODIFIERS [35:8] | | |--TYPE -> TYPE [35:8] - | | | `--IDENT -> Object [35:8] - | | |--IDENT -> o [35:15] - | | `--ASSIGN -> = [35:17] - | | `--EXPR -> EXPR [35:19] - | | `--LITERAL_NULL -> null [35:19] - | |--SEMI -> ; [35:23] + | | | `--LITERAL_INT -> int [35:8] + | | `--IDENT -> vint [35:12] + | |--SEMI -> ; [35:16] | |--VARIABLE_DEF -> VARIABLE_DEF [36:8] | | |--MODIFIERS -> MODIFIERS [36:8] | | |--TYPE -> TYPE [36:8] - | | | |--IDENT -> List [36:8] - | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [36:12] - | | | |--GENERIC_START -> < [36:12] - | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [36:13] - | | | | `--IDENT -> String [36:13] - | | | `--GENERIC_END -> > [36:19] - | | `--IDENT -> vlist [36:21] - | |--SEMI -> ; [36:26] - | |--EXPR -> EXPR [37:14] - | | `--ASSIGN -> = [37:14] - | | |--IDENT -> vlist [37:8] - | | `--LITERAL_NEW -> new [37:16] - | | |--IDENT -> ArrayList [37:20] - | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [37:29] - | | | |--GENERIC_START -> < [37:29] - | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [37:30] - | | | | `--IDENT -> String [37:30] - | | | `--GENERIC_END -> > [37:36] - | | |--LPAREN -> ( [37:37] - | | |--ELIST -> ELIST [37:38] - | | `--RPAREN -> ) [37:38] - | |--SEMI -> ; [37:39] - | |--VARIABLE_DEF -> VARIABLE_DEF [38:8] - | | |--MODIFIERS -> MODIFIERS [38:8] - | | |--TYPE -> TYPE [38:8] - | | | |--IDENT -> Supplier [38:8] - | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [38:16] - | | | |--GENERIC_START -> < [38:16] - | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [38:17] - | | | | `--WILDCARD_TYPE -> ? [38:17] - | | | `--GENERIC_END -> > [38:18] - | | `--IDENT -> s [38:20] - | |--SEMI -> ; [38:21] - | |--VARIABLE_DEF -> VARIABLE_DEF [41:11] - | | |--MODIFIERS -> MODIFIERS [41:11] - | | |--TYPE -> TYPE [41:11] - | | | `--DOT -> . [41:11] - | | | |--IDENT -> Map [41:8] - | | | |--ANNOTATIONS -> ANNOTATIONS [41:12] - | | | | `--ANNOTATION -> ANNOTATION [41:12] - | | | | |--AT -> @ [41:12] - | | | | `--IDENT -> Nullable [41:13] - | | | `--IDENT -> Entry [41:22] - | | `--IDENT -> e [41:28] - | |--SEMI -> ; [41:29] - | |--VARIABLE_DEF -> VARIABLE_DEF [42:8] - | | |--MODIFIERS -> MODIFIERS [42:8] - | | |--TYPE -> TYPE [42:8] - | | | `--IDENT -> String [42:8] - | | |--IDENT -> str [42:15] - | | `--ASSIGN -> = [42:19] - | | `--EXPR -> EXPR [42:21] - | | `--TYPECAST -> ( [42:21] - | | |--TYPE -> TYPE [42:22] - | | | |--ANNOTATIONS -> ANNOTATIONS [42:22] - | | | | `--ANNOTATION -> ANNOTATION [42:22] - | | | | |--AT -> @ [42:22] - | | | | `--IDENT -> Nullable [42:23] - | | | `--IDENT -> String [42:32] - | | |--RPAREN -> ) [42:38] - | | `--STRING_LITERAL -> "" [42:40] - | |--SEMI -> ; [42:42] - | |--EXPR -> EXPR [43:42] - | | `--METHOD_CALL -> ( [43:42] - | | |--DOT -> . [43:22] - | | | |--LPAREN -> ( [43:8] - | | | |--LITERAL_NEW -> new [43:9] - | | | | |--IDENT -> Inner3 [43:13] - | | | | |--LPAREN -> ( [43:19] - | | | | |--ELIST -> ELIST [43:20] - | | | | `--RPAREN -> ) [43:20] - | | | |--RPAREN -> ) [43:21] - | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [43:23] - | | | | |--GENERIC_START -> < [43:23] - | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [43:24] - | | | | | |--ANNOTATIONS -> ANNOTATIONS [43:24] - | | | | | | `--ANNOTATION -> ANNOTATION [43:24] - | | | | | | |--AT -> @ [43:24] - | | | | | | `--IDENT -> Nullable [43:25] - | | | | | `--IDENT -> String [43:34] - | | | | `--GENERIC_END -> > [43:40] - | | | `--IDENT -> m [43:41] - | | |--ELIST -> ELIST [43:43] - | | `--RPAREN -> ) [43:43] - | |--SEMI -> ; [43:44] - | |--VARIABLE_DEF -> VARIABLE_DEF [46:8] - | | |--MODIFIERS -> MODIFIERS [46:8] - | | |--TYPE -> TYPE [46:8] - | | | `--IDENT -> IntBinaryOperator [46:8] - | | |--IDENT -> ibo [46:26] - | | `--ASSIGN -> = [46:30] - | | `--EXPR -> EXPR [46:36] - | | `--METHOD_REF -> :: [46:36] - | | |--IDENT -> Math [46:32] - | | `--IDENT -> max [46:38] - | |--SEMI -> ; [46:41] - | |--EXPR -> EXPR [47:10] - | | `--ASSIGN -> = [47:10] - | | |--IDENT -> s [47:8] - | | `--METHOD_REF -> :: [47:38] - | | |--IDENT -> InputRegressionJava8Class1 [47:12] - | | `--LITERAL_NEW -> new [47:40] - | |--SEMI -> ; [47:43] + | | | `--IDENT -> Object [36:8] + | | |--IDENT -> o [36:15] + | | `--ASSIGN -> = [36:17] + | | `--EXPR -> EXPR [36:19] + | | `--LITERAL_NULL -> null [36:19] + | |--SEMI -> ; [36:23] + | |--VARIABLE_DEF -> VARIABLE_DEF [37:8] + | | |--MODIFIERS -> MODIFIERS [37:8] + | | |--TYPE -> TYPE [37:8] + | | | |--IDENT -> List [37:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [37:12] + | | | |--GENERIC_START -> < [37:12] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [37:13] + | | | | `--IDENT -> String [37:13] + | | | `--GENERIC_END -> > [37:19] + | | `--IDENT -> vlist [37:21] + | |--SEMI -> ; [37:26] + | |--EXPR -> EXPR [38:14] + | | `--ASSIGN -> = [38:14] + | | |--IDENT -> vlist [38:8] + | | `--LITERAL_NEW -> new [38:16] + | | |--IDENT -> ArrayList [38:20] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [38:29] + | | | |--GENERIC_START -> < [38:29] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [38:30] + | | | | `--IDENT -> String [38:30] + | | | `--GENERIC_END -> > [38:36] + | | |--LPAREN -> ( [38:37] + | | |--ELIST -> ELIST [38:38] + | | `--RPAREN -> ) [38:38] + | |--SEMI -> ; [38:39] + | |--VARIABLE_DEF -> VARIABLE_DEF [39:8] + | | |--MODIFIERS -> MODIFIERS [39:8] + | | |--TYPE -> TYPE [39:8] + | | | |--IDENT -> Supplier [39:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [39:16] + | | | |--GENERIC_START -> < [39:16] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [39:17] + | | | | `--WILDCARD_TYPE -> ? [39:17] + | | | `--GENERIC_END -> > [39:18] + | | `--IDENT -> s [39:20] + | |--SEMI -> ; [39:21] + | |--VARIABLE_DEF -> VARIABLE_DEF [42:11] + | | |--MODIFIERS -> MODIFIERS [42:11] + | | |--TYPE -> TYPE [42:11] + | | | `--DOT -> . [42:11] + | | | |--IDENT -> Map [42:8] + | | | |--ANNOTATIONS -> ANNOTATIONS [42:12] + | | | | `--ANNOTATION -> ANNOTATION [42:12] + | | | | |--AT -> @ [42:12] + | | | | `--IDENT -> Nullable [42:13] + | | | `--IDENT -> Entry [42:22] + | | `--IDENT -> e [42:28] + | |--SEMI -> ; [42:29] + | |--VARIABLE_DEF -> VARIABLE_DEF [43:8] + | | |--MODIFIERS -> MODIFIERS [43:8] + | | |--TYPE -> TYPE [43:8] + | | | `--IDENT -> String [43:8] + | | |--IDENT -> str [43:15] + | | `--ASSIGN -> = [43:19] + | | `--EXPR -> EXPR [43:21] + | | `--TYPECAST -> ( [43:21] + | | |--TYPE -> TYPE [43:22] + | | | |--ANNOTATIONS -> ANNOTATIONS [43:22] + | | | | `--ANNOTATION -> ANNOTATION [43:22] + | | | | |--AT -> @ [43:22] + | | | | `--IDENT -> Nullable [43:23] + | | | `--IDENT -> String [43:32] + | | |--RPAREN -> ) [43:38] + | | `--STRING_LITERAL -> "" [43:40] + | |--SEMI -> ; [43:42] + | |--EXPR -> EXPR [44:42] + | | `--METHOD_CALL -> ( [44:42] + | | |--DOT -> . [44:22] + | | | |--LPAREN -> ( [44:8] + | | | |--LITERAL_NEW -> new [44:9] + | | | | |--IDENT -> Inner3 [44:13] + | | | | |--LPAREN -> ( [44:19] + | | | | |--ELIST -> ELIST [44:20] + | | | | `--RPAREN -> ) [44:20] + | | | |--RPAREN -> ) [44:21] + | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [44:23] + | | | | |--GENERIC_START -> < [44:23] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [44:24] + | | | | | |--ANNOTATIONS -> ANNOTATIONS [44:24] + | | | | | | `--ANNOTATION -> ANNOTATION [44:24] + | | | | | | |--AT -> @ [44:24] + | | | | | | `--IDENT -> Nullable [44:25] + | | | | | `--IDENT -> String [44:34] + | | | | `--GENERIC_END -> > [44:40] + | | | `--IDENT -> m [44:41] + | | |--ELIST -> ELIST [44:43] + | | `--RPAREN -> ) [44:43] + | |--SEMI -> ; [44:44] + | |--VARIABLE_DEF -> VARIABLE_DEF [47:8] + | | |--MODIFIERS -> MODIFIERS [47:8] + | | |--TYPE -> TYPE [47:8] + | | | `--IDENT -> IntBinaryOperator [47:8] + | | |--IDENT -> ibo [47:26] + | | `--ASSIGN -> = [47:30] + | | `--EXPR -> EXPR [47:36] + | | `--METHOD_REF -> :: [47:36] + | | |--IDENT -> Math [47:32] + | | `--IDENT -> max [47:38] + | |--SEMI -> ; [47:41] | |--EXPR -> EXPR [48:10] | | `--ASSIGN -> = [48:10] | | |--IDENT -> s [48:8] - | | `--METHOD_REF -> :: [48:33] - | | |--DOT -> . [48:18] - | | | |--IDENT -> Inner1 [48:12] - | | | |--IDENT -> Inner2 [48:19] - | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [48:25] - | | | |--GENERIC_START -> < [48:25] - | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [48:26] - | | | | `--IDENT -> String [48:26] - | | | `--GENERIC_END -> > [48:32] - | | `--LITERAL_NEW -> new [48:35] - | |--SEMI -> ; [48:38] - | |--VARIABLE_DEF -> VARIABLE_DEF [51:8] - | | |--MODIFIERS -> MODIFIERS [51:8] - | | |--TYPE -> TYPE [51:8] - | | | `--IDENT -> Runnable [51:8] - | | |--IDENT -> r1 [51:17] - | | `--ASSIGN -> = [51:20] - | | `--LAMBDA -> -> [51:25] - | | |--LPAREN -> ( [51:22] - | | |--PARAMETERS -> PARAMETERS [51:23] - | | |--RPAREN -> ) [51:23] - | | `--EXPR -> EXPR [51:29] - | | `--METHOD_CALL -> ( [51:29] - | | |--IDENT -> m [51:28] - | | |--ELIST -> ELIST [51:30] - | | `--RPAREN -> ) [51:30] - | |--SEMI -> ; [51:31] + | | `--METHOD_REF -> :: [48:38] + | | |--IDENT -> InputRegressionJava8Class1 [48:12] + | | `--LITERAL_NEW -> new [48:40] + | |--SEMI -> ; [48:43] + | |--EXPR -> EXPR [49:10] + | | `--ASSIGN -> = [49:10] + | | |--IDENT -> s [49:8] + | | `--METHOD_REF -> :: [49:33] + | | |--DOT -> . [49:18] + | | | |--IDENT -> Inner1 [49:12] + | | | |--IDENT -> Inner2 [49:19] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [49:25] + | | | |--GENERIC_START -> < [49:25] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [49:26] + | | | | `--IDENT -> String [49:26] + | | | `--GENERIC_END -> > [49:32] + | | `--LITERAL_NEW -> new [49:35] + | |--SEMI -> ; [49:38] | |--VARIABLE_DEF -> VARIABLE_DEF [52:8] | | |--MODIFIERS -> MODIFIERS [52:8] | | |--TYPE -> TYPE [52:8] | | | `--IDENT -> Runnable [52:8] - | | |--IDENT -> r2 [52:17] + | | |--IDENT -> r1 [52:17] | | `--ASSIGN -> = [52:20] | | `--LAMBDA -> -> [52:25] | | |--LPAREN -> ( [52:22] | | |--PARAMETERS -> PARAMETERS [52:23] | | |--RPAREN -> ) [52:23] - | | `--SLIST -> { [52:28] - | | |--EXPR -> EXPR [52:31] - | | | `--METHOD_CALL -> ( [52:31] - | | | |--IDENT -> m [52:30] - | | | |--ELIST -> ELIST [52:32] - | | | `--RPAREN -> ) [52:32] - | | |--SEMI -> ; [52:33] - | | `--RCURLY -> } [52:35] - | |--SEMI -> ; [52:37] - | |--EXPR -> EXPR [53:24] - | | `--METHOD_CALL -> ( [53:24] - | | |--DOT -> . [53:19] - | | | |--IDENT -> Collections [53:8] - | | | `--IDENT -> sort [53:20] - | | |--ELIST -> ELIST [53:25] - | | | |--EXPR -> EXPR [53:25] - | | | | `--IDENT -> vlist [53:25] - | | | |--COMMA -> , [53:30] - | | | `--LAMBDA -> -> [53:40] - | | | |--LPAREN -> ( [53:32] - | | | |--PARAMETERS -> PARAMETERS [53:33] - | | | | |--PARAMETER_DEF -> PARAMETER_DEF [53:33] - | | | | | |--MODIFIERS -> MODIFIERS [53:33] - | | | | | |--TYPE -> TYPE [53:33] - | | | | | `--IDENT -> l [53:33] - | | | | |--COMMA -> , [53:34] - | | | | `--PARAMETER_DEF -> PARAMETER_DEF [53:37] - | | | | |--MODIFIERS -> MODIFIERS [53:37] - | | | | |--TYPE -> TYPE [53:37] - | | | | `--IDENT -> r [53:37] - | | | |--RPAREN -> ) [53:38] - | | | `--EXPR -> EXPR [53:50] - | | | `--QUESTION -> ? [53:50] - | | | |--EQUAL -> == [53:45] - | | | | |--IDENT -> l [53:43] - | | | | `--IDENT -> r [53:48] - | | | |--NUM_INT -> 0 [53:52] - | | | |--COLON -> : [53:54] - | | | `--NUM_INT -> 1 [53:56] - | | `--RPAREN -> ) [53:57] - | |--SEMI -> ; [53:58] - | |--VARIABLE_DEF -> VARIABLE_DEF [54:8] - | | |--MODIFIERS -> MODIFIERS [54:8] - | | |--TYPE -> TYPE [54:8] - | | | |--IDENT -> Predicate [54:8] - | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [54:17] - | | | |--GENERIC_START -> < [54:17] - | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [54:18] - | | | | `--WILDCARD_TYPE -> ? [54:18] - | | | `--GENERIC_END -> > [54:19] - | | |--IDENT -> t [54:21] - | | `--ASSIGN -> = [54:23] - | | `--EXPR -> EXPR [54:29] - | | `--QUESTION -> ? [54:29] - | | |--LPAREN -> ( [54:25] - | | |--IDENT -> b [54:26] - | | |--RPAREN -> ) [54:27] - | | |--LITERAL_NULL -> null [54:31] - | | |--COLON -> : [54:36] - | | `--LAMBDA -> -> [54:45] - | | |--IDENT -> object [54:38] - | | `--EXPR -> EXPR [54:56] - | | `--METHOD_CALL -> ( [54:56] - | | |--DOT -> . [54:49] - | | | |--IDENT -> o [54:48] - | | | `--IDENT -> equals [54:50] - | | |--ELIST -> ELIST [54:57] - | | | `--EXPR -> EXPR [54:57] - | | | `--IDENT -> object [54:57] - | | `--RPAREN -> ) [54:63] - | |--SEMI -> ; [54:64] + | | `--EXPR -> EXPR [52:29] + | | `--METHOD_CALL -> ( [52:29] + | | |--IDENT -> m [52:28] + | | |--ELIST -> ELIST [52:30] + | | `--RPAREN -> ) [52:30] + | |--SEMI -> ; [52:31] + | |--VARIABLE_DEF -> VARIABLE_DEF [53:8] + | | |--MODIFIERS -> MODIFIERS [53:8] + | | |--TYPE -> TYPE [53:8] + | | | `--IDENT -> Runnable [53:8] + | | |--IDENT -> r2 [53:17] + | | `--ASSIGN -> = [53:20] + | | `--LAMBDA -> -> [53:25] + | | |--LPAREN -> ( [53:22] + | | |--PARAMETERS -> PARAMETERS [53:23] + | | |--RPAREN -> ) [53:23] + | | `--SLIST -> { [53:28] + | | |--EXPR -> EXPR [53:31] + | | | `--METHOD_CALL -> ( [53:31] + | | | |--IDENT -> m [53:30] + | | | |--ELIST -> ELIST [53:32] + | | | `--RPAREN -> ) [53:32] + | | |--SEMI -> ; [53:33] + | | `--RCURLY -> } [53:35] + | |--SEMI -> ; [53:37] + | |--EXPR -> EXPR [54:24] + | | `--METHOD_CALL -> ( [54:24] + | | |--DOT -> . [54:19] + | | | |--IDENT -> Collections [54:8] + | | | `--IDENT -> sort [54:20] + | | |--ELIST -> ELIST [54:25] + | | | |--EXPR -> EXPR [54:25] + | | | | `--IDENT -> vlist [54:25] + | | | |--COMMA -> , [54:30] + | | | `--LAMBDA -> -> [54:40] + | | | |--LPAREN -> ( [54:32] + | | | |--PARAMETERS -> PARAMETERS [54:33] + | | | | |--PARAMETER_DEF -> PARAMETER_DEF [54:33] + | | | | | |--MODIFIERS -> MODIFIERS [54:33] + | | | | | |--TYPE -> TYPE [54:33] + | | | | | `--IDENT -> l [54:33] + | | | | |--COMMA -> , [54:34] + | | | | `--PARAMETER_DEF -> PARAMETER_DEF [54:37] + | | | | |--MODIFIERS -> MODIFIERS [54:37] + | | | | |--TYPE -> TYPE [54:37] + | | | | `--IDENT -> r [54:37] + | | | |--RPAREN -> ) [54:38] + | | | `--EXPR -> EXPR [54:50] + | | | `--QUESTION -> ? [54:50] + | | | |--EQUAL -> == [54:45] + | | | | |--IDENT -> l [54:43] + | | | | `--IDENT -> r [54:48] + | | | |--NUM_INT -> 0 [54:52] + | | | |--COLON -> : [54:54] + | | | `--NUM_INT -> 1 [54:56] + | | `--RPAREN -> ) [54:57] + | |--SEMI -> ; [54:58] | |--VARIABLE_DEF -> VARIABLE_DEF [55:8] | | |--MODIFIERS -> MODIFIERS [55:8] | | |--TYPE -> TYPE [55:8] - | | | `--IDENT -> Double [55:8] - | | |--IDENT -> mPi [55:15] - | | `--ASSIGN -> = [55:19] - | | `--EXPR -> EXPR [55:25] - | | `--DOT -> . [55:25] - | | |--IDENT -> Math [55:21] - | | `--IDENT -> PI [55:26] - | |--SEMI -> ; [55:28] - | `--RCURLY -> } [56:4] - |--VARIABLE_DEF -> VARIABLE_DEF [58:4] - | |--MODIFIERS -> MODIFIERS [58:4] - | | |--LITERAL_STATIC -> static [58:4] - | | `--FINAL -> final [58:11] - | |--TYPE -> TYPE [58:17] - | | |--IDENT -> Comparator [58:17] - | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [58:27] - | | |--GENERIC_START -> < [58:27] - | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [58:28] - | | | `--WILDCARD_TYPE -> ? [58:28] - | | `--GENERIC_END -> > [58:29] - | |--IDENT -> f [58:31] - | |--ASSIGN -> = [58:33] - | | `--EXPR -> EXPR [58:35] - | | `--TYPECAST -> ( [58:35] - | | |--TYPE -> TYPE [58:36] - | | | |--IDENT -> Comparator [58:36] - | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [58:46] - | | | |--GENERIC_START -> < [58:46] - | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [58:47] - | | | | `--WILDCARD_TYPE -> ? [58:47] - | | | `--GENERIC_END -> > [58:48] - | | |--RPAREN -> ) [58:49] - | | `--LAMBDA -> -> [58:74] - | | |--LPAREN -> ( [58:51] - | | |--PARAMETERS -> PARAMETERS [58:52] - | | | |--PARAMETER_DEF -> PARAMETER_DEF [58:52] - | | | | |--MODIFIERS -> MODIFIERS [58:52] - | | | | |--TYPE -> TYPE [58:52] - | | | | `--IDENT -> dateTime1 [58:52] - | | | |--COMMA -> , [58:61] - | | | `--PARAMETER_DEF -> PARAMETER_DEF [58:63] - | | | |--MODIFIERS -> MODIFIERS [58:63] - | | | |--TYPE -> TYPE [58:63] - | | | `--IDENT -> dateTime2 [58:63] - | | |--RPAREN -> ) [58:72] - | | `--SLIST -> { [58:77] - | | |--LITERAL_RETURN -> return [58:79] - | | | |--EXPR -> EXPR [58:86] - | | | | `--NUM_INT -> 0 [58:86] - | | | `--SEMI -> ; [58:87] - | | `--RCURLY -> } [58:89] - | `--SEMI -> ; [58:90] - `--RCURLY -> } [59:0] -SEMI -> ; [60:0] -CLASS_DEF -> CLASS_DEF [61:0] -|--MODIFIERS -> MODIFIERS [61:0] -|--LITERAL_CLASS -> class [61:0] -|--IDENT -> InputRegressionJava8TypeParam [61:6] -|--TYPE_PARAMETERS -> TYPE_PARAMETERS [61:36] -| |--GENERIC_START -> < [61:36] -| |--TYPE_PARAMETER -> TYPE_PARAMETER [61:37] -| | |--ANNOTATIONS -> ANNOTATIONS [61:37] -| | | `--ANNOTATION -> ANNOTATION [61:37] -| | | |--AT -> @ [61:37] -| | | `--IDENT -> Nullable [61:38] -| | `--IDENT -> T [61:47] -| `--GENERIC_END -> > [61:48] -`--OBJBLOCK -> OBJBLOCK [61:50] - |--LCURLY -> { [61:50] - `--RCURLY -> } [62:0] -ANNOTATION_DEF -> ANNOTATION_DEF [63:0] -|--MODIFIERS -> MODIFIERS [63:0] -| |--ANNOTATION -> ANNOTATION [63:0] -| | |--AT -> @ [63:0] -| | |--IDENT -> Retention [63:1] -| | |--LPAREN -> ( [63:10] -| | |--EXPR -> EXPR [63:26] -| | | `--DOT -> . [63:26] -| | | |--IDENT -> RetentionPolicy [63:11] -| | | `--IDENT -> CLASS [63:27] -| | `--RPAREN -> ) [63:32] -| `--ANNOTATION -> ANNOTATION [64:0] -| |--AT -> @ [64:0] -| |--IDENT -> Target [64:1] -| |--LPAREN -> ( [64:7] -| |--ANNOTATION_ARRAY_INIT -> { [64:8] -| | |--EXPR -> EXPR [64:21] -| | | `--DOT -> . [64:21] -| | | |--IDENT -> ElementType [64:10] -| | | `--IDENT -> TYPE_USE [64:22] -| | `--RCURLY -> } [64:31] -| `--RPAREN -> ) [64:32] -|--AT -> @ [65:0] -|--LITERAL_INTERFACE -> interface [65:1] -|--IDENT -> Nullable [65:11] -`--OBJBLOCK -> OBJBLOCK [65:20] - |--LCURLY -> { [65:20] - `--RCURLY -> } [66:0] + | | | |--IDENT -> Predicate [55:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [55:17] + | | | |--GENERIC_START -> < [55:17] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [55:18] + | | | | `--WILDCARD_TYPE -> ? [55:18] + | | | `--GENERIC_END -> > [55:19] + | | |--IDENT -> t [55:21] + | | `--ASSIGN -> = [55:23] + | | `--EXPR -> EXPR [55:29] + | | `--QUESTION -> ? [55:29] + | | |--LPAREN -> ( [55:25] + | | |--IDENT -> b [55:26] + | | |--RPAREN -> ) [55:27] + | | |--LITERAL_NULL -> null [55:31] + | | |--COLON -> : [55:36] + | | `--LAMBDA -> -> [55:45] + | | |--IDENT -> object [55:38] + | | `--EXPR -> EXPR [55:56] + | | `--METHOD_CALL -> ( [55:56] + | | |--DOT -> . [55:49] + | | | |--IDENT -> o [55:48] + | | | `--IDENT -> equals [55:50] + | | |--ELIST -> ELIST [55:57] + | | | `--EXPR -> EXPR [55:57] + | | | `--IDENT -> object [55:57] + | | `--RPAREN -> ) [55:63] + | |--SEMI -> ; [55:64] + | |--VARIABLE_DEF -> VARIABLE_DEF [56:8] + | | |--MODIFIERS -> MODIFIERS [56:8] + | | |--TYPE -> TYPE [56:8] + | | | `--IDENT -> Double [56:8] + | | |--IDENT -> mPi [56:15] + | | `--ASSIGN -> = [56:19] + | | `--EXPR -> EXPR [56:25] + | | `--DOT -> . [56:25] + | | |--IDENT -> Math [56:21] + | | `--IDENT -> PI [56:26] + | |--SEMI -> ; [56:28] + | `--RCURLY -> } [57:4] + |--VARIABLE_DEF -> VARIABLE_DEF [59:4] + | |--MODIFIERS -> MODIFIERS [59:4] + | | |--LITERAL_STATIC -> static [59:4] + | | `--FINAL -> final [59:11] + | |--TYPE -> TYPE [59:17] + | | |--IDENT -> Comparator [59:17] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [59:27] + | | |--GENERIC_START -> < [59:27] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [59:28] + | | | `--WILDCARD_TYPE -> ? [59:28] + | | `--GENERIC_END -> > [59:29] + | |--IDENT -> f [59:31] + | |--ASSIGN -> = [59:33] + | | `--EXPR -> EXPR [59:35] + | | `--TYPECAST -> ( [59:35] + | | |--TYPE -> TYPE [59:36] + | | | |--IDENT -> Comparator [59:36] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [59:46] + | | | |--GENERIC_START -> < [59:46] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [59:47] + | | | | `--WILDCARD_TYPE -> ? [59:47] + | | | `--GENERIC_END -> > [59:48] + | | |--RPAREN -> ) [59:49] + | | `--LAMBDA -> -> [59:74] + | | |--LPAREN -> ( [59:51] + | | |--PARAMETERS -> PARAMETERS [59:52] + | | | |--PARAMETER_DEF -> PARAMETER_DEF [59:52] + | | | | |--MODIFIERS -> MODIFIERS [59:52] + | | | | |--TYPE -> TYPE [59:52] + | | | | `--IDENT -> dateTime1 [59:52] + | | | |--COMMA -> , [59:61] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [59:63] + | | | |--MODIFIERS -> MODIFIERS [59:63] + | | | |--TYPE -> TYPE [59:63] + | | | `--IDENT -> dateTime2 [59:63] + | | |--RPAREN -> ) [59:72] + | | `--SLIST -> { [59:77] + | | |--LITERAL_RETURN -> return [59:79] + | | | |--EXPR -> EXPR [59:86] + | | | | `--NUM_INT -> 0 [59:86] + | | | `--SEMI -> ; [59:87] + | | `--RCURLY -> } [59:89] + | `--SEMI -> ; [59:90] + `--RCURLY -> } [60:0] +SEMI -> ; [61:0] +CLASS_DEF -> CLASS_DEF [62:0] +|--MODIFIERS -> MODIFIERS [62:0] +|--LITERAL_CLASS -> class [62:0] +|--IDENT -> InputRegressionJava8TypeParam [62:6] +|--TYPE_PARAMETERS -> TYPE_PARAMETERS [62:36] +| |--GENERIC_START -> < [62:36] +| |--TYPE_PARAMETER -> TYPE_PARAMETER [62:37] +| | |--ANNOTATIONS -> ANNOTATIONS [62:37] +| | | `--ANNOTATION -> ANNOTATION [62:37] +| | | |--AT -> @ [62:37] +| | | `--IDENT -> Nullable [62:38] +| | `--IDENT -> T [62:47] +| `--GENERIC_END -> > [62:48] +`--OBJBLOCK -> OBJBLOCK [62:50] + |--LCURLY -> { [62:50] + `--RCURLY -> } [63:0] +ANNOTATION_DEF -> ANNOTATION_DEF [64:0] +|--MODIFIERS -> MODIFIERS [64:0] +| |--ANNOTATION -> ANNOTATION [64:0] +| | |--AT -> @ [64:0] +| | |--IDENT -> Retention [64:1] +| | |--LPAREN -> ( [64:10] +| | |--EXPR -> EXPR [64:26] +| | | `--DOT -> . [64:26] +| | | |--IDENT -> RetentionPolicy [64:11] +| | | `--IDENT -> CLASS [64:27] +| | `--RPAREN -> ) [64:32] +| `--ANNOTATION -> ANNOTATION [65:0] +| |--AT -> @ [65:0] +| |--IDENT -> Target [65:1] +| |--LPAREN -> ( [65:7] +| |--ANNOTATION_ARRAY_INIT -> { [65:8] +| | |--EXPR -> EXPR [65:21] +| | | `--DOT -> . [65:21] +| | | |--IDENT -> ElementType [65:10] +| | | `--IDENT -> TYPE_USE [65:22] +| | `--RCURLY -> } [65:31] +| `--RPAREN -> ) [65:32] +|--AT -> @ [66:0] +|--LITERAL_INTERFACE -> interface [66:1] +|--IDENT -> Nullable [66:11] +`--OBJBLOCK -> OBJBLOCK [66:20] + |--LCURLY -> { [66:20] + `--RCURLY -> } [67:0] diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations5.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations5.java index 087c48530..f198b8258 100644 --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations5.java +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations5.java @@ -8,6 +8,7 @@ public class InputAnnotations5 { void monitorTemperature() throws @Critical Exception { } + void monitorTemperature2() throws NullPointerException, @Critical Exception { } @Target(ElementType.TYPE_USE) @interface Critical { |