repo
string
pull_number
int64
instance_id
string
issue_numbers
sequence
base_commit
string
patch
string
test_patch
string
problem_statement
string
hints_text
string
created_at
timestamp[ns, tz=UTC]
version
float64
checkstyle/checkstyle
14,553
checkstyle__checkstyle-14553
[ "11340" ]
d667c38174c32d2f2fc3cac16ef4a4bd2a978f9f
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionParameterNumberTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionParameterNumberTest.java --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionParameterNumberTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionParameterNumberTest.java @@ -103,4 +103,30 @@ public void testIgnoreOverriddenMethods() throws Exception { runVerifications(moduleConfig, fileToProcess, expectedViolations, expectedXpathQueries); } + @Test + public void testIgnoreAnnotatedBy() throws Exception { + final String filePath = + getPath("SuppressionXpathRegressionParameterNumberIgnoreAnnotatedBy.java"); + final File fileToProcess = new File(filePath); + + final DefaultConfiguration moduleConfig = createModuleConfig(ParameterNumberCheck.class); + moduleConfig.addProperty("ignoreAnnotatedBy", "MyAnno"); + moduleConfig.addProperty("max", "2"); + + final String[] expectedViolations = { + "15:34: " + getCheckMessage(ParameterNumberCheck.class, MSG_KEY, 2, 3), + }; + + final List<String> expectedXpathQueries = Collections.singletonList( + "/COMPILATION_UNIT/CLASS_DEF" + + "[./IDENT[@text='SuppressionXpathRegressionParameterNumberIgnoreAnnotatedBy']]" + + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='InnerClass']]" + + "/OBJBLOCK/STATIC_INIT/SLIST/EXPR/LITERAL_NEW[./IDENT[@text='Object']]" + + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]" + + "/SLIST/LITERAL_IF/SLIST/EXPR/LITERAL_NEW[./IDENT[@text='Object']]" + + "/OBJBLOCK/METHOD_DEF/IDENT[@text='checkedMethod']" + ); + + runVerifications(moduleConfig, fileToProcess, expectedViolations, expectedXpathQueries); + } } diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parameternumber/SuppressionXpathRegressionParameterNumberIgnoreAnnotatedBy.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parameternumber/SuppressionXpathRegressionParameterNumberIgnoreAnnotatedBy.java new file mode 100644 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/parameternumber/SuppressionXpathRegressionParameterNumberIgnoreAnnotatedBy.java @@ -0,0 +1,26 @@ +package org.checkstyle.suppressionxpathfilter.parameternumber; + +public class SuppressionXpathRegressionParameterNumberIgnoreAnnotatedBy { + static class InnerClass { + static { + new Object() { + void method() { + if (true) { + new Object() { + @MyAnno + void ignoredMethod(int a, @MyAnno int b, int c) { + + } + + void checkedMethod(int a, @MyAnno int b, int c) { // warn + + } + }; + } + } + }; + } + } + + @interface MyAnno {} +} diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheck.java @@ -19,6 +19,9 @@ package com.puppycrawl.tools.checkstyle.checks.sizes; +import java.util.Collections; +import java.util.Set; + import com.puppycrawl.tools.checkstyle.StatelessCheck; import com.puppycrawl.tools.checkstyle.api.AbstractCheck; import com.puppycrawl.tools.checkstyle.api.DetailAST; @@ -32,6 +35,12 @@ * </p> * <ul> * <li> + * Property {@code ignoreAnnotatedBy} - Ignore methods and constructors + * annotated with the specified annotation(s). + * Type is {@code java.lang.String[]}. + * Default value is {@code ""}. + * </li> + * <li> * Property {@code ignoreOverriddenMethods} - Ignore number of parameters for * methods with {@code @Override} annotation. * Type is {@code boolean}. @@ -86,6 +95,11 @@ public class ParameterNumberCheck /** Ignore number of parameters for methods with {@code @Override} annotation. */ private boolean ignoreOverriddenMethods; + /** + * Ignore methods and constructors annotated with the specified annotation(s). + */ + private Set<String> ignoreAnnotatedBy = Collections.emptySet(); + /** * Setter to specify the maximum number of parameters allowed. * @@ -106,6 +120,16 @@ public void setIgnoreOverriddenMethods(boolean ignoreOverriddenMethods) { this.ignoreOverriddenMethods = ignoreOverriddenMethods; } + /** + * Setter to ignore methods and constructors annotated with the specified annotation(s). + * + * @param annotationNames specified annotation(s) + * @since 10.15.0 + */ + public void setIgnoreAnnotatedBy(String... annotationNames) { + ignoreAnnotatedBy = Set.of(annotationNames); + } + @Override public int[] getDefaultTokens() { return getAcceptableTokens(); @@ -132,16 +156,33 @@ public void visitToken(DetailAST ast) { } /** - * Determine whether to ignore number of parameters for the method. + * Determine whether to ignore number of parameters. * * @param ast the token to process - * @return true if this is overridden method and number of parameters should be ignored - * false otherwise + * @return true if number of parameters should be ignored. */ private boolean shouldIgnoreNumberOfParameters(DetailAST ast) { - // if you override a method, you have no power over the number of parameters - return ignoreOverriddenMethods - && AnnotationUtil.hasOverrideAnnotation(ast); + return isIgnoredOverriddenMethod(ast) || isAnnotatedByIgnoredAnnotations(ast); + } + + /** + * Checks if method is overridden and should be ignored. + * + * @param ast method definition to check + * @return true if method is overridden and should be ignored. + */ + private boolean isIgnoredOverriddenMethod(DetailAST ast) { + return ignoreOverriddenMethods && AnnotationUtil.hasOverrideAnnotation(ast); + } + + /** + * Checks if method or constructor is annotated by ignored annotation(s). + * + * @param ast method or constructor definition to check + * @return true if annotated by ignored annotation(s). + */ + private boolean isAnnotatedByIgnoredAnnotations(DetailAST ast) { + return AnnotationUtil.containsAnnotation(ast, ignoreAnnotatedBy); } }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheckTest.java @@ -123,4 +123,35 @@ public void testIgnoreOverriddenMethodsFalse() getPath("InputParameterNumber2.java"), expected); } + @Test + public void testIgnoreAnnotatedBy() throws Exception { + final String[] expected = { + "23:10: " + getCheckMessage(MSG_KEY, 2, 3), + "30:10: " + getCheckMessage(MSG_KEY, 2, 4), + "35:14: " + getCheckMessage(MSG_KEY, 2, 3), + "43:9: " + getCheckMessage(MSG_KEY, 2, 4), + "58:30: " + getCheckMessage(MSG_KEY, 2, 3), + "62:29: " + getCheckMessage(MSG_KEY, 2, 3), + "77:34: " + getCheckMessage(MSG_KEY, 2, 4), + "97:10: " + getCheckMessage(MSG_KEY, 2, 3), + "106:14: " + getCheckMessage(MSG_KEY, 2, 3), + }; + verifyWithInlineConfigParser( + getPath("InputParameterNumberIgnoreAnnotatedBy.java"), expected); + } + + @Test + public void testIgnoreAnnotatedByFullyQualifiedClassName() throws Exception { + final String[] expected = { + "15:10: " + getCheckMessage(MSG_KEY, 2, 3), + "17:10: " + getCheckMessage(MSG_KEY, 2, 3), + "23:10: " + getCheckMessage(MSG_KEY, 2, 3), + "27:10: " + getCheckMessage(MSG_KEY, 2, 3), + "41:14: " + getCheckMessage(MSG_KEY, 2, 3), + "45:14: " + getCheckMessage(MSG_KEY, 2, 3), + }; + verifyWithInlineConfigParser( + getPath("InputParameterNumberIgnoreAnnotatedByFullyQualifiedClassName.java"), + expected); + } } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/InputParameterNumberIgnoreAnnotatedBy.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/InputParameterNumberIgnoreAnnotatedBy.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/InputParameterNumberIgnoreAnnotatedBy.java @@ -0,0 +1,115 @@ +/* +ParameterNumber +max = 2 +ignoreAnnotatedBy = MyAnno, Session + +*/ + +package com.puppycrawl.tools.checkstyle.checks.sizes.parameternumber; + +public class InputParameterNumberIgnoreAnnotatedBy { + @MyAnno + InputParameterNumberIgnoreAnnotatedBy(int a, int b, int c) {} + + void method1(int a, int b) {} + + @MyAnno + void method2(int a, int b, int c) {} + + @Session(uid = "Y2K") + void method3(int a, int b, int c, int d) {} + + @Wawa + void method5(int a, int b, int c) { // violation, 'More than 2 parameters (found 3).' + } + + @Wawa + void method6(int a, int b) {} + + + void method7(int a, int b, int c, int d) { // violation, 'More than 2 parameters (found 4).' + } + + class InnerClass extends InputParameterNumberIgnoreAnnotatedBy { + @Override + void method2(int a, int b, int c) { // violation, 'More than 2 parameters (found 3).' + int d = a + c; + } + + InnerClass(int a, int b) { + super(1, 2, 3); + } + + InnerClass(int a, int b, int c, int d) { // violation, 'More than 2 parameters (found 4).' + super(1, 2, 3); + } + } + + static class Very { + static class Deep { + static class Rabbit { + enum Colors { + GOLDEN(1, 2, 3) { + void jump(int a, int b) {} + @MyAnno + void roll(int a, int b, int c) {} + + // violation below, 'More than 2 parameters (found 3).' + void loaf(int a, int b, int c) {} + }; + + @Wawa + private Colors(@MyAnno int a, int b, int c) {} + // violation above, 'More than 2 parameters (found 3).' + + @Session(uid = ":D") + private Colors(@Wawa int a, @Wawa int b, @Wawa int c, @Wawa int d) {} + + private Colors(int a) {} + } + static class Hole { + static { + new Object() { + @MyAnno @Session(uid = "G0F") + void method1(int a, int b, int c) {} + + // violation below, 'More than 2 parameters (found 4).' + void method3(@MyAnno int a, @MyAnno int b, @MyAnno int c, int d) {} + }; + } + } + } + } + } + + @Wawa + @MyAnno + void method8(int a, int b, int c) { + } + + @Session(uid = "H1") @Bit + @Wawa + void method9(int a, int b, int c) { + } + + @Bit + @Wawa + void method10(int a, int b, int c) { // violation, 'More than 2 parameters (found 3).' + } + + interface Reader { + void method1 (int a, int b); + + @MyAnno + void method2 (int a, int b, int c); + + void method3 (int a, int b, int c); // violation, 'More than 2 parameters (found 3).' + } + + @interface Wawa {} + @interface Bit {} + @interface MyAnno {} + @interface Session { + String uid(); + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/InputParameterNumberIgnoreAnnotatedByFullyQualifiedClassName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/InputParameterNumberIgnoreAnnotatedByFullyQualifiedClassName.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/InputParameterNumberIgnoreAnnotatedByFullyQualifiedClassName.java @@ -0,0 +1,62 @@ +/* +ParameterNumber +max = 2 +ignoreAnnotatedBy = java.lang.Deprecated, InnerClass.InnerAnno, Session + +*/ + +package com.puppycrawl.tools.checkstyle.checks.sizes.parameternumber; + +public class InputParameterNumberIgnoreAnnotatedByFullyQualifiedClassName { + @java.lang.Deprecated + void method3(int a, int b, int c) {} + + @Deprecated + void method4(int a, int b, int c) {} // violation, 'More than 2 parameters (found 3).' + + void method5(int a, int b, int c) {} // violation, 'More than 2 parameters (found 3).' + + @Session + void method6(int a, int b, int c) {} + + @InputParameterNumberIgnoreAnnotatedByFullyQualifiedClassName.Session + void method7(int a, int b, int c) {} // violation, 'More than 2 parameters (found 3).' + + @com.puppycrawl.tools.checkstyle.checks.sizes.parameternumber + .InputParameterNumberIgnoreAnnotatedByFullyQualifiedClassName.Session + void method8(int a, int b, int c) {} // violation, 'More than 2 parameters (found 3).' + + @com.puppycrawl.tools.checkstyle.checks.sizes.parameternumber + .InputParameterNumberIgnoreAnnotatedByFullyQualifiedClassName.Session + void method8(int a, int b) {} + + private static class InnerClass { + private @interface InnerAnno {} + + @InnerClass.InnerAnno + void method1(int a, int b, int c) { + } + + @InnerAnno + void method2(int a, int b, int c) { // violation, 'More than 2 parameters (found 3).' + } + + @Bit + void method3(int a, int b, int c) { // violation, 'More than 2 parameters (found 3).' + } + + @InnerAnno + void method2(int a, int b) { + } + + @Bit + void method3(int a, int b) { + } + + void method4(int a, int b) { + } + } + + @interface Session {} + @interface Bit{} +}
Add ignoreAnnotatedBy property to ParameterNumberCheck Check name: [ParameterNumberCheck](https://checkstyle.org/config_sizes.html#ParameterNumber) https://checkstyle.org/checks/sizes/parameternumber.html#ParameterNumber ## Problem https://www.baeldung.com/jackson-annotations#1-jsoncreator https://fasterxml.github.io/jackson-annotations/javadoc/2.7/com/fasterxml/jackson/annotation/JsonCreator.html If I implement external API, I have no power over the number of parameters, e.g. when creating a DTO class for REST API and deserializing JSON to an object by constructor annotated by @JsonCreator ``` class MyDto { private final String a1; private final String a2; private final String a3; private final String a4; private final String a5; private final String a6; private final String a7; private final String a8; private final String a9; @JsonCreator MyDto(String a1, String a2, String a3, String a4, String a5, String a6, String a7, String a8, String a9) { this.a1 = a1; this.a2 = a2; this.a3 = a3; this.a4 = a4; this.a5 = a5; this.a6 = a6; this.a7 = a7; this.a8 = a8; this.a9 = a9; } } ``` ## Solution I'd like to configure check to ignore this constructor. In general, ignore all methods annotated by `@JsonCreator`, e.g. ``` <module name="ParameterNumber"> <property name="max" value="5"/> <property name="ignoreMethodAnnotatedBy" value="JsonCreator"/> </module> ``` The PR with the proposal is here https://github.com/checkstyle/checkstyle/pull/11339 Check already has property `ignoreOverriddenMethods` so new property will make it more general.
Nice! Supression of constructors with this annotation can be achieved via [SuppresionXpathSingleFilter](https://checkstyle.sourceforge.io/config_filters.html#SuppressionXpathSingleFilter): ``` ➜ java cat Test.java public class Test { private final String a1; private final String a2; private final String a3; private final String a4; private final String a5; private final String a6; private final String a7; private final String a8; private final String a9; @JsonCreator Test(String a1, String a2, String a3, String a4, String a5, String a6, String a7, String a8, String a9) { this.a1 = a1; this.a2 = a2; this.a3 = a3; this.a4 = a4; this.a5 = a5; this.a6 = a6; this.a7 = a7; this.a8 = a8; this.a9 = a9; } } @interface JsonCreator {} ➜ java javac Test.java ➜ java cat config.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> <module name="Checker"> <property name="charset" value="UTF-8"/> <module name="TreeWalker"> <module name="ParameterNumber"> <property name="max" value="5"/> </module> <module name="SuppressionXpathSingleFilter"> <property name="checks" value="ParameterNumber"/> <property name="query" value="//CTOR_DEF/IDENT[preceding-sibling::MODIFIERS/ANNOTATION/IDENT[@text='JsonCreator']]"/> </module> </module> </module> ➜ java java -jar checkstyle-9.3-all.jar -c config.xml Test.java Starting audit... Audit done. ``` @tfij we typically try to avoid adding properties to checks when we can handle suppression of special cases with some filter. If you prefer to use a suppression file, you can use the same XPath with https://checkstyle.sourceforge.io/config_filters.html#SuppressionXpathFilter. XPath can also be extended by the `|` operator to cover method definitions: ``` ➜ java cat Test.java public class Test { private final String a1; private final String a2; private final String a3; private final String a4; private final String a5; private final String a6; private final String a7; private final String a8; private final String a9; @JsonCreator Test(String a1, String a2, String a3, String a4, String a5, String a6, String a7, String a8, String a9) { this.a1 = a1; this.a2 = a2; this.a3 = a3; this.a4 = a4; this.a5 = a5; this.a6 = a6; this.a7 = a7; this.a8 = a8; this.a9 = a9; } @JsonCreator void someMethod(int a, int b, int c, int d, int e, int f) {} } @interface JsonCreator {} ➜ java javac Test.java ➜ java cat config.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> <module name="Checker"> <property name="charset" value="UTF-8"/> <module name="TreeWalker"> <module name="ParameterNumber"> <property name="max" value="5"/> </module> <module name="SuppressionXpathSingleFilter"> <property name="checks" value="ParameterNumber"/> <property name="query" value="//CTOR_DEF/IDENT[preceding-sibling::MODIFIERS/ANNOTATION/IDENT[@text='JsonCreator']] | //METHOD_DEF/IDENT[preceding-sibling::MODIFIERS/ANNOTATION/IDENT[@text='JsonCreator']]"/> </module> </module> </module> ➜ java java -jar checkstyle-9.3-all.jar -c config.xml Test.java Starting audit... Audit done. ``` @nmancus1 , @rnveach , @strkkk , @pbludov , lets think/vote/re-consider on our decision to avoid extra suppresion/ignore properties. We use to make this decision as we had no time to provide updates to all user requests, so Xpath is definitely workaround for user, but it is not very good for configurations as it imply two modules that are hard to keep together and manage later on. in the same time, updating Checks to have such properties might also be not that good, as potentially all Checks might need something like this. And it is magic of certain library that not everyone is using. But in the same time instrumenting code with magic annotations is definitely a trend. As for me, I prefer to keep checks simple, and only add properties if they cannot be covered by some reasonable/ reliable XPath or other filter. So, > avoid extra suppresion/ignore properties would be my vote. As experience has shown, checks with lots of properties become harder to maintain; not just from a simple code standpoint, but also the logic of how the properties interact with each other. Just as a related note - I think that we need to keep a "repository" of sorts (or entire website page) for all of the XPath related modules that we create, to help users more readily find what they need (with examples). usually we resolved such cases, by example in documentation (xdoc) on how to handle frequent edge cases, so googling usually helps to find solution. I agree with @romani > it imply two modules that are hard to keep together and manage later on How about making it possible to set suppress property for any check configuration? In this case ``` <module name="ParameterNumber"> <property name="max" value="5"/> <suppress-check query="//CTOR_DEF/IDENT[preceding-sibling::MODIFIERS/ANNOTATION/IDENT[@text='JsonCreator']] | //METHOD_DEF/IDENT[preceding-sibling::MODIFIERS/ANNOTATION/IDENT[@text='JsonCreator']]" /> </module> ``` or something like this. It will solve a problem with two modules maintained separately. It is a generic solution, consistent for all checks and can reuse some existing code. we did not make it like this few years ago, as implementation of Xpath was not mature enough, we still have items to finish to make it for all Checks. May be we can start sooner, somebody need to do deep thinking on this. Even we will have this option, it is not user friendly approach and can help users for edge cases and workaround some defects. But we still need to think on most common ways to suppress and allow them to be done by Check properties. This border of xpath to Check special property is not defined by us and not clear for us. I am against complicating the check. Such property will fix this particular issue, but it won't work for another. Suppressions are more flexible. I think I might like the idea of adding suppressions to the check itself, locking the 2 together ( https://github.com/checkstyle/checkstyle/issues/11340#issuecomment-1049579521 ). The only downside to that is there would need to be some type of double checking that this new suppression is only suppressing the violations of this check and not accidentally picking up some other check by user configuration error. I am probably more extreme in that we have `ignoreOverriddenMethods` which is already looking at annotations. Why don't we just deprecate that property and add a new one that extends it to all annotation and then the user can add `@Override` or any other annotation. (`ignoreOverriddenMethods` is default to `false`, so we would continue that default in the new property). To me this makes more sense as it allows, like this issue wants, a more broader usage. Otherwise, I don't think I can get behind having the 2 options live together in the same check. Deprecation is long for us and painful process for users. Better to keep two options and let them work by same code inside. Xpath is too brutal to user, it tooks awhile for users to understand how to do this, and how to make xpath expression that is required. @tfij, imagine we did not give you xpath expression, how much time you will spend to make it ? But in the same time Lombok like libraries become very popular way of codding now. So suppression by annotation might be well used approach. Agree, xpath is very mysterious. Mainly because I don't know what XML structure I'm scanning. I imagine that if user hadn't found a ready or similar solution in the documentation or on stackoverflow, it would take hours to work out this by themself. After reading through the discussion here, and thinking on this some more, I have reconsidered my general position on check properties. If a new check property that is a “feature” is proposed, I stay with my original position. But - if new property is some simple suppression (i.e. checking for a particular annotation) , we should consider it. Most of the time, this will just require some Boolean method used to guard the `log` method. We do not want to make Checkstyle difficult to configure or inflexible, this will only frustrate users. I more care about users experience, implementation pain is limited to few people during PR and eventually forgotten. We use/reconfigure checkstyle more than we spend time to code it. Xpath suppression was good approach to resolve problem on user side quickly, temporary hack. And it might continue to serve this purpose. But custom ignore properties are a way more easy to use. Ignore by annotation will be most used ignore/suppression approach. As annotation imply some third-party features/magic that happening in runtime or compilation time, Checkstyle is not working at that time, so we have to skip validation in some cases. We did not have time to implement ignore properties in Checks, that is why we invested more in xpath to let users has workaround sooner, but if implementation is provided by community, I think it is good to accept it. Especially if we see that such ignore approach can be widely reused. Just example of property to ignore: https://github.com/checkstyle/checkstyle/commit/0b3a2606e535eb14d2d9dcd6c79d00db17c22f91 that is named "exclude" but meaning is the same as ignore/suppress. Let's make a decision here, in regards to this particular issue. If we want to continue discussion about adding check properties in general, let's create a Github discussion and continue there. After thinking on @romani 's comments above, I am for approval of this issue. One more example of Lombok usage that cause unwanted violation https://github.com/checkstyle/checkstyle/issues/11415 Hi, is there anything I can do to help make the decision? I hope it will be the approval of this proposal :) @tfij, can I ask you to help : We need to review all Checks that has same property and list all of them, and we need to choose a good name from existing or just new. For now I think we should name it like: ignoreAnnothedBy or something similar. We should avoid usage of "method" or similar words to let it be used for any Check target. Can we also analyze what Checks are highly likely to have such property in future? And what Check unlikely to change behavior by annotated target. one more example how annotation make false positive for static analisys - https://github.com/checkstyle/checkstyle/pull/11481 pmd using property `ignoredAnnotations` @romani I can handle it next week. One question, by > review all Checks that has same property and list all of them Do you mean some kind of grid of all checks? or some subset of checks? What format do you expect? All Checks, any readable format, to see what we have already @romani This is a list of all checks with all not static fields (type and name). https://gist.github.com/tfij/58f1b0e1e5e6e15c0a3730f46872762e Hope it will be useful. Reach out if you need any other data. @tfij, thanks a lot. can ask you grep properties that are about ignorance/skip/exclude by annotations. For now, there is a small number of parameters related with annotations: ``` MissingJavadocMethodCheck | allowedAnnotations JavadocTypeCheck | allowedAnnotations VisibilityModifierCheck | ignoreAnnotationCanonicalNames, ignoreAnnotationShortNames DesignForExtensionCheck | ignoredAnnotations MagicNumberCheck | ignoreAnnotationElementDefaults, ignoreAnnotation JavadocMethodCheck | allowedAnnotations ``` By the way, I have another case for excluding the check by annotation: `HideUtilityClassConstructorCheck` should not report a violation if a class is annotated with lombok [@UtilityClass](https://projectlombok.org/features/experimental/UtilityClass) annotation. Sorry that issue lost from my attention for more than year. I am ok to approve issue with new property `ignoreAnnotatedBy`. @nrmancuso , pre-approved at https://github.com/checkstyle/checkstyle/issues/11340#issuecomment-1062967967 @rnveach , please share your opinion and if you agree , please put approved label. My only question on adding this type of properties is why go through this trouble when xpath suppression can do the same thing. I also question if the property will use the FQCP for the annotation, or if it will just be the class name. Otherwise, I am good. > if the property will use the FQCP for the annotation, yes > why go through this trouble when xpath suppression can do the same thing. xpath is very complicated concept, it is good for one time workaround, but for cases where lombok is popular (people are lazy to type and lombok is popular to generate code for people, all IDEs support it, so it become a part of our life). and Lombok is not the only library that does this, there are many. Consolidation of whole config in one `<module>` is easy for user concept. I am not ready to discuss embebded xpath suppression property in each module for now, but looks like we slowly going to this decision. ``` <module name="ParameterNumber"> <property name="max" value="5"/> <property name="ignoreAnnotatedBy" value="JsonCreator"/> </module> ``` sounds like ignore parameter that is annotated by, not a method. But check is actually targeting method, so it is not confusion. ~Sounds like we have to come back to originnal:~ ``` <module name="ParameterNumber"> <property name="max" value="5"/> <property name="ignoreMethodAnnotatedBy" value="JsonCreator"/> </module> ``` to be very explicit where annotation is expected. Ideally user should not read documentation to understand how to configure Check. @rnveach , please approve. I'm OK with `ignoreMethodAnnotatedBy`. However, you have to make a decision :) @rnveach , @nrmancuso , please review and approve. @tfij, if no response will be there before 1 january 2023, please mention me here, I will approve issue. I would prefer this new property to be called `ignoreAnnotatedBy` for two reasons: 1. ParameterNumber also checks constructors (which is sort of a special method) 2. As we extend this concept to other checks, property name can be consistent and users don’t have to be concerned with details We could also devise some alternative general naming such as `ignoreTargetAnnotatedBy` or something similar. Ok, let's move forward with `ignoreAnnotatedBy`. Everyone is welcome to finish this PR https://github.com/checkstyle/checkstyle/pull/11339, just reuse code and move this PR across finish line. @sktpy, do you have time to help us with this issue ? Yes, I am on it.
2024-02-26T17:17:57Z
10.14
checkstyle/checkstyle
14,497
checkstyle__checkstyle-14497
[ "14344" ]
49d5c0d7ae601be805d52890a821404266630d27
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.java @@ -219,7 +219,7 @@ else if (line[after] == ' ') { */ private void processSingleGeneric(DetailAST ast, int[] line, int after) { final char charAfter = Character.toChars(line[after])[0]; - if (isGenericBeforeMethod(ast) || isGenericBeforeCtor(ast)) { + if (isGenericBeforeMethod(ast) || isGenericBeforeCtorInvocation(ast)) { if (Character.isWhitespace(charAfter)) { log(ast, MSG_WS_FOLLOWED, CLOSE_ANGLE_BRACKET); } @@ -230,16 +230,38 @@ else if (!isCharacterValidAfterGenericEnd(charAfter)) { } /** - * Checks if generic is before constructor invocation. + * Checks if generic is before constructor invocation. Identifies two cases: + * <ol> + * <li>{@code new ArrayList<>();}</li> + * <li>{@code new Outer.Inner<>();}</li> + * </ol> * * @param ast ast - * @return true if generic before a constructor invocation + * @return true if generic is before constructor invocation */ - private static boolean isGenericBeforeCtor(DetailAST ast) { + private static boolean isGenericBeforeCtorInvocation(DetailAST ast) { + final DetailAST grandParent = ast.getParent().getParent(); + return grandParent.getType() == TokenTypes.LITERAL_NEW + || grandParent.getParent().getType() == TokenTypes.LITERAL_NEW; + } + + /** + * Checks if generic is after {@code LITERAL_NEW}. Identifies three cases: + * <ol> + * <li>{@code new <String>Object();}</li> + * <li>{@code new <String>Outer.Inner();}</li> + * <li>{@code new <@A Outer>@B Inner();}</li> + * </ol> + * + * @param ast ast + * @return true if generic after {@code LITERAL_NEW} + */ + private static boolean isGenericAfterNew(DetailAST ast) { final DetailAST parent = ast.getParent(); return parent.getParent().getType() == TokenTypes.LITERAL_NEW && (parent.getNextSibling().getType() == TokenTypes.IDENT - || parent.getNextSibling().getType() == TokenTypes.DOT); + || parent.getNextSibling().getType() == TokenTypes.DOT + || parent.getNextSibling().getType() == TokenTypes.ANNOTATIONS); } /** @@ -274,25 +296,29 @@ private void processStart(DetailAST ast) { final int before = ast.getColumnNo() - 1; final int after = ast.getColumnNo() + 1; - // Need to handle two cases as in: + // Checks if generic needs to be preceded by a whitespace or not. + // Handles 3 cases as in: // // public static <T> Callable<T> callable(Runnable task, T result) // ^ ^ - // ws reqd ---+ +--- whitespace NOT required + // 1. ws reqd ---+ 2. +--- whitespace NOT required // + // new <String>Object() + // ^ + // 3. +--- ws required if (before >= 0) { - // Detect if the first case final DetailAST parent = ast.getParent(); final DetailAST grandparent = parent.getParent(); + // cases (1, 3) where whitespace is required: if (grandparent.getType() == TokenTypes.CTOR_DEF || grandparent.getType() == TokenTypes.METHOD_DEF - || isGenericBeforeCtor(ast)) { - // Require whitespace + || isGenericAfterNew(ast)) { + if (!CommonUtil.isCodePointWhitespace(line, before)) { log(ast, MSG_WS_NOT_PRECEDED, OPEN_ANGLE_BRACKET); } } - // Whitespace not required + // case 2 where whitespace is not required: else if (CommonUtil.isCodePointWhitespace(line, before) && !containsWhitespaceBefore(before, line)) { log(ast, MSG_WS_PRECEDED, OPEN_ANGLE_BRACKET);
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/GenericWhitespaceTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/GenericWhitespaceTest.java --- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/GenericWhitespaceTest.java +++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/GenericWhitespaceTest.java @@ -54,6 +54,7 @@ public void testWhitespaceAroundGenerics() throws Exception { "14:46: " + getCheckMessage(messages, msgPreceded, ">"), "15:33: " + getCheckMessage(messages, msgFollowed, "<"), "15:33: " + getCheckMessage(messages, msgPreceded, "<"), + "15:46: " + getCheckMessage(messages, msgFollowed, ">"), "15:46: " + getCheckMessage(messages, msgPreceded, ">"), "20:39: " + getCheckMessage(messages, msgFollowed, "<"), "20:39: " + getCheckMessage(messages, msgPreceded, "<"), @@ -81,6 +82,7 @@ public void testGenericWhitespace() throws Exception { "16:24: " + getCheckMessage(messages, msgPreceded, ">"), "16:44: " + getCheckMessage(messages, msgFollowed, "<"), "16:44: " + getCheckMessage(messages, msgPreceded, "<"), + "16:54: " + getCheckMessage(messages, msgFollowed, ">"), "16:54: " + getCheckMessage(messages, msgPreceded, ">"), "17:14: " + getCheckMessage(messages, msgFollowed, "<"), "17:14: " + getCheckMessage(messages, msgPreceded, "<"), @@ -95,6 +97,7 @@ public void testGenericWhitespace() throws Exception { "17:60: " + getCheckMessage(messages, msgPreceded, "<"), "17:70: " + getCheckMessage(messages, msgFollowed, ">"), "17:70: " + getCheckMessage(messages, msgPreceded, ">"), + "17:72: " + getCheckMessage(messages, msgFollowed, ">"), "17:72: " + getCheckMessage(messages, msgPreceded, ">"), "30:18: " + getCheckMessage(messages, msgNotPreceded, "<"), "30:20: " + getCheckMessage(messages, msgIllegalFollow, ">"), diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java @@ -71,6 +71,7 @@ public void testDefault() throws Exception { "22:44: " + getCheckMessage(MSG_WS_PRECEDED, "<"), "22:44: " + getCheckMessage(MSG_WS_FOLLOWED, "<"), "22:54: " + getCheckMessage(MSG_WS_PRECEDED, ">"), + "22:54: " + getCheckMessage(MSG_WS_FOLLOWED, ">"), "23:14: " + getCheckMessage(MSG_WS_PRECEDED, "<"), "23:14: " + getCheckMessage(MSG_WS_FOLLOWED, "<"), "23:21: " + getCheckMessage(MSG_WS_PRECEDED, "<"), @@ -85,6 +86,7 @@ public void testDefault() throws Exception { "23:70: " + getCheckMessage(MSG_WS_PRECEDED, ">"), "23:70: " + getCheckMessage(MSG_WS_FOLLOWED, ">"), "23:72: " + getCheckMessage(MSG_WS_PRECEDED, ">"), + "23:72: " + getCheckMessage(MSG_WS_FOLLOWED, ">"), "36:18: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "<"), "36:20: " + getCheckMessage(MSG_WS_ILLEGAL_FOLLOW, ">"), "48:22: " + getCheckMessage(MSG_WS_PRECEDED, "<"), @@ -173,6 +175,65 @@ public void testGenericWhitespaceWithEmoji() throws Exception { getPath("InputGenericWhitespaceWithEmoji.java"), expected); } + @Test + public void testBeforeCtorInvocation() throws Exception { + final String[] expected = { + "17:31: " + getCheckMessage(MSG_WS_FOLLOWED, '>'), + "19:56: " + getCheckMessage(MSG_WS_FOLLOWED, '>'), + "19:56: " + getCheckMessage(MSG_WS_PRECEDED, '>'), + "24:25: " + getCheckMessage(MSG_WS_FOLLOWED, '<'), + "27:36: " + getCheckMessage(MSG_WS_FOLLOWED, '>'), + "31:35: " + getCheckMessage(MSG_WS_FOLLOWED, '<'), + "31:35: " + getCheckMessage(MSG_WS_PRECEDED, '<'), + "31:47: " + getCheckMessage(MSG_WS_FOLLOWED, '>'), + "31:47: " + getCheckMessage(MSG_WS_PRECEDED, '>'), + "38:34: " + getCheckMessage(MSG_WS_FOLLOWED, '>'), + "39:47: " + getCheckMessage(MSG_WS_FOLLOWED, '>'), + "40:28: " + getCheckMessage(MSG_WS_PRECEDED, '<'), + "40:48: " + getCheckMessage(MSG_WS_FOLLOWED, '>'), + "47:41: " + getCheckMessage(MSG_WS_FOLLOWED, '>'), + "50:47: " + getCheckMessage(MSG_WS_FOLLOWED, '>'), + "52:44: " + getCheckMessage(MSG_WS_FOLLOWED, '>'), + }; + verifyWithInlineConfigParser( + getPath("InputGenericWhitespaceBeforeCtorInvocation.java"), expected); + } + + @Test + public void testAfterNew() throws Exception { + final String[] expected = { + "17:30: " + getCheckMessage(MSG_WS_FOLLOWED, '>'), + "21:12: " + getCheckMessage(MSG_WS_FOLLOWED, '<'), + "21:12: " + getCheckMessage(MSG_WS_NOT_PRECEDED, '<'), + "21:23: " + getCheckMessage(MSG_WS_FOLLOWED, '>'), + "21:23: " + getCheckMessage(MSG_WS_PRECEDED, '>'), + "28:22: " + getCheckMessage(MSG_WS_FOLLOWED, '>'), + "33:31: " + getCheckMessage(MSG_WS_FOLLOWED, '<'), + "33:31: " + getCheckMessage(MSG_WS_NOT_PRECEDED, '<'), + "33:40: " + getCheckMessage(MSG_WS_FOLLOWED, '>'), + "33:40: " + getCheckMessage(MSG_WS_PRECEDED, '>'), + "41:28: " + getCheckMessage(MSG_WS_NOT_PRECEDED, '<'), + "41:36: " + getCheckMessage(MSG_WS_FOLLOWED, '<'), + "41:56: " + getCheckMessage(MSG_WS_FOLLOWED, '>'), + "41:61: " + getCheckMessage(MSG_WS_PRECEDED, '>'), + "41:63: " + getCheckMessage(MSG_WS_FOLLOWED, '>'), + "41:65: " + getCheckMessage(MSG_WS_PRECEDED, '>'), + "41:66: " + getCheckMessage(MSG_WS_FOLLOWED, '>'), + "41:85: " + getCheckMessage(MSG_WS_PRECEDED, '<'), + "41:92: " + getCheckMessage(MSG_WS_FOLLOWED, '>'), + }; + verifyWithInlineConfigParser( + getPath("InputGenericWhitespaceAfterNew.java"), expected); + } + + @Test + public void testBeforeRecordHeader() throws Exception { + final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; + verifyWithInlineConfigParser( + getNonCompilablePath("InputGenericWhitespaceBeforeRecordHeader.java"), + expected); + } + /** * Checks if the private field {@code depth} is properly cleared during the * start of processing the next file in the check. diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceBeforeRecordHeader.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceBeforeRecordHeader.java new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceBeforeRecordHeader.java @@ -0,0 +1,12 @@ +/* +GenericWhitespace + + +*/ + +//non-compiled with javac: Compilable with Java16 +package com.puppycrawl.tools.checkstyle.checks.whitespace.genericwhitespace; + +public class InputGenericWhitespaceBeforeRecordHeader { + record Session<T>() {} +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceAfterNew.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceAfterNew.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceAfterNew.java @@ -0,0 +1,65 @@ +/* +GenericWhitespace + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.whitespace.genericwhitespace; + +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.TYPE_USE; + +public class InputGenericWhitespaceAfterNew { + public class Inner<T> { } + + Object obj1 = new <String>Object(); + Object obj2 = new <String> Object(); // violation, ''>' is followed by whitespace.' + + void method() { + new <@A Inner>Inner(); + new< @A Inner > Inner (); + // 4 violations above: + // ''<' is followed by whitespace.' + // ''<' is not preceded with whitespace.' + // ''>' is followed by whitespace.' + // ''>' is preceded with whitespace.' + + new <@A Inner> @A Inner<@A Inner>(); // violation, ''>' is followed by whitespace.' + } + + void popCan() { + Can.Pop cannot = new <String>Can.Pop(); + Can.Pop burstCan = new< String > Can.Pop(); + // 4 violations above: + // ''<' is followed by whitespace.' + // ''<' is not preceded with whitespace.' + // ''>' is followed by whitespace.' + // ''>' is preceded with whitespace.' + + // + + + + + ++ + + + Can.must("idk", new<Can<Can< @A Inner<Can<Can<?> [] >>> >> Can.Pop.But.Wont <String> ()); + // 9 violations above: + // ''<' is not preceded with whitespace.' + // ''<' is followed by whitespace.' + // ''>' is followed by whitespace.' + // ''>' is preceded with whitespace.' + // ''>' is followed by whitespace.' + // ''>' is preceded with whitespace.' + // ''>' is followed by whitespace.' + // ''<' is preceded with whitespace.' + // ''>' is followed by whitespace.' + } + + @Target({TYPE_USE}) @interface A {} +} + +class Can<T> { + static <T> void must(String why, T whatever) {} + static class Pop { + static class But { + static class Wont<T> { + } + } + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceBeforeCtorInvocation.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceBeforeCtorInvocation.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceBeforeCtorInvocation.java @@ -0,0 +1,73 @@ +/* +GenericWhitespace + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.whitespace.genericwhitespace; + +import java.lang.annotation.Target; +import java.util.ArrayList; +import java.util.List; + +import static java.lang.annotation.ElementType.TYPE_USE; + +public class InputGenericWhitespaceBeforeCtorInvocation { + List<String> music = new ArrayList<>(); + List todo = new ArrayList<> (); // violation, ''>' is followed by whitespace.' + + Gen<String, Integer> eel = new Gen<String, Integer > (); + // 2 violations above: + // ''>' is followed by whitespace.' + // ''>' is preceded with whitespace.' + + Pipe pipe = new Pipe< String>() { // violation, ''<' is followed by whitespace.' + }; + + Class<?>[] classy = new Class<?> []{}; // violation, ''>' is followed by whitespace.' + + void method() { + new Very.Deep<Integer>(); + new Very.Deep.Rabbit.Hole < Integer > (); + // 4 violations above: + // ''<' is followed by whitespace.' + // ''<' is preceded with whitespace.' + // ''>' is followed by whitespace.' + // ''>' is preceded with whitespace.' + + new @A Gen<@A Gen, @A Gen> (); // violation, ''>' is followed by whitespace.' + new java.util.HashMap<Integer, Integer> (); // violation, ''>' is followed by whitespace.' + new ArrayList<Very <Gen<String,String>>> (); + // 2 violations above: + // ''<' is preceded with whitespace.' + // ''>' is followed by whitespace.' + } + + static final Very<Gen<String, String>> veryGen = + new Very<Gen<String, String>> () {}; // violation, ''>' is followed by whitespace.' + + <T> void mustPatTheCroc(boolean mustPat, T[] crocs) { + Very.swampPuppy(new Gen<String, String> ()); // violation, ''>' is followed by whitespace.' + if (!mustPat) { + mustPatTheCroc(true, new Very<?> []{}); // violation, ''>' is followed by whitespace.' + } + } + + class Gen<T, U> {} + + static class Very<Q> { + static void swampPuppy(Gen<String, String> croc) {} + static class Deep<D> { + static class Rabbit<R> { + static class Hole<H> { + + } + } + } + } + + interface Pipe<T> { + } + + @Target({TYPE_USE}) @interface A {} +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceDefault.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceDefault.java --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceDefault.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceDefault.java @@ -19,8 +19,8 @@ void meth() { List<Integer> x = new ArrayList<Integer>(); List<List<Integer>> y = new ArrayList<List<Integer>>(); - List < Integer > a = new ArrayList < Integer > (); // 6 violations - List < List < Integer > > b = new ArrayList < List < Integer > > (); // 14 violations + List < Integer > a = new ArrayList < Integer > (); // 7 violations + List < List < Integer > > b = new ArrayList < List < Integer > > (); // 15 violations } //always 0 public int compareTo(Object aObject)
GenericWhitespace Check ignores exception to the ">" rule for succeeding whitespaces Detected at [#14341](https://github.com/checkstyle/checkstyle/pull/14341). Affects PR #14364 ([Documentation](https://checkstyle.org/checks/whitespace/genericwhitespace.html)) **Test.java** ```java import java.util.ArrayList; import java.util.List; public class Test { List a = new ArrayList<> (); // violation expected } ``` **config.xml** ```xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <module name="TreeWalker"> <module name="GenericWhitespace"/> </module> </module> ``` **Actual:** ``` java -jar checkstyle-10.12.7-all.jar -c config.xml Test.java Starting audit... Audit done. ``` **Expected:** violation on line 5. `Test.java:5:26: '>' is followed by whitespace. [GenericWhitespace]` ### Explanation: - As per the documentation, right angle bracket (`>`) should not be followed by whitespace for diamond operators and when preceding method name or constructor. - In `List a = new ArrayList<> ();` the right angle bracket (`>`) precedes the constructor, and is also part of the diamond operator (`<>`), hence shouldn't be followed by the whitespace. - The exact example is provided provided in the [documentation](https://checkstyle.org/checks/whitespace/genericwhitespace.html#Example2-code), showcasing that it is incorrect style and should throw a violation, but this is ignored by the Check. (Also evident in the [referenced PR](https://github.com/checkstyle/checkstyle/pull/14341#issuecomment-1907645027))
@sktpy , I understand that the Checkstyle style mentions the said violation and the same has not been implemented. But does the Sun Java style guide and the Google Java Style Guide also include the whitespace as a violation?? If yes, please attach a snapshot of the rule for reference. If not, perhaps that is why the violation has been ignored so far!! Thanks. And also do correct me in case I am wrong. @MANISH-K-07, While Google's Java Style does not have an explicit example stating that this exact thing is not allowed, they cover specifically what _is_ allowed for the case of [Horizontal whitespace](https://google.github.io/styleguide/javaguide.html#s4.6.2-horizontal-whitespace): > "Beyond where required by the language or other style rules, and apart from literals, comments and Javadoc, a single ASCII space also appears in the following places **_only_**." - The rule addresses interior space. - The list provided there defines the **_only_** cases where the occurrence of white-space is valid, except when it falls within the specified excluded scope(i.e. required by language, other style rules, literals, comments and Javadoc). - Hence implying that any occurrence not listed there is indeed a violation. <br>As per the Checkstyle [documentation](https://checkstyle.org/checks/whitespace/genericwhitespace.html#Description), this Check adheres to the "typical convention": > "Checks that the whitespace around the Generic tokens (angle brackets) "<" and ">" are correct to the **_typical convention_**. The convention is not configurable." <br>When running the Checkstyle with `sun_checks` or `google_checks` config on the given Test, a violation does appear in the expected line but for `MethodParamPad`. > Test.java:5:28: '(' is preceded with whitespace. [MethodParamPad] <br>Besides, even if the violation was not covered by any style guide, the Check should behave exactly like it is stated in the documentation, else changes in the documentation should be made to reflect the actual behaviour. I am on it
2024-02-17T10:21:59Z
10.13
checkstyle/checkstyle
13,667
checkstyle__checkstyle-13667
[ "13666" ]
acecbd4d7ec4a20c1c1130dfcdd8823e01ae3a8a
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.java @@ -98,18 +98,18 @@ * </p> * <ul> * <li> - * Property {@code elementStyle} - Define the annotation element styles. - * Type is {@code - * com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck$ElementStyleOption}. - * Default value is {@code compact_no_array}. - * </li> - * <li> * Property {@code closingParens} - Define the policy for ending parenthesis. * Type is {@code * com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck$ClosingParensOption}. * Default value is {@code never}. * </li> * <li> + * Property {@code elementStyle} - Define the annotation element styles. + * Type is {@code + * com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck$ElementStyleOption}. + * Default value is {@code compact_no_array}. + * </li> + * <li> * Property {@code trailingArrayComma} - Define the policy for trailing comma in arrays. * Type is {@code * com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck$TrailingArrayCommaOption}.
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java @@ -226,6 +226,78 @@ public class XdocsPagesTest { private static final Set<String> GOOGLE_MODULES = Collections.unmodifiableSet( CheckUtil.getConfigGoogleStyleModules()); + // until https://github.com/checkstyle/checkstyle/issues/13666 + private static final Set<String> MODULES_WITH_UNORDERED_PROPERTIES = Set.of( + "Checker", + "MissingJavadocMethod", + "VariableDeclarationUsageDistance", + "LocalVariableName", + "JavadocTagContinuationIndentation", + "ClassFanOutComplexity", + "Translation", + "MethodCount", + "SummaryJavadoc", + "ClassDataAbstractionCoupling", + "JavadocMethod", + "VisibilityModifier", + "MethodLength", + "Regexp", + "Indentation", + "MethodName", + "AtclauseOrder", + "SuppressWithNearbyTextFilter", + "SuppressWithPlainTextCommentFilter", + "MemberName", + "AvoidStarImport", + "ReturnCount", + "StaticVariableName", + "AvoidEscapedUnicodeCharacters", + "ParameterNumber", + "RecordComponentNumber", + "RegexpSingleline", + "RegexpOnFilename", + "JavaNCSS", + "EmptyCatchBlock", + "ParameterName", + "IllegalThrows", + "HiddenField", + "SuppressionXpathSingleFilter", + "WhitespaceAround", + "RegexpSinglelineJava", + "ImportOrder", + "IllegalType", + "ConstantName", + "MutableException", + "JavadocType", + "CustomImportOrder", + "AnnotationLocation", + "Header", + "DescendantToken", + "RegexpMultiline", + "JavadocVariable", + "SuppressionSingleFilter", + "InterfaceMemberImpliedModifier", + "IllegalImport", + "NewlineAtEndOfFile", + "SingleLineJavadoc", + "MissingJavadocType", + "FileLength", + "RegexpHeader", + "ThrowsCount", + "SuppressionCommentFilter", + "TypeName", + "MagicNumber", + "NeedBraces", + "SeverityMatchFilter", + "SuppressWithNearbyCommentFilter", + "MultipleStringLiterals", + "LeftCurly", + "AbbreviationAsWordInName", + "EmptyLineSeparator", + "JavadocStyle", + "JavadocParagraph" + ); + /** * Generate xdoc content from templates before validation. * This method will be removed once @@ -797,6 +869,10 @@ private static void validatePropertySection(String fileName, String sectionName, .that(table.getNodeName()) .isEqualTo("table"); + if (!MODULES_WITH_UNORDERED_PROPERTIES.contains(sectionName)) { + validatePropertySectionPropertiesOrder(fileName, sectionName, table, properties); + } + validatePropertySectionProperties(fileName, sectionName, table, instance, properties); } @@ -807,6 +883,43 @@ private static void validatePropertySection(String fileName, String sectionName, .isEmpty(); } + private static void validatePropertySectionPropertiesOrder(String fileName, String sectionName, + Node table, Set<String> properties) { + final Set<Node> rows = XmlUtil.getChildrenElements(table); + final List<String> orderedPropertyNames = new ArrayList<>(properties); + final List<String> tablePropertyNames = new ArrayList<>(); + + // javadocTokens and tokens should be last + if (orderedPropertyNames.contains("javadocTokens")) { + orderedPropertyNames.remove("javadocTokens"); + orderedPropertyNames.add("javadocTokens"); + } + if (orderedPropertyNames.contains("tokens")) { + orderedPropertyNames.remove("tokens"); + orderedPropertyNames.add("tokens"); + } + + rows + .stream() + // First row is header row + .skip(1) + .forEach(row -> { + final List<Node> columns = new ArrayList<>(XmlUtil.getChildrenElements(row)); + assertWithMessage(fileName + " section '" + sectionName + + "' should have the requested columns") + .that(columns) + .hasSize(5); + + final String propertyName = columns.get(0).getTextContent(); + tablePropertyNames.add(propertyName); + }); + + assertWithMessage(fileName + " section '" + sectionName + + "' should have properties in the requested order") + .that(tablePropertyNames) + .isEqualTo(orderedPropertyNames); + } + private static void fixCapturedProperties(String sectionName, Object instance, Class<?> clss, Set<String> properties) { // remove global properties that don't need documentation
Assert that properties are ordered alphabetically in xdoc As suggested in https://github.com/checkstyle/checkstyle/pull/13407#discussion_r1309128616 We need to rearrange properties in alphabetical order(xdoc and javadoc since they are connected) and add a test for that. This will ease reviews when applying the properties macro to checks. https://checkstyle.org/checks/annotation/annotationusestyle.html for example, has properties that do not follow alphabetical order: - elementStyle - closingParens - trailingArrayComma Edit: This issue is only for adding the test with suppressions. I will deal with ordering the properties at https://github.com/checkstyle/checkstyle/issues/13668 Update: almost all are ordered with reference to this issue. #13668 is closed.
Do we still want to keep `tokens`/`javadocTokens` at the end or do we want true alphabetical order?
2023-08-30T08:31:36Z
10.12
checkstyle/checkstyle
13,357
checkstyle__checkstyle-13357
[ "13134" ]
f4a33f90bf8eda8ef2cdf7f66fd60878d2aa1736
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java @@ -80,82 +80,6 @@ * </li> * </ul> * <p> - * To configure the check: - * </p> - * <pre> - * &lt;module name=&quot;WhitespaceAfter&quot;/&gt; - * </pre> - * <p>Example:</p> - * <pre> - * public void myTest() { - * if (foo) { // OK - * //... - * } else if(bar) { // violation - * //... - * } - * - * testMethod(foo, bar); // OK - * testMethod(foo,bar); // violation - * - * for (;;){} // OK - * for(;;){} // violation, space after 'for' is required - * - * try (InputStream ignored = System.in) {} // OK - * try(InputStream ignored = System.in) {} // violation ''try' is not followed by whitespace' - * - * try {} catch (Exception e){} // OK - * try{} catch (Exception e){} // violation ''try' is not followed by whitespace' - * - * try {} finally {} // OK - * try {} finally{} // violation ''finally' is not followed by whitespace' - * - * try {} catch (Error e){} finally {} // OK - * try {} catch (Error e){} finally{} // violation ''finally' is not followed by whitespace' - * - * try {} catch (Exception e){} // OK - * try {} catch(Exception e){} // violation ''catch' is not followed by whitespace' - * - * synchronized (this) { } // OK - * synchronized(this) { } // violation ''synchronized' is not followed by whitespace' - * } - * public String testOne() { - * return ("a" + "b"); // OK - * } - * public String testTwo() { - * return("a" + "b"); // violation 'return' is not followed by whitespace' - * } - * public static void main(String[] args) { - * int a = switch (args[0]) { - * case "got": - * yield (1); // OK - * case "my": - * yield(3); // violation ''yield' is not followed by whitespace' - * default: - * yield 2; - * }; - * } - * </pre> - * <p> - * To configure the check for whitespace only after COMMA and SEMI tokens: - * </p> - * <pre> - * &lt;module name=&quot;WhitespaceAfter&quot;&gt; - * &lt;property name=&quot;tokens&quot; value=&quot;COMMA, SEMI&quot;/&gt; - * &lt;/module&gt; - * </pre> - * <p>Example:</p> - * <pre> - * public void myTest() { - * int a; int b; // OK - * int a;int b; // violation - * - * testMethod(foo, bar); // OK - * testMethod(foo,bar); // violation - * - * for(;;) {} // OK - * } - * </pre> - * <p> * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker} * </p> * <p> diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/site/ExampleMacro.java b/src/main/java/com/puppycrawl/tools/checkstyle/site/ExampleMacro.java new file mode 100644 --- /dev/null +++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/ExampleMacro.java @@ -0,0 +1,146 @@ +/////////////////////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code and other text files for adherence to a set of rules. +// Copyright (C) 2001-2023 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +/////////////////////////////////////////////////////////////////////////////////////////////// + +package com.puppycrawl.tools.checkstyle.site; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Locale; +import java.util.stream.Collectors; + +import org.apache.maven.doxia.macro.AbstractMacro; +import org.apache.maven.doxia.macro.Macro; +import org.apache.maven.doxia.macro.MacroExecutionException; +import org.apache.maven.doxia.macro.MacroRequest; +import org.apache.maven.doxia.sink.Sink; +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; +import org.codehaus.plexus.component.annotations.Component; + +/** + * A macro that inserts a snippet of code or configuration from a file. + */ +@Component(role = Macro.class, hint = "example") +public class ExampleMacro extends AbstractMacro { + + /** Starting delimiter for config snippets. */ + private static final String XML_CONFIG_START = "/*xml"; + + /** Ending delimiter for config snippets. */ + private static final String XML_CONFIG_END = "*/"; + + /** Starting delimiter for code snippets. */ + private static final String CODE_SNIPPET_START = "// xdoc section -- start"; + + /** Ending delimiter for code snippets. */ + private static final String CODE_SNIPPET_END = "// xdoc section -- end"; + + /** Newline character. */ + private static final String NEWLINE = System.lineSeparator(); + + /** Eight whitespace characters. All example source tags are indented 8 spaces. */ + private static final String INDENTATION = " "; + + /** The path of the last file. */ + private String lastPath = ""; + + /** The line contents of the last file. */ + private List<String> lastLines = new ArrayList<>(); + + @Override + public void execute(Sink sink, MacroRequest request) throws MacroExecutionException { + final String path = (String) request.getParameter("path"); + final String type = (String) request.getParameter("type"); + + List<String> lines = lastLines; + if (!path.equals(lastPath)) { + lines = readFile("src/xdocs-examples/" + path); + lastPath = path; + lastLines = lines; + } + + if ("config".equals(type)) { + final String config = getSnippetBetweenDelimiters(lines, + XML_CONFIG_START, XML_CONFIG_END); + writeSnippet(sink, config); + } + else if ("code".equals(type)) { + final String code = getSnippetBetweenDelimiters(lines, + CODE_SNIPPET_START, CODE_SNIPPET_END); + writeSnippet(sink, code); + } + else { + final String message = String.format(Locale.ROOT, "Unknown example type: %s", type); + throw new MacroExecutionException(message); + } + } + + /** + * Read the file at the given path and returns its contents as a list of lines. + * + * @param path the path to the file to read. + * @return the contents of the file as a list of lines. + * @throws MacroExecutionException if the file could not be read. + */ + private static List<String> readFile(String path) throws MacroExecutionException { + try { + final Path exampleFilePath = Path.of(path); + return Files.readAllLines(exampleFilePath); + } + catch (IOException ioException) { + final String message = String.format(Locale.ROOT, "Failed to read %s", path); + throw new MacroExecutionException(message, ioException); + } + } + + /** + * Extract a snippet between the given start and end delimiters. + * The lines containing the delimiter are not included in the snippet. + * + * @param lines the lines to extract the snippet from. + * @param startingDelimiter the starting delimiter. + * @param endingDelimiter the ending delimiter. + * @return the snippet. + */ + private static String getSnippetBetweenDelimiters( + Collection<String> lines, String startingDelimiter, String endingDelimiter) { + return lines.stream() + .dropWhile(line -> !line.contains(startingDelimiter)) + .skip(1) + .takeWhile(line -> !line.contains(endingDelimiter)) + .collect(Collectors.joining(NEWLINE)); + } + + /** + * Write the given snippet to the file inside a source block. + * + * @param sink the sink to write to. + * @param snippet the snippet to write. + */ + private static void writeSnippet(Sink sink, String snippet) { + sink.verbatim(SinkEventAttributeSet.BOXED); + final String text = NEWLINE + + String.join(NEWLINE, snippet.stripTrailing(), INDENTATION); + sink.text(text); + sink.verbatim_(); + } +} diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateParser.java b/src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateParser.java new file mode 100644 --- /dev/null +++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateParser.java @@ -0,0 +1,204 @@ +/////////////////////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code and other text files for adherence to a set of rules. +// Copyright (C) 2001-2023 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +/////////////////////////////////////////////////////////////////////////////////////////////// + +package com.puppycrawl.tools.checkstyle.site; + +import java.io.File; +import java.io.IOException; +import java.io.Reader; +import java.io.StringReader; +import java.io.StringWriter; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; + +import javax.swing.text.html.HTML.Attribute; + +import org.apache.maven.doxia.macro.MacroExecutionException; +import org.apache.maven.doxia.macro.MacroRequest; +import org.apache.maven.doxia.macro.manager.MacroNotFoundException; +import org.apache.maven.doxia.module.xdoc.XdocParser; +import org.apache.maven.doxia.parser.ParseException; +import org.apache.maven.doxia.parser.Parser; +import org.apache.maven.doxia.sink.Sink; +import org.codehaus.plexus.component.annotations.Component; +import org.codehaus.plexus.util.IOUtil; +import org.codehaus.plexus.util.xml.pull.XmlPullParser; + +/** + * Parser for Checkstyle's xdoc templates. + * This parser is responsible for generating xdocs({@code .xml}) from the xdoc + * templates({@code .xml.template}). The templates are regular xdocs with custom + * macros for generating dynamic content - properties, examples, etc. + * This parser behaves just like the {@link XdocParser} with the difference that all + * elements apart from the {@code macro} element are copied as is to the output. + * This module will be removed once + * <a href="https://github.com/checkstyle/checkstyle/issues/13426">#13426</a> is resolved. + * + * @see ExampleMacro + */ +@Component(role = Parser.class, hint = "xdocs-template") +public class XdocsTemplateParser extends XdocParser { + + /** User working directory. */ + public static final String TEMP_DIR = System.getProperty("java.io.tmpdir"); + + /** The macro parameters. */ + private final Map<String, Object> macroParameters = new HashMap<>(); + + /** The source content of the input reader. Used to pass into macros. */ + private String sourceContent; + + /** A macro name. */ + private String macroName; + + @Override + public void parse(Reader source, Sink sink, String reference) throws ParseException { + try (StringWriter contentWriter = new StringWriter()) { + IOUtil.copy(source, contentWriter); + sourceContent = contentWriter.toString(); + super.parse(new StringReader(sourceContent), sink, reference); + } + catch (IOException ioException) { + throw new ParseException("Error reading the input source", ioException); + } + finally { + sourceContent = null; + } + } + + @Override + protected void handleStartTag(XmlPullParser parser, Sink sink) throws MacroExecutionException { + final String tagName = parser.getName(); + if (tagName.equals(DOCUMENT_TAG.toString())) { + sink.body(); + sink.rawText(parser.getText()); + } + else if (tagName.equals(MACRO_TAG.toString()) && !isSecondParsing()) { + processMacroStart(parser); + setIgnorableWhitespace(true); + } + else if (tagName.equals(PARAM.toString()) && !isSecondParsing()) { + processParamStart(parser, sink); + } + else { + sink.rawText(parser.getText()); + } + } + + @Override + protected void handleEndTag(XmlPullParser parser, Sink sink) throws MacroExecutionException { + final String tagName = parser.getName(); + if (tagName.equals(DOCUMENT_TAG.toString())) { + sink.rawText(parser.getText()); + sink.body_(); + } + else if (macroName != null + && tagName.equals(MACRO_TAG.toString()) + && !macroName.isEmpty() + && !isSecondParsing()) { + processMacroEnd(sink); + setIgnorableWhitespace(false); + } + else if (!tagName.equals(PARAM.toString())) { + sink.rawText(parser.getText()); + } + } + + /** + * Handle the opening tag of a macro. Gather the macro name and parameters. + * + * @param parser the xml parser. + * @throws MacroExecutionException if the macro name is not specified. + */ + private void processMacroStart(XmlPullParser parser) throws MacroExecutionException { + macroName = parser.getAttributeValue(null, Attribute.NAME.toString()); + + if (macroName == null || macroName.isEmpty()) { + final String message = String.format(Locale.ROOT, + "The '%s' attribute for the '%s' tag is required.", + Attribute.NAME, MACRO_TAG); + throw new MacroExecutionException(message); + } + } + + /** + * Handle the opening tag of a parameter. Gather the parameter name and value. + * + * @param parser the xml parser. + * @param sink the sink object. + * @throws MacroExecutionException if the parameter name or value is not specified. + */ + private void processParamStart(XmlPullParser parser, Sink sink) throws MacroExecutionException { + if (macroName != null && !macroName.isEmpty()) { + final String paramName = parser + .getAttributeValue(null, Attribute.NAME.toString()); + final String paramValue = parser + .getAttributeValue(null, Attribute.VALUE.toString()); + + if (paramName == null + || paramValue == null + || paramName.isEmpty() + || paramValue.isEmpty()) { + final String message = String.format(Locale.ROOT, + "'%s' and '%s' attributes for the '%s' tag are required" + + " inside the '%s' tag.", + Attribute.NAME, Attribute.VALUE, PARAM, MACRO_TAG); + throw new MacroExecutionException(message); + } + + macroParameters.put(paramName, paramValue); + } + else { + sink.rawText(parser.getText()); + } + } + + /** + * Execute a macro. Creates a {@link MacroRequest} with the gathered + * {@link #macroName} and {@link #macroParameters} and executes the macro. + * Afterward, the macro fields are reinitialized. + * + * @param sink the sink object. + * @throws MacroExecutionException if a macro is not found. + */ + private void processMacroEnd(Sink sink) throws MacroExecutionException { + final MacroRequest request = new MacroRequest(sourceContent, + new XdocsTemplateParser(), macroParameters, + new File(TEMP_DIR)); + + try { + executeMacro(macroName, request, sink); + } + catch (MacroNotFoundException exception) { + final String message = String.format(Locale.ROOT, "Macro '%s' not found.", macroName); + throw new MacroExecutionException(message, exception); + } + + reinitializeMacroFields(); + } + + /** + * Reinitialize the macro fields. + */ + private void reinitializeMacroFields() { + macroName = ""; + macroParameters.clear(); + } +} diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSink.java b/src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSink.java new file mode 100644 --- /dev/null +++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSink.java @@ -0,0 +1,67 @@ +/////////////////////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code and other text files for adherence to a set of rules. +// Copyright (C) 2001-2023 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +/////////////////////////////////////////////////////////////////////////////////////////////// + +package com.puppycrawl.tools.checkstyle.site; + +import java.io.Writer; + +import org.apache.maven.doxia.module.xdoc.XdocSink; + +/** + * A sink for Checkstyle's xdoc templates. + * This module will be removed once + * <a href="https://github.com/checkstyle/checkstyle/issues/13426">#13426</a> is resolved. + * + * @see <a href="https://maven.apache.org/doxia/doxia/doxia-sink-api">Doxia Sink API</a> + */ +public class XdocsTemplateSink extends XdocSink { + + /** Encoding of the writer. */ + private final String encoding; + + /** + * Create a new instance, initialize the Writer. + * + * @param writer not null writer to write the result. + * @param encoding encoding of the writer. + */ + public XdocsTemplateSink(Writer writer, String encoding) { + super(writer); + this.encoding = encoding; + } + + /** + * Place the XML declaration at the top of the file. + */ + @Override + public void body() { + write("<?xml version=\"1.0\" encoding=\"" + encoding + "\"?>"); + writeEOL(); + } + + /** + * Place a newline at the end of the file, flush the writer, and reset the sink. + */ + @Override + public void body_() { + writeEOL(); + flush(); + init(); + } +} diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSinkFactory.java b/src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSinkFactory.java new file mode 100644 --- /dev/null +++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSinkFactory.java @@ -0,0 +1,48 @@ +/////////////////////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code and other text files for adherence to a set of rules. +// Copyright (C) 2001-2023 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +/////////////////////////////////////////////////////////////////////////////////////////////// + +package com.puppycrawl.tools.checkstyle.site; + +import java.io.Writer; + +import org.apache.maven.doxia.sink.Sink; +import org.apache.maven.doxia.sink.SinkFactory; +import org.apache.maven.doxia.sink.impl.AbstractTextSinkFactory; +import org.codehaus.plexus.component.annotations.Component; + +/** + * Xdoc template implementation of the {@link SinkFactory}. + * This module will be removed once + * <a href="https://github.com/checkstyle/checkstyle/issues/13426">#13426</a> is resolved. + */ +@Component(role = SinkFactory.class, hint = "xdocs-template") +public class XdocsTemplateSinkFactory extends AbstractTextSinkFactory { + + /** + * Create a Sink instance. + * + * @param writer writer to use. + * @param encoding encoding of the writer. + * @return Sink instance. + */ + @Override + public Sink createSink(Writer writer, String encoding) { + return new XdocsTemplateSink(writer, encoding); + } +} diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/site/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/site/package-info.java new file mode 100644 --- /dev/null +++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/package-info.java @@ -0,0 +1,23 @@ +/////////////////////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code and other text files for adherence to a set of rules. +// Copyright (C) 2001-2023 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +/////////////////////////////////////////////////////////////////////////////////////////////// + +/** + * Contains classes for generating the Checkstyle website. + */ +package com.puppycrawl.tools.checkstyle.site; diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterExamplesTest.java --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterExamplesTest.java @@ -40,16 +40,16 @@ protected String getPackageLocation() { public void testExample1() throws Exception { final String[] expected = { "19:12: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "if"), - "22:16: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ","), - "24:5: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "for"), - "26:5: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "try"), - "28:5: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "try"), - "30:12: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "finally"), - "32:30: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "finally"), - "34:12: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "catch"), - "36:5: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "synchronized"), - "42:5: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "return"), - "49:9: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "yield"), + "23:16: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ","), + "26:5: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "for"), + "29:5: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "try"), + "32:5: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "try"), + "35:12: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "finally"), + "38:30: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "finally"), + "41:12: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "catch"), + "44:5: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "synchronized"), + "51:5: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "return"), + "59:9: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "yield"), }; verifyWithInlineConfigParser(getNonCompilablePath("Example1.java"), expected); diff --git a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/Example1.java b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/Example1.java --- a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/Example1.java +++ b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/Example1.java @@ -18,29 +18,39 @@ void example() throws Exception { if (true) { } else if(false) { // violation 'not followed by whitespace' } + testOne("x", "y"); testOne("z","o"); // violation 'not followed by whitespace' + for (int i = 0; i < 10; i++){} for(int i = 0; i < 10; i++){} // violation 'not followed by whitespace' + try (InputStream ignored = System.in) {} try(InputStream ignored = System.in) {} // violation 'not followed by whitespace' + try {} catch (Exception e){} - try{} catch (Exception e){} // violation 'not followed by whitespace' + try{} catch (Exception e) {} // violation ''try' is not followed by whitespace' + try {} finally {} try {} finally{} // violation 'not followed by whitespace' + try {} catch (Error e){} finally {} try {} catch (Error e){} finally{} // violation 'not followed by whitespace' + try {} catch (Exception e){} try {} catch(Exception e){} // violation 'not followed by whitespace' + synchronized (this) { } synchronized(this) { } // violation 'not followed by whitespace' } + public String testOne(String a, String b) { return (a + b); } - public String testTwo() { - return("a" + "b"); // violation 'not followed by whitespace' + public String testTwo(String a, String b) { + return(a + b); // violation 'not followed by whitespace' } + void switchExample() { int a = switch ("hello") { case "got":
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsJavaDocsTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsJavaDocsTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsJavaDocsTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsJavaDocsTest.java @@ -113,6 +113,12 @@ public class XdocsJavaDocsTest extends AbstractModuleTestSupport { "MultipleStringLiterals - ignoreOccurrenceContext", }).collect(Collectors.toSet())); + // We skip validation of examples section on modules that have this section generated + // until https://github.com/checkstyle/checkstyle/issues/13429 + private static final Set<String> MODULES_EXAMPLES_TO_SKIP = Set.of( + "WhitespaceAfter" + ); + private static final List<List<Node>> CHECK_PROPERTIES = new ArrayList<>(); private static final Map<String, String> CHECK_PROPERTY_DOC = new HashMap<>(); private static final Map<String, String> CHECK_TEXT = new HashMap<>(); @@ -645,16 +651,22 @@ private static void visitClass(DetailAST node) { } if (ScopeUtil.isInScope(node, Scope.PUBLIC)) { - assertWithMessage(checkName + "'s class-level JavaDoc") - .that(getJavaDocText(node)) - .isEqualTo(CHECK_TEXT.get("Description") + String expected = CHECK_TEXT.get("Description") + CHECK_TEXT.computeIfAbsent("Rule Description", unused -> "") + CHECK_TEXT.computeIfAbsent("Notes", unused -> "") - + CHECK_TEXT.computeIfAbsent("Properties", unused -> "") - + CHECK_TEXT.get("Examples") - + CHECK_TEXT.get("Parent Module") + + CHECK_TEXT.computeIfAbsent("Properties", unused -> ""); + + if (!MODULES_EXAMPLES_TO_SKIP.contains(checkName)) { + expected += CHECK_TEXT.get("Examples"); + } + + expected += CHECK_TEXT.get("Parent Module") + violationMessagesText + " @since " - + CHECK_TEXT.get("since")); + + CHECK_TEXT.get("since"); + + assertWithMessage(checkName + "'s class-level JavaDoc") + .that(getJavaDocText(node)) + .isEqualTo(expected); } } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java @@ -56,6 +56,7 @@ import java.util.stream.Stream; import org.apache.commons.beanutils.PropertyUtils; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -76,10 +77,17 @@ import com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption; import com.puppycrawl.tools.checkstyle.internal.utils.CheckUtil; import com.puppycrawl.tools.checkstyle.internal.utils.TestUtil; +import com.puppycrawl.tools.checkstyle.internal.utils.XdocGenerator; import com.puppycrawl.tools.checkstyle.internal.utils.XdocUtil; import com.puppycrawl.tools.checkstyle.internal.utils.XmlUtil; import com.puppycrawl.tools.checkstyle.utils.TokenUtil; +/** + * Generates xdocs pages from templates and performs validations. + * Before running this test, the following commands have to be executed: + * - mvn clean compile - Required for next command + * - mvn plexus-component-metadata:generate-metadata - Required to find custom macros and parser + */ public class XdocsPagesTest { private static final Path SITE_PATH = Paths.get("src/site/site.xml"); @@ -214,9 +222,22 @@ public class XdocsPagesTest { "WhitespaceAfter", "WhitespaceAround" ); + private static final Set<String> GOOGLE_MODULES = Collections.unmodifiableSet( CheckUtil.getConfigGoogleStyleModules()); + /** + * Generate xdoc content from templates before validation. + * This method will be removed once + * <a href="https://github.com/checkstyle/checkstyle/issues/13426">#13426</a> is resolved. + * + * @throws Exception if something goes wrong + */ + @BeforeAll + public static void generateXdocContent() throws Exception { + XdocGenerator.generateXdocContent(); + } + @Test public void testAllChecksPresentOnAvailableChecksPage() throws Exception { final String availableChecks = Files.readString(AVAILABLE_CHECKS_PATH); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XdocGenerator.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XdocGenerator.java new file mode 100644 --- /dev/null +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XdocGenerator.java @@ -0,0 +1,73 @@ +/////////////////////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code and other text files for adherence to a set of rules. +// Copyright (C) 2001-2023 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +/////////////////////////////////////////////////////////////////////////////////////////////// + +package com.puppycrawl.tools.checkstyle.internal.utils; + +import java.io.File; +import java.io.Reader; +import java.nio.charset.StandardCharsets; +import java.nio.file.Path; +import java.util.Set; + +import org.apache.maven.doxia.parser.Parser; +import org.apache.maven.doxia.sink.Sink; +import org.apache.maven.doxia.sink.SinkFactory; +import org.codehaus.plexus.DefaultPlexusContainer; +import org.codehaus.plexus.PlexusContainer; +import org.codehaus.plexus.util.ReaderFactory; + +import com.puppycrawl.tools.checkstyle.site.XdocsTemplateParser; +import com.puppycrawl.tools.checkstyle.site.XdocsTemplateSinkFactory; + +/** + * Generates xdoc content from xdoc templates. + * This module will be removed once + * <a href="https://github.com/checkstyle/checkstyle/issues/13426">#13426</a> is resolved. + */ +public final class XdocGenerator { + private static final String XDOCS_TEMPLATE_HINT = "xdocs-template"; + + private XdocGenerator() { + } + + public static void generateXdocContent() throws Exception { + final PlexusContainer plexus = new DefaultPlexusContainer(); + final Set<Path> templatesFilePaths = XdocUtil.getXdocsTemplatesFilePaths(); + + for (Path path : templatesFilePaths) { + final String pathToFile = path.toString(); + final File inputFile = new File(pathToFile); + final File outputFile = new File(pathToFile.replace(".template", "")); + + final XdocsTemplateSinkFactory sinkFactory = (XdocsTemplateSinkFactory) + plexus.lookup(SinkFactory.ROLE, XDOCS_TEMPLATE_HINT); + final Sink sink = sinkFactory.createSink(outputFile.getParentFile(), + outputFile.getName(), String.valueOf(StandardCharsets.UTF_8)); + final XdocsTemplateParser parser = (XdocsTemplateParser) + plexus.lookup(Parser.ROLE, XDOCS_TEMPLATE_HINT); + try (Reader reader = ReaderFactory.newReader(inputFile, + String.valueOf(StandardCharsets.UTF_8))) { + parser.parse(reader, sink); + } + finally { + sink.close(); + } + } + } +} diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XdocUtil.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XdocUtil.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XdocUtil.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XdocUtil.java @@ -69,6 +69,25 @@ public static Set<Path> getXdocsFilePaths() throws IOException { } } + /** + * Gets xdocs template file paths. These are files ending with .xml.template. + * This module will be removed once + * <a href="https://github.com/checkstyle/checkstyle/issues/13426">#13426</a> is resolved. + * + * @return a set of xdocs template file paths. + * @throws IOException if an I/O error occurs. + */ + public static Set<Path> getXdocsTemplatesFilePaths() throws IOException { + final Path directory = Paths.get(DIRECTORY_PATH); + try (Stream<Path> stream = Files.find(directory, Integer.MAX_VALUE, + (path, attr) -> { + return attr.isRegularFile() + && path.toString().endsWith(".xml.template"); + })) { + return stream.collect(Collectors.toSet()); + } + } + /** * Gets xdocs documentation file paths. *
Implement examples macro and xdoc template parser All xdoc examples are being moved to real java tests in https://github.com/checkstyle/checkstyle/issues/13100 The purpose of this issue is to gather requirements on how this parser should work and then implement it after an agreement is achieved. - There is a proposal at https://github.com/checkstyle/checkstyle/issues/12155#issuecomment-1573143997 to use real XML configs. - [ We should remove "package" in HTML version of this snippet.](https://github.com/checkstyle/checkstyle/pull/13112#discussion_r1211662594) --- Edit: It was decided to use [Doxia Macros](https://maven.apache.org/doxia/macros/index.html) for that. Doxia already comes with a built in [`SnippetMacro`](https://maven.apache.org/doxia/macros/index.html#snippet-macro) that works in a similar way to what we want - use delimiter comments inside the target file. We will just build a similar one that fits our needs. Doxia documentation already explains how to make our own macro - https://maven.apache.org/doxia/developers/macros.html. Source code of snippet macro - https://github.com/apache/maven-doxia/blob/master/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java Since we want to keep the xdoc files in the repository, a custom parser needs to be created to just execute the macros and keep the rest of the xdoc the same. This parser will work very similarly to the default xdoc one - https://github.com/apache/maven-doxia/blob/master/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java Doxia documentation on how to build a custom macro - https://maven.apache.org/doxia/developers/modules.html.
My vision would be to have some custom check and listener (comment aware of course) that does the following: 1. Grabs config comment and extracts xml 2. Transforms the AST based on some properties defined within our generation system 3. Ties into listener that grabs data we need Listener would provide data we need as some object, maybe with a name like `JavaExample` (since we will have others). JavaExample object would look like: DetailAST packageDeclaration; DetailAST imports; DetailAST outerType; XMLNode configuration; (or String representation) in my mind: run our parser(or maybe even simple line reader) to get line for outter type location - it is all after last import. run line based reader of file to get XML content (I think we already do line based reader for Inputs). AST based reader of Example file might be too slow, we do not need AST based detailization of file content. Examples are strict files by structure, freedom is not required. But it is ok to user slow parser if we move this execution to "site" phase of mvn build. I recommend to keep this parser on "test" phase and override files in xdoc folder to let users take this changes in commit easily. We will think about this at: https://github.com/orgs/checkstyle/projects/5/views/2?pane=issue&itemId=29857687 Even we see AST parser convenient, we will should use from it start-end lines and after that cut raw file by lines.
2023-07-04T12:31:48Z
10.12
checkstyle/checkstyle
13,320
checkstyle__checkstyle-13320
[ "12155" ]
08da65a9f63912571441fde44965b827c4977614
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java b/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java @@ -68,6 +68,14 @@ public enum IgnoredModulesOptions { } + /** The new public ID for version 1_3 of the configuration dtd. */ + public static final String DTD_PUBLIC_CS_ID_1_3 = + "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"; + + /** The resource for version 1_3 of the configuration dtd. */ + public static final String DTD_CONFIGURATION_NAME_1_3 = + "com/puppycrawl/tools/checkstyle/configuration_1_3.dtd"; + /** Format of message for sax parse exception. */ private static final String SAX_PARSE_EXCEPTION_FORMAT = "%s - %s:%s:%s"; @@ -111,14 +119,6 @@ public enum IgnoredModulesOptions { private static final String DTD_PUBLIC_ID_1_3 = "-//Puppy Crawl//DTD Check Configuration 1.3//EN"; - /** The new public ID for version 1_3 of the configuration dtd. */ - private static final String DTD_PUBLIC_CS_ID_1_3 = - "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"; - - /** The resource for version 1_3 of the configuration dtd. */ - private static final String DTD_CONFIGURATION_NAME_1_3 = - "com/puppycrawl/tools/checkstyle/configuration_1_3.dtd"; - /** Prefix for the exception when unable to parse resource. */ private static final String UNABLE_TO_PARSE_EXCEPTION_PREFIX = "unable to parse" + " configuration stream"; diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameExamplesTest.java --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameExamplesTest.java @@ -42,9 +42,9 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - "14:7: " + getCheckMessage(MSG_KEY, "CURRENT_COUNTER", DEFAULT_EXPECTED_CAPITAL_COUNT), - "23:8: " + getCheckMessage(MSG_KEY, "incrementCOUNTER", DEFAULT_EXPECTED_CAPITAL_COUNT), - "27:15: " + getCheckMessage(MSG_KEY, "incrementGLOBAL", DEFAULT_EXPECTED_CAPITAL_COUNT), + "18:7: " + getCheckMessage(MSG_KEY, "CURRENT_COUNTER", DEFAULT_EXPECTED_CAPITAL_COUNT), + "27:8: " + getCheckMessage(MSG_KEY, "incrementCOUNTER", DEFAULT_EXPECTED_CAPITAL_COUNT), + "31:15: " + getCheckMessage(MSG_KEY, "incrementGLOBAL", DEFAULT_EXPECTED_CAPITAL_COUNT), }; verifyWithInlineConfigParser(getPath("Example1.java"), expected); @@ -53,11 +53,11 @@ public void testExample1() throws Exception { @Test public void testExample2() throws Exception { final String[] expected = { - "16:7: " + getCheckMessage(MSG_KEY, "CURRENT_COUNTER", DEFAULT_EXPECTED_CAPITAL_COUNT), - "18:14: " + getCheckMessage(MSG_KEY, "GLOBAL_COUNTER", DEFAULT_EXPECTED_CAPITAL_COUNT), - "22:15: " + getCheckMessage(MSG_KEY, "printCOUNTER", DEFAULT_EXPECTED_CAPITAL_COUNT), - "26:8: " + getCheckMessage(MSG_KEY, "incrementCOUNTER", DEFAULT_EXPECTED_CAPITAL_COUNT), - "30:15: " + getCheckMessage(MSG_KEY, "incrementGLOBAL", DEFAULT_EXPECTED_CAPITAL_COUNT), + "21:7: " + getCheckMessage(MSG_KEY, "CURRENT_COUNTER", DEFAULT_EXPECTED_CAPITAL_COUNT), + "23:14: " + getCheckMessage(MSG_KEY, "GLOBAL_COUNTER", DEFAULT_EXPECTED_CAPITAL_COUNT), + "27:15: " + getCheckMessage(MSG_KEY, "printCOUNTER", DEFAULT_EXPECTED_CAPITAL_COUNT), + "31:8: " + getCheckMessage(MSG_KEY, "incrementCOUNTER", DEFAULT_EXPECTED_CAPITAL_COUNT), + "35:15: " + getCheckMessage(MSG_KEY, "incrementGLOBAL", DEFAULT_EXPECTED_CAPITAL_COUNT), }; verifyWithInlineConfigParser(getPath("Example2.java"), expected); @@ -68,8 +68,8 @@ public void testExample3() throws Exception { final int expectedCapitalCount = 1; final String[] expected = { - "16:7: " + getCheckMessage(MSG_KEY, "secondNUM", expectedCapitalCount), - "18:14: " + getCheckMessage(MSG_KEY, "fourthNUm", expectedCapitalCount), + "21:7: " + getCheckMessage(MSG_KEY, "secondNUM", expectedCapitalCount), + "23:14: " + getCheckMessage(MSG_KEY, "fourthNUm", expectedCapitalCount), }; verifyWithInlineConfigParser(getPath("Example3.java"), expected); @@ -80,9 +80,9 @@ public void testExample4() throws Exception { final int expectedCapitalCount = 2; final String[] expected = { - "17:7: " + getCheckMessage(MSG_KEY, "secondMYNum", expectedCapitalCount), - "18:7: " + getCheckMessage(MSG_KEY, "thirdNUM", expectedCapitalCount), - "21:10: " + getCheckMessage(MSG_KEY, "firstXML", expectedCapitalCount), + "22:7: " + getCheckMessage(MSG_KEY, "secondMYNum", expectedCapitalCount), + "23:7: " + getCheckMessage(MSG_KEY, "thirdNUM", expectedCapitalCount), + "26:10: " + getCheckMessage(MSG_KEY, "firstXML", expectedCapitalCount), }; verifyWithInlineConfigParser(getPath("Example4.java"), expected); @@ -93,9 +93,9 @@ public void testExample5() throws Exception { final int expectedCapitalCount = 1; final String[] expected = { - "16:7: " + getCheckMessage(MSG_KEY, "counterXYZ", expectedCapitalCount), - "18:13: " + getCheckMessage(MSG_KEY, "customerID", expectedCapitalCount), - "19:14: " + getCheckMessage(MSG_KEY, "nextID", expectedCapitalCount), + "21:7: " + getCheckMessage(MSG_KEY, "counterXYZ", expectedCapitalCount), + "23:13: " + getCheckMessage(MSG_KEY, "customerID", expectedCapitalCount), + "24:14: " + getCheckMessage(MSG_KEY, "nextID", expectedCapitalCount), }; verifyWithInlineConfigParser(getPath("Example5.java"), expected); @@ -106,9 +106,9 @@ public void testExample6() throws Exception { final int expectedCapitalCount = 1; final String[] expected = { - "16:7: " + getCheckMessage(MSG_KEY, "counterXYZ", expectedCapitalCount), - "18:13: " + getCheckMessage(MSG_KEY, "customerID", expectedCapitalCount), - "21:20: " + getCheckMessage(MSG_KEY, "MAX_ALLOWED", expectedCapitalCount), + "21:7: " + getCheckMessage(MSG_KEY, "counterXYZ", expectedCapitalCount), + "23:13: " + getCheckMessage(MSG_KEY, "customerID", expectedCapitalCount), + "26:20: " + getCheckMessage(MSG_KEY, "MAX_ALLOWED", expectedCapitalCount), }; verifyWithInlineConfigParser(getPath("Example6.java"), expected); diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckExamplesTest.java --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckExamplesTest.java @@ -42,10 +42,10 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - "12:3: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "Second", DEFAULT_PATTERN), - "13:3: " + getCheckMessage(MSG_NO_ABSTRACT_CLASS_MODIFIER, "AbstractThird", + "16:3: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "Second", DEFAULT_PATTERN), + "17:3: " + getCheckMessage(MSG_NO_ABSTRACT_CLASS_MODIFIER, "AbstractThird", DEFAULT_PATTERN), - "15:3: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "GeneratorFifth", + "19:3: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "GeneratorFifth", DEFAULT_PATTERN), }; @@ -55,8 +55,8 @@ public void testExample1() throws Exception { @Test public void testExample2() throws Exception { final String[] expected = { - "13:3: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "Second", DEFAULT_PATTERN), - "16:3: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "GeneratorFifth", + "18:3: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "Second", DEFAULT_PATTERN), + "21:3: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "GeneratorFifth", DEFAULT_PATTERN), }; @@ -66,7 +66,7 @@ public void testExample2() throws Exception { @Test public void testExample3() throws Exception { final String[] expected = { - "14:3: " + getCheckMessage(MSG_NO_ABSTRACT_CLASS_MODIFIER, "AbstractThird", + "19:3: " + getCheckMessage(MSG_NO_ABSTRACT_CLASS_MODIFIER, "AbstractThird", DEFAULT_PATTERN), }; @@ -78,9 +78,9 @@ public void testExample4() throws Exception { final String pattern = "^Generator.+$"; final String[] expected = { - "13:3: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "AbstractFirst", pattern), - "14:3: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "Second", pattern), - "18:3: " + getCheckMessage(MSG_NO_ABSTRACT_CLASS_MODIFIER, "GeneratorSixth", + "18:3: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "AbstractFirst", pattern), + "19:3: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "Second", pattern), + "23:3: " + getCheckMessage(MSG_NO_ABSTRACT_CLASS_MODIFIER, "GeneratorSixth", pattern), }; diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheckExamplesTest.java --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheckExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheckExamplesTest.java @@ -41,12 +41,12 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - "13:20: " + getCheckMessage(MSG_INVALID_PATTERN, "third_Constant3", DEFAULT_PATTERN), - "14:28: " + getCheckMessage(MSG_INVALID_PATTERN, "fourth_Const4", DEFAULT_PATTERN), - "15:27: " + getCheckMessage(MSG_INVALID_PATTERN, "log", DEFAULT_PATTERN), - "16:30: " + getCheckMessage(MSG_INVALID_PATTERN, "logger", DEFAULT_PATTERN), - "17:20: " + getCheckMessage(MSG_INVALID_PATTERN, "loggerMYSELF", DEFAULT_PATTERN), - "19:30: " + getCheckMessage(MSG_INVALID_PATTERN, "myselfConstant", DEFAULT_PATTERN), + "17:20: " + getCheckMessage(MSG_INVALID_PATTERN, "third_Constant3", DEFAULT_PATTERN), + "18:28: " + getCheckMessage(MSG_INVALID_PATTERN, "fourth_Const4", DEFAULT_PATTERN), + "19:27: " + getCheckMessage(MSG_INVALID_PATTERN, "log", DEFAULT_PATTERN), + "20:30: " + getCheckMessage(MSG_INVALID_PATTERN, "logger", DEFAULT_PATTERN), + "21:20: " + getCheckMessage(MSG_INVALID_PATTERN, "loggerMYSELF", DEFAULT_PATTERN), + "23:30: " + getCheckMessage(MSG_INVALID_PATTERN, "myselfConstant", DEFAULT_PATTERN), }; verifyWithInlineConfigParser(getPath("Example1.java"), expected); @@ -57,10 +57,10 @@ public void testExample2() throws Exception { final String pattern = "^log(ger)?$|^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"; final String[] expected = { - "14:20: " + getCheckMessage(MSG_INVALID_PATTERN, "third_Constant3", pattern), - "15:28: " + getCheckMessage(MSG_INVALID_PATTERN, "fourth_Const4", pattern), - "18:20: " + getCheckMessage(MSG_INVALID_PATTERN, "loggerMYSELF", pattern), - "20:30: " + getCheckMessage(MSG_INVALID_PATTERN, "myselfConstant", pattern), + "19:20: " + getCheckMessage(MSG_INVALID_PATTERN, "third_Constant3", pattern), + "20:28: " + getCheckMessage(MSG_INVALID_PATTERN, "fourth_Const4", pattern), + "23:20: " + getCheckMessage(MSG_INVALID_PATTERN, "loggerMYSELF", pattern), + "25:30: " + getCheckMessage(MSG_INVALID_PATTERN, "myselfConstant", pattern), }; verifyWithInlineConfigParser(getPath("Example2.java"), expected); @@ -69,9 +69,9 @@ public void testExample2() throws Exception { @Test public void testExample3() throws Exception { final String[] expected = { - "15:20: " + getCheckMessage(MSG_INVALID_PATTERN, "third_Constant3", DEFAULT_PATTERN), - "16:28: " + getCheckMessage(MSG_INVALID_PATTERN, "fourth_Const4", DEFAULT_PATTERN), - "19:20: " + getCheckMessage(MSG_INVALID_PATTERN, "loggerMYSELF", DEFAULT_PATTERN), + "20:20: " + getCheckMessage(MSG_INVALID_PATTERN, "third_Constant3", DEFAULT_PATTERN), + "21:28: " + getCheckMessage(MSG_INVALID_PATTERN, "fourth_Const4", DEFAULT_PATTERN), + "24:20: " + getCheckMessage(MSG_INVALID_PATTERN, "loggerMYSELF", DEFAULT_PATTERN), }; verifyWithInlineConfigParser(getPath("Example3.java"), expected); diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthExamplesTest.java --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthExamplesTest.java @@ -41,8 +41,8 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - "21:20: " + getCheckMessage(MSG_KEY, 11, DEFAULT_MAX), - "32:20: " + getCheckMessage(MSG_KEY, 11, DEFAULT_MAX), + "25:20: " + getCheckMessage(MSG_KEY, 11, DEFAULT_MAX), + "36:20: " + getCheckMessage(MSG_KEY, 11, DEFAULT_MAX), }; verifyWithInlineConfigParser(getPath("Example1.java"), expected); @@ -53,8 +53,8 @@ public void testExample2() throws Exception { final int max = 5; final String[] expected = { - "17:20: " + getCheckMessage(MSG_KEY, 6, max), - "24:20: " + getCheckMessage(MSG_KEY, 6, max), + "22:20: " + getCheckMessage(MSG_KEY, 6, max), + "29:20: " + getCheckMessage(MSG_KEY, 6, max), }; verifyWithInlineConfigParser(getPath("Example2.java"), expected); diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadExamplesTest.java --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadExamplesTest.java @@ -40,8 +40,8 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - "13:11: " + getCheckMessage(MSG_PRECEDED, ";"), - "16:11: " + getCheckMessage(MSG_PRECEDED, ";"), + "17:11: " + getCheckMessage(MSG_PRECEDED, ";"), + "20:11: " + getCheckMessage(MSG_PRECEDED, ";"), }; verifyWithInlineConfigParser(getPath("Example1.java"), expected); @@ -50,8 +50,8 @@ public void testExample1() throws Exception { @Test public void testExample2() throws Exception { final String[] expected = { - "15:10: " + getCheckMessage(MSG_NOT_PRECEDED, ";"), - "16:10: " + getCheckMessage(MSG_NOT_PRECEDED, ";"), + "20:10: " + getCheckMessage(MSG_NOT_PRECEDED, ";"), + "21:10: " + getCheckMessage(MSG_NOT_PRECEDED, ";"), }; verifyWithInlineConfigParser(getPath("Example2.java"), expected); diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadExamplesTest.java --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadExamplesTest.java @@ -40,7 +40,7 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - "18:66: " + getCheckMessage(MSG_WS_FOLLOWED, ";"), + "22:66: " + getCheckMessage(MSG_WS_FOLLOWED, ";"), }; verifyWithInlineConfigParser(getPath("Example1.java"), expected); @@ -49,7 +49,7 @@ public void testExample1() throws Exception { @Test public void testExample2() throws Exception { final String[] expected = { - "18:65: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ";"), + "23:65: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ";"), }; verifyWithInlineConfigParser(getPath("Example2.java"), expected); diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorExamplesTest.java --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorExamplesTest.java @@ -41,10 +41,10 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - "10:1: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "package"), - "11:1: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "import"), - "18:3: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "VARIABLE_DEF"), - "25:3: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "METHOD_DEF"), + "14:1: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "package"), + "15:1: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "import"), + "22:3: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "VARIABLE_DEF"), + "29:3: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "METHOD_DEF"), }; verifyWithInlineConfigParser(getPath("Example1.java"), expected); @@ -53,8 +53,8 @@ public void testExample1() throws Exception { @Test public void testExample2() throws Exception { final String[] expected = { - "17:3: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "VARIABLE_DEF"), - "24:3: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "METHOD_DEF"), + "22:3: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "VARIABLE_DEF"), + "29:3: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "METHOD_DEF"), }; verifyWithInlineConfigParser(getPath("Example2.java"), expected); @@ -63,9 +63,9 @@ public void testExample2() throws Exception { @Test public void testExample3() throws Exception { final String[] expected = { - "11:1: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "package"), - "12:1: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "import"), - "26:3: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "METHOD_DEF"), + "16:1: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "package"), + "17:1: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "import"), + "31:3: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "METHOD_DEF"), }; verifyWithInlineConfigParser(getPath("Example3.java"), expected); @@ -74,12 +74,12 @@ public void testExample3() throws Exception { @Test public void testExample4() throws Exception { final String[] expected = { - "11:1: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "package"), - "12:1: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "import"), - "19:3: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "VARIABLE_DEF"), - "22:3: " + getCheckMessage(MSG_MULTIPLE_LINES, "VARIABLE_DEF"), - "25:3: " + getCheckMessage(MSG_MULTIPLE_LINES, "METHOD_DEF"), - "26:3: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "METHOD_DEF"), + "16:1: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "package"), + "17:1: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "import"), + "24:3: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "VARIABLE_DEF"), + "27:3: " + getCheckMessage(MSG_MULTIPLE_LINES, "VARIABLE_DEF"), + "30:3: " + getCheckMessage(MSG_MULTIPLE_LINES, "METHOD_DEF"), + "31:3: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "METHOD_DEF"), }; verifyWithInlineConfigParser(getPath("Example4.java"), expected); @@ -88,11 +88,11 @@ public void testExample4() throws Exception { @Test public void testExample5() throws Exception { final String[] expected = { - "11:1: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "package"), - "12:1: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "import"), - "19:3: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "VARIABLE_DEF"), - "26:3: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "METHOD_DEF"), - "27:17: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), + "16:1: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "package"), + "17:1: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "import"), + "24:3: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "VARIABLE_DEF"), + "31:3: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "METHOD_DEF"), + "32:17: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), }; verifyWithInlineConfigParser(getPath("Example5.java"), expected); diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterExamplesTest.java --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterExamplesTest.java @@ -41,7 +41,7 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - "11:1: " + getCheckMessage(MSG_FILE_CONTAINS_TAB), + "13:1: " + getCheckMessage(MSG_FILE_CONTAINS_TAB), }; verifyWithInlineConfigParser(getPath("Example1.java"), expected); @@ -50,8 +50,8 @@ public void testExample1() throws Exception { @Test public void testExample2() throws Exception { final String[] expected = { - "12:1: " + getCheckMessage(MSG_CONTAINS_TAB), - "14:1: " + getCheckMessage(MSG_CONTAINS_TAB), + "15:1: " + getCheckMessage(MSG_CONTAINS_TAB), + "17:1: " + getCheckMessage(MSG_CONTAINS_TAB), }; verifyWithInlineConfigParser(getPath("Example2.java"), expected); @@ -60,7 +60,7 @@ public void testExample2() throws Exception { @Test public void testExample3() throws Exception { final String[] expected = { - "12:1: " + getCheckMessage(MSG_FILE_CONTAINS_TAB), + "15:1: " + getCheckMessage(MSG_FILE_CONTAINS_TAB), }; verifyWithInlineConfigParser(getPath("Example3.java"), expected); @@ -69,7 +69,7 @@ public void testExample3() throws Exception { @Test public void testExample4() throws Exception { final String[] expected = { - "10:1: " + getCheckMessage(MSG_FILE_CONTAINS_TAB), + "13:1: " + getCheckMessage(MSG_FILE_CONTAINS_TAB), }; verifyWithInlineConfigParser(getPath("Example4.xml"), expected); diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadExamplesTest.java --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadExamplesTest.java @@ -41,9 +41,9 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - "15:19: " + getCheckMessage(MSG_WS_PRECEDED, "("), - "16:11: " + getCheckMessage(MSG_WS_PRECEDED, "("), - "22:3: " + getCheckMessage(MSG_LINE_PREVIOUS, "("), + "19:19: " + getCheckMessage(MSG_WS_PRECEDED, "("), + "20:11: " + getCheckMessage(MSG_WS_PRECEDED, "("), + "26:3: " + getCheckMessage(MSG_LINE_PREVIOUS, "("), }; verifyWithInlineConfigParser(getPath("Example1.java"), expected); @@ -52,7 +52,7 @@ public void testExample1() throws Exception { @Test public void testExample2() throws Exception { final String[] expected = { - "22:21: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "("), + "27:21: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "("), }; verifyWithInlineConfigParser(getPath("Example2.java"), expected); diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapExamplesTest.java --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapExamplesTest.java @@ -39,9 +39,9 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - "8:1: " + getCheckMessage(MSG_KEY, "package"), - "11:1: " + getCheckMessage(MSG_KEY, "import"), - "14:1: " + getCheckMessage(MSG_KEY, "import"), + "12:1: " + getCheckMessage(MSG_KEY, "package"), + "15:1: " + getCheckMessage(MSG_KEY, "import"), + "18:1: " + getCheckMessage(MSG_KEY, "import"), }; verifyWithInlineConfigParser(getPath("Example1.java"), expected); @@ -50,9 +50,9 @@ public void testExample1() throws Exception { @Test public void testExample2() throws Exception { final String[] expected = { - "8:1: " + getCheckMessage(MSG_KEY, "package"), - "12:1: " + getCheckMessage(MSG_KEY, "import"), - "15:1: " + getCheckMessage(MSG_KEY, "import"), + "12:1: " + getCheckMessage(MSG_KEY, "package"), + "16:1: " + getCheckMessage(MSG_KEY, "import"), + "19:1: " + getCheckMessage(MSG_KEY, "import"), }; verifyWithInlineConfigParser(getPath("Example2.java"), expected); @@ -61,7 +61,7 @@ public void testExample2() throws Exception { @Test public void testExample3() throws Exception { final String[] expected = { - "10:1: " + getCheckMessage(MSG_KEY, "import"), + "14:1: " + getCheckMessage(MSG_KEY, "import"), }; verifyWithInlineConfigParser(getPath("Example3.java"), expected); @@ -70,7 +70,7 @@ public void testExample3() throws Exception { @Test public void testExample4() throws Exception { final String[] expected = { - "13:1: " + getCheckMessage(MSG_KEY, "import"), + "18:1: " + getCheckMessage(MSG_KEY, "import"), }; verifyWithInlineConfigParser(getPath("Example4.java"), expected); @@ -79,9 +79,9 @@ public void testExample4() throws Exception { @Test public void testExample5() throws Exception { final String[] expected = { - "14:1: " + getCheckMessage(MSG_KEY, "CLASS_DEF"), - "20:3: " + getCheckMessage(MSG_KEY, "METHOD_DEF"), - "26:5: " + getCheckMessage(MSG_KEY, "CTOR_DEF"), + "19:1: " + getCheckMessage(MSG_KEY, "CLASS_DEF"), + "25:3: " + getCheckMessage(MSG_KEY, "METHOD_DEF"), + "31:5: " + getCheckMessage(MSG_KEY, "CTOR_DEF"), }; verifyWithInlineConfigParser(getPath("Example5.java"), expected); diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterExamplesTest.java --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterExamplesTest.java @@ -39,9 +39,9 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - "19:12: " + getCheckMessage(MSG_KEY, "."), - "24:9: " + getCheckMessage(MSG_KEY, "int"), - "28:9: " + getCheckMessage(MSG_KEY, "~"), + "23:12: " + getCheckMessage(MSG_KEY, "."), + "28:9: " + getCheckMessage(MSG_KEY, "int"), + "32:9: " + getCheckMessage(MSG_KEY, "~"), }; verifyWithInlineConfigParser(getPath("Example1.java"), expected); @@ -50,8 +50,8 @@ public void testExample1() throws Exception { @Test public void testExample2() throws Exception { final String[] expected = { - "14:12: " + getCheckMessage(MSG_KEY, "."), - "21:12: " + getCheckMessage(MSG_KEY, "."), + "19:12: " + getCheckMessage(MSG_KEY, "."), + "26:12: " + getCheckMessage(MSG_KEY, "."), }; verifyWithInlineConfigParser(getPath("Example2.java"), expected); diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonExamplesTest.java --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonExamplesTest.java @@ -40,11 +40,11 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - "15:14: " + getCheckMessage(MSG_KEY, ":"), - "19:15: " + getCheckMessage(MSG_KEY, ":"), - "27:9: " + getCheckMessage(MSG_KEY, ":"), - "31:13: " + getCheckMessage(MSG_KEY, ":"), - "38:34: " + getCheckMessage(MSG_KEY, ":"), + "19:14: " + getCheckMessage(MSG_KEY, ":"), + "23:15: " + getCheckMessage(MSG_KEY, ":"), + "31:9: " + getCheckMessage(MSG_KEY, ":"), + "35:13: " + getCheckMessage(MSG_KEY, ":"), + "42:34: " + getCheckMessage(MSG_KEY, ":"), }; verifyWithInlineConfigParser(getNonCompilablePath("Example1.java"), expected); diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeExamplesTest.java --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeExamplesTest.java @@ -39,11 +39,11 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - "15:9: " + getCheckMessage(MSG_KEY, "++"), - "17:20: " + getCheckMessage(MSG_KEY, ";"), - "20:21: " + getCheckMessage(MSG_KEY, ","), - "25:12: " + getCheckMessage(MSG_KEY, ";"), - "27:14: " + getCheckMessage(MSG_KEY, ":"), + "19:9: " + getCheckMessage(MSG_KEY, "++"), + "21:20: " + getCheckMessage(MSG_KEY, ";"), + "24:21: " + getCheckMessage(MSG_KEY, ","), + "29:12: " + getCheckMessage(MSG_KEY, ";"), + "31:14: " + getCheckMessage(MSG_KEY, ":"), }; verifyWithInlineConfigParser(getPath("Example1.java"), expected); @@ -52,7 +52,7 @@ public void testExample1() throws Exception { @Test public void testExample2() throws Exception { final String[] expected = { - "18:31: " + getCheckMessage(MSG_KEY, "..."), + "23:31: " + getCheckMessage(MSG_KEY, "..."), }; verifyWithInlineConfigParser(getPath("Example2.java"), expected); @@ -61,8 +61,8 @@ public void testExample2() throws Exception { @Test public void testExample3() throws Exception { final String[] expected = { - "16:10: " + getCheckMessage(MSG_KEY, "."), - "18:74: " + getCheckMessage(MSG_KEY, "::"), + "21:10: " + getCheckMessage(MSG_KEY, "."), + "23:74: " + getCheckMessage(MSG_KEY, "::"), }; verifyWithInlineConfigParser(getPath("Example3.java"), expected); @@ -71,8 +71,8 @@ public void testExample3() throws Exception { @Test public void testExample4() throws Exception { final String[] expected = { - "16:11: " + getCheckMessage(MSG_KEY, "."), - "18:40: " + getCheckMessage(MSG_KEY, "::"), + "21:11: " + getCheckMessage(MSG_KEY, "."), + "23:40: " + getCheckMessage(MSG_KEY, "::"), }; verifyWithInlineConfigParser(getPath("Example4.java"), expected); diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapExamplesTest.java --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapExamplesTest.java @@ -40,9 +40,9 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - "12:24: " + getCheckMessage(MSG_LINE_NEW, "+"), - "15:12: " + getCheckMessage(MSG_LINE_NEW, "=="), - "23:16: " + getCheckMessage(MSG_LINE_NEW, "/"), + "16:24: " + getCheckMessage(MSG_LINE_NEW, "+"), + "19:12: " + getCheckMessage(MSG_LINE_NEW, "=="), + "27:16: " + getCheckMessage(MSG_LINE_NEW, "/"), }; verifyWithInlineConfigParser(getPath("Example1.java"), expected); @@ -51,16 +51,16 @@ public void testExample1() throws Exception { @Test public void testExample2() throws Exception { final String[] expected = { - "16:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "="), - "20:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "+="), - "24:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "*="), - "26:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "-="), - "30:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "/="), - "32:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "%="), - "34:13: " + getCheckMessage(MSG_LINE_PREVIOUS, ">>="), - "36:9: " + getCheckMessage(MSG_LINE_PREVIOUS, ">>>="), - "38:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "&="), - "40:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "<<="), + "23:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "="), + "27:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "+="), + "31:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "*="), + "33:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "-="), + "37:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "/="), + "39:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "%="), + "41:13: " + getCheckMessage(MSG_LINE_PREVIOUS, ">>="), + "43:9: " + getCheckMessage(MSG_LINE_PREVIOUS, ">>>="), + "45:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "&="), + "47:13: " + getCheckMessage(MSG_LINE_PREVIOUS, "<<="), }; verifyWithInlineConfigParser(getPath("Example2.java"), expected); diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadExamplesTest.java --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadExamplesTest.java @@ -42,9 +42,9 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - "14:8: " + getCheckMessage(MSG_WS_FOLLOWED, "("), - "17:25: " + getCheckMessage(MSG_WS_PRECEDED, ")"), - "25:11: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "18:8: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "21:25: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "29:11: " + getCheckMessage(MSG_WS_FOLLOWED, "("), }; verifyWithInlineConfigParser(getPath("Example1.java"), expected); @@ -53,9 +53,9 @@ public void testExample1() throws Exception { @Test public void testExample2() throws Exception { final String[] expected = { - "23:27: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), - "33:12: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), - "39:34: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "28:27: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "38:12: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "44:34: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), }; verifyWithInlineConfigParser(getPath("Example2.java"), expected); diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapExamplesTest.java --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapExamplesTest.java @@ -40,8 +40,8 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - "20:21: " + getCheckMessage(MSG_LINE_PREVIOUS, ","), - "22:11: " + getCheckMessage(MSG_LINE_PREVIOUS, "."), + "24:21: " + getCheckMessage(MSG_LINE_PREVIOUS, ","), + "26:11: " + getCheckMessage(MSG_LINE_PREVIOUS, "."), }; verifyWithInlineConfigParser(getPath("Example1.java"), expected); @@ -50,7 +50,7 @@ public void testExample1() throws Exception { @Test public void testExample2() throws Exception { final String[] expected = { - "18:36: " + getCheckMessage(MSG_LINE_NEW, "::"), + "23:36: " + getCheckMessage(MSG_LINE_NEW, "::"), }; verifyWithInlineConfigParser(getPath("Example2.java"), expected); @@ -59,8 +59,8 @@ public void testExample2() throws Exception { @Test public void testExample3() throws Exception { final String[] expected = { - "14:8: " + getCheckMessage(MSG_LINE_NEW, ","), - "17:17: " + getCheckMessage(MSG_LINE_NEW, ","), + "19:8: " + getCheckMessage(MSG_LINE_NEW, ","), + "22:17: " + getCheckMessage(MSG_LINE_NEW, ","), }; verifyWithInlineConfigParser(getPath("Example3.java"), expected); diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorExamplesTest.java --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorExamplesTest.java @@ -39,9 +39,9 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - "11:15: " + getCheckMessage(MSG_KEY), - "12:13: " + getCheckMessage(MSG_KEY), - "17:9: " + getCheckMessage(MSG_KEY), + "15:15: " + getCheckMessage(MSG_KEY), + "16:13: " + getCheckMessage(MSG_KEY), + "21:9: " + getCheckMessage(MSG_KEY), }; verifyWithInlineConfigParser(getPath("Example1.java"), expected); @@ -50,10 +50,10 @@ public void testExample1() throws Exception { @Test public void testExample2() throws Exception { final String[] expected = { - "13:19: " + getCheckMessage(MSG_KEY), - "15:28: " + getCheckMessage(MSG_KEY), - "17:47: " + getCheckMessage(MSG_KEY), - "23:8: " + getCheckMessage(MSG_KEY), + "18:19: " + getCheckMessage(MSG_KEY), + "20:28: " + getCheckMessage(MSG_KEY), + "22:47: " + getCheckMessage(MSG_KEY), + "28:8: " + getCheckMessage(MSG_KEY), }; verifyWithInlineConfigParser(getPath("Example2.java"), expected); diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadExamplesTest.java --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadExamplesTest.java @@ -42,10 +42,10 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - "13:11: " + getCheckMessage(MSG_WS_FOLLOWED, "("), - "13:17: " + getCheckMessage(MSG_WS_PRECEDED, ")"), - "17:21: " + getCheckMessage(MSG_WS_PRECEDED, ")"), - "21:14: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "17:11: " + getCheckMessage(MSG_WS_FOLLOWED, "("), + "17:17: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "21:21: " + getCheckMessage(MSG_WS_PRECEDED, ")"), + "25:14: " + getCheckMessage(MSG_WS_FOLLOWED, "("), }; verifyWithInlineConfigParser(getPath("Example1.java"), expected); @@ -54,10 +54,10 @@ public void testExample1() throws Exception { @Test public void testExample2() throws Exception { final String[] expected = { - "16:11: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), - "20:11: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), - "20:15: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), - "22:16: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "21:11: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "25:11: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "("), + "25:15: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), + "27:16: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ")"), }; verifyWithInlineConfigParser(getPath("Example2.java"), expected); diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterExamplesTest.java --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterExamplesTest.java @@ -39,17 +39,17 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - "15:12: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "if"), - "18:16: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ","), - "20:5: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "for"), - "22:5: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "try"), - "24:5: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "try"), - "26:12: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "finally"), - "28:30: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "finally"), - "30:12: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "catch"), - "32:5: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "synchronized"), - "38:5: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "return"), - "45:9: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "yield"), + "19:12: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "if"), + "22:16: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ","), + "24:5: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "for"), + "26:5: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "try"), + "28:5: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "try"), + "30:12: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "finally"), + "32:30: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "finally"), + "34:12: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "catch"), + "36:5: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "synchronized"), + "42:5: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "return"), + "49:9: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "yield"), }; verifyWithInlineConfigParser(getNonCompilablePath("Example1.java"), expected); @@ -58,8 +58,8 @@ public void testExample1() throws Exception { @Test public void testExample2() throws Exception { final String[] expected = { - "14:14: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ";"), - "17:17: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ","), + "19:14: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ";"), + "22:17: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ","), }; verifyWithInlineConfigParser(getPath("Example2.java"), expected); diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundExamplesTest.java --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundExamplesTest.java @@ -40,20 +40,20 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - "11:20: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), - "11:20: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "{"), - "11:21: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), - "15:5: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "else"), - "15:9: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "{"), - "19:33: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), - "19:34: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), - "22:24: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "->"), - "22:26: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), - "22:26: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "{"), - "22:27: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), - "25:24: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), - "25:24: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "{"), - "25:25: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), + "15:20: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "15:20: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "{"), + "15:21: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), + "19:5: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "else"), + "19:9: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "{"), + "23:33: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "23:34: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), + "26:24: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "->"), + "26:26: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "26:26: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "{"), + "26:27: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), + "29:24: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "29:24: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "{"), + "29:25: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), }; verifyWithInlineConfigParser(getPath("Example1.java"), expected); @@ -62,22 +62,22 @@ public void testExample1() throws Exception { @Test public void testExample2() throws Exception { final String[] expected = { - "15:10: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), - "15:10: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "="), - "18:6: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "+="), - "18:6: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "+="), - "21:6: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "*="), - "21:6: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "*="), - "24:6: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "-="), - "24:6: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "-="), - "27:6: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "/="), - "27:6: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "/="), - "30:6: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "%="), - "30:6: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "%="), - "33:6: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ">>="), - "33:6: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ">>="), - "36:6: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ">>>="), - "36:6: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ">>>="), + "21:10: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), + "21:10: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "="), + "24:6: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "+="), + "24:6: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "+="), + "27:6: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "*="), + "27:6: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "*="), + "30:6: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "-="), + "30:6: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "-="), + "33:6: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "/="), + "33:6: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "/="), + "36:6: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "%="), + "36:6: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "%="), + "39:6: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ">>="), + "39:6: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ">>="), + "42:6: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ">>>="), + "42:6: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ">>>="), }; verifyWithInlineConfigParser(getPath("Example2.java"), expected); @@ -86,7 +86,7 @@ public void testExample2() throws Exception { @Test public void testExample3() throws Exception { final String[] expected = { - "12:22: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), + "17:22: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), }; verifyWithInlineConfigParser(getPath("Example3.java"), expected); @@ -95,8 +95,8 @@ public void testExample3() throws Exception { @Test public void testExample4() throws Exception { final String[] expected = { - "13:8: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "="), - "13:8: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), + "18:8: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "="), + "18:8: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), }; verifyWithInlineConfigParser(getPath("Example4.java"), expected); @@ -105,8 +105,8 @@ public void testExample4() throws Exception { @Test public void testExample5() throws Exception { final String[] expected = { - "13:28: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), - "13:29: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), + "18:28: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"), + "18:29: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"), }; verifyWithInlineConfigParser(getPath("Example5.java"), expected); @@ -115,8 +115,8 @@ public void testExample5() throws Exception { @Test public void testExample6() throws Exception { final String[] expected = { - "15:10: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "="), - "15:10: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), + "20:10: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "="), + "20:10: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), }; verifyWithInlineConfigParser(getPath("Example6.java"), expected); @@ -125,8 +125,8 @@ public void testExample6() throws Exception { @Test public void testExample7() throws Exception { final String[] expected = { - "16:10: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "="), - "16:10: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), + "21:10: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "="), + "21:10: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), }; verifyWithInlineConfigParser(getPath("Example7.java"), expected); @@ -135,8 +135,8 @@ public void testExample7() throws Exception { @Test public void testExample8() throws Exception { final String[] expected = { - "14:10: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "="), - "14:10: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), + "19:10: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "="), + "19:10: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), }; verifyWithInlineConfigParser(getPath("Example8.java"), expected); @@ -145,8 +145,8 @@ public void testExample8() throws Exception { @Test public void testExample9() throws Exception { final String[] expected = { - "13:10: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "="), - "13:10: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), + "18:10: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "="), + "18:10: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), }; verifyWithInlineConfigParser(getPath("Example9.java"), expected); @@ -155,9 +155,9 @@ public void testExample9() throws Exception { @Test public void testExample10() throws Exception { final String[] expected = { - "13:10: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "="), - "13:10: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), - "16:19: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ":"), + "18:10: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "="), + "18:10: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "="), + "21:19: " + getCheckMessage(MSG_WS_NOT_PRECEDED, ":"), }; verifyWithInlineConfigParser(getPath("Example10.java"), expected); diff --git a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebeforecasedefaultcolon/Example1.java b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebeforecasedefaultcolon/Example1.java --- a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebeforecasedefaultcolon/Example1.java +++ b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebeforecasedefaultcolon/Example1.java @@ -1,5 +1,9 @@ -/* -NoWhitespaceBeforeCaseDefaultColon +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="NoWhitespaceBeforeCaseDefaultColon"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/Example1.java b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/Example1.java --- a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/Example1.java +++ b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/Example1.java @@ -1,5 +1,9 @@ -/* -WhitespaceAfter +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="WhitespaceAfter"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example1.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example1.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example1.java @@ -1,5 +1,9 @@ -/* -AbbreviationAsWordInName +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="AbbreviationAsWordInName"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example2.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example2.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example2.java @@ -1,7 +1,12 @@ -/* -AbbreviationAsWordInName -ignoreStatic = false -ignoreOverriddenMethods = false +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="AbbreviationAsWordInName"> + <property name="ignoreStatic" value="false"/> + <property name="ignoreOverriddenMethods" value="false"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example3.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example3.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example3.java @@ -1,9 +1,14 @@ -/* -AbbreviationAsWordInName -allowedAbbreviationLength = 0 -allowedAbbreviations = XML,URL,O -ignoreStatic = false -tokens = VARIABLE_DEF,CLASS_DEF +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="AbbreviationAsWordInName"> + <property name="allowedAbbreviationLength" value="0"/> + <property name="allowedAbbreviations" value="XML,URL,O"/> + <property name="ignoreStatic" value="false"/> + <property name="tokens" value="VARIABLE_DEF,CLASS_DEF"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example4.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example4.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example4.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example4.java @@ -1,9 +1,14 @@ -/* -AbbreviationAsWordInName -allowedAbbreviationLength = 1 -allowedAbbreviations = CSV -ignoreStatic = true -tokens = VARIABLE_DEF +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="AbbreviationAsWordInName"> + <property name="allowedAbbreviationLength" value="1"/> + <property name="allowedAbbreviations" value="CSV"/> + <property name="ignoreStatic" value="true"/> + <property name="tokens" value="VARIABLE_DEF"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example5.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example5.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example5.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example5.java @@ -1,10 +1,15 @@ -/* -AbbreviationAsWordInName -allowedAbbreviationLength = 0 -ignoreFinal = false -ignoreStatic = false -ignoreStaticFinal = true -tokens = VARIABLE_DEF +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="AbbreviationAsWordInName"> + <property name="allowedAbbreviationLength" value="0"/> + <property name="ignoreFinal" value="false"/> + <property name="ignoreStatic" value="false"/> + <property name="ignoreStaticFinal" value="true"/> + <property name="tokens" value="VARIABLE_DEF"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example6.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example6.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example6.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example6.java @@ -1,10 +1,15 @@ -/* -AbbreviationAsWordInName -allowedAbbreviationLength = 0 -ignoreFinal = false -ignoreStatic = true -ignoreStaticFinal = false -tokens = VARIABLE_DEF +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="AbbreviationAsWordInName"> + <property name="allowedAbbreviationLength" value="0"/> + <property name="ignoreFinal" value="false"/> + <property name="ignoreStatic" value="true"/> + <property name="ignoreStaticFinal" value="false"/> + <property name="tokens" value="VARIABLE_DEF"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example7.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example7.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example7.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/Example7.java @@ -1,7 +1,12 @@ -/* -AbbreviationAsWordInName -allowedAbbreviations = ALLOWED -ignoreStaticFinal = false +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="AbbreviationAsWordInName"> + <property name="allowedAbbreviations" value="ALLOWED"/> + <property name="ignoreStaticFinal" value="false"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/Example1.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/Example1.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/Example1.java @@ -1,5 +1,9 @@ -/* -AbstractClassName +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="AbstractClassName"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/Example2.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/Example2.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/Example2.java @@ -1,6 +1,11 @@ -/* -AbstractClassName -ignoreModifier = true +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="AbstractClassName"> + <property name="ignoreModifier" value="true"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/Example3.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/Example3.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/Example3.java @@ -1,6 +1,11 @@ -/* -AbstractClassName -ignoreName = true +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="AbstractClassName"> + <property name="ignoreName" value="true"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/Example4.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/Example4.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/Example4.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/Example4.java @@ -1,6 +1,11 @@ -/* -AbstractClassName -format = ^Generator.+$ +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="AbstractClassName"> + <property name="format" value="^Generator.+$"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/Example1.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/Example1.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/Example1.java @@ -1,5 +1,9 @@ -/* -ConstantName +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="ConstantName"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/Example2.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/Example2.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/Example2.java @@ -1,6 +1,11 @@ -/* -ConstantName -format = ^log(ger)?$|^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$ +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="ConstantName"> + <property name="format" value="^log(ger)?$|^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/Example3.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/Example3.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/Example3.java @@ -1,7 +1,12 @@ -/* -ConstantName -applyToPublic = false -applyToProtected = false +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="ConstantName"> + <property name="applyToPublic" value="false"/> + <property name="applyToProtected" value="false"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/lambdabodylength/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/lambdabodylength/Example1.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/lambdabodylength/Example1.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/lambdabodylength/Example1.java @@ -1,5 +1,9 @@ -/* -LambdaBodyLength +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="LambdaBodyLength"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/lambdabodylength/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/lambdabodylength/Example2.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/lambdabodylength/Example2.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/lambdabodylength/Example2.java @@ -1,6 +1,11 @@ -/* -LambdaBodyLength -max = 5 +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="LambdaBodyLength"> + <property name="max" value="5"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforinitializerpad/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforinitializerpad/Example1.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforinitializerpad/Example1.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforinitializerpad/Example1.java @@ -1,5 +1,9 @@ -/* -EmptyForInitializerPad +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="EmptyForInitializerPad"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforinitializerpad/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforinitializerpad/Example2.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforinitializerpad/Example2.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforinitializerpad/Example2.java @@ -1,6 +1,11 @@ -/* -EmptyForInitializerPad -option = space +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="EmptyForInitializerPad"> + <property name="option" value="space"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforiteratorpad/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforiteratorpad/Example1.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforiteratorpad/Example1.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforiteratorpad/Example1.java @@ -1,5 +1,9 @@ -/* -EmptyForIteratorPad +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="EmptyForIteratorPad"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforiteratorpad/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforiteratorpad/Example2.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforiteratorpad/Example2.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforiteratorpad/Example2.java @@ -1,6 +1,11 @@ -/* -EmptyForIteratorPad -option = space +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="EmptyForIteratorPad"> + <property name="option" value="space"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/Example1.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/Example1.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/Example1.java @@ -1,5 +1,9 @@ -/* -EmptyLineSeparator +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="EmptyLineSeparator"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/Example2.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/Example2.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/Example2.java @@ -1,6 +1,11 @@ -/* -EmptyLineSeparator -tokens = VARIABLE_DEF, METHOD_DEF +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="EmptyLineSeparator"> + <property name="tokens" value="VARIABLE_DEF, METHOD_DEF"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/Example3.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/Example3.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/Example3.java @@ -1,6 +1,11 @@ -/* -EmptyLineSeparator -allowNoEmptyLineBetweenFields = true +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="EmptyLineSeparator"> + <property name="allowNoEmptyLineBetweenFields" value="true"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/Example4.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/Example4.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/Example4.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/Example4.java @@ -1,6 +1,11 @@ -/* -EmptyLineSeparator -allowMultipleEmptyLines = false +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="EmptyLineSeparator"> + <property name="allowMultipleEmptyLines" value="false"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/Example5.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/Example5.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/Example5.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/Example5.java @@ -1,6 +1,11 @@ -/* -EmptyLineSeparator -allowMultipleEmptyLinesInsideClassMembers = false +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="EmptyLineSeparator"> + <property name="allowMultipleEmptyLinesInsideClassMembers" value="false"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/filetabcharacter/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/filetabcharacter/Example1.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/filetabcharacter/Example1.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/filetabcharacter/Example1.java @@ -1,5 +1,7 @@ -/* -FileTabCharacter +/*xml +<module name="Checker"> + <module name="FileTabCharacter"/> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/filetabcharacter/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/filetabcharacter/Example2.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/filetabcharacter/Example2.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/filetabcharacter/Example2.java @@ -1,6 +1,9 @@ -/* -FileTabCharacter -eachLine = true +/*xml +<module name="Checker"> + <module name="FileTabCharacter"> + <property name="eachLine" value="true"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/filetabcharacter/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/filetabcharacter/Example3.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/filetabcharacter/Example3.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/filetabcharacter/Example3.java @@ -1,6 +1,9 @@ -/* -FileTabCharacter -fileExtensions = java, xml +/*xml +<module name="Checker"> + <module name="FileTabCharacter"> + <property name="fileExtensions" value="java, xml"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/Example1.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/Example1.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/Example1.java @@ -1,5 +1,9 @@ -/* -MethodParamPad +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="MethodParamPad"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/Example2.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/Example2.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/Example2.java @@ -1,8 +1,13 @@ -/* -MethodParamPad -allowLineBreaks = true -option = space -tokens = METHOD_DEF +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="MethodParamPad"> + <property name="allowLineBreaks" value="true"/> + <property name="option" value="space"/> + <property name="tokens" value="METHOD_DEF"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/Example1.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/Example1.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/Example1.java @@ -1,5 +1,9 @@ -/* -NoLineWrap +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="NoLineWrap"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/Example2.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/Example2.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/Example2.java @@ -1,5 +1,9 @@ -/* -NoLineWrap +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="NoLineWrap"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/Example3.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/Example3.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/Example3.java @@ -1,5 +1,9 @@ -/* -NoLineWrap +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="NoLineWrap"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/Example4.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/Example4.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/Example4.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/Example4.java @@ -1,6 +1,11 @@ -/* -NoLineWrap -tokens = IMPORT +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="NoLineWrap"> + <property name="tokens" value="IMPORT"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/Example5.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/Example5.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/Example5.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/Example5.java @@ -1,6 +1,11 @@ -/* -NoLineWrap -tokens = CLASS_DEF, METHOD_DEF, CTOR_DEF +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="NoLineWrap"> + <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespaceafter/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespaceafter/Example1.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespaceafter/Example1.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespaceafter/Example1.java @@ -1,5 +1,9 @@ -/* -NoWhitespaceAfter +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="NoWhitespaceAfter"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespaceafter/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespaceafter/Example2.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespaceafter/Example2.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespaceafter/Example2.java @@ -1,7 +1,12 @@ -/* -NoWhitespaceAfter -allowLineBreaks = false -tokens = DOT +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="NoWhitespaceAfter"> + <property name="allowLineBreaks" value="false"/> + <property name="tokens" value="DOT"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/Example1.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/Example1.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/Example1.java @@ -1,5 +1,9 @@ -/* -NoWhitespaceBefore +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="NoWhitespaceBefore"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/Example2.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/Example2.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/Example2.java @@ -1,6 +1,11 @@ -/* -NoWhitespaceBefore -allowLineBreaks = true +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="NoWhitespaceBefore"> + <property name="allowLineBreaks" value="true"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/Example3.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/Example3.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/Example3.java @@ -1,6 +1,11 @@ -/* -NoWhitespaceBefore -tokens = METHOD_REF, DOT +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="NoWhitespaceBefore"> + <property name="tokens" value="METHOD_REF, DOT"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/Example4.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/Example4.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/Example4.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/Example4.java @@ -1,7 +1,12 @@ -/* -NoWhitespaceBefore -tokens = METHOD_REF, DOT -allowLineBreaks = true +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="NoWhitespaceBefore"> + <property name="tokens" value="METHOD_REF, DOT"/> + <property name="allowLineBreaks" value="true"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/Example1.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/Example1.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/Example1.java @@ -1,5 +1,9 @@ -/* -OperatorWrap +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="OperatorWrap"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/Example2.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/Example2.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/Example2.java @@ -1,8 +1,15 @@ -/* -OperatorWrap -option = eol -tokens = ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN, \ - SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, BOR_ASSIGN,BAND_ASSIGN +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="OperatorWrap"> + <property name="option" value="eol"/> + <property name="tokens" + value="ASSIGN,DIV_ASSIGN,PLUS_ASSIGN,MINUS_ASSIGN,STAR_ASSIGN, + MOD_ASSIGN,SR_ASSIGN,BSR_ASSIGN,SL_ASSIGN, + BXOR_ASSIGN,BOR_ASSIGN,BAND_ASSIGN"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/parenpad/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/parenpad/Example1.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/parenpad/Example1.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/parenpad/Example1.java @@ -1,5 +1,9 @@ -/* -ParenPad +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="ParenPad"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/parenpad/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/parenpad/Example2.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/parenpad/Example2.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/parenpad/Example2.java @@ -1,7 +1,12 @@ -/* -ParenPad -tokens = LITERAL_FOR, LITERAL_CATCH, SUPER_CTOR_CALL -option = space +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="ParenPad"> + <property name="tokens" value="LITERAL_FOR, LITERAL_CATCH, SUPER_CTOR_CALL"/> + <property name="option" value="space"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/separatorwrap/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/separatorwrap/Example1.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/separatorwrap/Example1.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/separatorwrap/Example1.java @@ -1,5 +1,9 @@ -/* -SeparatorWrap +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="SeparatorWrap"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/separatorwrap/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/separatorwrap/Example2.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/separatorwrap/Example2.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/separatorwrap/Example2.java @@ -1,7 +1,12 @@ -/* -SeparatorWrap -tokens = METHOD_REF -option = nl +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="SeparatorWrap"> + <property name="tokens" value="METHOD_REF"/> + <property name="option" value="nl"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/separatorwrap/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/separatorwrap/Example3.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/separatorwrap/Example3.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/separatorwrap/Example3.java @@ -1,7 +1,12 @@ -/* -SeparatorWrap -tokens = COMMA -option = nl +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="SeparatorWrap"> + <property name="tokens" value="COMMA"/> + <property name="option" value="nl"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/singlespaceseparator/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/singlespaceseparator/Example1.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/singlespaceseparator/Example1.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/singlespaceseparator/Example1.java @@ -1,5 +1,9 @@ -/* -SingleSpaceSeparator +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="SingleSpaceSeparator"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/singlespaceseparator/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/singlespaceseparator/Example2.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/singlespaceseparator/Example2.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/singlespaceseparator/Example2.java @@ -1,6 +1,11 @@ -/* -SingleSpaceSeparator -validateComments = true +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="SingleSpaceSeparator"> + <property name="validateComments" value="true"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/typecastparenpad/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/typecastparenpad/Example1.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/typecastparenpad/Example1.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/typecastparenpad/Example1.java @@ -1,5 +1,9 @@ -/* -TypecastParenPad +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="TypecastParenPad"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/typecastparenpad/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/typecastparenpad/Example2.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/typecastparenpad/Example2.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/typecastparenpad/Example2.java @@ -1,6 +1,11 @@ -/* -TypecastParenPad -option = space +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="TypecastParenPad"> + <property name="option" value="space"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/Example2.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/Example2.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/Example2.java @@ -1,6 +1,11 @@ -/* -WhitespaceAfter -tokens = COMMA, SEMI +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="WhitespaceAfter"> + <property name="tokens" value="COMMA, SEMI"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example1.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example1.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example1.java @@ -1,5 +1,9 @@ -/* -WhitespaceAround +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="WhitespaceAround"/> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example10.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example10.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example10.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example10.java @@ -1,6 +1,11 @@ -/* -WhitespaceAround -ignoreEnhancedForColon = false +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="WhitespaceAround"> + <property name="ignoreEnhancedForColon" value="false"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example2.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example2.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example2.java @@ -1,8 +1,14 @@ -/* -WhitespaceAround -tokens = ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, \ - MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, \ - BOR_ASSIGN, BAND_ASSIGN +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="WhitespaceAround"> + <property name="tokens" + value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, + MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, + BOR_ASSIGN, BAND_ASSIGN"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example3.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example3.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example3.java @@ -1,6 +1,11 @@ -/* -WhitespaceAround -tokens = LCURLY, RCURLY +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="WhitespaceAround"> + <property name="tokens" value="LCURLY, RCURLY"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example4.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example4.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example4.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example4.java @@ -1,6 +1,11 @@ -/* -WhitespaceAround -allowEmptyMethods = true +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="WhitespaceAround"> + <property name="allowEmptyMethods" value="true"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example5.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example5.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example5.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example5.java @@ -1,6 +1,11 @@ -/* -WhitespaceAround -allowEmptyConstructors = true +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="WhitespaceAround"> + <property name="allowEmptyConstructors" value="true"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example6.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example6.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example6.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example6.java @@ -1,6 +1,11 @@ -/* -WhitespaceAround -allowEmptyTypes = true +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="WhitespaceAround"> + <property name="allowEmptyTypes" value="true"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example7.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example7.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example7.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example7.java @@ -1,6 +1,11 @@ -/* -WhitespaceAround -allowEmptyLoops = true +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="WhitespaceAround"> + <property name="allowEmptyLoops" value="true"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example8.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example8.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example8.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example8.java @@ -1,6 +1,11 @@ -/* -WhitespaceAround -allowEmptyLambdas = true +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="WhitespaceAround"> + <property name="allowEmptyLambdas" value="true"/> + </module> + </module> +</module> */ diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example9.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example9.java --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example9.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/Example9.java @@ -1,6 +1,11 @@ -/* -WhitespaceAround -allowEmptyCatches = true +/*xml +<module name="Checker"> + <module name="TreeWalker"> + <module name="WhitespaceAround"> + <property name="allowEmptyCatches" value="true"/> + </module> + </module> +</module> */
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/bdd/InlineConfigParser.java b/src/test/java/com/puppycrawl/tools/checkstyle/bdd/InlineConfigParser.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/bdd/InlineConfigParser.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/bdd/InlineConfigParser.java @@ -36,8 +36,14 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; +import org.xml.sax.InputSource; + +import com.puppycrawl.tools.checkstyle.ConfigurationLoader; +import com.puppycrawl.tools.checkstyle.PropertiesExpander; import com.puppycrawl.tools.checkstyle.api.CheckstyleException; +import com.puppycrawl.tools.checkstyle.api.Configuration; public final class InlineConfigParser { @@ -91,6 +97,11 @@ public final class InlineConfigParser { /** The String "(null)". */ private static final String NULL_STRING = "(null)"; + private static final String LATEST_DTD = String.format(Locale.ROOT, + "<!DOCTYPE module PUBLIC \"%s\" \"%s\">%n", + ConfigurationLoader.DTD_PUBLIC_CS_ID_1_3, + ConfigurationLoader.DTD_PUBLIC_CS_ID_1_3); + /** * Checks in which violation message is not specified in input file and have more than * one violation message key. @@ -165,8 +176,61 @@ private static void setModules(TestInputConfiguration.Builder testInputConfigBui throw new CheckstyleException("Config not specified on top." + "Please see other inputs for examples of what is required."); } - int lineNo = 1; - do { + + final List<String> inlineConfig = getInlineConfig(lines); + final boolean isXmlConfig = "/*xml".equals(lines.get(0)); + + if (isXmlConfig) { + final String stringXmlConfig = LATEST_DTD + String.join("", inlineConfig); + final InputSource inputSource = new InputSource(new StringReader(stringXmlConfig)); + final Configuration xmlConfig = ConfigurationLoader.loadConfiguration( + inputSource, new PropertiesExpander(System.getProperties()), + ConfigurationLoader.IgnoredModulesOptions.EXECUTE + ); + final String configName = xmlConfig.getName(); + if (!"Checker".equals(configName)) { + throw new CheckstyleException( + "First module should be Checker, but was " + configName); + } + handleXmlConfig(testInputConfigBuilder, inputFilePath, xmlConfig.getChildren()); + } + else { + handleKeyValueConfig(testInputConfigBuilder, inputFilePath, inlineConfig); + } + } + + private static List<String> getInlineConfig(List<String> lines) { + return lines.stream() + .skip(1) + .takeWhile(line -> !line.startsWith("*/")) + .collect(Collectors.toList()); + } + + private static void handleXmlConfig(TestInputConfiguration.Builder testInputConfigBuilder, + String inputFilePath, + Configuration... modules) + throws CheckstyleException { + + for (Configuration module: modules) { + final String moduleName = module.getName(); + if ("TreeWalker".equals(moduleName)) { + handleXmlConfig(testInputConfigBuilder, inputFilePath, module.getChildren()); + } + else { + final ModuleInputConfiguration.Builder moduleInputConfigBuilder = + new ModuleInputConfiguration.Builder(); + setModuleName(moduleInputConfigBuilder, inputFilePath, moduleName); + setProperties(inputFilePath, module, moduleInputConfigBuilder); + testInputConfigBuilder.addChildModule(moduleInputConfigBuilder.build()); + } + } + } + + private static void handleKeyValueConfig(TestInputConfiguration.Builder testInputConfigBuilder, + String inputFilePath, List<String> lines) + throws CheckstyleException, IOException { + int lineNo = 0; + while (lineNo < lines.size()) { final ModuleInputConfiguration.Builder moduleInputConfigBuilder = new ModuleInputConfiguration.Builder(); setModuleName(moduleInputConfigBuilder, inputFilePath, lines.get(lineNo)); @@ -174,8 +238,10 @@ private static void setModules(TestInputConfiguration.Builder testInputConfigBui testInputConfigBuilder.addChildModule(moduleInputConfigBuilder.build()); do { lineNo++; - } while (lines.get(lineNo).isEmpty() || !lines.get(lineNo - 1).isEmpty()); - } while (!lines.get(lineNo).startsWith("*/")); + } while (lineNo < lines.size() + && lines.get(lineNo).isEmpty() + || !lines.get(lineNo - 1).isEmpty()); + } } private static String getFullyQualifiedClassName(String filePath, String moduleName) @@ -296,6 +362,35 @@ else if (value.startsWith("(default)")) { } } + private static void setProperties(String inputFilePath, Configuration module, + ModuleInputConfiguration.Builder moduleInputConfigBuilder) + throws CheckstyleException { + final String[] getPropertyNames = module.getPropertyNames(); + for (final String propertyName : getPropertyNames) { + final String propertyValue = module.getProperty(propertyName); + + if ("file".equals(propertyName)) { + final String filePath = getResolvedPath(propertyValue, inputFilePath); + moduleInputConfigBuilder.addNonDefaultProperty(propertyName, filePath); + } + else { + if (NULL_STRING.equals(propertyValue)) { + moduleInputConfigBuilder.addNonDefaultProperty(propertyName, null); + } + else { + moduleInputConfigBuilder.addNonDefaultProperty(propertyName, propertyValue); + } + } + } + + final Map<String, String> messages = module.getMessages(); + for (final Map.Entry<String, String> entry : messages.entrySet()) { + final String key = entry.getKey(); + final String value = entry.getValue(); + moduleInputConfigBuilder.addModuleMessage(key, value); + } + } + private static void setViolations(TestInputConfiguration.Builder inputConfigBuilder, List<String> lines, boolean useFilteredViolations) throws ClassNotFoundException, CheckstyleException {
BDD configuration comments should be in XML Consider: ```bash ~/I/checkstyle/s/t/resources/c/p/t/c/checks/im/importorder master *1 !2 > cat InputImportOrderStaticGroupOrderBottom_Negative2.java /* ImportOrder option = top groups = org, java ordered = (default)true separated = true separatedStaticGroups = (default)false caseSensitive = (default)true staticGroups = (default) sortStaticImportsAlphabetically = true useContainerOrderingForStatic = (default)false tokens = (default)STATIC_IMPORT */ package com.puppycrawl.tools.checkstyle.checks.imports.importorder; import org.antlr.v4.runtime.*; // ok import static java.lang.Math.PI; // violation import static org.antlr.v4.runtime.Recognizer.EOF; // ok import java.util.Set; // ok public class InputImportOrderStaticGroupOrderBottom_Negative2 { } ``` If I want to test or use this config locally or set up an example for an issue report, I need to manually translate this into a configuration module: ``` ~/IdeaProjects/checkstyle_tester/src > cat import_config.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <property name="charset" value="UTF-8"/> <module name="TreeWalker"> <module name="ImportOrder"> <property name="option" value="top"/> <property name="groups" value="org, java"/> <property name="ordered" value="true"/> <property name="separated" value="true"/> <property name="separatedStaticGroups" value="false"/> <property name="caseSensitive" value="true"/> <property name="staticGroups" value=""/> <property name="sortStaticImportsAlphabetically" value="true"/> <property name="useContainerOrderingForStatic" value="false"/> <property name="tokens" value="STATIC_IMPORT"/> </module> </module> </module> ``` I am proposing that we migrate from our custom config/ config parser, to simply extract xml from block comment in header to create check module configs. Example: ``` ~/I/checkstyle/s/t/resources/c/p/t/c/checks/im/importorder master *1 !2 > cat InputImportOrderStaticGroupOrderBottom_Negative2.java /* <module name="Checker"> <property name="charset" value="UTF-8"/> <module name="TreeWalker"> <module name="ImportOrder"> <property name="option" value="top"/> <property name="groups" value="org, java"/> <property name="ordered" value="true"/> <property name="separated" value="true"/> <property name="separatedStaticGroups" value="false"/> <property name="caseSensitive" value="true"/> <property name="staticGroups" value=""/> <property name="sortStaticImportsAlphabetically" value="true"/> <property name="useContainerOrderingForStatic" value="false"/> <property name="tokens" value="STATIC_IMPORT"/> </module> </module> </module> */ package com.puppycrawl.tools.checkstyle.checks.imports.importorder; import org.antlr.v4.runtime.*; // ok import static java.lang.Math.PI; // violation import static org.antlr.v4.runtime.Recognizer.EOF; // ok import java.util.Set; // ok public class InputImportOrderStaticGroupOrderBottom_Negative2 { } ``` Using xml for our configuration header has several advantages: 1. Allows us to validate syntax/ format of configuration easily 2. Will ease issues where we need multiple modules, etc. 3. Can even allow comments inline to explain complicated module combinations in place 4. Provides portability; the same config used in a given test can be used in an actual configuration file, issue report, etc. 5. Allows us to remove all current limitations of BDD.
>Allows us to validate syntax/ format of configuration easily We already payed a price for this, it is not an issue now. >Will ease issues where we need multiple modules We do not want to have complicated configs, issue with filters (where we need few modules) looks like resolved. >Can even allow comments inline to explain complicated module combinations in place I might be wrong, but , content of comment is property file, so it should support `#` >Allows us to remove all current limitations of BDD. Probably good time to list them all. >same config used in a given test can be used in an actual configuration file Please share more on this, in what cases you need this. ---------- We had idea of xml at the beginning, but abandoned it due to high technical verbosity. Issues with length of lines. Reviewer should look at config content easily. We can try this as extra option. We can have comment in ``` /*xml <module name="Checker"> .... */ ``` To let parser do load by xml. So there will be no conflicts, and it might find its place in life. https://checkstyle.org/writingjavadocchecks.html#What_is_Javadoc_comment last paragraphs on this section. > We can try this as extra option. The idea looks good at first sight. I think if we go with this, the parser for the examples will be the testing ground before migrating all tests? Or is the idea to make and use this only for the examples parser? Hopefully it is testing ground :) We will not migrate all tests. All we can do is to use it in ExampleX.java. @romani @nrmancuso @rnveach Do you have any tips on how this is going to work? I am digging right now. I imagine a new method `verifyWithXmlConfigParser()` that passes file to `XmlConfigParser`(new class in `bdd` package) which will extract config from comment starting with `/*xml` and finishing with `*/`. Then `verifyWithXmlConfigParser()` passes that configuration string to `ConfigurationLoader.loadConfiguration()`. This is what I imagine after just looking around. I could be completely wrong. I thought in this as update of existing verify method with internal switch/if to load content as xml instead of as properties. We just need to have ready to use config object to execute. How this config was loaded is business on very specific phase in this verify method. In worse case I ok with verifyWithXmlConfigParser() Test methods should not have to care about which verify method to use. Either try and fail to parse one type and the try other, or use special comment format like ‘/*xml’ Better to use some marker in comment to be explicit.
2023-06-26T20:28:36Z
10.12
checkstyle/checkstyle
12,487
checkstyle__checkstyle-12487
[ "12486" ]
8382d882dc9e446238d337b069d2ddce908f7bbc
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheck.java @@ -50,11 +50,16 @@ * INDEX_OP</a> will be ignored. * </p> * <p> - * If the annotation is between the type and the array, the check will skip validation for spaces + * If the annotation is between the type and the array, like {@code char @NotNull [] param}, + * the check will skip validation for spaces. + * </p> + * <p> + * Note: This check processes the + * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED"> + * LITERAL_SYNCHRONIZED</a> token only when it appears as a part of a + * <a href="https://docs.oracle.com/javase/specs/jls/se19/html/jls-14.html#jls-14.19"> + * synchronized statement</a>, i.e. {@code synchronized(this) {}}. * </p> - * <pre> - * public void foo(final char @NotNull [] param) {} // No violation - * </pre> * <ul> * <li> * Property {@code allowLineBreaks} - Control whether whitespace is allowed @@ -283,12 +288,11 @@ private static DetailAST getWhitespaceFollowedNode(DetailAST ast) { * @return true if whitespace after ast should be checked */ private static boolean shouldCheckWhitespaceAfter(DetailAST ast) { - boolean checkWhitespace = true; final DetailAST previousSibling = ast.getPreviousSibling(); - if (previousSibling != null && previousSibling.getType() == TokenTypes.ANNOTATIONS) { - checkWhitespace = false; - } - return checkWhitespace; + final boolean isSynchronizedMethod = ast.getType() == TokenTypes.LITERAL_SYNCHRONIZED + && ast.getFirstChild() == null; + return !isSynchronizedMethod + && (previousSibling == null || previousSibling.getType() != TokenTypes.ANNOTATIONS); } /**
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java @@ -354,6 +354,17 @@ public void testNoWhitespaceAfterWithEmoji() throws Exception { getPath("InputNoWhitespaceAfterWithEmoji.java"), expected); } + @Test + public void testNoWhitespaceAfterSynchronized() throws Exception { + final String[] expected = { + "18:9: " + getCheckMessage(MSG_KEY, "synchronized"), + }; + + verifyWithInlineConfigParser( + getPath("InputNoWhitespaceAfterSynchronized.java"), + expected); + } + /** * Creates MOCK lexical token and returns AST node for this token. * diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespaceafter/InputNoWhitespaceAfterSynchronized.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespaceafter/InputNoWhitespaceAfterSynchronized.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespaceafter/InputNoWhitespaceAfterSynchronized.java @@ -0,0 +1,59 @@ +/* +NoWhitespaceAfter +allowLineBreaks = (default)true +tokens = LITERAL_SYNCHRONIZED + + +*/ +package com.puppycrawl.tools.checkstyle.checks.whitespace.nowhitespaceafter; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; + +public class InputNoWhitespaceAfterSynchronized<T> { + + private final Object lock = new Object(); + + void m1() { + synchronized (lock) {} // violation + synchronized(lock) {} // ok + } + + synchronized int m2() { // ok + return 2; + } + + synchronized private int[] m3() { // ok + return new int[]{2}; + } + + synchronized int[] m4() { // ok + return new int[]{2}; + } + + private final synchronized int m5() { // ok + return 2; + } + + synchronized T m6() { // ok + return null; + } + + @SyncAnno synchronized T m7() { // ok + return null; + } + + @SyncAnno private synchronized T m8() { // ok + return null; + } + + // Note that we do not check 'synchronized' as a modifier, + // convention is to have type parameters of a generic method + // be surrounded by whitespace. + synchronized <T2> void m9() {} // ok + synchronized<T2> void m10() {} // ok +} + +@Target(ElementType.METHOD) +@interface SyncAnno { +}
NoWhitespaceAfter false positive on synchronized method Hello, I have the following checkstyle configuration in `pom.xml`: ```xml <module name="NoWhitespaceAfter">       <property name="tokens" value="ARRAY_INIT,AT,INC,DEC,UNARY_MINUS,UNARY_PLUS,BNOT,LNOT,DOT,TYPECAST,ARRAY_DECLARATOR,INDEX_OP,LITERAL_SYNCHRONIZED,METHOD_REF" /> </module> ``` With a `mvn verify`, the following piece of code reports an error `'synchronized' is followed by whitespace`: ```java public class TestClass {     private synchronized Row waitForNextRow() {     } } ``` It seems to be a false positive because the check should only apply on structures like: ```java synchronized(lock) { ... } ``` Here is the output: ``` $ cat TestClass.java public class TestClass {     private synchronized Row waitForNextRow() {     } } $ cat TestConfig.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC           "-//Puppy Crawl//DTD Check Configuration 1.3//EN"           "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker">     <property name="charset" value="UTF-8"/>     <module name="TreeWalker"> <module name="NoWhitespaceAfter">       <property name="tokens" value="ARRAY_INIT,AT,INC,DEC,UNARY_MINUS,UNARY_PLUS,BNOT,LNOT,DOT,TYPECAST,ARRAY_DECLARATOR,INDEX_OP,LITERAL_SYNCHRONIZED,METHOD_REF" /> </module>     </module> </module> $ java -jar checkstyle-10.5.0-all.jar -c TestConfig.xml TestClass.java Starting audit... [ERROR] TestClass.java:2:13: 'synchronized' is followed by whitespace. [NoWhitespaceAfter] Audit done. Checkstyle ends with 1 errors. ``` Thanks & best regards.
@rnveach Oops it seems you edited my comments and I edited them back behind, sorry. Don't hesitate if you think I'm missing some important information. We ask for issues to reported in our format https://checkstyle.org/report_issue.html#How_to_report_a_bug.3F @rnveach Thanks. I put back the output you've added previously. Hope it is good. I am on it
2022-12-02T05:06:55Z
10.5
checkstyle/checkstyle
12,831
checkstyle__checkstyle-12831
[ "11569" ]
0b832630aa4c9d841e86f5283e76f25caea1afa7
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheck.java @@ -22,6 +22,7 @@ import com.puppycrawl.tools.checkstyle.StatelessCheck; import com.puppycrawl.tools.checkstyle.api.AbstractCheck; import com.puppycrawl.tools.checkstyle.api.DetailAST; +import com.puppycrawl.tools.checkstyle.api.Scope; import com.puppycrawl.tools.checkstyle.api.TokenTypes; import com.puppycrawl.tools.checkstyle.utils.ScopeUtil; @@ -237,13 +238,14 @@ public void visitToken(DetailAST ast) { } /** - * Checks if ast is in a class, enum, or record block. + * Checks if ast is in a class, enum, anon class or record block. * * @param ast the current ast - * @return true if ast is in a class, enum, or record + * @return true if ast is in a class, enum, anon class or record */ private static boolean isInTypeBlock(DetailAST ast) { - return ScopeUtil.isInClassBlock(ast) + return ScopeUtil.isInScope(ast, Scope.ANONINNER) + || ScopeUtil.isInClassBlock(ast) || ScopeUtil.isInEnumBlock(ast) || ScopeUtil.isInRecordBlock(ast); }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheckTest.java @@ -122,6 +122,7 @@ public void testClassMemberImpliedModifierRecords() throws Exception { "29:9: " + getCheckMessage(MSG_KEY, "static"), "33:9: " + getCheckMessage(MSG_KEY, "static"), "37:9: " + getCheckMessage(MSG_KEY, "static"), + "43:13: " + getCheckMessage(MSG_KEY, "static"), }; verifyWithInlineConfigParser( getNonCompilablePath("InputClassMemberImpliedModifierRecords.java"), diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/InputClassMemberImpliedModifierNoViolationRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/InputClassMemberImpliedModifierNoViolationRecords.java --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/InputClassMemberImpliedModifierNoViolationRecords.java +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/InputClassMemberImpliedModifierNoViolationRecords.java @@ -36,4 +36,11 @@ public static enum InnerEnum1{} // ok // Implied modifier 'static' should be explicit. [ClassMemberImpliedModifier] public enum InnerEnum2{} // violation } + + void method() { + Object obj = new Object() { + public record BadRecord() {} // ok + public static record OkRecord() {} // ok + }; + } } diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/InputClassMemberImpliedModifierRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/InputClassMemberImpliedModifierRecords.java --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/InputClassMemberImpliedModifierRecords.java +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/InputClassMemberImpliedModifierRecords.java @@ -36,4 +36,12 @@ public static enum InnerEnum1{} // ok // Implied modifier 'static' should be explicit. [ClassMemberImpliedModifier] public enum InnerEnum2{} // violation } + + void method() { + Object obj = new Object() { + // Implied modifier 'static' should be explicit. [ClassMemberImpliedModifier] + public record BadRecord() {} // violation + public static record OkRecord() {} // ok + }; + } }
A false negative about the rule ClassMemberImpliedModifier I have read check documentation: https://checkstyle.sourceforge.io/config_modifier.html#ClassMemberImpliedModifier I have downloaded the latest checkstyle from: https://checkstyle.org/cmdline.html#Download_and_Run I have executed the cli and showed it below, as cli describes the problem better than 1,000 words ```bash /var/tmp $ javac Test.java /var/tmp $ cat config.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <property name="severity" value="error"/> <property name="fileExtensions" value="java, properties, xml"/> <module name="TreeWalker"> <module name="ClassMemberImpliedModifier" /> </module> </module> /var/tmp $ cat Test.java public class Test { Object obj = new Object() { public record BadRecord() {} // should report a warning in this line }; } /var/tmp $ RUN_LOCALE="-Duser.language=en -Duser.country=US" /var/tmp $ java $RUN_LOCALE -jar checkstyle-10.1-all.jar -c config.xml Test.java Starting audit... Audit done. ``` --- **Describe what you expect in detail.** --- Hi, I found a false negative about the rule ClassMemberImpliedModifier. CheckStyle should have reported a warning in line 3. But it does not. Thanks for your consideration. Static modifier is expected to be present.
I'm on it.
2023-03-12T19:24:51Z
10.9
checkstyle/checkstyle
12,516
checkstyle__checkstyle-12516
[ "12507" ]
a671904137010568625930b0c105528db46914a8
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java b/src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java @@ -1952,14 +1952,20 @@ public DetailAstImpl visitArguments(JavaLanguageParser.ArgumentsContext ctx) { @Override public DetailAstImpl visitPattern(JavaLanguageParser.PatternContext ctx) { - final ParserRuleContext primaryPattern = ctx.primaryPattern(); + final JavaLanguageParser.InnerPatternContext innerPattern = ctx.innerPattern(); + final ParserRuleContext primaryPattern = innerPattern.primaryPattern(); + final ParserRuleContext recordPattern = innerPattern.recordPattern(); final boolean isSimpleTypePattern = primaryPattern != null && primaryPattern.getChild(0) instanceof JavaLanguageParser.TypePatternContext; final DetailAstImpl pattern; - if (isSimpleTypePattern) { + + if (recordPattern != null) { + pattern = visit(recordPattern); + } + else if (isSimpleTypePattern) { // For simple type pattern like 'Integer i`, we do not add `PATTERN_DEF` parent - pattern = visit(ctx.primaryPattern()); + pattern = visit(primaryPattern); } else { pattern = createImaginary(TokenTypes.PATTERN_DEF); @@ -1968,6 +1974,11 @@ public DetailAstImpl visitPattern(JavaLanguageParser.PatternContext ctx) { return pattern; } + @Override + public DetailAstImpl visitInnerPattern(JavaLanguageParser.InnerPatternContext ctx) { + return flattenedTree(ctx); + } + @Override public DetailAstImpl visitGuardedPattern(JavaLanguageParser.GuardedPatternContext ctx) { final DetailAstImpl guardAstNode = flattenedTree(ctx.guard()); @@ -1985,6 +1996,11 @@ public DetailAstImpl visitParenPattern(JavaLanguageParser.ParenPatternContext ct return lparen; } + @Override + public DetailAstImpl visitRecordPatternDef(JavaLanguageParser.RecordPatternDefContext ctx) { + return flattenedTree(ctx); + } + @Override public DetailAstImpl visitTypePattern( JavaLanguageParser.TypePatternContext ctx) { @@ -1996,6 +2012,24 @@ public DetailAstImpl visitTypePattern( return patternVariableDef; } + @Override + public DetailAstImpl visitRecordPattern(JavaLanguageParser.RecordPatternContext ctx) { + final DetailAstImpl recordPattern = createImaginary(TokenTypes.RECORD_PATTERN_DEF); + recordPattern.addChild(createModifiers(ctx.mods)); + processChildren(recordPattern, + ctx.children.subList(ctx.mods.size(), ctx.children.size())); + return recordPattern; + } + + @Override + public DetailAstImpl visitRecordComponentPatternList( + JavaLanguageParser.RecordComponentPatternListContext ctx) { + final DetailAstImpl recordComponents = + createImaginary(TokenTypes.RECORD_PATTERN_COMPONENTS); + processChildren(recordComponents, ctx.children); + return recordComponents; + } + @Override public DetailAstImpl visitPermittedSubclassesAndInterfaces( JavaLanguageParser.PermittedSubclassesAndInterfacesContext ctx) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/TokenTypes.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/TokenTypes.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/TokenTypes.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/TokenTypes.java @@ -6272,6 +6272,194 @@ public final class TokenTypes { public static final int LITERAL_WHEN = JavaLanguageLexer.LITERAL_WHEN; + /** + * A {@code record} pattern definition. A record pattern consists of a type, + * a (possibly empty) record component pattern list which is used to match against + * the corresponding record components, and an optional identifier. Appears as part of + * an {@code instanceof} expression or a {@code case} label in a switch. + * + * <p>For example:</p> + * <pre> + * record R(Object o){} + * if (o instanceof R(String s) myRecord) {} + * switch (o) { + * case R(String s) myRecord -&gt; {} + * } + * </pre> + * <p>parses as:</p> + * <pre> + * |--RECORD_DEF -&gt; RECORD_DEF + * | |--MODIFIERS -&gt; MODIFIERS + * | |--LITERAL_RECORD -&gt; record + * | |--IDENT -&gt; R + * | |--LPAREN -&gt; ( + * | |--RECORD_COMPONENTS -&gt; RECORD_COMPONENTS + * | | `--RECORD_COMPONENT_DEF -&gt; RECORD_COMPONENT_DEF + * | | |--ANNOTATIONS -&gt; ANNOTATIONS + * | | |--TYPE -&gt; TYPE + * | | | `--IDENT -&gt; Object + * | | `--IDENT -&gt; o + * | |--RPAREN -&gt; ) + * | `--OBJBLOCK -&gt; OBJBLOCK + * | |--LCURLY -&gt; { + * | `--RCURLY -&gt; } + * |--LITERAL_IF -&gt; if + * | |--LPAREN -&gt; ( + * | |--EXPR -&gt; EXPR + * | | `--LITERAL_INSTANCEOF -&gt; instanceof + * | | |--IDENT -&gt; o + * | | `--RECORD_PATTERN_DEF -&gt; RECORD_PATTERN_DEF + * | | |--MODIFIERS -&gt; MODIFIERS + * | | |--TYPE -&gt; TYPE + * | | | `--IDENT -&gt; R + * | | |--LPAREN -&gt; ( + * | | |--RECORD_PATTERN_COMPONENTS -&gt; RECORD_PATTERN_COMPONENTS + * | | | `--PATTERN_VARIABLE_DEF -&gt; PATTERN_VARIABLE_DEF + * | | | |--MODIFIERS -&gt; MODIFIERS + * | | | |--TYPE -&gt; TYPE + * | | | | `--IDENT -&gt; String + * | | | `--IDENT -&gt; s + * | | |--RPAREN -&gt; ) + * | | `--IDENT -&gt; myRecord + * | |--RPAREN -&gt; ) + * | `--SLIST -&gt; { + * | `--RCURLY -&gt; } + * |--LITERAL_SWITCH -&gt; switch + * | |--LPAREN -&gt; ( + * | |--EXPR -&gt; EXPR + * | | `--IDENT -&gt; o + * | |--RPAREN -&gt; ) + * | |--LCURLY -&gt; { + * | |--SWITCH_RULE -&gt; SWITCH_RULE + * | | |--LITERAL_CASE -&gt; case + * | | | `--RECORD_PATTERN_DEF -&gt; RECORD_PATTERN_DEF + * | | | |--MODIFIERS -&gt; MODIFIERS + * | | | |--TYPE -&gt; TYPE + * | | | | `--IDENT -&gt; R + * | | | |--LPAREN -&gt; ( + * | | | |--RECORD_PATTERN_COMPONENTS -&gt; RECORD_PATTERN_COMPONENTS + * | | | | `--PATTERN_VARIABLE_DEF -&gt; PATTERN_VARIABLE_DEF + * | | | | |--MODIFIERS -&gt; MODIFIERS + * | | | | |--TYPE -&gt; TYPE + * | | | | | `--IDENT -&gt; String + * | | | | `--IDENT -&gt; s + * | | | |--RPAREN -&gt; ) + * | | | `--IDENT -&gt; myRecord + * | | |--LAMBDA -&gt; -&gt; + * | | `--SLIST -&gt; { + * | | `--RCURLY -&gt; } + * | `--RCURLY -&gt; } + * `--RCURLY -&gt; } + * </pre> + * + * @see <a href="https://openjdk.org/jeps/405">JEP 405: Record Patterns</a> + * @see #LITERAL_WHEN + * @see #PATTERN_VARIABLE_DEF + * @see #LITERAL_INSTANCEOF + * @see #SWITCH_RULE + * + * @since 10.12.0 + */ + public static final int RECORD_PATTERN_DEF = + JavaLanguageLexer.RECORD_PATTERN_DEF; + + /** + * A (possibly empty) record component pattern list which is used to match against + * the corresponding record components. Appears as part of a record pattern definition. + * + * <p>For example:</p> + * <pre> + * record R(Object o){} + * if (o instanceof R(String myComponent)) {} + * switch (o) { + * case R(String myComponent) when "component".equalsIgnoreCase(myComponent) -&gt; {} + * } + * </pre> + * <p>parses as:</p> + * <pre> + * |--RECORD_DEF -&gt; RECORD_DEF + * | |--MODIFIERS -&gt; MODIFIERS + * | |--LITERAL_RECORD -&gt; record + * | |--IDENT -&gt; R + * | |--LPAREN -&gt; ( + * | |--RECORD_COMPONENTS -&gt; RECORD_COMPONENTS + * | | `--RECORD_COMPONENT_DEF -&gt; RECORD_COMPONENT_DEF + * | | |--ANNOTATIONS -&gt; ANNOTATIONS + * | | |--TYPE -&gt; TYPE + * | | | `--IDENT -&gt; Object + * | | `--IDENT -&gt; o + * | |--RPAREN -&gt; ) + * | `--OBJBLOCK -&gt; OBJBLOCK + * | |--LCURLY -&gt; { + * | `--RCURLY -&gt; } + * |--LITERAL_IF -&gt; if + * | |--LPAREN -&gt; ( + * | |--EXPR -&gt; EXPR + * | | `--LITERAL_INSTANCEOF -&gt; instanceof + * | | |--IDENT -&gt; o + * | | `--RECORD_PATTERN_DEF -&gt; RECORD_PATTERN_DEF + * | | |--MODIFIERS -&gt; MODIFIERS + * | | |--TYPE -&gt; TYPE + * | | | `--IDENT -&gt; R + * | | |--LPAREN -&gt; ( + * | | |--RECORD_PATTERN_COMPONENTS -&gt; RECORD_PATTERN_COMPONENTS + * | | | `--PATTERN_VARIABLE_DEF -&gt; PATTERN_VARIABLE_DEF + * | | | |--MODIFIERS -&gt; MODIFIERS + * | | | |--TYPE -&gt; TYPE + * | | | | `--IDENT -&gt; String + * | | | `--IDENT -&gt; myComponent + * | | `--RPAREN -&gt; ) + * | |--RPAREN -&gt; ) + * | `--SLIST -&gt; { + * | `--RCURLY -&gt; } + * |--LITERAL_SWITCH -&gt; switch + * | |--LPAREN -&gt; ( + * | |--EXPR -&gt; EXPR + * | | `--IDENT -&gt; o + * | |--RPAREN -&gt; ) + * | |--LCURLY -&gt; { + * | |--SWITCH_RULE -&gt; SWITCH_RULE + * | | |--LITERAL_CASE -&gt; case + * | | | `--PATTERN_DEF -&gt; PATTERN_DEF + * | | | `--LITERAL_WHEN -&gt; when + * | | | |--RECORD_PATTERN_DEF -&gt; RECORD_PATTERN_DEF + * | | | | |--MODIFIERS -&gt; MODIFIERS + * | | | | |--TYPE -&gt; TYPE + * | | | | | `--IDENT -&gt; R + * | | | | |--LPAREN -&gt; ( + * | | | | |--RECORD_PATTERN_COMPONENTS -&gt; RECORD_PATTERN_COMPONENTS + * | | | | | `--PATTERN_VARIABLE_DEF -&gt; PATTERN_VARIABLE_DEF + * | | | | | |--MODIFIERS -&gt; MODIFIERS + * | | | | | |--TYPE -&gt; TYPE + * | | | | | | `--IDENT -&gt; String + * | | | | | `--IDENT -&gt; myComponent + * | | | | `--RPAREN -&gt; ) + * | | | `--METHOD_CALL -&gt; ( + * | | | |--DOT -&gt; . + * | | | | |--STRING_LITERAL -&gt; "component" + * | | | | `--IDENT -&gt; equalsIgnoreCase + * | | | |--ELIST -&gt; ELIST + * | | | | `--EXPR -&gt; EXPR + * | | | | `--IDENT -&gt; myComponent + * | | | `--RPAREN -&gt; ) + * | | |--LAMBDA -&gt; -&gt; + * | | `--SLIST -&gt; { + * | | `--RCURLY -&gt; } + * | `--RCURLY -&gt; } + * `--RCURLY -&gt; } + * </pre> + * + * @see <a href="https://openjdk.org/jeps/405">JEP 405: Record Patterns</a> + * @see #LITERAL_WHEN + * @see #PATTERN_VARIABLE_DEF + * @see #LITERAL_INSTANCEOF + * @see #SWITCH_RULE + * + * @since 10.12.0 + */ + public static final int RECORD_PATTERN_COMPONENTS = + JavaLanguageLexer.RECORD_PATTERN_COMPONENTS; + /** Prevent instantiation. */ private TokenTypes() { }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheckTest.java @@ -161,7 +161,7 @@ public void testOrderOfProperties() { @Test public void testAcceptableTokensMakeSense() { - final int expectedTokenTypesTotalNumber = 186; + final int expectedTokenTypesTotalNumber = 188; assertWithMessage("Total number of TokenTypes has changed, acceptable tokens in" + " IllegalTokenTextCheck need to be reconsidered.") .that(TokenUtil.getTokenTypesTotalNumber()) diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/GeneratedJavaTokenTypesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/GeneratedJavaTokenTypesTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/GeneratedJavaTokenTypesTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/GeneratedJavaTokenTypesTest.java @@ -709,6 +709,12 @@ public void testTokenNumbering() { assertWithMessage(message) .that(JavaLanguageLexer.LITERAL_WHEN) .isEqualTo(214); + assertWithMessage(message) + .that(JavaLanguageLexer.RECORD_PATTERN_DEF) + .isEqualTo(215); + assertWithMessage(message) + .that(JavaLanguageLexer.RECORD_PATTERN_COMPONENTS) + .isEqualTo(216); final int tokenCount = (int) Arrays.stream(JavaLanguageLexer.class.getDeclaredFields()) .filter(GeneratedJavaTokenTypesTest::isPublicStaticFinalInt) @@ -719,7 +725,7 @@ public void testTokenNumbering() { + " 'GeneratedJavaTokenTypesTest' and verified" + " that their old numbering didn't change") .that(tokenCount) - .isEqualTo(226); + .isEqualTo(228); } /** diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java19/Java19AstRegressionTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java19/Java19AstRegressionTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java19/Java19AstRegressionTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java19/Java19AstRegressionTest.java @@ -65,4 +65,43 @@ public void testLotsOfOperators() throws Exception { verifyAst(getNonCompilablePath("ExpectedJava19BindingsWithLotsOfOperators.txt"), getNonCompilablePath("InputJava19BindingsWithLotsOfOperators.java")); } + + @Test + public void testRecordPatternsWithNestedDecomposition() throws Exception { + verifyAst(getPath("ExpectedRecordPatternsPreviewNestedDecomposition.txt"), + getNonCompilablePath("InputRecordPatternsPreviewNestedDecomposition.java")); + } + + @Test + public void testRecordPatternsPreview() throws Exception { + verifyAst(getPath("ExpectedRecordPatternsPreview.txt"), + getNonCompilablePath("InputRecordPatternsPreview.java")); + } + + @Test + public void testGenericRecordDecomposition() throws Exception { + verifyAst(getNonCompilablePath("ExpectedGenericRecordDeconstructionPattern.txt"), + getNonCompilablePath("InputGenericRecordDeconstructionPattern.java")); + } + + @Test + public void testGuardsWithExtraParenthesis() throws Exception { + verifyAst(getNonCompilablePath("ExpectedJava19GuardsWithExtraParenthesis.txt"), + getNonCompilablePath("InputJava19GuardsWithExtraParenthesis.java")); + } + + @Test + public void testBindingWithModifiers() throws Exception { + verifyAst(getNonCompilablePath("ExpectedJava19BindingWithModifiers.txt"), + getNonCompilablePath("InputJava19BindingWithModifiers.java")); + } + + @Test + public void test() throws Exception { + verifyAst(getNonCompilablePath( + "ExpectedJava19RecordDecompositionWithConditionInLoops.txt"), + getNonCompilablePath( + "InputJava19RecordDecompositionWithConditionInLoops.java" + )); + } } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/utils/TokenUtilTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/utils/TokenUtilTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/TokenUtilTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/TokenUtilTest.java @@ -228,7 +228,7 @@ public void testGetTokenTypesTotalNumber() { assertWithMessage("Invalid token total number") .that(tokenTypesTotalNumber) - .isEqualTo(186); + .isEqualTo(188); } @Test @@ -238,10 +238,10 @@ public void testGetAllTokenIds() { assertWithMessage("Invalid token length") .that(allTokenIds.length) - .isEqualTo(186); + .isEqualTo(188); assertWithMessage("invalid sum") .that(sum) - .isEqualTo(19164); + .isEqualTo(19595); } @Test diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/ExpectedGenericRecordDeconstructionPattern.txt b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/ExpectedGenericRecordDeconstructionPattern.txt new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/ExpectedGenericRecordDeconstructionPattern.txt @@ -0,0 +1,790 @@ +COMPILATION_UNIT -> COMPILATION_UNIT [2:0] +|--PACKAGE_DEF -> package [2:0] +| |--ANNOTATIONS -> ANNOTATIONS [2:47] +| |--DOT -> . [2:47] +| | |--DOT -> . [2:39] +| | | |--DOT -> . [2:28] +| | | | |--DOT -> . [2:22] +| | | | | |--DOT -> . [2:11] +| | | | | | |--IDENT -> com [2:8] +| | | | | | `--IDENT -> puppycrawl [2:12] +| | | | | `--IDENT -> tools [2:23] +| | | | `--IDENT -> checkstyle [2:29] +| | | `--IDENT -> grammar [2:40] +| | `--IDENT -> java19 [2:48] +| `--SEMI -> ; [2:54] +|--IMPORT -> import [4:0] +| |--DOT -> . [4:16] +| | |--DOT -> . [4:11] +| | | |--IDENT -> java [4:7] +| | | `--IDENT -> util [4:12] +| | `--IDENT -> Objects [4:17] +| `--SEMI -> ; [4:24] +|--IMPORT -> import [5:0] +| |--DOT -> . [5:25] +| | |--DOT -> . [5:16] +| | | |--DOT -> . [5:11] +| | | | |--IDENT -> java [5:7] +| | | | `--IDENT -> util [5:12] +| | | `--IDENT -> function [5:17] +| | `--IDENT -> Function [5:26] +| `--SEMI -> ; [5:34] +`--CLASS_DEF -> CLASS_DEF [7:0] + |--MODIFIERS -> MODIFIERS [7:0] + | `--LITERAL_PUBLIC -> public [7:0] + |--LITERAL_CLASS -> class [7:7] + |--IDENT -> InputGenericRecordDeconstructionPattern [7:13] + `--OBJBLOCK -> OBJBLOCK [7:53] + |--LCURLY -> { [7:53] + |--METHOD_DEF -> METHOD_DEF [9:4] + | |--MODIFIERS -> MODIFIERS [9:4] + | |--TYPE -> TYPE [9:4] + | | `--LITERAL_VOID -> void [9:4] + | |--IDENT -> m1 [9:9] + | |--LPAREN -> ( [9:11] + | |--PARAMETERS -> PARAMETERS [9:12] + | | `--PARAMETER_DEF -> PARAMETER_DEF [9:12] + | | |--MODIFIERS -> MODIFIERS [9:12] + | | |--TYPE -> TYPE [9:12] + | | | |--IDENT -> Function [9:12] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [9:20] + | | | |--GENERIC_START -> < [9:20] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [9:21] + | | | | |--IDENT -> Box [9:21] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [9:24] + | | | | |--GENERIC_START -> < [9:24] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [9:25] + | | | | | `--IDENT -> String [9:25] + | | | | `--GENERIC_END -> > [9:31] + | | | |--COMMA -> , [9:32] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [9:34] + | | | | `--IDENT -> Integer [9:34] + | | | `--GENERIC_END -> > [9:41] + | | `--IDENT -> test [9:43] + | |--RPAREN -> ) [9:47] + | `--SLIST -> { [9:49] + | |--VARIABLE_DEF -> VARIABLE_DEF [10:8] + | | |--MODIFIERS -> MODIFIERS [10:8] + | | |--TYPE -> TYPE [10:8] + | | | |--IDENT -> Box [10:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [10:11] + | | | |--GENERIC_START -> < [10:11] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [10:12] + | | | | `--IDENT -> String [10:12] + | | | `--GENERIC_END -> > [10:18] + | | |--IDENT -> b [10:20] + | | `--ASSIGN -> = [10:22] + | | `--EXPR -> EXPR [10:24] + | | `--LITERAL_NEW -> new [10:24] + | | |--IDENT -> Box [10:28] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [10:31] + | | | |--GENERIC_START -> < [10:31] + | | | `--GENERIC_END -> > [10:32] + | | |--LPAREN -> ( [10:33] + | | |--ELIST -> ELIST [10:34] + | | | `--EXPR -> EXPR [10:34] + | | | `--LITERAL_NULL -> null [10:34] + | | `--RPAREN -> ) [10:38] + | |--SEMI -> ; [10:39] + | `--RCURLY -> } [11:4] + |--METHOD_DEF -> METHOD_DEF [13:4] + | |--MODIFIERS -> MODIFIERS [13:4] + | |--TYPE -> TYPE [13:4] + | | `--LITERAL_INT -> int [13:4] + | |--IDENT -> m2 [13:8] + | |--LPAREN -> ( [13:10] + | |--PARAMETERS -> PARAMETERS [13:11] + | | `--PARAMETER_DEF -> PARAMETER_DEF [13:11] + | | |--MODIFIERS -> MODIFIERS [13:11] + | | |--TYPE -> TYPE [13:11] + | | | |--IDENT -> Box [13:11] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [13:14] + | | | |--GENERIC_START -> < [13:14] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [13:15] + | | | | `--IDENT -> String [13:15] + | | | `--GENERIC_END -> > [13:21] + | | `--IDENT -> b [13:23] + | |--RPAREN -> ) [13:24] + | `--SLIST -> { [13:26] + | |--LITERAL_IF -> if [14:8] + | | |--LPAREN -> ( [14:11] + | | |--EXPR -> EXPR [14:14] + | | | `--LITERAL_INSTANCEOF -> instanceof [14:14] + | | | |--IDENT -> b [14:12] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [14:25] + | | | |--MODIFIERS -> MODIFIERS [14:25] + | | | |--TYPE -> TYPE [14:25] + | | | | |--IDENT -> Box [14:25] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [14:28] + | | | | |--GENERIC_START -> < [14:28] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [14:29] + | | | | | `--IDENT -> String [14:29] + | | | | `--GENERIC_END -> > [14:35] + | | | |--LPAREN -> ( [14:36] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [14:37] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [14:37] + | | | | |--MODIFIERS -> MODIFIERS [14:37] + | | | | |--TYPE -> TYPE [14:37] + | | | | | `--IDENT -> String [14:37] + | | | | `--IDENT -> s [14:44] + | | | `--RPAREN -> ) [14:45] + | | |--RPAREN -> ) [14:46] + | | `--LITERAL_RETURN -> return [14:48] + | | |--EXPR -> EXPR [14:55] + | | | `--NUM_INT -> 1 [14:55] + | | `--SEMI -> ; [14:56] + | |--LITERAL_IF -> if [15:8] + | | |--LPAREN -> ( [15:11] + | | |--EXPR -> EXPR [18:12] + | | | `--LAND -> && [18:12] + | | | |--LAND -> && [17:12] + | | | | |--LAND -> && [16:12] + | | | | | |--LITERAL_INSTANCEOF -> instanceof [15:14] + | | | | | | |--IDENT -> b [15:12] + | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [15:25] + | | | | | | |--MODIFIERS -> MODIFIERS [15:25] + | | | | | | |--TYPE -> TYPE [15:25] + | | | | | | | |--IDENT -> Box [15:25] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [15:28] + | | | | | | | |--GENERIC_START -> < [15:28] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [15:29] + | | | | | | | | `--IDENT -> String [15:29] + | | | | | | | `--GENERIC_END -> > [15:35] + | | | | | | |--LPAREN -> ( [15:36] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [15:37] + | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [15:37] + | | | | | | | |--MODIFIERS -> MODIFIERS [15:37] + | | | | | | | |--TYPE -> TYPE [15:37] + | | | | | | | | `--IDENT -> String [15:37] + | | | | | | | `--IDENT -> s [15:44] + | | | | | | `--RPAREN -> ) [15:45] + | | | | | `--NOT_EQUAL -> != [16:19] + | | | | | |--DOT -> . [16:16] + | | | | | | |--IDENT -> b [16:15] + | | | | | | `--IDENT -> v [16:17] + | | | | | `--LITERAL_NULL -> null [16:22] + | | | | `--NOT_EQUAL -> != [17:21] + | | | | |--METHOD_CALL -> ( [17:18] + | | | | | |--DOT -> . [17:16] + | | | | | | |--IDENT -> b [17:15] + | | | | | | `--IDENT -> v [17:17] + | | | | | |--ELIST -> ELIST [17:19] + | | | | | `--RPAREN -> ) [17:19] + | | | | `--LITERAL_NULL -> null [17:24] + | | | `--METHOD_CALL -> ( [18:32] + | | | |--DOT -> . [18:25] + | | | | |--STRING_LITERAL -> "whatever" [18:15] + | | | | `--IDENT -> equals [18:26] + | | | |--ELIST -> ELIST [18:34] + | | | | `--EXPR -> EXPR [18:34] + | | | | `--DOT -> . [18:34] + | | | | |--IDENT -> b [18:33] + | | | | `--IDENT -> v [18:35] + | | | `--RPAREN -> ) [18:36] + | | |--RPAREN -> ) [18:37] + | | `--LITERAL_RETURN -> return [18:39] + | | |--EXPR -> EXPR [18:46] + | | | `--NUM_INT -> 1 [18:46] + | | `--SEMI -> ; [18:47] + | |--LITERAL_RETURN -> return [19:8] + | | |--EXPR -> EXPR [19:15] + | | | `--UNARY_MINUS -> - [19:15] + | | | `--NUM_INT -> 1 [19:16] + | | `--SEMI -> ; [19:17] + | `--RCURLY -> } [20:4] + |--METHOD_DEF -> METHOD_DEF [22:4] + | |--MODIFIERS -> MODIFIERS [22:4] + | |--TYPE -> TYPE [22:4] + | | `--LITERAL_INT -> int [22:4] + | |--IDENT -> m3 [22:8] + | |--LPAREN -> ( [22:10] + | |--PARAMETERS -> PARAMETERS [22:11] + | | `--PARAMETER_DEF -> PARAMETER_DEF [22:11] + | | |--MODIFIERS -> MODIFIERS [22:11] + | | |--TYPE -> TYPE [22:11] + | | | |--IDENT -> Box [22:11] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [22:14] + | | | |--GENERIC_START -> < [22:14] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [22:15] + | | | | `--IDENT -> String [22:15] + | | | `--GENERIC_END -> > [22:21] + | | `--IDENT -> b [22:23] + | |--RPAREN -> ) [22:24] + | `--SLIST -> { [22:26] + | |--LITERAL_SWITCH -> switch [23:8] + | | |--LPAREN -> ( [23:15] + | | |--EXPR -> EXPR [23:16] + | | | `--IDENT -> b [23:16] + | | |--RPAREN -> ) [23:17] + | | |--LCURLY -> { [23:19] + | | |--CASE_GROUP -> CASE_GROUP [24:12] + | | | |--LITERAL_CASE -> case [24:12] + | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [24:17] + | | | | | |--MODIFIERS -> MODIFIERS [24:17] + | | | | | |--TYPE -> TYPE [24:17] + | | | | | | |--IDENT -> Box [24:17] + | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [24:20] + | | | | | | |--GENERIC_START -> < [24:20] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [24:21] + | | | | | | | `--IDENT -> String [24:21] + | | | | | | `--GENERIC_END -> > [24:27] + | | | | | |--LPAREN -> ( [24:28] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [24:29] + | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [24:29] + | | | | | | |--MODIFIERS -> MODIFIERS [24:29] + | | | | | | |--TYPE -> TYPE [24:29] + | | | | | | | `--IDENT -> String [24:29] + | | | | | | `--IDENT -> s [24:36] + | | | | | `--RPAREN -> ) [24:37] + | | | | `--COLON -> : [24:38] + | | | `--SLIST -> SLIST [24:40] + | | | `--LITERAL_RETURN -> return [24:40] + | | | |--EXPR -> EXPR [24:47] + | | | | `--NUM_INT -> 1 [24:47] + | | | `--SEMI -> ; [24:48] + | | |--CASE_GROUP -> CASE_GROUP [25:12] + | | | |--LITERAL_DEFAULT -> default [25:12] + | | | | `--COLON -> : [25:19] + | | | `--SLIST -> SLIST [25:21] + | | | `--LITERAL_RETURN -> return [25:21] + | | | |--EXPR -> EXPR [25:28] + | | | | `--UNARY_MINUS -> - [25:28] + | | | | `--NUM_INT -> 1 [25:29] + | | | `--SEMI -> ; [25:30] + | | `--RCURLY -> } [26:8] + | `--RCURLY -> } [27:4] + |--METHOD_DEF -> METHOD_DEF [29:4] + | |--MODIFIERS -> MODIFIERS [29:4] + | |--TYPE -> TYPE [29:4] + | | `--LITERAL_INT -> int [29:4] + | |--IDENT -> m4 [29:8] + | |--LPAREN -> ( [29:10] + | |--PARAMETERS -> PARAMETERS [29:11] + | | `--PARAMETER_DEF -> PARAMETER_DEF [29:11] + | | |--MODIFIERS -> MODIFIERS [29:11] + | | |--TYPE -> TYPE [29:11] + | | | |--IDENT -> Box [29:11] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [29:14] + | | | |--GENERIC_START -> < [29:14] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [29:15] + | | | | `--IDENT -> String [29:15] + | | | `--GENERIC_END -> > [29:21] + | | `--IDENT -> b [29:23] + | |--RPAREN -> ) [29:24] + | `--SLIST -> { [29:26] + | |--LITERAL_RETURN -> return [30:8] + | | |--EXPR -> EXPR [30:15] + | | | `--LITERAL_SWITCH -> switch [30:15] + | | | |--LPAREN -> ( [30:22] + | | | |--EXPR -> EXPR [30:23] + | | | | `--IDENT -> b [30:23] + | | | |--RPAREN -> ) [30:24] + | | | |--LCURLY -> { [30:26] + | | | |--SWITCH_RULE -> SWITCH_RULE [31:12] + | | | | |--LITERAL_CASE -> case [31:12] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [31:17] + | | | | | |--MODIFIERS -> MODIFIERS [31:17] + | | | | | |--TYPE -> TYPE [31:17] + | | | | | | |--IDENT -> Box [31:17] + | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [31:20] + | | | | | | |--GENERIC_START -> < [31:20] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [31:21] + | | | | | | | `--IDENT -> String [31:21] + | | | | | | `--GENERIC_END -> > [31:27] + | | | | | |--LPAREN -> ( [31:28] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [31:29] + | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [31:29] + | | | | | | |--MODIFIERS -> MODIFIERS [31:29] + | | | | | | |--TYPE -> TYPE [31:29] + | | | | | | | `--IDENT -> String [31:29] + | | | | | | `--IDENT -> s [31:36] + | | | | | `--RPAREN -> ) [31:37] + | | | | |--LAMBDA -> -> [31:39] + | | | | |--EXPR -> EXPR [31:42] + | | | | | `--NUM_INT -> 1 [31:42] + | | | | `--SEMI -> ; [31:43] + | | | |--SWITCH_RULE -> SWITCH_RULE [32:12] + | | | | |--LITERAL_DEFAULT -> default [32:12] + | | | | |--LAMBDA -> -> [32:20] + | | | | |--EXPR -> EXPR [32:23] + | | | | | `--UNARY_MINUS -> - [32:23] + | | | | | `--NUM_INT -> 1 [32:24] + | | | | `--SEMI -> ; [32:25] + | | | `--RCURLY -> } [33:8] + | | `--SEMI -> ; [33:9] + | `--RCURLY -> } [34:4] + |--METHOD_DEF -> METHOD_DEF [36:4] + | |--MODIFIERS -> MODIFIERS [36:4] + | |--TYPE -> TYPE [36:4] + | | `--LITERAL_INT -> int [36:4] + | |--IDENT -> m5 [36:8] + | |--LPAREN -> ( [36:10] + | |--PARAMETERS -> PARAMETERS [36:11] + | | `--PARAMETER_DEF -> PARAMETER_DEF [36:11] + | | |--MODIFIERS -> MODIFIERS [36:11] + | | |--TYPE -> TYPE [36:11] + | | | |--IDENT -> Box [36:11] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [36:14] + | | | |--GENERIC_START -> < [36:14] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [36:15] + | | | | |--IDENT -> Box [36:15] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [36:18] + | | | | |--GENERIC_START -> < [36:18] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [36:19] + | | | | | `--IDENT -> String [36:19] + | | | | `--GENERIC_END -> > [36:25] + | | | `--GENERIC_END -> > [36:26] + | | `--IDENT -> b [36:28] + | |--RPAREN -> ) [36:29] + | `--SLIST -> { [36:31] + | |--LITERAL_RETURN -> return [37:8] + | | |--EXPR -> EXPR [37:15] + | | | `--LITERAL_SWITCH -> switch [37:15] + | | | |--LPAREN -> ( [37:22] + | | | |--EXPR -> EXPR [37:23] + | | | | `--IDENT -> b [37:23] + | | | |--RPAREN -> ) [37:24] + | | | |--LCURLY -> { [37:26] + | | | |--SWITCH_RULE -> SWITCH_RULE [38:12] + | | | | |--LITERAL_CASE -> case [38:12] + | | | | | `--PATTERN_DEF -> PATTERN_DEF [39:20] + | | | | | `--LITERAL_WHEN -> when [39:20] + | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [38:17] + | | | | | | |--MODIFIERS -> MODIFIERS [38:17] + | | | | | | |--TYPE -> TYPE [38:17] + | | | | | | | |--IDENT -> Box [38:17] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [38:20] + | | | | | | | |--GENERIC_START -> < [38:20] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [38:21] + | | | | | | | | |--IDENT -> Box [38:21] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [38:24] + | | | | | | | | |--GENERIC_START -> < [38:24] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [38:25] + | | | | | | | | | `--IDENT -> String [38:25] + | | | | | | | | `--GENERIC_END -> > [38:31] + | | | | | | | `--GENERIC_END -> > [38:32] + | | | | | | |--LPAREN -> ( [38:33] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [38:34] + | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [38:34] + | | | | | | | |--MODIFIERS -> MODIFIERS [38:34] + | | | | | | | |--TYPE -> TYPE [38:34] + | | | | | | | | |--IDENT -> Box [38:34] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [38:37] + | | | | | | | | |--GENERIC_START -> < [38:37] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [38:38] + | | | | | | | | | `--IDENT -> String [38:38] + | | | | | | | | `--GENERIC_END -> > [38:44] + | | | | | | | |--LPAREN -> ( [38:45] + | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [38:46] + | | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [38:46] + | | | | | | | | |--MODIFIERS -> MODIFIERS [38:46] + | | | | | | | | |--TYPE -> TYPE [38:46] + | | | | | | | | | `--IDENT -> String [38:46] + | | | | | | | | `--IDENT -> s [38:53] + | | | | | | | |--RPAREN -> ) [38:54] + | | | | | | | `--IDENT -> box [38:55] + | | | | | | `--RPAREN -> ) [38:58] + | | | | | `--LAND -> && [39:42] + | | | | | |--METHOD_CALL -> ( [39:38] + | | | | | | |--DOT -> . [39:31] + | | | | | | | |--STRING_LITERAL -> "test" [39:25] + | | | | | | | `--IDENT -> equals [39:32] + | | | | | | |--ELIST -> ELIST [39:39] + | | | | | | | `--EXPR -> EXPR [39:39] + | | | | | | | `--IDENT -> s [39:39] + | | | | | | `--RPAREN -> ) [39:40] + | | | | | `--NOT_EQUAL -> != [39:51] + | | | | | |--DOT -> . [39:48] + | | | | | | |--IDENT -> box [39:45] + | | | | | | `--IDENT -> x [39:49] + | | | | | `--NUM_INT -> 7 [39:54] + | | | | |--LAMBDA -> -> [39:57] + | | | | |--EXPR -> EXPR [39:60] + | | | | | `--NUM_INT -> 1 [39:60] + | | | | `--SEMI -> ; [39:61] + | | | |--SWITCH_RULE -> SWITCH_RULE [40:12] + | | | | |--LITERAL_CASE -> case [40:12] + | | | | | `--PATTERN_DEF -> PATTERN_DEF [41:20] + | | | | | `--LITERAL_WHEN -> when [41:20] + | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [40:17] + | | | | | | |--MODIFIERS -> MODIFIERS [40:17] + | | | | | | |--TYPE -> TYPE [40:17] + | | | | | | | |--IDENT -> Box [40:17] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [40:20] + | | | | | | | |--GENERIC_START -> < [40:20] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [40:21] + | | | | | | | | |--IDENT -> Box [40:21] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [40:24] + | | | | | | | | |--GENERIC_START -> < [40:24] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [40:25] + | | | | | | | | | `--IDENT -> String [40:25] + | | | | | | | | `--GENERIC_END -> > [40:31] + | | | | | | | `--GENERIC_END -> > [40:32] + | | | | | | |--LPAREN -> ( [40:33] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [40:34] + | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [40:34] + | | | | | | | |--MODIFIERS -> MODIFIERS [40:34] + | | | | | | | |--TYPE -> TYPE [40:34] + | | | | | | | | |--IDENT -> Box [40:34] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [40:37] + | | | | | | | | |--GENERIC_START -> < [40:37] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [40:38] + | | | | | | | | | `--IDENT -> String [40:38] + | | | | | | | | `--GENERIC_END -> > [40:44] + | | | | | | | |--LPAREN -> ( [40:45] + | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [40:46] + | | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [40:46] + | | | | | | | | |--MODIFIERS -> MODIFIERS [40:46] + | | | | | | | | |--TYPE -> TYPE [40:46] + | | | | | | | | | `--IDENT -> String [40:46] + | | | | | | | | `--IDENT -> s [40:53] + | | | | | | | |--RPAREN -> ) [40:54] + | | | | | | | `--IDENT -> box [40:55] + | | | | | | `--RPAREN -> ) [40:58] + | | | | | `--LAND -> && [41:42] + | | | | | |--METHOD_CALL -> ( [41:38] + | | | | | | |--DOT -> . [41:31] + | | | | | | | |--STRING_LITERAL -> "test" [41:25] + | | | | | | | `--IDENT -> equals [41:32] + | | | | | | |--ELIST -> ELIST [41:39] + | | | | | | | `--EXPR -> EXPR [41:39] + | | | | | | | `--IDENT -> s [41:39] + | | | | | | `--RPAREN -> ) [41:40] + | | | | | `--NOT_EQUAL -> != [41:57] + | | | | | |--TYPECAST -> ( [41:45] + | | | | | | |--TYPE -> TYPE [41:46] + | | | | | | | `--LITERAL_INT -> int [41:46] + | | | | | | |--RPAREN -> ) [41:49] + | | | | | | `--DOT -> . [41:54] + | | | | | | |--IDENT -> box [41:51] + | | | | | | `--IDENT -> x [41:55] + | | | | | `--NUM_INT -> 7 [41:60] + | | | | |--LAMBDA -> -> [41:63] + | | | | |--EXPR -> EXPR [41:66] + | | | | | `--NUM_INT -> 1 [41:66] + | | | | `--SEMI -> ; [41:67] + | | | |--SWITCH_RULE -> SWITCH_RULE [42:12] + | | | | |--LITERAL_CASE -> case [42:12] + | | | | | `--PATTERN_DEF -> PATTERN_DEF [43:20] + | | | | | `--LITERAL_WHEN -> when [43:20] + | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [42:17] + | | | | | | |--MODIFIERS -> MODIFIERS [42:17] + | | | | | | |--TYPE -> TYPE [42:17] + | | | | | | | |--IDENT -> Box [42:17] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [42:20] + | | | | | | | |--GENERIC_START -> < [42:20] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [42:21] + | | | | | | | | |--IDENT -> Box [42:21] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [42:24] + | | | | | | | | |--GENERIC_START -> < [42:24] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [42:25] + | | | | | | | | | `--IDENT -> String [42:25] + | | | | | | | | `--GENERIC_END -> > [42:31] + | | | | | | | `--GENERIC_END -> > [42:32] + | | | | | | |--LPAREN -> ( [42:33] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [42:34] + | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [42:34] + | | | | | | | |--MODIFIERS -> MODIFIERS [42:34] + | | | | | | | |--TYPE -> TYPE [42:34] + | | | | | | | | |--IDENT -> Box [42:34] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [42:37] + | | | | | | | | |--GENERIC_START -> < [42:37] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [42:38] + | | | | | | | | | `--IDENT -> String [42:38] + | | | | | | | | `--GENERIC_END -> > [42:44] + | | | | | | | |--LPAREN -> ( [42:45] + | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [42:46] + | | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [42:46] + | | | | | | | | |--MODIFIERS -> MODIFIERS [42:46] + | | | | | | | | |--TYPE -> TYPE [42:46] + | | | | | | | | | `--IDENT -> String [42:46] + | | | | | | | | `--IDENT -> s [42:53] + | | | | | | | |--RPAREN -> ) [42:54] + | | | | | | | `--IDENT -> box [42:55] + | | | | | | `--RPAREN -> ) [42:58] + | | | | | `--LAND -> && [43:42] + | | | | | |--METHOD_CALL -> ( [43:38] + | | | | | | |--DOT -> . [43:31] + | | | | | | | |--STRING_LITERAL -> "test" [43:25] + | | | | | | | `--IDENT -> equals [43:32] + | | | | | | |--ELIST -> ELIST [43:39] + | | | | | | | `--EXPR -> EXPR [43:39] + | | | | | | | `--IDENT -> s [43:39] + | | | | | | `--RPAREN -> ) [43:40] + | | | | | `--METHOD_CALL -> ( [43:59] + | | | | | |--DOT -> . [43:52] + | | | | | | |--IDENT -> Objects [43:45] + | | | | | | `--IDENT -> equals [43:53] + | | | | | |--ELIST -> ELIST [43:63] + | | | | | | |--EXPR -> EXPR [43:63] + | | | | | | | `--DOT -> . [43:63] + | | | | | | | |--IDENT -> box [43:60] + | | | | | | | `--IDENT -> v [43:64] + | | | | | | |--COMMA -> , [43:65] + | | | | | | `--EXPR -> EXPR [43:67] + | | | | | | `--STRING_LITERAL -> "box" [43:67] + | | | | | `--RPAREN -> ) [43:72] + | | | | |--LAMBDA -> -> [43:74] + | | | | |--EXPR -> EXPR [43:77] + | | | | | `--NUM_INT -> 1 [43:77] + | | | | `--SEMI -> ; [43:78] + | | | |--SWITCH_RULE -> SWITCH_RULE [44:12] + | | | | |--LITERAL_CASE -> case [44:12] + | | | | | `--PATTERN_DEF -> PATTERN_DEF [45:20] + | | | | | `--LITERAL_WHEN -> when [45:20] + | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [44:17] + | | | | | | |--MODIFIERS -> MODIFIERS [44:17] + | | | | | | |--TYPE -> TYPE [44:17] + | | | | | | | |--IDENT -> Box [44:17] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [44:20] + | | | | | | | |--GENERIC_START -> < [44:20] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [44:21] + | | | | | | | | |--IDENT -> Box [44:21] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [44:24] + | | | | | | | | |--GENERIC_START -> < [44:24] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [44:25] + | | | | | | | | | `--IDENT -> String [44:25] + | | | | | | | | `--GENERIC_END -> > [44:31] + | | | | | | | `--GENERIC_END -> > [44:32] + | | | | | | |--LPAREN -> ( [44:33] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [44:34] + | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [44:34] + | | | | | | | |--MODIFIERS -> MODIFIERS [44:34] + | | | | | | | |--TYPE -> TYPE [44:34] + | | | | | | | | |--IDENT -> Box [44:34] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [44:37] + | | | | | | | | |--GENERIC_START -> < [44:37] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [44:38] + | | | | | | | | | `--IDENT -> String [44:38] + | | | | | | | | `--GENERIC_END -> > [44:44] + | | | | | | | |--LPAREN -> ( [44:45] + | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [44:46] + | | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [44:46] + | | | | | | | | |--MODIFIERS -> MODIFIERS [44:46] + | | | | | | | | |--TYPE -> TYPE [44:46] + | | | | | | | | | `--IDENT -> String [44:46] + | | | | | | | | `--IDENT -> s [44:53] + | | | | | | | |--RPAREN -> ) [44:54] + | | | | | | | `--IDENT -> box [44:55] + | | | | | | `--RPAREN -> ) [44:58] + | | | | | `--LOR -> || [46:24] + | | | | | |--LAND -> && [45:42] + | | | | | | |--METHOD_CALL -> ( [45:38] + | | | | | | | |--DOT -> . [45:31] + | | | | | | | | |--STRING_LITERAL -> "test" [45:25] + | | | | | | | | `--IDENT -> equals [45:32] + | | | | | | | |--ELIST -> ELIST [45:39] + | | | | | | | | `--EXPR -> EXPR [45:39] + | | | | | | | | `--IDENT -> s [45:39] + | | | | | | | `--RPAREN -> ) [45:40] + | | | | | | `--METHOD_CALL -> ( [45:59] + | | | | | | |--DOT -> . [45:52] + | | | | | | | |--IDENT -> Objects [45:45] + | | | | | | | `--IDENT -> equals [45:53] + | | | | | | |--ELIST -> ELIST [45:63] + | | | | | | | |--EXPR -> EXPR [45:63] + | | | | | | | | `--DOT -> . [45:63] + | | | | | | | | |--IDENT -> box [45:60] + | | | | | | | | `--IDENT -> v [45:64] + | | | | | | | |--COMMA -> , [45:65] + | | | | | | | `--EXPR -> EXPR [45:67] + | | | | | | | `--STRING_LITERAL -> "box" [45:67] + | | | | | | `--RPAREN -> ) [45:72] + | | | | | `--METHOD_CALL -> ( [46:50] + | | | | | |--DOT -> . [46:43] + | | | | | | |--STRING_LITERAL -> "something else" [46:27] + | | | | | | `--IDENT -> equals [46:44] + | | | | | |--ELIST -> ELIST [46:51] + | | | | | | `--EXPR -> EXPR [46:51] + | | | | | | `--IDENT -> s [46:51] + | | | | | `--RPAREN -> ) [46:52] + | | | | |--LAMBDA -> -> [46:54] + | | | | |--EXPR -> EXPR [46:57] + | | | | | `--NUM_INT -> 1 [46:57] + | | | | `--SEMI -> ; [46:58] + | | | |--SWITCH_RULE -> SWITCH_RULE [47:12] + | | | | |--LITERAL_CASE -> case [47:12] + | | | | | `--PATTERN_DEF -> PATTERN_DEF [48:20] + | | | | | `--LITERAL_WHEN -> when [48:20] + | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [47:17] + | | | | | | |--MODIFIERS -> MODIFIERS [47:17] + | | | | | | |--TYPE -> TYPE [47:17] + | | | | | | | |--IDENT -> Box [47:17] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [47:20] + | | | | | | | |--GENERIC_START -> < [47:20] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [47:21] + | | | | | | | | |--IDENT -> Box [47:21] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [47:24] + | | | | | | | | |--GENERIC_START -> < [47:24] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [47:25] + | | | | | | | | | `--IDENT -> String [47:25] + | | | | | | | | `--GENERIC_END -> > [47:31] + | | | | | | | `--GENERIC_END -> > [47:32] + | | | | | | |--LPAREN -> ( [47:33] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [47:34] + | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [47:34] + | | | | | | | |--MODIFIERS -> MODIFIERS [47:34] + | | | | | | | |--TYPE -> TYPE [47:34] + | | | | | | | | |--IDENT -> Box [47:34] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [47:37] + | | | | | | | | |--GENERIC_START -> < [47:37] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [47:38] + | | | | | | | | | `--IDENT -> String [47:38] + | | | | | | | | `--GENERIC_END -> > [47:44] + | | | | | | | |--LPAREN -> ( [47:45] + | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [47:46] + | | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [47:46] + | | | | | | | | |--MODIFIERS -> MODIFIERS [47:46] + | | | | | | | | |--TYPE -> TYPE [47:46] + | | | | | | | | | `--IDENT -> String [47:46] + | | | | | | | | `--IDENT -> s [47:53] + | | | | | | | `--RPAREN -> ) [47:54] + | | | | | | `--RPAREN -> ) [47:55] + | | | | | `--METHOD_CALL -> ( [48:38] + | | | | | |--DOT -> . [48:31] + | | | | | | |--STRING_LITERAL -> "test" [48:25] + | | | | | | `--IDENT -> equals [48:32] + | | | | | |--ELIST -> ELIST [48:39] + | | | | | | `--EXPR -> EXPR [48:39] + | | | | | | `--IDENT -> s [48:39] + | | | | | `--RPAREN -> ) [48:40] + | | | | |--LAMBDA -> -> [48:42] + | | | | |--EXPR -> EXPR [48:45] + | | | | | `--NUM_INT -> 1 [48:45] + | | | | `--SEMI -> ; [48:46] + | | | |--SWITCH_RULE -> SWITCH_RULE [49:12] + | | | | |--LITERAL_CASE -> case [49:12] + | | | | | `--PATTERN_DEF -> PATTERN_DEF [50:20] + | | | | | `--LITERAL_WHEN -> when [50:20] + | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [49:17] + | | | | | | |--MODIFIERS -> MODIFIERS [49:17] + | | | | | | |--TYPE -> TYPE [49:17] + | | | | | | | |--IDENT -> Box [49:17] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [49:20] + | | | | | | | |--GENERIC_START -> < [49:20] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [49:21] + | | | | | | | | |--IDENT -> Box [49:21] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [49:24] + | | | | | | | | |--GENERIC_START -> < [49:24] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [49:25] + | | | | | | | | | `--IDENT -> String [49:25] + | | | | | | | | `--GENERIC_END -> > [49:31] + | | | | | | | `--GENERIC_END -> > [49:32] + | | | | | | |--LPAREN -> ( [49:33] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [49:34] + | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [49:34] + | | | | | | | |--MODIFIERS -> MODIFIERS [49:34] + | | | | | | | |--TYPE -> TYPE [49:34] + | | | | | | | | |--IDENT -> Box [49:34] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [49:37] + | | | | | | | | |--GENERIC_START -> < [49:37] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [49:38] + | | | | | | | | | `--WILDCARD_TYPE -> ? [49:38] + | | | | | | | | `--GENERIC_END -> > [49:39] + | | | | | | | `--IDENT -> b2 [49:41] + | | | | | | `--RPAREN -> ) [49:43] + | | | | | `--METHOD_CALL -> ( [50:38] + | | | | | |--DOT -> . [50:31] + | | | | | | |--STRING_LITERAL -> "test" [50:25] + | | | | | | `--IDENT -> equals [50:32] + | | | | | |--ELIST -> ELIST [50:41] + | | | | | | `--EXPR -> EXPR [50:41] + | | | | | | `--DOT -> . [50:41] + | | | | | | |--IDENT -> b2 [50:39] + | | | | | | `--IDENT -> v [50:42] + | | | | | `--RPAREN -> ) [50:43] + | | | | |--LAMBDA -> -> [50:45] + | | | | |--EXPR -> EXPR [50:48] + | | | | | `--NUM_INT -> 1 [50:48] + | | | | `--SEMI -> ; [50:49] + | | | |--SWITCH_RULE -> SWITCH_RULE [51:12] + | | | | |--LITERAL_CASE -> case [51:12] + | | | | | `--PATTERN_DEF -> PATTERN_DEF [52:20] + | | | | | `--LITERAL_WHEN -> when [52:20] + | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [51:17] + | | | | | | |--MODIFIERS -> MODIFIERS [51:17] + | | | | | | |--TYPE -> TYPE [51:17] + | | | | | | | |--IDENT -> Box [51:17] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [51:20] + | | | | | | | |--GENERIC_START -> < [51:20] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [51:21] + | | | | | | | | |--IDENT -> Box [51:21] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [51:24] + | | | | | | | | |--GENERIC_START -> < [51:24] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [51:25] + | | | | | | | | | `--IDENT -> String [51:25] + | | | | | | | | `--GENERIC_END -> > [51:31] + | | | | | | | `--GENERIC_END -> > [51:32] + | | | | | | |--LPAREN -> ( [51:33] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [51:34] + | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [51:34] + | | | | | | | |--MODIFIERS -> MODIFIERS [51:34] + | | | | | | | |--TYPE -> TYPE [51:34] + | | | | | | | | `--IDENT -> Object [51:34] + | | | | | | | `--IDENT -> o [51:41] + | | | | | | |--RPAREN -> ) [51:42] + | | | | | | `--IDENT -> b2 [51:44] + | | | | | `--LAND -> && [52:38] + | | | | | |--NOT_EQUAL -> != [52:30] + | | | | | | |--DOT -> . [52:27] + | | | | | | | |--IDENT -> b2 [52:25] + | | | | | | | `--IDENT -> v [52:28] + | | | | | | `--LITERAL_NULL -> null [52:33] + | | | | | `--METHOD_CALL -> ( [52:58] + | | | | | |--DOT -> . [52:51] + | | | | | | |--STRING_LITERAL -> "whatever" [52:41] + | | | | | | `--IDENT -> equals [52:52] + | | | | | |--ELIST -> ELIST [52:69] + | | | | | | `--EXPR -> EXPR [52:69] + | | | | | | `--METHOD_CALL -> ( [52:69] + | | | | | | |--DOT -> . [52:60] + | | | | | | | |--IDENT -> o [52:59] + | | | | | | | `--IDENT -> toString [52:61] + | | | | | | |--ELIST -> ELIST [52:70] + | | | | | | `--RPAREN -> ) [52:70] + | | | | | `--RPAREN -> ) [52:71] + | | | | |--LAMBDA -> -> [52:72] + | | | | |--EXPR -> EXPR [52:75] + | | | | | `--NUM_INT -> 1 [52:75] + | | | | `--SEMI -> ; [52:76] + | | | |--SWITCH_RULE -> SWITCH_RULE [53:12] + | | | | |--LITERAL_DEFAULT -> default [53:12] + | | | | |--LAMBDA -> -> [53:20] + | | | | |--EXPR -> EXPR [53:23] + | | | | | `--UNARY_MINUS -> - [53:23] + | | | | | `--NUM_INT -> 1 [53:24] + | | | | `--SEMI -> ; [53:25] + | | | `--RCURLY -> } [54:8] + | | `--SEMI -> ; [54:9] + | `--RCURLY -> } [55:4] + |--RECORD_DEF -> RECORD_DEF [57:4] + | |--MODIFIERS -> MODIFIERS [57:4] + | |--LITERAL_RECORD -> record [57:4] + | |--IDENT -> Box [57:11] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [57:14] + | | |--GENERIC_START -> < [57:14] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [57:15] + | | | `--IDENT -> V [57:15] + | | `--GENERIC_END -> > [57:16] + | |--LPAREN -> ( [57:17] + | |--RECORD_COMPONENTS -> RECORD_COMPONENTS [57:18] + | | `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [57:18] + | | |--ANNOTATIONS -> ANNOTATIONS [57:18] + | | |--TYPE -> TYPE [57:18] + | | | `--IDENT -> V [57:18] + | | `--IDENT -> v [57:20] + | |--RPAREN -> ) [57:21] + | `--OBJBLOCK -> OBJBLOCK [57:23] + | |--LCURLY -> { [57:23] + | |--VARIABLE_DEF -> VARIABLE_DEF [58:8] + | | |--MODIFIERS -> MODIFIERS [58:8] + | | | `--LITERAL_STATIC -> static [58:8] + | | |--TYPE -> TYPE [58:15] + | | | `--LITERAL_INT -> int [58:15] + | | |--IDENT -> x [58:19] + | | |--ASSIGN -> = [58:21] + | | | `--EXPR -> EXPR [58:23] + | | | `--NUM_INT -> 5 [58:23] + | | `--SEMI -> ; [58:24] + | `--RCURLY -> } [59:4] + `--RCURLY -> } [61:0] diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/ExpectedJava19BindingWithModifiers.txt b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/ExpectedJava19BindingWithModifiers.txt new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/ExpectedJava19BindingWithModifiers.txt @@ -0,0 +1,1176 @@ +COMPILATION_UNIT -> COMPILATION_UNIT [2:0] +|--PACKAGE_DEF -> package [2:0] +| |--ANNOTATIONS -> ANNOTATIONS [2:47] +| |--DOT -> . [2:47] +| | |--DOT -> . [2:39] +| | | |--DOT -> . [2:28] +| | | | |--DOT -> . [2:22] +| | | | | |--DOT -> . [2:11] +| | | | | | |--IDENT -> com [2:8] +| | | | | | `--IDENT -> puppycrawl [2:12] +| | | | | `--IDENT -> tools [2:23] +| | | | `--IDENT -> checkstyle [2:29] +| | | `--IDENT -> grammar [2:40] +| | `--IDENT -> java19 [2:48] +| `--SEMI -> ; [2:54] +`--CLASS_DEF -> CLASS_DEF [4:0] + |--MODIFIERS -> MODIFIERS [4:0] + | `--LITERAL_PUBLIC -> public [4:0] + |--LITERAL_CLASS -> class [4:7] + |--IDENT -> InputJava19BindingWithModifiers [4:13] + `--OBJBLOCK -> OBJBLOCK [4:45] + |--LCURLY -> { [4:45] + |--RECORD_DEF -> RECORD_DEF [5:4] + | |--MODIFIERS -> MODIFIERS [5:4] + | |--LITERAL_RECORD -> record [5:4] + | |--IDENT -> Box [5:11] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [5:14] + | | |--GENERIC_START -> < [5:14] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [5:15] + | | | `--IDENT -> T [5:15] + | | `--GENERIC_END -> > [5:16] + | |--LPAREN -> ( [5:17] + | |--RECORD_COMPONENTS -> RECORD_COMPONENTS [5:18] + | | `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [5:18] + | | |--ANNOTATIONS -> ANNOTATIONS [5:18] + | | |--TYPE -> TYPE [5:18] + | | | `--IDENT -> T [5:18] + | | `--IDENT -> t [5:20] + | |--RPAREN -> ) [5:21] + | `--OBJBLOCK -> OBJBLOCK [5:23] + | |--LCURLY -> { [5:23] + | `--RCURLY -> } [6:4] + |--CLASS_DEF -> CLASS_DEF [8:4] + | |--MODIFIERS -> MODIFIERS [8:4] + | |--LITERAL_CLASS -> class [8:4] + | |--IDENT -> A [8:10] + | `--OBJBLOCK -> OBJBLOCK [8:12] + | |--LCURLY -> { [8:12] + | `--RCURLY -> } [9:4] + |--CLASS_DEF -> CLASS_DEF [11:4] + | |--MODIFIERS -> MODIFIERS [11:4] + | |--LITERAL_CLASS -> class [11:4] + | |--IDENT -> B [11:10] + | |--EXTENDS_CLAUSE -> extends [11:12] + | | `--IDENT -> A [11:20] + | `--OBJBLOCK -> OBJBLOCK [11:22] + | |--LCURLY -> { [11:22] + | `--RCURLY -> } [12:4] + |--INTERFACE_DEF -> INTERFACE_DEF [14:4] + | |--MODIFIERS -> MODIFIERS [14:4] + | | `--LITERAL_SEALED -> sealed [14:4] + | |--LITERAL_INTERFACE -> interface [14:11] + | |--IDENT -> I [14:21] + | |--PERMITS_CLAUSE -> permits [14:23] + | | |--IDENT -> C [14:31] + | | |--COMMA -> , [14:32] + | | `--IDENT -> D [14:34] + | `--OBJBLOCK -> OBJBLOCK [14:36] + | |--LCURLY -> { [14:36] + | `--RCURLY -> } [15:4] + |--CLASS_DEF -> CLASS_DEF [17:4] + | |--MODIFIERS -> MODIFIERS [17:4] + | | `--FINAL -> final [17:4] + | |--LITERAL_CLASS -> class [17:10] + | |--IDENT -> C [17:16] + | |--IMPLEMENTS_CLAUSE -> implements [17:18] + | | `--IDENT -> I [17:29] + | `--OBJBLOCK -> OBJBLOCK [17:31] + | |--LCURLY -> { [17:31] + | `--RCURLY -> } [18:4] + |--CLASS_DEF -> CLASS_DEF [20:4] + | |--MODIFIERS -> MODIFIERS [20:4] + | | `--FINAL -> final [20:4] + | |--LITERAL_CLASS -> class [20:10] + | |--IDENT -> D [20:16] + | |--IMPLEMENTS_CLAUSE -> implements [20:18] + | | `--IDENT -> I [20:29] + | `--OBJBLOCK -> OBJBLOCK [20:31] + | |--LCURLY -> { [20:31] + | `--RCURLY -> } [21:4] + |--RECORD_DEF -> RECORD_DEF [23:4] + | |--MODIFIERS -> MODIFIERS [23:4] + | |--LITERAL_RECORD -> record [23:4] + | |--IDENT -> Pair [23:11] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [23:15] + | | |--GENERIC_START -> < [23:15] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [23:16] + | | | `--IDENT -> T [23:16] + | | `--GENERIC_END -> > [23:17] + | |--LPAREN -> ( [23:18] + | |--RECORD_COMPONENTS -> RECORD_COMPONENTS [23:19] + | | |--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [23:19] + | | | |--ANNOTATIONS -> ANNOTATIONS [23:19] + | | | |--TYPE -> TYPE [23:19] + | | | | `--IDENT -> T [23:19] + | | | `--IDENT -> x [23:21] + | | |--COMMA -> , [23:22] + | | `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [23:24] + | | |--ANNOTATIONS -> ANNOTATIONS [23:24] + | | |--TYPE -> TYPE [23:24] + | | | `--IDENT -> T [23:24] + | | `--IDENT -> y [23:26] + | |--RPAREN -> ) [23:27] + | `--OBJBLOCK -> OBJBLOCK [23:29] + | |--LCURLY -> { [23:29] + | `--RCURLY -> } [24:4] + |--ANNOTATION_DEF -> ANNOTATION_DEF [26:4] + | |--MODIFIERS -> MODIFIERS [26:4] + | |--AT -> @ [26:4] + | |--LITERAL_INTERFACE -> interface [26:5] + | |--IDENT -> MyAnno1 [26:15] + | `--OBJBLOCK -> OBJBLOCK [26:22] + | |--LCURLY -> { [26:22] + | `--RCURLY -> } [26:23] + |--ANNOTATION_DEF -> ANNOTATION_DEF [27:4] + | |--MODIFIERS -> MODIFIERS [27:4] + | |--AT -> @ [27:4] + | |--LITERAL_INTERFACE -> interface [27:5] + | |--IDENT -> MyAnno2 [27:15] + | `--OBJBLOCK -> OBJBLOCK [27:22] + | |--LCURLY -> { [27:22] + | `--RCURLY -> } [27:23] + |--ANNOTATION_DEF -> ANNOTATION_DEF [29:4] + | |--MODIFIERS -> MODIFIERS [29:4] + | |--AT -> @ [29:4] + | |--LITERAL_INTERFACE -> interface [29:5] + | |--IDENT -> MyAnno3 [29:15] + | `--OBJBLOCK -> OBJBLOCK [29:22] + | |--LCURLY -> { [29:22] + | |--ANNOTATION_FIELD_DEF -> ANNOTATION_FIELD_DEF [30:8] + | | |--MODIFIERS -> MODIFIERS [30:8] + | | |--TYPE -> TYPE [30:8] + | | | `--IDENT -> String [30:8] + | | |--IDENT -> value [30:15] + | | |--LPAREN -> ( [30:20] + | | |--RPAREN -> ) [30:21] + | | `--SEMI -> ; [30:22] + | |--ANNOTATION_FIELD_DEF -> ANNOTATION_FIELD_DEF [31:8] + | | |--MODIFIERS -> MODIFIERS [31:8] + | | |--TYPE -> TYPE [31:8] + | | | |--IDENT -> String [31:8] + | | | `--ARRAY_DECLARATOR -> [ [31:14] + | | | `--RBRACK -> ] [31:15] + | | |--IDENT -> values [31:17] + | | |--LPAREN -> ( [31:23] + | | |--RPAREN -> ) [31:24] + | | `--SEMI -> ; [31:25] + | `--RCURLY -> } [32:4] + |--RECORD_DEF -> RECORD_DEF [34:4] + | |--MODIFIERS -> MODIFIERS [34:4] + | |--LITERAL_RECORD -> record [34:4] + | |--IDENT -> Tuple [34:11] + | |--LPAREN -> ( [34:16] + | |--RECORD_COMPONENTS -> RECORD_COMPONENTS [34:17] + | | |--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [34:17] + | | | |--ANNOTATIONS -> ANNOTATIONS [34:17] + | | | |--TYPE -> TYPE [34:17] + | | | | `--IDENT -> Object [34:17] + | | | `--IDENT -> o1 [34:24] + | | |--COMMA -> , [34:26] + | | |--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [34:28] + | | | |--ANNOTATIONS -> ANNOTATIONS [34:28] + | | | |--TYPE -> TYPE [34:28] + | | | | `--IDENT -> Object [34:28] + | | | `--IDENT -> o2 [34:35] + | | |--COMMA -> , [34:37] + | | `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [34:39] + | | |--ANNOTATIONS -> ANNOTATIONS [34:39] + | | |--TYPE -> TYPE [34:39] + | | | `--IDENT -> Object [34:39] + | | `--IDENT -> o3 [34:46] + | |--RPAREN -> ) [34:48] + | `--OBJBLOCK -> OBJBLOCK [34:50] + | |--LCURLY -> { [34:50] + | `--RCURLY -> } [34:51] + |--RECORD_DEF -> RECORD_DEF [35:4] + | |--MODIFIERS -> MODIFIERS [35:4] + | |--LITERAL_RECORD -> record [35:4] + | |--IDENT -> VarArgs [35:11] + | |--LPAREN -> ( [35:18] + | |--RECORD_COMPONENTS -> RECORD_COMPONENTS [35:19] + | | `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [35:19] + | | |--ANNOTATIONS -> ANNOTATIONS [35:19] + | | |--TYPE -> TYPE [35:19] + | | | `--IDENT -> Object [35:19] + | | |--ELLIPSIS -> ... [35:25] + | | `--IDENT -> objArgs [35:29] + | |--RPAREN -> ) [35:36] + | `--OBJBLOCK -> OBJBLOCK [35:37] + | |--LCURLY -> { [35:37] + | `--RCURLY -> } [35:38] + |--METHOD_DEF -> METHOD_DEF [38:4] + | |--MODIFIERS -> MODIFIERS [38:4] + | | `--LITERAL_STATIC -> static [38:4] + | |--TYPE -> TYPE [38:11] + | | `--LITERAL_VOID -> void [38:11] + | |--IDENT -> test1 [38:16] + | |--LPAREN -> ( [38:21] + | |--PARAMETERS -> PARAMETERS [38:22] + | | `--PARAMETER_DEF -> PARAMETER_DEF [38:22] + | | |--MODIFIERS -> MODIFIERS [38:22] + | | |--TYPE -> TYPE [38:22] + | | | |--IDENT -> Box [38:22] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [38:25] + | | | |--GENERIC_START -> < [38:25] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [38:26] + | | | | `--IDENT -> Object [38:26] + | | | `--GENERIC_END -> > [38:32] + | | `--IDENT -> bo [38:34] + | |--RPAREN -> ) [38:36] + | `--SLIST -> { [38:38] + | |--LITERAL_IF -> if [39:8] + | | |--LPAREN -> ( [39:11] + | | |--EXPR -> EXPR [39:15] + | | | `--LITERAL_INSTANCEOF -> instanceof [39:15] + | | | |--IDENT -> bo [39:12] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [39:26] + | | | |--MODIFIERS -> MODIFIERS [39:26] + | | | | |--ANNOTATION -> ANNOTATION [39:26] + | | | | | |--AT -> @ [39:26] + | | | | | `--IDENT -> MyAnno1 [39:27] + | | | | `--ANNOTATION -> ANNOTATION [39:35] + | | | | |--AT -> @ [39:35] + | | | | `--IDENT -> MyAnno2 [39:36] + | | | |--TYPE -> TYPE [39:44] + | | | | |--IDENT -> Box [39:44] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [39:47] + | | | | |--GENERIC_START -> < [39:47] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [39:48] + | | | | | `--IDENT -> Object [39:48] + | | | | `--GENERIC_END -> > [39:54] + | | | |--LPAREN -> ( [39:55] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [39:56] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [39:56] + | | | | |--MODIFIERS -> MODIFIERS [39:56] + | | | | |--TYPE -> TYPE [39:56] + | | | | | `--IDENT -> String [39:56] + | | | | `--IDENT -> s [39:63] + | | | `--RPAREN -> ) [39:64] + | | |--RPAREN -> ) [39:65] + | | `--SLIST -> { [39:67] + | | |--EXPR -> EXPR [40:30] + | | | `--METHOD_CALL -> ( [40:30] + | | | |--DOT -> . [40:22] + | | | | |--DOT -> . [40:18] + | | | | | |--IDENT -> System [40:12] + | | | | | `--IDENT -> out [40:19] + | | | | `--IDENT -> println [40:23] + | | | |--ELIST -> ELIST [40:41] + | | | | `--EXPR -> EXPR [40:41] + | | | | `--PLUS -> + [40:41] + | | | | |--STRING_LITERAL -> "String " [40:31] + | | | | `--IDENT -> s [40:43] + | | | `--RPAREN -> ) [40:44] + | | |--SEMI -> ; [40:45] + | | `--RCURLY -> } [41:8] + | `--RCURLY -> } [42:4] + |--METHOD_DEF -> METHOD_DEF [44:4] + | |--MODIFIERS -> MODIFIERS [44:4] + | | `--LITERAL_STATIC -> static [44:4] + | |--TYPE -> TYPE [44:11] + | | `--LITERAL_VOID -> void [44:11] + | |--IDENT -> test2 [44:16] + | |--LPAREN -> ( [44:21] + | |--PARAMETERS -> PARAMETERS [44:22] + | | `--PARAMETER_DEF -> PARAMETER_DEF [44:22] + | | |--MODIFIERS -> MODIFIERS [44:22] + | | |--TYPE -> TYPE [44:22] + | | | |--IDENT -> Box [44:22] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [44:25] + | | | |--GENERIC_START -> < [44:25] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [44:26] + | | | | `--IDENT -> Object [44:26] + | | | `--GENERIC_END -> > [44:32] + | | `--IDENT -> bo [44:34] + | |--RPAREN -> ) [44:36] + | `--SLIST -> { [44:38] + | |--LITERAL_IF -> if [45:8] + | | |--LPAREN -> ( [45:11] + | | |--EXPR -> EXPR [45:15] + | | | `--LITERAL_INSTANCEOF -> instanceof [45:15] + | | | |--IDENT -> bo [45:12] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [45:26] + | | | |--MODIFIERS -> MODIFIERS [45:26] + | | | | |--ANNOTATION -> ANNOTATION [45:26] + | | | | | |--AT -> @ [45:26] + | | | | | `--IDENT -> MyAnno2 [45:27] + | | | | |--FINAL -> final [45:35] + | | | | `--ANNOTATION -> ANNOTATION [45:41] + | | | | |--AT -> @ [45:41] + | | | | `--IDENT -> MyAnno1 [45:42] + | | | |--TYPE -> TYPE [45:50] + | | | | |--IDENT -> Box [45:50] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [45:53] + | | | | |--GENERIC_START -> < [45:53] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [45:54] + | | | | | `--WILDCARD_TYPE -> ? [45:54] + | | | | `--GENERIC_END -> > [45:55] + | | | |--LPAREN -> ( [45:56] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [45:57] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [45:57] + | | | | |--MODIFIERS -> MODIFIERS [45:57] + | | | | |--TYPE -> TYPE [45:57] + | | | | | `--IDENT -> var [45:57] + | | | | `--IDENT -> s [45:61] + | | | `--RPAREN -> ) [45:62] + | | |--RPAREN -> ) [45:63] + | | `--SLIST -> { [45:65] + | | |--EXPR -> EXPR [46:30] + | | | `--METHOD_CALL -> ( [46:30] + | | | |--DOT -> . [46:22] + | | | | |--DOT -> . [46:18] + | | | | | |--IDENT -> System [46:12] + | | | | | `--IDENT -> out [46:19] + | | | | `--IDENT -> println [46:23] + | | | |--ELIST -> ELIST [46:41] + | | | | `--EXPR -> EXPR [46:41] + | | | | `--PLUS -> + [46:41] + | | | | |--STRING_LITERAL -> "String " [46:31] + | | | | `--IDENT -> s [46:43] + | | | `--RPAREN -> ) [46:44] + | | |--SEMI -> ; [46:45] + | | `--RCURLY -> } [47:8] + | `--RCURLY -> } [48:4] + |--METHOD_DEF -> METHOD_DEF [50:4] + | |--MODIFIERS -> MODIFIERS [50:4] + | |--TYPE -> TYPE [50:4] + | | `--LITERAL_VOID -> void [50:4] + | |--IDENT -> test3 [50:9] + | |--LPAREN -> ( [50:14] + | |--PARAMETERS -> PARAMETERS [50:15] + | | `--PARAMETER_DEF -> PARAMETER_DEF [50:15] + | | |--MODIFIERS -> MODIFIERS [50:15] + | | |--TYPE -> TYPE [50:15] + | | | |--IDENT -> Box [50:15] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [50:18] + | | | |--GENERIC_START -> < [50:18] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [50:19] + | | | | `--IDENT -> I [50:19] + | | | `--GENERIC_END -> > [50:20] + | | `--IDENT -> bo [50:22] + | |--RPAREN -> ) [50:24] + | `--SLIST -> { [50:26] + | |--VARIABLE_DEF -> VARIABLE_DEF [51:8] + | | |--MODIFIERS -> MODIFIERS [51:8] + | | |--TYPE -> TYPE [51:8] + | | | `--IDENT -> C [51:8] + | | |--IDENT -> c [51:10] + | | `--ASSIGN -> = [51:12] + | | `--EXPR -> EXPR [51:14] + | | `--LITERAL_NEW -> new [51:14] + | | |--IDENT -> C [51:18] + | | |--LPAREN -> ( [51:19] + | | |--ELIST -> ELIST [51:20] + | | `--RPAREN -> ) [51:20] + | |--SEMI -> ; [51:21] + | |--LITERAL_IF -> if [52:8] + | | |--LPAREN -> ( [52:11] + | | |--EXPR -> EXPR [52:15] + | | | `--LITERAL_INSTANCEOF -> instanceof [52:15] + | | | |--IDENT -> bo [52:12] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [52:26] + | | | |--MODIFIERS -> MODIFIERS [52:26] + | | | | `--ANNOTATION -> ANNOTATION [52:26] + | | | | |--AT -> @ [52:26] + | | | | `--IDENT -> MyAnno1 [52:27] + | | | |--TYPE -> TYPE [52:35] + | | | | |--IDENT -> Box [52:35] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [52:38] + | | | | |--GENERIC_START -> < [52:38] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [52:39] + | | | | | `--IDENT -> I [52:39] + | | | | `--GENERIC_END -> > [52:40] + | | | |--LPAREN -> ( [52:41] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [52:42] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [52:42] + | | | | |--MODIFIERS -> MODIFIERS [52:42] + | | | | |--TYPE -> TYPE [52:42] + | | | | | `--IDENT -> var [52:42] + | | | | `--IDENT -> s [52:46] + | | | `--RPAREN -> ) [52:47] + | | |--RPAREN -> ) [52:48] + | | |--SLIST -> { [52:50] + | | | |--EXPR -> EXPR [53:30] + | | | | `--METHOD_CALL -> ( [53:30] + | | | | |--DOT -> . [53:22] + | | | | | |--DOT -> . [53:18] + | | | | | | |--IDENT -> System [53:12] + | | | | | | `--IDENT -> out [53:19] + | | | | | `--IDENT -> println [53:23] + | | | | |--ELIST -> ELIST [53:41] + | | | | | `--EXPR -> EXPR [53:41] + | | | | | `--PLUS -> + [53:41] + | | | | | |--STRING_LITERAL -> "String " [53:31] + | | | | | `--IDENT -> s [53:43] + | | | | `--RPAREN -> ) [53:44] + | | | |--SEMI -> ; [53:45] + | | | `--RCURLY -> } [54:8] + | | `--LITERAL_ELSE -> else [55:8] + | | `--LITERAL_IF -> if [55:13] + | | |--LPAREN -> ( [55:16] + | | |--EXPR -> EXPR [55:20] + | | | `--LITERAL_INSTANCEOF -> instanceof [55:20] + | | | |--IDENT -> bo [55:17] + | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [55:31] + | | | |--MODIFIERS -> MODIFIERS [55:31] + | | | |--TYPE -> TYPE [55:31] + | | | | `--IDENT -> Box [55:31] + | | | `--IDENT -> b [55:35] + | | |--RPAREN -> ) [55:36] + | | |--SLIST -> { [55:38] + | | | `--RCURLY -> } [57:8] + | | `--LITERAL_ELSE -> else [58:8] + | | `--LITERAL_IF -> if [58:13] + | | |--LPAREN -> ( [58:16] + | | |--EXPR -> EXPR [58:40] + | | | `--LAND -> && [58:40] + | | | |--LITERAL_INSTANCEOF -> instanceof [58:20] + | | | | |--IDENT -> bo [58:17] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [58:31] + | | | | |--MODIFIERS -> MODIFIERS [58:31] + | | | | |--TYPE -> TYPE [58:31] + | | | | | |--IDENT -> Box [58:31] + | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [58:34] + | | | | | |--GENERIC_START -> < [58:34] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [58:35] + | | | | | | `--IDENT -> I [58:35] + | | | | | `--GENERIC_END -> > [58:36] + | | | | `--IDENT -> b [58:38] + | | | `--METHOD_CALL -> ( [58:54] + | | | |--DOT -> . [58:47] + | | | | |--DOT -> . [58:45] + | | | | | |--IDENT -> bo [58:43] + | | | | | `--IDENT -> t [58:46] + | | | | `--IDENT -> equals [58:48] + | | | |--ELIST -> ELIST [58:55] + | | | | `--EXPR -> EXPR [58:55] + | | | | `--IDENT -> c [58:55] + | | | `--RPAREN -> ) [58:56] + | | |--RPAREN -> ) [58:57] + | | |--SLIST -> { [58:59] + | | | `--RCURLY -> } [60:8] + | | `--LITERAL_ELSE -> else [61:8] + | | `--LITERAL_IF -> if [61:13] + | | |--LPAREN -> ( [61:16] + | | |--EXPR -> EXPR [61:28] + | | | `--LAND -> && [61:28] + | | | |--NOT_EQUAL -> != [61:20] + | | | | |--IDENT -> bo [61:17] + | | | | `--LITERAL_NULL -> null [61:23] + | | | `--METHOD_CALL -> ( [61:42] + | | | |--DOT -> . [61:35] + | | | | |--DOT -> . [61:33] + | | | | | |--IDENT -> bo [61:31] + | | | | | `--IDENT -> t [61:34] + | | | | `--IDENT -> equals [61:36] + | | | |--ELIST -> ELIST [61:43] + | | | | `--EXPR -> EXPR [61:43] + | | | | `--IDENT -> c [61:43] + | | | `--RPAREN -> ) [61:44] + | | |--RPAREN -> ) [61:45] + | | `--SLIST -> { [61:47] + | | `--RCURLY -> } [63:8] + | `--RCURLY -> } [64:4] + |--METHOD_DEF -> METHOD_DEF [66:4] + | |--MODIFIERS -> MODIFIERS [66:4] + | | `--LITERAL_STATIC -> static [66:4] + | |--TYPE -> TYPE [66:11] + | | `--LITERAL_VOID -> void [66:11] + | |--IDENT -> test4 [66:16] + | |--LPAREN -> ( [66:21] + | |--PARAMETERS -> PARAMETERS [66:22] + | | `--PARAMETER_DEF -> PARAMETER_DEF [66:22] + | | |--MODIFIERS -> MODIFIERS [66:22] + | | |--TYPE -> TYPE [66:22] + | | | |--IDENT -> Pair [66:22] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [66:26] + | | | |--GENERIC_START -> < [66:26] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [66:27] + | | | | `--IDENT -> I [66:27] + | | | `--GENERIC_END -> > [66:28] + | | `--IDENT -> p [66:30] + | |--RPAREN -> ) [66:31] + | `--SLIST -> { [66:33] + | |--LITERAL_IF -> if [67:8] + | | |--LPAREN -> ( [67:11] + | | |--EXPR -> EXPR [67:14] + | | | `--LITERAL_INSTANCEOF -> instanceof [67:14] + | | | |--IDENT -> p [67:12] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [67:25] + | | | |--MODIFIERS -> MODIFIERS [67:25] + | | | | `--FINAL -> final [67:25] + | | | |--TYPE -> TYPE [67:31] + | | | | |--IDENT -> Pair [67:31] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [67:35] + | | | | |--GENERIC_START -> < [67:35] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [67:36] + | | | | | `--IDENT -> I [67:36] + | | | | `--GENERIC_END -> > [67:37] + | | | |--LPAREN -> ( [67:38] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [67:39] + | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [67:39] + | | | | | |--MODIFIERS -> MODIFIERS [67:39] + | | | | | |--TYPE -> TYPE [67:39] + | | | | | | `--IDENT -> C [67:39] + | | | | | `--IDENT -> t1 [67:41] + | | | | |--COMMA -> , [67:43] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [67:45] + | | | | |--MODIFIERS -> MODIFIERS [67:45] + | | | | |--TYPE -> TYPE [67:45] + | | | | | `--IDENT -> C [67:45] + | | | | `--IDENT -> t2 [67:47] + | | | `--RPAREN -> ) [67:49] + | | |--RPAREN -> ) [67:50] + | | |--SLIST -> { [67:52] + | | | |--EXPR -> EXPR [68:30] + | | | | `--METHOD_CALL -> ( [68:30] + | | | | |--DOT -> . [68:22] + | | | | | |--DOT -> . [68:18] + | | | | | | |--IDENT -> System [68:12] + | | | | | | `--IDENT -> out [68:19] + | | | | | `--IDENT -> println [68:23] + | | | | |--ELIST -> ELIST [68:31] + | | | | | `--EXPR -> EXPR [68:31] + | | | | | `--IDENT -> t2 [68:31] + | | | | `--RPAREN -> ) [68:33] + | | | |--SEMI -> ; [68:34] + | | | `--RCURLY -> } [69:8] + | | `--LITERAL_ELSE -> else [70:8] + | | `--LITERAL_IF -> if [70:13] + | | |--LPAREN -> ( [70:16] + | | |--EXPR -> EXPR [70:19] + | | | `--LITERAL_INSTANCEOF -> instanceof [70:19] + | | | |--IDENT -> p [70:17] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [70:30] + | | | |--MODIFIERS -> MODIFIERS [70:30] + | | | | |--ANNOTATION -> ANNOTATION [70:30] + | | | | | |--AT -> @ [70:30] + | | | | | `--IDENT -> MyAnno2 [70:31] + | | | | `--FINAL -> final [70:39] + | | | |--TYPE -> TYPE [70:45] + | | | | |--IDENT -> Pair [70:45] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [70:49] + | | | | |--GENERIC_START -> < [70:49] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [70:50] + | | | | | `--IDENT -> I [70:50] + | | | | `--GENERIC_END -> > [70:51] + | | | |--LPAREN -> ( [70:52] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [70:53] + | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [70:53] + | | | | | |--MODIFIERS -> MODIFIERS [70:53] + | | | | | |--TYPE -> TYPE [70:53] + | | | | | | `--IDENT -> D [70:53] + | | | | | `--IDENT -> t1 [70:55] + | | | | |--COMMA -> , [70:57] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [70:59] + | | | | |--MODIFIERS -> MODIFIERS [70:59] + | | | | |--TYPE -> TYPE [70:59] + | | | | | `--IDENT -> D [70:59] + | | | | `--IDENT -> t2 [70:61] + | | | `--RPAREN -> ) [70:63] + | | |--RPAREN -> ) [70:64] + | | `--SLIST -> { [70:66] + | | |--EXPR -> EXPR [71:30] + | | | `--METHOD_CALL -> ( [71:30] + | | | |--DOT -> . [71:22] + | | | | |--DOT -> . [71:18] + | | | | | |--IDENT -> System [71:12] + | | | | | `--IDENT -> out [71:19] + | | | | `--IDENT -> println [71:23] + | | | |--ELIST -> ELIST [71:31] + | | | | `--EXPR -> EXPR [71:31] + | | | | `--IDENT -> t1 [71:31] + | | | `--RPAREN -> ) [71:33] + | | |--SEMI -> ; [71:34] + | | `--RCURLY -> } [72:8] + | `--RCURLY -> } [73:4] + |--METHOD_DEF -> METHOD_DEF [75:4] + | |--MODIFIERS -> MODIFIERS [75:4] + | | `--LITERAL_STATIC -> static [75:4] + | |--TYPE -> TYPE [75:11] + | | `--LITERAL_VOID -> void [75:11] + | |--IDENT -> test5 [75:16] + | |--LPAREN -> ( [75:21] + | |--PARAMETERS -> PARAMETERS [75:22] + | | `--PARAMETER_DEF -> PARAMETER_DEF [75:22] + | | |--MODIFIERS -> MODIFIERS [75:22] + | | |--TYPE -> TYPE [75:22] + | | | `--IDENT -> Tuple [75:22] + | | `--IDENT -> t [75:28] + | |--RPAREN -> ) [75:29] + | `--SLIST -> { [75:31] + | |--LITERAL_IF -> if [76:8] + | | |--LPAREN -> ( [76:11] + | | |--EXPR -> EXPR [76:14] + | | | `--LITERAL_INSTANCEOF -> instanceof [76:14] + | | | |--IDENT -> t [76:12] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [76:25] + | | | |--MODIFIERS -> MODIFIERS [76:25] + | | | |--TYPE -> TYPE [76:25] + | | | | `--IDENT -> Tuple [76:25] + | | | |--LPAREN -> ( [76:30] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [76:31] + | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [76:31] + | | | | | |--MODIFIERS -> MODIFIERS [76:31] + | | | | | |--TYPE -> TYPE [76:31] + | | | | | | `--IDENT -> String [76:31] + | | | | | `--IDENT -> x [76:38] + | | | | |--COMMA -> , [76:39] + | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [76:41] + | | | | | |--MODIFIERS -> MODIFIERS [76:41] + | | | | | |--TYPE -> TYPE [76:41] + | | | | | | `--IDENT -> String [76:41] + | | | | | `--IDENT -> y [76:48] + | | | | |--COMMA -> , [76:49] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [76:51] + | | | | |--MODIFIERS -> MODIFIERS [76:51] + | | | | |--TYPE -> TYPE [76:51] + | | | | | `--IDENT -> String [76:51] + | | | | `--IDENT -> z [76:58] + | | | `--RPAREN -> ) [76:59] + | | |--RPAREN -> ) [76:60] + | | |--SLIST -> { [76:62] + | | | |--EXPR -> EXPR [77:30] + | | | | `--METHOD_CALL -> ( [77:30] + | | | | |--DOT -> . [77:22] + | | | | | |--DOT -> . [77:18] + | | | | | | |--IDENT -> System [77:12] + | | | | | | `--IDENT -> out [77:19] + | | | | | `--IDENT -> println [77:23] + | | | | |--ELIST -> ELIST [77:37] + | | | | | `--EXPR -> EXPR [77:37] + | | | | | `--PLUS -> + [77:37] + | | | | | |--PLUS -> + [77:33] + | | | | | | |--IDENT -> x [77:31] + | | | | | | `--IDENT -> y [77:35] + | | | | | `--IDENT -> z [77:39] + | | | | `--RPAREN -> ) [77:40] + | | | |--SEMI -> ; [77:41] + | | | `--RCURLY -> } [78:8] + | | `--LITERAL_ELSE -> else [79:8] + | | `--LITERAL_IF -> if [79:13] + | | |--LPAREN -> ( [79:16] + | | |--EXPR -> EXPR [79:19] + | | | `--LITERAL_INSTANCEOF -> instanceof [79:19] + | | | |--IDENT -> t [79:17] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [79:30] + | | | |--MODIFIERS -> MODIFIERS [79:30] + | | | | `--FINAL -> final [79:30] + | | | |--TYPE -> TYPE [79:36] + | | | | `--IDENT -> Tuple [79:36] + | | | |--LPAREN -> ( [79:41] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [80:16] + | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [80:16] + | | | | | |--MODIFIERS -> MODIFIERS [80:16] + | | | | | | `--FINAL -> final [80:16] + | | | | | |--TYPE -> TYPE [80:22] + | | | | | | `--IDENT -> Integer [80:22] + | | | | | `--IDENT -> x [80:30] + | | | | |--COMMA -> , [80:31] + | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [81:16] + | | | | | |--MODIFIERS -> MODIFIERS [81:16] + | | | | | | `--ANNOTATION -> ANNOTATION [81:16] + | | | | | | |--AT -> @ [81:16] + | | | | | | `--IDENT -> MyAnno1 [81:17] + | | | | | |--TYPE -> TYPE [81:25] + | | | | | | `--IDENT -> Integer [81:25] + | | | | | `--IDENT -> y [81:33] + | | | | |--COMMA -> , [81:34] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [82:16] + | | | | |--MODIFIERS -> MODIFIERS [82:16] + | | | | | |--FINAL -> final [82:16] + | | | | | |--ANNOTATION -> ANNOTATION [82:22] + | | | | | | |--AT -> @ [82:22] + | | | | | | `--IDENT -> MyAnno1 [82:23] + | | | | | `--ANNOTATION -> ANNOTATION [82:31] + | | | | | |--AT -> @ [82:31] + | | | | | `--IDENT -> MyAnno2 [82:32] + | | | | |--TYPE -> TYPE [82:40] + | | | | | `--IDENT -> Integer [82:40] + | | | | `--IDENT -> z [82:48] + | | | `--RPAREN -> ) [82:49] + | | |--RPAREN -> ) [82:50] + | | `--SLIST -> { [82:52] + | | |--EXPR -> EXPR [83:30] + | | | `--METHOD_CALL -> ( [83:30] + | | | |--DOT -> . [83:22] + | | | | |--DOT -> . [83:18] + | | | | | |--IDENT -> System [83:12] + | | | | | `--IDENT -> out [83:19] + | | | | `--IDENT -> println [83:23] + | | | |--ELIST -> ELIST [83:37] + | | | | `--EXPR -> EXPR [83:37] + | | | | `--PLUS -> + [83:37] + | | | | |--PLUS -> + [83:33] + | | | | | |--IDENT -> x [83:31] + | | | | | `--IDENT -> y [83:35] + | | | | `--IDENT -> z [83:39] + | | | `--RPAREN -> ) [83:40] + | | |--SEMI -> ; [83:41] + | | `--RCURLY -> } [84:8] + | `--RCURLY -> } [85:4] + |--METHOD_DEF -> METHOD_DEF [87:4] + | |--MODIFIERS -> MODIFIERS [87:4] + | |--TYPE -> TYPE [87:4] + | | `--IDENT -> String [87:4] + | |--IDENT -> m2 [87:11] + | |--LPAREN -> ( [87:13] + | |--PARAMETERS -> PARAMETERS [87:14] + | | `--PARAMETER_DEF -> PARAMETER_DEF [87:14] + | | |--MODIFIERS -> MODIFIERS [87:14] + | | |--TYPE -> TYPE [87:14] + | | | |--IDENT -> Pair [87:14] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [87:18] + | | | |--GENERIC_START -> < [87:18] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [87:19] + | | | | `--IDENT -> I [87:19] + | | | `--GENERIC_END -> > [87:20] + | | `--IDENT -> p1 [87:22] + | |--RPAREN -> ) [87:24] + | `--SLIST -> { [87:26] + | |--LITERAL_RETURN -> return [88:8] + | | |--EXPR -> EXPR [88:15] + | | | `--LITERAL_SWITCH -> switch [88:15] + | | | |--LPAREN -> ( [88:22] + | | | |--EXPR -> EXPR [88:23] + | | | | `--IDENT -> p1 [88:23] + | | | |--RPAREN -> ) [88:25] + | | | |--LCURLY -> { [88:27] + | | | |--SWITCH_RULE -> SWITCH_RULE [89:12] + | | | | |--LITERAL_CASE -> case [89:12] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [89:17] + | | | | | |--MODIFIERS -> MODIFIERS [89:17] + | | | | | |--TYPE -> TYPE [89:17] + | | | | | | |--IDENT -> Pair [89:17] + | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [89:21] + | | | | | | |--GENERIC_START -> < [89:21] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [89:22] + | | | | | | | `--IDENT -> I [89:22] + | | | | | | `--GENERIC_END -> > [89:23] + | | | | | |--LPAREN -> ( [89:24] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [89:25] + | | | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [89:25] + | | | | | | | |--MODIFIERS -> MODIFIERS [89:25] + | | | | | | | | `--FINAL -> final [89:25] + | | | | | | | |--TYPE -> TYPE [89:31] + | | | | | | | | `--IDENT -> C [89:31] + | | | | | | | `--IDENT -> c [89:33] + | | | | | | |--COMMA -> , [89:34] + | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [89:35] + | | | | | | |--MODIFIERS -> MODIFIERS [89:35] + | | | | | | | `--ANNOTATION -> ANNOTATION [89:35] + | | | | | | | |--AT -> @ [89:35] + | | | | | | | `--IDENT -> MyAnno2 [89:36] + | | | | | | |--TYPE -> TYPE [89:44] + | | | | | | | `--IDENT -> I [89:44] + | | | | | | `--IDENT -> i [89:46] + | | | | | `--RPAREN -> ) [89:47] + | | | | |--LAMBDA -> -> [89:49] + | | | | |--EXPR -> EXPR [89:52] + | | | | | `--STRING_LITERAL -> "T!" [89:52] + | | | | `--SEMI -> ; [89:56] + | | | |--SWITCH_RULE -> SWITCH_RULE [90:12] + | | | | |--LITERAL_CASE -> case [90:12] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [90:17] + | | | | | |--MODIFIERS -> MODIFIERS [90:17] + | | | | | | `--FINAL -> final [90:17] + | | | | | |--TYPE -> TYPE [90:23] + | | | | | | |--IDENT -> Pair [90:23] + | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [90:27] + | | | | | | |--GENERIC_START -> < [90:27] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [90:28] + | | | | | | | `--IDENT -> I [90:28] + | | | | | | `--GENERIC_END -> > [90:29] + | | | | | |--LPAREN -> ( [90:30] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [91:20] + | | | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [91:20] + | | | | | | | |--MODIFIERS -> MODIFIERS [91:20] + | | | | | | | | |--FINAL -> final [91:20] + | | | | | | | | `--ANNOTATION -> ANNOTATION [91:26] + | | | | | | | | |--AT -> @ [91:26] + | | | | | | | | |--IDENT -> MyAnno3 [91:27] + | | | | | | | | |--LPAREN -> ( [91:34] + | | | | | | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [91:35] + | | | | | | | | | |--IDENT -> value [91:35] + | | | | | | | | | |--ASSIGN -> = [91:41] + | | | | | | | | | `--EXPR -> EXPR [91:43] + | | | | | | | | | `--STRING_LITERAL -> "some value" [91:43] + | | | | | | | | |--COMMA -> , [91:55] + | | | | | | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [91:57] + | | | | | | | | | |--IDENT -> values [91:57] + | | | | | | | | | |--ASSIGN -> = [91:64] + | | | | | | | | | `--ANNOTATION_ARRAY_INIT -> { [91:66] + | | | | | | | | | `--RCURLY -> } [91:67] + | | | | | | | | `--RPAREN -> ) [91:68] + | | | | | | | |--TYPE -> TYPE [91:70] + | | | | | | | | `--IDENT -> D [91:70] + | | | | | | | `--IDENT -> d [91:72] + | | | | | | |--COMMA -> , [91:73] + | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [92:20] + | | | | | | |--MODIFIERS -> MODIFIERS [92:20] + | | | | | | | `--FINAL -> final [92:20] + | | | | | | |--TYPE -> TYPE [92:26] + | | | | | | | `--IDENT -> C [92:26] + | | | | | | `--IDENT -> c [92:28] + | | | | | `--RPAREN -> ) [92:29] + | | | | |--LAMBDA -> -> [92:31] + | | | | |--EXPR -> EXPR [92:34] + | | | | | `--STRING_LITERAL -> "C!" [92:34] + | | | | `--SEMI -> ; [92:38] + | | | |--SWITCH_RULE -> SWITCH_RULE [93:12] + | | | | |--LITERAL_CASE -> case [93:12] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [93:17] + | | | | | |--MODIFIERS -> MODIFIERS [93:17] + | | | | | |--TYPE -> TYPE [93:17] + | | | | | | |--IDENT -> Pair [93:17] + | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [93:21] + | | | | | | |--GENERIC_START -> < [93:21] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [93:22] + | | | | | | | `--IDENT -> I [93:22] + | | | | | | `--GENERIC_END -> > [93:23] + | | | | | |--LPAREN -> ( [93:24] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [94:20] + | | | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [94:20] + | | | | | | | |--MODIFIERS -> MODIFIERS [94:20] + | | | | | | | | `--ANNOTATION -> ANNOTATION [94:20] + | | | | | | | | |--AT -> @ [94:20] + | | | | | | | | |--IDENT -> MyAnno3 [94:21] + | | | | | | | | |--LPAREN -> ( [94:28] + | | | | | | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [94:29] + | | | | | | | | | |--IDENT -> value [94:29] + | | | | | | | | | |--ASSIGN -> = [94:35] + | | | | | | | | | `--EXPR -> EXPR [94:37] + | | | | | | | | | `--STRING_LITERAL -> "val" [94:37] + | | | | | | | | |--COMMA -> , [94:42] + | | | | | | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [94:44] + | | | | | | | | | |--IDENT -> values [94:44] + | | | | | | | | | |--ASSIGN -> = [94:51] + | | | | | | | | | `--ANNOTATION_ARRAY_INIT -> { [94:53] + | | | | | | | | | |--EXPR -> EXPR [94:54] + | | | | | | | | | | `--STRING_LITERAL -> "1" [94:54] + | | | | | | | | | |--COMMA -> , [94:57] + | | | | | | | | | |--EXPR -> EXPR [94:59] + | | | | | | | | | | `--STRING_LITERAL -> "2" [94:59] + | | | | | | | | | `--RCURLY -> } [94:62] + | | | | | | | | `--RPAREN -> ) [94:63] + | | | | | | | |--TYPE -> TYPE [94:65] + | | | | | | | | `--IDENT -> D [94:65] + | | | | | | | `--IDENT -> d1 [94:67] + | | | | | | |--COMMA -> , [94:69] + | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [94:70] + | | | | | | |--MODIFIERS -> MODIFIERS [94:70] + | | | | | | |--TYPE -> TYPE [94:70] + | | | | | | | `--IDENT -> D [94:70] + | | | | | | `--IDENT -> d2 [94:72] + | | | | | `--RPAREN -> ) [94:74] + | | | | |--LAMBDA -> -> [94:76] + | | | | |--EXPR -> EXPR [94:79] + | | | | | `--STRING_LITERAL -> "D!" [94:79] + | | | | `--SEMI -> ; [94:83] + | | | `--RCURLY -> } [95:8] + | | `--SEMI -> ; [95:9] + | `--RCURLY -> } [96:4] + |--METHOD_DEF -> METHOD_DEF [98:4] + | |--MODIFIERS -> MODIFIERS [98:4] + | |--TYPE -> TYPE [98:4] + | | `--LITERAL_VOID -> void [98:4] + | |--IDENT -> m3 [98:9] + | |--LPAREN -> ( [98:12] + | |--PARAMETERS -> PARAMETERS [98:13] + | | `--PARAMETER_DEF -> PARAMETER_DEF [98:13] + | | |--MODIFIERS -> MODIFIERS [98:13] + | | |--TYPE -> TYPE [98:13] + | | | |--IDENT -> Pair [98:13] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [98:17] + | | | |--GENERIC_START -> < [98:17] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [98:18] + | | | | |--IDENT -> Pair [98:18] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [98:22] + | | | | |--GENERIC_START -> < [98:22] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [98:23] + | | | | | `--IDENT -> Integer [98:23] + | | | | `--GENERIC_END -> > [98:30] + | | | `--GENERIC_END -> > [98:31] + | | `--IDENT -> s [98:33] + | |--RPAREN -> ) [98:34] + | `--SLIST -> { [98:36] + | |--LITERAL_SWITCH -> switch [99:8] + | | |--LPAREN -> ( [99:15] + | | |--EXPR -> EXPR [99:16] + | | | `--IDENT -> s [99:16] + | | |--RPAREN -> ) [99:17] + | | |--LCURLY -> { [99:19] + | | |--SWITCH_RULE -> SWITCH_RULE [100:12] + | | | |--LITERAL_CASE -> case [100:12] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [100:17] + | | | | |--MODIFIERS -> MODIFIERS [100:17] + | | | | | `--FINAL -> final [100:17] + | | | | |--TYPE -> TYPE [100:23] + | | | | | |--IDENT -> Pair [100:23] + | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [100:27] + | | | | | |--GENERIC_START -> < [100:27] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [100:28] + | | | | | | |--IDENT -> Pair [100:28] + | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [100:32] + | | | | | | |--GENERIC_START -> < [100:32] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [100:33] + | | | | | | | `--IDENT -> Integer [100:33] + | | | | | | `--GENERIC_END -> > [100:40] + | | | | | `--GENERIC_END -> > [100:41] + | | | | |--LPAREN -> ( [100:42] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [101:20] + | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [101:20] + | | | | | | |--MODIFIERS -> MODIFIERS [101:20] + | | | | | | | `--ANNOTATION -> ANNOTATION [101:20] + | | | | | | | |--AT -> @ [101:20] + | | | | | | | `--IDENT -> MyAnno1 [101:21] + | | | | | | |--TYPE -> TYPE [101:29] + | | | | | | | |--IDENT -> Pair [101:29] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [101:33] + | | | | | | | |--GENERIC_START -> < [101:33] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [101:34] + | | | | | | | | `--IDENT -> Integer [101:34] + | | | | | | | `--GENERIC_END -> > [101:41] + | | | | | | |--LPAREN -> ( [101:42] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [101:43] + | | | | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [101:43] + | | | | | | | | |--MODIFIERS -> MODIFIERS [101:43] + | | | | | | | | | `--ANNOTATION -> ANNOTATION [101:43] + | | | | | | | | | |--AT -> @ [101:43] + | | | | | | | | | `--IDENT -> MyAnno1 [101:44] + | | | | | | | | |--TYPE -> TYPE [101:52] + | | | | | | | | | `--IDENT -> Integer [101:52] + | | | | | | | | `--IDENT -> x1 [101:60] + | | | | | | | |--COMMA -> , [101:62] + | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [101:64] + | | | | | | | |--MODIFIERS -> MODIFIERS [101:64] + | | | | | | | | `--FINAL -> final [101:64] + | | | | | | | |--TYPE -> TYPE [101:70] + | | | | | | | | `--IDENT -> Integer [101:70] + | | | | | | | `--IDENT -> y1 [101:78] + | | | | | | |--RPAREN -> ) [101:80] + | | | | | | `--IDENT -> x [101:82] + | | | | | |--COMMA -> , [101:83] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [102:20] + | | | | | |--MODIFIERS -> MODIFIERS [102:20] + | | | | | | `--FINAL -> final [102:20] + | | | | | |--TYPE -> TYPE [102:26] + | | | | | | |--IDENT -> Pair [102:26] + | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [102:30] + | | | | | | |--GENERIC_START -> < [102:30] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [102:31] + | | | | | | | `--IDENT -> Integer [102:31] + | | | | | | `--GENERIC_END -> > [102:38] + | | | | | |--LPAREN -> ( [102:39] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [102:40] + | | | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [102:40] + | | | | | | | |--MODIFIERS -> MODIFIERS [102:40] + | | | | | | | |--TYPE -> TYPE [102:40] + | | | | | | | | `--IDENT -> Integer [102:40] + | | | | | | | `--IDENT -> x2 [102:48] + | | | | | | |--COMMA -> , [102:50] + | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [102:52] + | | | | | | |--MODIFIERS -> MODIFIERS [102:52] + | | | | | | |--TYPE -> TYPE [102:52] + | | | | | | | `--IDENT -> Integer [102:52] + | | | | | | `--IDENT -> y2 [102:60] + | | | | | |--RPAREN -> ) [102:62] + | | | | | `--IDENT -> p2 [102:64] + | | | | |--RPAREN -> ) [102:66] + | | | | `--IDENT -> y [102:68] + | | | |--LAMBDA -> -> [103:24] + | | | |--EXPR -> EXPR [103:45] + | | | | `--METHOD_CALL -> ( [103:45] + | | | | |--DOT -> . [103:37] + | | | | | |--DOT -> . [103:33] + | | | | | | |--IDENT -> System [103:27] + | | | | | | `--IDENT -> out [103:34] + | | | | | `--IDENT -> println [103:38] + | | | | |--ELIST -> ELIST [103:46] + | | | | `--RPAREN -> ) [103:46] + | | | `--SEMI -> ; [103:47] + | | |--SWITCH_RULE -> SWITCH_RULE [104:12] + | | | |--LITERAL_CASE -> case [104:12] + | | | | `--LITERAL_DEFAULT -> default [104:17] + | | | |--LAMBDA -> -> [104:25] + | | | |--EXPR -> EXPR [104:46] + | | | | `--METHOD_CALL -> ( [104:46] + | | | | |--DOT -> . [104:38] + | | | | | |--DOT -> . [104:34] + | | | | | | |--IDENT -> System [104:28] + | | | | | | `--IDENT -> out [104:35] + | | | | | `--IDENT -> println [104:39] + | | | | |--ELIST -> ELIST [104:47] + | | | | `--RPAREN -> ) [104:47] + | | | `--SEMI -> ; [104:48] + | | `--RCURLY -> } [105:8] + | `--RCURLY -> } [106:4] + |--METHOD_DEF -> METHOD_DEF [108:4] + | |--MODIFIERS -> MODIFIERS [108:4] + | |--TYPE -> TYPE [108:4] + | | `--LITERAL_VOID -> void [108:4] + | |--IDENT -> m4 [108:9] + | |--LPAREN -> ( [108:12] + | |--PARAMETERS -> PARAMETERS [108:13] + | | `--PARAMETER_DEF -> PARAMETER_DEF [108:13] + | | |--MODIFIERS -> MODIFIERS [108:13] + | | |--TYPE -> TYPE [108:13] + | | | |--IDENT -> Pair [108:13] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [108:17] + | | | |--GENERIC_START -> < [108:17] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [108:18] + | | | | |--IDENT -> Pair [108:18] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [108:22] + | | | | |--GENERIC_START -> < [108:22] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [108:23] + | | | | | `--IDENT -> Integer [108:23] + | | | | `--GENERIC_END -> > [108:30] + | | | `--GENERIC_END -> > [108:31] + | | `--IDENT -> s [108:33] + | |--RPAREN -> ) [108:34] + | `--SLIST -> { [108:36] + | |--LITERAL_SWITCH -> switch [109:8] + | | |--LPAREN -> ( [109:15] + | | |--EXPR -> EXPR [109:16] + | | | `--IDENT -> s [109:16] + | | |--RPAREN -> ) [109:17] + | | |--LCURLY -> { [109:19] + | | |--SWITCH_RULE -> SWITCH_RULE [110:12] + | | | |--LITERAL_CASE -> case [110:12] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [110:17] + | | | | |--MODIFIERS -> MODIFIERS [110:17] + | | | | | `--ANNOTATION -> ANNOTATION [110:17] + | | | | | |--AT -> @ [110:17] + | | | | | `--IDENT -> MyAnno2 [110:18] + | | | | |--TYPE -> TYPE [110:26] + | | | | | |--IDENT -> Pair [110:26] + | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [110:30] + | | | | | |--GENERIC_START -> < [110:30] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [110:31] + | | | | | | |--IDENT -> Pair [110:31] + | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [110:35] + | | | | | | |--GENERIC_START -> < [110:35] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [110:36] + | | | | | | | `--IDENT -> Integer [110:36] + | | | | | | `--GENERIC_END -> > [110:43] + | | | | | `--GENERIC_END -> > [110:44] + | | | | |--LPAREN -> ( [110:45] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [111:20] + | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [111:20] + | | | | | | |--MODIFIERS -> MODIFIERS [111:20] + | | | | | | | `--ANNOTATION -> ANNOTATION [111:20] + | | | | | | | |--AT -> @ [111:20] + | | | | | | | |--IDENT -> MyAnno3 [111:21] + | | | | | | | |--LPAREN -> ( [111:28] + | | | | | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [111:29] + | | | | | | | | |--IDENT -> value [111:29] + | | | | | | | | |--ASSIGN -> = [111:35] + | | | | | | | | `--EXPR -> EXPR [111:37] + | | | | | | | | `--STRING_LITERAL -> "" [111:37] + | | | | | | | |--COMMA -> , [111:39] + | | | | | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [111:41] + | | | | | | | | |--IDENT -> values [111:41] + | | | | | | | | |--ASSIGN -> = [111:48] + | | | | | | | | `--ANNOTATION_ARRAY_INIT -> { [111:50] + | | | | | | | | `--RCURLY -> } [111:51] + | | | | | | | `--RPAREN -> ) [111:52] + | | | | | | |--TYPE -> TYPE [111:54] + | | | | | | | |--IDENT -> Pair [111:54] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [111:58] + | | | | | | | |--GENERIC_START -> < [111:58] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [111:59] + | | | | | | | | `--IDENT -> Integer [111:59] + | | | | | | | `--GENERIC_END -> > [111:66] + | | | | | | |--LPAREN -> ( [111:67] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [112:28] + | | | | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [112:28] + | | | | | | | | |--MODIFIERS -> MODIFIERS [112:28] + | | | | | | | | | `--FINAL -> final [112:28] + | | | | | | | | |--TYPE -> TYPE [112:34] + | | | | | | | | | `--IDENT -> Integer [112:34] + | | | | | | | | `--IDENT -> x1 [112:42] + | | | | | | | |--COMMA -> , [112:44] + | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [112:45] + | | | | | | | |--MODIFIERS -> MODIFIERS [112:45] + | | | | | | | |--TYPE -> TYPE [112:45] + | | | | | | | | `--IDENT -> Integer [112:45] + | | | | | | | `--IDENT -> y1 [112:53] + | | | | | | |--RPAREN -> ) [112:55] + | | | | | | `--IDENT -> x [112:57] + | | | | | |--COMMA -> , [112:58] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [113:21] + | | | | | |--MODIFIERS -> MODIFIERS [113:21] + | | | | | | |--ANNOTATION -> ANNOTATION [113:21] + | | | | | | | |--AT -> @ [113:21] + | | | | | | | |--IDENT -> MyAnno3 [113:22] + | | | | | | | |--LPAREN -> ( [113:29] + | | | | | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [113:30] + | | | | | | | | |--IDENT -> value [113:30] + | | | | | | | | |--ASSIGN -> = [113:36] + | | | | | | | | `--EXPR -> EXPR [113:38] + | | | | | | | | `--STRING_LITERAL -> "" [113:38] + | | | | | | | |--COMMA -> , [113:40] + | | | | | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [113:42] + | | | | | | | | |--IDENT -> values [113:42] + | | | | | | | | |--ASSIGN -> = [113:49] + | | | | | | | | `--ANNOTATION_ARRAY_INIT -> { [113:51] + | | | | | | | | `--RCURLY -> } [113:52] + | | | | | | | `--RPAREN -> ) [113:53] + | | | | | | `--FINAL -> final [113:55] + | | | | | |--TYPE -> TYPE [113:61] + | | | | | | |--IDENT -> Pair [113:61] + | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [113:65] + | | | | | | |--GENERIC_START -> < [113:65] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [113:66] + | | | | | | | `--IDENT -> Integer [113:66] + | | | | | | `--GENERIC_END -> > [113:73] + | | | | | |--LPAREN -> ( [113:74] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [114:29] + | | | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [114:29] + | | | | | | | |--MODIFIERS -> MODIFIERS [114:29] + | | | | | | | | |--ANNOTATION -> ANNOTATION [114:29] + | | | | | | | | | |--AT -> @ [114:29] + | | | | | | | | | `--IDENT -> MyAnno2 [114:30] + | | | | | | | | `--FINAL -> final [114:38] + | | | | | | | |--TYPE -> TYPE [114:44] + | | | | | | | | `--IDENT -> Integer [114:44] + | | | | | | | `--IDENT -> x2 [114:52] + | | | | | | |--COMMA -> , [114:54] + | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [114:55] + | | | | | | |--MODIFIERS -> MODIFIERS [114:55] + | | | | | | |--TYPE -> TYPE [114:55] + | | | | | | | `--IDENT -> Integer [114:55] + | | | | | | `--IDENT -> y2 [114:63] + | | | | | |--RPAREN -> ) [114:65] + | | | | | `--IDENT -> p2 [114:67] + | | | | |--RPAREN -> ) [114:69] + | | | | `--IDENT -> y [114:71] + | | | |--LAMBDA -> -> [115:36] + | | | |--EXPR -> EXPR [115:57] + | | | | `--METHOD_CALL -> ( [115:57] + | | | | |--DOT -> . [115:49] + | | | | | |--DOT -> . [115:45] + | | | | | | |--IDENT -> System [115:39] + | | | | | | `--IDENT -> out [115:46] + | | | | | `--IDENT -> println [115:50] + | | | | |--ELIST -> ELIST [115:58] + | | | | `--RPAREN -> ) [115:58] + | | | `--SEMI -> ; [115:59] + | | |--SWITCH_RULE -> SWITCH_RULE [116:12] + | | | |--LITERAL_CASE -> case [116:12] + | | | | `--LITERAL_DEFAULT -> default [116:17] + | | | |--LAMBDA -> -> [116:25] + | | | |--EXPR -> EXPR [116:46] + | | | | `--METHOD_CALL -> ( [116:46] + | | | | |--DOT -> . [116:38] + | | | | | |--DOT -> . [116:34] + | | | | | | |--IDENT -> System [116:28] + | | | | | | `--IDENT -> out [116:35] + | | | | | `--IDENT -> println [116:39] + | | | | |--ELIST -> ELIST [116:47] + | | | | `--RPAREN -> ) [116:47] + | | | `--SEMI -> ; [116:48] + | | `--RCURLY -> } [117:8] + | `--RCURLY -> } [118:4] + `--RCURLY -> } [119:0] diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/ExpectedJava19GuardsWithExtraParenthesis.txt b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/ExpectedJava19GuardsWithExtraParenthesis.txt new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/ExpectedJava19GuardsWithExtraParenthesis.txt @@ -0,0 +1,1250 @@ +COMPILATION_UNIT -> COMPILATION_UNIT [2:0] +|--PACKAGE_DEF -> package [2:0] +| |--ANNOTATIONS -> ANNOTATIONS [2:47] +| |--DOT -> . [2:47] +| | |--DOT -> . [2:39] +| | | |--DOT -> . [2:28] +| | | | |--DOT -> . [2:22] +| | | | | |--DOT -> . [2:11] +| | | | | | |--IDENT -> com [2:8] +| | | | | | `--IDENT -> puppycrawl [2:12] +| | | | | `--IDENT -> tools [2:23] +| | | | `--IDENT -> checkstyle [2:29] +| | | `--IDENT -> grammar [2:40] +| | `--IDENT -> java19 [2:48] +| `--SEMI -> ; [2:54] +|--IMPORT -> import [4:0] +| |--DOT -> . [4:16] +| | |--DOT -> . [4:11] +| | | |--IDENT -> java [4:7] +| | | `--IDENT -> util [4:12] +| | `--IDENT -> Objects [4:17] +| `--SEMI -> ; [4:24] +`--CLASS_DEF -> CLASS_DEF [6:0] + |--MODIFIERS -> MODIFIERS [6:0] + | `--LITERAL_PUBLIC -> public [6:0] + |--LITERAL_CLASS -> class [6:7] + |--IDENT -> InputJava19GuardsWithExtraParenthesis [6:13] + `--OBJBLOCK -> OBJBLOCK [6:51] + |--LCURLY -> { [6:51] + |--RECORD_DEF -> RECORD_DEF [8:4] + | |--MODIFIERS -> MODIFIERS [8:4] + | |--LITERAL_RECORD -> record [8:4] + | |--IDENT -> Box [8:11] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [8:14] + | | |--GENERIC_START -> < [8:14] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [8:15] + | | | `--IDENT -> V [8:15] + | | `--GENERIC_END -> > [8:16] + | |--LPAREN -> ( [8:17] + | |--RECORD_COMPONENTS -> RECORD_COMPONENTS [8:18] + | | `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [8:18] + | | |--ANNOTATIONS -> ANNOTATIONS [8:18] + | | |--TYPE -> TYPE [8:18] + | | | `--IDENT -> V [8:18] + | | `--IDENT -> v [8:20] + | |--RPAREN -> ) [8:21] + | `--OBJBLOCK -> OBJBLOCK [8:23] + | |--LCURLY -> { [8:23] + | |--VARIABLE_DEF -> VARIABLE_DEF [9:8] + | | |--MODIFIERS -> MODIFIERS [9:8] + | | | `--LITERAL_STATIC -> static [9:8] + | | |--TYPE -> TYPE [9:15] + | | | `--LITERAL_INT -> int [9:15] + | | |--IDENT -> x [9:19] + | | |--ASSIGN -> = [9:21] + | | | `--EXPR -> EXPR [9:23] + | | | `--NUM_INT -> 5 [9:23] + | | `--SEMI -> ; [9:24] + | `--RCURLY -> } [10:4] + |--METHOD_DEF -> METHOD_DEF [12:4] + | |--MODIFIERS -> MODIFIERS [12:4] + | |--TYPE -> TYPE [12:4] + | | `--LITERAL_INT -> int [12:4] + | |--IDENT -> m1 [12:8] + | |--LPAREN -> ( [12:10] + | |--PARAMETERS -> PARAMETERS [12:11] + | | `--PARAMETER_DEF -> PARAMETER_DEF [12:11] + | | |--MODIFIERS -> MODIFIERS [12:11] + | | |--TYPE -> TYPE [12:11] + | | | |--IDENT -> Box [12:11] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [12:14] + | | | |--GENERIC_START -> < [12:14] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [12:15] + | | | | |--IDENT -> Box [12:15] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [12:18] + | | | | |--GENERIC_START -> < [12:18] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [12:19] + | | | | | `--IDENT -> String [12:19] + | | | | `--GENERIC_END -> > [12:25] + | | | `--GENERIC_END -> > [12:26] + | | `--IDENT -> b [12:28] + | |--RPAREN -> ) [12:29] + | `--SLIST -> { [12:31] + | |--LITERAL_RETURN -> return [13:8] + | | |--EXPR -> EXPR [13:15] + | | | `--LITERAL_SWITCH -> switch [13:15] + | | | |--LPAREN -> ( [13:22] + | | | |--EXPR -> EXPR [13:23] + | | | | `--IDENT -> b [13:23] + | | | |--RPAREN -> ) [13:24] + | | | |--LCURLY -> { [13:26] + | | | |--SWITCH_RULE -> SWITCH_RULE [14:12] + | | | | |--LITERAL_CASE -> case [14:12] + | | | | | `--PATTERN_DEF -> PATTERN_DEF [15:20] + | | | | | `--LITERAL_WHEN -> when [15:20] + | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [14:17] + | | | | | | |--MODIFIERS -> MODIFIERS [14:17] + | | | | | | |--TYPE -> TYPE [14:17] + | | | | | | | |--IDENT -> Box [14:17] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [14:20] + | | | | | | | |--GENERIC_START -> < [14:20] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [14:21] + | | | | | | | | |--IDENT -> Box [14:21] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [14:24] + | | | | | | | | |--GENERIC_START -> < [14:24] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [14:25] + | | | | | | | | | `--IDENT -> String [14:25] + | | | | | | | | `--GENERIC_END -> > [14:31] + | | | | | | | `--GENERIC_END -> > [14:32] + | | | | | | |--LPAREN -> ( [14:33] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [14:34] + | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [14:34] + | | | | | | | |--MODIFIERS -> MODIFIERS [14:34] + | | | | | | | |--TYPE -> TYPE [14:34] + | | | | | | | | |--IDENT -> Box [14:34] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [14:37] + | | | | | | | | |--GENERIC_START -> < [14:37] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [14:38] + | | | | | | | | | `--IDENT -> String [14:38] + | | | | | | | | `--GENERIC_END -> > [14:44] + | | | | | | | |--LPAREN -> ( [14:45] + | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [14:46] + | | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [14:46] + | | | | | | | | |--MODIFIERS -> MODIFIERS [14:46] + | | | | | | | | |--TYPE -> TYPE [14:46] + | | | | | | | | | `--IDENT -> String [14:46] + | | | | | | | | `--IDENT -> s [14:53] + | | | | | | | |--RPAREN -> ) [14:54] + | | | | | | | `--IDENT -> box [14:55] + | | | | | | `--RPAREN -> ) [14:58] + | | | | | |--LPAREN -> ( [15:25] + | | | | | |--LPAREN -> ( [15:26] + | | | | | |--LAND -> && [15:44] + | | | | | | |--METHOD_CALL -> ( [15:40] + | | | | | | | |--DOT -> . [15:33] + | | | | | | | | |--STRING_LITERAL -> "test" [15:27] + | | | | | | | | `--IDENT -> equals [15:34] + | | | | | | | |--ELIST -> ELIST [15:41] + | | | | | | | | `--EXPR -> EXPR [15:41] + | | | | | | | | `--IDENT -> s [15:41] + | | | | | | | `--RPAREN -> ) [15:42] + | | | | | | `--NOT_EQUAL -> != [15:53] + | | | | | | |--DOT -> . [15:50] + | | | | | | | |--IDENT -> box [15:47] + | | | | | | | `--IDENT -> x [15:51] + | | | | | | `--NUM_INT -> 7 [15:56] + | | | | | |--RPAREN -> ) [15:57] + | | | | | `--RPAREN -> ) [15:58] + | | | | |--LAMBDA -> -> [15:61] + | | | | |--EXPR -> EXPR [15:64] + | | | | | `--NUM_INT -> 1 [15:64] + | | | | `--SEMI -> ; [15:65] + | | | |--SWITCH_RULE -> SWITCH_RULE [16:12] + | | | | |--LITERAL_CASE -> case [16:12] + | | | | | `--PATTERN_DEF -> PATTERN_DEF [17:20] + | | | | | `--LITERAL_WHEN -> when [17:20] + | | | | | |--LPAREN -> ( [16:17] + | | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [16:18] + | | | | | | | |--MODIFIERS -> MODIFIERS [16:18] + | | | | | | | |--TYPE -> TYPE [16:18] + | | | | | | | | |--IDENT -> Box [16:18] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [16:21] + | | | | | | | | |--GENERIC_START -> < [16:21] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [16:22] + | | | | | | | | | |--IDENT -> Box [16:22] + | | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [16:25] + | | | | | | | | | |--GENERIC_START -> < [16:25] + | | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [16:26] + | | | | | | | | | | `--IDENT -> String [16:26] + | | | | | | | | | `--GENERIC_END -> > [16:32] + | | | | | | | | `--GENERIC_END -> > [16:33] + | | | | | | | |--LPAREN -> ( [16:34] + | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [16:35] + | | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [16:35] + | | | | | | | | |--MODIFIERS -> MODIFIERS [16:35] + | | | | | | | | |--TYPE -> TYPE [16:35] + | | | | | | | | | |--IDENT -> Box [16:35] + | | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [16:38] + | | | | | | | | | |--GENERIC_START -> < [16:38] + | | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [16:39] + | | | | | | | | | | `--IDENT -> String [16:39] + | | | | | | | | | `--GENERIC_END -> > [16:45] + | | | | | | | | |--LPAREN -> ( [16:46] + | | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [16:47] + | | | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [16:47] + | | | | | | | | | |--MODIFIERS -> MODIFIERS [16:47] + | | | | | | | | | |--TYPE -> TYPE [16:47] + | | | | | | | | | | `--IDENT -> String [16:47] + | | | | | | | | | `--IDENT -> s [16:54] + | | | | | | | | |--RPAREN -> ) [16:55] + | | | | | | | | `--IDENT -> box [16:56] + | | | | | | | `--RPAREN -> ) [16:59] + | | | | | | `--RPAREN -> ) [16:60] + | | | | | |--LPAREN -> ( [17:25] + | | | | | |--LAND -> && [17:45] + | | | | | | |--LPAREN -> ( [17:26] + | | | | | | |--METHOD_CALL -> ( [17:40] + | | | | | | | |--DOT -> . [17:33] + | | | | | | | | |--STRING_LITERAL -> "test" [17:27] + | | | | | | | | `--IDENT -> equals [17:34] + | | | | | | | |--ELIST -> ELIST [17:41] + | | | | | | | | `--EXPR -> EXPR [17:41] + | | | | | | | | `--IDENT -> s [17:41] + | | | | | | | `--RPAREN -> ) [17:42] + | | | | | | |--RPAREN -> ) [17:43] + | | | | | | |--LPAREN -> ( [17:48] + | | | | | | |--NOT_EQUAL -> != [17:61] + | | | | | | | |--TYPECAST -> ( [17:49] + | | | | | | | | |--TYPE -> TYPE [17:50] + | | | | | | | | | `--LITERAL_INT -> int [17:50] + | | | | | | | | |--RPAREN -> ) [17:53] + | | | | | | | | `--DOT -> . [17:58] + | | | | | | | | |--IDENT -> box [17:55] + | | | | | | | | `--IDENT -> x [17:59] + | | | | | | | `--NUM_INT -> 7 [17:64] + | | | | | | `--RPAREN -> ) [17:65] + | | | | | `--RPAREN -> ) [17:66] + | | | | |--LAMBDA -> -> [17:69] + | | | | |--EXPR -> EXPR [17:72] + | | | | | `--NUM_INT -> 1 [17:72] + | | | | `--SEMI -> ; [17:73] + | | | |--SWITCH_RULE -> SWITCH_RULE [18:12] + | | | | |--LITERAL_CASE -> case [18:12] + | | | | | `--PATTERN_DEF -> PATTERN_DEF [19:20] + | | | | | `--LITERAL_WHEN -> when [19:20] + | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [18:17] + | | | | | | |--MODIFIERS -> MODIFIERS [18:17] + | | | | | | |--TYPE -> TYPE [18:17] + | | | | | | | |--IDENT -> Box [18:17] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [18:20] + | | | | | | | |--GENERIC_START -> < [18:20] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [18:21] + | | | | | | | | |--IDENT -> Box [18:21] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [18:24] + | | | | | | | | |--GENERIC_START -> < [18:24] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [18:25] + | | | | | | | | | `--IDENT -> String [18:25] + | | | | | | | | `--GENERIC_END -> > [18:31] + | | | | | | | `--GENERIC_END -> > [18:32] + | | | | | | |--LPAREN -> ( [18:33] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [18:34] + | | | | | | | `--LPAREN -> ( [18:34] + | | | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [18:35] + | | | | | | | | |--MODIFIERS -> MODIFIERS [18:35] + | | | | | | | | |--TYPE -> TYPE [18:35] + | | | | | | | | | |--IDENT -> Box [18:35] + | | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [18:38] + | | | | | | | | | |--GENERIC_START -> < [18:38] + | | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [18:39] + | | | | | | | | | | `--IDENT -> String [18:39] + | | | | | | | | | `--GENERIC_END -> > [18:45] + | | | | | | | | |--LPAREN -> ( [18:46] + | | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [18:47] + | | | | | | | | | `--LPAREN -> ( [18:47] + | | | | | | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [18:48] + | | | | | | | | | | |--MODIFIERS -> MODIFIERS [18:48] + | | | | | | | | | | |--TYPE -> TYPE [18:48] + | | | | | | | | | | | `--IDENT -> String [18:48] + | | | | | | | | | | `--IDENT -> s [18:55] + | | | | | | | | | `--RPAREN -> ) [18:56] + | | | | | | | | |--RPAREN -> ) [18:57] + | | | | | | | | `--IDENT -> box [18:58] + | | | | | | | `--RPAREN -> ) [18:61] + | | | | | | `--RPAREN -> ) [18:62] + | | | | | `--LAND -> && [19:51] + | | | | | |--TYPECAST -> ( [19:25] + | | | | | | |--TYPE -> TYPE [19:26] + | | | | | | | `--LITERAL_BOOLEAN -> boolean [19:26] + | | | | | | |--RPAREN -> ) [19:33] + | | | | | | `--METHOD_CALL -> ( [19:47] + | | | | | | |--DOT -> . [19:40] + | | | | | | | |--STRING_LITERAL -> "test" [19:34] + | | | | | | | `--IDENT -> equals [19:41] + | | | | | | |--ELIST -> ELIST [19:48] + | | | | | | | `--EXPR -> EXPR [19:48] + | | | | | | | `--IDENT -> s [19:48] + | | | | | | `--RPAREN -> ) [19:49] + | | | | | `--TYPECAST -> ( [19:54] + | | | | | |--TYPE -> TYPE [19:55] + | | | | | | `--LITERAL_BOOLEAN -> boolean [19:55] + | | | | | |--RPAREN -> ) [19:62] + | | | | | `--METHOD_CALL -> ( [19:77] + | | | | | |--DOT -> . [19:70] + | | | | | | |--IDENT -> Objects [19:63] + | | | | | | `--IDENT -> equals [19:71] + | | | | | |--ELIST -> ELIST [19:81] + | | | | | | |--EXPR -> EXPR [19:81] + | | | | | | | `--DOT -> . [19:81] + | | | | | | | |--IDENT -> box [19:78] + | | | | | | | `--IDENT -> v [19:82] + | | | | | | |--COMMA -> , [19:83] + | | | | | | `--EXPR -> EXPR [19:85] + | | | | | | `--STRING_LITERAL -> "box" [19:85] + | | | | | `--RPAREN -> ) [19:90] + | | | | |--LAMBDA -> -> [19:92] + | | | | |--EXPR -> EXPR [19:95] + | | | | | |--LPAREN -> ( [19:95] + | | | | | |--NUM_INT -> 1 [19:96] + | | | | | `--RPAREN -> ) [19:97] + | | | | `--SEMI -> ; [19:98] + | | | |--SWITCH_RULE -> SWITCH_RULE [20:12] + | | | | |--LITERAL_CASE -> case [20:12] + | | | | | `--PATTERN_DEF -> PATTERN_DEF [21:20] + | | | | | `--LITERAL_WHEN -> when [21:20] + | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [20:17] + | | | | | | |--MODIFIERS -> MODIFIERS [20:17] + | | | | | | |--TYPE -> TYPE [20:17] + | | | | | | | |--IDENT -> Box [20:17] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [20:20] + | | | | | | | |--GENERIC_START -> < [20:20] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [20:21] + | | | | | | | | |--IDENT -> Box [20:21] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [20:24] + | | | | | | | | |--GENERIC_START -> < [20:24] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [20:25] + | | | | | | | | | `--IDENT -> String [20:25] + | | | | | | | | `--GENERIC_END -> > [20:31] + | | | | | | | `--GENERIC_END -> > [20:32] + | | | | | | |--LPAREN -> ( [20:33] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [20:34] + | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [20:34] + | | | | | | | |--MODIFIERS -> MODIFIERS [20:34] + | | | | | | | |--TYPE -> TYPE [20:34] + | | | | | | | | |--IDENT -> Box [20:34] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [20:37] + | | | | | | | | |--GENERIC_START -> < [20:37] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [20:38] + | | | | | | | | | `--IDENT -> String [20:38] + | | | | | | | | `--GENERIC_END -> > [20:44] + | | | | | | | |--LPAREN -> ( [20:45] + | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [20:46] + | | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [20:46] + | | | | | | | | |--MODIFIERS -> MODIFIERS [20:46] + | | | | | | | | |--TYPE -> TYPE [20:46] + | | | | | | | | | `--IDENT -> String [20:46] + | | | | | | | | `--IDENT -> s [20:53] + | | | | | | | |--RPAREN -> ) [20:54] + | | | | | | | `--IDENT -> box [20:55] + | | | | | | `--RPAREN -> ) [20:58] + | | | | | `--LOR -> || [22:24] + | | | | | |--LAND -> && [21:42] + | | | | | | |--METHOD_CALL -> ( [21:38] + | | | | | | | |--DOT -> . [21:31] + | | | | | | | | |--STRING_LITERAL -> "test" [21:25] + | | | | | | | | `--IDENT -> equals [21:32] + | | | | | | | |--ELIST -> ELIST [21:39] + | | | | | | | | `--EXPR -> EXPR [21:39] + | | | | | | | | `--IDENT -> s [21:39] + | | | | | | | `--RPAREN -> ) [21:40] + | | | | | | `--METHOD_CALL -> ( [21:59] + | | | | | | |--DOT -> . [21:52] + | | | | | | | |--IDENT -> Objects [21:45] + | | | | | | | `--IDENT -> equals [21:53] + | | | | | | |--ELIST -> ELIST [21:63] + | | | | | | | |--EXPR -> EXPR [21:63] + | | | | | | | | `--DOT -> . [21:63] + | | | | | | | | |--IDENT -> box [21:60] + | | | | | | | | `--IDENT -> v [21:64] + | | | | | | | |--COMMA -> , [21:65] + | | | | | | | `--EXPR -> EXPR [21:67] + | | | | | | | `--STRING_LITERAL -> "box" [21:67] + | | | | | | `--RPAREN -> ) [21:72] + | | | | | `--METHOD_CALL -> ( [22:50] + | | | | | |--DOT -> . [22:43] + | | | | | | |--STRING_LITERAL -> "something else" [22:27] + | | | | | | `--IDENT -> equals [22:44] + | | | | | |--ELIST -> ELIST [22:51] + | | | | | | `--EXPR -> EXPR [22:51] + | | | | | | `--IDENT -> s [22:51] + | | | | | `--RPAREN -> ) [22:52] + | | | | |--LAMBDA -> -> [22:54] + | | | | |--EXPR -> EXPR [22:57] + | | | | | `--NUM_INT -> 1 [22:57] + | | | | `--SEMI -> ; [22:58] + | | | |--SWITCH_RULE -> SWITCH_RULE [23:12] + | | | | |--LITERAL_CASE -> case [23:12] + | | | | | `--PATTERN_DEF -> PATTERN_DEF [24:20] + | | | | | `--LITERAL_WHEN -> when [24:20] + | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [23:17] + | | | | | | |--MODIFIERS -> MODIFIERS [23:17] + | | | | | | |--TYPE -> TYPE [23:17] + | | | | | | | |--IDENT -> Box [23:17] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [23:20] + | | | | | | | |--GENERIC_START -> < [23:20] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [23:21] + | | | | | | | | |--IDENT -> Box [23:21] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [23:24] + | | | | | | | | |--GENERIC_START -> < [23:24] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [23:25] + | | | | | | | | | `--IDENT -> String [23:25] + | | | | | | | | `--GENERIC_END -> > [23:31] + | | | | | | | `--GENERIC_END -> > [23:32] + | | | | | | |--LPAREN -> ( [23:33] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [23:34] + | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [23:34] + | | | | | | | |--MODIFIERS -> MODIFIERS [23:34] + | | | | | | | |--TYPE -> TYPE [23:34] + | | | | | | | | |--IDENT -> Box [23:34] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [23:37] + | | | | | | | | |--GENERIC_START -> < [23:37] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [23:38] + | | | | | | | | | `--IDENT -> String [23:38] + | | | | | | | | `--GENERIC_END -> > [23:44] + | | | | | | | |--LPAREN -> ( [23:45] + | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [23:46] + | | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [23:46] + | | | | | | | | |--MODIFIERS -> MODIFIERS [23:46] + | | | | | | | | |--TYPE -> TYPE [23:46] + | | | | | | | | | `--IDENT -> String [23:46] + | | | | | | | | `--IDENT -> s [23:53] + | | | | | | | `--RPAREN -> ) [23:54] + | | | | | | `--RPAREN -> ) [23:55] + | | | | | `--METHOD_CALL -> ( [24:38] + | | | | | |--DOT -> . [24:31] + | | | | | | |--STRING_LITERAL -> "test" [24:25] + | | | | | | `--IDENT -> equals [24:32] + | | | | | |--ELIST -> ELIST [24:39] + | | | | | | `--EXPR -> EXPR [24:39] + | | | | | | `--IDENT -> s [24:39] + | | | | | `--RPAREN -> ) [24:40] + | | | | |--LAMBDA -> -> [24:42] + | | | | |--EXPR -> EXPR [24:45] + | | | | | `--NUM_INT -> 1 [24:45] + | | | | `--SEMI -> ; [24:46] + | | | |--SWITCH_RULE -> SWITCH_RULE [25:12] + | | | | |--LITERAL_CASE -> case [25:12] + | | | | | `--PATTERN_DEF -> PATTERN_DEF [26:20] + | | | | | `--LITERAL_WHEN -> when [26:20] + | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [25:17] + | | | | | | |--MODIFIERS -> MODIFIERS [25:17] + | | | | | | |--TYPE -> TYPE [25:17] + | | | | | | | |--IDENT -> Box [25:17] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [25:20] + | | | | | | | |--GENERIC_START -> < [25:20] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [25:21] + | | | | | | | | |--IDENT -> Box [25:21] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [25:24] + | | | | | | | | |--GENERIC_START -> < [25:24] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [25:25] + | | | | | | | | | `--IDENT -> String [25:25] + | | | | | | | | `--GENERIC_END -> > [25:31] + | | | | | | | `--GENERIC_END -> > [25:32] + | | | | | | |--LPAREN -> ( [25:33] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [25:34] + | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [25:34] + | | | | | | | |--MODIFIERS -> MODIFIERS [25:34] + | | | | | | | |--TYPE -> TYPE [25:34] + | | | | | | | | |--IDENT -> Box [25:34] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [25:37] + | | | | | | | | |--GENERIC_START -> < [25:37] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [25:38] + | | | | | | | | | `--WILDCARD_TYPE -> ? [25:38] + | | | | | | | | `--GENERIC_END -> > [25:39] + | | | | | | | `--IDENT -> b2 [25:41] + | | | | | | `--RPAREN -> ) [25:43] + | | | | | `--METHOD_CALL -> ( [26:38] + | | | | | |--DOT -> . [26:31] + | | | | | | |--STRING_LITERAL -> "test" [26:25] + | | | | | | `--IDENT -> equals [26:32] + | | | | | |--ELIST -> ELIST [26:41] + | | | | | | `--EXPR -> EXPR [26:41] + | | | | | | `--DOT -> . [26:41] + | | | | | | |--IDENT -> b2 [26:39] + | | | | | | `--IDENT -> v [26:42] + | | | | | `--RPAREN -> ) [26:43] + | | | | |--LAMBDA -> -> [26:45] + | | | | |--EXPR -> EXPR [26:48] + | | | | | `--NUM_INT -> 1 [26:48] + | | | | `--SEMI -> ; [26:49] + | | | |--SWITCH_RULE -> SWITCH_RULE [27:12] + | | | | |--LITERAL_CASE -> case [27:12] + | | | | | `--PATTERN_DEF -> PATTERN_DEF [28:20] + | | | | | `--LITERAL_WHEN -> when [28:20] + | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [27:17] + | | | | | | |--MODIFIERS -> MODIFIERS [27:17] + | | | | | | |--TYPE -> TYPE [27:17] + | | | | | | | |--IDENT -> Box [27:17] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [27:20] + | | | | | | | |--GENERIC_START -> < [27:20] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [27:21] + | | | | | | | | |--IDENT -> Box [27:21] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [27:24] + | | | | | | | | |--GENERIC_START -> < [27:24] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [27:25] + | | | | | | | | | `--IDENT -> String [27:25] + | | | | | | | | `--GENERIC_END -> > [27:31] + | | | | | | | `--GENERIC_END -> > [27:32] + | | | | | | |--LPAREN -> ( [27:33] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [27:34] + | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [27:34] + | | | | | | | |--MODIFIERS -> MODIFIERS [27:34] + | | | | | | | |--TYPE -> TYPE [27:34] + | | | | | | | | `--IDENT -> Object [27:34] + | | | | | | | `--IDENT -> o [27:41] + | | | | | | |--RPAREN -> ) [27:42] + | | | | | | `--IDENT -> b2 [27:44] + | | | | | `--LAND -> && [28:38] + | | | | | |--NOT_EQUAL -> != [28:30] + | | | | | | |--DOT -> . [28:27] + | | | | | | | |--IDENT -> b2 [28:25] + | | | | | | | `--IDENT -> v [28:28] + | | | | | | `--LITERAL_NULL -> null [28:33] + | | | | | `--METHOD_CALL -> ( [28:58] + | | | | | |--DOT -> . [28:51] + | | | | | | |--STRING_LITERAL -> "whatever" [28:41] + | | | | | | `--IDENT -> equals [28:52] + | | | | | |--ELIST -> ELIST [28:69] + | | | | | | `--EXPR -> EXPR [28:69] + | | | | | | `--METHOD_CALL -> ( [28:69] + | | | | | | |--DOT -> . [28:60] + | | | | | | | |--IDENT -> o [28:59] + | | | | | | | `--IDENT -> toString [28:61] + | | | | | | |--ELIST -> ELIST [28:70] + | | | | | | `--RPAREN -> ) [28:70] + | | | | | `--RPAREN -> ) [28:71] + | | | | |--LAMBDA -> -> [28:72] + | | | | |--EXPR -> EXPR [28:75] + | | | | | `--NUM_INT -> 1 [28:75] + | | | | `--SEMI -> ; [28:76] + | | | |--SWITCH_RULE -> SWITCH_RULE [29:12] + | | | | |--LITERAL_DEFAULT -> default [29:12] + | | | | |--LAMBDA -> -> [29:20] + | | | | |--EXPR -> EXPR [29:23] + | | | | | `--UNARY_MINUS -> - [29:23] + | | | | | `--NUM_INT -> 1 [29:24] + | | | | `--SEMI -> ; [29:25] + | | | `--RCURLY -> } [30:8] + | | `--SEMI -> ; [30:9] + | `--RCURLY -> } [31:4] + |--RECORD_DEF -> RECORD_DEF [33:4] + | |--MODIFIERS -> MODIFIERS [33:4] + | |--LITERAL_RECORD -> record [33:4] + | |--IDENT -> when [33:11] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [33:15] + | | |--GENERIC_START -> < [33:15] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [33:16] + | | | `--IDENT -> T [33:16] + | | `--GENERIC_END -> > [33:17] + | |--LPAREN -> ( [33:18] + | |--RECORD_COMPONENTS -> RECORD_COMPONENTS [33:19] + | | `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [33:19] + | | |--ANNOTATIONS -> ANNOTATIONS [33:19] + | | |--TYPE -> TYPE [33:19] + | | | |--IDENT -> when [33:19] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [33:23] + | | | |--GENERIC_START -> < [33:23] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [33:24] + | | | | `--IDENT -> T [33:24] + | | | `--GENERIC_END -> > [33:25] + | | `--IDENT -> when [33:27] + | |--RPAREN -> ) [33:31] + | `--OBJBLOCK -> OBJBLOCK [33:32] + | |--LCURLY -> { [33:32] + | `--RCURLY -> } [33:33] + |--METHOD_DEF -> METHOD_DEF [35:4] + | |--MODIFIERS -> MODIFIERS [35:4] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [35:4] + | | |--GENERIC_START -> < [35:4] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [35:5] + | | | `--IDENT -> T [35:5] + | | `--GENERIC_END -> > [35:6] + | |--TYPE -> TYPE [35:8] + | | `--LITERAL_INT -> int [35:8] + | |--IDENT -> moreTrickyWhen [35:12] + | |--LPAREN -> ( [35:26] + | |--PARAMETERS -> PARAMETERS [35:27] + | | `--PARAMETER_DEF -> PARAMETER_DEF [35:27] + | | |--MODIFIERS -> MODIFIERS [35:27] + | | |--TYPE -> TYPE [35:27] + | | | |--IDENT -> when [35:27] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [35:31] + | | | |--GENERIC_START -> < [35:31] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [35:32] + | | | | |--IDENT -> when [35:32] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [35:36] + | | | | |--GENERIC_START -> < [35:36] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [35:37] + | | | | | `--IDENT -> T [35:37] + | | | | `--GENERIC_END -> > [35:38] + | | | `--GENERIC_END -> > [35:39] + | | `--IDENT -> when [35:41] + | |--RPAREN -> ) [35:45] + | `--SLIST -> { [35:46] + | |--LITERAL_RETURN -> return [36:8] + | | |--EXPR -> EXPR [36:15] + | | | `--LITERAL_SWITCH -> switch [36:15] + | | | |--LPAREN -> ( [36:21] + | | | |--EXPR -> EXPR [36:22] + | | | | `--IDENT -> when [36:22] + | | | |--RPAREN -> ) [36:26] + | | | |--LCURLY -> { [36:28] + | | | |--SWITCH_RULE -> SWITCH_RULE [37:8] + | | | | |--LITERAL_CASE -> case [37:8] + | | | | | `--PATTERN_DEF -> PATTERN_DEF [38:18] + | | | | | `--LITERAL_WHEN -> when [38:18] + | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [37:13] + | | | | | | |--MODIFIERS -> MODIFIERS [37:13] + | | | | | | |--TYPE -> TYPE [37:13] + | | | | | | | |--IDENT -> when [37:13] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [37:17] + | | | | | | | |--GENERIC_START -> < [37:17] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [37:18] + | | | | | | | | |--IDENT -> when [37:18] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [37:22] + | | | | | | | | |--GENERIC_START -> < [37:22] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [37:23] + | | | | | | | | | `--IDENT -> T [37:23] + | | | | | | | | `--GENERIC_END -> > [37:24] + | | | | | | | `--GENERIC_END -> > [37:25] + | | | | | | |--LPAREN -> ( [37:26] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [37:27] + | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [37:27] + | | | | | | | |--MODIFIERS -> MODIFIERS [37:27] + | | | | | | | |--TYPE -> TYPE [37:27] + | | | | | | | | |--IDENT -> when [37:27] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [37:31] + | | | | | | | | |--GENERIC_START -> < [37:31] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [37:32] + | | | | | | | | | |--IDENT -> when [37:32] + | | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [37:36] + | | | | | | | | | |--GENERIC_START -> < [37:36] + | | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [37:37] + | | | | | | | | | | `--IDENT -> T [37:37] + | | | | | | | | | `--GENERIC_END -> > [37:38] + | | | | | | | | `--GENERIC_END -> > [37:39] + | | | | | | | `--IDENT -> w1 [37:41] + | | | | | | `--RPAREN -> ) [37:43] + | | | | | `--METHOD_CALL -> ( [38:65] + | | | | | |--DOT -> . [38:58] + | | | | | | |--DOT -> . [38:53] + | | | | | | | |--DOT -> . [38:48] + | | | | | | | | |--DOT -> . [38:43] + | | | | | | | | | |--DOT -> . [38:38] + | | | | | | | | | | |--DOT -> . [38:33] + | | | | | | | | | | | |--LPAREN -> ( [38:23] + | | | | | | | | | | | |--TYPECAST -> ( [38:24] + | | | | | | | | | | | | |--TYPE -> TYPE [38:25] + | | | | | | | | | | | | | `--IDENT -> when [38:25] + | | | | | | | | | | | | |--RPAREN -> ) [38:29] + | | | | | | | | | | | | `--IDENT -> w1 [38:30] + | | | | | | | | | | | |--RPAREN -> ) [38:32] + | | | | | | | | | | | `--IDENT -> when [38:34] + | | | | | | | | | | `--IDENT -> when [38:39] + | | | | | | | | | `--IDENT -> when [38:44] + | | | | | | | | `--IDENT -> when [38:49] + | | | | | | | `--IDENT -> when [38:54] + | | | | | | `--IDENT -> equals [38:59] + | | | | | |--ELIST -> ELIST [38:66] + | | | | | | `--EXPR -> EXPR [38:66] + | | | | | | `--LITERAL_NULL -> null [38:66] + | | | | | `--RPAREN -> ) [38:70] + | | | | |--LAMBDA -> -> [38:71] + | | | | |--EXPR -> EXPR [38:74] + | | | | | `--NUM_INT -> 2 [38:74] + | | | | `--SEMI -> ; [38:75] + | | | |--SWITCH_RULE -> SWITCH_RULE [39:8] + | | | | |--LITERAL_CASE -> case [39:8] + | | | | | `--PATTERN_DEF -> PATTERN_DEF [40:18] + | | | | | `--LITERAL_WHEN -> when [40:18] + | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [39:13] + | | | | | | |--MODIFIERS -> MODIFIERS [39:13] + | | | | | | |--TYPE -> TYPE [39:13] + | | | | | | | |--IDENT -> when [39:13] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [39:17] + | | | | | | | |--GENERIC_START -> < [39:17] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [39:18] + | | | | | | | | |--IDENT -> when [39:18] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [39:22] + | | | | | | | | |--GENERIC_START -> < [39:22] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [39:23] + | | | | | | | | | `--IDENT -> T [39:23] + | | | | | | | | `--GENERIC_END -> > [39:24] + | | | | | | | `--GENERIC_END -> > [39:25] + | | | | | | |--LPAREN -> ( [39:26] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [39:27] + | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [39:27] + | | | | | | | |--MODIFIERS -> MODIFIERS [39:27] + | | | | | | | |--TYPE -> TYPE [39:27] + | | | | | | | | |--IDENT -> when [39:27] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [39:31] + | | | | | | | | |--GENERIC_START -> < [39:31] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [39:32] + | | | | | | | | | |--IDENT -> when [39:32] + | | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [39:36] + | | | | | | | | | |--GENERIC_START -> < [39:36] + | | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [39:37] + | | | | | | | | | | `--IDENT -> T [39:37] + | | | | | | | | | `--GENERIC_END -> > [39:38] + | | | | | | | | `--GENERIC_END -> > [39:39] + | | | | | | | `--IDENT -> w1 [39:41] + | | | | | | `--RPAREN -> ) [39:43] + | | | | | |--LPAREN -> ( [40:23] + | | | | | |--LPAREN -> ( [40:24] + | | | | | |--LPAREN -> ( [40:25] + | | | | | |--METHOD_CALL -> ( [40:60] + | | | | | | |--DOT -> . [40:53] + | | | | | | | |--DOT -> . [40:48] + | | | | | | | | |--DOT -> . [40:43] + | | | | | | | | | |--DOT -> . [40:38] + | | | | | | | | | | |--DOT -> . [40:33] + | | | | | | | | | | | |--DOT -> . [40:28] + | | | | | | | | | | | | |--IDENT -> w1 [40:26] + | | | | | | | | | | | | `--IDENT -> when [40:29] + | | | | | | | | | | | `--IDENT -> when [40:34] + | | | | | | | | | | `--IDENT -> when [40:39] + | | | | | | | | | `--IDENT -> when [40:44] + | | | | | | | | `--IDENT -> when [40:49] + | | | | | | | `--IDENT -> equals [40:54] + | | | | | | |--ELIST -> ELIST [40:61] + | | | | | | | `--EXPR -> EXPR [40:61] + | | | | | | | `--LITERAL_NULL -> null [40:61] + | | | | | | `--RPAREN -> ) [40:65] + | | | | | |--RPAREN -> ) [40:66] + | | | | | |--RPAREN -> ) [40:67] + | | | | | `--RPAREN -> ) [40:68] + | | | | |--LAMBDA -> -> [41:24] + | | | | |--EXPR -> EXPR [41:27] + | | | | | `--NUM_INT -> 2 [41:27] + | | | | `--SEMI -> ; [41:28] + | | | |--SWITCH_RULE -> SWITCH_RULE [42:8] + | | | | |--LITERAL_CASE -> case [42:8] + | | | | | `--PATTERN_DEF -> PATTERN_DEF [43:18] + | | | | | `--LITERAL_WHEN -> when [43:18] + | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [42:13] + | | | | | | |--MODIFIERS -> MODIFIERS [42:13] + | | | | | | |--TYPE -> TYPE [42:13] + | | | | | | | |--IDENT -> when [42:13] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [42:17] + | | | | | | | |--GENERIC_START -> < [42:17] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [42:18] + | | | | | | | | |--IDENT -> when [42:18] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [42:22] + | | | | | | | | |--GENERIC_START -> < [42:22] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [42:23] + | | | | | | | | | `--IDENT -> T [42:23] + | | | | | | | | `--GENERIC_END -> > [42:24] + | | | | | | | `--GENERIC_END -> > [42:25] + | | | | | | |--LPAREN -> ( [42:26] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [42:27] + | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [42:27] + | | | | | | | |--MODIFIERS -> MODIFIERS [42:27] + | | | | | | | |--TYPE -> TYPE [42:27] + | | | | | | | | |--IDENT -> when [42:27] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [42:31] + | | | | | | | | |--GENERIC_START -> < [42:31] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [42:32] + | | | | | | | | | |--IDENT -> when [42:32] + | | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [42:36] + | | | | | | | | | |--GENERIC_START -> < [42:36] + | | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [42:37] + | | | | | | | | | | `--IDENT -> T [42:37] + | | | | | | | | | `--GENERIC_END -> > [42:38] + | | | | | | | | `--GENERIC_END -> > [42:39] + | | | | | | | |--LPAREN -> ( [42:40] + | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [42:41] + | | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [42:41] + | | | | | | | | |--MODIFIERS -> MODIFIERS [42:41] + | | | | | | | | |--TYPE -> TYPE [42:41] + | | | | | | | | | |--IDENT -> when [42:41] + | | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [42:45] + | | | | | | | | | |--GENERIC_START -> < [42:45] + | | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [42:46] + | | | | | | | | | | |--IDENT -> when [42:46] + | | | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [42:50] + | | | | | | | | | | |--GENERIC_START -> < [42:50] + | | | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [42:51] + | | | | | | | | | | | `--IDENT -> T [42:51] + | | | | | | | | | | `--GENERIC_END -> > [42:52] + | | | | | | | | | `--GENERIC_END -> > [42:53] + | | | | | | | | `--IDENT -> w2 [42:55] + | | | | | | | |--RPAREN -> ) [42:57] + | | | | | | | `--IDENT -> w1 [42:59] + | | | | | | `--RPAREN -> ) [42:61] + | | | | | `--LOR -> || [44:24] + | | | | | |--LPAREN -> ( [43:23] + | | | | | |--LPAREN -> ( [43:24] + | | | | | |--LPAREN -> ( [43:25] + | | | | | |--METHOD_CALL -> ( [43:60] + | | | | | | |--DOT -> . [43:53] + | | | | | | | |--DOT -> . [43:48] + | | | | | | | | |--DOT -> . [43:43] + | | | | | | | | | |--DOT -> . [43:38] + | | | | | | | | | | |--DOT -> . [43:33] + | | | | | | | | | | | |--DOT -> . [43:28] + | | | | | | | | | | | | |--IDENT -> w1 [43:26] + | | | | | | | | | | | | `--IDENT -> when [43:29] + | | | | | | | | | | | `--IDENT -> when [43:34] + | | | | | | | | | | `--IDENT -> when [43:39] + | | | | | | | | | `--IDENT -> when [43:44] + | | | | | | | | `--IDENT -> when [43:49] + | | | | | | | `--IDENT -> equals [43:54] + | | | | | | |--ELIST -> ELIST [43:61] + | | | | | | | `--EXPR -> EXPR [43:61] + | | | | | | | `--LITERAL_NULL -> null [43:61] + | | | | | | `--RPAREN -> ) [43:65] + | | | | | |--RPAREN -> ) [43:66] + | | | | | |--RPAREN -> ) [43:67] + | | | | | |--RPAREN -> ) [43:68] + | | | | | `--METHOD_CALL -> ( [44:44] + | | | | | |--DOT -> . [44:37] + | | | | | | |--LPAREN -> ( [44:27] + | | | | | | |--TYPECAST -> ( [44:28] + | | | | | | | |--TYPE -> TYPE [44:29] + | | | | | | | | `--IDENT -> when [44:29] + | | | | | | | |--RPAREN -> ) [44:33] + | | | | | | | `--IDENT -> w2 [44:34] + | | | | | | |--RPAREN -> ) [44:36] + | | | | | | `--IDENT -> equals [44:38] + | | | | | |--ELIST -> ELIST [44:45] + | | | | | | `--EXPR -> EXPR [44:45] + | | | | | | |--LPAREN -> ( [44:45] + | | | | | | |--TYPECAST -> ( [44:46] + | | | | | | | |--TYPE -> TYPE [44:47] + | | | | | | | | `--IDENT -> when [44:47] + | | | | | | | |--RPAREN -> ) [44:51] + | | | | | | | `--IDENT -> w1 [44:52] + | | | | | | `--RPAREN -> ) [44:54] + | | | | | `--RPAREN -> ) [44:55] + | | | | |--LAMBDA -> -> [44:56] + | | | | |--EXPR -> EXPR [44:59] + | | | | | `--NUM_INT -> 2 [44:59] + | | | | `--SEMI -> ; [44:60] + | | | |--SWITCH_RULE -> SWITCH_RULE [45:8] + | | | | |--LITERAL_CASE -> case [45:8] + | | | | | `--PATTERN_DEF -> PATTERN_DEF [46:18] + | | | | | `--LITERAL_WHEN -> when [46:18] + | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [45:13] + | | | | | | |--MODIFIERS -> MODIFIERS [45:13] + | | | | | | |--TYPE -> TYPE [45:13] + | | | | | | | |--IDENT -> when [45:13] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [45:17] + | | | | | | | |--GENERIC_START -> < [45:17] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [45:18] + | | | | | | | | |--IDENT -> when [45:18] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [45:22] + | | | | | | | | |--GENERIC_START -> < [45:22] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [45:23] + | | | | | | | | | `--IDENT -> T [45:23] + | | | | | | | | `--GENERIC_END -> > [45:24] + | | | | | | | `--GENERIC_END -> > [45:25] + | | | | | | |--LPAREN -> ( [45:26] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [45:27] + | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [45:27] + | | | | | | | |--MODIFIERS -> MODIFIERS [45:27] + | | | | | | | |--TYPE -> TYPE [45:27] + | | | | | | | | |--IDENT -> when [45:27] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [45:31] + | | | | | | | | |--GENERIC_START -> < [45:31] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [45:32] + | | | | | | | | | |--IDENT -> when [45:32] + | | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [45:36] + | | | | | | | | | |--GENERIC_START -> < [45:36] + | | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [45:37] + | | | | | | | | | | `--IDENT -> T [45:37] + | | | | | | | | | `--GENERIC_END -> > [45:38] + | | | | | | | | `--GENERIC_END -> > [45:39] + | | | | | | | |--LPAREN -> ( [45:40] + | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [45:41] + | | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [45:41] + | | | | | | | | |--MODIFIERS -> MODIFIERS [45:41] + | | | | | | | | |--TYPE -> TYPE [45:41] + | | | | | | | | | |--IDENT -> when [45:41] + | | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [45:45] + | | | | | | | | | |--GENERIC_START -> < [45:45] + | | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [45:46] + | | | | | | | | | | |--IDENT -> when [45:46] + | | | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [45:50] + | | | | | | | | | | |--GENERIC_START -> < [45:50] + | | | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [45:51] + | | | | | | | | | | | `--IDENT -> T [45:51] + | | | | | | | | | | `--GENERIC_END -> > [45:52] + | | | | | | | | | `--GENERIC_END -> > [45:53] + | | | | | | | | `--IDENT -> w2 [45:55] + | | | | | | | |--RPAREN -> ) [45:57] + | | | | | | | `--IDENT -> w1 [45:59] + | | | | | | `--RPAREN -> ) [45:61] + | | | | | `--LOR -> || [47:24] + | | | | | |--NOT_EQUAL -> != [46:28] + | | | | | | |--IDENT -> when [46:23] + | | | | | | `--LITERAL_NULL -> null [46:31] + | | | | | `--METHOD_CALL -> ( [47:44] + | | | | | |--DOT -> . [47:37] + | | | | | | |--LPAREN -> ( [47:27] + | | | | | | |--TYPECAST -> ( [47:28] + | | | | | | | |--TYPE -> TYPE [47:29] + | | | | | | | | `--IDENT -> when [47:29] + | | | | | | | |--RPAREN -> ) [47:33] + | | | | | | | `--IDENT -> w2 [47:34] + | | | | | | |--RPAREN -> ) [47:36] + | | | | | | `--IDENT -> equals [47:38] + | | | | | |--ELIST -> ELIST [47:45] + | | | | | | `--EXPR -> EXPR [47:45] + | | | | | | |--LPAREN -> ( [47:45] + | | | | | | |--TYPECAST -> ( [47:46] + | | | | | | | |--TYPE -> TYPE [47:47] + | | | | | | | | `--IDENT -> when [47:47] + | | | | | | | |--RPAREN -> ) [47:51] + | | | | | | | `--IDENT -> w1 [47:52] + | | | | | | `--RPAREN -> ) [47:54] + | | | | | `--RPAREN -> ) [47:55] + | | | | |--LAMBDA -> -> [47:56] + | | | | |--EXPR -> EXPR [47:59] + | | | | | `--NUM_INT -> 2 [47:59] + | | | | `--SEMI -> ; [47:60] + | | | |--SWITCH_RULE -> SWITCH_RULE [48:8] + | | | | |--LITERAL_CASE -> case [48:8] + | | | | | `--PATTERN_DEF -> PATTERN_DEF [48:37] + | | | | | `--LITERAL_WHEN -> when [48:37] + | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [48:13] + | | | | | | |--MODIFIERS -> MODIFIERS [48:13] + | | | | | | |--TYPE -> TYPE [48:13] + | | | | | | | |--IDENT -> when [48:13] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [48:17] + | | | | | | | |--GENERIC_START -> < [48:17] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [48:18] + | | | | | | | | |--IDENT -> when [48:18] + | | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [48:22] + | | | | | | | | |--GENERIC_START -> < [48:22] + | | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [48:23] + | | | | | | | | | `--IDENT -> T [48:23] + | | | | | | | | `--GENERIC_END -> > [48:24] + | | | | | | | `--GENERIC_END -> > [48:25] + | | | | | | |--LPAREN -> ( [48:26] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [48:27] + | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [48:27] + | | | | | | | |--MODIFIERS -> MODIFIERS [48:27] + | | | | | | | |--TYPE -> TYPE [48:27] + | | | | | | | | `--IDENT -> Object [48:27] + | | | | | | | `--IDENT -> w [48:34] + | | | | | | `--RPAREN -> ) [48:35] + | | | | | `--NOT_EQUAL -> != [48:47] + | | | | | |--IDENT -> when [48:42] + | | | | | `--LITERAL_NULL -> null [48:50] + | | | | |--LAMBDA -> -> [48:55] + | | | | |--EXPR -> EXPR [48:58] + | | | | | `--NUM_INT -> 9 [48:58] + | | | | `--SEMI -> ; [48:59] + | | | |--SWITCH_RULE -> SWITCH_RULE [49:10] + | | | | |--LITERAL_CASE -> case [49:10] + | | | | | |--LITERAL_DEFAULT -> default [49:15] + | | | | | |--COMMA -> , [49:22] + | | | | | `--EXPR -> EXPR [49:24] + | | | | | `--LITERAL_NULL -> null [49:24] + | | | | |--LAMBDA -> -> [49:29] + | | | | |--EXPR -> EXPR [49:32] + | | | | | `--NUM_INT -> 1 [49:32] + | | | | `--SEMI -> ; [49:33] + | | | `--RCURLY -> } [50:8] + | | `--SEMI -> ; [50:9] + | `--RCURLY -> } [51:4] + |--METHOD_DEF -> METHOD_DEF [53:4] + | |--MODIFIERS -> MODIFIERS [53:4] + | |--TYPE -> TYPE [53:4] + | | `--IDENT -> Object [53:4] + | |--IDENT -> m3 [53:11] + | |--LPAREN -> ( [53:13] + | |--PARAMETERS -> PARAMETERS [53:14] + | | `--PARAMETER_DEF -> PARAMETER_DEF [53:14] + | | |--MODIFIERS -> MODIFIERS [53:14] + | | |--TYPE -> TYPE [53:14] + | | | |--IDENT -> when [53:14] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [53:18] + | | | |--GENERIC_START -> < [53:18] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [53:19] + | | | | `--IDENT -> String [53:19] + | | | `--GENERIC_END -> > [53:25] + | | `--IDENT -> when [53:27] + | |--RPAREN -> ) [53:31] + | `--SLIST -> { [53:33] + | |--LITERAL_IF -> if [54:8] + | | |--LPAREN -> ( [54:11] + | | |--EXPR -> EXPR [54:17] + | | | `--LITERAL_INSTANCEOF -> instanceof [54:17] + | | | |--IDENT -> when [54:12] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [54:28] + | | | |--MODIFIERS -> MODIFIERS [54:28] + | | | |--TYPE -> TYPE [54:28] + | | | | |--IDENT -> when [54:28] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [54:32] + | | | | |--GENERIC_START -> < [54:32] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [54:33] + | | | | | `--IDENT -> String [54:33] + | | | | `--GENERIC_END -> > [54:39] + | | | |--LPAREN -> ( [54:40] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [54:41] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [54:41] + | | | | |--MODIFIERS -> MODIFIERS [54:41] + | | | | |--TYPE -> TYPE [54:41] + | | | | | |--IDENT -> when [54:41] + | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [54:45] + | | | | | |--GENERIC_START -> < [54:45] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [54:46] + | | | | | | `--IDENT -> String [54:46] + | | | | | `--GENERIC_END -> > [54:52] + | | | | `--IDENT -> w1 [54:54] + | | | `--RPAREN -> ) [54:56] + | | |--RPAREN -> ) [54:57] + | | |--SLIST -> { [54:59] + | | | |--LITERAL_RETURN -> return [55:12] + | | | | |--EXPR -> EXPR [55:33] + | | | | | `--DOT -> . [55:33] + | | | | | |--METHOD_CALL -> ( [55:31] + | | | | | | |--DOT -> . [55:26] + | | | | | | | |--DOT -> . [55:21] + | | | | | | | | |--IDENT -> w1 [55:19] + | | | | | | | | `--IDENT -> when [55:22] + | | | | | | | `--IDENT -> when [55:27] + | | | | | | |--ELIST -> ELIST [55:32] + | | | | | | `--RPAREN -> ) [55:32] + | | | | | `--IDENT -> when [55:34] + | | | | `--SEMI -> ; [55:38] + | | | `--RCURLY -> } [56:8] + | | `--LITERAL_ELSE -> else [57:8] + | | `--LITERAL_IF -> if [57:13] + | | |--LPAREN -> ( [57:16] + | | |--EXPR -> EXPR [57:22] + | | | `--LITERAL_INSTANCEOF -> instanceof [57:22] + | | | |--IDENT -> when [57:17] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [57:33] + | | | |--MODIFIERS -> MODIFIERS [57:33] + | | | |--TYPE -> TYPE [57:33] + | | | | |--IDENT -> when [57:33] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [57:37] + | | | | |--GENERIC_START -> < [57:37] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [57:38] + | | | | | `--IDENT -> String [57:38] + | | | | `--GENERIC_END -> > [57:44] + | | | |--LPAREN -> ( [57:45] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [57:46] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [57:46] + | | | | |--MODIFIERS -> MODIFIERS [57:46] + | | | | |--TYPE -> TYPE [57:46] + | | | | | |--IDENT -> when [57:46] + | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [57:50] + | | | | | |--GENERIC_START -> < [57:50] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [57:51] + | | | | | | `--IDENT -> String [57:51] + | | | | | `--GENERIC_END -> > [57:57] + | | | | |--LPAREN -> ( [57:58] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [57:59] + | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [57:59] + | | | | | |--MODIFIERS -> MODIFIERS [57:59] + | | | | | |--TYPE -> TYPE [57:59] + | | | | | | |--IDENT -> when [57:59] + | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [57:63] + | | | | | | |--GENERIC_START -> < [57:63] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [57:64] + | | | | | | | `--IDENT -> String [57:64] + | | | | | | `--GENERIC_END -> > [57:70] + | | | | | `--IDENT -> s1 [57:72] + | | | | `--RPAREN -> ) [57:74] + | | | |--RPAREN -> ) [57:75] + | | | `--IDENT -> w1 [57:77] + | | |--RPAREN -> ) [57:79] + | | |--SLIST -> { [57:81] + | | | |--LITERAL_IF -> if [58:12] + | | | | |--LPAREN -> ( [58:15] + | | | | |--EXPR -> EXPR [58:27] + | | | | | `--METHOD_CALL -> ( [58:27] + | | | | | |--DOT -> . [58:20] + | | | | | | |--STRING_LITERAL -> "s1" [58:16] + | | | | | | `--IDENT -> equals [58:21] + | | | | | |--ELIST -> ELIST [58:28] + | | | | | | `--EXPR -> EXPR [58:28] + | | | | | | `--IDENT -> s1 [58:28] + | | | | | `--RPAREN -> ) [58:30] + | | | | |--RPAREN -> ) [58:31] + | | | | |--SLIST -> { [58:33] + | | | | | |--LITERAL_RETURN -> return [59:16] + | | | | | | |--EXPR -> EXPR [59:23] + | | | | | | | `--IDENT -> s1 [59:23] + | | | | | | `--SEMI -> ; [59:25] + | | | | | `--RCURLY -> } [60:12] + | | | | `--LITERAL_ELSE -> else [60:14] + | | | | `--SLIST -> { [60:19] + | | | | |--LITERAL_RETURN -> return [61:16] + | | | | | |--EXPR -> EXPR [61:23] + | | | | | | `--IDENT -> w1 [61:23] + | | | | | `--SEMI -> ; [61:25] + | | | | `--RCURLY -> } [62:12] + | | | `--RCURLY -> } [63:8] + | | `--LITERAL_ELSE -> else [64:8] + | | `--LITERAL_IF -> if [64:13] + | | |--LPAREN -> ( [64:16] + | | |--EXPR -> EXPR [65:20] + | | | `--LAND -> && [65:20] + | | | |--LITERAL_INSTANCEOF -> instanceof [64:22] + | | | | |--IDENT -> when [64:17] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [64:33] + | | | | |--MODIFIERS -> MODIFIERS [64:33] + | | | | |--TYPE -> TYPE [64:33] + | | | | | |--IDENT -> when [64:33] + | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [64:37] + | | | | | |--GENERIC_START -> < [64:37] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [64:38] + | | | | | | `--IDENT -> String [64:38] + | | | | | `--GENERIC_END -> > [64:44] + | | | | |--LPAREN -> ( [64:45] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [64:46] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [64:46] + | | | | | |--MODIFIERS -> MODIFIERS [64:46] + | | | | | |--TYPE -> TYPE [64:46] + | | | | | | |--IDENT -> when [64:46] + | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [64:50] + | | | | | | |--GENERIC_START -> < [64:50] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [64:51] + | | | | | | | `--IDENT -> String [64:51] + | | | | | | `--GENERIC_END -> > [64:57] + | | | | | |--LPAREN -> ( [64:58] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [64:59] + | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [64:59] + | | | | | | |--MODIFIERS -> MODIFIERS [64:59] + | | | | | | |--TYPE -> TYPE [64:59] + | | | | | | | |--IDENT -> when [64:59] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [64:63] + | | | | | | | |--GENERIC_START -> < [64:63] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [64:64] + | | | | | | | | `--IDENT -> String [64:64] + | | | | | | | `--GENERIC_END -> > [64:70] + | | | | | | `--IDENT -> s1 [64:72] + | | | | | `--RPAREN -> ) [64:74] + | | | | |--RPAREN -> ) [64:75] + | | | | `--IDENT -> w1 [64:77] + | | | `--METHOD_CALL -> ( [65:43] + | | | |--DOT -> . [65:36] + | | | | |--METHOD_CALL -> ( [65:34] + | | | | | |--DOT -> . [65:25] + | | | | | | |--IDENT -> s1 [65:23] + | | | | | | `--IDENT -> toString [65:26] + | | | | | |--ELIST -> ELIST [65:35] + | | | | | `--RPAREN -> ) [65:35] + | | | | `--IDENT -> equals [65:37] + | | | |--ELIST -> ELIST [65:55] + | | | | `--EXPR -> EXPR [65:55] + | | | | `--METHOD_CALL -> ( [65:55] + | | | | |--DOT -> . [65:46] + | | | | | |--IDENT -> w1 [65:44] + | | | | | `--IDENT -> toString [65:47] + | | | | |--ELIST -> ELIST [65:56] + | | | | `--RPAREN -> ) [65:56] + | | | `--RPAREN -> ) [65:57] + | | |--RPAREN -> ) [65:58] + | | |--SLIST -> { [65:60] + | | | |--LITERAL_IF -> if [66:12] + | | | | |--LPAREN -> ( [66:15] + | | | | |--EXPR -> EXPR [66:27] + | | | | | `--METHOD_CALL -> ( [66:27] + | | | | | |--DOT -> . [66:20] + | | | | | | |--STRING_LITERAL -> "s1" [66:16] + | | | | | | `--IDENT -> equals [66:21] + | | | | | |--ELIST -> ELIST [66:28] + | | | | | | `--EXPR -> EXPR [66:28] + | | | | | | `--IDENT -> s1 [66:28] + | | | | | `--RPAREN -> ) [66:30] + | | | | |--RPAREN -> ) [66:31] + | | | | |--SLIST -> { [66:33] + | | | | | |--LITERAL_RETURN -> return [67:16] + | | | | | | |--EXPR -> EXPR [67:23] + | | | | | | | `--IDENT -> s1 [67:23] + | | | | | | `--SEMI -> ; [67:25] + | | | | | `--RCURLY -> } [68:12] + | | | | `--LITERAL_ELSE -> else [68:14] + | | | | `--SLIST -> { [68:19] + | | | | |--LITERAL_RETURN -> return [69:16] + | | | | | |--EXPR -> EXPR [69:23] + | | | | | | `--IDENT -> w1 [69:23] + | | | | | `--SEMI -> ; [69:25] + | | | | `--RCURLY -> } [70:12] + | | | `--RCURLY -> } [71:8] + | | `--LITERAL_ELSE -> else [72:8] + | | `--LITERAL_IF -> if [72:13] + | | |--LPAREN -> ( [72:16] + | | |--EXPR -> EXPR [72:17] + | | | `--LNOT -> ! [72:17] + | | | |--LPAREN -> ( [72:18] + | | | |--LITERAL_INSTANCEOF -> instanceof [72:24] + | | | | |--IDENT -> when [72:19] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [72:35] + | | | | |--MODIFIERS -> MODIFIERS [72:35] + | | | | |--TYPE -> TYPE [72:35] + | | | | | |--IDENT -> when [72:35] + | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [72:39] + | | | | | |--GENERIC_START -> < [72:39] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [72:40] + | | | | | | `--IDENT -> String [72:40] + | | | | | `--GENERIC_END -> > [72:46] + | | | | |--LPAREN -> ( [72:47] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [72:48] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [72:48] + | | | | | |--MODIFIERS -> MODIFIERS [72:48] + | | | | | |--TYPE -> TYPE [72:48] + | | | | | | |--IDENT -> when [72:48] + | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [72:52] + | | | | | | |--GENERIC_START -> < [72:52] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [72:53] + | | | | | | | `--IDENT -> String [72:53] + | | | | | | `--GENERIC_END -> > [72:59] + | | | | | |--LPAREN -> ( [72:60] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [72:61] + | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [72:61] + | | | | | | |--MODIFIERS -> MODIFIERS [72:61] + | | | | | | |--TYPE -> TYPE [72:61] + | | | | | | | |--IDENT -> when [72:61] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [72:65] + | | | | | | | |--GENERIC_START -> < [72:65] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [72:66] + | | | | | | | | `--IDENT -> String [72:66] + | | | | | | | `--GENERIC_END -> > [72:72] + | | | | | | `--IDENT -> s1 [72:74] + | | | | | `--RPAREN -> ) [72:76] + | | | | |--RPAREN -> ) [72:77] + | | | | `--IDENT -> w1 [72:79] + | | | `--RPAREN -> ) [72:81] + | | |--RPAREN -> ) [72:82] + | | |--SLIST -> { [72:84] + | | | |--LITERAL_RETURN -> return [73:12] + | | | | |--EXPR -> EXPR [73:19] + | | | | | `--LITERAL_NEW -> new [73:19] + | | | | | |--IDENT -> Object [73:23] + | | | | | |--LPAREN -> ( [73:29] + | | | | | |--ELIST -> ELIST [73:30] + | | | | | `--RPAREN -> ) [73:30] + | | | | `--SEMI -> ; [73:31] + | | | `--RCURLY -> } [74:8] + | | `--LITERAL_ELSE -> else [75:8] + | | `--SLIST -> { [75:13] + | | |--LITERAL_RETURN -> return [76:12] + | | | |--EXPR -> EXPR [76:39] + | | | | `--METHOD_CALL -> ( [76:39] + | | | | |--DOT -> . [76:32] + | | | | | |--METHOD_CALL -> ( [76:30] + | | | | | | |--DOT -> . [76:21] + | | | | | | | |--IDENT -> s1 [76:19] + | | | | | | | `--IDENT -> toString [76:22] + | | | | | | |--ELIST -> ELIST [76:31] + | | | | | | `--RPAREN -> ) [76:31] + | | | | | `--IDENT -> equals [76:33] + | | | | |--ELIST -> ELIST [76:51] + | | | | | `--EXPR -> EXPR [76:51] + | | | | | `--METHOD_CALL -> ( [76:51] + | | | | | |--DOT -> . [76:42] + | | | | | | |--IDENT -> w1 [76:40] + | | | | | | `--IDENT -> toString [76:43] + | | | | | |--ELIST -> ELIST [76:52] + | | | | | `--RPAREN -> ) [76:52] + | | | | `--RPAREN -> ) [76:53] + | | | `--SEMI -> ; [76:54] + | | `--RCURLY -> } [77:8] + | `--RCURLY -> } [78:4] + `--RCURLY -> } [79:0] diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/ExpectedJava19PatternsInNullSwitch1.txt b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/ExpectedJava19PatternsInNullSwitch1.txt --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/ExpectedJava19PatternsInNullSwitch1.txt +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/ExpectedJava19PatternsInNullSwitch1.txt @@ -51,6 +51,106 @@ COMPILATION_UNIT -> COMPILATION_UNIT [2:0] | `--OBJBLOCK -> OBJBLOCK [8:22] | |--LCURLY -> { [8:22] | `--RCURLY -> } [8:23] + |--METHOD_DEF -> METHOD_DEF [10:4] + | |--MODIFIERS -> MODIFIERS [10:4] + | | `--LITERAL_PRIVATE -> private [10:4] + | |--TYPE -> TYPE [10:12] + | | `--LITERAL_INT -> int [10:12] + | |--IDENT -> matchingSwitch14 [10:16] + | |--LPAREN -> ( [10:32] + | |--PARAMETERS -> PARAMETERS [10:33] + | | `--PARAMETER_DEF -> PARAMETER_DEF [10:33] + | | |--MODIFIERS -> MODIFIERS [10:33] + | | |--TYPE -> TYPE [10:33] + | | | `--IDENT -> R [10:33] + | | `--IDENT -> r [10:35] + | |--RPAREN -> ) [10:36] + | `--SLIST -> { [10:38] + | |--LITERAL_RETURN -> return [11:8] + | | |--EXPR -> EXPR [11:15] + | | | `--LITERAL_SWITCH -> switch [11:15] + | | | |--LPAREN -> ( [11:21] + | | | |--EXPR -> EXPR [11:22] + | | | | `--IDENT -> r [11:22] + | | | |--RPAREN -> ) [11:23] + | | | |--LCURLY -> { [11:25] + | | | |--SWITCH_RULE -> SWITCH_RULE [12:12] + | | | | |--LITERAL_CASE -> case [12:12] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [12:17] + | | | | | |--MODIFIERS -> MODIFIERS [12:17] + | | | | | |--TYPE -> TYPE [12:17] + | | | | | | `--IDENT -> R [12:17] + | | | | | |--LPAREN -> ( [12:18] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [12:19] + | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [12:19] + | | | | | | |--MODIFIERS -> MODIFIERS [12:19] + | | | | | | |--TYPE -> TYPE [12:19] + | | | | | | | `--IDENT -> Super [12:19] + | | | | | | `--IDENT -> s [12:25] + | | | | | `--RPAREN -> ) [12:26] + | | | | |--LAMBDA -> -> [12:28] + | | | | |--EXPR -> EXPR [12:31] + | | | | | `--NUM_INT -> 1 [12:31] + | | | | `--SEMI -> ; [12:32] + | | | |--SWITCH_RULE -> SWITCH_RULE [13:12] + | | | | |--LITERAL_DEFAULT -> default [13:12] + | | | | |--LAMBDA -> -> [13:20] + | | | | |--EXPR -> EXPR [13:23] + | | | | | `--NUM_INT -> 2 [13:23] + | | | | `--SEMI -> ; [13:24] + | | | `--RCURLY -> } [14:8] + | | `--SEMI -> ; [14:9] + | `--RCURLY -> } [15:4] + |--METHOD_DEF -> METHOD_DEF [17:4] + | |--MODIFIERS -> MODIFIERS [17:4] + | | `--LITERAL_PRIVATE -> private [17:4] + | |--TYPE -> TYPE [17:12] + | | `--LITERAL_INT -> int [17:12] + | |--IDENT -> matchingSwitch15 [17:16] + | |--LPAREN -> ( [17:32] + | |--PARAMETERS -> PARAMETERS [17:33] + | | `--PARAMETER_DEF -> PARAMETER_DEF [17:33] + | | |--MODIFIERS -> MODIFIERS [17:33] + | | |--TYPE -> TYPE [17:33] + | | | `--IDENT -> R [17:33] + | | `--IDENT -> r [17:35] + | |--RPAREN -> ) [17:36] + | `--SLIST -> { [17:38] + | |--LITERAL_RETURN -> return [18:8] + | | |--EXPR -> EXPR [18:15] + | | | `--LITERAL_SWITCH -> switch [18:15] + | | | |--LPAREN -> ( [18:21] + | | | |--EXPR -> EXPR [18:22] + | | | | `--IDENT -> r [18:22] + | | | |--RPAREN -> ) [18:23] + | | | |--LCURLY -> { [18:25] + | | | |--SWITCH_RULE -> SWITCH_RULE [19:12] + | | | | |--LITERAL_CASE -> case [19:12] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [19:17] + | | | | | |--MODIFIERS -> MODIFIERS [19:17] + | | | | | |--TYPE -> TYPE [19:17] + | | | | | | `--IDENT -> R [19:17] + | | | | | |--LPAREN -> ( [19:18] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [19:19] + | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [19:19] + | | | | | | |--MODIFIERS -> MODIFIERS [19:19] + | | | | | | |--TYPE -> TYPE [19:19] + | | | | | | | `--IDENT -> Sub [19:19] + | | | | | | `--IDENT -> s [19:23] + | | | | | `--RPAREN -> ) [19:24] + | | | | |--LAMBDA -> -> [19:26] + | | | | |--EXPR -> EXPR [19:29] + | | | | | `--NUM_INT -> 1 [19:29] + | | | | `--SEMI -> ; [19:30] + | | | |--SWITCH_RULE -> SWITCH_RULE [20:12] + | | | | |--LITERAL_DEFAULT -> default [20:12] + | | | | |--LAMBDA -> -> [20:20] + | | | | |--EXPR -> EXPR [20:23] + | | | | | `--NUM_INT -> 2 [20:23] + | | | | `--SEMI -> ; [20:24] + | | | `--RCURLY -> } [21:8] + | | `--SEMI -> ; [21:9] + | `--RCURLY -> } [22:4] |--METHOD_DEF -> METHOD_DEF [24:4] | |--MODIFIERS -> MODIFIERS [24:4] | | `--LITERAL_PRIVATE -> private [24:4] diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/ExpectedJava19RecordDecompositionWithConditionInLoops.txt b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/ExpectedJava19RecordDecompositionWithConditionInLoops.txt new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/ExpectedJava19RecordDecompositionWithConditionInLoops.txt @@ -0,0 +1,1124 @@ +COMPILATION_UNIT -> COMPILATION_UNIT [2:0] +|--PACKAGE_DEF -> package [2:0] +| |--ANNOTATIONS -> ANNOTATIONS [2:47] +| |--DOT -> . [2:47] +| | |--DOT -> . [2:39] +| | | |--DOT -> . [2:28] +| | | | |--DOT -> . [2:22] +| | | | | |--DOT -> . [2:11] +| | | | | | |--IDENT -> com [2:8] +| | | | | | `--IDENT -> puppycrawl [2:12] +| | | | | `--IDENT -> tools [2:23] +| | | | `--IDENT -> checkstyle [2:29] +| | | `--IDENT -> grammar [2:40] +| | `--IDENT -> java19 [2:48] +| `--SEMI -> ; [2:54] +|--IMPORT -> import [4:0] +| |--DOT -> . [4:16] +| | |--DOT -> . [4:11] +| | | |--IDENT -> java [4:7] +| | | `--IDENT -> util [4:12] +| | `--IDENT -> Iterator [4:17] +| `--SEMI -> ; [4:25] +|--IMPORT -> import [5:0] +| |--DOT -> . [5:16] +| | |--DOT -> . [5:11] +| | | |--IDENT -> java [5:7] +| | | `--IDENT -> util [5:12] +| | `--IDENT -> List [5:17] +| `--SEMI -> ; [5:21] +`--CLASS_DEF -> CLASS_DEF [7:0] + |--MODIFIERS -> MODIFIERS [7:0] + | `--LITERAL_PUBLIC -> public [7:0] + |--LITERAL_CLASS -> class [7:7] + |--IDENT -> InputJava19RecordDecompositionWithConditionInLoops [7:13] + `--OBJBLOCK -> OBJBLOCK [7:64] + |--LCURLY -> { [7:64] + |--RECORD_DEF -> RECORD_DEF [8:4] + | |--MODIFIERS -> MODIFIERS [8:4] + | |--LITERAL_RECORD -> record [8:4] + | |--IDENT -> R [8:11] + | |--LPAREN -> ( [8:12] + | |--RECORD_COMPONENTS -> RECORD_COMPONENTS [8:13] + | | `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [8:13] + | | |--ANNOTATIONS -> ANNOTATIONS [8:13] + | | |--TYPE -> TYPE [8:13] + | | | `--IDENT -> R [8:13] + | | `--IDENT -> r [8:15] + | |--RPAREN -> ) [8:16] + | `--OBJBLOCK -> OBJBLOCK [8:18] + | |--LCURLY -> { [8:18] + | `--RCURLY -> } [10:4] + |--METHOD_DEF -> METHOD_DEF [12:4] + | |--MODIFIERS -> MODIFIERS [12:4] + | | |--LITERAL_PUBLIC -> public [12:4] + | | `--LITERAL_STATIC -> static [12:11] + | |--TYPE -> TYPE [12:18] + | | `--LITERAL_VOID -> void [12:18] + | |--IDENT -> main [12:23] + | |--LPAREN -> ( [12:27] + | |--PARAMETERS -> PARAMETERS [12:28] + | | `--PARAMETER_DEF -> PARAMETER_DEF [12:28] + | | |--MODIFIERS -> MODIFIERS [12:28] + | | |--TYPE -> TYPE [12:28] + | | | `--IDENT -> String [12:28] + | | |--ELLIPSIS -> ... [12:34] + | | `--IDENT -> args [12:38] + | |--RPAREN -> ) [12:42] + | `--SLIST -> { [12:44] + | |--VARIABLE_DEF -> VARIABLE_DEF [13:8] + | | |--MODIFIERS -> MODIFIERS [13:8] + | | |--TYPE -> TYPE [13:8] + | | | `--IDENT -> R [13:8] + | | |--IDENT -> r [13:10] + | | `--ASSIGN -> = [13:12] + | | `--EXPR -> EXPR [13:14] + | | `--LITERAL_NEW -> new [13:14] + | | |--IDENT -> R [13:18] + | | |--LPAREN -> ( [13:19] + | | |--ELIST -> ELIST [13:20] + | | | `--EXPR -> EXPR [13:20] + | | | `--LITERAL_NEW -> new [13:20] + | | | |--IDENT -> R [13:24] + | | | |--LPAREN -> ( [13:25] + | | | |--ELIST -> ELIST [13:26] + | | | | `--EXPR -> EXPR [13:26] + | | | | `--LITERAL_NULL -> null [13:26] + | | | `--RPAREN -> ) [13:30] + | | `--RPAREN -> ) [13:31] + | |--SEMI -> ; [13:32] + | |--LITERAL_IF -> if [14:8] + | | |--LPAREN -> ( [14:11] + | | |--EXPR -> EXPR [14:14] + | | | `--LITERAL_INSTANCEOF -> instanceof [14:14] + | | | |--IDENT -> r [14:12] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [14:25] + | | | |--MODIFIERS -> MODIFIERS [14:25] + | | | |--TYPE -> TYPE [14:25] + | | | | `--IDENT -> R [14:25] + | | | |--LPAREN -> ( [14:26] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [14:27] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [14:27] + | | | | |--MODIFIERS -> MODIFIERS [14:27] + | | | | |--TYPE -> TYPE [14:27] + | | | | | `--IDENT -> R [14:27] + | | | | `--IDENT -> recordComponent [14:29] + | | | |--RPAREN -> ) [14:44] + | | | `--IDENT -> r1 [14:46] + | | |--RPAREN -> ) [14:48] + | | |--SLIST -> { [14:50] + | | | |--EXPR -> EXPR [15:30] + | | | | `--METHOD_CALL -> ( [15:30] + | | | | |--DOT -> . [15:22] + | | | | | |--DOT -> . [15:18] + | | | | | | |--IDENT -> System [15:12] + | | | | | | `--IDENT -> out [15:19] + | | | | | `--IDENT -> println [15:23] + | | | | |--ELIST -> ELIST [15:31] + | | | | | `--EXPR -> EXPR [15:31] + | | | | | `--IDENT -> recordComponent [15:31] + | | | | `--RPAREN -> ) [15:46] + | | | |--SEMI -> ; [15:47] + | | | `--RCURLY -> } [16:8] + | | `--LITERAL_ELSE -> else [16:10] + | | `--LITERAL_IF -> if [16:15] + | | |--LPAREN -> ( [16:18] + | | |--EXPR -> EXPR [16:21] + | | | `--LITERAL_INSTANCEOF -> instanceof [16:21] + | | | |--IDENT -> r [16:19] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [16:32] + | | | |--MODIFIERS -> MODIFIERS [16:32] + | | | |--TYPE -> TYPE [16:32] + | | | | `--IDENT -> R [16:32] + | | | |--LPAREN -> ( [16:33] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [16:34] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [16:34] + | | | | |--MODIFIERS -> MODIFIERS [16:34] + | | | | |--TYPE -> TYPE [16:34] + | | | | | `--IDENT -> R [16:34] + | | | | |--LPAREN -> ( [16:35] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [16:36] + | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [16:36] + | | | | | |--MODIFIERS -> MODIFIERS [16:36] + | | | | | |--TYPE -> TYPE [16:36] + | | | | | | `--IDENT -> R [16:36] + | | | | | `--IDENT -> innerRecordComponent [16:38] + | | | | |--RPAREN -> ) [16:58] + | | | | `--IDENT -> r2 [16:60] + | | | |--RPAREN -> ) [16:62] + | | | `--IDENT -> r3 [16:64] + | | |--RPAREN -> ) [16:66] + | | |--SLIST -> { [16:68] + | | | |--EXPR -> EXPR [17:30] + | | | | `--METHOD_CALL -> ( [17:30] + | | | | |--DOT -> . [17:22] + | | | | | |--DOT -> . [17:18] + | | | | | | |--IDENT -> System [17:12] + | | | | | | `--IDENT -> out [17:19] + | | | | | `--IDENT -> println [17:23] + | | | | |--ELIST -> ELIST [17:31] + | | | | | `--EXPR -> EXPR [17:31] + | | | | | `--IDENT -> innerRecordComponent [17:31] + | | | | `--RPAREN -> ) [17:51] + | | | |--SEMI -> ; [17:52] + | | | `--RCURLY -> } [18:8] + | | `--LITERAL_ELSE -> else [18:10] + | | `--LITERAL_IF -> if [18:15] + | | |--LPAREN -> ( [18:18] + | | |--EXPR -> EXPR [18:21] + | | | `--LITERAL_INSTANCEOF -> instanceof [18:21] + | | | |--IDENT -> r [18:19] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [18:32] + | | | |--MODIFIERS -> MODIFIERS [18:32] + | | | |--TYPE -> TYPE [18:32] + | | | | `--IDENT -> R [18:32] + | | | |--LPAREN -> ( [18:33] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [18:34] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [18:34] + | | | | |--MODIFIERS -> MODIFIERS [18:34] + | | | | |--TYPE -> TYPE [18:34] + | | | | | `--IDENT -> R [18:34] + | | | | |--LPAREN -> ( [18:35] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [18:36] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [18:36] + | | | | | |--MODIFIERS -> MODIFIERS [18:36] + | | | | | |--TYPE -> TYPE [18:36] + | | | | | | `--IDENT -> R [18:36] + | | | | | |--LPAREN -> ( [18:37] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [18:38] + | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [18:38] + | | | | | | |--MODIFIERS -> MODIFIERS [18:38] + | | | | | | |--TYPE -> TYPE [18:38] + | | | | | | | `--IDENT -> R [18:38] + | | | | | | `--IDENT -> innerInnerRecordComponent [18:40] + | | | | | `--RPAREN -> ) [18:65] + | | | | `--RPAREN -> ) [18:66] + | | | `--RPAREN -> ) [18:67] + | | |--RPAREN -> ) [18:68] + | | |--SLIST -> { [18:70] + | | | |--EXPR -> EXPR [19:30] + | | | | `--METHOD_CALL -> ( [19:30] + | | | | |--DOT -> . [19:22] + | | | | | |--DOT -> . [19:18] + | | | | | | |--IDENT -> System [19:12] + | | | | | | `--IDENT -> out [19:19] + | | | | | `--IDENT -> println [19:23] + | | | | |--ELIST -> ELIST [19:31] + | | | | | `--EXPR -> EXPR [19:31] + | | | | | `--IDENT -> innerInnerRecordComponent [19:31] + | | | | `--RPAREN -> ) [19:56] + | | | |--SEMI -> ; [19:57] + | | | `--RCURLY -> } [20:8] + | | `--LITERAL_ELSE -> else [20:10] + | | `--LITERAL_IF -> if [20:15] + | | |--LPAREN -> ( [20:18] + | | |--EXPR -> EXPR [20:21] + | | | `--LITERAL_INSTANCEOF -> instanceof [20:21] + | | | |--IDENT -> r [20:19] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [21:16] + | | | |--MODIFIERS -> MODIFIERS [21:16] + | | | |--TYPE -> TYPE [21:16] + | | | | `--IDENT -> R [21:16] + | | | |--LPAREN -> ( [21:17] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [21:18] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [21:18] + | | | | |--MODIFIERS -> MODIFIERS [21:18] + | | | | |--TYPE -> TYPE [21:18] + | | | | | `--IDENT -> R [21:18] + | | | | |--LPAREN -> ( [21:19] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [21:20] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [21:20] + | | | | | |--MODIFIERS -> MODIFIERS [21:20] + | | | | | |--TYPE -> TYPE [21:20] + | | | | | | `--IDENT -> R [21:20] + | | | | | |--LPAREN -> ( [21:21] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [21:22] + | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [21:22] + | | | | | | |--MODIFIERS -> MODIFIERS [21:22] + | | | | | | |--TYPE -> TYPE [21:22] + | | | | | | | `--IDENT -> R [21:22] + | | | | | | |--LPAREN -> ( [21:23] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [21:24] + | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [21:24] + | | | | | | | |--MODIFIERS -> MODIFIERS [21:24] + | | | | | | | |--TYPE -> TYPE [21:24] + | | | | | | | | `--IDENT -> R [21:24] + | | | | | | | `--IDENT -> innerInnerInnerRecordComponent [21:26] + | | | | | | `--RPAREN -> ) [21:56] + | | | | | `--RPAREN -> ) [21:57] + | | | | `--RPAREN -> ) [21:58] + | | | `--RPAREN -> ) [21:59] + | | |--RPAREN -> ) [21:60] + | | |--SLIST -> { [21:62] + | | | |--EXPR -> EXPR [22:30] + | | | | `--METHOD_CALL -> ( [22:30] + | | | | |--DOT -> . [22:22] + | | | | | |--DOT -> . [22:18] + | | | | | | |--IDENT -> System [22:12] + | | | | | | `--IDENT -> out [22:19] + | | | | | `--IDENT -> println [22:23] + | | | | |--ELIST -> ELIST [22:31] + | | | | | `--EXPR -> EXPR [22:31] + | | | | | `--IDENT -> innerInnerInnerRecordComponent [22:31] + | | | | `--RPAREN -> ) [22:61] + | | | |--SEMI -> ; [22:62] + | | | `--RCURLY -> } [23:8] + | | `--LITERAL_ELSE -> else [23:10] + | | `--LITERAL_IF -> if [23:15] + | | |--LPAREN -> ( [23:18] + | | |--EXPR -> EXPR [23:21] + | | | `--LITERAL_INSTANCEOF -> instanceof [23:21] + | | | |--IDENT -> r [23:19] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [24:16] + | | | |--MODIFIERS -> MODIFIERS [24:16] + | | | |--TYPE -> TYPE [24:16] + | | | | `--IDENT -> R [24:16] + | | | |--LPAREN -> ( [24:17] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [24:18] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [24:18] + | | | | |--MODIFIERS -> MODIFIERS [24:18] + | | | | |--TYPE -> TYPE [24:18] + | | | | | `--IDENT -> R [24:18] + | | | | |--LPAREN -> ( [24:19] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [24:20] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [24:20] + | | | | | |--MODIFIERS -> MODIFIERS [24:20] + | | | | | |--TYPE -> TYPE [24:20] + | | | | | | `--IDENT -> R [24:20] + | | | | | |--LPAREN -> ( [24:21] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [24:22] + | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [24:22] + | | | | | | |--MODIFIERS -> MODIFIERS [24:22] + | | | | | | |--TYPE -> TYPE [24:22] + | | | | | | | `--IDENT -> R [24:22] + | | | | | | |--LPAREN -> ( [24:23] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [24:24] + | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [24:24] + | | | | | | | |--MODIFIERS -> MODIFIERS [24:24] + | | | | | | | |--TYPE -> TYPE [24:24] + | | | | | | | | `--IDENT -> R [24:24] + | | | | | | | |--LPAREN -> ( [24:25] + | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [24:26] + | | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [24:26] + | | | | | | | | |--MODIFIERS -> MODIFIERS [24:26] + | | | | | | | | |--TYPE -> TYPE [24:26] + | | | | | | | | | `--IDENT -> R [24:26] + | | | | | | | | `--IDENT -> innerInnerInnerInnerRecordComponent [24:28] + | | | | | | | `--RPAREN -> ) [24:63] + | | | | | | `--RPAREN -> ) [24:64] + | | | | | `--RPAREN -> ) [24:65] + | | | | `--RPAREN -> ) [24:66] + | | | `--RPAREN -> ) [24:67] + | | |--RPAREN -> ) [24:68] + | | |--SLIST -> { [24:70] + | | | |--EXPR -> EXPR [25:30] + | | | | `--METHOD_CALL -> ( [25:30] + | | | | |--DOT -> . [25:22] + | | | | | |--DOT -> . [25:18] + | | | | | | |--IDENT -> System [25:12] + | | | | | | `--IDENT -> out [25:19] + | | | | | `--IDENT -> println [25:23] + | | | | |--ELIST -> ELIST [25:31] + | | | | | `--EXPR -> EXPR [25:31] + | | | | | `--IDENT -> innerInnerInnerInnerRecordComponent [25:31] + | | | | `--RPAREN -> ) [25:66] + | | | |--SEMI -> ; [25:67] + | | | `--RCURLY -> } [26:8] + | | `--LITERAL_ELSE -> else [26:10] + | | `--LITERAL_IF -> if [26:15] + | | |--LPAREN -> ( [26:18] + | | |--EXPR -> EXPR [26:21] + | | | `--LITERAL_INSTANCEOF -> instanceof [26:21] + | | | |--IDENT -> r [26:19] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [27:16] + | | | |--MODIFIERS -> MODIFIERS [27:16] + | | | |--TYPE -> TYPE [27:16] + | | | | `--IDENT -> R [27:16] + | | | |--LPAREN -> ( [27:17] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [27:18] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [27:18] + | | | | |--MODIFIERS -> MODIFIERS [27:18] + | | | | |--TYPE -> TYPE [27:18] + | | | | | `--IDENT -> R [27:18] + | | | | |--LPAREN -> ( [27:19] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [27:20] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [27:20] + | | | | | |--MODIFIERS -> MODIFIERS [27:20] + | | | | | |--TYPE -> TYPE [27:20] + | | | | | | `--IDENT -> R [27:20] + | | | | | |--LPAREN -> ( [27:21] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [27:22] + | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [27:22] + | | | | | | |--MODIFIERS -> MODIFIERS [27:22] + | | | | | | |--TYPE -> TYPE [27:22] + | | | | | | | `--IDENT -> R [27:22] + | | | | | | |--LPAREN -> ( [27:23] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [27:24] + | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [27:24] + | | | | | | | |--MODIFIERS -> MODIFIERS [27:24] + | | | | | | | |--TYPE -> TYPE [27:24] + | | | | | | | | `--IDENT -> R [27:24] + | | | | | | | |--LPAREN -> ( [27:25] + | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [27:26] + | | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [27:26] + | | | | | | | | |--MODIFIERS -> MODIFIERS [27:26] + | | | | | | | | |--TYPE -> TYPE [27:26] + | | | | | | | | | `--IDENT -> R [27:26] + | | | | | | | | |--LPAREN -> ( [27:27] + | | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [27:28] + | | | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [27:28] + | | | | | | | | | |--MODIFIERS -> MODIFIERS [27:28] + | | | | | | | | | |--TYPE -> TYPE [27:28] + | | | | | | | | | | `--IDENT -> R [27:28] + | | | | | | | | | `--IDENT -> innerInnerInnerInnerInnerRecordComponent [27:30] + | | | | | | | | `--RPAREN -> ) [27:70] + | | | | | | | `--RPAREN -> ) [27:71] + | | | | | | `--RPAREN -> ) [27:72] + | | | | | `--RPAREN -> ) [27:73] + | | | | `--RPAREN -> ) [27:74] + | | | `--RPAREN -> ) [27:75] + | | |--RPAREN -> ) [27:76] + | | |--SLIST -> { [27:78] + | | | |--EXPR -> EXPR [28:30] + | | | | `--METHOD_CALL -> ( [28:30] + | | | | |--DOT -> . [28:22] + | | | | | |--DOT -> . [28:18] + | | | | | | |--IDENT -> System [28:12] + | | | | | | `--IDENT -> out [28:19] + | | | | | `--IDENT -> println [28:23] + | | | | |--ELIST -> ELIST [28:31] + | | | | | `--EXPR -> EXPR [28:31] + | | | | | `--IDENT -> innerInnerInnerInnerInnerRecordComponent [28:31] + | | | | `--RPAREN -> ) [28:71] + | | | |--SEMI -> ; [28:72] + | | | `--RCURLY -> } [29:8] + | | `--LITERAL_ELSE -> else [29:10] + | | `--LITERAL_IF -> if [29:15] + | | |--LPAREN -> ( [29:18] + | | |--EXPR -> EXPR [29:21] + | | | `--LITERAL_INSTANCEOF -> instanceof [29:21] + | | | |--IDENT -> r [29:19] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [30:16] + | | | |--MODIFIERS -> MODIFIERS [30:16] + | | | |--TYPE -> TYPE [30:16] + | | | | `--IDENT -> R [30:16] + | | | |--LPAREN -> ( [30:17] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [30:18] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [30:18] + | | | | |--MODIFIERS -> MODIFIERS [30:18] + | | | | |--TYPE -> TYPE [30:18] + | | | | | `--IDENT -> R [30:18] + | | | | |--LPAREN -> ( [30:19] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [30:20] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [30:20] + | | | | | |--MODIFIERS -> MODIFIERS [30:20] + | | | | | |--TYPE -> TYPE [30:20] + | | | | | | `--IDENT -> R [30:20] + | | | | | |--LPAREN -> ( [30:21] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [30:22] + | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [30:22] + | | | | | | |--MODIFIERS -> MODIFIERS [30:22] + | | | | | | |--TYPE -> TYPE [30:22] + | | | | | | | `--IDENT -> R [30:22] + | | | | | | |--LPAREN -> ( [30:23] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [30:24] + | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [30:24] + | | | | | | | |--MODIFIERS -> MODIFIERS [30:24] + | | | | | | | |--TYPE -> TYPE [30:24] + | | | | | | | | `--IDENT -> R [30:24] + | | | | | | | |--LPAREN -> ( [30:25] + | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [30:26] + | | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [30:26] + | | | | | | | | |--MODIFIERS -> MODIFIERS [30:26] + | | | | | | | | |--TYPE -> TYPE [30:26] + | | | | | | | | | `--IDENT -> R [30:26] + | | | | | | | | |--LPAREN -> ( [30:27] + | | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [30:28] + | | | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [30:28] + | | | | | | | | | |--MODIFIERS -> MODIFIERS [30:28] + | | | | | | | | | |--TYPE -> TYPE [30:28] + | | | | | | | | | | `--IDENT -> R [30:28] + | | | | | | | | | |--LPAREN -> ( [30:29] + | | | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [30:30] + | | | | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [30:30] + | | | | | | | | | | |--MODIFIERS -> MODIFIERS [30:30] + | | | | | | | | | | |--TYPE -> TYPE [30:30] + | | | | | | | | | | | `--IDENT -> R [30:30] + | | | | | | | | | | `--IDENT -> innerInnerInnerInnerInnerInnerRecordComponent [30:32] + | | | | | | | | | `--RPAREN -> ) [30:77] + | | | | | | | | `--RPAREN -> ) [30:78] + | | | | | | | `--RPAREN -> ) [30:79] + | | | | | | `--RPAREN -> ) [30:80] + | | | | | `--RPAREN -> ) [30:81] + | | | | `--RPAREN -> ) [30:82] + | | | `--RPAREN -> ) [30:83] + | | |--RPAREN -> ) [30:84] + | | |--SLIST -> { [30:86] + | | | |--EXPR -> EXPR [31:30] + | | | | `--METHOD_CALL -> ( [31:30] + | | | | |--DOT -> . [31:22] + | | | | | |--DOT -> . [31:18] + | | | | | | |--IDENT -> System [31:12] + | | | | | | `--IDENT -> out [31:19] + | | | | | `--IDENT -> println [31:23] + | | | | |--ELIST -> ELIST [31:31] + | | | | | `--EXPR -> EXPR [31:31] + | | | | | `--IDENT -> innerInnerInnerInnerInnerInnerRecordComponent [31:31] + | | | | `--RPAREN -> ) [31:76] + | | | |--SEMI -> ; [31:77] + | | | `--RCURLY -> } [32:8] + | | `--LITERAL_ELSE -> else [32:10] + | | `--LITERAL_IF -> if [32:15] + | | |--LPAREN -> ( [32:18] + | | |--EXPR -> EXPR [32:21] + | | | `--LITERAL_INSTANCEOF -> instanceof [32:21] + | | | |--IDENT -> r [32:19] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [33:16] + | | | |--MODIFIERS -> MODIFIERS [33:16] + | | | |--TYPE -> TYPE [33:16] + | | | | `--IDENT -> R [33:16] + | | | |--LPAREN -> ( [33:17] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [33:18] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [33:18] + | | | | |--MODIFIERS -> MODIFIERS [33:18] + | | | | |--TYPE -> TYPE [33:18] + | | | | | `--IDENT -> R [33:18] + | | | | |--LPAREN -> ( [33:19] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [33:20] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [33:20] + | | | | | |--MODIFIERS -> MODIFIERS [33:20] + | | | | | |--TYPE -> TYPE [33:20] + | | | | | | `--IDENT -> R [33:20] + | | | | | |--LPAREN -> ( [33:21] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [33:22] + | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [33:22] + | | | | | | |--MODIFIERS -> MODIFIERS [33:22] + | | | | | | |--TYPE -> TYPE [33:22] + | | | | | | | `--IDENT -> R [33:22] + | | | | | | |--LPAREN -> ( [33:23] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [33:24] + | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [33:24] + | | | | | | | |--MODIFIERS -> MODIFIERS [33:24] + | | | | | | | |--TYPE -> TYPE [33:24] + | | | | | | | | `--IDENT -> R [33:24] + | | | | | | | |--LPAREN -> ( [33:25] + | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [33:26] + | | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [33:26] + | | | | | | | | |--MODIFIERS -> MODIFIERS [33:26] + | | | | | | | | |--TYPE -> TYPE [33:26] + | | | | | | | | | `--IDENT -> R [33:26] + | | | | | | | | |--LPAREN -> ( [33:27] + | | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [33:28] + | | | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [33:28] + | | | | | | | | | |--MODIFIERS -> MODIFIERS [33:28] + | | | | | | | | | |--TYPE -> TYPE [33:28] + | | | | | | | | | | `--IDENT -> R [33:28] + | | | | | | | | | |--LPAREN -> ( [33:29] + | | | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [33:30] + | | | | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [33:30] + | | | | | | | | | | |--MODIFIERS -> MODIFIERS [33:30] + | | | | | | | | | | |--TYPE -> TYPE [33:30] + | | | | | | | | | | | `--IDENT -> R [33:30] + | | | | | | | | | | |--LPAREN -> ( [33:31] + | | | | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [33:32] + | | | | | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [33:32] + | | | | | | | | | | | |--MODIFIERS -> MODIFIERS [33:32] + | | | | | | | | | | | |--TYPE -> TYPE [33:32] + | | | | | | | | | | | | `--IDENT -> R [33:32] + | | | | | | | | | | | `--IDENT -> innerInnerInnerInnerInnerInnerInnerRecordComponent [33:34] + | | | | | | | | | | `--RPAREN -> ) [33:84] + | | | | | | | | | `--RPAREN -> ) [33:85] + | | | | | | | | `--RPAREN -> ) [33:86] + | | | | | | | `--RPAREN -> ) [33:87] + | | | | | | `--RPAREN -> ) [33:88] + | | | | | `--RPAREN -> ) [33:89] + | | | | `--RPAREN -> ) [33:90] + | | | `--RPAREN -> ) [33:91] + | | |--RPAREN -> ) [33:92] + | | |--SLIST -> { [33:94] + | | | |--EXPR -> EXPR [34:30] + | | | | `--METHOD_CALL -> ( [34:30] + | | | | |--DOT -> . [34:22] + | | | | | |--DOT -> . [34:18] + | | | | | | |--IDENT -> System [34:12] + | | | | | | `--IDENT -> out [34:19] + | | | | | `--IDENT -> println [34:23] + | | | | |--ELIST -> ELIST [34:31] + | | | | | `--EXPR -> EXPR [34:31] + | | | | | `--IDENT -> innerInnerInnerInnerInnerInnerInnerRecordComponent [34:31] + | | | | `--RPAREN -> ) [34:81] + | | | |--SEMI -> ; [34:82] + | | | `--RCURLY -> } [35:8] + | | `--LITERAL_ELSE -> else [35:10] + | | `--LITERAL_IF -> if [35:15] + | | |--LPAREN -> ( [35:18] + | | |--EXPR -> EXPR [35:21] + | | | `--LITERAL_INSTANCEOF -> instanceof [35:21] + | | | |--IDENT -> r [35:19] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [35:32] + | | | |--MODIFIERS -> MODIFIERS [35:32] + | | | |--TYPE -> TYPE [35:32] + | | | | `--IDENT -> R [35:32] + | | | |--LPAREN -> ( [35:33] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [35:34] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [35:34] + | | | | |--MODIFIERS -> MODIFIERS [35:34] + | | | | |--TYPE -> TYPE [35:34] + | | | | | `--IDENT -> R [35:34] + | | | | `--IDENT -> myRecord [35:36] + | | | `--RPAREN -> ) [35:44] + | | |--RPAREN -> ) [35:45] + | | `--SLIST -> { [35:47] + | | |--LITERAL_IF -> if [36:12] + | | | |--LPAREN -> ( [36:15] + | | | |--EXPR -> EXPR [36:25] + | | | | `--LITERAL_INSTANCEOF -> instanceof [36:25] + | | | | |--IDENT -> myRecord [36:16] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [36:36] + | | | | |--MODIFIERS -> MODIFIERS [36:36] + | | | | |--TYPE -> TYPE [36:36] + | | | | | `--IDENT -> R [36:36] + | | | | |--LPAREN -> ( [36:37] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [36:38] + | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [36:38] + | | | | | |--MODIFIERS -> MODIFIERS [36:38] + | | | | | |--TYPE -> TYPE [36:38] + | | | | | | `--IDENT -> R [36:38] + | | | | | `--IDENT -> myInnerRecord [36:40] + | | | | `--RPAREN -> ) [36:53] + | | | |--RPAREN -> ) [36:54] + | | | `--SLIST -> { [36:56] + | | | |--LITERAL_IF -> if [37:16] + | | | | |--LPAREN -> ( [37:19] + | | | | |--EXPR -> EXPR [37:34] + | | | | | `--LITERAL_INSTANCEOF -> instanceof [37:34] + | | | | | |--IDENT -> myInnerRecord [37:20] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [37:45] + | | | | | |--MODIFIERS -> MODIFIERS [37:45] + | | | | | |--TYPE -> TYPE [37:45] + | | | | | | `--IDENT -> R [37:45] + | | | | | |--LPAREN -> ( [37:46] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [37:47] + | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [37:47] + | | | | | | |--MODIFIERS -> MODIFIERS [37:47] + | | | | | | |--TYPE -> TYPE [37:47] + | | | | | | | `--IDENT -> R [37:47] + | | | | | | `--IDENT -> myInnerInnerRecord [37:49] + | | | | | `--RPAREN -> ) [37:67] + | | | | |--RPAREN -> ) [37:68] + | | | | `--SLIST -> { [37:70] + | | | | |--LITERAL_IF -> if [38:20] + | | | | | |--LPAREN -> ( [38:23] + | | | | | |--EXPR -> EXPR [38:43] + | | | | | | `--LITERAL_INSTANCEOF -> instanceof [38:43] + | | | | | | |--IDENT -> myInnerInnerRecord [38:24] + | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [38:54] + | | | | | | |--MODIFIERS -> MODIFIERS [38:54] + | | | | | | |--TYPE -> TYPE [38:54] + | | | | | | | `--IDENT -> R [38:54] + | | | | | | |--LPAREN -> ( [38:55] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [38:56] + | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [38:56] + | | | | | | | |--MODIFIERS -> MODIFIERS [38:56] + | | | | | | | |--TYPE -> TYPE [38:56] + | | | | | | | | `--IDENT -> R [38:56] + | | | | | | | `--IDENT -> myInnerInnerInnerRecord [38:58] + | | | | | | `--RPAREN -> ) [38:81] + | | | | | |--RPAREN -> ) [38:82] + | | | | | `--SLIST -> { [38:84] + | | | | | |--LITERAL_IF -> if [39:24] + | | | | | | |--LPAREN -> ( [39:27] + | | | | | | |--EXPR -> EXPR [39:52] + | | | | | | | `--LITERAL_INSTANCEOF -> instanceof [39:52] + | | | | | | | |--IDENT -> myInnerInnerInnerRecord [39:28] + | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [39:63] + | | | | | | | |--MODIFIERS -> MODIFIERS [39:63] + | | | | | | | |--TYPE -> TYPE [39:63] + | | | | | | | | `--IDENT -> R [39:63] + | | | | | | | |--LPAREN -> ( [39:64] + | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [39:65] + | | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [39:65] + | | | | | | | | |--MODIFIERS -> MODIFIERS [39:65] + | | | | | | | | |--TYPE -> TYPE [39:65] + | | | | | | | | | `--IDENT -> R [39:65] + | | | | | | | | `--IDENT -> myInnerInnerInnerInnerRecord [39:67] + | | | | | | | `--RPAREN -> ) [39:95] + | | | | | | |--RPAREN -> ) [39:96] + | | | | | | `--SLIST -> { [39:98] + | | | | | | |--LITERAL_IF -> if [40:28] + | | | | | | | |--LPAREN -> ( [40:31] + | | | | | | | |--EXPR -> EXPR [40:61] + | | | | | | | | `--LITERAL_INSTANCEOF -> instanceof [40:61] + | | | | | | | | |--IDENT -> myInnerInnerInnerInnerRecord [40:32] + | | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [41:36] + | | | | | | | | |--MODIFIERS -> MODIFIERS [41:36] + | | | | | | | | |--TYPE -> TYPE [41:36] + | | | | | | | | | `--IDENT -> R [41:36] + | | | | | | | | |--LPAREN -> ( [41:37] + | | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [41:38] + | | | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [41:38] + | | | | | | | | | |--MODIFIERS -> MODIFIERS [41:38] + | | | | | | | | | |--TYPE -> TYPE [41:38] + | | | | | | | | | | `--IDENT -> R [41:38] + | | | | | | | | | `--IDENT -> myInnerInnerInnerInnerInnerRecord [41:40] + | | | | | | | | `--RPAREN -> ) [41:73] + | | | | | | | |--RPAREN -> ) [41:74] + | | | | | | | `--SLIST -> { [41:76] + | | | | | | | |--LITERAL_IF -> if [42:32] + | | | | | | | | |--LPAREN -> ( [42:35] + | | | | | | | | |--EXPR -> EXPR [43:40] + | | | | | | | | | `--LITERAL_INSTANCEOF -> instanceof [43:40] + | | | | | | | | | |--IDENT -> myInnerInnerInnerInnerInnerRecord [42:36] + | | | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [43:51] + | | | | | | | | | |--MODIFIERS -> MODIFIERS [43:51] + | | | | | | | | | |--TYPE -> TYPE [43:51] + | | | | | | | | | | `--IDENT -> R [43:51] + | | | | | | | | | |--LPAREN -> ( [43:52] + | | | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [43:53] + | | | | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [43:53] + | | | | | | | | | | |--MODIFIERS -> MODIFIERS [43:53] + | | | | | | | | | | |--TYPE -> TYPE [43:53] + | | | | | | | | | | | `--IDENT -> R [43:53] + | | | | | | | | | | `--IDENT -> myInnerInnerInnerInnerInnerInnerRecord [43:55] + | | | | | | | | | `--RPAREN -> ) [43:93] + | | | | | | | | |--RPAREN -> ) [43:94] + | | | | | | | | `--SLIST -> { [43:96] + | | | | | | | | |--LITERAL_IF -> if [44:36] + | | | | | | | | | |--LPAREN -> ( [44:39] + | | | | | | | | | |--EXPR -> EXPR [45:44] + | | | | | | | | | | `--LITERAL_INSTANCEOF -> instanceof [45:44] + | | | | | | | | | | |--IDENT -> myInnerInnerInnerInnerInnerInnerRecord [44:40] + | | | | | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [45:55] + | | | | | | | | | | |--MODIFIERS -> MODIFIERS [45:55] + | | | | | | | | | | |--TYPE -> TYPE [45:55] + | | | | | | | | | | | `--IDENT -> R [45:55] + | | | | | | | | | | |--LPAREN -> ( [45:56] + | | | | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [46:44] + | | | | | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [46:44] + | | | | | | | | | | | |--MODIFIERS -> MODIFIERS [46:44] + | | | | | | | | | | | |--TYPE -> TYPE [46:44] + | | | | | | | | | | | | `--IDENT -> R [46:44] + | | | | | | | | | | | `--IDENT -> myInnerInnerInnerInnerInnerInnerInnerRecord [47:52] + | | | | | | | | | | `--RPAREN -> ) [48:36] + | | | | | | | | | |--RPAREN -> ) [48:37] + | | | | | | | | | `--SLIST -> { [48:39] + | | | | | | | | | `--RCURLY -> } [50:36] + | | | | | | | | `--RCURLY -> } [51:32] + | | | | | | | `--RCURLY -> } [52:28] + | | | | | | `--RCURLY -> } [53:24] + | | | | | `--RCURLY -> } [54:20] + | | | | `--RCURLY -> } [55:16] + | | | `--RCURLY -> } [56:12] + | | `--RCURLY -> } [57:8] + | |--VARIABLE_DEF -> VARIABLE_DEF [60:8] + | | |--MODIFIERS -> MODIFIERS [60:8] + | | | `--FINAL -> final [60:8] + | | |--TYPE -> TYPE [60:14] + | | | |--IDENT -> List [60:14] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [60:18] + | | | |--GENERIC_START -> < [60:18] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [60:19] + | | | | `--IDENT -> R [60:19] + | | | `--GENERIC_END -> > [60:20] + | | |--IDENT -> list [60:22] + | | `--ASSIGN -> = [60:27] + | | `--EXPR -> EXPR [61:23] + | | `--METHOD_CALL -> ( [61:23] + | | |--DOT -> . [61:20] + | | | |--IDENT -> List [61:16] + | | | `--IDENT -> of [61:21] + | | |--ELIST -> ELIST [61:24] + | | | `--EXPR -> EXPR [61:24] + | | | `--LITERAL_NEW -> new [61:24] + | | | |--IDENT -> R [61:28] + | | | |--LPAREN -> ( [61:29] + | | | |--ELIST -> ELIST [61:30] + | | | | `--EXPR -> EXPR [61:30] + | | | | `--LITERAL_NEW -> new [61:30] + | | | | |--IDENT -> R [61:34] + | | | | |--LPAREN -> ( [61:35] + | | | | |--ELIST -> ELIST [61:36] + | | | | | `--EXPR -> EXPR [61:36] + | | | | | `--LITERAL_NEW -> new [61:36] + | | | | | |--IDENT -> R [61:40] + | | | | | |--LPAREN -> ( [61:41] + | | | | | |--ELIST -> ELIST [61:42] + | | | | | | `--EXPR -> EXPR [61:42] + | | | | | | `--LITERAL_NEW -> new [61:42] + | | | | | | |--IDENT -> R [61:46] + | | | | | | |--LPAREN -> ( [61:47] + | | | | | | |--ELIST -> ELIST [61:48] + | | | | | | | `--EXPR -> EXPR [61:48] + | | | | | | | `--LITERAL_NEW -> new [61:48] + | | | | | | | |--IDENT -> R [62:24] + | | | | | | | |--LPAREN -> ( [62:25] + | | | | | | | |--ELIST -> ELIST [62:26] + | | | | | | | | `--EXPR -> EXPR [62:26] + | | | | | | | | `--LITERAL_NEW -> new [62:26] + | | | | | | | | |--IDENT -> R [62:30] + | | | | | | | | |--LPAREN -> ( [62:31] + | | | | | | | | |--ELIST -> ELIST [62:32] + | | | | | | | | | `--EXPR -> EXPR [62:32] + | | | | | | | | | `--LITERAL_NEW -> new [62:32] + | | | | | | | | | |--IDENT -> R [62:36] + | | | | | | | | | |--LPAREN -> ( [62:37] + | | | | | | | | | |--ELIST -> ELIST [62:38] + | | | | | | | | | | `--EXPR -> EXPR [62:38] + | | | | | | | | | | `--LITERAL_NEW -> new [62:38] + | | | | | | | | | | |--IDENT -> R [62:42] + | | | | | | | | | | |--LPAREN -> ( [62:43] + | | | | | | | | | | |--ELIST -> ELIST [62:44] + | | | | | | | | | | | `--EXPR -> EXPR [62:44] + | | | | | | | | | | | `--LITERAL_NEW -> new [62:44] + | | | | | | | | | | | |--IDENT -> R [62:48] + | | | | | | | | | | | |--LPAREN -> ( [62:49] + | | | | | | | | | | | |--ELIST -> ELIST [62:50] + | | | | | | | | | | | | `--EXPR -> EXPR [62:50] + | | | | | | | | | | | | `--LITERAL_NULL -> null [62:50] + | | | | | | | | | | | `--RPAREN -> ) [62:54] + | | | | | | | | | | `--RPAREN -> ) [62:55] + | | | | | | | | | `--RPAREN -> ) [62:56] + | | | | | | | | `--RPAREN -> ) [62:57] + | | | | | | | `--RPAREN -> ) [62:58] + | | | | | | `--RPAREN -> ) [62:59] + | | | | | `--RPAREN -> ) [62:60] + | | | | `--RPAREN -> ) [62:61] + | | | `--RPAREN -> ) [62:62] + | | `--RPAREN -> ) [62:63] + | |--SEMI -> ; [62:64] + | |--VARIABLE_DEF -> VARIABLE_DEF [64:8] + | | |--MODIFIERS -> MODIFIERS [64:8] + | | | `--FINAL -> final [64:8] + | | |--TYPE -> TYPE [64:14] + | | | `--IDENT -> Object [64:14] + | | |--IDENT -> o [64:21] + | | `--ASSIGN -> = [64:23] + | | `--EXPR -> EXPR [64:33] + | | `--METHOD_CALL -> ( [64:33] + | | |--DOT -> . [64:29] + | | | |--IDENT -> list [64:25] + | | | `--IDENT -> get [64:30] + | | |--ELIST -> ELIST [64:34] + | | | `--EXPR -> EXPR [64:34] + | | | `--NUM_INT -> 0 [64:34] + | | `--RPAREN -> ) [64:35] + | |--SEMI -> ; [64:36] + | |--LITERAL_FOR -> for [65:8] + | | |--LPAREN -> ( [65:12] + | | |--FOR_INIT -> FOR_INIT [65:13] + | | |--SEMI -> ; [65:13] + | | |--FOR_CONDITION -> FOR_CONDITION [65:17] + | | | `--EXPR -> EXPR [65:17] + | | | `--LITERAL_INSTANCEOF -> instanceof [65:17] + | | | |--IDENT -> o [65:15] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [65:28] + | | | |--MODIFIERS -> MODIFIERS [65:28] + | | | |--TYPE -> TYPE [65:28] + | | | | `--IDENT -> R [65:28] + | | | |--LPAREN -> ( [65:29] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [65:30] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [65:30] + | | | | |--MODIFIERS -> MODIFIERS [65:30] + | | | | |--TYPE -> TYPE [65:30] + | | | | | `--IDENT -> R [65:30] + | | | | `--IDENT -> rListElement [65:32] + | | | `--RPAREN -> ) [65:44] + | | |--SEMI -> ; [65:45] + | | |--FOR_ITERATOR -> FOR_ITERATOR [65:47] + | | |--RPAREN -> ) [65:47] + | | `--SLIST -> { [65:49] + | | |--LITERAL_FOR -> for [66:12] + | | | |--LPAREN -> ( [66:16] + | | | |--FOR_INIT -> FOR_INIT [66:17] + | | | |--SEMI -> ; [66:17] + | | | |--FOR_CONDITION -> FOR_CONDITION [66:32] + | | | | `--EXPR -> EXPR [66:32] + | | | | `--LITERAL_INSTANCEOF -> instanceof [66:32] + | | | | |--IDENT -> rListElement [66:19] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [66:43] + | | | | |--MODIFIERS -> MODIFIERS [66:43] + | | | | |--TYPE -> TYPE [66:43] + | | | | | `--IDENT -> R [66:43] + | | | | |--LPAREN -> ( [66:44] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [66:45] + | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [66:45] + | | | | | |--MODIFIERS -> MODIFIERS [66:45] + | | | | | |--TYPE -> TYPE [66:45] + | | | | | | `--IDENT -> R [66:45] + | | | | | `--IDENT -> rListElementInner [66:47] + | | | | |--RPAREN -> ) [66:64] + | | | | `--IDENT -> r5 [66:66] + | | | |--SEMI -> ; [66:68] + | | | |--FOR_ITERATOR -> FOR_ITERATOR [66:70] + | | | |--RPAREN -> ) [66:70] + | | | `--SLIST -> { [66:72] + | | | |--LITERAL_FOR -> for [67:16] + | | | | |--LPAREN -> ( [67:20] + | | | | |--FOR_INIT -> FOR_INIT [67:21] + | | | | |--SEMI -> ; [67:21] + | | | | |--FOR_CONDITION -> FOR_CONDITION [67:41] + | | | | | `--EXPR -> EXPR [67:41] + | | | | | `--LITERAL_INSTANCEOF -> instanceof [67:41] + | | | | | |--IDENT -> rListElementInner [67:23] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [67:52] + | | | | | |--MODIFIERS -> MODIFIERS [67:52] + | | | | | |--TYPE -> TYPE [67:52] + | | | | | | `--IDENT -> R [67:52] + | | | | | |--LPAREN -> ( [67:53] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [67:54] + | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [67:54] + | | | | | | |--MODIFIERS -> MODIFIERS [67:54] + | | | | | | |--TYPE -> TYPE [67:54] + | | | | | | | `--IDENT -> R [67:54] + | | | | | | `--IDENT -> rListElementInnerInner [67:56] + | | | | | `--RPAREN -> ) [67:78] + | | | | |--SEMI -> ; [67:79] + | | | | |--FOR_ITERATOR -> FOR_ITERATOR [67:81] + | | | | |--RPAREN -> ) [67:81] + | | | | `--SLIST -> { [67:83] + | | | | |--LITERAL_FOR -> for [68:20] + | | | | | |--LPAREN -> ( [68:24] + | | | | | |--FOR_INIT -> FOR_INIT [68:25] + | | | | | |--SEMI -> ; [68:25] + | | | | | |--FOR_CONDITION -> FOR_CONDITION [68:50] + | | | | | | `--EXPR -> EXPR [68:50] + | | | | | | `--LITERAL_INSTANCEOF -> instanceof [68:50] + | | | | | | |--IDENT -> rListElementInnerInner [68:27] + | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [68:61] + | | | | | | |--MODIFIERS -> MODIFIERS [68:61] + | | | | | | |--TYPE -> TYPE [68:61] + | | | | | | | `--IDENT -> R [68:61] + | | | | | | |--LPAREN -> ( [68:62] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [68:63] + | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [68:63] + | | | | | | | |--MODIFIERS -> MODIFIERS [68:63] + | | | | | | | |--TYPE -> TYPE [68:63] + | | | | | | | | `--IDENT -> R [68:63] + | | | | | | | `--IDENT -> rListElementInnerInnerInner [68:65] + | | | | | | `--RPAREN -> ) [68:92] + | | | | | |--SEMI -> ; [68:93] + | | | | | |--FOR_ITERATOR -> FOR_ITERATOR [68:95] + | | | | | |--RPAREN -> ) [68:95] + | | | | | `--SLIST -> { [68:97] + | | | | | `--RCURLY -> } [69:20] + | | | | `--RCURLY -> } [70:16] + | | | `--RCURLY -> } [71:12] + | | `--RCURLY -> } [72:8] + | |--VARIABLE_DEF -> VARIABLE_DEF [74:8] + | | |--MODIFIERS -> MODIFIERS [74:8] + | | | `--FINAL -> final [74:8] + | | |--TYPE -> TYPE [74:14] + | | | `--IDENT -> Iterator [74:14] + | | |--IDENT -> it [74:23] + | | `--ASSIGN -> = [74:26] + | | `--EXPR -> EXPR [74:41] + | | `--METHOD_CALL -> ( [74:41] + | | |--DOT -> . [74:32] + | | | |--IDENT -> list [74:28] + | | | `--IDENT -> iterator [74:33] + | | |--ELIST -> ELIST [74:42] + | | `--RPAREN -> ) [74:42] + | |--SEMI -> ; [74:43] + | |--LITERAL_WHILE -> while [75:8] + | | |--LPAREN -> ( [75:14] + | | |--EXPR -> EXPR [75:28] + | | | `--LAND -> && [75:28] + | | | |--METHOD_CALL -> ( [75:25] + | | | | |--DOT -> . [75:17] + | | | | | |--IDENT -> it [75:15] + | | | | | `--IDENT -> hasNext [75:18] + | | | | |--ELIST -> ELIST [75:26] + | | | | `--RPAREN -> ) [75:26] + | | | `--LITERAL_INSTANCEOF -> instanceof [75:41] + | | | |--METHOD_CALL -> ( [75:38] + | | | | |--DOT -> . [75:33] + | | | | | |--IDENT -> it [75:31] + | | | | | `--IDENT -> next [75:34] + | | | | |--ELIST -> ELIST [75:39] + | | | | `--RPAREN -> ) [75:39] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [75:52] + | | | |--MODIFIERS -> MODIFIERS [75:52] + | | | |--TYPE -> TYPE [75:52] + | | | | `--IDENT -> R [75:52] + | | | |--LPAREN -> ( [75:53] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [75:54] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [75:54] + | | | | |--MODIFIERS -> MODIFIERS [75:54] + | | | | |--TYPE -> TYPE [75:54] + | | | | | `--IDENT -> R [75:54] + | | | | `--IDENT -> rListElement2 [75:56] + | | | |--RPAREN -> ) [75:69] + | | | `--IDENT -> r6 [75:71] + | | |--RPAREN -> ) [75:73] + | | `--SLIST -> { [75:75] + | | |--LITERAL_WHILE -> while [76:12] + | | | |--LPAREN -> ( [76:18] + | | | |--EXPR -> EXPR [76:32] + | | | | `--LAND -> && [76:32] + | | | | |--METHOD_CALL -> ( [76:29] + | | | | | |--DOT -> . [76:21] + | | | | | | |--IDENT -> it [76:19] + | | | | | | `--IDENT -> hasNext [76:22] + | | | | | |--ELIST -> ELIST [76:30] + | | | | | `--RPAREN -> ) [76:30] + | | | | `--LITERAL_INSTANCEOF -> instanceof [76:45] + | | | | |--METHOD_CALL -> ( [76:42] + | | | | | |--DOT -> . [76:37] + | | | | | | |--IDENT -> it [76:35] + | | | | | | `--IDENT -> next [76:38] + | | | | | |--ELIST -> ELIST [76:43] + | | | | | `--RPAREN -> ) [76:43] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [76:56] + | | | | |--MODIFIERS -> MODIFIERS [76:56] + | | | | |--TYPE -> TYPE [76:56] + | | | | | `--IDENT -> R [76:56] + | | | | |--LPAREN -> ( [76:57] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [76:58] + | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [76:58] + | | | | | |--MODIFIERS -> MODIFIERS [76:58] + | | | | | |--TYPE -> TYPE [76:58] + | | | | | | `--IDENT -> R [76:58] + | | | | | `--IDENT -> rListElementInner2 [76:60] + | | | | `--RPAREN -> ) [76:78] + | | | |--RPAREN -> ) [76:79] + | | | `--SLIST -> { [76:81] + | | | |--LITERAL_WHILE -> while [77:16] + | | | | |--LPAREN -> ( [77:22] + | | | | |--EXPR -> EXPR [77:36] + | | | | | `--LAND -> && [77:36] + | | | | | |--METHOD_CALL -> ( [77:33] + | | | | | | |--DOT -> . [77:25] + | | | | | | | |--IDENT -> it [77:23] + | | | | | | | `--IDENT -> hasNext [77:26] + | | | | | | |--ELIST -> ELIST [77:34] + | | | | | | `--RPAREN -> ) [77:34] + | | | | | `--LITERAL_INSTANCEOF -> instanceof [77:49] + | | | | | |--METHOD_CALL -> ( [77:46] + | | | | | | |--DOT -> . [77:41] + | | | | | | | |--IDENT -> it [77:39] + | | | | | | | `--IDENT -> next [77:42] + | | | | | | |--ELIST -> ELIST [77:47] + | | | | | | `--RPAREN -> ) [77:47] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [77:60] + | | | | | |--MODIFIERS -> MODIFIERS [77:60] + | | | | | |--TYPE -> TYPE [77:60] + | | | | | | `--IDENT -> R [77:60] + | | | | | |--LPAREN -> ( [77:61] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [77:62] + | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [77:62] + | | | | | | |--MODIFIERS -> MODIFIERS [77:62] + | | | | | | |--TYPE -> TYPE [77:62] + | | | | | | | `--IDENT -> R [77:62] + | | | | | | `--IDENT -> rListElementInnerInner2 [77:64] + | | | | | `--RPAREN -> ) [77:87] + | | | | |--RPAREN -> ) [77:88] + | | | | `--SLIST -> { [77:90] + | | | | |--LITERAL_WHILE -> while [78:20] + | | | | | |--LPAREN -> ( [78:26] + | | | | | |--EXPR -> EXPR [78:40] + | | | | | | `--LAND -> && [78:40] + | | | | | | |--METHOD_CALL -> ( [78:37] + | | | | | | | |--DOT -> . [78:29] + | | | | | | | | |--IDENT -> it [78:27] + | | | | | | | | `--IDENT -> hasNext [78:30] + | | | | | | | |--ELIST -> ELIST [78:38] + | | | | | | | `--RPAREN -> ) [78:38] + | | | | | | `--LITERAL_INSTANCEOF -> instanceof [78:53] + | | | | | | |--METHOD_CALL -> ( [78:50] + | | | | | | | |--DOT -> . [78:45] + | | | | | | | | |--IDENT -> it [78:43] + | | | | | | | | `--IDENT -> next [78:46] + | | | | | | | |--ELIST -> ELIST [78:51] + | | | | | | | `--RPAREN -> ) [78:51] + | | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [78:64] + | | | | | | |--MODIFIERS -> MODIFIERS [78:64] + | | | | | | |--TYPE -> TYPE [78:64] + | | | | | | | `--IDENT -> R [78:64] + | | | | | | |--LPAREN -> ( [78:65] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [78:66] + | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [78:66] + | | | | | | | |--MODIFIERS -> MODIFIERS [78:66] + | | | | | | | |--TYPE -> TYPE [78:66] + | | | | | | | | `--IDENT -> R [78:66] + | | | | | | | `--IDENT -> rListElementInnerInnerInner2 [78:68] + | | | | | | `--RPAREN -> ) [78:96] + | | | | | |--RPAREN -> ) [78:97] + | | | | | `--SLIST -> { [78:99] + | | | | | `--RCURLY -> } [79:20] + | | | | `--RCURLY -> } [80:16] + | | | `--RCURLY -> } [81:12] + | | `--RCURLY -> } [82:8] + | |--VARIABLE_DEF -> VARIABLE_DEF [84:8] + | | |--MODIFIERS -> MODIFIERS [84:8] + | | | `--FINAL -> final [84:8] + | | |--TYPE -> TYPE [84:14] + | | | `--IDENT -> Object [84:14] + | | |--IDENT -> myObj [84:21] + | | `--ASSIGN -> = [84:27] + | | `--EXPR -> EXPR [87:16] + | | `--QUESTION -> ? [87:16] + | | |--LAND -> && [86:16] + | | | |--LAND -> && [85:16] + | | | | |--LITERAL_INSTANCEOF -> instanceof [84:41] + | | | | | |--METHOD_CALL -> ( [84:37] + | | | | | | |--DOT -> . [84:33] + | | | | | | | |--IDENT -> list [84:29] + | | | | | | | `--IDENT -> get [84:34] + | | | | | | |--ELIST -> ELIST [84:38] + | | | | | | | `--EXPR -> EXPR [84:38] + | | | | | | | `--NUM_INT -> 0 [84:38] + | | | | | | `--RPAREN -> ) [84:39] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [84:52] + | | | | | |--MODIFIERS -> MODIFIERS [84:52] + | | | | | |--TYPE -> TYPE [84:52] + | | | | | | `--IDENT -> R [84:52] + | | | | | |--LPAREN -> ( [84:53] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [84:54] + | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [84:54] + | | | | | | |--MODIFIERS -> MODIFIERS [84:54] + | | | | | | |--TYPE -> TYPE [84:54] + | | | | | | | `--IDENT -> R [84:54] + | | | | | | `--IDENT -> myRecord2 [84:56] + | | | | | |--RPAREN -> ) [84:65] + | | | | | `--IDENT -> r7 [84:67] + | | | | `--LITERAL_INSTANCEOF -> instanceof [85:29] + | | | | |--IDENT -> myRecord2 [85:19] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [85:40] + | | | | |--MODIFIERS -> MODIFIERS [85:40] + | | | | |--TYPE -> TYPE [85:40] + | | | | | `--IDENT -> R [85:40] + | | | | |--LPAREN -> ( [85:41] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [85:42] + | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [85:42] + | | | | | |--MODIFIERS -> MODIFIERS [85:42] + | | | | | |--TYPE -> TYPE [85:42] + | | | | | | `--IDENT -> R [85:42] + | | | | | `--IDENT -> someComponent [85:44] + | | | | `--RPAREN -> ) [85:57] + | | | `--LITERAL_INSTANCEOF -> instanceof [86:33] + | | | |--IDENT -> someComponent [86:19] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [86:44] + | | | |--MODIFIERS -> MODIFIERS [86:44] + | | | |--TYPE -> TYPE [86:44] + | | | | `--IDENT -> R [86:44] + | | | |--LPAREN -> ( [86:45] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [86:46] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [86:46] + | | | | |--MODIFIERS -> MODIFIERS [86:46] + | | | | |--TYPE -> TYPE [86:46] + | | | | | `--IDENT -> R [86:46] + | | | | |--LPAREN -> ( [86:47] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [86:48] + | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [86:48] + | | | | | |--MODIFIERS -> MODIFIERS [86:48] + | | | | | |--TYPE -> TYPE [86:48] + | | | | | | `--IDENT -> R [86:48] + | | | | | `--IDENT -> someComponent2 [86:50] + | | | | `--RPAREN -> ) [86:64] + | | | `--RPAREN -> ) [86:65] + | | |--IDENT -> myRecord2 [87:18] + | | |--COLON -> : [87:28] + | | `--LITERAL_NULL -> null [87:30] + | |--SEMI -> ; [87:34] + | `--RCURLY -> } [88:4] + `--RCURLY -> } [89:0] diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/InputGenericRecordDeconstructionPattern.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/InputGenericRecordDeconstructionPattern.java new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/InputGenericRecordDeconstructionPattern.java @@ -0,0 +1,61 @@ +//non-compiled with javac: Compilable with Java19 +package com.puppycrawl.tools.checkstyle.grammar.java19; + +import java.util.Objects; +import java.util.function.Function; + +public class InputGenericRecordDeconstructionPattern { + + void m1(Function<Box<String>, Integer> test) { + Box<String> b = new Box<>(null); + } + + int m2(Box<String> b) { + if (b instanceof Box<String>(String s)) return 1; + if (b instanceof Box<String>(String s) + && b.v != null + && b.v() != null + && "whatever".equals(b.v)) return 1; + return -1; + } + + int m3(Box<String> b) { + switch (b) { + case Box<String>(String s): return 1; + default: return -1; + } + } + + int m4(Box<String> b) { + return switch (b) { + case Box<String>(String s) -> 1; + default -> -1; + }; + } + + int m5(Box<Box<String>> b) { + return switch (b) { + case Box<Box<String>>(Box<String>(String s)box) + when "test".equals(s) && box.x != 7 -> 1; + case Box<Box<String>>(Box<String>(String s)box) + when "test".equals(s) && (int) box.x != 7 -> 1; + case Box<Box<String>>(Box<String>(String s)box) + when "test".equals(s) && Objects.equals(box.v, "box") -> 1; + case Box<Box<String>>(Box<String>(String s)box) + when "test".equals(s) && Objects.equals(box.v, "box") + || "something else".equals(s) -> 1; + case Box<Box<String>>(Box<String>(String s)) + when "test".equals(s) -> 1; + case Box<Box<String>>(Box<?> b2) + when "test".equals(b2.v) -> 1; + case Box<Box<String>>(Object o) b2 + when b2.v != null && "whatever".equals(o.toString())-> 1; + default -> -1; + }; + } + + record Box<V>(V v) { + static int x = 5; + } + +} diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/InputJava19BindingWithModifiers.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/InputJava19BindingWithModifiers.java new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/InputJava19BindingWithModifiers.java @@ -0,0 +1,119 @@ +//non-compiled with javac: Compilable with Java19 +package com.puppycrawl.tools.checkstyle.grammar.java19; + +public class InputJava19BindingWithModifiers { + record Box<T>(T t) { + } + + class A { + } + + class B extends A { + } + + sealed interface I permits C, D { + } + + final class C implements I { + } + + final class D implements I { + } + + record Pair<T>(T x, T y) { + } + + @interface MyAnno1{} + @interface MyAnno2{} + + @interface MyAnno3{ + String value(); + String[] values(); + } + + record Tuple(Object o1, Object o2, Object o3) {} + record VarArgs(Object... objArgs){} + + + static void test1(Box<Object> bo) { + if (bo instanceof @MyAnno1 @MyAnno2 Box<Object>(String s)) { + System.out.println("String " + s); + } + } + + static void test2(Box<Object> bo) { + if (bo instanceof @MyAnno2 final @MyAnno1 Box<?>(var s)) { + System.out.println("String " + s); + } + } + + void test3(Box<I> bo) { + C c = new C(); + if (bo instanceof @MyAnno1 Box<I>(var s)) { + System.out.println("String " + s); + } + else if (bo instanceof Box b) { + + } + else if (bo instanceof Box<I> b && bo.t.equals(c)) { + + } + else if (bo != null && bo.t.equals(c)) { + + } + } + + static void test4(Pair<I> p) { + if (p instanceof final Pair<I>(C t1, C t2)) { + System.out.println(t2); + } + else if (p instanceof @MyAnno2 final Pair<I>(D t1, D t2)) { + System.out.println(t1); + } + } + + static void test5(Tuple t) { + if (t instanceof Tuple(String x, String y, String z)) { + System.out.println(x + y + z); + } + else if (t instanceof final Tuple( + final Integer x, + @MyAnno1 Integer y, + final @MyAnno1 @MyAnno2 Integer z)) { + System.out.println(x + y + z); + } + } + + String m2(Pair<I> p1) { + return switch (p1) { + case Pair<I>(final C c,@MyAnno2 I i) -> "T!"; + case final Pair<I>( + final @MyAnno3(value = "some value", values = {}) D d, + final C c) -> "C!"; + case Pair<I>( + @MyAnno3(value = "val", values = {"1", "2"}) D d1,D d2) -> "D!"; + }; + } + + void m3 (Pair<Pair<Integer>> s) { + switch (s) { + case final Pair<Pair<Integer>>( + @MyAnno1 Pair<Integer>(@MyAnno1 Integer x1, final Integer y1) x, + final Pair<Integer>(Integer x2, Integer y2) p2) y + -> System.out.println(); + case default -> System.out.println(); + } + } + + void m4 (Pair<Pair<Integer>> s) { + switch (s) { + case @MyAnno2 Pair<Pair<Integer>>( + @MyAnno3(value = "", values = {}) Pair<Integer>( + final Integer x1,Integer y1) x, + @MyAnno3(value = "", values = {}) final Pair<Integer>( + @MyAnno2 final Integer x2,Integer y2) p2) y + -> System.out.println(); + case default -> System.out.println(); + } + } +} diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/InputJava19GuardsWithExtraParenthesis.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/InputJava19GuardsWithExtraParenthesis.java new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/InputJava19GuardsWithExtraParenthesis.java @@ -0,0 +1,79 @@ +//non-compiled with javac: Compilable with Java19 +package com.puppycrawl.tools.checkstyle.grammar.java19; + +import java.util.Objects; + +public class InputJava19GuardsWithExtraParenthesis { + + record Box<V>(V v) { + static int x = 5; + } + + int m1(Box<Box<String>> b) { + return switch (b) { + case Box<Box<String>>(Box<String>(String s)box) + when (("test".equals(s) && box.x != 7)) -> 1; + case (Box<Box<String>>(Box<String>(String s)box)) + when (("test".equals(s)) && ((int) box.x != 7)) -> 1; + case Box<Box<String>>((Box<String>((String s))box)) + when (boolean)"test".equals(s) && (boolean)Objects.equals(box.v, "box") -> (1); + case Box<Box<String>>(Box<String>(String s)box) + when "test".equals(s) && Objects.equals(box.v, "box") + || "something else".equals(s) -> 1; + case Box<Box<String>>(Box<String>(String s)) + when "test".equals(s) -> 1; + case Box<Box<String>>(Box<?> b2) + when "test".equals(b2.v) -> 1; + case Box<Box<String>>(Object o) b2 + when b2.v != null && "whatever".equals(o.toString())-> 1; + default -> -1; + }; + } + + record when<T>(when<T> when){} + + <T> int moreTrickyWhen(when<when<T>> when){ + return switch(when) { + case when<when<T>>(when<when<T>> w1) + when ((when)w1).when.when.when.when.when.equals(null)-> 2; + case when<when<T>>(when<when<T>> w1) + when (((w1.when.when.when.when.when.equals(null)))) + -> 2; + case when<when<T>>(when<when<T>>(when<when<T>> w2) w1) + when (((w1.when.when.when.when.when.equals(null)))) + || ((when)w2).equals(((when)w1))-> 2; + case when<when<T>>(when<when<T>>(when<when<T>> w2) w1) + when when != null + || ((when)w2).equals(((when)w1))-> 2; + case when<when<T>>(Object w) when when != null -> 9; + case default, null -> 1; + }; + } + + Object m3(when<String> when) { + if (when instanceof when<String>(when<String> w1)) { + return w1.when.when().when; + } + else if (when instanceof when<String>(when<String>(when<String> s1)) w1) { + if ("s1".equals(s1)) { + return s1; + } else { + return w1; + } + } + else if (when instanceof when<String>(when<String>(when<String> s1)) w1 + && s1.toString().equals(w1.toString())) { + if ("s1".equals(s1)) { + return s1; + } else { + return w1; + } + } + else if (!(when instanceof when<String>(when<String>(when<String> s1)) w1)) { + return new Object(); + } + else { + return s1.toString().equals(w1.toString()); + } + } +} diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/InputJava19PatternsInNullSwitch1.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/InputJava19PatternsInNullSwitch1.java --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/InputJava19PatternsInNullSwitch1.java +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/InputJava19PatternsInNullSwitch1.java @@ -6,20 +6,20 @@ public class InputJava19PatternsInNullSwitch1 { class Super {} class Sub extends Super {} record R(Super s) {} -// until https://github.com/checkstyle/checkstyle/issues/12507 -// private int matchingSwitch14(R r) { -// return switch(r) { -// case R(Super s) -> 1; -// default -> 2; -// }; -// } -// -// private int matchingSwitch15(R r) { -// return switch(r) { -// case R(Sub s) -> 1; -// default -> 2; -// }; -// } + + private int matchingSwitch14(R r) { + return switch(r) { + case R(Super s) -> 1; + default -> 2; + }; + } + + private int matchingSwitch15(R r) { + return switch(r) { + case R(Sub s) -> 1; + default -> 2; + }; + } private int matchingSwitch1(Object obj) { return switch (obj) { diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/InputJava19RecordDecompositionWithConditionInLoops.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/InputJava19RecordDecompositionWithConditionInLoops.java new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/InputJava19RecordDecompositionWithConditionInLoops.java @@ -0,0 +1,89 @@ +//non-compiled with javac: Compilable with Java19 +package com.puppycrawl.tools.checkstyle.grammar.java19; + +import java.util.Iterator; +import java.util.List; + +public class InputJava19RecordDecompositionWithConditionInLoops { + record R(R r) { + + } + + public static void main(String... args) { + R r = new R(new R(null)); + if (r instanceof R(R recordComponent) r1) { + System.out.println(recordComponent); + } else if (r instanceof R(R(R innerRecordComponent) r2) r3) { + System.out.println(innerRecordComponent); + } else if (r instanceof R(R(R(R innerInnerRecordComponent)))) { + System.out.println(innerInnerRecordComponent); + } else if (r instanceof + R(R(R(R(R innerInnerInnerRecordComponent))))) { + System.out.println(innerInnerInnerRecordComponent); + } else if (r instanceof + R(R(R(R(R(R innerInnerInnerInnerRecordComponent)))))) { + System.out.println(innerInnerInnerInnerRecordComponent); + } else if (r instanceof + R(R(R(R(R(R(R innerInnerInnerInnerInnerRecordComponent))))))) { + System.out.println(innerInnerInnerInnerInnerRecordComponent); + } else if (r instanceof + R(R(R(R(R(R(R(R innerInnerInnerInnerInnerInnerRecordComponent)))))))) { + System.out.println(innerInnerInnerInnerInnerInnerRecordComponent); + } else if (r instanceof + R(R(R(R(R(R(R(R(R innerInnerInnerInnerInnerInnerInnerRecordComponent))))))))) { + System.out.println(innerInnerInnerInnerInnerInnerInnerRecordComponent); + } else if (r instanceof R(R myRecord)) { + if (myRecord instanceof R(R myInnerRecord)) { + if (myInnerRecord instanceof R(R myInnerInnerRecord)) { + if (myInnerInnerRecord instanceof R(R myInnerInnerInnerRecord)) { + if (myInnerInnerInnerRecord instanceof R(R myInnerInnerInnerInnerRecord)) { + if (myInnerInnerInnerInnerRecord instanceof + R(R myInnerInnerInnerInnerInnerRecord)) { + if (myInnerInnerInnerInnerInnerRecord + instanceof R(R myInnerInnerInnerInnerInnerInnerRecord)) { + if (myInnerInnerInnerInnerInnerInnerRecord + instanceof R( + R + myInnerInnerInnerInnerInnerInnerInnerRecord + )) { + + } + } + } + } + } + } + } + } + + + final List<R> list = + List.of(new R(new R(new R(new R(new + R(new R(new R(new R(new R(null)))))))))); + + final Object o = list.get(0); + for (; o instanceof R(R rListElement); ) { + for (; rListElement instanceof R(R rListElementInner) r5; ) { + for (; rListElementInner instanceof R(R rListElementInnerInner); ) { + for (; rListElementInnerInner instanceof R(R rListElementInnerInnerInner); ) { + } + } + } + } + + final Iterator it = list.iterator(); + while (it.hasNext() && it.next() instanceof R(R rListElement2) r6) { + while (it.hasNext() && it.next() instanceof R(R rListElementInner2)) { + while (it.hasNext() && it.next() instanceof R(R rListElementInnerInner2)) { + while (it.hasNext() && it.next() instanceof R(R rListElementInnerInnerInner2)) { + } + } + } + } + + final Object myObj = list.get(0) instanceof R(R myRecord2) r7 + && myRecord2 instanceof R(R someComponent) + && someComponent instanceof R(R(R someComponent2)) + ? myRecord2 : null; + } +} diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/InputRecordPatternsPreview.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/InputRecordPatternsPreview.java new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/InputRecordPatternsPreview.java @@ -0,0 +1,116 @@ +//non-compiled with javac: Compilable with Java19 +package com.puppycrawl.tools.checkstyle.grammar.java19; + +public class InputRecordPatternsPreview { + record Box<T>(T t) { + } + + class A { + } + + class B extends A { + } + + sealed interface I permits C, D { + } + + final class C implements I { + } + + final class D implements I { + } + + record Pair<T>(T x, T y) { + } + + record Tuple(Object o1, Object o2, Object o3) {} + record VarArgs(Object... objArgs){} + + + static void test1(Box<Object> bo) { + if (bo instanceof Box<Object>(String s)) { + System.out.println("String " + s); + } + } + + static void test2(Box<Object> bo) { + if (bo instanceof Box<?>(var s)) { + System.out.println("String " + s); + } + } + + void test3(Box<I> bo) { + C c = new C(); + if (bo instanceof Box<I>(var s)) { + System.out.println("String " + s); + } + else if (bo instanceof Box b) { + + } + else if (bo instanceof Box<I> b && bo.t.equals(c)) { + + } + else if (bo != null && bo.t.equals(c)) { + + } + } + + static void test4(Pair<I> p) { + if (p instanceof Pair<I>(C t1, C t2)) { + System.out.println(t2); + } + else if (p instanceof Pair<I>(D t1, D t2)) { + System.out.println(t1); + } + } + + static void test5(Tuple t) { + if (t instanceof Tuple(String x, String y, String z)) { + System.out.println(x + y + z); + } + else if (t instanceof Tuple(Integer x, Integer y, Integer z)) { + System.out.println(x + y + z); + } + } + + static void test5(VarArgs v) { + if (v instanceof VarArgs(Integer[] ints)) { + int l = ints.length; + } + else if (v instanceof VarArgs(Object[] objects) + && objects.length > 2) { + int l = objects.length; + } + else if (v instanceof VarArgs(Object[] objects) + && objects.length < 2){ + int l = objects.length; + } + + } + + static void m1(Pair<I> p1) { + switch (p1) { + case Pair<I>(I i,C c) -> + System.out.println("C!"); + case Pair<I>(I i,D d) -> + System.out.println("D!"); + } + + switch (p1) { + case Pair<I>(C c,I i) -> + System.out.println("T!"); + case Pair<I>(D d,C c) -> + System.out.println("C!"); + case Pair<I>(D d1,D d2) -> + System.out.println("D!"); + } + } + + String m2(Pair<I> p1) { + return switch (p1) { + case Pair<I>(C c,I i) -> "T!"; + case Pair<I>(D d,C c) -> "C!"; + case Pair<I>(D d1,D d2) -> "D!"; + }; + } +} diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/InputRecordPatternsPreviewNestedDecomposition.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/InputRecordPatternsPreviewNestedDecomposition.java new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java19/InputRecordPatternsPreviewNestedDecomposition.java @@ -0,0 +1,80 @@ +//non-compiled with javac: Compilable with Java19 +package com.puppycrawl.tools.checkstyle.grammar.java19; + +public class InputRecordPatternsPreviewNestedDecomposition { + record A(Object o) { + } + + record B(Object o) { + } + + record Point(int x, int y) { + } + + enum Color {RED, GREEN, BLUE} + + record ColoredPoint(Point p, Color c) { + } + + record Rectangle(ColoredPoint upperLeft, ColoredPoint lowerRight) { + } + + void method(Object param) { + switch (param) { + case A(Object o) -> { + } + case B(var o) -> { + } + default -> { + } + } + if (param instanceof A(var o)) { + + } + } + + // Decompose record + static void p1(Rectangle r) { + if (r instanceof Rectangle(ColoredPoint ul,ColoredPoint lr)) { + System.out.println(ul.c()); + } + } + + // We can decompose this record further, since Point is also + // a record + static void p2(Rectangle r) { + if (r instanceof Rectangle(ColoredPoint(Point p1,Color c1), + ColoredPoint lr1) + && r instanceof Rectangle(ColoredPoint(Point p2,Color c2), + ColoredPoint lr2) && lr2.c == Color.BLUE) { + System.out.println(r); + } + } + + // We can keep decomposing down to the last "inner" record + static void p3(Rectangle r) { + if (r instanceof Rectangle(ColoredPoint(Point p1,Color c1), + ColoredPoint lr1) + && r instanceof Rectangle( + ColoredPoint(Point(int x,int y),Color c2), + ColoredPoint lr2)) { + System.out.println(r); + } + } + + static void p4() { + int x1 = 0; + int x2 = 0; + int y1 = 0; + int y2 = 0; + Color c1 = Color.BLUE; + Color c2 = Color.GREEN; + Rectangle r = new Rectangle(new ColoredPoint(new Point(x1, y1), c1), + new ColoredPoint(new Point(x2, y2), c2)); + if (r instanceof Rectangle( + ColoredPoint(Point(var x,var y),var c), + var lr)) { + System.out.println(x); + } + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughWeird.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughWeird.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughWeird.java @@ -0,0 +1,27 @@ +/* +FallThrough +checkLastCaseGroup = (default)false +reliefPattern = (default)falls?[ -]?thr(u|ough) + +*/ + +package com.puppycrawl.tools.checkstyle.checks.coding.fallthrough; + +public class InputFallThroughWeird { + void foo(int i){ + switch(i) { + case 1: + int fallthru = 2; // some comment + case 2: // violation 'Fall through from previous branch of the switch statement.' + break; + case 3: + int c = 2; // fall thru + case 4: // should be ok + break; + case 5: + String x = "x"; // fall thru + case 6: // should be ok + default: + } + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/java19/ExpectedRecordPatternsPreview.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/java19/ExpectedRecordPatternsPreview.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/java19/ExpectedRecordPatternsPreview.txt @@ -0,0 +1,1109 @@ +COMPILATION_UNIT -> COMPILATION_UNIT [2:0] +|--PACKAGE_DEF -> package [2:0] +| |--ANNOTATIONS -> ANNOTATIONS [2:47] +| |--DOT -> . [2:47] +| | |--DOT -> . [2:39] +| | | |--DOT -> . [2:28] +| | | | |--DOT -> . [2:22] +| | | | | |--DOT -> . [2:11] +| | | | | | |--IDENT -> com [2:8] +| | | | | | `--IDENT -> puppycrawl [2:12] +| | | | | `--IDENT -> tools [2:23] +| | | | `--IDENT -> checkstyle [2:29] +| | | `--IDENT -> grammar [2:40] +| | `--IDENT -> java19 [2:48] +| `--SEMI -> ; [2:54] +`--CLASS_DEF -> CLASS_DEF [4:0] + |--MODIFIERS -> MODIFIERS [4:0] + | `--LITERAL_PUBLIC -> public [4:0] + |--LITERAL_CLASS -> class [4:7] + |--IDENT -> InputRecordPatternsPreview [4:13] + `--OBJBLOCK -> OBJBLOCK [4:40] + |--LCURLY -> { [4:40] + |--RECORD_DEF -> RECORD_DEF [5:4] + | |--MODIFIERS -> MODIFIERS [5:4] + | |--LITERAL_RECORD -> record [5:4] + | |--IDENT -> Box [5:11] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [5:14] + | | |--GENERIC_START -> < [5:14] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [5:15] + | | | `--IDENT -> T [5:15] + | | `--GENERIC_END -> > [5:16] + | |--LPAREN -> ( [5:17] + | |--RECORD_COMPONENTS -> RECORD_COMPONENTS [5:18] + | | `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [5:18] + | | |--ANNOTATIONS -> ANNOTATIONS [5:18] + | | |--TYPE -> TYPE [5:18] + | | | `--IDENT -> T [5:18] + | | `--IDENT -> t [5:20] + | |--RPAREN -> ) [5:21] + | `--OBJBLOCK -> OBJBLOCK [5:23] + | |--LCURLY -> { [5:23] + | `--RCURLY -> } [6:4] + |--CLASS_DEF -> CLASS_DEF [8:4] + | |--MODIFIERS -> MODIFIERS [8:4] + | |--LITERAL_CLASS -> class [8:4] + | |--IDENT -> A [8:10] + | `--OBJBLOCK -> OBJBLOCK [8:12] + | |--LCURLY -> { [8:12] + | `--RCURLY -> } [9:4] + |--CLASS_DEF -> CLASS_DEF [11:4] + | |--MODIFIERS -> MODIFIERS [11:4] + | |--LITERAL_CLASS -> class [11:4] + | |--IDENT -> B [11:10] + | |--EXTENDS_CLAUSE -> extends [11:12] + | | `--IDENT -> A [11:20] + | `--OBJBLOCK -> OBJBLOCK [11:22] + | |--LCURLY -> { [11:22] + | `--RCURLY -> } [12:4] + |--INTERFACE_DEF -> INTERFACE_DEF [14:4] + | |--MODIFIERS -> MODIFIERS [14:4] + | | `--LITERAL_SEALED -> sealed [14:4] + | |--LITERAL_INTERFACE -> interface [14:11] + | |--IDENT -> I [14:21] + | |--PERMITS_CLAUSE -> permits [14:23] + | | |--IDENT -> C [14:31] + | | |--COMMA -> , [14:32] + | | `--IDENT -> D [14:34] + | `--OBJBLOCK -> OBJBLOCK [14:36] + | |--LCURLY -> { [14:36] + | `--RCURLY -> } [15:4] + |--CLASS_DEF -> CLASS_DEF [17:4] + | |--MODIFIERS -> MODIFIERS [17:4] + | | `--FINAL -> final [17:4] + | |--LITERAL_CLASS -> class [17:10] + | |--IDENT -> C [17:16] + | |--IMPLEMENTS_CLAUSE -> implements [17:18] + | | `--IDENT -> I [17:29] + | `--OBJBLOCK -> OBJBLOCK [17:31] + | |--LCURLY -> { [17:31] + | `--RCURLY -> } [18:4] + |--CLASS_DEF -> CLASS_DEF [20:4] + | |--MODIFIERS -> MODIFIERS [20:4] + | | `--FINAL -> final [20:4] + | |--LITERAL_CLASS -> class [20:10] + | |--IDENT -> D [20:16] + | |--IMPLEMENTS_CLAUSE -> implements [20:18] + | | `--IDENT -> I [20:29] + | `--OBJBLOCK -> OBJBLOCK [20:31] + | |--LCURLY -> { [20:31] + | `--RCURLY -> } [21:4] + |--RECORD_DEF -> RECORD_DEF [23:4] + | |--MODIFIERS -> MODIFIERS [23:4] + | |--LITERAL_RECORD -> record [23:4] + | |--IDENT -> Pair [23:11] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [23:15] + | | |--GENERIC_START -> < [23:15] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [23:16] + | | | `--IDENT -> T [23:16] + | | `--GENERIC_END -> > [23:17] + | |--LPAREN -> ( [23:18] + | |--RECORD_COMPONENTS -> RECORD_COMPONENTS [23:19] + | | |--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [23:19] + | | | |--ANNOTATIONS -> ANNOTATIONS [23:19] + | | | |--TYPE -> TYPE [23:19] + | | | | `--IDENT -> T [23:19] + | | | `--IDENT -> x [23:21] + | | |--COMMA -> , [23:22] + | | `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [23:24] + | | |--ANNOTATIONS -> ANNOTATIONS [23:24] + | | |--TYPE -> TYPE [23:24] + | | | `--IDENT -> T [23:24] + | | `--IDENT -> y [23:26] + | |--RPAREN -> ) [23:27] + | `--OBJBLOCK -> OBJBLOCK [23:29] + | |--LCURLY -> { [23:29] + | `--RCURLY -> } [24:4] + |--RECORD_DEF -> RECORD_DEF [26:4] + | |--MODIFIERS -> MODIFIERS [26:4] + | |--LITERAL_RECORD -> record [26:4] + | |--IDENT -> Tuple [26:11] + | |--LPAREN -> ( [26:16] + | |--RECORD_COMPONENTS -> RECORD_COMPONENTS [26:17] + | | |--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [26:17] + | | | |--ANNOTATIONS -> ANNOTATIONS [26:17] + | | | |--TYPE -> TYPE [26:17] + | | | | `--IDENT -> Object [26:17] + | | | `--IDENT -> o1 [26:24] + | | |--COMMA -> , [26:26] + | | |--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [26:28] + | | | |--ANNOTATIONS -> ANNOTATIONS [26:28] + | | | |--TYPE -> TYPE [26:28] + | | | | `--IDENT -> Object [26:28] + | | | `--IDENT -> o2 [26:35] + | | |--COMMA -> , [26:37] + | | `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [26:39] + | | |--ANNOTATIONS -> ANNOTATIONS [26:39] + | | |--TYPE -> TYPE [26:39] + | | | `--IDENT -> Object [26:39] + | | `--IDENT -> o3 [26:46] + | |--RPAREN -> ) [26:48] + | `--OBJBLOCK -> OBJBLOCK [26:50] + | |--LCURLY -> { [26:50] + | `--RCURLY -> } [26:51] + |--RECORD_DEF -> RECORD_DEF [27:4] + | |--MODIFIERS -> MODIFIERS [27:4] + | |--LITERAL_RECORD -> record [27:4] + | |--IDENT -> VarArgs [27:11] + | |--LPAREN -> ( [27:18] + | |--RECORD_COMPONENTS -> RECORD_COMPONENTS [27:19] + | | `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [27:19] + | | |--ANNOTATIONS -> ANNOTATIONS [27:19] + | | |--TYPE -> TYPE [27:19] + | | | `--IDENT -> Object [27:19] + | | |--ELLIPSIS -> ... [27:25] + | | `--IDENT -> objArgs [27:29] + | |--RPAREN -> ) [27:36] + | `--OBJBLOCK -> OBJBLOCK [27:37] + | |--LCURLY -> { [27:37] + | `--RCURLY -> } [27:38] + |--METHOD_DEF -> METHOD_DEF [30:4] + | |--MODIFIERS -> MODIFIERS [30:4] + | | `--LITERAL_STATIC -> static [30:4] + | |--TYPE -> TYPE [30:11] + | | `--LITERAL_VOID -> void [30:11] + | |--IDENT -> test1 [30:16] + | |--LPAREN -> ( [30:21] + | |--PARAMETERS -> PARAMETERS [30:22] + | | `--PARAMETER_DEF -> PARAMETER_DEF [30:22] + | | |--MODIFIERS -> MODIFIERS [30:22] + | | |--TYPE -> TYPE [30:22] + | | | |--IDENT -> Box [30:22] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [30:25] + | | | |--GENERIC_START -> < [30:25] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [30:26] + | | | | `--IDENT -> Object [30:26] + | | | `--GENERIC_END -> > [30:32] + | | `--IDENT -> bo [30:34] + | |--RPAREN -> ) [30:36] + | `--SLIST -> { [30:38] + | |--LITERAL_IF -> if [31:8] + | | |--LPAREN -> ( [31:11] + | | |--EXPR -> EXPR [31:15] + | | | `--LITERAL_INSTANCEOF -> instanceof [31:15] + | | | |--IDENT -> bo [31:12] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [31:26] + | | | |--MODIFIERS -> MODIFIERS [31:26] + | | | |--TYPE -> TYPE [31:26] + | | | | |--IDENT -> Box [31:26] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [31:29] + | | | | |--GENERIC_START -> < [31:29] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [31:30] + | | | | | `--IDENT -> Object [31:30] + | | | | `--GENERIC_END -> > [31:36] + | | | |--LPAREN -> ( [31:37] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [31:38] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [31:38] + | | | | |--MODIFIERS -> MODIFIERS [31:38] + | | | | |--TYPE -> TYPE [31:38] + | | | | | `--IDENT -> String [31:38] + | | | | `--IDENT -> s [31:45] + | | | `--RPAREN -> ) [31:46] + | | |--RPAREN -> ) [31:47] + | | `--SLIST -> { [31:49] + | | |--EXPR -> EXPR [32:30] + | | | `--METHOD_CALL -> ( [32:30] + | | | |--DOT -> . [32:22] + | | | | |--DOT -> . [32:18] + | | | | | |--IDENT -> System [32:12] + | | | | | `--IDENT -> out [32:19] + | | | | `--IDENT -> println [32:23] + | | | |--ELIST -> ELIST [32:41] + | | | | `--EXPR -> EXPR [32:41] + | | | | `--PLUS -> + [32:41] + | | | | |--STRING_LITERAL -> "String " [32:31] + | | | | `--IDENT -> s [32:43] + | | | `--RPAREN -> ) [32:44] + | | |--SEMI -> ; [32:45] + | | `--RCURLY -> } [33:8] + | `--RCURLY -> } [34:4] + |--METHOD_DEF -> METHOD_DEF [36:4] + | |--MODIFIERS -> MODIFIERS [36:4] + | | `--LITERAL_STATIC -> static [36:4] + | |--TYPE -> TYPE [36:11] + | | `--LITERAL_VOID -> void [36:11] + | |--IDENT -> test2 [36:16] + | |--LPAREN -> ( [36:21] + | |--PARAMETERS -> PARAMETERS [36:22] + | | `--PARAMETER_DEF -> PARAMETER_DEF [36:22] + | | |--MODIFIERS -> MODIFIERS [36:22] + | | |--TYPE -> TYPE [36:22] + | | | |--IDENT -> Box [36:22] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [36:25] + | | | |--GENERIC_START -> < [36:25] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [36:26] + | | | | `--IDENT -> Object [36:26] + | | | `--GENERIC_END -> > [36:32] + | | `--IDENT -> bo [36:34] + | |--RPAREN -> ) [36:36] + | `--SLIST -> { [36:38] + | |--LITERAL_IF -> if [37:8] + | | |--LPAREN -> ( [37:11] + | | |--EXPR -> EXPR [37:15] + | | | `--LITERAL_INSTANCEOF -> instanceof [37:15] + | | | |--IDENT -> bo [37:12] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [37:26] + | | | |--MODIFIERS -> MODIFIERS [37:26] + | | | |--TYPE -> TYPE [37:26] + | | | | |--IDENT -> Box [37:26] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [37:29] + | | | | |--GENERIC_START -> < [37:29] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [37:30] + | | | | | `--WILDCARD_TYPE -> ? [37:30] + | | | | `--GENERIC_END -> > [37:31] + | | | |--LPAREN -> ( [37:32] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [37:33] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [37:33] + | | | | |--MODIFIERS -> MODIFIERS [37:33] + | | | | |--TYPE -> TYPE [37:33] + | | | | | `--IDENT -> var [37:33] + | | | | `--IDENT -> s [37:37] + | | | `--RPAREN -> ) [37:38] + | | |--RPAREN -> ) [37:39] + | | `--SLIST -> { [37:41] + | | |--EXPR -> EXPR [38:30] + | | | `--METHOD_CALL -> ( [38:30] + | | | |--DOT -> . [38:22] + | | | | |--DOT -> . [38:18] + | | | | | |--IDENT -> System [38:12] + | | | | | `--IDENT -> out [38:19] + | | | | `--IDENT -> println [38:23] + | | | |--ELIST -> ELIST [38:41] + | | | | `--EXPR -> EXPR [38:41] + | | | | `--PLUS -> + [38:41] + | | | | |--STRING_LITERAL -> "String " [38:31] + | | | | `--IDENT -> s [38:43] + | | | `--RPAREN -> ) [38:44] + | | |--SEMI -> ; [38:45] + | | `--RCURLY -> } [39:8] + | `--RCURLY -> } [40:4] + |--METHOD_DEF -> METHOD_DEF [42:4] + | |--MODIFIERS -> MODIFIERS [42:4] + | |--TYPE -> TYPE [42:4] + | | `--LITERAL_VOID -> void [42:4] + | |--IDENT -> test3 [42:9] + | |--LPAREN -> ( [42:14] + | |--PARAMETERS -> PARAMETERS [42:15] + | | `--PARAMETER_DEF -> PARAMETER_DEF [42:15] + | | |--MODIFIERS -> MODIFIERS [42:15] + | | |--TYPE -> TYPE [42:15] + | | | |--IDENT -> Box [42:15] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [42:18] + | | | |--GENERIC_START -> < [42:18] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [42:19] + | | | | `--IDENT -> I [42:19] + | | | `--GENERIC_END -> > [42:20] + | | `--IDENT -> bo [42:22] + | |--RPAREN -> ) [42:24] + | `--SLIST -> { [42:26] + | |--VARIABLE_DEF -> VARIABLE_DEF [43:8] + | | |--MODIFIERS -> MODIFIERS [43:8] + | | |--TYPE -> TYPE [43:8] + | | | `--IDENT -> C [43:8] + | | |--IDENT -> c [43:10] + | | `--ASSIGN -> = [43:12] + | | `--EXPR -> EXPR [43:14] + | | `--LITERAL_NEW -> new [43:14] + | | |--IDENT -> C [43:18] + | | |--LPAREN -> ( [43:19] + | | |--ELIST -> ELIST [43:20] + | | `--RPAREN -> ) [43:20] + | |--SEMI -> ; [43:21] + | |--LITERAL_IF -> if [44:8] + | | |--LPAREN -> ( [44:11] + | | |--EXPR -> EXPR [44:15] + | | | `--LITERAL_INSTANCEOF -> instanceof [44:15] + | | | |--IDENT -> bo [44:12] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [44:26] + | | | |--MODIFIERS -> MODIFIERS [44:26] + | | | |--TYPE -> TYPE [44:26] + | | | | |--IDENT -> Box [44:26] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [44:29] + | | | | |--GENERIC_START -> < [44:29] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [44:30] + | | | | | `--IDENT -> I [44:30] + | | | | `--GENERIC_END -> > [44:31] + | | | |--LPAREN -> ( [44:32] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [44:33] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [44:33] + | | | | |--MODIFIERS -> MODIFIERS [44:33] + | | | | |--TYPE -> TYPE [44:33] + | | | | | `--IDENT -> var [44:33] + | | | | `--IDENT -> s [44:37] + | | | `--RPAREN -> ) [44:38] + | | |--RPAREN -> ) [44:39] + | | |--SLIST -> { [44:41] + | | | |--EXPR -> EXPR [45:30] + | | | | `--METHOD_CALL -> ( [45:30] + | | | | |--DOT -> . [45:22] + | | | | | |--DOT -> . [45:18] + | | | | | | |--IDENT -> System [45:12] + | | | | | | `--IDENT -> out [45:19] + | | | | | `--IDENT -> println [45:23] + | | | | |--ELIST -> ELIST [45:41] + | | | | | `--EXPR -> EXPR [45:41] + | | | | | `--PLUS -> + [45:41] + | | | | | |--STRING_LITERAL -> "String " [45:31] + | | | | | `--IDENT -> s [45:43] + | | | | `--RPAREN -> ) [45:44] + | | | |--SEMI -> ; [45:45] + | | | `--RCURLY -> } [46:8] + | | `--LITERAL_ELSE -> else [47:8] + | | `--LITERAL_IF -> if [47:13] + | | |--LPAREN -> ( [47:16] + | | |--EXPR -> EXPR [47:20] + | | | `--LITERAL_INSTANCEOF -> instanceof [47:20] + | | | |--IDENT -> bo [47:17] + | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [47:31] + | | | |--MODIFIERS -> MODIFIERS [47:31] + | | | |--TYPE -> TYPE [47:31] + | | | | `--IDENT -> Box [47:31] + | | | `--IDENT -> b [47:35] + | | |--RPAREN -> ) [47:36] + | | |--SLIST -> { [47:38] + | | | `--RCURLY -> } [49:8] + | | `--LITERAL_ELSE -> else [50:8] + | | `--LITERAL_IF -> if [50:13] + | | |--LPAREN -> ( [50:16] + | | |--EXPR -> EXPR [50:40] + | | | `--LAND -> && [50:40] + | | | |--LITERAL_INSTANCEOF -> instanceof [50:20] + | | | | |--IDENT -> bo [50:17] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [50:31] + | | | | |--MODIFIERS -> MODIFIERS [50:31] + | | | | |--TYPE -> TYPE [50:31] + | | | | | |--IDENT -> Box [50:31] + | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [50:34] + | | | | | |--GENERIC_START -> < [50:34] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [50:35] + | | | | | | `--IDENT -> I [50:35] + | | | | | `--GENERIC_END -> > [50:36] + | | | | `--IDENT -> b [50:38] + | | | `--METHOD_CALL -> ( [50:54] + | | | |--DOT -> . [50:47] + | | | | |--DOT -> . [50:45] + | | | | | |--IDENT -> bo [50:43] + | | | | | `--IDENT -> t [50:46] + | | | | `--IDENT -> equals [50:48] + | | | |--ELIST -> ELIST [50:55] + | | | | `--EXPR -> EXPR [50:55] + | | | | `--IDENT -> c [50:55] + | | | `--RPAREN -> ) [50:56] + | | |--RPAREN -> ) [50:57] + | | |--SLIST -> { [50:59] + | | | `--RCURLY -> } [52:8] + | | `--LITERAL_ELSE -> else [53:8] + | | `--LITERAL_IF -> if [53:13] + | | |--LPAREN -> ( [53:16] + | | |--EXPR -> EXPR [53:28] + | | | `--LAND -> && [53:28] + | | | |--NOT_EQUAL -> != [53:20] + | | | | |--IDENT -> bo [53:17] + | | | | `--LITERAL_NULL -> null [53:23] + | | | `--METHOD_CALL -> ( [53:42] + | | | |--DOT -> . [53:35] + | | | | |--DOT -> . [53:33] + | | | | | |--IDENT -> bo [53:31] + | | | | | `--IDENT -> t [53:34] + | | | | `--IDENT -> equals [53:36] + | | | |--ELIST -> ELIST [53:43] + | | | | `--EXPR -> EXPR [53:43] + | | | | `--IDENT -> c [53:43] + | | | `--RPAREN -> ) [53:44] + | | |--RPAREN -> ) [53:45] + | | `--SLIST -> { [53:47] + | | `--RCURLY -> } [55:8] + | `--RCURLY -> } [56:4] + |--METHOD_DEF -> METHOD_DEF [58:4] + | |--MODIFIERS -> MODIFIERS [58:4] + | | `--LITERAL_STATIC -> static [58:4] + | |--TYPE -> TYPE [58:11] + | | `--LITERAL_VOID -> void [58:11] + | |--IDENT -> test4 [58:16] + | |--LPAREN -> ( [58:21] + | |--PARAMETERS -> PARAMETERS [58:22] + | | `--PARAMETER_DEF -> PARAMETER_DEF [58:22] + | | |--MODIFIERS -> MODIFIERS [58:22] + | | |--TYPE -> TYPE [58:22] + | | | |--IDENT -> Pair [58:22] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [58:26] + | | | |--GENERIC_START -> < [58:26] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [58:27] + | | | | `--IDENT -> I [58:27] + | | | `--GENERIC_END -> > [58:28] + | | `--IDENT -> p [58:30] + | |--RPAREN -> ) [58:31] + | `--SLIST -> { [58:33] + | |--LITERAL_IF -> if [59:8] + | | |--LPAREN -> ( [59:11] + | | |--EXPR -> EXPR [59:14] + | | | `--LITERAL_INSTANCEOF -> instanceof [59:14] + | | | |--IDENT -> p [59:12] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [59:25] + | | | |--MODIFIERS -> MODIFIERS [59:25] + | | | |--TYPE -> TYPE [59:25] + | | | | |--IDENT -> Pair [59:25] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [59:29] + | | | | |--GENERIC_START -> < [59:29] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [59:30] + | | | | | `--IDENT -> I [59:30] + | | | | `--GENERIC_END -> > [59:31] + | | | |--LPAREN -> ( [59:32] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [59:33] + | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [59:33] + | | | | | |--MODIFIERS -> MODIFIERS [59:33] + | | | | | |--TYPE -> TYPE [59:33] + | | | | | | `--IDENT -> C [59:33] + | | | | | `--IDENT -> t1 [59:35] + | | | | |--COMMA -> , [59:37] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [59:39] + | | | | |--MODIFIERS -> MODIFIERS [59:39] + | | | | |--TYPE -> TYPE [59:39] + | | | | | `--IDENT -> C [59:39] + | | | | `--IDENT -> t2 [59:41] + | | | `--RPAREN -> ) [59:43] + | | |--RPAREN -> ) [59:44] + | | |--SLIST -> { [59:46] + | | | |--EXPR -> EXPR [60:30] + | | | | `--METHOD_CALL -> ( [60:30] + | | | | |--DOT -> . [60:22] + | | | | | |--DOT -> . [60:18] + | | | | | | |--IDENT -> System [60:12] + | | | | | | `--IDENT -> out [60:19] + | | | | | `--IDENT -> println [60:23] + | | | | |--ELIST -> ELIST [60:31] + | | | | | `--EXPR -> EXPR [60:31] + | | | | | `--IDENT -> t2 [60:31] + | | | | `--RPAREN -> ) [60:33] + | | | |--SEMI -> ; [60:34] + | | | `--RCURLY -> } [61:8] + | | `--LITERAL_ELSE -> else [62:8] + | | `--LITERAL_IF -> if [62:13] + | | |--LPAREN -> ( [62:16] + | | |--EXPR -> EXPR [62:19] + | | | `--LITERAL_INSTANCEOF -> instanceof [62:19] + | | | |--IDENT -> p [62:17] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [62:30] + | | | |--MODIFIERS -> MODIFIERS [62:30] + | | | |--TYPE -> TYPE [62:30] + | | | | |--IDENT -> Pair [62:30] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [62:34] + | | | | |--GENERIC_START -> < [62:34] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [62:35] + | | | | | `--IDENT -> I [62:35] + | | | | `--GENERIC_END -> > [62:36] + | | | |--LPAREN -> ( [62:37] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [62:38] + | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [62:38] + | | | | | |--MODIFIERS -> MODIFIERS [62:38] + | | | | | |--TYPE -> TYPE [62:38] + | | | | | | `--IDENT -> D [62:38] + | | | | | `--IDENT -> t1 [62:40] + | | | | |--COMMA -> , [62:42] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [62:44] + | | | | |--MODIFIERS -> MODIFIERS [62:44] + | | | | |--TYPE -> TYPE [62:44] + | | | | | `--IDENT -> D [62:44] + | | | | `--IDENT -> t2 [62:46] + | | | `--RPAREN -> ) [62:48] + | | |--RPAREN -> ) [62:49] + | | `--SLIST -> { [62:51] + | | |--EXPR -> EXPR [63:30] + | | | `--METHOD_CALL -> ( [63:30] + | | | |--DOT -> . [63:22] + | | | | |--DOT -> . [63:18] + | | | | | |--IDENT -> System [63:12] + | | | | | `--IDENT -> out [63:19] + | | | | `--IDENT -> println [63:23] + | | | |--ELIST -> ELIST [63:31] + | | | | `--EXPR -> EXPR [63:31] + | | | | `--IDENT -> t1 [63:31] + | | | `--RPAREN -> ) [63:33] + | | |--SEMI -> ; [63:34] + | | `--RCURLY -> } [64:8] + | `--RCURLY -> } [65:4] + |--METHOD_DEF -> METHOD_DEF [67:4] + | |--MODIFIERS -> MODIFIERS [67:4] + | | `--LITERAL_STATIC -> static [67:4] + | |--TYPE -> TYPE [67:11] + | | `--LITERAL_VOID -> void [67:11] + | |--IDENT -> test5 [67:16] + | |--LPAREN -> ( [67:21] + | |--PARAMETERS -> PARAMETERS [67:22] + | | `--PARAMETER_DEF -> PARAMETER_DEF [67:22] + | | |--MODIFIERS -> MODIFIERS [67:22] + | | |--TYPE -> TYPE [67:22] + | | | `--IDENT -> Tuple [67:22] + | | `--IDENT -> t [67:28] + | |--RPAREN -> ) [67:29] + | `--SLIST -> { [67:31] + | |--LITERAL_IF -> if [68:8] + | | |--LPAREN -> ( [68:11] + | | |--EXPR -> EXPR [68:14] + | | | `--LITERAL_INSTANCEOF -> instanceof [68:14] + | | | |--IDENT -> t [68:12] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [68:25] + | | | |--MODIFIERS -> MODIFIERS [68:25] + | | | |--TYPE -> TYPE [68:25] + | | | | `--IDENT -> Tuple [68:25] + | | | |--LPAREN -> ( [68:30] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [68:31] + | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [68:31] + | | | | | |--MODIFIERS -> MODIFIERS [68:31] + | | | | | |--TYPE -> TYPE [68:31] + | | | | | | `--IDENT -> String [68:31] + | | | | | `--IDENT -> x [68:38] + | | | | |--COMMA -> , [68:39] + | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [68:41] + | | | | | |--MODIFIERS -> MODIFIERS [68:41] + | | | | | |--TYPE -> TYPE [68:41] + | | | | | | `--IDENT -> String [68:41] + | | | | | `--IDENT -> y [68:48] + | | | | |--COMMA -> , [68:49] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [68:51] + | | | | |--MODIFIERS -> MODIFIERS [68:51] + | | | | |--TYPE -> TYPE [68:51] + | | | | | `--IDENT -> String [68:51] + | | | | `--IDENT -> z [68:58] + | | | `--RPAREN -> ) [68:59] + | | |--RPAREN -> ) [68:60] + | | |--SLIST -> { [68:62] + | | | |--EXPR -> EXPR [69:30] + | | | | `--METHOD_CALL -> ( [69:30] + | | | | |--DOT -> . [69:22] + | | | | | |--DOT -> . [69:18] + | | | | | | |--IDENT -> System [69:12] + | | | | | | `--IDENT -> out [69:19] + | | | | | `--IDENT -> println [69:23] + | | | | |--ELIST -> ELIST [69:37] + | | | | | `--EXPR -> EXPR [69:37] + | | | | | `--PLUS -> + [69:37] + | | | | | |--PLUS -> + [69:33] + | | | | | | |--IDENT -> x [69:31] + | | | | | | `--IDENT -> y [69:35] + | | | | | `--IDENT -> z [69:39] + | | | | `--RPAREN -> ) [69:40] + | | | |--SEMI -> ; [69:41] + | | | `--RCURLY -> } [70:8] + | | `--LITERAL_ELSE -> else [71:8] + | | `--LITERAL_IF -> if [71:13] + | | |--LPAREN -> ( [71:16] + | | |--EXPR -> EXPR [71:19] + | | | `--LITERAL_INSTANCEOF -> instanceof [71:19] + | | | |--IDENT -> t [71:17] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [71:30] + | | | |--MODIFIERS -> MODIFIERS [71:30] + | | | |--TYPE -> TYPE [71:30] + | | | | `--IDENT -> Tuple [71:30] + | | | |--LPAREN -> ( [71:35] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [71:36] + | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [71:36] + | | | | | |--MODIFIERS -> MODIFIERS [71:36] + | | | | | |--TYPE -> TYPE [71:36] + | | | | | | `--IDENT -> Integer [71:36] + | | | | | `--IDENT -> x [71:44] + | | | | |--COMMA -> , [71:45] + | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [71:47] + | | | | | |--MODIFIERS -> MODIFIERS [71:47] + | | | | | |--TYPE -> TYPE [71:47] + | | | | | | `--IDENT -> Integer [71:47] + | | | | | `--IDENT -> y [71:55] + | | | | |--COMMA -> , [71:56] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [71:58] + | | | | |--MODIFIERS -> MODIFIERS [71:58] + | | | | |--TYPE -> TYPE [71:58] + | | | | | `--IDENT -> Integer [71:58] + | | | | `--IDENT -> z [71:66] + | | | `--RPAREN -> ) [71:67] + | | |--RPAREN -> ) [71:68] + | | `--SLIST -> { [71:70] + | | |--EXPR -> EXPR [72:30] + | | | `--METHOD_CALL -> ( [72:30] + | | | |--DOT -> . [72:22] + | | | | |--DOT -> . [72:18] + | | | | | |--IDENT -> System [72:12] + | | | | | `--IDENT -> out [72:19] + | | | | `--IDENT -> println [72:23] + | | | |--ELIST -> ELIST [72:37] + | | | | `--EXPR -> EXPR [72:37] + | | | | `--PLUS -> + [72:37] + | | | | |--PLUS -> + [72:33] + | | | | | |--IDENT -> x [72:31] + | | | | | `--IDENT -> y [72:35] + | | | | `--IDENT -> z [72:39] + | | | `--RPAREN -> ) [72:40] + | | |--SEMI -> ; [72:41] + | | `--RCURLY -> } [73:8] + | `--RCURLY -> } [74:4] + |--METHOD_DEF -> METHOD_DEF [76:4] + | |--MODIFIERS -> MODIFIERS [76:4] + | | `--LITERAL_STATIC -> static [76:4] + | |--TYPE -> TYPE [76:11] + | | `--LITERAL_VOID -> void [76:11] + | |--IDENT -> test5 [76:16] + | |--LPAREN -> ( [76:21] + | |--PARAMETERS -> PARAMETERS [76:22] + | | `--PARAMETER_DEF -> PARAMETER_DEF [76:22] + | | |--MODIFIERS -> MODIFIERS [76:22] + | | |--TYPE -> TYPE [76:22] + | | | `--IDENT -> VarArgs [76:22] + | | `--IDENT -> v [76:30] + | |--RPAREN -> ) [76:31] + | `--SLIST -> { [76:33] + | |--LITERAL_IF -> if [77:8] + | | |--LPAREN -> ( [77:11] + | | |--EXPR -> EXPR [77:14] + | | | `--LITERAL_INSTANCEOF -> instanceof [77:14] + | | | |--IDENT -> v [77:12] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [77:25] + | | | |--MODIFIERS -> MODIFIERS [77:25] + | | | |--TYPE -> TYPE [77:25] + | | | | `--IDENT -> VarArgs [77:25] + | | | |--LPAREN -> ( [77:32] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [77:33] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [77:33] + | | | | |--MODIFIERS -> MODIFIERS [77:33] + | | | | |--TYPE -> TYPE [77:33] + | | | | | |--IDENT -> Integer [77:33] + | | | | | `--ARRAY_DECLARATOR -> [ [77:40] + | | | | | `--RBRACK -> ] [77:41] + | | | | `--IDENT -> ints [77:43] + | | | `--RPAREN -> ) [77:47] + | | |--RPAREN -> ) [77:48] + | | |--SLIST -> { [77:50] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [78:12] + | | | | |--MODIFIERS -> MODIFIERS [78:12] + | | | | |--TYPE -> TYPE [78:12] + | | | | | `--LITERAL_INT -> int [78:12] + | | | | |--IDENT -> l [78:16] + | | | | `--ASSIGN -> = [78:18] + | | | | `--EXPR -> EXPR [78:24] + | | | | `--DOT -> . [78:24] + | | | | |--IDENT -> ints [78:20] + | | | | `--IDENT -> length [78:25] + | | | |--SEMI -> ; [78:31] + | | | `--RCURLY -> } [79:8] + | | `--LITERAL_ELSE -> else [80:8] + | | `--LITERAL_IF -> if [80:13] + | | |--LPAREN -> ( [80:16] + | | |--EXPR -> EXPR [81:12] + | | | `--LAND -> && [81:12] + | | | |--LITERAL_INSTANCEOF -> instanceof [80:19] + | | | | |--IDENT -> v [80:17] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [80:30] + | | | | |--MODIFIERS -> MODIFIERS [80:30] + | | | | |--TYPE -> TYPE [80:30] + | | | | | `--IDENT -> VarArgs [80:30] + | | | | |--LPAREN -> ( [80:37] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [80:38] + | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [80:38] + | | | | | |--MODIFIERS -> MODIFIERS [80:38] + | | | | | |--TYPE -> TYPE [80:38] + | | | | | | |--IDENT -> Object [80:38] + | | | | | | `--ARRAY_DECLARATOR -> [ [80:44] + | | | | | | `--RBRACK -> ] [80:45] + | | | | | `--IDENT -> objects [80:47] + | | | | `--RPAREN -> ) [80:54] + | | | `--GT -> > [81:30] + | | | |--DOT -> . [81:22] + | | | | |--IDENT -> objects [81:15] + | | | | `--IDENT -> length [81:23] + | | | `--NUM_INT -> 2 [81:32] + | | |--RPAREN -> ) [81:33] + | | |--SLIST -> { [81:35] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [82:12] + | | | | |--MODIFIERS -> MODIFIERS [82:12] + | | | | |--TYPE -> TYPE [82:12] + | | | | | `--LITERAL_INT -> int [82:12] + | | | | |--IDENT -> l [82:16] + | | | | `--ASSIGN -> = [82:18] + | | | | `--EXPR -> EXPR [82:27] + | | | | `--DOT -> . [82:27] + | | | | |--IDENT -> objects [82:20] + | | | | `--IDENT -> length [82:28] + | | | |--SEMI -> ; [82:34] + | | | `--RCURLY -> } [83:8] + | | `--LITERAL_ELSE -> else [84:8] + | | `--LITERAL_IF -> if [84:13] + | | |--LPAREN -> ( [84:16] + | | |--EXPR -> EXPR [85:12] + | | | `--LAND -> && [85:12] + | | | |--LITERAL_INSTANCEOF -> instanceof [84:19] + | | | | |--IDENT -> v [84:17] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [84:30] + | | | | |--MODIFIERS -> MODIFIERS [84:30] + | | | | |--TYPE -> TYPE [84:30] + | | | | | `--IDENT -> VarArgs [84:30] + | | | | |--LPAREN -> ( [84:37] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [84:38] + | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [84:38] + | | | | | |--MODIFIERS -> MODIFIERS [84:38] + | | | | | |--TYPE -> TYPE [84:38] + | | | | | | |--IDENT -> Object [84:38] + | | | | | | `--ARRAY_DECLARATOR -> [ [84:44] + | | | | | | `--RBRACK -> ] [84:45] + | | | | | `--IDENT -> objects [84:47] + | | | | `--RPAREN -> ) [84:54] + | | | `--LT -> < [85:30] + | | | |--DOT -> . [85:22] + | | | | |--IDENT -> objects [85:15] + | | | | `--IDENT -> length [85:23] + | | | `--NUM_INT -> 2 [85:32] + | | |--RPAREN -> ) [85:33] + | | `--SLIST -> { [85:34] + | | |--VARIABLE_DEF -> VARIABLE_DEF [86:12] + | | | |--MODIFIERS -> MODIFIERS [86:12] + | | | |--TYPE -> TYPE [86:12] + | | | | `--LITERAL_INT -> int [86:12] + | | | |--IDENT -> l [86:16] + | | | `--ASSIGN -> = [86:18] + | | | `--EXPR -> EXPR [86:27] + | | | `--DOT -> . [86:27] + | | | |--IDENT -> objects [86:20] + | | | `--IDENT -> length [86:28] + | | |--SEMI -> ; [86:34] + | | `--RCURLY -> } [87:8] + | `--RCURLY -> } [89:4] + |--METHOD_DEF -> METHOD_DEF [91:4] + | |--MODIFIERS -> MODIFIERS [91:4] + | | `--LITERAL_STATIC -> static [91:4] + | |--TYPE -> TYPE [91:11] + | | `--LITERAL_VOID -> void [91:11] + | |--IDENT -> m1 [91:16] + | |--LPAREN -> ( [91:18] + | |--PARAMETERS -> PARAMETERS [91:19] + | | `--PARAMETER_DEF -> PARAMETER_DEF [91:19] + | | |--MODIFIERS -> MODIFIERS [91:19] + | | |--TYPE -> TYPE [91:19] + | | | |--IDENT -> Pair [91:19] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [91:23] + | | | |--GENERIC_START -> < [91:23] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [91:24] + | | | | `--IDENT -> I [91:24] + | | | `--GENERIC_END -> > [91:25] + | | `--IDENT -> p1 [91:27] + | |--RPAREN -> ) [91:29] + | `--SLIST -> { [91:31] + | |--LITERAL_SWITCH -> switch [92:8] + | | |--LPAREN -> ( [92:15] + | | |--EXPR -> EXPR [92:16] + | | | `--IDENT -> p1 [92:16] + | | |--RPAREN -> ) [92:18] + | | |--LCURLY -> { [92:20] + | | |--SWITCH_RULE -> SWITCH_RULE [93:12] + | | | |--LITERAL_CASE -> case [93:12] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [93:17] + | | | | |--MODIFIERS -> MODIFIERS [93:17] + | | | | |--TYPE -> TYPE [93:17] + | | | | | |--IDENT -> Pair [93:17] + | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [93:21] + | | | | | |--GENERIC_START -> < [93:21] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [93:22] + | | | | | | `--IDENT -> I [93:22] + | | | | | `--GENERIC_END -> > [93:23] + | | | | |--LPAREN -> ( [93:24] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [93:25] + | | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [93:25] + | | | | | | |--MODIFIERS -> MODIFIERS [93:25] + | | | | | | |--TYPE -> TYPE [93:25] + | | | | | | | `--IDENT -> I [93:25] + | | | | | | `--IDENT -> i [93:27] + | | | | | |--COMMA -> , [93:28] + | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [93:29] + | | | | | |--MODIFIERS -> MODIFIERS [93:29] + | | | | | |--TYPE -> TYPE [93:29] + | | | | | | `--IDENT -> C [93:29] + | | | | | `--IDENT -> c [93:31] + | | | | `--RPAREN -> ) [93:32] + | | | |--LAMBDA -> -> [93:34] + | | | |--EXPR -> EXPR [94:38] + | | | | `--METHOD_CALL -> ( [94:38] + | | | | |--DOT -> . [94:30] + | | | | | |--DOT -> . [94:26] + | | | | | | |--IDENT -> System [94:20] + | | | | | | `--IDENT -> out [94:27] + | | | | | `--IDENT -> println [94:31] + | | | | |--ELIST -> ELIST [94:39] + | | | | | `--EXPR -> EXPR [94:39] + | | | | | `--STRING_LITERAL -> "C!" [94:39] + | | | | `--RPAREN -> ) [94:43] + | | | `--SEMI -> ; [94:44] + | | |--SWITCH_RULE -> SWITCH_RULE [95:12] + | | | |--LITERAL_CASE -> case [95:12] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [95:17] + | | | | |--MODIFIERS -> MODIFIERS [95:17] + | | | | |--TYPE -> TYPE [95:17] + | | | | | |--IDENT -> Pair [95:17] + | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [95:21] + | | | | | |--GENERIC_START -> < [95:21] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [95:22] + | | | | | | `--IDENT -> I [95:22] + | | | | | `--GENERIC_END -> > [95:23] + | | | | |--LPAREN -> ( [95:24] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [95:25] + | | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [95:25] + | | | | | | |--MODIFIERS -> MODIFIERS [95:25] + | | | | | | |--TYPE -> TYPE [95:25] + | | | | | | | `--IDENT -> I [95:25] + | | | | | | `--IDENT -> i [95:27] + | | | | | |--COMMA -> , [95:28] + | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [95:29] + | | | | | |--MODIFIERS -> MODIFIERS [95:29] + | | | | | |--TYPE -> TYPE [95:29] + | | | | | | `--IDENT -> D [95:29] + | | | | | `--IDENT -> d [95:31] + | | | | `--RPAREN -> ) [95:32] + | | | |--LAMBDA -> -> [95:34] + | | | |--EXPR -> EXPR [96:38] + | | | | `--METHOD_CALL -> ( [96:38] + | | | | |--DOT -> . [96:30] + | | | | | |--DOT -> . [96:26] + | | | | | | |--IDENT -> System [96:20] + | | | | | | `--IDENT -> out [96:27] + | | | | | `--IDENT -> println [96:31] + | | | | |--ELIST -> ELIST [96:39] + | | | | | `--EXPR -> EXPR [96:39] + | | | | | `--STRING_LITERAL -> "D!" [96:39] + | | | | `--RPAREN -> ) [96:43] + | | | `--SEMI -> ; [96:44] + | | `--RCURLY -> } [97:8] + | |--LITERAL_SWITCH -> switch [99:8] + | | |--LPAREN -> ( [99:15] + | | |--EXPR -> EXPR [99:16] + | | | `--IDENT -> p1 [99:16] + | | |--RPAREN -> ) [99:18] + | | |--LCURLY -> { [99:20] + | | |--SWITCH_RULE -> SWITCH_RULE [100:12] + | | | |--LITERAL_CASE -> case [100:12] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [100:17] + | | | | |--MODIFIERS -> MODIFIERS [100:17] + | | | | |--TYPE -> TYPE [100:17] + | | | | | |--IDENT -> Pair [100:17] + | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [100:21] + | | | | | |--GENERIC_START -> < [100:21] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [100:22] + | | | | | | `--IDENT -> I [100:22] + | | | | | `--GENERIC_END -> > [100:23] + | | | | |--LPAREN -> ( [100:24] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [100:25] + | | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [100:25] + | | | | | | |--MODIFIERS -> MODIFIERS [100:25] + | | | | | | |--TYPE -> TYPE [100:25] + | | | | | | | `--IDENT -> C [100:25] + | | | | | | `--IDENT -> c [100:27] + | | | | | |--COMMA -> , [100:28] + | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [100:29] + | | | | | |--MODIFIERS -> MODIFIERS [100:29] + | | | | | |--TYPE -> TYPE [100:29] + | | | | | | `--IDENT -> I [100:29] + | | | | | `--IDENT -> i [100:31] + | | | | `--RPAREN -> ) [100:32] + | | | |--LAMBDA -> -> [100:34] + | | | |--EXPR -> EXPR [101:38] + | | | | `--METHOD_CALL -> ( [101:38] + | | | | |--DOT -> . [101:30] + | | | | | |--DOT -> . [101:26] + | | | | | | |--IDENT -> System [101:20] + | | | | | | `--IDENT -> out [101:27] + | | | | | `--IDENT -> println [101:31] + | | | | |--ELIST -> ELIST [101:39] + | | | | | `--EXPR -> EXPR [101:39] + | | | | | `--STRING_LITERAL -> "T!" [101:39] + | | | | `--RPAREN -> ) [101:43] + | | | `--SEMI -> ; [101:44] + | | |--SWITCH_RULE -> SWITCH_RULE [102:12] + | | | |--LITERAL_CASE -> case [102:12] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [102:17] + | | | | |--MODIFIERS -> MODIFIERS [102:17] + | | | | |--TYPE -> TYPE [102:17] + | | | | | |--IDENT -> Pair [102:17] + | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [102:21] + | | | | | |--GENERIC_START -> < [102:21] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [102:22] + | | | | | | `--IDENT -> I [102:22] + | | | | | `--GENERIC_END -> > [102:23] + | | | | |--LPAREN -> ( [102:24] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [102:25] + | | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [102:25] + | | | | | | |--MODIFIERS -> MODIFIERS [102:25] + | | | | | | |--TYPE -> TYPE [102:25] + | | | | | | | `--IDENT -> D [102:25] + | | | | | | `--IDENT -> d [102:27] + | | | | | |--COMMA -> , [102:28] + | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [102:29] + | | | | | |--MODIFIERS -> MODIFIERS [102:29] + | | | | | |--TYPE -> TYPE [102:29] + | | | | | | `--IDENT -> C [102:29] + | | | | | `--IDENT -> c [102:31] + | | | | `--RPAREN -> ) [102:32] + | | | |--LAMBDA -> -> [102:34] + | | | |--EXPR -> EXPR [103:38] + | | | | `--METHOD_CALL -> ( [103:38] + | | | | |--DOT -> . [103:30] + | | | | | |--DOT -> . [103:26] + | | | | | | |--IDENT -> System [103:20] + | | | | | | `--IDENT -> out [103:27] + | | | | | `--IDENT -> println [103:31] + | | | | |--ELIST -> ELIST [103:39] + | | | | | `--EXPR -> EXPR [103:39] + | | | | | `--STRING_LITERAL -> "C!" [103:39] + | | | | `--RPAREN -> ) [103:43] + | | | `--SEMI -> ; [103:44] + | | |--SWITCH_RULE -> SWITCH_RULE [104:12] + | | | |--LITERAL_CASE -> case [104:12] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [104:17] + | | | | |--MODIFIERS -> MODIFIERS [104:17] + | | | | |--TYPE -> TYPE [104:17] + | | | | | |--IDENT -> Pair [104:17] + | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [104:21] + | | | | | |--GENERIC_START -> < [104:21] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [104:22] + | | | | | | `--IDENT -> I [104:22] + | | | | | `--GENERIC_END -> > [104:23] + | | | | |--LPAREN -> ( [104:24] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [104:25] + | | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [104:25] + | | | | | | |--MODIFIERS -> MODIFIERS [104:25] + | | | | | | |--TYPE -> TYPE [104:25] + | | | | | | | `--IDENT -> D [104:25] + | | | | | | `--IDENT -> d1 [104:27] + | | | | | |--COMMA -> , [104:29] + | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [104:30] + | | | | | |--MODIFIERS -> MODIFIERS [104:30] + | | | | | |--TYPE -> TYPE [104:30] + | | | | | | `--IDENT -> D [104:30] + | | | | | `--IDENT -> d2 [104:32] + | | | | `--RPAREN -> ) [104:34] + | | | |--LAMBDA -> -> [104:36] + | | | |--EXPR -> EXPR [105:38] + | | | | `--METHOD_CALL -> ( [105:38] + | | | | |--DOT -> . [105:30] + | | | | | |--DOT -> . [105:26] + | | | | | | |--IDENT -> System [105:20] + | | | | | | `--IDENT -> out [105:27] + | | | | | `--IDENT -> println [105:31] + | | | | |--ELIST -> ELIST [105:39] + | | | | | `--EXPR -> EXPR [105:39] + | | | | | `--STRING_LITERAL -> "D!" [105:39] + | | | | `--RPAREN -> ) [105:43] + | | | `--SEMI -> ; [105:44] + | | `--RCURLY -> } [106:8] + | `--RCURLY -> } [107:4] + |--METHOD_DEF -> METHOD_DEF [109:4] + | |--MODIFIERS -> MODIFIERS [109:4] + | |--TYPE -> TYPE [109:4] + | | `--IDENT -> String [109:4] + | |--IDENT -> m2 [109:11] + | |--LPAREN -> ( [109:13] + | |--PARAMETERS -> PARAMETERS [109:14] + | | `--PARAMETER_DEF -> PARAMETER_DEF [109:14] + | | |--MODIFIERS -> MODIFIERS [109:14] + | | |--TYPE -> TYPE [109:14] + | | | |--IDENT -> Pair [109:14] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [109:18] + | | | |--GENERIC_START -> < [109:18] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [109:19] + | | | | `--IDENT -> I [109:19] + | | | `--GENERIC_END -> > [109:20] + | | `--IDENT -> p1 [109:22] + | |--RPAREN -> ) [109:24] + | `--SLIST -> { [109:26] + | |--LITERAL_RETURN -> return [110:8] + | | |--EXPR -> EXPR [110:15] + | | | `--LITERAL_SWITCH -> switch [110:15] + | | | |--LPAREN -> ( [110:22] + | | | |--EXPR -> EXPR [110:23] + | | | | `--IDENT -> p1 [110:23] + | | | |--RPAREN -> ) [110:25] + | | | |--LCURLY -> { [110:27] + | | | |--SWITCH_RULE -> SWITCH_RULE [111:12] + | | | | |--LITERAL_CASE -> case [111:12] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [111:17] + | | | | | |--MODIFIERS -> MODIFIERS [111:17] + | | | | | |--TYPE -> TYPE [111:17] + | | | | | | |--IDENT -> Pair [111:17] + | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [111:21] + | | | | | | |--GENERIC_START -> < [111:21] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [111:22] + | | | | | | | `--IDENT -> I [111:22] + | | | | | | `--GENERIC_END -> > [111:23] + | | | | | |--LPAREN -> ( [111:24] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [111:25] + | | | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [111:25] + | | | | | | | |--MODIFIERS -> MODIFIERS [111:25] + | | | | | | | |--TYPE -> TYPE [111:25] + | | | | | | | | `--IDENT -> C [111:25] + | | | | | | | `--IDENT -> c [111:27] + | | | | | | |--COMMA -> , [111:28] + | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [111:29] + | | | | | | |--MODIFIERS -> MODIFIERS [111:29] + | | | | | | |--TYPE -> TYPE [111:29] + | | | | | | | `--IDENT -> I [111:29] + | | | | | | `--IDENT -> i [111:31] + | | | | | `--RPAREN -> ) [111:32] + | | | | |--LAMBDA -> -> [111:34] + | | | | |--EXPR -> EXPR [111:37] + | | | | | `--STRING_LITERAL -> "T!" [111:37] + | | | | `--SEMI -> ; [111:41] + | | | |--SWITCH_RULE -> SWITCH_RULE [112:12] + | | | | |--LITERAL_CASE -> case [112:12] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [112:17] + | | | | | |--MODIFIERS -> MODIFIERS [112:17] + | | | | | |--TYPE -> TYPE [112:17] + | | | | | | |--IDENT -> Pair [112:17] + | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [112:21] + | | | | | | |--GENERIC_START -> < [112:21] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [112:22] + | | | | | | | `--IDENT -> I [112:22] + | | | | | | `--GENERIC_END -> > [112:23] + | | | | | |--LPAREN -> ( [112:24] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [112:25] + | | | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [112:25] + | | | | | | | |--MODIFIERS -> MODIFIERS [112:25] + | | | | | | | |--TYPE -> TYPE [112:25] + | | | | | | | | `--IDENT -> D [112:25] + | | | | | | | `--IDENT -> d [112:27] + | | | | | | |--COMMA -> , [112:28] + | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [112:29] + | | | | | | |--MODIFIERS -> MODIFIERS [112:29] + | | | | | | |--TYPE -> TYPE [112:29] + | | | | | | | `--IDENT -> C [112:29] + | | | | | | `--IDENT -> c [112:31] + | | | | | `--RPAREN -> ) [112:32] + | | | | |--LAMBDA -> -> [112:34] + | | | | |--EXPR -> EXPR [112:37] + | | | | | `--STRING_LITERAL -> "C!" [112:37] + | | | | `--SEMI -> ; [112:41] + | | | |--SWITCH_RULE -> SWITCH_RULE [113:12] + | | | | |--LITERAL_CASE -> case [113:12] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [113:17] + | | | | | |--MODIFIERS -> MODIFIERS [113:17] + | | | | | |--TYPE -> TYPE [113:17] + | | | | | | |--IDENT -> Pair [113:17] + | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [113:21] + | | | | | | |--GENERIC_START -> < [113:21] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [113:22] + | | | | | | | `--IDENT -> I [113:22] + | | | | | | `--GENERIC_END -> > [113:23] + | | | | | |--LPAREN -> ( [113:24] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [113:25] + | | | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [113:25] + | | | | | | | |--MODIFIERS -> MODIFIERS [113:25] + | | | | | | | |--TYPE -> TYPE [113:25] + | | | | | | | | `--IDENT -> D [113:25] + | | | | | | | `--IDENT -> d1 [113:27] + | | | | | | |--COMMA -> , [113:29] + | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [113:30] + | | | | | | |--MODIFIERS -> MODIFIERS [113:30] + | | | | | | |--TYPE -> TYPE [113:30] + | | | | | | | `--IDENT -> D [113:30] + | | | | | | `--IDENT -> d2 [113:32] + | | | | | `--RPAREN -> ) [113:34] + | | | | |--LAMBDA -> -> [113:36] + | | | | |--EXPR -> EXPR [113:39] + | | | | | `--STRING_LITERAL -> "D!" [113:39] + | | | | `--SEMI -> ; [113:43] + | | | `--RCURLY -> } [114:8] + | | `--SEMI -> ; [114:9] + | `--RCURLY -> } [115:4] + `--RCURLY -> } [116:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/java19/ExpectedRecordPatternsPreviewNestedDecomposition.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/java19/ExpectedRecordPatternsPreviewNestedDecomposition.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/java19/ExpectedRecordPatternsPreviewNestedDecomposition.txt @@ -0,0 +1,684 @@ +COMPILATION_UNIT -> COMPILATION_UNIT [2:0] +|--PACKAGE_DEF -> package [2:0] +| |--ANNOTATIONS -> ANNOTATIONS [2:47] +| |--DOT -> . [2:47] +| | |--DOT -> . [2:39] +| | | |--DOT -> . [2:28] +| | | | |--DOT -> . [2:22] +| | | | | |--DOT -> . [2:11] +| | | | | | |--IDENT -> com [2:8] +| | | | | | `--IDENT -> puppycrawl [2:12] +| | | | | `--IDENT -> tools [2:23] +| | | | `--IDENT -> checkstyle [2:29] +| | | `--IDENT -> grammar [2:40] +| | `--IDENT -> java19 [2:48] +| `--SEMI -> ; [2:54] +`--CLASS_DEF -> CLASS_DEF [4:0] + |--MODIFIERS -> MODIFIERS [4:0] + | `--LITERAL_PUBLIC -> public [4:0] + |--LITERAL_CLASS -> class [4:7] + |--IDENT -> InputRecordPatternsPreviewNestedDecomposition [4:13] + `--OBJBLOCK -> OBJBLOCK [4:59] + |--LCURLY -> { [4:59] + |--RECORD_DEF -> RECORD_DEF [5:4] + | |--MODIFIERS -> MODIFIERS [5:4] + | |--LITERAL_RECORD -> record [5:4] + | |--IDENT -> A [5:11] + | |--LPAREN -> ( [5:12] + | |--RECORD_COMPONENTS -> RECORD_COMPONENTS [5:13] + | | `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [5:13] + | | |--ANNOTATIONS -> ANNOTATIONS [5:13] + | | |--TYPE -> TYPE [5:13] + | | | `--IDENT -> Object [5:13] + | | `--IDENT -> o [5:20] + | |--RPAREN -> ) [5:21] + | `--OBJBLOCK -> OBJBLOCK [5:23] + | |--LCURLY -> { [5:23] + | `--RCURLY -> } [6:4] + |--RECORD_DEF -> RECORD_DEF [8:4] + | |--MODIFIERS -> MODIFIERS [8:4] + | |--LITERAL_RECORD -> record [8:4] + | |--IDENT -> B [8:11] + | |--LPAREN -> ( [8:12] + | |--RECORD_COMPONENTS -> RECORD_COMPONENTS [8:13] + | | `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [8:13] + | | |--ANNOTATIONS -> ANNOTATIONS [8:13] + | | |--TYPE -> TYPE [8:13] + | | | `--IDENT -> Object [8:13] + | | `--IDENT -> o [8:20] + | |--RPAREN -> ) [8:21] + | `--OBJBLOCK -> OBJBLOCK [8:23] + | |--LCURLY -> { [8:23] + | `--RCURLY -> } [9:4] + |--RECORD_DEF -> RECORD_DEF [11:4] + | |--MODIFIERS -> MODIFIERS [11:4] + | |--LITERAL_RECORD -> record [11:4] + | |--IDENT -> Point [11:11] + | |--LPAREN -> ( [11:16] + | |--RECORD_COMPONENTS -> RECORD_COMPONENTS [11:17] + | | |--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [11:17] + | | | |--ANNOTATIONS -> ANNOTATIONS [11:17] + | | | |--TYPE -> TYPE [11:17] + | | | | `--LITERAL_INT -> int [11:17] + | | | `--IDENT -> x [11:21] + | | |--COMMA -> , [11:22] + | | `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [11:24] + | | |--ANNOTATIONS -> ANNOTATIONS [11:24] + | | |--TYPE -> TYPE [11:24] + | | | `--LITERAL_INT -> int [11:24] + | | `--IDENT -> y [11:28] + | |--RPAREN -> ) [11:29] + | `--OBJBLOCK -> OBJBLOCK [11:31] + | |--LCURLY -> { [11:31] + | `--RCURLY -> } [12:4] + |--ENUM_DEF -> ENUM_DEF [14:4] + | |--MODIFIERS -> MODIFIERS [14:4] + | |--ENUM -> enum [14:4] + | |--IDENT -> Color [14:9] + | `--OBJBLOCK -> OBJBLOCK [14:15] + | |--LCURLY -> { [14:15] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [14:16] + | | |--ANNOTATIONS -> ANNOTATIONS [14:16] + | | `--IDENT -> RED [14:16] + | |--COMMA -> , [14:19] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [14:21] + | | |--ANNOTATIONS -> ANNOTATIONS [14:21] + | | `--IDENT -> GREEN [14:21] + | |--COMMA -> , [14:26] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [14:28] + | | |--ANNOTATIONS -> ANNOTATIONS [14:28] + | | `--IDENT -> BLUE [14:28] + | `--RCURLY -> } [14:32] + |--RECORD_DEF -> RECORD_DEF [16:4] + | |--MODIFIERS -> MODIFIERS [16:4] + | |--LITERAL_RECORD -> record [16:4] + | |--IDENT -> ColoredPoint [16:11] + | |--LPAREN -> ( [16:23] + | |--RECORD_COMPONENTS -> RECORD_COMPONENTS [16:24] + | | |--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [16:24] + | | | |--ANNOTATIONS -> ANNOTATIONS [16:24] + | | | |--TYPE -> TYPE [16:24] + | | | | `--IDENT -> Point [16:24] + | | | `--IDENT -> p [16:30] + | | |--COMMA -> , [16:31] + | | `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [16:33] + | | |--ANNOTATIONS -> ANNOTATIONS [16:33] + | | |--TYPE -> TYPE [16:33] + | | | `--IDENT -> Color [16:33] + | | `--IDENT -> c [16:39] + | |--RPAREN -> ) [16:40] + | `--OBJBLOCK -> OBJBLOCK [16:42] + | |--LCURLY -> { [16:42] + | `--RCURLY -> } [17:4] + |--RECORD_DEF -> RECORD_DEF [19:4] + | |--MODIFIERS -> MODIFIERS [19:4] + | |--LITERAL_RECORD -> record [19:4] + | |--IDENT -> Rectangle [19:11] + | |--LPAREN -> ( [19:20] + | |--RECORD_COMPONENTS -> RECORD_COMPONENTS [19:21] + | | |--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [19:21] + | | | |--ANNOTATIONS -> ANNOTATIONS [19:21] + | | | |--TYPE -> TYPE [19:21] + | | | | `--IDENT -> ColoredPoint [19:21] + | | | `--IDENT -> upperLeft [19:34] + | | |--COMMA -> , [19:43] + | | `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [19:45] + | | |--ANNOTATIONS -> ANNOTATIONS [19:45] + | | |--TYPE -> TYPE [19:45] + | | | `--IDENT -> ColoredPoint [19:45] + | | `--IDENT -> lowerRight [19:58] + | |--RPAREN -> ) [19:68] + | `--OBJBLOCK -> OBJBLOCK [19:70] + | |--LCURLY -> { [19:70] + | `--RCURLY -> } [20:4] + |--METHOD_DEF -> METHOD_DEF [22:4] + | |--MODIFIERS -> MODIFIERS [22:4] + | |--TYPE -> TYPE [22:4] + | | `--LITERAL_VOID -> void [22:4] + | |--IDENT -> method [22:9] + | |--LPAREN -> ( [22:15] + | |--PARAMETERS -> PARAMETERS [22:16] + | | `--PARAMETER_DEF -> PARAMETER_DEF [22:16] + | | |--MODIFIERS -> MODIFIERS [22:16] + | | |--TYPE -> TYPE [22:16] + | | | `--IDENT -> Object [22:16] + | | `--IDENT -> param [22:23] + | |--RPAREN -> ) [22:28] + | `--SLIST -> { [22:30] + | |--LITERAL_SWITCH -> switch [23:8] + | | |--LPAREN -> ( [23:15] + | | |--EXPR -> EXPR [23:16] + | | | `--IDENT -> param [23:16] + | | |--RPAREN -> ) [23:21] + | | |--LCURLY -> { [23:23] + | | |--SWITCH_RULE -> SWITCH_RULE [24:12] + | | | |--LITERAL_CASE -> case [24:12] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [24:17] + | | | | |--MODIFIERS -> MODIFIERS [24:17] + | | | | |--TYPE -> TYPE [24:17] + | | | | | `--IDENT -> A [24:17] + | | | | |--LPAREN -> ( [24:18] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [24:19] + | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [24:19] + | | | | | |--MODIFIERS -> MODIFIERS [24:19] + | | | | | |--TYPE -> TYPE [24:19] + | | | | | | `--IDENT -> Object [24:19] + | | | | | `--IDENT -> o [24:26] + | | | | `--RPAREN -> ) [24:27] + | | | |--LAMBDA -> -> [24:29] + | | | `--SLIST -> { [24:32] + | | | `--RCURLY -> } [25:12] + | | |--SWITCH_RULE -> SWITCH_RULE [26:12] + | | | |--LITERAL_CASE -> case [26:12] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [26:17] + | | | | |--MODIFIERS -> MODIFIERS [26:17] + | | | | |--TYPE -> TYPE [26:17] + | | | | | `--IDENT -> B [26:17] + | | | | |--LPAREN -> ( [26:18] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [26:19] + | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [26:19] + | | | | | |--MODIFIERS -> MODIFIERS [26:19] + | | | | | |--TYPE -> TYPE [26:19] + | | | | | | `--IDENT -> var [26:19] + | | | | | `--IDENT -> o [26:23] + | | | | `--RPAREN -> ) [26:24] + | | | |--LAMBDA -> -> [26:26] + | | | `--SLIST -> { [26:29] + | | | `--RCURLY -> } [27:12] + | | |--SWITCH_RULE -> SWITCH_RULE [28:12] + | | | |--LITERAL_DEFAULT -> default [28:12] + | | | |--LAMBDA -> -> [28:20] + | | | `--SLIST -> { [28:23] + | | | `--RCURLY -> } [29:12] + | | `--RCURLY -> } [30:8] + | |--LITERAL_IF -> if [31:8] + | | |--LPAREN -> ( [31:11] + | | |--EXPR -> EXPR [31:18] + | | | `--LITERAL_INSTANCEOF -> instanceof [31:18] + | | | |--IDENT -> param [31:12] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [31:29] + | | | |--MODIFIERS -> MODIFIERS [31:29] + | | | |--TYPE -> TYPE [31:29] + | | | | `--IDENT -> A [31:29] + | | | |--LPAREN -> ( [31:30] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [31:31] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [31:31] + | | | | |--MODIFIERS -> MODIFIERS [31:31] + | | | | |--TYPE -> TYPE [31:31] + | | | | | `--IDENT -> var [31:31] + | | | | `--IDENT -> o [31:35] + | | | `--RPAREN -> ) [31:36] + | | |--RPAREN -> ) [31:37] + | | `--SLIST -> { [31:39] + | | `--RCURLY -> } [33:8] + | `--RCURLY -> } [34:4] + |--METHOD_DEF -> METHOD_DEF [37:4] + | |--MODIFIERS -> MODIFIERS [37:4] + | | `--LITERAL_STATIC -> static [37:4] + | |--TYPE -> TYPE [37:11] + | | `--LITERAL_VOID -> void [37:11] + | |--IDENT -> p1 [37:16] + | |--LPAREN -> ( [37:18] + | |--PARAMETERS -> PARAMETERS [37:19] + | | `--PARAMETER_DEF -> PARAMETER_DEF [37:19] + | | |--MODIFIERS -> MODIFIERS [37:19] + | | |--TYPE -> TYPE [37:19] + | | | `--IDENT -> Rectangle [37:19] + | | `--IDENT -> r [37:29] + | |--RPAREN -> ) [37:30] + | `--SLIST -> { [37:32] + | |--LITERAL_IF -> if [38:8] + | | |--LPAREN -> ( [38:11] + | | |--EXPR -> EXPR [38:14] + | | | `--LITERAL_INSTANCEOF -> instanceof [38:14] + | | | |--IDENT -> r [38:12] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [38:25] + | | | |--MODIFIERS -> MODIFIERS [38:25] + | | | |--TYPE -> TYPE [38:25] + | | | | `--IDENT -> Rectangle [38:25] + | | | |--LPAREN -> ( [38:34] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [38:35] + | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [38:35] + | | | | | |--MODIFIERS -> MODIFIERS [38:35] + | | | | | |--TYPE -> TYPE [38:35] + | | | | | | `--IDENT -> ColoredPoint [38:35] + | | | | | `--IDENT -> ul [38:48] + | | | | |--COMMA -> , [38:50] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [38:51] + | | | | |--MODIFIERS -> MODIFIERS [38:51] + | | | | |--TYPE -> TYPE [38:51] + | | | | | `--IDENT -> ColoredPoint [38:51] + | | | | `--IDENT -> lr [38:64] + | | | `--RPAREN -> ) [38:66] + | | |--RPAREN -> ) [38:67] + | | `--SLIST -> { [38:69] + | | |--EXPR -> EXPR [39:30] + | | | `--METHOD_CALL -> ( [39:30] + | | | |--DOT -> . [39:22] + | | | | |--DOT -> . [39:18] + | | | | | |--IDENT -> System [39:12] + | | | | | `--IDENT -> out [39:19] + | | | | `--IDENT -> println [39:23] + | | | |--ELIST -> ELIST [39:35] + | | | | `--EXPR -> EXPR [39:35] + | | | | `--METHOD_CALL -> ( [39:35] + | | | | |--DOT -> . [39:33] + | | | | | |--IDENT -> ul [39:31] + | | | | | `--IDENT -> c [39:34] + | | | | |--ELIST -> ELIST [39:36] + | | | | `--RPAREN -> ) [39:36] + | | | `--RPAREN -> ) [39:37] + | | |--SEMI -> ; [39:38] + | | `--RCURLY -> } [40:8] + | `--RCURLY -> } [41:4] + |--METHOD_DEF -> METHOD_DEF [45:4] + | |--MODIFIERS -> MODIFIERS [45:4] + | | `--LITERAL_STATIC -> static [45:4] + | |--TYPE -> TYPE [45:11] + | | `--LITERAL_VOID -> void [45:11] + | |--IDENT -> p2 [45:16] + | |--LPAREN -> ( [45:18] + | |--PARAMETERS -> PARAMETERS [45:19] + | | `--PARAMETER_DEF -> PARAMETER_DEF [45:19] + | | |--MODIFIERS -> MODIFIERS [45:19] + | | |--TYPE -> TYPE [45:19] + | | | `--IDENT -> Rectangle [45:19] + | | `--IDENT -> r [45:29] + | |--RPAREN -> ) [45:30] + | `--SLIST -> { [45:32] + | |--LITERAL_IF -> if [46:8] + | | |--LPAREN -> ( [46:11] + | | |--EXPR -> EXPR [49:34] + | | | `--LAND -> && [49:34] + | | | |--LAND -> && [48:16] + | | | | |--LITERAL_INSTANCEOF -> instanceof [46:14] + | | | | | |--IDENT -> r [46:12] + | | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [46:25] + | | | | | |--MODIFIERS -> MODIFIERS [46:25] + | | | | | |--TYPE -> TYPE [46:25] + | | | | | | `--IDENT -> Rectangle [46:25] + | | | | | |--LPAREN -> ( [46:34] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [46:35] + | | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [46:35] + | | | | | | | |--MODIFIERS -> MODIFIERS [46:35] + | | | | | | | |--TYPE -> TYPE [46:35] + | | | | | | | | `--IDENT -> ColoredPoint [46:35] + | | | | | | | |--LPAREN -> ( [46:47] + | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [46:48] + | | | | | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [46:48] + | | | | | | | | | |--MODIFIERS -> MODIFIERS [46:48] + | | | | | | | | | |--TYPE -> TYPE [46:48] + | | | | | | | | | | `--IDENT -> Point [46:48] + | | | | | | | | | `--IDENT -> p1 [46:54] + | | | | | | | | |--COMMA -> , [46:56] + | | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [46:57] + | | | | | | | | |--MODIFIERS -> MODIFIERS [46:57] + | | | | | | | | |--TYPE -> TYPE [46:57] + | | | | | | | | | `--IDENT -> Color [46:57] + | | | | | | | | `--IDENT -> c1 [46:63] + | | | | | | | `--RPAREN -> ) [46:65] + | | | | | | |--COMMA -> , [46:66] + | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [47:16] + | | | | | | |--MODIFIERS -> MODIFIERS [47:16] + | | | | | | |--TYPE -> TYPE [47:16] + | | | | | | | `--IDENT -> ColoredPoint [47:16] + | | | | | | `--IDENT -> lr1 [47:29] + | | | | | `--RPAREN -> ) [47:32] + | | | | `--LITERAL_INSTANCEOF -> instanceof [48:21] + | | | | |--IDENT -> r [48:19] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [48:32] + | | | | |--MODIFIERS -> MODIFIERS [48:32] + | | | | |--TYPE -> TYPE [48:32] + | | | | | `--IDENT -> Rectangle [48:32] + | | | | |--LPAREN -> ( [48:41] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [48:42] + | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [48:42] + | | | | | | |--MODIFIERS -> MODIFIERS [48:42] + | | | | | | |--TYPE -> TYPE [48:42] + | | | | | | | `--IDENT -> ColoredPoint [48:42] + | | | | | | |--LPAREN -> ( [48:54] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [48:55] + | | | | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [48:55] + | | | | | | | | |--MODIFIERS -> MODIFIERS [48:55] + | | | | | | | | |--TYPE -> TYPE [48:55] + | | | | | | | | | `--IDENT -> Point [48:55] + | | | | | | | | `--IDENT -> p2 [48:61] + | | | | | | | |--COMMA -> , [48:63] + | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [48:64] + | | | | | | | |--MODIFIERS -> MODIFIERS [48:64] + | | | | | | | |--TYPE -> TYPE [48:64] + | | | | | | | | `--IDENT -> Color [48:64] + | | | | | | | `--IDENT -> c2 [48:70] + | | | | | | `--RPAREN -> ) [48:72] + | | | | | |--COMMA -> , [48:73] + | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [49:16] + | | | | | |--MODIFIERS -> MODIFIERS [49:16] + | | | | | |--TYPE -> TYPE [49:16] + | | | | | | `--IDENT -> ColoredPoint [49:16] + | | | | | `--IDENT -> lr2 [49:29] + | | | | `--RPAREN -> ) [49:32] + | | | `--EQUAL -> == [49:43] + | | | |--DOT -> . [49:40] + | | | | |--IDENT -> lr2 [49:37] + | | | | `--IDENT -> c [49:41] + | | | `--DOT -> . [49:51] + | | | |--IDENT -> Color [49:46] + | | | `--IDENT -> BLUE [49:52] + | | |--RPAREN -> ) [49:56] + | | `--SLIST -> { [49:58] + | | |--EXPR -> EXPR [50:30] + | | | `--METHOD_CALL -> ( [50:30] + | | | |--DOT -> . [50:22] + | | | | |--DOT -> . [50:18] + | | | | | |--IDENT -> System [50:12] + | | | | | `--IDENT -> out [50:19] + | | | | `--IDENT -> println [50:23] + | | | |--ELIST -> ELIST [50:31] + | | | | `--EXPR -> EXPR [50:31] + | | | | `--IDENT -> r [50:31] + | | | `--RPAREN -> ) [50:32] + | | |--SEMI -> ; [50:33] + | | `--RCURLY -> } [51:8] + | `--RCURLY -> } [52:4] + |--METHOD_DEF -> METHOD_DEF [55:4] + | |--MODIFIERS -> MODIFIERS [55:4] + | | `--LITERAL_STATIC -> static [55:4] + | |--TYPE -> TYPE [55:11] + | | `--LITERAL_VOID -> void [55:11] + | |--IDENT -> p3 [55:16] + | |--LPAREN -> ( [55:18] + | |--PARAMETERS -> PARAMETERS [55:19] + | | `--PARAMETER_DEF -> PARAMETER_DEF [55:19] + | | |--MODIFIERS -> MODIFIERS [55:19] + | | |--TYPE -> TYPE [55:19] + | | | `--IDENT -> Rectangle [55:19] + | | `--IDENT -> r [55:29] + | |--RPAREN -> ) [55:30] + | `--SLIST -> { [55:32] + | |--LITERAL_IF -> if [56:8] + | | |--LPAREN -> ( [56:11] + | | |--EXPR -> EXPR [58:16] + | | | `--LAND -> && [58:16] + | | | |--LITERAL_INSTANCEOF -> instanceof [56:14] + | | | | |--IDENT -> r [56:12] + | | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [56:25] + | | | | |--MODIFIERS -> MODIFIERS [56:25] + | | | | |--TYPE -> TYPE [56:25] + | | | | | `--IDENT -> Rectangle [56:25] + | | | | |--LPAREN -> ( [56:34] + | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [56:35] + | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [56:35] + | | | | | | |--MODIFIERS -> MODIFIERS [56:35] + | | | | | | |--TYPE -> TYPE [56:35] + | | | | | | | `--IDENT -> ColoredPoint [56:35] + | | | | | | |--LPAREN -> ( [56:47] + | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [56:48] + | | | | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [56:48] + | | | | | | | | |--MODIFIERS -> MODIFIERS [56:48] + | | | | | | | | |--TYPE -> TYPE [56:48] + | | | | | | | | | `--IDENT -> Point [56:48] + | | | | | | | | `--IDENT -> p1 [56:54] + | | | | | | | |--COMMA -> , [56:56] + | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [56:57] + | | | | | | | |--MODIFIERS -> MODIFIERS [56:57] + | | | | | | | |--TYPE -> TYPE [56:57] + | | | | | | | | `--IDENT -> Color [56:57] + | | | | | | | `--IDENT -> c1 [56:63] + | | | | | | `--RPAREN -> ) [56:65] + | | | | | |--COMMA -> , [56:66] + | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [57:16] + | | | | | |--MODIFIERS -> MODIFIERS [57:16] + | | | | | |--TYPE -> TYPE [57:16] + | | | | | | `--IDENT -> ColoredPoint [57:16] + | | | | | `--IDENT -> lr1 [57:29] + | | | | `--RPAREN -> ) [57:32] + | | | `--LITERAL_INSTANCEOF -> instanceof [58:21] + | | | |--IDENT -> r [58:19] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [58:32] + | | | |--MODIFIERS -> MODIFIERS [58:32] + | | | |--TYPE -> TYPE [58:32] + | | | | `--IDENT -> Rectangle [58:32] + | | | |--LPAREN -> ( [58:41] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [59:16] + | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [59:16] + | | | | | |--MODIFIERS -> MODIFIERS [59:16] + | | | | | |--TYPE -> TYPE [59:16] + | | | | | | `--IDENT -> ColoredPoint [59:16] + | | | | | |--LPAREN -> ( [59:28] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [59:29] + | | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [59:29] + | | | | | | | |--MODIFIERS -> MODIFIERS [59:29] + | | | | | | | |--TYPE -> TYPE [59:29] + | | | | | | | | `--IDENT -> Point [59:29] + | | | | | | | |--LPAREN -> ( [59:34] + | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [59:35] + | | | | | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [59:35] + | | | | | | | | | |--MODIFIERS -> MODIFIERS [59:35] + | | | | | | | | | |--TYPE -> TYPE [59:35] + | | | | | | | | | | `--LITERAL_INT -> int [59:35] + | | | | | | | | | `--IDENT -> x [59:39] + | | | | | | | | |--COMMA -> , [59:40] + | | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [59:41] + | | | | | | | | |--MODIFIERS -> MODIFIERS [59:41] + | | | | | | | | |--TYPE -> TYPE [59:41] + | | | | | | | | | `--LITERAL_INT -> int [59:41] + | | | | | | | | `--IDENT -> y [59:45] + | | | | | | | `--RPAREN -> ) [59:46] + | | | | | | |--COMMA -> , [59:47] + | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [59:48] + | | | | | | |--MODIFIERS -> MODIFIERS [59:48] + | | | | | | |--TYPE -> TYPE [59:48] + | | | | | | | `--IDENT -> Color [59:48] + | | | | | | `--IDENT -> c2 [59:54] + | | | | | `--RPAREN -> ) [59:56] + | | | | |--COMMA -> , [59:57] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [60:16] + | | | | |--MODIFIERS -> MODIFIERS [60:16] + | | | | |--TYPE -> TYPE [60:16] + | | | | | `--IDENT -> ColoredPoint [60:16] + | | | | `--IDENT -> lr2 [60:29] + | | | `--RPAREN -> ) [60:32] + | | |--RPAREN -> ) [60:33] + | | `--SLIST -> { [60:35] + | | |--EXPR -> EXPR [61:30] + | | | `--METHOD_CALL -> ( [61:30] + | | | |--DOT -> . [61:22] + | | | | |--DOT -> . [61:18] + | | | | | |--IDENT -> System [61:12] + | | | | | `--IDENT -> out [61:19] + | | | | `--IDENT -> println [61:23] + | | | |--ELIST -> ELIST [61:31] + | | | | `--EXPR -> EXPR [61:31] + | | | | `--IDENT -> r [61:31] + | | | `--RPAREN -> ) [61:32] + | | |--SEMI -> ; [61:33] + | | `--RCURLY -> } [62:8] + | `--RCURLY -> } [63:4] + |--METHOD_DEF -> METHOD_DEF [65:4] + | |--MODIFIERS -> MODIFIERS [65:4] + | | `--LITERAL_STATIC -> static [65:4] + | |--TYPE -> TYPE [65:11] + | | `--LITERAL_VOID -> void [65:11] + | |--IDENT -> p4 [65:16] + | |--LPAREN -> ( [65:18] + | |--PARAMETERS -> PARAMETERS [65:19] + | |--RPAREN -> ) [65:19] + | `--SLIST -> { [65:21] + | |--VARIABLE_DEF -> VARIABLE_DEF [66:8] + | | |--MODIFIERS -> MODIFIERS [66:8] + | | |--TYPE -> TYPE [66:8] + | | | `--LITERAL_INT -> int [66:8] + | | |--IDENT -> x1 [66:12] + | | `--ASSIGN -> = [66:15] + | | `--EXPR -> EXPR [66:17] + | | `--NUM_INT -> 0 [66:17] + | |--SEMI -> ; [66:18] + | |--VARIABLE_DEF -> VARIABLE_DEF [67:8] + | | |--MODIFIERS -> MODIFIERS [67:8] + | | |--TYPE -> TYPE [67:8] + | | | `--LITERAL_INT -> int [67:8] + | | |--IDENT -> x2 [67:12] + | | `--ASSIGN -> = [67:15] + | | `--EXPR -> EXPR [67:17] + | | `--NUM_INT -> 0 [67:17] + | |--SEMI -> ; [67:18] + | |--VARIABLE_DEF -> VARIABLE_DEF [68:8] + | | |--MODIFIERS -> MODIFIERS [68:8] + | | |--TYPE -> TYPE [68:8] + | | | `--LITERAL_INT -> int [68:8] + | | |--IDENT -> y1 [68:12] + | | `--ASSIGN -> = [68:15] + | | `--EXPR -> EXPR [68:17] + | | `--NUM_INT -> 0 [68:17] + | |--SEMI -> ; [68:18] + | |--VARIABLE_DEF -> VARIABLE_DEF [69:8] + | | |--MODIFIERS -> MODIFIERS [69:8] + | | |--TYPE -> TYPE [69:8] + | | | `--LITERAL_INT -> int [69:8] + | | |--IDENT -> y2 [69:12] + | | `--ASSIGN -> = [69:15] + | | `--EXPR -> EXPR [69:17] + | | `--NUM_INT -> 0 [69:17] + | |--SEMI -> ; [69:18] + | |--VARIABLE_DEF -> VARIABLE_DEF [70:8] + | | |--MODIFIERS -> MODIFIERS [70:8] + | | |--TYPE -> TYPE [70:8] + | | | `--IDENT -> Color [70:8] + | | |--IDENT -> c1 [70:14] + | | `--ASSIGN -> = [70:17] + | | `--EXPR -> EXPR [70:24] + | | `--DOT -> . [70:24] + | | |--IDENT -> Color [70:19] + | | `--IDENT -> BLUE [70:25] + | |--SEMI -> ; [70:29] + | |--VARIABLE_DEF -> VARIABLE_DEF [71:8] + | | |--MODIFIERS -> MODIFIERS [71:8] + | | |--TYPE -> TYPE [71:8] + | | | `--IDENT -> Color [71:8] + | | |--IDENT -> c2 [71:14] + | | `--ASSIGN -> = [71:17] + | | `--EXPR -> EXPR [71:24] + | | `--DOT -> . [71:24] + | | |--IDENT -> Color [71:19] + | | `--IDENT -> GREEN [71:25] + | |--SEMI -> ; [71:30] + | |--VARIABLE_DEF -> VARIABLE_DEF [72:8] + | | |--MODIFIERS -> MODIFIERS [72:8] + | | |--TYPE -> TYPE [72:8] + | | | `--IDENT -> Rectangle [72:8] + | | |--IDENT -> r [72:18] + | | `--ASSIGN -> = [72:20] + | | `--EXPR -> EXPR [72:22] + | | `--LITERAL_NEW -> new [72:22] + | | |--IDENT -> Rectangle [72:26] + | | |--LPAREN -> ( [72:35] + | | |--ELIST -> ELIST [72:36] + | | | |--EXPR -> EXPR [72:36] + | | | | `--LITERAL_NEW -> new [72:36] + | | | | |--IDENT -> ColoredPoint [72:40] + | | | | |--LPAREN -> ( [72:52] + | | | | |--ELIST -> ELIST [72:53] + | | | | | |--EXPR -> EXPR [72:53] + | | | | | | `--LITERAL_NEW -> new [72:53] + | | | | | | |--IDENT -> Point [72:57] + | | | | | | |--LPAREN -> ( [72:62] + | | | | | | |--ELIST -> ELIST [72:63] + | | | | | | | |--EXPR -> EXPR [72:63] + | | | | | | | | `--IDENT -> x1 [72:63] + | | | | | | | |--COMMA -> , [72:65] + | | | | | | | `--EXPR -> EXPR [72:67] + | | | | | | | `--IDENT -> y1 [72:67] + | | | | | | `--RPAREN -> ) [72:69] + | | | | | |--COMMA -> , [72:70] + | | | | | `--EXPR -> EXPR [72:72] + | | | | | `--IDENT -> c1 [72:72] + | | | | `--RPAREN -> ) [72:74] + | | | |--COMMA -> , [72:75] + | | | `--EXPR -> EXPR [73:16] + | | | `--LITERAL_NEW -> new [73:16] + | | | |--IDENT -> ColoredPoint [73:20] + | | | |--LPAREN -> ( [73:32] + | | | |--ELIST -> ELIST [73:33] + | | | | |--EXPR -> EXPR [73:33] + | | | | | `--LITERAL_NEW -> new [73:33] + | | | | | |--IDENT -> Point [73:37] + | | | | | |--LPAREN -> ( [73:42] + | | | | | |--ELIST -> ELIST [73:43] + | | | | | | |--EXPR -> EXPR [73:43] + | | | | | | | `--IDENT -> x2 [73:43] + | | | | | | |--COMMA -> , [73:45] + | | | | | | `--EXPR -> EXPR [73:47] + | | | | | | `--IDENT -> y2 [73:47] + | | | | | `--RPAREN -> ) [73:49] + | | | | |--COMMA -> , [73:50] + | | | | `--EXPR -> EXPR [73:52] + | | | | `--IDENT -> c2 [73:52] + | | | `--RPAREN -> ) [73:54] + | | `--RPAREN -> ) [73:55] + | |--SEMI -> ; [73:56] + | |--LITERAL_IF -> if [74:8] + | | |--LPAREN -> ( [74:11] + | | |--EXPR -> EXPR [74:14] + | | | `--LITERAL_INSTANCEOF -> instanceof [74:14] + | | | |--IDENT -> r [74:12] + | | | `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [74:25] + | | | |--MODIFIERS -> MODIFIERS [74:25] + | | | |--TYPE -> TYPE [74:25] + | | | | `--IDENT -> Rectangle [74:25] + | | | |--LPAREN -> ( [74:34] + | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [75:16] + | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [75:16] + | | | | | |--MODIFIERS -> MODIFIERS [75:16] + | | | | | |--TYPE -> TYPE [75:16] + | | | | | | `--IDENT -> ColoredPoint [75:16] + | | | | | |--LPAREN -> ( [75:28] + | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [75:29] + | | | | | | |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [75:29] + | | | | | | | |--MODIFIERS -> MODIFIERS [75:29] + | | | | | | | |--TYPE -> TYPE [75:29] + | | | | | | | | `--IDENT -> Point [75:29] + | | | | | | | |--LPAREN -> ( [75:34] + | | | | | | | |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [75:35] + | | | | | | | | |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [75:35] + | | | | | | | | | |--MODIFIERS -> MODIFIERS [75:35] + | | | | | | | | | |--TYPE -> TYPE [75:35] + | | | | | | | | | | `--IDENT -> var [75:35] + | | | | | | | | | `--IDENT -> x [75:39] + | | | | | | | | |--COMMA -> , [75:40] + | | | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [75:41] + | | | | | | | | |--MODIFIERS -> MODIFIERS [75:41] + | | | | | | | | |--TYPE -> TYPE [75:41] + | | | | | | | | | `--IDENT -> var [75:41] + | | | | | | | | `--IDENT -> y [75:45] + | | | | | | | `--RPAREN -> ) [75:46] + | | | | | | |--COMMA -> , [75:47] + | | | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [75:48] + | | | | | | |--MODIFIERS -> MODIFIERS [75:48] + | | | | | | |--TYPE -> TYPE [75:48] + | | | | | | | `--IDENT -> var [75:48] + | | | | | | `--IDENT -> c [75:52] + | | | | | `--RPAREN -> ) [75:53] + | | | | |--COMMA -> , [75:54] + | | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [76:16] + | | | | |--MODIFIERS -> MODIFIERS [76:16] + | | | | |--TYPE -> TYPE [76:16] + | | | | | `--IDENT -> var [76:16] + | | | | `--IDENT -> lr [76:20] + | | | `--RPAREN -> ) [76:22] + | | |--RPAREN -> ) [76:23] + | | `--SLIST -> { [76:25] + | | |--EXPR -> EXPR [77:30] + | | | `--METHOD_CALL -> ( [77:30] + | | | |--DOT -> . [77:22] + | | | | |--DOT -> . [77:18] + | | | | | |--IDENT -> System [77:12] + | | | | | `--IDENT -> out [77:19] + | | | | `--IDENT -> println [77:23] + | | | |--ELIST -> ELIST [77:31] + | | | | `--EXPR -> EXPR [77:31] + | | | | `--IDENT -> x [77:31] + | | | `--RPAREN -> ) [77:32] + | | |--SEMI -> ; [77:33] + | | `--RCURLY -> } [78:8] + | `--RCURLY -> } [79:4] + `--RCURLY -> } [80:0]
Support record patterns (preview-feature in Java 19) as described by JEP 405 **How it works Now:** **Compilation works** ```bash javac --release 19 --enable-preview Example.java Note: Example.java uses preview features of Java SE 19. Note: Recompile with -Xlint:preview for details. ``` **The source file** ```bash cat Example.java class Example { record A(Object o) {} record B(Object o) {} void method(Object param) { switch (param) { case A(Object o) -> {} case B(var o) -> {} default -> {} } if (param instanceof A(var o)) { } } } ``` **Run checkstyle 10.5.0** ```bash RUN_LOCALE="-Duser.language=en -Duser.country=US" java $RUN_LOCALE -jar checkstyle-10.5.0-all.jar -c /sun_checks.xml Example.java Starting audit... com.puppycrawl.tools.checkstyle.api.CheckstyleException: Exception was thrown while processing Example.java at com.puppycrawl.tools.checkstyle.Checker.processFiles(Checker.java:307) at com.puppycrawl.tools.checkstyle.Checker.process(Checker.java:224) at com.puppycrawl.tools.checkstyle.Main.runCheckstyle(Main.java:415) at com.puppycrawl.tools.checkstyle.Main.runCli(Main.java:338) at com.puppycrawl.tools.checkstyle.Main.execute(Main.java:195) at com.puppycrawl.tools.checkstyle.Main.main(Main.java:130) Caused by: com.puppycrawl.tools.checkstyle.api.CheckstyleException: IllegalStateException occurred while parsing file /Users/apflieger/src/sample-checkstyle-record-pattern/Example.java. at com.puppycrawl.tools.checkstyle.JavaParser.parse(JavaParser.java:105) at com.puppycrawl.tools.checkstyle.TreeWalker.processFiltered(TreeWalker.java:153) at com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.process(AbstractFileSetCheck.java:98) at com.puppycrawl.tools.checkstyle.Checker.processFile(Checker.java:335) at com.puppycrawl.tools.checkstyle.Checker.processFiles(Checker.java:294) ... 5 more Caused by: java.lang.IllegalStateException: 9:12: no viable alternative at input 'switch(param){caseA(Objecto)->{}case' at com.puppycrawl.tools.checkstyle.JavaParser$CheckstyleErrorListener.syntaxError(JavaParser.java:255) at org.antlr.v4.runtime.ProxyErrorListener.syntaxError(ProxyErrorListener.java:41) at org.antlr.v4.runtime.Parser.notifyErrorListeners(Parser.java:544) at org.antlr.v4.runtime.DefaultErrorStrategy.reportNoViableAlternative(DefaultErrorStrategy.java:310) at org.antlr.v4.runtime.DefaultErrorStrategy.reportError(DefaultErrorStrategy.java:136) at com.puppycrawl.tools.checkstyle.grammar.java.JavaLanguageParser.statement(JavaLanguageParser.java:7050) at com.puppycrawl.tools.checkstyle.grammar.java.JavaLanguageParser.blockStatement(JavaLanguageParser.java:6192) at com.puppycrawl.tools.checkstyle.grammar.java.JavaLanguageParser.block(JavaLanguageParser.java:6095) at com.puppycrawl.tools.checkstyle.grammar.java.JavaLanguageParser.methodBody(JavaLanguageParser.java:2938) at com.puppycrawl.tools.checkstyle.grammar.java.JavaLanguageParser.methodDeclaration(JavaLanguageParser.java:2896) at com.puppycrawl.tools.checkstyle.grammar.java.JavaLanguageParser.memberDeclaration(JavaLanguageParser.java:2743) at com.puppycrawl.tools.checkstyle.grammar.java.JavaLanguageParser.classBodyDeclaration(JavaLanguageParser.java:2669) at com.puppycrawl.tools.checkstyle.grammar.java.JavaLanguageParser.classBody(JavaLanguageParser.java:2475) at com.puppycrawl.tools.checkstyle.grammar.java.JavaLanguageParser.classDeclaration(JavaLanguageParser.java:1094) at com.puppycrawl.tools.checkstyle.grammar.java.JavaLanguageParser.types(JavaLanguageParser.java:751) at com.puppycrawl.tools.checkstyle.grammar.java.JavaLanguageParser.typeDeclaration(JavaLanguageParser.java:665) at com.puppycrawl.tools.checkstyle.grammar.java.JavaLanguageParser.compilationUnit(JavaLanguageParser.java:412) at com.puppycrawl.tools.checkstyle.JavaParser.parse(JavaParser.java:99) ... 9 more Caused by: org.antlr.v4.runtime.NoViableAltException at org.antlr.v4.runtime.atn.ParserATNSimulator.noViableAlt(ParserATNSimulator.java:2031) at org.antlr.v4.runtime.atn.ParserATNSimulator.execATN(ParserATNSimulator.java:470) at org.antlr.v4.runtime.atn.ParserATNSimulator.adaptivePredict(ParserATNSimulator.java:396) at com.puppycrawl.tools.checkstyle.grammar.java.JavaLanguageParser.statement(JavaLanguageParser.java:6723) ... 21 more Checkstyle ends with 1 errors. ``` **Is your feature request related to a problem? Please describe.** This feature has been released in september 2022 as a preview feature. To me, given the trend of the recent java evolutions, it is very unlikely to be withdrawn. Here's the jep https://openjdk.org/jeps/405 😇 Thank you for your awesome work 🙏
I am on it. @apflieger , can we ask you to try workaround while fix is in progress ? please try to apply this update to your config - https://github.com/checkstyle/checkstyle/issues/12542#issuecomment-1365367872 it should allow you to use new features without being blocked by checkstyle. Please share feedback. It works but other rules on the same file seem not to be executed then. > It works but other rules on the same file seem not to be executed then. Yes, TreeWalker checks (java code) will not work if file cannot be parsed. Checks that have Checker as a parent (FileSet) checks will still work with the file: ``` ➜ src cat config.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <module name="RegexpSingleline"> <property name="format" value="Object param"/> <property name="minimum" value="0"/> <property name="maximum" value="0"/> </module> <property name="haltOnException" value="false"/> <module name="SuppressionSingleFilter"> <property name="message" value=".*IllegalStateException occurred while parsing file.*"/> </module> <module name="TreeWalker"> <module name="IllegalIdentifierName"/> </module> </module> ➜ src cat Test.java public class Test { record A(Object o) {} record B(Object o) {} void method(Object param) { switch (param) { case A(Object o) -> {} case B(var o) -> {} default -> {} } if (param instanceof A(var o)) { } } } ➜ src javac --enable-preview --release 19 Test.java Note: Test.java uses preview features of Java SE 19. Note: Recompile with -Xlint:preview for details. ➜ src java -jar checkstyle-10.4-all.jar -c config.xml Test.java Starting audit... [ERROR] /home/nick/IdeaProjects/tester/src/Test.java:5: Line matches the illegal pattern 'Object param'. [RegexpSingleline] Audit done. Checkstyle ends with 1 errors. ``` Workaround at https://github.com/checkstyle/checkstyle/issues/12542#issuecomment-1365367872 allows users to still use checkstyle, but not use TreeWalker checks on new syntax until support is added. Edit: there is a nuance, modules are executed sequentially: ``` ➜ src cat config.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <property name="haltOnException" value="false"/> <module name="SuppressionSingleFilter"> <property name="message" value=".*IllegalStateException occurred while parsing file.*"/> </module> <module name="TreeWalker"> <module name="IllegalIdentifierName"/> </module> <module name="RegexpSingleline"> <property name="format" value="Object param"/> <property name="minimum" value="0"/> <property name="maximum" value="0"/> </module> </module> ➜ src java -jar checkstyle-10.4-all.jar -c config.xml Test.java Starting audit... Audit done. ``` So, for this workaround to still allow other checks (non TreeWalker) to execute, they must appear in config BEFORE TreeWalker module. On my main project we have Checker rules like `RegexpMultiline`, they are declared before the TreeWalker module. These rules are sometimes executed, sometimes not. Weird, but it's not really a problem for me. @apflieger , if you move Treewalker in xml to be last child, execution will be more predictable.
2022-12-10T16:28:02Z
10.11
checkstyle/checkstyle
12,444
checkstyle__checkstyle-12444
[ "12443" ]
3f31f9f303f38d86242bd4ecf67662ab2f2899a8
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java @@ -361,7 +361,7 @@ private static class RelaxedStringArrayConverter implements Converter { @Override public Object convert(Class type, Object value) { final StringTokenizer tokenizer = new StringTokenizer( - value.toString(), COMMA_SEPARATOR); + value.toString().trim(), COMMA_SEPARATOR); final List<String> result = new ArrayList<>(); while (tokenizer.hasMoreTokens()) { @@ -390,7 +390,7 @@ private static class RelaxedAccessModifierArrayConverter implements Converter { public Object convert(Class type, Object value) { // Converts to a String and trims it for the tokenizer. final StringTokenizer tokenizer = new StringTokenizer( - value.toString(), COMMA_SEPARATOR); + value.toString().trim(), COMMA_SEPARATOR); final List<AccessModifierOption> result = new ArrayList<>(); while (tokenizer.hasMoreTokens()) {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java @@ -389,6 +389,14 @@ public void testRecordComponentsPublicProtectedStatic() throws Exception { expected); } + @Test + public void testTrailingWhitespaceInConfig() throws Exception { + final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; + verifyWithInlineConfigParser( + getPath("InputIllegalTypeWhitespaceInConfig.java"), + expected); + } + @Test public void testTokensNotNull() { final IllegalTypeCheck check = new IllegalTypeCheck(); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheckTest.java @@ -178,4 +178,11 @@ public void testLambdaParameterNoViolationAtAll() throws Exception { getPath("InputParameterNameLambda.java"), expected); } + @Test + public void testWhitespaceInConfig() throws Exception { + final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; + verifyWithInlineConfigParser( + getPath("InputParameterNameWhitespaceInConfig.java"), expected); + } + } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeWhitespaceInConfig.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeWhitespaceInConfig.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeWhitespaceInConfig.java @@ -0,0 +1,28 @@ +/* +IllegalType +validateAbstractClassNames = (default)false +illegalClassNames = java.lang.StringBuffer,\t +legalAbstractClassNames = (default) +ignoredMethodNames = (default)getEnvironment, getInitialContext +illegalAbstractClassNameFormat = (default)^(.*[.])?Abstract.*$ +memberModifiers = (default) +tokens = (default)ANNOTATION_FIELD_DEF, CLASS_DEF, INTERFACE_DEF, METHOD_CALL, METHOD_DEF, \ + METHOD_REF, PARAMETER_DEF, VARIABLE_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF, \ + RECORD_COMPONENT_DEF + + +*/ +package com.puppycrawl.tools.checkstyle.checks.coding.illegaltype; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; + +public class InputIllegalTypeWhitespaceInConfig { + public void example(List<@MyPattern String> strings) { // ok + } + + @Target(ElementType.TYPE_USE) + public @interface MyPattern {} +} + diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameWhitespaceInConfig.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameWhitespaceInConfig.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameWhitespaceInConfig.java @@ -0,0 +1,14 @@ +/* +ParameterName +format = (default)^[a-z][a-zA-Z0-9]*$ +ignoreOverridden = (default)false +accessModifiers = public\t,\t + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.naming.parametername; + +public class InputParameterNameWhitespaceInConfig { + int method(){return 1;} // ok +}
checkstyle 10.3.3 and newer throws NullPointerException on annotated generic types from IllegalType rule I minimized my repro to narrow down the cause. The config: `❯ /bin/cat checkstyle-configuration.xml` ```xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <module name="TreeWalker"> <module name="IllegalType"> <property name="illegalClassNames" value="java.lang.StringBuffer, " /> </module> </module> </module> ``` The code: `❯ cat ExampleClass.java` ```java package com.example; import java.util.List; import javax.validation.constraints.Pattern; public class ExampleClass { public void example(List<@Pattern String> strings) { } } ``` ```bash ❯ RUN_LOCALE="-Duser.language=en -Duser.country=US" ❯ java $RUN_LOCALE -jar checkstyle-10.3.3-all.jar -c checkstyle-configuration.xml ExampleClass.java Starting audit... com.puppycrawl.tools.checkstyle.api.CheckstyleException: Exception was thrown while processing ExampleClass.java at com.puppycrawl.tools.checkstyle.Checker.processFiles(Checker.java:307) at com.puppycrawl.tools.checkstyle.Checker.process(Checker.java:224) at com.puppycrawl.tools.checkstyle.Main.runCheckstyle(Main.java:416) at com.puppycrawl.tools.checkstyle.Main.runCli(Main.java:339) at com.puppycrawl.tools.checkstyle.Main.execute(Main.java:196) at com.puppycrawl.tools.checkstyle.Main.main(Main.java:131) Caused by: java.lang.NullPointerException: Cannot invoke "com.puppycrawl.tools.checkstyle.api.DetailAST.getLineNo()" because "ast" is null at com.puppycrawl.tools.checkstyle.api.AbstractCheck.log(AbstractCheck.java:276) at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.checkIdent(IllegalTypeCheck.java:645) at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.checkType(IllegalTypeCheck.java:674) at com.puppycrawl.tools.checkstyle.utils.TokenUtil.forEachChild(TokenUtil.java:244) at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.checkTypeArguments(IllegalTypeCheck.java:719) at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.checkType(IllegalTypeCheck.java:675) at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.checkClassName(IllegalTypeCheck.java:633) at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.visitParameterDef(IllegalTypeCheck.java:563) at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.visitToken(IllegalTypeCheck.java:478) at com.puppycrawl.tools.checkstyle.TreeWalker.notifyVisit(TreeWalker.java:336) at com.puppycrawl.tools.checkstyle.TreeWalker.processIter(TreeWalker.java:407) at com.puppycrawl.tools.checkstyle.TreeWalker.walk(TreeWalker.java:274) at com.puppycrawl.tools.checkstyle.TreeWalker.processFiltered(TreeWalker.java:155) at com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.process(AbstractFileSetCheck.java:98) at com.puppycrawl.tools.checkstyle.Checker.processFile(Checker.java:335) at com.puppycrawl.tools.checkstyle.Checker.processFiles(Checker.java:294) ... 5 more Checkstyle ends with 1 errors. ❯ java $RUN_LOCALE -jar checkstyle-10.3.2-all.jar -c checkstyle-configuration.xml ExampleClass.java Starting audit... Audit done. ``` --- Note that any little change to the config file prevents this problem. Even getting rid of the trailing comma or space at the end of StringBuffer in `<property name="illegalClassNames" value="java.lang.StringBuffer, " />` prevents the problem. ---
This issue is tied to https://github.com/checkstyle/checkstyle/issues/12017 and commits https://github.com/checkstyle/checkstyle/commit/308001394030b0ba52921dd8f1b0bef22c90ea83 and https://github.com/checkstyle/checkstyle/commit/01b7de64e59c5932a13f4936c2f2355bb56603ec and PRs https://github.com/checkstyle/checkstyle/pull/12034 and https://github.com/checkstyle/checkstyle/pull/12035. Rationale was `No need to trim strings here, they are trimmed further down in the method`. It appears it was not taken into account to have an extra comma on the end with an empty space. There is no exception if there is just an extra comma. The exception comes in when there is a space after the comma. It is not user friendly to throw an exception. I think we should restore the code and drop the remaining empty item. We should restore trim. As we do for all other. Example: https://github.com/checkstyle/checkstyle/pull/12258 On it
2022-11-23T04:52:55Z
10.4
checkstyle/checkstyle
12,105
checkstyle__checkstyle-12105
[ "12104" ]
fa6856985e3eb32f11ae63e56c19fc2181a50d06
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java b/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java @@ -431,7 +431,7 @@ public void fireFileFinished(String fileName) { @Override protected void finishLocalSetup() throws CheckstyleException { final Locale locale = new Locale(localeLanguage, localeCountry); - Violation.setLocale(locale); + LocalizedMessage.setLocale(locale); if (moduleFactory == null) { if (moduleClassLoader == null) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/DefaultLogger.java b/src/main/java/com/puppycrawl/tools/checkstyle/DefaultLogger.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/DefaultLogger.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/DefaultLogger.java @@ -24,7 +24,6 @@ import java.io.PrintWriter; import java.io.Writer; import java.nio.charset.StandardCharsets; -import java.util.Locale; import com.puppycrawl.tools.checkstyle.api.AuditEvent; import com.puppycrawl.tools.checkstyle.api.AuditListener; @@ -161,7 +160,7 @@ public void addError(AuditEvent event) { public void addException(AuditEvent event, Throwable throwable) { synchronized (errorWriter) { final LocalizedMessage exceptionMessage = new LocalizedMessage( - Definitions.CHECKSTYLE_BUNDLE, Locale.getDefault(), DefaultLogger.class, + Definitions.CHECKSTYLE_BUNDLE, DefaultLogger.class, ADD_EXCEPTION_MESSAGE, event.getFileName()); errorWriter.println(exceptionMessage.getMessage()); throwable.printStackTrace(errorWriter); @@ -171,7 +170,7 @@ public void addException(AuditEvent event, Throwable throwable) { @Override public void auditStarted(AuditEvent event) { final LocalizedMessage auditStartMessage = new LocalizedMessage( - Definitions.CHECKSTYLE_BUNDLE, Locale.getDefault(), DefaultLogger.class, + Definitions.CHECKSTYLE_BUNDLE, DefaultLogger.class, AUDIT_STARTED_MESSAGE); infoWriter.println(auditStartMessage.getMessage()); infoWriter.flush(); @@ -180,7 +179,7 @@ public void auditStarted(AuditEvent event) { @Override public void auditFinished(AuditEvent event) { final LocalizedMessage auditFinishMessage = new LocalizedMessage( - Definitions.CHECKSTYLE_BUNDLE, Locale.getDefault(), DefaultLogger.class, + Definitions.CHECKSTYLE_BUNDLE, DefaultLogger.class, AUDIT_FINISHED_MESSAGE); infoWriter.println(auditFinishMessage.getMessage()); closeStreams(); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinter.java b/src/main/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinter.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinter.java @@ -29,7 +29,6 @@ import com.puppycrawl.tools.checkstyle.api.DetailNode; import com.puppycrawl.tools.checkstyle.api.FileText; import com.puppycrawl.tools.checkstyle.api.JavadocTokenTypes; -import com.puppycrawl.tools.checkstyle.api.Violation; import com.puppycrawl.tools.checkstyle.utils.JavadocUtil; import com.puppycrawl.tools.checkstyle.utils.ParserUtil; @@ -91,15 +90,12 @@ private static DetailNode parseJavadocAsDetailNode(String javadocComment) { * @return error violation */ private static String getParseErrorMessage(ParseErrorMessage parseErrorMessage) { - final Violation lmessage = new Violation( - parseErrorMessage.getLineNumber(), + final LocalizedMessage message = new LocalizedMessage( "com.puppycrawl.tools.checkstyle.checks.javadoc.messages", - parseErrorMessage.getMessageKey(), - parseErrorMessage.getMessageArguments(), - "", DetailNodeTreeStringPrinter.class, - null); - return "[ERROR:" + parseErrorMessage.getLineNumber() + "] " + lmessage.getViolation(); + parseErrorMessage.getMessageKey(), + parseErrorMessage.getMessageArguments()); + return "[ERROR:" + parseErrorMessage.getLineNumber() + "] " + message.getMessage(); } /** diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/LocalizedMessage.java b/src/main/java/com/puppycrawl/tools/checkstyle/LocalizedMessage.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/LocalizedMessage.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/LocalizedMessage.java @@ -40,14 +40,12 @@ */ public class LocalizedMessage { + /** The locale to localise messages to. **/ + private static Locale sLocale = Locale.getDefault(); + /** Name of the resource bundle to get messages from. **/ private final String bundle; - /** - * The locale to localise messages to. - **/ - private final Locale locale; - /** Class of the source for this message. */ private final Class<?> sourceClass; @@ -65,15 +63,13 @@ public class LocalizedMessage { * Creates a new {@code LocalizedMessage} instance. * * @param bundle resource bundle name - * @param locale The locale to localise messages to. * @param sourceClass the Class that is the source of the message * @param key the key to locate the translation. * @param args arguments for the translation. */ - public LocalizedMessage(String bundle, Locale locale, Class<?> sourceClass, String key, + public LocalizedMessage(String bundle, Class<?> sourceClass, String key, Object... args) { this.bundle = bundle; - this.locale = locale; this.sourceClass = sourceClass; this.key = key; if (args == null) { @@ -84,6 +80,20 @@ public LocalizedMessage(String bundle, Locale locale, Class<?> sourceClass, Stri } } + /** + * Sets a locale to use for localization. + * + * @param locale the locale to use for localization + */ + public static void setLocale(Locale locale) { + if (Locale.ENGLISH.getLanguage().equals(locale.getLanguage())) { + sLocale = Locale.ROOT; + } + else { + sLocale = locale; + } + } + /** * Gets the translated message. * @@ -119,7 +129,7 @@ public String getMessage() { * @return a ResourceBundle. */ private ResourceBundle getBundle() { - return ResourceBundle.getBundle(bundle, locale, sourceClass.getClassLoader(), + return ResourceBundle.getBundle(bundle, sLocale, sourceClass.getClassLoader(), new Utf8Control()); } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/Main.java b/src/main/java/com/puppycrawl/tools/checkstyle/Main.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/Main.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/Main.java @@ -48,7 +48,6 @@ import com.puppycrawl.tools.checkstyle.api.CheckstyleException; import com.puppycrawl.tools.checkstyle.api.Configuration; import com.puppycrawl.tools.checkstyle.api.RootModule; -import com.puppycrawl.tools.checkstyle.api.Violation; import com.puppycrawl.tools.checkstyle.utils.ChainedPropertyUtil; import com.puppycrawl.tools.checkstyle.utils.CommonUtil; import com.puppycrawl.tools.checkstyle.utils.XpathUtil; @@ -146,12 +145,12 @@ else if (parseResult.isUsageHelpRequested()) { finally { // return exit code base on validation of Checker if (errorCounter > 0) { - final Violation errorCounterViolation = new Violation(1, - Definitions.CHECKSTYLE_BUNDLE, ERROR_COUNTER, - new String[] {String.valueOf(errorCounter)}, null, Main.class, null); + final LocalizedMessage errorCounterViolation = new LocalizedMessage( + Definitions.CHECKSTYLE_BUNDLE, Main.class, + ERROR_COUNTER, String.valueOf(errorCounter)); // print error count statistic to error output stream, // output stream might be used by validation report content - System.err.println(errorCounterViolation.getViolation()); + System.err.println(errorCounterViolation.getMessage()); } } Runtime.getRuntime().exit(exitStatus); @@ -439,10 +438,10 @@ private static Properties loadProperties(File file) properties.load(stream); } catch (final IOException ex) { - final Violation loadPropertiesExceptionMessage = new Violation(1, - Definitions.CHECKSTYLE_BUNDLE, LOAD_PROPERTIES_EXCEPTION, - new String[] {file.getAbsolutePath()}, null, Main.class, null); - throw new CheckstyleException(loadPropertiesExceptionMessage.getViolation(), ex); + final LocalizedMessage loadPropertiesExceptionMessage = new LocalizedMessage( + Definitions.CHECKSTYLE_BUNDLE, Main.class, + LOAD_PROPERTIES_EXCEPTION, file.getAbsolutePath()); + throw new CheckstyleException(loadPropertiesExceptionMessage.getMessage(), ex); } return ChainedPropertyUtil.getResolvedProperties(properties); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java b/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java @@ -31,7 +31,6 @@ import java.util.stream.Stream; import com.puppycrawl.tools.checkstyle.api.CheckstyleException; -import com.puppycrawl.tools.checkstyle.api.Violation; import com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil; /** @@ -209,10 +208,10 @@ public Object createModule(String name) throws CheckstyleException { + STRING_SEPARATOR + nameCheck + STRING_SEPARATOR + joinPackageNamesWithClassName(nameCheck, packages); } - final Violation exceptionMessage = new Violation(1, - Definitions.CHECKSTYLE_BUNDLE, UNABLE_TO_INSTANTIATE_EXCEPTION_MESSAGE, - new String[] {name, attemptedNames}, null, getClass(), null); - throw new CheckstyleException(exceptionMessage.getViolation()); + final LocalizedMessage exceptionMessage = new LocalizedMessage( + Definitions.CHECKSTYLE_BUNDLE, getClass(), + UNABLE_TO_INSTANTIATE_EXCEPTION_MESSAGE, name, attemptedNames); + throw new CheckstyleException(exceptionMessage.getMessage()); } return instance; } @@ -285,10 +284,10 @@ private Object createObjectFromFullModuleNames(String name, Set<String> fullModu final String optionalNames = fullModuleNames.stream() .sorted() .collect(Collectors.joining(STRING_SEPARATOR)); - final Violation exceptionMessage = new Violation(1, - Definitions.CHECKSTYLE_BUNDLE, AMBIGUOUS_MODULE_NAME_EXCEPTION_MESSAGE, - new String[] {name, optionalNames}, null, getClass(), null); - throw new CheckstyleException(exceptionMessage.getViolation()); + final LocalizedMessage exceptionMessage = new LocalizedMessage( + Definitions.CHECKSTYLE_BUNDLE, getClass(), + AMBIGUOUS_MODULE_NAME_EXCEPTION_MESSAGE, name, optionalNames); + throw new CheckstyleException(exceptionMessage.getMessage()); } return returnValue; } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/Violation.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/Violation.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/Violation.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/Violation.java @@ -46,9 +46,6 @@ public final class Violation /** The default severity level if one is not specified. */ private static final SeverityLevel DEFAULT_SEVERITY = SeverityLevel.ERROR; - /** The locale to localise violations to. **/ - private static Locale sLocale = Locale.getDefault(); - /** The line number. **/ private final int lineNo; /** The column number. **/ @@ -358,20 +355,6 @@ public String getSourceName() { return sourceClass.getName(); } - /** - * Sets a locale to use for localization. - * - * @param locale the locale to use for localization - */ - public static void setLocale(Locale locale) { - if (Locale.ENGLISH.getLanguage().equals(locale.getLanguage())) { - sLocale = Locale.ROOT; - } - else { - sLocale = locale; - } - } - /** * Indicates whether some other object is "equal to" this one. * Suppression on enumeration is needed so code stays consistent. @@ -448,26 +431,15 @@ else if (other.moduleId == null) { * @return the translated violation */ public String getViolation() { - String violation = getCustomViolation(); + final String violation; - if (violation == null) { - violation = new LocalizedMessage(bundle, sLocale, sourceClass, key, args).getMessage(); - } - return violation; - } - - /** - * Returns the formatted custom violation if one is configured. - * - * @return the formatted custom violation or {@code null} - * if there is no custom violation - */ - private String getCustomViolation() { - String violation = null; if (customMessage != null) { - final MessageFormat formatter = new MessageFormat(customMessage, Locale.ROOT); - violation = formatter.format(args); + violation = new MessageFormat(customMessage, Locale.ROOT).format(args); + } + else { + violation = new LocalizedMessage(bundle, sourceClass, key, args).getMessage(); } + return violation; } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java @@ -45,6 +45,7 @@ import com.puppycrawl.tools.checkstyle.Definitions; import com.puppycrawl.tools.checkstyle.GlobalStatefulCheck; +import com.puppycrawl.tools.checkstyle.LocalizedMessage; import com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck; import com.puppycrawl.tools.checkstyle.api.FileText; import com.puppycrawl.tools.checkstyle.api.MessageDispatcher; @@ -318,11 +319,9 @@ public void setRequiredTranslations(String... translationCodes) { private void validateUserSpecifiedLanguageCodes(Set<String> languageCodes) { for (String code : languageCodes) { if (!isValidLanguageCode(code)) { - final Violation msg = new Violation(1, TRANSLATION_BUNDLE, - WRONG_LANGUAGE_CODE_KEY, new Object[] {code}, getId(), getClass(), null); - final String exceptionMessage = String.format(Locale.ROOT, - "%s [%s]", msg.getViolation(), TranslationCheck.class.getSimpleName()); - throw new IllegalArgumentException(exceptionMessage); + final LocalizedMessage msg = new LocalizedMessage(TRANSLATION_BUNDLE, + getClass(), WRONG_LANGUAGE_CODE_KEY, code); + throw new IllegalArgumentException(msg.getMessage()); } } }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java @@ -491,7 +491,7 @@ public void testFinishLocalSetupFullyInitialized() throws Exception { .that(context.get("basedir")) .isEqualTo("testBaseDir"); - final Field sLocale = Violation.class.getDeclaredField("sLocale"); + final Field sLocale = LocalizedMessage.class.getDeclaredField("sLocale"); sLocale.setAccessible(true); final Locale locale = (Locale) sLocale.get(null); assertWithMessage("Locale is set to unexpected value") diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/DefaultLoggerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/DefaultLoggerTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/DefaultLoggerTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/DefaultLoggerTest.java @@ -307,17 +307,17 @@ public void testStreamsNotClosedByLogger() throws IOException { } private static LocalizedMessage getAuditStartMessageClass() { - return new LocalizedMessage(Definitions.CHECKSTYLE_BUNDLE, Locale.getDefault(), + return new LocalizedMessage(Definitions.CHECKSTYLE_BUNDLE, DefaultLogger.class, "DefaultLogger.auditStarted"); } private static LocalizedMessage getAuditFinishMessageClass() { - return new LocalizedMessage(Definitions.CHECKSTYLE_BUNDLE, Locale.getDefault(), + return new LocalizedMessage(Definitions.CHECKSTYLE_BUNDLE, DefaultLogger.class, "DefaultLogger.auditFinished"); } private static LocalizedMessage getAddExceptionMessageClass(Object... arguments) { - return new LocalizedMessage(Definitions.CHECKSTYLE_BUNDLE, Locale.getDefault(), + return new LocalizedMessage(Definitions.CHECKSTYLE_BUNDLE, DefaultLogger.class, "DefaultLogger.addException", arguments); } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinterTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinterTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinterTest.java @@ -30,7 +30,6 @@ import org.junit.jupiter.api.Test; import com.puppycrawl.tools.checkstyle.JavadocDetailNodeParser.ParseErrorMessage; -import com.puppycrawl.tools.checkstyle.api.Violation; import com.puppycrawl.tools.checkstyle.internal.utils.TestUtil; public class DetailNodeTreeStringPrinterTest extends AbstractTreeTestSupport { @@ -83,15 +82,13 @@ public void testMissedHtmlTagParseErrorMessage() throws Exception { final String actual = TestUtil.invokeStaticMethod(DetailNodeTreeStringPrinter.class, "getParseErrorMessage", new ParseErrorMessage(35, MSG_JAVADOC_MISSED_HTML_CLOSE, 7, "xyz")); - final Violation violation = new Violation( - 35, + final LocalizedMessage violation = new LocalizedMessage( "com.puppycrawl.tools.checkstyle.checks.javadoc.messages", - MSG_JAVADOC_MISSED_HTML_CLOSE, - new Object[] {7, "xyz"}, - "", DetailNodeTreeStringPrinter.class, - null); - final String expected = "[ERROR:35] " + violation.getViolation(); + MSG_JAVADOC_MISSED_HTML_CLOSE, + 7, + "xyz"); + final String expected = "[ERROR:35] " + violation.getMessage(); assertWithMessage("Javadoc parse error violation for missed HTML tag " + "doesn't meet expectations") .that(actual) @@ -104,15 +101,13 @@ public void testParseErrorMessage() throws Exception { "getParseErrorMessage", new ParseErrorMessage(10, MSG_JAVADOC_PARSE_RULE_ERROR, 9, "no viable alternative at input ' xyz'", "SOME_JAVADOC_ELEMENT")); - final Violation violation = new Violation( - 10, + final LocalizedMessage violation = new LocalizedMessage( "com.puppycrawl.tools.checkstyle.checks.javadoc.messages", - MSG_JAVADOC_PARSE_RULE_ERROR, - new Object[] {9, "no viable alternative at input ' xyz'", "SOME_JAVADOC_ELEMENT"}, - "", DetailNodeTreeStringPrinter.class, - null); - final String expected = "[ERROR:10] " + violation.getViolation(); + MSG_JAVADOC_PARSE_RULE_ERROR, + 9, + "no viable alternative at input ' xyz'", "SOME_JAVADOC_ELEMENT"); + final String expected = "[ERROR:10] " + violation.getMessage(); assertWithMessage("Javadoc parse error violation doesn't meet expectations") .that(actual) .isEqualTo(expected); @@ -124,15 +119,13 @@ public void testWrongSingletonParseErrorMessage() throws Exception { "getParseErrorMessage", new ParseErrorMessage(100, MSG_JAVADOC_WRONG_SINGLETON_TAG, 9, "tag")); - final Violation violation = new Violation( - 100, + final LocalizedMessage violation = new LocalizedMessage( "com.puppycrawl.tools.checkstyle.checks.javadoc.messages", - MSG_JAVADOC_WRONG_SINGLETON_TAG, - new Object[] {9, "tag"}, - "", DetailNodeTreeStringPrinter.class, - null); - final String expected = "[ERROR:100] " + violation.getViolation(); + MSG_JAVADOC_WRONG_SINGLETON_TAG, + 9, + "tag"); + final String expected = "[ERROR:100] " + violation.getMessage(); assertWithMessage("Javadoc parse error violation for void elements with close tag " + "doesn't meet expectations") .that(actual) diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/LocalizedMessageTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/LocalizedMessageTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/LocalizedMessageTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/LocalizedMessageTest.java @@ -20,6 +20,7 @@ package com.puppycrawl.tools.checkstyle; import static com.google.common.truth.Truth.assertWithMessage; +import static org.junit.jupiter.api.Assumptions.assumeFalse; import java.io.IOException; import java.io.InputStream; @@ -30,7 +31,9 @@ import java.util.ResourceBundle; import java.util.concurrent.atomic.AtomicBoolean; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; +import org.junitpioneer.jupiter.DefaultLocale; import com.puppycrawl.tools.checkstyle.LocalizedMessage.Utf8Control; @@ -45,16 +48,18 @@ */ public class LocalizedMessageTest { + private static final Locale DEFAULT_LOCALE = Locale.getDefault(); + @Test public void testNullArgs() { final LocalizedMessage messageClass = new LocalizedMessage(Definitions.CHECKSTYLE_BUNDLE, - Locale.getDefault(), DefaultLogger.class, "DefaultLogger.addException", "myfile"); + DefaultLogger.class, "DefaultLogger.addException", "myfile"); assertWithMessage("Violation should contain exception info") .that(messageClass.getMessage()) .contains("Error auditing myfile"); final LocalizedMessage nullClass = new LocalizedMessage(Definitions.CHECKSTYLE_BUNDLE, - Locale.getDefault(), DefaultLogger.class, "DefaultLogger.addException"); + DefaultLogger.class, "DefaultLogger.addException"); final String outputForNullArgs = nullClass.getMessage(); assertWithMessage("Violation should contain exception info") .that(outputForNullArgs) @@ -206,6 +211,74 @@ protected URLConnection openConnection(URL ignore) { .isNull(); } + /** + * Verifies that the language specified with the system property {@code user.language} exists. + */ + @Test + public void testLanguageIsValid() { + final String language = DEFAULT_LOCALE.getLanguage(); + assumeFalse(language.isEmpty(), "Locale not set"); + assertWithMessage("Invalid language") + .that(Locale.getISOLanguages()) + .asList() + .contains(language); + } + + /** + * Verifies that the country specified with the system property {@code user.country} exists. + */ + @Test + public void testCountryIsValid() { + final String country = DEFAULT_LOCALE.getCountry(); + assumeFalse(country.isEmpty(), "Locale not set"); + assertWithMessage("Invalid country") + .that(Locale.getISOCountries()) + .asList() + .contains(country); + } + + @Test + public void testMessageInFrench() { + final LocalizedMessage violation = createSampleViolation(); + LocalizedMessage.setLocale(Locale.FRENCH); + + assertWithMessage("Invalid violation") + .that(violation.getMessage()) + .isEqualTo("Instruction vide."); + } + + @DefaultLocale("fr") + @Test + public void testEnforceEnglishLanguageBySettingUnitedStatesLocale() { + LocalizedMessage.setLocale(Locale.US); + final LocalizedMessage violation = createSampleViolation(); + + assertWithMessage("Invalid violation") + .that(violation.getMessage()) + .isEqualTo("Empty statement."); + } + + @DefaultLocale("fr") + @Test + public void testEnforceEnglishLanguageBySettingRootLocale() { + LocalizedMessage.setLocale(Locale.ROOT); + final LocalizedMessage violation = createSampleViolation(); + + assertWithMessage("Invalid violation") + .that(violation.getMessage()) + .isEqualTo("Empty statement."); + } + + private static LocalizedMessage createSampleViolation() { + return new LocalizedMessage("com.puppycrawl.tools.checkstyle.checks.coding.messages", + LocalizedMessage.class, "empty.statement"); + } + + @AfterEach + public void tearDown() { + LocalizedMessage.setLocale(DEFAULT_LOCALE); + } + /** * Mocked ClassLoader for testing URL loading. * diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java @@ -186,16 +186,16 @@ public class MainTest { @TempDir public File temporaryFolder; - private final Violation auditStartMessage = new Violation(1, - Definitions.CHECKSTYLE_BUNDLE, "DefaultLogger.auditStarted", null, null, - getClass(), null); + private final LocalizedMessage auditStartMessage = new LocalizedMessage( + Definitions.CHECKSTYLE_BUNDLE, getClass(), + "DefaultLogger.auditStarted"); - private final Violation auditFinishMessage = new Violation(1, - Definitions.CHECKSTYLE_BUNDLE, "DefaultLogger.auditFinished", null, null, - getClass(), null); + private final LocalizedMessage auditFinishMessage = new LocalizedMessage( + Definitions.CHECKSTYLE_BUNDLE, getClass(), + "DefaultLogger.auditFinished"); - private final String noViolationsOutput = auditStartMessage.getViolation() + EOL - + auditFinishMessage.getViolation() + EOL; + private final String noViolationsOutput = auditStartMessage.getMessage() + EOL + + auditFinishMessage.getMessage() + EOL; private static String getPath(String filename) { return "src/test/resources/com/puppycrawl/tools/checkstyle/main/" + filename; @@ -388,8 +388,8 @@ public void testExistingTargetFile(@SysErr Capturable systemErr, @SysOut Captura getPath("InputMain.java")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) - .isEqualTo(addEndOfLine(auditStartMessage.getViolation(), - auditFinishMessage.getViolation())); + .isEqualTo(addEndOfLine(auditStartMessage.getMessage(), + auditFinishMessage.getMessage())); assertWithMessage("Unexpected system error log") .that(systemErr.getCapturedData()) .isEqualTo(""); @@ -470,8 +470,8 @@ public void testExistingTargetFilePlainOutput(@SysErr Capturable systemErr, getPath("InputMain.java")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) - .isEqualTo(addEndOfLine(auditStartMessage.getViolation(), - auditFinishMessage.getViolation())); + .isEqualTo(addEndOfLine(auditStartMessage.getMessage(), + auditFinishMessage.getMessage())); assertWithMessage("Unexpected system error log") .that(systemErr.getCapturedData()) .isEqualTo(""); @@ -493,14 +493,14 @@ public void testExistingTargetFileWithViolations(@SysErr Capturable systemErr, final String expectedPath = getFilePath("InputMain.java"); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) - .isEqualTo(addEndOfLine(auditStartMessage.getViolation(), + .isEqualTo(addEndOfLine(auditStartMessage.getMessage(), "[WARN] " + expectedPath + ":3:14: " + invalidPatternMessageMain.getViolation() + " [TypeName]", "[WARN] " + expectedPath + ":5:7: " + invalidPatternMessageMainInner.getViolation() + " [TypeName]", - auditFinishMessage.getViolation())); + auditFinishMessage.getMessage())); assertWithMessage("Unexpected system error log") .that(systemErr.getCapturedData()) .isEqualTo(""); @@ -555,12 +555,12 @@ public void testExistingTargetFileWithError(@SysErr Capturable systemErr, final String expectedPath = getFilePath("InputMain.java"); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) - .isEqualTo(addEndOfLine(auditStartMessage.getViolation(), + .isEqualTo(addEndOfLine(auditStartMessage.getMessage(), "[ERROR] " + expectedPath + ":3:14: " + invalidPatternMessageMain.getViolation() + " [TypeName]", "[ERROR] " + expectedPath + ":5:7: " + invalidPatternMessageMainInner.getViolation() + " [TypeName]", - auditFinishMessage.getViolation())); + auditFinishMessage.getMessage())); assertWithMessage("Unexpected system error log") .that(systemErr.getCapturedData()) .isEqualTo(addEndOfLine(errorCounterTwoMessage.getViolation())); @@ -588,10 +588,10 @@ public void testExistingTargetFileWithOneError(@SysErr Capturable systemErr, final String expectedPath = getFilePath("InputMain1.java"); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) - .isEqualTo(addEndOfLine(auditStartMessage.getViolation(), + .isEqualTo(addEndOfLine(auditStartMessage.getMessage(), "[ERROR] " + expectedPath + ":3:14: " + invalidPatternMessageMain.getViolation() + " [TypeName]", - auditFinishMessage.getViolation())); + auditFinishMessage.getMessage())); assertWithMessage("Unexpected system error log") .that(systemErr.getCapturedData()) .isEqualTo(addEndOfLine(errorCounterTwoMessage.getViolation())); @@ -611,9 +611,9 @@ public void testExistingTargetFileWithOneErrorAgainstSunCheck(@SysErr Capturable final String expectedPath = getFilePath("InputMain1.java"); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) - .isEqualTo(addEndOfLine(auditStartMessage.getViolation(), + .isEqualTo(addEndOfLine(auditStartMessage.getMessage(), "[ERROR] " + expectedPath + ":1: " + message.getViolation() + " [JavadocPackage]", - auditFinishMessage.getViolation())); + auditFinishMessage.getMessage())); assertWithMessage("Unexpected system error log") .that(systemErr.getCapturedData()) .isEqualTo(addEndOfLine(errorCounterTwoMessage.getViolation())); @@ -670,8 +670,8 @@ public void testExistingTargetFilePlainOutputProperties(@SysErr Capturable syste "-p", getPath("InputMainMycheckstyle.properties"), getPath("InputMain.java")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) - .isEqualTo(addEndOfLine(auditStartMessage.getViolation(), - auditFinishMessage.getViolation())); + .isEqualTo(addEndOfLine(auditStartMessage.getMessage(), + auditFinishMessage.getMessage())); assertWithMessage("Unexpected system error log") .that(systemErr.getCapturedData()) .isEqualTo(""); @@ -685,8 +685,8 @@ public void testPropertyFileWithPropertyChaining(@SysErr Capturable systemErr, assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) - .isEqualTo(addEndOfLine(auditStartMessage.getViolation(), - auditFinishMessage.getViolation())); + .isEqualTo(addEndOfLine(auditStartMessage.getMessage(), + auditFinishMessage.getMessage())); assertWithMessage("Unexpected system error log") .that(systemErr.getCapturedData()) .isEqualTo(""); @@ -813,7 +813,7 @@ public void testExistingDirectoryWithViolations(@SysErr Capturable systemErr, getPath("")); final String expectedPath = getFilePath("") + File.separator; final StringBuilder sb = new StringBuilder(28); - sb.append(auditStartMessage.getViolation()) + sb.append(auditStartMessage.getMessage()) .append(EOL); final String format = "[WARN] " + expectedPath + outputValues[0][0] + ".java:" + outputValues[0][1] + ": "; @@ -824,7 +824,7 @@ public void testExistingDirectoryWithViolations(@SysErr Capturable systemErr, final String line = format + violation + " [FileLength]"; sb.append(line).append(EOL); } - sb.append(auditFinishMessage.getViolation()) + sb.append(auditFinishMessage.getMessage()) .append(EOL); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) @@ -1740,19 +1740,20 @@ public void testCustomSimpleRootModule(@SysErr Capturable systemErr) { assertMainReturnCode(-2, "-c", getPath("InputMainConfig-custom-simple-root-module.xml"), getPath("InputMain.java")); final String checkstylePackage = "com.puppycrawl.tools.checkstyle."; - final Violation unableToInstantiateExceptionMessage = new Violation(1, + final LocalizedMessage unableToInstantiateExceptionMessage = new LocalizedMessage( Definitions.CHECKSTYLE_BUNDLE, + getClass(), "PackageObjectFactory.unableToInstantiateExceptionMessage", - new String[] {"TestRootModuleChecker", checkstylePackage + "TestRootModuleChecker", + checkstylePackage + "TestRootModuleChecker, " + "TestRootModuleCheckerCheck, " + checkstylePackage - + "TestRootModuleCheckerCheck"}, - null, getClass(), null); + + "TestRootModuleCheckerCheck"); assertWithMessage( "Unexpected system error log") .that(systemErr.getCapturedData() .startsWith(checkstylePackage + "api.CheckstyleException: " - + unableToInstantiateExceptionMessage.getViolation())) + + unableToInstantiateExceptionMessage.getMessage())) .isTrue(); assertWithMessage("Invalid checker state") .that(TestRootModuleChecker.isProcessed()) diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/PackageObjectFactoryTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/PackageObjectFactoryTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/PackageObjectFactoryTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/PackageObjectFactoryTest.java @@ -156,12 +156,12 @@ public void testMakeCheckFromName() { assertWithMessage("Exception is expected").fail(); } catch (CheckstyleException ex) { - final Violation exceptionMessage = new Violation(1, - Definitions.CHECKSTYLE_BUNDLE, UNABLE_TO_INSTANTIATE_EXCEPTION_MESSAGE, - new String[] {name, null}, null, factory.getClass(), null); + final LocalizedMessage exceptionMessage = new LocalizedMessage( + Definitions.CHECKSTYLE_BUNDLE, factory.getClass(), + UNABLE_TO_INSTANTIATE_EXCEPTION_MESSAGE, name, null); assertWithMessage("Invalid exception message") .that(ex.getMessage()) - .isEqualTo(exceptionMessage.getViolation()); + .isEqualTo(exceptionMessage.getMessage()); } } @@ -177,12 +177,12 @@ public void testCreateModuleWithNonExistName() { final String attemptedNames = BASE_PACKAGE + PACKAGE_SEPARATOR + name + STRING_SEPARATOR + name + CHECK_SUFFIX + STRING_SEPARATOR + BASE_PACKAGE + PACKAGE_SEPARATOR + name + CHECK_SUFFIX; - final Violation exceptionMessage = new Violation(1, - Definitions.CHECKSTYLE_BUNDLE, UNABLE_TO_INSTANTIATE_EXCEPTION_MESSAGE, - new String[] {name, attemptedNames}, null, factory.getClass(), null); + final LocalizedMessage exceptionMessage = new LocalizedMessage( + Definitions.CHECKSTYLE_BUNDLE, factory.getClass(), + UNABLE_TO_INSTANTIATE_EXCEPTION_MESSAGE, name, attemptedNames); assertWithMessage("Invalid exception message") .that(ex.getMessage()) - .isEqualTo(exceptionMessage.getViolation()); + .isEqualTo(exceptionMessage.getMessage()); } } } @@ -250,12 +250,12 @@ public void testCreateObjectFromFullModuleNamesWithAmbiguousException() { catch (CheckstyleException ex) { final String optionalNames = barPackage + PACKAGE_SEPARATOR + name + STRING_SEPARATOR + fooPackage + PACKAGE_SEPARATOR + name; - final Violation exceptionMessage = new Violation(1, - Definitions.CHECKSTYLE_BUNDLE, AMBIGUOUS_MODULE_NAME_EXCEPTION_MESSAGE, - new String[] {name, optionalNames}, null, getClass(), null); + final LocalizedMessage exceptionMessage = new LocalizedMessage( + Definitions.CHECKSTYLE_BUNDLE, getClass(), + AMBIGUOUS_MODULE_NAME_EXCEPTION_MESSAGE, name, optionalNames); assertWithMessage("Invalid exception message") .that(ex.getMessage()) - .isEqualTo(exceptionMessage.getViolation()); + .isEqualTo(exceptionMessage.getMessage()); } } @@ -278,12 +278,12 @@ public void testCreateObjectFromFullModuleNamesWithCantInstantiateException() { + checkName + STRING_SEPARATOR + package1 + PACKAGE_SEPARATOR + checkName + STRING_SEPARATOR + package2 + PACKAGE_SEPARATOR + checkName; - final Violation exceptionMessage = new Violation(1, - Definitions.CHECKSTYLE_BUNDLE, UNABLE_TO_INSTANTIATE_EXCEPTION_MESSAGE, - new String[] {name, attemptedNames}, null, getClass(), null); + final LocalizedMessage exceptionMessage = new LocalizedMessage( + Definitions.CHECKSTYLE_BUNDLE, getClass(), + UNABLE_TO_INSTANTIATE_EXCEPTION_MESSAGE, name, attemptedNames); assertWithMessage("Invalid exception message") .that(ex.getMessage()) - .isEqualTo(exceptionMessage.getViolation()); + .isEqualTo(exceptionMessage.getMessage()); } } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/ViolationTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/ViolationTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/api/ViolationTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/ViolationTest.java @@ -21,11 +21,7 @@ import static com.google.common.truth.Truth.assertWithMessage; import static com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_OBJECT_ARRAY; -import static org.junit.jupiter.api.Assumptions.assumeFalse; -import java.util.Locale; - -import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junitpioneer.jupiter.DefaultLocale; @@ -34,34 +30,6 @@ public class ViolationTest { - private static final Locale DEFAULT_LOCALE = Locale.getDefault(); - - /** - * Verifies that the language specified with the system property {@code user.language} exists. - */ - @Test - public void testLanguageIsValid() { - final String language = DEFAULT_LOCALE.getLanguage(); - assumeFalse(language.isEmpty(), "Locale not set"); - assertWithMessage("Invalid language") - .that(Locale.getISOLanguages()) - .asList() - .contains(language); - } - - /** - * Verifies that the country specified with the system property {@code user.country} exists. - */ - @Test - public void testCountryIsValid() { - final String country = DEFAULT_LOCALE.getCountry(); - assumeFalse(country.isEmpty(), "Locale not set"); - assertWithMessage("Invalid country") - .that(Locale.getISOCountries()) - .asList() - .contains(country); - } - @Test public void testEqualsAndHashCode() { final EqualsVerifierReport ev = EqualsVerifier.forClass(Violation.class) @@ -98,42 +66,10 @@ public void testGetSourceName() { .isEqualTo("com.puppycrawl.tools.checkstyle.api.Violation"); } + @DefaultLocale("en") @Test public void testMessageInEnglish() { final Violation violation = createSampleViolation(); - Violation.setLocale(Locale.ENGLISH); - - assertWithMessage("Invalid violation") - .that(violation.getViolation()) - .isEqualTo("Empty statement."); - } - - @Test - public void testMessageInFrench() { - final Violation violation = createSampleViolation(); - Violation.setLocale(Locale.FRENCH); - - assertWithMessage("Invalid violation") - .that(violation.getViolation()) - .isEqualTo("Instruction vide."); - } - - @DefaultLocale("fr") - @Test - public void testEnforceEnglishLanguageBySettingUnitedStatesLocale() { - Violation.setLocale(Locale.US); - final Violation violation = createSampleViolation(); - - assertWithMessage("Invalid violation") - .that(violation.getViolation()) - .isEqualTo("Empty statement."); - } - - @DefaultLocale("fr") - @Test - public void testEnforceEnglishLanguageBySettingRootLocale() { - Violation.setLocale(Locale.ROOT); - final Violation violation = createSampleViolation(); assertWithMessage("Invalid violation") .that(violation.getViolation()) @@ -143,7 +79,6 @@ public void testEnforceEnglishLanguageBySettingRootLocale() { @DefaultLocale("fr") @Test public void testGetKey() { - Violation.setLocale(Locale.US); final Violation violation = createSampleViolation(); assertWithMessage("Invalid violation key") @@ -252,9 +187,4 @@ private static Violation createSampleViolationWithColumn(int column) { EMPTY_OBJECT_ARRAY, "module", Violation.class, null); } - @AfterEach - public void tearDown() { - Violation.setLocale(DEFAULT_LOCALE); - } - } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheckTest.java @@ -231,12 +231,12 @@ public void testLogIoExceptionFileNotFound() throws Exception { assertWithMessage("expected number of errors to fire") .that(dispatcher.savedErrors) .hasSize(1); - final Violation violation = new Violation(1, + final Violation violation = new Violation(0, Definitions.CHECKSTYLE_BUNDLE, "general.fileNotFound", - null, null, getClass(), null); + null, null, TranslationCheck.class, null); assertWithMessage("Invalid violation") - .that(dispatcher.savedErrors.iterator().next().getViolation()) - .isEqualTo(violation.getViolation()); + .that(dispatcher.savedErrors.iterator().next()) + .isEqualTo(violation); } @Test @@ -256,12 +256,12 @@ public void testLogIoException() throws Exception { assertWithMessage("expected number of errors to fire") .that(dispatcher.savedErrors.size()) .isEqualTo(1); - final Violation violation = new Violation(1, + final Violation violation = new Violation(0, Definitions.CHECKSTYLE_BUNDLE, "general.exception", - new String[] {exception.getMessage()}, null, getClass(), null); + new String[] {exception.getMessage()}, null, TranslationCheck.class, null); assertWithMessage("Invalid violation") - .that(dispatcher.savedErrors.iterator().next().getViolation()) - .isEqualTo(violation.getViolation()); + .that(dispatcher.savedErrors.iterator().next()) + .isEqualTo(violation); } @Test @@ -269,9 +269,9 @@ public void testLogIllegalArgumentException() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(TranslationCheck.class); checkConfig.addProperty("baseName", "^bad.*$"); final String[] expected = { - "0: " + new Violation(1, Definitions.CHECKSTYLE_BUNDLE, "general.exception", - new String[] {"Malformed \\uxxxx encoding." }, null, getClass(), - null).getViolation(), "1: " + getCheckMessage(MSG_KEY, "test"), + "0: " + getCheckMessage(Checker.class, "general.exception", + "Malformed \\uxxxx encoding."), + "1: " + getCheckMessage(MSG_KEY, "test"), }; final File[] propertyFiles = { new File(getPath("bad.properties")), @@ -607,9 +607,6 @@ public void testWrongUserSpecifiedLanguageCodes() { assertWithMessage("Error message is unexpected") .that(exceptionMessage) .contains("11"); - assertWithMessage("Error message is unexpected") - .that(exceptionMessage) - .endsWith("[TranslationCheck]"); } }
Remove Global Static Locale https://github.com/checkstyle/checkstyle/blob/a368230b7df8ca70839f97d30a8d8adebd8b9ff3/src/main/java/com/puppycrawl/tools/checkstyle/api/Violation.java#L68 https://github.com/checkstyle/checkstyle/blob/a368230b7df8ca70839f97d30a8d8adebd8b9ff3/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java#L434 Identified in several issues, https://github.com/checkstyle/checkstyle/pull/12053#discussion_r955646247 https://github.com/checkstyle/checkstyle/issues/12101 https://github.com/checkstyle/checkstyle/issues/7436 Setting any type of locale in a global area, either by `Violation.setLocale` or `Locale.setDefault`, is a very bad idea. It is very easy to corrupt the locale if developers creating tests aren't careful as changing this value can impact all other tests since it is global. Even if developers are careful, its hard to remember all the little places that can change the locale without in-depth knowledge all the time. Example: https://github.com/checkstyle/checkstyle/blob/d287d78e7ee1218092f0c386cddd78ea81448fc3/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java#L478 -- We set the locale to italy and don't do any reversion. I am not sure how this hasn't been an issue already but I think we have been lucky on test run ordering. https://github.com/checkstyle/checkstyle/blob/0eadd97b8af5b79e7c49f82958fbb3d863bfdf61/src/it/java/org/checkstyle/base/AbstractItModuleTestSupport.java#L286 -- We set the locale to English but CI and most users run in English. https://github.com/checkstyle/checkstyle/blob/d287d78e7ee1218092f0c386cddd78ea81448fc3/src/test/java/com/puppycrawl/tools/checkstyle/api/ViolationTest.java#L445 -- Example of where we have to be extra careful and reset the global locale back after testing. If we ever create a config with a locale set and load it in a test, it would also cause a global issue. We need to remove this method somehow and pass the locale either by stack or have a central, non-static, area be the main source of it like Checker. We also need to forbid `Locale.setDefault`. (either ForbiddenAPIs or xpath)
2022-08-26T14:35:05Z
10.3
checkstyle/checkstyle
11,972
checkstyle__checkstyle-11972
[ "11720" ]
f4ab4aa20d27153bb9489315644cfb2a4c8b9e3c
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java @@ -761,37 +761,26 @@ private static DetailAST getFirstNodeInsideIfBlock( DetailAST firstNodeInsideBlock = null; if (!isVariableInOperatorExpr(block, variable)) { - DetailAST currentNode = block.getLastChild(); - final List<DetailAST> variableUsageExpressions = - new ArrayList<>(); - - while (currentNode != null - && currentNode.getType() == TokenTypes.LITERAL_ELSE) { - final DetailAST previousNode = - currentNode.getPreviousSibling(); - - // Checking variable usage inside IF block. - if (isChild(previousNode, variable)) { - variableUsageExpressions.add(previousNode); - } + final Optional<DetailAST> slistToken = TokenUtil + .findFirstTokenByPredicate(block, token -> token.getType() == TokenTypes.SLIST); + final DetailAST lastNode = block.getLastChild(); + DetailAST previousNode = lastNode.getPreviousSibling(); - // Looking into ELSE block, get its first child and analyze it. - currentNode = currentNode.getFirstChild(); + if (slistToken.isEmpty() + && lastNode.getType() == TokenTypes.LITERAL_ELSE) { - if (currentNode.getType() == TokenTypes.LITERAL_IF) { - currentNode = currentNode.getLastChild(); - } - else if (isChild(currentNode, variable)) { - variableUsageExpressions.add(currentNode); - currentNode = null; - } + // Is if statement without '{}' and has a following else branch, + // then change previousNode to the if statement body. + previousNode = previousNode.getPreviousSibling(); + } + + final List<DetailAST> variableUsageExpressions = new ArrayList<>(); + if (isChild(previousNode, variable)) { + variableUsageExpressions.add(previousNode); } - // If IF block doesn't include ELSE then analyze variable usage - // only inside IF block. - if (currentNode != null - && isChild(currentNode, variable)) { - variableUsageExpressions.add(currentNode); + if (isChild(lastNode, variable)) { + variableUsageExpressions.add(lastNode); } // If variable usage exists in several related blocks, then
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheckTest.java @@ -91,6 +91,23 @@ public void testGeneralLogic2() throws Exception { getPath("InputVariableDeclarationUsageDistanceGeneral2.java"), expected); } + @Test + public void testIfStatements() throws Exception { + final String[] expected = { + "18:9: " + getCheckMessage(MSG_KEY, "a", 4, 1), + "28:9: " + getCheckMessage(MSG_KEY, "a", 2, 1), + "32:9: " + getCheckMessage(MSG_KEY, "b", 2, 1), + "38:9: " + getCheckMessage(MSG_KEY, "c", 3, 1), + "49:9: " + getCheckMessage(MSG_KEY, "b", 2, 1), + "50:9: " + getCheckMessage(MSG_KEY, "c", 3, 1), + "51:9: " + getCheckMessage(MSG_KEY, "d", 4, 1), + "63:9: " + getCheckMessage(MSG_KEY, "a", 4, 1), + + }; + verifyWithInlineConfigParser( + getPath("InputVariableDeclarationUsageDistanceIfStatements.java"), expected); + } + @Test public void testDistance() throws Exception { final String[] expected = { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceIfStatements.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceIfStatements.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceIfStatements.java @@ -0,0 +1,72 @@ +/* +VariableDeclarationUsageDistance +allowedDistance = 1 +ignoreVariablePattern = (default) +validateBetweenScopes = true +ignoreFinal = false + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.coding.variabledeclarationusagedistance; + +import java.util.HashSet; +import java.util.Set; + +public class InputVariableDeclarationUsageDistanceIfStatements { + void method2() { + int a = 12; // violation + if (true) { + method2(); + checkIfStatementWithoutParen(); + method2(); + a++; + } + } + + void checkIfStatementWithoutParen() { + int a = 12; // violation + method2(); + if (true) + a++; + int b = 12; // violation + method2(); + if (false) + method2(); + else if(true) + b++; + int c = 12; // violation + method2(); + checkIfStatementWithoutParen(); + if (true) + c++; + else + method2(); + } + + void testConsecutiveIfStatements() { + int a = 12; // ok + int b = 13; // violation + int c = 14; // violation + int d = 15; // violation + if (true) + a++; + if (true) + b++; + if (false) + c++; + if (true) + d++; + } + + int testReturnStatement() { + int a = 1; // violation + testConsecutiveIfStatements(); + testConsecutiveIfStatements(); + testConsecutiveIfStatements(); + if (true) + return a; + + return 0; + } +}
Pitest: Kill all surviving mutations This will be main tracker issue for killing surviving mutations before we begin work in https://github.com/checkstyle/checkstyle/issues/11719 Now that we have diff report generation as github action, let's modify the procedure from https://github.com/checkstyle/checkstyle/issues/7797#issue-577522554 a bit to speed this up: 1. Disable all CI first as separate commit(See example at https://github.com/checkstyle/checkstyle/pull/11721). This will help to not waste credits. 2. Pick one single surviving mutation from pitest.sh. 3. Send PR with a single hardcoded mutation only. 4. Generate diff report with hardcoded mutation. 5. Share link to initial commit with hardcoded mutation and initial diff report in PR description. This is in lieu of separate branch/ etc. in previous issue at #7797. HARDCODED MUTATION WILL NOT BE IN FINAL PR. We will have one of three outcomes for each mutation (in order of preference): 1. Find a case that kills the mutation via diff report, add new test in existing PR 2. Safely (no regressions) modify code to be covered, in existing PR 3. Safely (no regressions) remove code to be covered, in existing PR Case (2) and (3) required a detailed analysis and discussion in issue before making any changes. ----------------------------------- **We will not be pursuing surviving mutations in IndentationCheck or gui package .**
Once we approve this issue, we should close https://github.com/checkstyle/checkstyle/issues/7797 and any child/ associated issues. approved. it would be good to see html report(s) where ALL is activated to see visually scope of work. REpost should be on github.io to let mentors review it and discuss at any time and from phones. we need to have commit that disables all CIs. to make sure we will not eat all credits for CI provided, and we are not banned from CI usage due to misbehavior (overusage). so PRs for search of killer will have two commits: 1) disable all CIs jobs 2) hardcoded survival mutation PR should have no CI jobs started or all of them do nothing (skip all jobs). the only activity happens by comment to trigger Github Action. @rnveach @nick-mancuso The new pitest method only examines `mutations.xml` which isn't appropriate to determine lines that are uncovered and are not mutated (due to the absence of some mutator). Such lines can only be taken from the HTML file. An example of such lines is present over [here](https://vyom-yadav.github.io/DiffReport/pit-blocks-mod-1/index.html) (modified a bit for demonstrating). Though uncovered lines will result in low line coverage, it is rounded up in certain cases ([example](https://vyom-yadav.github.io/DiffReport/pit-blocks-mod-single-line/index.html)) and the line coverage becomes 100% :( https://github.com/hcoles/pitest/issues/375 The final resort is to create some custom method, we can either check line coverage `212/213` in this sense or we can, do what we used to do, add suppression, but in that case, our suppression model needs to be different because current one operates on mutations. We can create a new class named `UncoveredLines` and add that to the suppression model, ideas are welcome :) Missing code coverage would also impact jacoco, which is also checking code coverage. Is Jacoco reporting similar missing code coverage is pitest only alone? This seems like an improvement to me, as long as coverage is properly reported by Jacoco. Do we currently have suppressions in pitest.sh like this? > This seems like an improvement to me, as long as coverage is properly reported by Jacoco. @nick-mancuso Yes, coverage is supported by jacoco, where pitest rounds off, jacoco doesn't so the result is more accurate. See [this](https://vyom-yadav.github.io/DiffReport/jacoco-coverage/index.html) report, see `blocks` package, it shows 99% whereas [pitest](https://vyom-yadav.github.io/DiffReport/pit-blocks-mod-single-line/index.html) turns it to 100%. > Do we currently have suppressions in pitest.sh like this? We do but that suppression is a bug, see https://github.com/hcoles/pitest/issues/688 https://github.com/checkstyle/checkstyle/blob/e8b63a1b1ce4d9f40d0ce9dc8bc70ea8549a77bf/.ci/pitest.sh#L61-L67 @Vyom-Yadav let's do this: since we have separated execution of pitest and generation of pitest report out of your groovy script, let's also remove pitest execution and report generation from pitest.sh, and have both scripts run for duration of GSOC as an ongoing "regression" test for your new script. @nick-mancuso , do we need this mega issue ? I think it is better to create more precise issue with more clear scope and target. We will allow #11972 to close this issue, and open more granular issues as we need to.
2022-07-23T18:16:08Z
10.3
checkstyle/checkstyle
11,517
checkstyle__checkstyle-11517
[ "11498" ]
3103d5256fc518710c0e34ba72a25eb700aa133f
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java @@ -56,6 +56,8 @@ * LITERAL_FOR</a>, * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY"> * LITERAL_FINALLY</a>, + * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH"> + * LITERAL_CATCH</a>, * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO"> * DO_WHILE</a>, * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ELLIPSIS"> @@ -100,6 +102,9 @@ * * try {} catch (Error e){} finally {} // OK * try {} catch (Error e){} finally{} // violation ''finally' is not followed by whitespace' + * + * try {} catch (Exception e){} // OK + * try {} catch(Exception e){} // violation ''catch' is not followed by whitespace' * } * </pre> * <p> @@ -172,6 +177,7 @@ public int[] getAcceptableTokens() { TokenTypes.LITERAL_DO, TokenTypes.LITERAL_FOR, TokenTypes.LITERAL_FINALLY, + TokenTypes.LITERAL_CATCH, TokenTypes.DO_WHILE, TokenTypes.ELLIPSIS, TokenTypes.LITERAL_SWITCH,
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAfterTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAfterTest.java --- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAfterTest.java +++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAfterTest.java @@ -59,6 +59,7 @@ public void testWhitespaceAfterBad() throws Exception { "31:9: " + getCheckMessage(clazz, message, "try"), "35:16: " + getCheckMessage(clazz, message, "finally"), "36:38: " + getCheckMessage(clazz, message, "finally"), + "40:16: " + getCheckMessage(clazz, message, "catch"), }; final Configuration checkConfig = getModuleConfig("WhitespaceAfter"); final String filePath = getPath("InputWhitespaceAfterBad.java"); diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/InputWhitespaceAfterBad.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/InputWhitespaceAfterBad.java --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/InputWhitespaceAfterBad.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/InputWhitespaceAfterBad.java @@ -35,4 +35,8 @@ public void check5() { try {} finally{} // warn try {} catch (Exception e){} finally{} // warn } + + public void check6() { + try {} catch(Exception e){} // warn + } } diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/InputWhitespaceAfterGood.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/InputWhitespaceAfterGood.java --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/InputWhitespaceAfterGood.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/InputWhitespaceAfterGood.java @@ -29,11 +29,15 @@ public void check3(int... a) { public void check4() throws java.io.IOException { try (java.io.InputStream ignored = System.in) {} - try {} catch(Exception e){} + try {} catch (Exception e){} } public void check5() { try {} finally {} try {} catch (Exception e){} finally {} } + + public void check6() { + try {} catch (Exception e){} + } } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java @@ -170,6 +170,16 @@ public void testLiteralTry() throws Exception { expected); } + @Test + public void testLiteralCatch() throws Exception { + final String[] expected = { + "14:14: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "catch"), + }; + verifyWithInlineConfigParser( + getPath("InputWhitespaceAfterLiteralCatch.java"), + expected); + } + @Test public void testEmptyForIterator() throws Exception { final String[] expected = { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterLiteralCatch.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterLiteralCatch.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterLiteralCatch.java @@ -0,0 +1,16 @@ +/* +WhitespaceAfter +tokens = LITERAL_CATCH + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.whitespace.whitespaceafter; + +public class InputWhitespaceAfterLiteralCatch { + public static void main(String[] args) { + + try {} catch (Exception e){} // OK + try {} catch(Exception e){} // violation ''catch' is not followed by whitespace' + } +}
WhitespaceAfter should support LITERAL_CATCH token https://checkstyle.org/config_whitespace.html#WhitespaceAfter I have downloaded the latest cli from: https://checkstyle.org/cmdline.html#Download_and_Run I have executed the cli and showed it below, as cli describes the problem better than 1,000 words **How it works Now:** ```bash /var/tmp $ javac CatchSpace.java /var/tmp $ /var/tmp $ cat config.xml <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> <module name="Checker"> <module name="TreeWalker"> <module name="WhitespaceAfter"> <property name="tokens" value="LITERAL_CATCH"/> </module> </module> </module> /var/tmp $ cat CatchSpace.java public class CatchSpace { public static void main(String[] args) { try { Integer.parseInt(args[0]); } catch(NumberFormatException e) { System.out.println("not a number"); } } } /var/tmp $ RUN_LOCALE="-Duser.language=en -Duser.country=US" /var/tmp $ java $RUN_LOCALE -jar checkstyle-10.1-all.jar -c config.xml CatchSpace.java com.puppycrawl.tools.checkstyle.api.CheckstyleException: cannot initialize module TreeWalker - Token "LITERAL_CATCH" was not found in Acceptable tokens list in check com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck at com.puppycrawl.tools.checkstyle.Checker.setupChild(Checker.java:476) at com.puppycrawl.tools.checkstyle.api.AutomaticBean.configure(AutomaticBean.java:201) at com.puppycrawl.tools.checkstyle.Main.runCheckstyle(Main.java:403) at com.puppycrawl.tools.checkstyle.Main.runCli(Main.java:330) at com.puppycrawl.tools.checkstyle.Main.execute(Main.java:189) at com.puppycrawl.tools.checkstyle.Main.main(Main.java:126) Caused by: com.puppycrawl.tools.checkstyle.api.CheckstyleException: Token "LITERAL_CATCH" was not found in Acceptable tokens list in check com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck at com.puppycrawl.tools.checkstyle.TreeWalker.registerCheck(TreeWalker.java:223) at com.puppycrawl.tools.checkstyle.TreeWalker.setupChild(TreeWalker.java:133) at com.puppycrawl.tools.checkstyle.api.AutomaticBean.configure(AutomaticBean.java:201) at com.puppycrawl.tools.checkstyle.Checker.setupChild(Checker.java:471) ... 5 more Checkstyle ends with 1 errors. ``` **Is your feature request related to a problem? Please describe.** It would be nice if checkstyle could detect missing space after `catch` keyword. **Describe the solution you'd like** WhitespaceAfter could support new literal type - `LITERAL_CATCH` **Additional context** Google Java Style Guide requires whitespace separation of `(` from any reserved words See https://google.github.io/styleguide/javaguide.html#s4.6.2-horizontal-whitespace >1. Separating any reserved word, such as `if`, `for` or `catch`, from an open parenthesis (`(`) that follows it on that line #11489, #11493 and #11494 are similar requests for `try`/`finally`/`synchronized` keywords support
I am on it.
2022-04-06T06:56:26Z
10.1
checkstyle/checkstyle
11,601
checkstyle__checkstyle-11601
[ "11588" ]
a96670f797f9db81df85a55abb8cf8bac93e5d15
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java @@ -383,16 +383,12 @@ private boolean checkLoop(final DetailAST ast) { * @param useBreak should we consider break as terminator * @param useContinue should we consider continue as terminator * @return true if try/catch/finally block is terminated - * @noinspection SimplifiableIfStatement */ private boolean checkTry(final DetailAST ast, boolean useBreak, boolean useContinue) { final DetailAST finalStmt = ast.getLastChild(); - boolean isTerminated = false; - if (finalStmt.getType() == TokenTypes.LITERAL_FINALLY) { - isTerminated = isTerminated(finalStmt.findFirstToken(TokenTypes.SLIST), - useBreak, useContinue); - } + boolean isTerminated = finalStmt.getType() == TokenTypes.LITERAL_FINALLY + && isTerminated(finalStmt.findFirstToken(TokenTypes.SLIST), useBreak, useContinue); if (!isTerminated) { DetailAST firstChild = ast.getFirstChild(); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.java @@ -363,9 +363,15 @@ private void visitVariableDefToken(DetailAST varDefAst) { * @param variablesStack stack of all the relevant variables in the scope */ private static void visitIdentToken(DetailAST identAst, Deque<VariableDesc> variablesStack) { - final DetailAST parentAst = identAst.getParent(); - if (!TokenUtil.isOfType(parentAst, UNACCEPTABLE_PARENT_OF_IDENT) - && shouldCheckIdentWithMethodRefParent(identAst)) { + final DetailAST parent = identAst.getParent(); + final boolean isMethodReferenceMethodName = parent.getType() == TokenTypes.METHOD_REF + && parent.getFirstChild() != identAst; + final boolean isConstructorReference = parent.getType() == TokenTypes.METHOD_REF + && parent.getLastChild().getType() == TokenTypes.LITERAL_NEW; + + if (!isMethodReferenceMethodName + && !isConstructorReference + && !TokenUtil.isOfType(parent, UNACCEPTABLE_PARENT_OF_IDENT)) { checkIdentifierAst(identAst, variablesStack); } } @@ -728,32 +734,13 @@ private void customLeaveToken(DetailAST ast, Deque<VariableDesc> variablesStack) logViolations(ast, variablesStack); } - /** - * Whether an ident with parent node of type {@link TokenTypes#METHOD_REF} - * should be checked or not. - * - * @param identAst identAst - * @return true if an ident with parent node of type {@link TokenTypes#METHOD_REF} - * should be checked or if the parent type is not {@link TokenTypes#METHOD_REF} - * @noinspection SimplifiableIfStatement - */ - public static boolean shouldCheckIdentWithMethodRefParent(DetailAST identAst) { - final DetailAST parent = identAst.getParent(); - boolean result = true; - if (parent.getType() == TokenTypes.METHOD_REF) { - result = parent.getFirstChild() == identAst - && parent.getLastChild().getType() != TokenTypes.LITERAL_NEW; - } - return result; - } - /** * Whether to check identifier token nested under dotAst. * * @param dotAst dotAst * @return true if ident nested under dotAst should be checked */ - public static boolean shouldCheckIdentTokenNestedUnderDot(DetailAST dotAst) { + private static boolean shouldCheckIdentTokenNestedUnderDot(DetailAST dotAst) { return TokenUtil.findFirstTokenByPredicate(dotAst, childAst -> {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheckTest.java @@ -36,6 +36,7 @@ import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; import com.puppycrawl.tools.checkstyle.internal.utils.TestUtil; +import com.puppycrawl.tools.checkstyle.utils.CommonUtil; public class UnusedLocalVariableCheckTest extends AbstractModuleTestSupport { @@ -265,6 +266,14 @@ public void testUnusedLocalVarWithoutPackageStatement() throws Exception { expected); } + @Test + public void testUnusedLocalVariableTernaryAndExpressions() throws Exception { + final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; + verifyWithInlineConfigParser( + getPath("InputUnusedLocalVariableTernaryAndExpressions.java"), + expected); + } + @Test public void testClearStateVariables() throws Exception { final UnusedLocalVariableCheck check = new UnusedLocalVariableCheck(); diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableTernaryAndExpressions.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableTernaryAndExpressions.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableTernaryAndExpressions.java @@ -0,0 +1,28 @@ +/* +UnusedLocalVariable + + +*/ +package com.puppycrawl.tools.checkstyle.checks.coding.unusedlocalvariable; + +public class InputUnusedLocalVariableTernaryAndExpressions { + void m1() { + int time = new Integer(2); // ok + assert(time < new Integer(3)); + } + + Object m2() { + Object x = getY(); // ok + String z = null; + return z == null ? x : new Object(); + } + + String getY() { + return "y"; + } + + int m3() { + boolean b = m2().equals(new Object()); // ok + return b ? 1 : new Integer(3); + } +}
Resolve SimplifiableIfStatement inspection violations Taken from https://github.com/checkstyle/checkstyle/issues/11566 see commit: https://github.com/checkstyle/checkstyle/commit/009cffaae0f1bd79f5c0084f5354f45ed391e346 we need to revert suppression of SimplifiableIfStatement or explain why they should be permanent.
On it
2022-05-03T03:26:33Z
10.2
checkstyle/checkstyle
11,383
checkstyle__checkstyle-11383
[ "11213" ]
d9f7a85713f43960153fb57d95e98bdd22d02176
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java @@ -251,8 +251,8 @@ public class SummaryJavadocCheck extends AbstractJavadocCheck { private static final Pattern HTML_ELEMENTS = Pattern.compile("<[^>]*>"); - /** Period literal. */ - private static final String PERIOD = "."; + /** Default period literal. */ + private static final String DEFAULT_PERIOD = "."; /** Summary tag text. */ private static final String SUMMARY_TEXT = "@summary"; @@ -274,7 +274,7 @@ public class SummaryJavadocCheck extends AbstractJavadocCheck { /** * Specify the period symbol at the end of first javadoc sentence. */ - private String period = PERIOD; + private String period = DEFAULT_PERIOD; /** * Setter to specify the regexp for forbidden summary fragments. @@ -309,11 +309,14 @@ public int[] getRequiredJavadocTokens() { @Override public void visitJavadocToken(DetailNode ast) { final Optional<DetailNode> inlineTag = getInlineTagNode(ast); - if (inlineTag.isPresent() && isSummaryTag(inlineTag.get())) { - validateSummaryTag(inlineTag.get()); + final DetailNode inlineTagNode = inlineTag.orElse(null); + if (inlineTag.isPresent() + && isSummaryTag(inlineTagNode) + && isDefinedFirst(inlineTagNode)) { + validateSummaryTag(inlineTagNode); } - else if (inlineTag.isPresent() && isInlineReturnTag(inlineTag.get())) { - validateInlineReturnTag(inlineTag.get()); + else if (inlineTag.isPresent() && isInlineReturnTag(inlineTagNode)) { + validateInlineReturnTag(inlineTagNode); } else if (!startsWithInheritDoc(ast)) { validateUntaggedSummary(ast); @@ -356,6 +359,61 @@ private static Optional<DetailNode> getInlineTagNode(DetailNode javadoc) { .map(SummaryJavadocCheck::getInlineTagNodeWithinHtmlElement); } + /** + * Whether the {@code {@summary}} tag is defined first in the javadoc. + * + * @param inlineSummaryTag node of type {@link JavadocTokenTypes#JAVADOC_INLINE_TAG} + * @return {@code true} if the {@code {@summary}} tag is defined first in the javadoc + */ + private static boolean isDefinedFirst(DetailNode inlineSummaryTag) { + boolean isDefinedFirst = true; + DetailNode previousSibling = JavadocUtil.getPreviousSibling(inlineSummaryTag); + while (previousSibling != null && isDefinedFirst) { + switch (previousSibling.getType()) { + case JavadocTokenTypes.TEXT: + isDefinedFirst = previousSibling.getText().isBlank(); + break; + case JavadocTokenTypes.HTML_ELEMENT: + isDefinedFirst = !isTextPresentInsideHtmlTag(previousSibling); + break; + default: + break; + } + previousSibling = JavadocUtil.getPreviousSibling(previousSibling); + } + return isDefinedFirst; + } + + /** + * Whether some text is present inside the HTML element or tag. + * + * @param node DetailNode of type {@link JavadocTokenTypes#HTML_TAG} + * or {@link JavadocTokenTypes#HTML_ELEMENT} + * @return {@code true} if some text is present inside the HTML element or tag + */ + public static boolean isTextPresentInsideHtmlTag(DetailNode node) { + DetailNode nestedChild = JavadocUtil.getFirstChild(node); + if (node.getType() == JavadocTokenTypes.HTML_ELEMENT) { + nestedChild = JavadocUtil.getFirstChild(nestedChild); + } + boolean isTextPresentInsideHtmlTag = false; + while (nestedChild != null && !isTextPresentInsideHtmlTag) { + switch (nestedChild.getType()) { + case JavadocTokenTypes.TEXT: + isTextPresentInsideHtmlTag = !nestedChild.getText().isBlank(); + break; + case JavadocTokenTypes.HTML_TAG: + case JavadocTokenTypes.HTML_ELEMENT: + isTextPresentInsideHtmlTag = isTextPresentInsideHtmlTag(nestedChild); + break; + default: + break; + } + nestedChild = JavadocUtil.getNextSibling(nestedChild); + } + return isTextPresentInsideHtmlTag; + } + /** * Checks if the inline tag node is present. * @@ -658,7 +716,7 @@ private static String getStringInsideTag(String result, DetailNode detailNode) { */ private static String getFirstSentence(DetailNode ast) { final StringBuilder result = new StringBuilder(256); - final String periodSuffix = PERIOD + ' '; + final String periodSuffix = DEFAULT_PERIOD + ' '; for (DetailNode child : ast.getChildren()) { final String text; if (child.getChildren().length == 0) {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheckTest.java @@ -57,7 +57,9 @@ public void testCorrect() throws Exception { @Test public void testInlineCorrect() throws Exception { - final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; + final String[] expected = { + "112: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE), + }; verifyWithInlineConfigParser( getPath("InputSummaryJavadocInlineCorrect.java"), expected); @@ -81,7 +83,6 @@ public void testIncorrect() throws Exception { "142: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE), "147: " + getCheckMessage(MSG_SUMMARY_JAVADOC_MISSING), "150: " + getCheckMessage(MSG_SUMMARY_JAVADOC_MISSING), - "155: " + getCheckMessage(MSG_SUMMARY_MISSING_PERIOD), }; verifyWithInlineConfigParser( getPath("InputSummaryJavadocIncorrect.java"), expected); @@ -100,7 +101,7 @@ public void testInlineForbidden() throws Exception { "80: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE), "94: " + getCheckMessage(MSG_SUMMARY_MISSING_PERIOD), "108: " + getCheckMessage(MSG_SUMMARY_JAVADOC_MISSING), - "115: " + getCheckMessage(MSG_SUMMARY_MISSING_PERIOD), + "114: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE), }; verifyWithInlineConfigParser( getPath("InputSummaryJavadocInlineForbidden.java"), expected); @@ -148,6 +149,23 @@ public void testDefaultConfiguration() throws Exception { getPath("InputSummaryJavadocIncorrect2.java"), expected); } + @Test + public void testIncorrectUsageOfSummaryTag() throws Exception { + final String[] expected = { + "34: " + getCheckMessage(MSG_SUMMARY_MISSING_PERIOD), + "41: " + getCheckMessage(MSG_SUMMARY_JAVADOC_MISSING), + "49: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE), + "57: " + getCheckMessage(MSG_SUMMARY_MISSING_PERIOD), + "64: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE), + "74: " + getCheckMessage(MSG_SUMMARY_MISSING_PERIOD), + // Until https://github.com/checkstyle/checkstyle/issues/11425 + "82: " + getCheckMessage(MSG_SUMMARY_JAVADOC_MISSING), + }; + + verifyWithInlineConfigParser( + getPath("InputSummaryJavadocIncorrect3.java"), expected); + } + @Test public void testInlineDefaultConfiguration() throws Exception { final String[] expected = { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadocIncorrect.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadocIncorrect.java --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadocIncorrect.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadocIncorrect.java @@ -154,8 +154,6 @@ void foo7() {} * This is the summary. * {@summary This is NOT summary according to javadoc tool} */ - // violation 2 lines above 'Summary .* missing an ending period.' - // until https://github.com/checkstyle/checkstyle/issues/11213 void testMethod() { } } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadocIncorrect3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadocIncorrect3.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadocIncorrect3.java @@ -0,0 +1,90 @@ +/* +SummaryJavadoc +violateExecutionOnNonTightHtml = (default)false +forbiddenSummaryFragments = (default)^$ +period = (default). + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.javadoc.summaryjavadoc; + +/** + * This is the real summary. + * {@summary This is not the summary} + */ +public class InputSummaryJavadocIncorrect3 { + + /** + * {@summary This is the real summary.} + * {@summary This is not the summary} + */ + public void testAnotherSummaryTag() { + } + + /** + * <p>This is summary.</p> + * {@summary This is not the summary} + */ + public void testHtmlTags() { + } + + /** + * <p><i></i></p> + * {@summary This is summary} + */ + // violation 2 lines above 'Summary of Javadoc is missing an ending period' + public void testHtmlTags2() { + } + + // violation below 'Summary javadoc is missing.' + /** + * @param a parameter + * {@summary Wrong usage} + */ + public void method(int a) { + } + + // violation below 'First sentence of Javadoc is missing an ending period' + /** + * <p> This is the summary {@summary This is not summary.} + */ + public void testParagraphTag() { + } + + /** + * <pre></pre> + * {@summary This is summary} + */ + // violation 2 lines above 'Summary of Javadoc is missing an ending period' + public void testPreTag() { + } + + // violation below 'First sentence of Javadoc is missing an ending period' + /** + * <i>This will be in italics and is the summary</i> + * {@summary This is not summary} + */ + public void testOtherTags() { + } + + /** + * <br> + * <br> + * {@summary Line breaks will be there but this will be the summary} + */ + // violation 2 lines above 'Summary of Javadoc is missing an ending period.' + public void testBreakTag() { + } + + // Until https://github.com/checkstyle/checkstyle/issues/11425 + // violation below 'Summary javadoc is missing' + /** + * <ul> + * <li><i>This is the summary</i></li> + * </ul> + * {@summary This is not the summary.} + */ + public void testMultipleElements() { + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadocInlineCorrect.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadocInlineCorrect.java --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadocInlineCorrect.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadocInlineCorrect.java @@ -108,6 +108,7 @@ public int validInlineJavadocReturn(int a) // ok */ private void voidValidJavadoc() {} // ok + // violation below 'First sentence of Javadoc is missing an ending period' /** * Sentence starts as a plain text sentence * {@summary ... but ends in the summary tag.} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadocInlineForbidden.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadocInlineForbidden.java --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadocInlineForbidden.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadocInlineForbidden.java @@ -110,12 +110,11 @@ public void validInlineJavadoc() void foo12() { } + // violation below 'First sentence of Javadoc is missing an ending period' /** * Sentence starts as a plain text sentence * {@summary ... but ends in the summary tag} */ - // violation 2 lines above 'Summary .* missing an ending period.' - // until https://github.com/checkstyle/checkstyle/issues/11213 public class TestClass {} /**
False positive: SummaryJavadocCheck From [comment1](https://github.com/checkstyle/checkstyle/pull/11051/files#r775167621) and [comment2](https://github.com/checkstyle/checkstyle/pull/11051/files#r775200466) I have read check documentation: https://checkstyle.sourceforge.io/config_javadoc.html#SummaryJavadoc I have downloaded the latest checkstyle from: https://checkstyle.org/cmdline.html#Download_and_Run I have executed the cli and showed it below, as cli describes the problem better than 1,000 words ```bash /var/tmp $ javac Test2.java /var/tmp $ cat config.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <module name="TreeWalker"> <module name="SummaryJavadocCheck"/> </module> </module> /var/tmp $ cat Test2.java // unexpected violation below /** * This is the actual summary. * {@summary This is wrong usage} */ public class Test2 { } // expected violation below /** * This is summary */ class foo { } /var/tmp $ RUN_LOCALE="-Duser.language=en -Duser.country=US" /var/tmp $ java $RUN_LOCALE -jar checkstyle-9.2.1-all.jar -c config.xml Test2.java Starting audit... [ERROR] /home/vyom/IdeaProjects/ConfigCheckstyle/src/TestP/Test2.java:2: Summary of Javadoc is missing an ending period. [SummaryJavadoc] [ERROR] /home/vyom/IdeaProjects/ConfigCheckstyle/src/TestP/Test2.java:10: First sentence of Javadoc is missing an ending period. [SummaryJavadoc] Audit done. Checkstyle ends with 2 errors. ``` --- **Describe what you expect in detail.** ``` Starting audit... [ERROR] /home/vyom/IdeaProjects/ConfigCheckstyle/src/TestP/Test2.java:10: First sentence of Javadoc is missing an ending period. [SummaryJavadoc] Audit done. ``` If the first line is present then `@summary` is ignored, though a warning is given by the Javadoc tool. ``` Test.java:4: warning: invalid use of @summary * {@summary This is wrong usage} ``` see all details at https://github.com/checkstyle/checkstyle/pull/11051#discussion_r775167621 Expected: only violation on second javadoc
on it.
2022-03-09T18:42:49Z
10
checkstyle/checkstyle
11,264
checkstyle__checkstyle-11264
[ "11259" ]
628a7643aeaa6736bec4c7c38910e5c0ab26aa4f
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheck.java @@ -56,6 +56,10 @@ * <li> * Nested {@code enum} definitions that are declared as {@code static}. * </li> + * <li> + * {@code record} definitions that are declared as {@code final} and nested + * {@code record} definitions that are declared as {@code static}. + * </li> * </ol> * <p> * interfaces by definition are abstract so the {@code abstract} modifier is redundant on them. @@ -73,6 +77,12 @@ * automatically public, static and final just as their * annotation fields are automatically public and abstract.</p> * + * <p>A record class is implicitly final and cannot be abstract, these restrictions emphasize + * that the API of a record class is defined solely by its state description, and + * cannot be enhanced later by another class. Nested records are implicitly static. This avoids an + * immediately enclosing instance which would silently add state to the record class. + * See <a href="https://openjdk.java.net/jeps/395">JEP 395</a> for more info.</p> + * * <p>Enums by definition are static implicit subclasses of java.lang.Enum&#60;E&#62;. * So, the {@code static} modifier on the enums is redundant. In addition, * if enum is inside of interface, {@code public} modifier is also redundant.</p> @@ -155,7 +165,9 @@ * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RESOURCE"> * RESOURCE</a>, * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF"> - * ANNOTATION_DEF</a>. + * ANNOTATION_DEF</a>, + * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF"> + * RECORD_DEF</a>. * </li> * </ul> * <p> @@ -226,6 +238,7 @@ public int[] getAcceptableTokens() { TokenTypes.ENUM_DEF, TokenTypes.RESOURCE, TokenTypes.ANNOTATION_DEF, + TokenTypes.RECORD_DEF, }; } @@ -248,6 +261,9 @@ public void visitToken(DetailAST ast) { case TokenTypes.RESOURCE: processResources(ast); break; + case TokenTypes.RECORD_DEF: + checkForRedundantModifier(ast, TokenTypes.FINAL, TokenTypes.LITERAL_STATIC); + break; case TokenTypes.CLASS_DEF: case TokenTypes.VARIABLE_DEF: case TokenTypes.ANNOTATION_FIELD_DEF: @@ -412,14 +428,17 @@ private void processResources(DetailAST ast) { * Checks if given ast has a redundant modifier. * * @param ast ast - * @param modifierType The modifier to check for. + * @param modifierTypes The modifiers to check for. */ - private void checkForRedundantModifier(DetailAST ast, int modifierType) { + private void checkForRedundantModifier(DetailAST ast, int... modifierTypes) { Optional.ofNullable(ast.findFirstToken(TokenTypes.MODIFIERS)) .ifPresent(modifiers -> { - TokenUtil.forEachChild(modifiers, modifierType, modifier -> { - log(modifier, MSG_KEY, modifier.getText()); - }); + for (DetailAST childAst = modifiers.getFirstChild(); + childAst != null; childAst = childAst.getNextSibling()) { + if (TokenUtil.isOfType(childAst, modifierTypes)) { + log(childAst, MSG_KEY, childAst.getText()); + } + } }); }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckTest.java @@ -153,6 +153,7 @@ public void testGetAcceptableTokens() { TokenTypes.ENUM_DEF, TokenTypes.RESOURCE, TokenTypes.ANNOTATION_DEF, + TokenTypes.RECORD_DEF, }; assertWithMessage("Invalid acceptable tokens") .that(actual) @@ -312,4 +313,24 @@ public void testNestedDef() throws Exception { verifyWithInlineConfigParser(getPath( "InputRedundantModifierNestedDef.java"), expected); } + + @Test + public void testRecords() throws Exception { + final String[] expected = { + "12:5: " + getCheckMessage(MSG_KEY, "static"), + "16:9: " + getCheckMessage(MSG_KEY, "final"), + "16:15: " + getCheckMessage(MSG_KEY, "static"), + "21:9: " + getCheckMessage(MSG_KEY, "static"), + "27:9: " + getCheckMessage(MSG_KEY, "final"), + "27:15: " + getCheckMessage(MSG_KEY, "static"), + "32:13: " + getCheckMessage(MSG_KEY, "static"), + "38:1: " + getCheckMessage(MSG_KEY, "final"), + "40:5: " + getCheckMessage(MSG_KEY, "final"), + "43:5: " + getCheckMessage(MSG_KEY, "static"), + "47:9: " + getCheckMessage(MSG_KEY, "final"), + "47:15: " + getCheckMessage(MSG_KEY, "static"), + }; + verifyWithInlineConfigParser( + getNonCompilablePath("InputRedundantModifierRecords.java"), expected); + } } diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierRecords.java new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierRecords.java @@ -0,0 +1,56 @@ +/* +RedundantModifier + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.modifier.redundantmodifier; + +//non-compiled with javac: Compilable with Java16 +public class InputRedundantModifierRecords { + + static record testRecord(int a) { // violation 'Redundant 'static' modifier' + } + + interface foo { + final static record testRecords(int a) { // 2 violations + } + } + + class b { + static record testRecord(int a) { // violation 'Redundant 'static' modifier' + } + } + + enum testEnum { + ONE; + final static record testRecord() { // 2 violations + + } + + class b { + static record testRecord() { // violation 'Redundant 'static' modifier' + } + } + } +} + +final record testRecord(int a) { // violation 'Redundant 'final' modifier' + + final record anotherRecord(int b) { // violation 'Redundant 'final' modifier' + } + + static record anotherTestRecord(int c) { // violation 'Redundant 'static' modifier' + } + + @interface hoo { + final static record someRecord() { // 2 violations + } + } +} + +record anotherRecord(int b) { // ok + + record nestedRecord(int a, int p) { // ok + } +}
RedundantModifier should include RECORD_DEF in acceptable tokens Issue property reported by @Vyom-Yadav I have read check documentation: http://checkstyle.sourceforge.net/config_modifier.html#RedundantModifier I have downloaded the latest checkstyle from: https://checkstyle.org/cmdline.html#Download_and_Run I have executed the cli and showed it below, as cli describes the problem better than 1,000 words ```bash /var/tmp $ javac Test.java /var/tmp $ cat config.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <module name="TreeWalker"> <module name="RedundantModifier"/> </module> </module> /var/tmp $ cat Test.java final record foo() { static final record hoo() { } } /var/tmp $ RUN_LOCALE="-Duser.language=en -Duser.country=US" /var/tmp $ java $RUN_LOCALE -jar checkstyle-10.0-all.jar -c config.xml YOUR_FILE.java Starting audit... Audit done. ``` --- **Describe what you expect in detail.** ``` /var/tmp $ RUN_LOCALE="-Duser.language=en -Duser.country=US" /var/tmp $ java $RUN_LOCALE -jar checkstyle-10.0-all.jar -c config.xml YOUR_FILE.java Starting audit... [ERROR] /var/tmp/Test.java:1:1: Redundant 'final' modifier. [RedundantModifier] [ERROR] /var/tmp/Test.java:3:5: Redundant 'static' modifier. [RedundantModifier] [ERROR] /var/tmp/Test.java:3:12: Redundant 'final' modifier. [RedundantModifier] Audit done. Checkstyle ends with 3 errors. ``` Related info https://docs.oracle.com/en/java/javase/17/language/records.html
It would be a good idea to wait for resolution of https://github.com/checkstyle/checkstyle/issues/10798 before working on this issue. Edit: on second thought, this should not matter, since we are only adding type definition token and checking for static modifier. @nmancus1 Though both the issues are related to the same check, I feel that we can go ahead with this issue as this one isn't dependent on the java version (afaik) unlike the other issue. > It would be a good idea to wait for resolution of #10798 before working on this issue. I do not think it is necessary, this issue can be fixed separately. Records are also implicitly final, will be fixed in the same PR.
2022-01-31T18:49:23Z
10
checkstyle/checkstyle
11,245
checkstyle__checkstyle-11245
[ "11241" ]
4b568976ada9210363162e64e232a0c67edbdc74
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java @@ -935,8 +935,7 @@ private static boolean isPrecededByJavadoc(DetailAST token) { * @return true variable definition is a type field. */ private static boolean isTypeField(DetailAST variableDef) { - return TokenUtil.isOfType(variableDef.getParent().getParent(), - TokenTypes.CLASS_DEF, TokenTypes.RECORD_DEF); + return TokenUtil.isTypeDeclaration(variableDef.getParent().getParent().getType()); } }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java @@ -248,6 +248,35 @@ public void testSingleCommentSeparatedFromPackage() throws Exception { expected); } + @Test + public void testEnumMembers() throws Exception { + final String[] expected = { + "22:5: " + getCheckMessage(MSG_MULTIPLE_LINES, "VARIABLE_DEF"), + "27:5: " + getCheckMessage(MSG_MULTIPLE_LINES, "VARIABLE_DEF"), + "28:5: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "VARIABLE_DEF"), + "31:5: " + getCheckMessage(MSG_MULTIPLE_LINES, "CTOR_DEF"), + "36:5: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "STATIC_INIT"), + "40:5: " + getCheckMessage(MSG_MULTIPLE_LINES, "STATIC_INIT"), + }; + verifyWithInlineConfigParser( + getPath("InputEmptyLineSeparatorEnumMembers.java"), expected + ); + } + + @Test + public void testInterfaceFields() throws Exception { + final String[] expected = { + "21:5: " + getCheckMessage(MSG_MULTIPLE_LINES, "VARIABLE_DEF"), + "25:5: " + getCheckMessage(MSG_MULTIPLE_LINES, "VARIABLE_DEF"), + "34:5: " + getCheckMessage(MSG_MULTIPLE_LINES, "VARIABLE_DEF"), + "38:5: " + getCheckMessage(MSG_MULTIPLE_LINES, "VARIABLE_DEF"), + "45:5: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "VARIABLE_DEF"), + }; + verifyWithInlineConfigParser( + getPath("InputEmptyLineSeparatorInterfaceFields.java"), expected + ); + } + @Test public void testGetAcceptableTokens() { final EmptyLineSeparatorCheck emptyLineSeparatorCheckObj = new EmptyLineSeparatorCheck(); diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorEnumMembers.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorEnumMembers.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorEnumMembers.java @@ -0,0 +1,47 @@ +/* +EmptyLineSeparator +allowNoEmptyLineBetweenFields = (default)false +allowMultipleEmptyLines = false +allowMultipleEmptyLinesInsideClassMembers = false +tokens = (default)PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF, \ + STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF, \ + COMPACT_CTOR_DEF + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.whitespace.emptylineseparator; + +public class InputEmptyLineSeparatorEnumMembers {} + +enum A { + ONE("one"), + TWO("two"); + + + private final String str; // violation ''VARIABLE_DEF' has more than 1 empty lines before.' + + private String otherString; // ok + + + private String thirdString; // violation ''VARIABLE_DEF' has more than 1 empty lines before.' + private String fourth; // violation ''VARIABLE_DEF' should be separated from previous line.' + + + A(String s) { // violation ''CTOR_DEF' has more than 1 empty lines before.' + this.str = s; + } + + private String fifth; + static { // violation ''STATIC_INIT' should be separated from previous line.' + } + + + static { // violation ''STATIC_INIT' has more than 1 empty lines before.' + + } + + public String getStr() { + return str; + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorInterfaceFields.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorInterfaceFields.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorInterfaceFields.java @@ -0,0 +1,46 @@ +/* +EmptyLineSeparator +allowNoEmptyLineBetweenFields = (default)false +allowMultipleEmptyLines = false +allowMultipleEmptyLinesInsideClassMembers = false +tokens = (default)PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF, \ + STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF, \ + COMPACT_CTOR_DEF + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.whitespace.emptylineseparator; + +public interface InputEmptyLineSeparatorInterfaceFields { + int a = 45; // ok + + int b = 45; // ok + + + int c = 45; // violation ''VARIABLE_DEF' has more than 1 empty lines before.' + + + + int d = 45; // violation ''VARIABLE_DEF' has more than 1 empty lines before.' +} + +@interface Ann { + int a = 45; // ok + + int b = 45; // ok + + + int c = 45; // violation ''VARIABLE_DEF' has more than 1 empty lines before.' + + + + int d = 45; // violation ''VARIABLE_DEF' has more than 1 empty lines before.' +} + +interface Abc { + Object apply(Object array, int index); + + Abc A = (o, i) -> new Object(); + Abc B = (o, i) -> o; // violation ''VARIABLE_DEF' should be separated from previous line.' +}
`EmptyLineSeparator`: false negative in Enum and interface fields I have read check documentation: https://checkstyle.org/config_whitespace.html#EmptyLineSeparator I have downloaded the latest checkstyle from: https://checkstyle.org/cmdline.html#Download_and_Run I have executed the cli and showed it below, as cli describes the problem better than 1,000 words ```bash /var/tmp $ javac SomeEnum.java /var/tmp $ cat config.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <module name="TreeWalker"> <module name="EmptyLineSeparator"> <property name="allowMultipleEmptyLines" value="false"/> <property name="allowMultipleEmptyLinesInsideClassMembers" value="false"/> </module> </module> </module> /var/tmp $ cat SomeEnum.java package some.pckg; public enum SomeEnum { ONE("one"), TWO("two"); private final String someString; SomeEnum(String someString) { this.someString = someString; } public String getSomeString() { return someString; } } /var/tmp $ RUN_LOCALE="-Duser.language=en -Duser.country=US" /var/tmp $ java $RUN_LOCALE -jar checkstyle-9.2.1-all.jar -c config.xml SomeEnum.java Checkstyle ends without errors. ``` --- Checkstyle ends without errors, but I expect violation to be found since there are more than 1 empty lines between enum constant `TWO` and field `someString`.
I could reproduce the issue, will fix it soon.
2022-01-27T20:05:41Z
9.3
checkstyle/checkstyle
11,482
checkstyle__checkstyle-11482
[ "9004" ]
c46bd286bd3d3e3ca133fe3df714aa3b97d35252
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTable.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTable.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTable.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTable.java @@ -30,6 +30,7 @@ import java.util.Deque; import java.util.EventObject; import java.util.List; +import java.util.stream.Collectors; import javax.swing.AbstractAction; import javax.swing.Action; @@ -42,7 +43,11 @@ import javax.swing.tree.TreePath; import com.puppycrawl.tools.checkstyle.api.DetailAST; +import com.puppycrawl.tools.checkstyle.utils.XpathUtil; +import com.puppycrawl.tools.checkstyle.xpath.AbstractNode; +import com.puppycrawl.tools.checkstyle.xpath.RootNode; import com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator; +import net.sf.saxon.trans.XPathException; /** * This example shows how to create a simple TreeTable component, @@ -59,6 +64,8 @@ public final class TreeTable extends JTable { /** A unique serial version identifier. */ private static final long serialVersionUID = -8493693409423365387L; + /** The newline character. */ + private static final String NEWLINE = "\n"; /** A subclass of JTree. */ private final TreeTableCellRenderer tree; /** JTextArea editor. */ @@ -158,10 +165,7 @@ private void makeCodeSelection() { private void generateXpath() { if (tree.getLastSelectedPathComponent() instanceof DetailAST) { final DetailAST ast = (DetailAST) tree.getLastSelectedPathComponent(); - final int beginPos = 4; - String xpath = XpathQueryGenerator.generateXpathQuery(ast); - final int length = xpath.length(); - xpath = xpath.substring(beginPos, length); + final String xpath = XpathQueryGenerator.generateXpathQuery(ast); xpathEditor.setText(xpath); } else { @@ -193,55 +197,25 @@ private void setColumnsInitialWidth() { getColumn("Type").setPreferredWidth(preferredTypeColumnWidth); } - /** - * Search node by Xpath. - * - * @param root {@code DetailAST} root ast element - * @param xpath {@code String} xpath query - * @param nodes {@code Deque<DetailAST>} stack of nodes in selection path - * @return {@code boolean} node found or not - */ - private static boolean search(DetailAST root, String xpath, Deque<DetailAST> nodes) { - boolean result = false; - if (xpath.equals(XpathQueryGenerator.generateXpathQuery(root))) { - nodes.push(root); - result = true; - } - else { - DetailAST child = root.getFirstChild(); - while (child != null) { - if (search(child, xpath, nodes)) { - nodes.push(root); - result = true; - break; - } - child = child.getNextSibling(); - } - } - return result; - } - /** * Select Node by Xpath. */ public void selectNodeByXpath() { final DetailAST rootAST = (DetailAST) tree.getModel().getRoot(); if (rootAST.hasChildren()) { - final String xpath = "/EOF" + xpathEditor.getText(); - final Deque<DetailAST> nodes = new ArrayDeque<>(); - if (search(rootAST, xpath, nodes)) { - TreePath path = new TreePath(nodes.pop()); - while (!nodes.isEmpty()) { - path = path.pathByAddingChild(nodes.pop()); - if (!tree.isExpanded(path)) { - tree.expandPath(path); - } - tree.setSelectionPath(path); - makeCodeSelection(); - } + final String xpath = xpathEditor.getText(); + + try { + final Deque<DetailAST> nodes = + XpathUtil.getXpathItems(xpath, new RootNode(rootAST)) + .stream() + .map(AbstractNode.class::cast) + .map(AbstractNode::getUnderlyingNode) + .collect(Collectors.toCollection(ArrayDeque::new)); + updateTreeTable(xpath, nodes); } - else { - xpathEditor.setText(xpathEditor.getText() + "\n^ wrong xpath query"); + catch (XPathException exception) { + xpathEditor.setText(xpathEditor.getText() + NEWLINE + exception.getMessage()); } } else { @@ -249,6 +223,55 @@ public void selectNodeByXpath() { } } + /** + * Updates the Treetable by expanding paths in the tree and highlighting + * associated code. + * + * @param xpath the XPath query to show in case of no match + * @param nodes the deque of DetailAST nodes to match in TreeTable and XPath editor + */ + private void updateTreeTable(String xpath, Deque<DetailAST> nodes) { + if (nodes.isEmpty()) { + xpathEditor.setText("No elements matching XPath query '" + + xpath + "' found."); + } + else { + for (DetailAST node : nodes) { + expandTreeTableByPath(node); + makeCodeSelection(); + } + xpathEditor.setText(getAllMatchingXpathQueriesText(nodes)); + } + } + + /** + * Expands path in tree table to given node so that user can + * see the node. + * + * @param node node to expand table by + */ + private void expandTreeTableByPath(DetailAST node) { + TreePath path = new TreePath(node); + path = path.pathByAddingChild(node); + if (!tree.isExpanded(path)) { + tree.expandPath(path); + } + tree.setSelectionPath(path); + } + + /** + * Generates a String with all matching XPath queries separated + * by newlines. + * + * @param nodes deque of nodes to generate queries for + * @return complete text of all XPath expressions separated by newlines. + */ + private static String getAllMatchingXpathQueriesText(Deque<DetailAST> nodes) { + return nodes.stream() + .map(XpathQueryGenerator::generateXpathQuery) + .collect(Collectors.joining(NEWLINE, "", NEWLINE)); + } + /** * Overridden to message super and forward the method to the tree. * Since the tree is not actually in the component hierarchy it will diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/XpathUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/XpathUtil.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/XpathUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/XpathUtil.java @@ -39,6 +39,7 @@ import com.puppycrawl.tools.checkstyle.xpath.RootNode; import net.sf.saxon.Configuration; import net.sf.saxon.om.Item; +import net.sf.saxon.om.NodeInfo; import net.sf.saxon.sxpath.XPathDynamicContext; import net.sf.saxon.sxpath.XPathEvaluator; import net.sf.saxon.sxpath.XPathExpression; @@ -184,14 +185,10 @@ public static String getTextAttributeValue(DetailAST ast) { */ public static String printXpathBranch(String xpath, File file) throws CheckstyleException, IOException { - final XPathEvaluator xpathEvaluator = new XPathEvaluator(Configuration.newConfiguration()); try { final RootNode rootNode = new RootNode(JavaParser.parseFile(file, JavaParser.Options.WITH_COMMENTS)); - final XPathExpression xpathExpression = xpathEvaluator.createExpression(xpath); - final XPathDynamicContext xpathDynamicContext = - xpathExpression.createDynamicContext(rootNode); - final List<Item> matchingItems = xpathExpression.evaluate(xpathDynamicContext); + final List<NodeInfo> matchingItems = getXpathItems(xpath, rootNode); return matchingItems.stream() .map(item -> ((AbstractNode) item).getUnderlyingNode()) .map(AstTreeStringPrinter::printBranch) @@ -204,4 +201,23 @@ public static String printXpathBranch(String xpath, File file) throws Checkstyle } } + /** + * Returns list of nodes matching xpath expression given node context. + * + * @param xpath Xpath expression + * @param rootNode {@code NodeInfo} node context + * @return list of nodes matching xpath expression given node context + * @throws XPathException if Xpath cannot be parsed + */ + public static List<NodeInfo> getXpathItems(String xpath, AbstractNode rootNode) + throws XPathException { + final XPathEvaluator xpathEvaluator = new XPathEvaluator(Configuration.newConfiguration()); + final XPathExpression xpathExpression = xpathEvaluator.createExpression(xpath); + final XPathDynamicContext xpathDynamicContext = xpathExpression + .createDynamicContext(rootNode); + final List<Item> items = xpathExpression.evaluate(xpathDynamicContext); + return items.stream() + .map(NodeInfo.class::cast) + .collect(Collectors.toUnmodifiableList()); + } }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainFrameTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainFrameTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainFrameTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainFrameTest.java @@ -183,7 +183,7 @@ public void testFindNodeButton() throws IOException { findNodeButton.doClick(); assertWithMessage("Unexpected XPath text area text") .that(xpathTextArea.getText()) - .isEqualTo("Xpath\n^ wrong xpath query"); + .isEqualTo("No elements matching XPath query 'Xpath' found."); } } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/gui/TreeTableTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/gui/TreeTableTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/gui/TreeTableTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/gui/TreeTableTest.java @@ -26,7 +26,9 @@ import java.awt.event.ActionListener; import java.awt.event.MouseEvent; import java.io.File; +import java.io.IOException; +import javax.swing.JButton; import javax.swing.JTextArea; import javax.swing.KeyStroke; import javax.swing.tree.TreePath; @@ -108,4 +110,105 @@ public void testExpandOnEnterKey() { .isTrue(); } + @Test + public void testFindNodesAllClassDefs() throws IOException { + final MainFrame mainFrame = new MainFrame(); + mainFrame.openFile(new File(getPath("InputTreeTableXpathAreaPanel.java"))); + final JButton findNodeButton = findComponentByName(mainFrame, "findNodeButton"); + final JTextArea xpathTextArea = findComponentByName(mainFrame, "xpathTextArea"); + xpathTextArea.setText("//CLASS_DEF"); + findNodeButton.doClick(); + + final String expected = "/COMPILATION_UNIT/CLASS_DEF[./IDENT" + + "[@text='InputTreeTableXpathAreaPanel']]\n" + + "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputTreeTableXpathAreaPanel']]" + + "/OBJBLOCK/CLASS_DEF" + + "[./IDENT[@text='Inner']]\n"; + + assertWithMessage("Expected and actual XPath queries should match.") + .that(xpathTextArea.getText()) + .isEqualTo(expected); + } + + @Test + public void testFindNodesIdent() throws IOException { + final MainFrame mainFrame = new MainFrame(); + mainFrame.openFile(new File(getPath("InputTreeTableXpathAreaPanel.java"))); + final JButton findNodeButton = findComponentByName(mainFrame, "findNodeButton"); + final JTextArea xpathTextArea = findComponentByName(mainFrame, "xpathTextArea"); + xpathTextArea.setText("//IDENT"); + findNodeButton.doClick(); + + final String expected = "/COMPILATION_UNIT/CLASS_DEF/IDENT" + + "[@text='InputTreeTableXpathAreaPanel']\n" + + "/COMPILATION_UNIT/PACKAGE_DEF/DOT/IDENT[@text='treetable']\n" + + "/COMPILATION_UNIT/PACKAGE_DEF/DOT[./IDENT[@text='treetable']]/DOT/IDENT" + + "[@text='gui']\n" + + "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputTreeTableXpathAreaPanel']]" + + "/OBJBLOCK/CLASS_DEF/IDENT[@text='Inner']\n" + + "/COMPILATION_UNIT/PACKAGE_DEF/DOT[./IDENT[@text='treetable']]/DOT[./IDENT" + + "[@text='gui']]/DOT/IDENT[@text='checkstyle']\n" + + "/COMPILATION_UNIT/PACKAGE_DEF/DOT[./IDENT[@text='treetable']]/DOT[./IDENT" + + "[@text='gui']]/DOT[./IDENT[@text='checkstyle']]/DOT/IDENT[@text='tools']\n" + + "/COMPILATION_UNIT/PACKAGE_DEF/DOT[./IDENT[@text='treetable']]/DOT[./IDENT" + + "[@text='gui']]" + + "/DOT[./IDENT[@text='checkstyle']]/DOT[./IDENT[@text='tools']]/DOT/IDENT" + + "[@text='com']\n" + + "/COMPILATION_UNIT/PACKAGE_DEF/DOT[./IDENT[@text='treetable']]/DOT[./IDENT" + + "[@text='gui']]" + + "/DOT[./IDENT[@text='checkstyle']]/DOT[./IDENT[@text='tools']]/DOT[./IDENT" + + "[@text='com']]/IDENT[@text='puppycrawl']\n"; + + assertWithMessage("Expected and actual XPath queries should match.") + .that(xpathTextArea.getText()) + .isEqualTo(expected); + } + + @Test + public void testFindNodesMissingElements() throws IOException { + final MainFrame mainFrame = new MainFrame(); + mainFrame.openFile(new File(getPath("InputTreeTableXpathAreaPanel.java"))); + final JButton findNodeButton = findComponentByName(mainFrame, "findNodeButton"); + final JTextArea xpathTextArea = findComponentByName(mainFrame, "xpathTextArea"); + xpathTextArea.setText("//LITERAL_TRY"); + findNodeButton.doClick(); + + final String expected = "No elements matching XPath query '//LITERAL_TRY' found."; + + assertWithMessage("Unexpected XPath text area text") + .that(xpathTextArea.getText()) + .isEqualTo(expected); + } + + @Test + public void testFindNodesUnexpectedTokenAtStart() throws IOException { + final MainFrame mainFrame = new MainFrame(); + mainFrame.openFile(new File(getPath("InputTreeTableXpathAreaPanel.java"))); + final JButton findNodeButton = findComponentByName(mainFrame, "findNodeButton"); + final JTextArea xpathTextArea = findComponentByName(mainFrame, "xpathTextArea"); + xpathTextArea.setText("!*7^"); + findNodeButton.doClick(); + + final String expected = "!*7^\nUnexpected token \"!\" at start of expression"; + + assertWithMessage("Unexpected XPath text area text") + .that(xpathTextArea.getText()) + .isEqualTo(expected); + } + + @Test + public void testFindNodesInvalidCharacterInExpression() throws IOException { + final MainFrame mainFrame = new MainFrame(); + mainFrame.openFile(new File(getPath("InputTreeTableXpathAreaPanel.java"))); + final JButton findNodeButton = findComponentByName(mainFrame, "findNodeButton"); + final JTextArea xpathTextArea = findComponentByName(mainFrame, "xpathTextArea"); + xpathTextArea.setText("//CLASS_DEF^"); + findNodeButton.doClick(); + + final String expected = "//CLASS_DEF^\nInvalid character '^' in expression"; + + assertWithMessage("Unexpected XPath text area text") + .that(xpathTextArea.getText()) + .isEqualTo(expected); + } } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XpathUtil.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XpathUtil.java deleted file mode 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XpathUtil.java +++ /dev/null @@ -1,61 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2022 the original author or authors. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -//////////////////////////////////////////////////////////////////////////////// - -package com.puppycrawl.tools.checkstyle.internal.utils; - -import java.util.List; -import java.util.stream.Collectors; - -import com.puppycrawl.tools.checkstyle.xpath.AbstractNode; -import net.sf.saxon.Configuration; -import net.sf.saxon.om.Item; -import net.sf.saxon.om.NodeInfo; -import net.sf.saxon.sxpath.XPathDynamicContext; -import net.sf.saxon.sxpath.XPathEvaluator; -import net.sf.saxon.sxpath.XPathExpression; -import net.sf.saxon.trans.XPathException; - -/** - * XpathUtil. - * - * @noinspection ClassOnlyUsedInOnePackage - */ -public final class XpathUtil { - - private XpathUtil() { - } - - /** - * Returns list of nodes matching xpath expression given node context. - * - * @param xpath Xpath expression - * @param rootNode {@code NodeInfo} node context - * @return list of nodes matching xpath expression given node context - */ - public static List<NodeInfo> getXpathItems(String xpath, AbstractNode rootNode) - throws XPathException { - final XPathEvaluator xpathEvaluator = new XPathEvaluator(Configuration.newConfiguration()); - final XPathExpression xpathExpression = xpathEvaluator.createExpression(xpath); - final XPathDynamicContext xpathDynamicContext = xpathExpression - .createDynamicContext(rootNode); - final List<Item> items = xpathExpression.evaluate(xpathDynamicContext); - return items.stream().map(item -> (NodeInfo) item).collect(Collectors.toList()); - } - -} diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/ElementNodeTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/ElementNodeTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/ElementNodeTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/ElementNodeTest.java @@ -20,7 +20,7 @@ package com.puppycrawl.tools.checkstyle.xpath; import static com.google.common.truth.Truth.assertWithMessage; -import static com.puppycrawl.tools.checkstyle.internal.utils.XpathUtil.getXpathItems; +import static com.puppycrawl.tools.checkstyle.utils.XpathUtil.getXpathItems; import java.io.File; import java.util.List; diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/RootNodeTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/RootNodeTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/RootNodeTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/RootNodeTest.java @@ -20,7 +20,7 @@ package com.puppycrawl.tools.checkstyle.xpath; import static com.google.common.truth.Truth.assertWithMessage; -import static com.puppycrawl.tools.checkstyle.internal.utils.XpathUtil.getXpathItems; +import static com.puppycrawl.tools.checkstyle.utils.XpathUtil.getXpathItems; import java.io.File; import java.util.List; diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/XpathMapperTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/XpathMapperTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/XpathMapperTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/XpathMapperTest.java @@ -20,7 +20,7 @@ package com.puppycrawl.tools.checkstyle.xpath; import static com.google.common.truth.Truth.assertWithMessage; -import static com.puppycrawl.tools.checkstyle.internal.utils.XpathUtil.getXpathItems; +import static com.puppycrawl.tools.checkstyle.utils.XpathUtil.getXpathItems; import java.io.File; import java.util.List; diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/gui/treetable/InputTreeTableXpathAreaPanel.java b/src/test/resources/com/puppycrawl/tools/checkstyle/gui/treetable/InputTreeTableXpathAreaPanel.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/gui/treetable/InputTreeTableXpathAreaPanel.java @@ -0,0 +1,5 @@ +package com.puppycrawl.tools.checkstyle.gui.treetable; + +public class InputTreeTableXpathAreaPanel { + class Inner{} +}
GUI can not find node by simple xpath ``` $ cat Test.java public class Test { int i; // warn int[] arr = { 40, // ok magic reason 47, // ok magic reason }; } $ java -jar checkstyle-8.36.2-all.jar -b "/CLASS_DEF" Test.java CLASS_DEF -> CLASS_DEF [1:0] ``` `java -cp checkstyle-8.36.2-all.jar com.puppycrawl.tools.checkstyle.gui.Main Test.java` Xpath is reported as `^ wrong xpath query` ![image](https://user-images.githubusercontent.com/812984/99819544-73f17680-2b04-11eb-9a30-b74e9624a064.png)
@romani I got the problem. The CLASS_DEF AST Node is supported by IDENT[@text='Test']. We cannot mention CLASS_DEF simply as there can be multiple class definitions in a java file. So, we need to also mention IDEN[@text='Test']. So, the correct XPATH Query will be `/CLASS_DEF[./IDENT[@text='Test']]`. We can see this when we click on CLASS_DEF node and generate the xpath query. The result is as shown below. ![image](https://user-images.githubusercontent.com/53093601/99880977-da79b000-2c3c-11eb-86a3-6cdd8cb78724.png) So, simple CLASS_DEF doesn't work. whole idea of Xpath to has non-exact queries. Can select first matching node instead printing error ? or at least find node and print "^ several results found" to let user be aware of this. https://github.com/checkstyle/checkstyle/blob/3f045f19d40ed017fe4647d6dc2efcda73107e7e/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTable.java#L205 Issue from line above looks like it is because we are expecting an EXACT match. Non-exact matches will fail. I expect the GUI doesn't support other non-exact matches like `//CLASS_DEF//IDENT` where classes can be nested as well as multiple. I assume we will have to switch to something like https://github.com/checkstyle/checkstyle/blob/797642aef9585ac695686b98b7268caccd332a20/src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java#L238 to support gathering all matching nodes. The idea was to Find the Node by running Xpath query and selecting particular text in the program. As far as I know Non-Exact Xpath Queries will not be able to identify particular node from the program uniquely. If we deal with Non Exact Xpath Query and give message like `several results found`, then we will get distracted from our functionality i.e `Find Node by Xpath`. If our functionality is to just check that given xpath is correct or not, then we should go for Non Exact Xpath Queries. A simple solution is to modify the message. We can give message like `^ wrong xpath query or not an exact xpath query`. Also we can give a sample xpath query so that user gets better idea. > We can give message like ^ wrong xpath query or not an exact xpath query at least this should be done. But we should be able to apply any Xpath and select it atleast first of it in tree, as whole reason of this UI is to give user GUI tool to generate/write Xpath whicj will be used in Xpath Filters. Example: https://github.com/checkstyle/checkstyle/pull/8711#issuecomment-731250709 can you point me where you apply query ? it should work the same as apply of query from CLI by option "-b", with only difference is to select first matching node. @romani > https://github.com/checkstyle/checkstyle/blob/3f045f19d40ed017fe4647d6dc2efcda73107e7e/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTable.java#L205 This is the line where are I match exact Xpath Query. This feature was completely broken since #3095 as there is hard coded "EOF" token for the root node in the `TreeTable` class. @nmancus1 , this is a item we completely forgot to recheck. > @nmancus1 , this is a item we completely forgot to recheck. Yes, it seems like the GUI is often an afterthought for us. I will send a PR soon.
2022-03-29T03:44:57Z
10.1
checkstyle/checkstyle
11,173
checkstyle__checkstyle-11173
[ "11172" ]
9e1ff370020786ed45ad2854752b4171d99ce979
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/Main.java b/src/main/java/com/puppycrawl/tools/checkstyle/Main.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/Main.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/Main.java @@ -102,7 +102,7 @@ private Main() { * * @param args the command line arguments. * @throws IOException if there is a problem with files access - * @noinspection UseOfSystemOutOrSystemErr, CallToPrintStackTrace + * @noinspection UseOfSystemOutOrSystemErr, CallToPrintStackTrace, CallToSystemExit **/ public static void main(String... args) throws IOException { @@ -149,7 +149,7 @@ else if (parseResult.isUsageHelpRequested()) { System.err.println(errorCounterViolation.getViolation()); } } - ExitHelper.exit(exitStatus); + Runtime.getRuntime().exit(exitStatus); } /** @@ -863,28 +863,4 @@ private List<String> validateOptionalCliParametersIfConfigDefined() { } } - /** - * This class is needed for a workaround for the Jacoco limitations. A call to - * {@link System#exit(int)} will never be shown as covered. - * Since it is not possible to exclude a certain method from the Jacoco coverage, - * the entire class is excluded. - * Method 'exit' must contain IF condition, see details at - * https://github.com/checkstyle/checkstyle/pull/10951 - */ - private static class ExitHelper { - - /** - * Terminates the program. - * - * @param code the return code - * @noinspection CallToSystemExit - */ - private static void exit(int code) { - if (code != 0) { - System.exit(code); - } - } - - } - }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java @@ -22,8 +22,10 @@ import static com.google.common.truth.Truth.assertWithMessage; import static com.puppycrawl.tools.checkstyle.AbstractPathTestSupport.addEndOfLine; import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.isUtilsClassHasPrivateConstructor; -import static org.itsallcode.junit.sysextensions.AssertExit.assertExitWithStatus; import static org.junit.jupiter.api.Assumptions.assumeTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.verify; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; @@ -46,7 +48,6 @@ import java.util.stream.Collectors; import org.itsallcode.io.Capturable; -import org.itsallcode.junit.sysextensions.ExitGuard; import org.itsallcode.junit.sysextensions.SystemErrGuard; import org.itsallcode.junit.sysextensions.SystemErrGuard.SysErr; import org.itsallcode.junit.sysextensions.SystemOutGuard; @@ -55,6 +56,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.io.TempDir; +import org.mockito.MockedStatic; +import org.mockito.Mockito; import com.puppycrawl.tools.checkstyle.api.AuditListener; import com.puppycrawl.tools.checkstyle.api.AutomaticBean; @@ -64,7 +67,7 @@ import com.puppycrawl.tools.checkstyle.internal.utils.TestUtil; import com.puppycrawl.tools.checkstyle.utils.ChainedPropertyUtil; -@ExtendWith({ExitGuard.class, SystemErrGuard.class, SystemOutGuard.class}) +@ExtendWith({SystemErrGuard.class, SystemOutGuard.class}) public class MainTest { private static final String SHORT_USAGE = String.format(Locale.ROOT, @@ -248,9 +251,8 @@ public void testIsProperUtilsClass() throws ReflectiveOperationException { } @Test - public void testVersionPrint(@SysErr Capturable systemErr, @SysOut Capturable systemOut) - throws IOException { - Main.main("-V"); + public void testVersionPrint(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { + assertMainReturnCode(0, "-V"); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo("Checkstyle version: null" + System.lineSeparator()); @@ -260,9 +262,8 @@ public void testVersionPrint(@SysErr Capturable systemErr, @SysOut Capturable sy } @Test - public void testUsageHelpPrint(@SysErr Capturable systemErr, @SysOut Capturable systemOut) - throws IOException { - Main.main("-h"); + public void testUsageHelpPrint(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { + assertMainReturnCode(0, "-h"); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo(USAGE); @@ -276,7 +277,7 @@ public void testWrongArgument(@SysErr Capturable systemErr, @SysOut Capturable s // need to specify a file: // <files> is defined as a required positional param; // picocli verifies required parameters before checking unknown options - assertExitWithStatus(-1, () -> invokeMain("-q", "file")); + assertMainReturnCode(-1, "-q", "file"); final String usage = "Unknown option: '-q'" + EOL + SHORT_USAGE; assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) @@ -289,7 +290,7 @@ public void testWrongArgument(@SysErr Capturable systemErr, @SysOut Capturable s @Test public void testWrongArgumentMissingFiles(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { - assertExitWithStatus(-1, () -> invokeMain("-q")); + assertMainReturnCode(-1, "-q"); // files is defined as a required positional param; // picocli verifies required parameters before checking unknown options final String usage = "Missing required parameter: '<files>'" + EOL + SHORT_USAGE; @@ -303,7 +304,7 @@ public void testWrongArgumentMissingFiles(@SysErr Capturable systemErr, @Test public void testNoConfigSpecified(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { - assertExitWithStatus(-1, () -> invokeMain(getPath("InputMain.java"))); + assertMainReturnCode(-1, getPath("InputMain.java")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo("Must specify a config XML file." + System.lineSeparator()); @@ -315,9 +316,7 @@ public void testNoConfigSpecified(@SysErr Capturable systemErr, @SysOut Capturab @Test public void testNonExistentTargetFile(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { - assertExitWithStatus(-1, () -> { - invokeMain("-c", "/google_checks.xml", "NonExistentFile.java"); - }); + assertMainReturnCode(-1, "-c", "/google_checks.xml", "NonExistentFile.java"); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo("Files to process must be specified, found 0." + System.lineSeparator()); @@ -336,9 +335,7 @@ public void testExistingTargetFileButWithoutReadAccess( assumeTrue(file.setReadable(false), "file is still readable"); final String canonicalPath = file.getCanonicalPath(); - assertExitWithStatus(-1, () -> { - invokeMain("-c", "/google_checks.xml", canonicalPath); - }); + assertMainReturnCode(-1, "-c", "/google_checks.xml", canonicalPath); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo("Files to process must be specified, found 0." + System.lineSeparator()); @@ -350,10 +347,8 @@ public void testExistingTargetFileButWithoutReadAccess( @Test public void testNonExistentConfigFile(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { - assertExitWithStatus(-1, () -> { - invokeMain("-c", "src/main/resources/non_existent_config.xml", + assertMainReturnCode(-1, "-c", "src/main/resources/non_existent_config.xml", getPath("InputMain.java")); - }); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo(addEndOfLine("Could not find config XML file " @@ -366,9 +361,8 @@ public void testNonExistentConfigFile(@SysErr Capturable systemErr, @Test public void testNonExistentOutputFormat(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { - assertExitWithStatus(-1, () -> { - invokeMain("-c", "/google_checks.xml", "-f", "xmlp", getPath("InputMain.java")); - }); + assertMainReturnCode(-1, "-c", "/google_checks.xml", "-f", "xmlp", + getPath("InputMain.java")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo(""); @@ -380,10 +374,8 @@ public void testNonExistentOutputFormat(@SysErr Capturable systemErr, @Test public void testNonExistentClass(@SysErr Capturable systemErr) { - assertExitWithStatus(-2, () -> { - invokeMain("-c", getPath("InputMainConfig-non-existent-classname.xml"), + assertMainReturnCode(-2, "-c", getPath("InputMainConfig-non-existent-classname.xml"), getPath("InputMain.java")); - }); final String cause = "com.puppycrawl.tools.checkstyle.api.CheckstyleException:" + " cannot initialize module TreeWalker - "; assertWithMessage("Unexpected system error log") @@ -392,9 +384,9 @@ public void testNonExistentClass(@SysErr Capturable systemErr) { } @Test - public void testExistingTargetFile(@SysErr Capturable systemErr, @SysOut Capturable systemOut) - throws IOException { - Main.main("-c", getPath("InputMainConfig-classname.xml"), getPath("InputMain.java")); + public void testExistingTargetFile(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { + assertMainReturnCode(0, "-c", getPath("InputMainConfig-classname.xml"), + getPath("InputMain.java")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo(addEndOfLine(auditStartMessage.getViolation(), @@ -407,7 +399,7 @@ public void testExistingTargetFile(@SysErr Capturable systemErr, @SysOut Captura @Test public void testExistingTargetFileXmlOutput(@SysErr Capturable systemErr, @SysOut Capturable systemOut) throws IOException { - Main.main("-c", getPath("InputMainConfig-classname.xml"), "-f", "xml", + assertMainReturnCode(0, "-c", getPath("InputMainConfig-classname.xml"), "-f", "xml", getPath("InputMain.java")); final String expectedPath = getFilePath("InputMain.java"); final String version = Main.class.getPackage().getImplementationVersion(); @@ -440,7 +432,7 @@ public void testNonClosedSystemStreams(@SysErr Capturable systemErr, try (ShouldNotBeClosedStream stream = new ShouldNotBeClosedStream()) { System.setOut(stream); System.setErr(stream); - Main.main("-c", getPath("InputMainConfig-classname.xml"), "-f", "xml", + assertMainReturnCode(0, "-c", getPath("InputMainConfig-classname.xml"), "-f", "xml", getPath("InputMain.java")); assertWithMessage("stream should not be closed") .that(stream.isClosed) @@ -475,8 +467,8 @@ public void testGetOutputStreamOptionsMethod() throws Exception { @Test public void testExistingTargetFilePlainOutput(@SysErr Capturable systemErr, - @SysOut Capturable systemOut) throws IOException { - Main.main("-c", getPath("InputMainConfig-classname.xml"), "-f", "plain", + @SysOut Capturable systemOut) { + assertMainReturnCode(0, "-c", getPath("InputMainConfig-classname.xml"), "-f", "plain", getPath("InputMain.java")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) @@ -490,7 +482,8 @@ public void testExistingTargetFilePlainOutput(@SysErr Capturable systemErr, @Test public void testExistingTargetFileWithViolations(@SysErr Capturable systemErr, @SysOut Capturable systemOut) throws IOException { - Main.main("-c", getPath("InputMainConfig-classname2.xml"), getPath("InputMain.java")); + assertMainReturnCode(0, "-c", getPath("InputMainConfig-classname2.xml"), + getPath("InputMain.java")); final Violation invalidPatternMessageMain = new Violation(1, "com.puppycrawl.tools.checkstyle.checks.naming.messages", "name.invalidPattern", new String[] {"InputMain", "^[a-z0-9]*$"}, @@ -517,10 +510,10 @@ public void testExistingTargetFileWithViolations(@SysErr Capturable systemErr, @Test public void testViolationsByGoogleAndXpathSuppressions(@SysErr Capturable systemErr, - @SysOut Capturable systemOut) throws Exception { + @SysOut Capturable systemOut) { System.setProperty("org.checkstyle.google.suppressionxpathfilter.config", getPath("InputMainViolationsForGoogleXpathSuppressions.xml")); - Main.main("-c", "/google_checks.xml", + assertMainReturnCode(0, "-c", "/google_checks.xml", getPath("InputMainViolationsForGoogle.java")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) @@ -532,10 +525,10 @@ public void testViolationsByGoogleAndXpathSuppressions(@SysErr Capturable system @Test public void testViolationsByGoogleAndSuppressions(@SysErr Capturable systemErr, - @SysOut Capturable systemOut) throws Exception { + @SysOut Capturable systemOut) { System.setProperty("org.checkstyle.google.suppressionfilter.config", getPath("InputMainViolationsForGoogleSuppressions.xml")); - Main.main("-c", "/google_checks.xml", + assertMainReturnCode(0, "-c", "/google_checks.xml", getPath("InputMainViolationsForGoogle.java")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) @@ -548,10 +541,8 @@ public void testViolationsByGoogleAndSuppressions(@SysErr Capturable systemErr, @Test public void testExistingTargetFileWithError(@SysErr Capturable systemErr, @SysOut Capturable systemOut) throws Exception { - assertExitWithStatus(2, () -> { - invokeMain("-c", getPath("InputMainConfig-classname2-error.xml"), + assertMainReturnCode(2, "-c", getPath("InputMainConfig-classname2-error.xml"), getPath("InputMain.java")); - }); final Violation errorCounterTwoMessage = new Violation(1, Definitions.CHECKSTYLE_BUNDLE, Main.ERROR_COUNTER, new String[] {String.valueOf(2)}, null, getClass(), null); @@ -587,10 +578,8 @@ public void testExistingTargetFileWithError(@SysErr Capturable systemErr, @Test public void testExistingTargetFileWithOneError(@SysErr Capturable systemErr, @SysOut Capturable systemOut) throws Exception { - assertExitWithStatus(1, () -> { - invokeMain("-c", getPath("InputMainConfig-classname2-error.xml"), + assertMainReturnCode(1, "-c", getPath("InputMainConfig-classname2-error.xml"), getPath("InputMain1.java")); - }); final Violation errorCounterTwoMessage = new Violation(1, Definitions.CHECKSTYLE_BUNDLE, Main.ERROR_COUNTER, new String[] {String.valueOf(1)}, null, getClass(), null); @@ -613,9 +602,7 @@ public void testExistingTargetFileWithOneError(@SysErr Capturable systemErr, @Test public void testExistingTargetFileWithOneErrorAgainstSunCheck(@SysErr Capturable systemErr, @SysOut Capturable systemOut) throws Exception { - assertExitWithStatus(1, () -> { - invokeMain("-c", "/sun_checks.xml", getPath("InputMain1.java")); - }); + assertMainReturnCode(1, "-c", "/sun_checks.xml", getPath("InputMain1.java")); final Violation errorCounterTwoMessage = new Violation(1, Definitions.CHECKSTYLE_BUNDLE, Main.ERROR_COUNTER, new String[] {String.valueOf(1)}, null, getClass(), null); @@ -636,8 +623,8 @@ public void testExistingTargetFileWithOneErrorAgainstSunCheck(@SysErr Capturable @Test public void testExistentTargetFilePlainOutputToNonExistentFile(@SysErr Capturable systemErr, - @SysOut Capturable systemOut) throws IOException { - Main.main("-c", getPath("InputMainConfig-classname.xml"), "-f", "plain", + @SysOut Capturable systemOut) { + assertMainReturnCode(0, "-c", getPath("InputMainConfig-classname.xml"), "-f", "plain", "-o", temporaryFolder + "/output.txt", getPath("InputMain.java")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) @@ -655,7 +642,7 @@ public void testExistingTargetFilePlainOutputToFile(@SysErr Capturable systemErr assertWithMessage("File must exist") .that(new File(outputFile).exists()) .isTrue(); - Main.main("-c", getPath("InputMainConfig-classname.xml"), "-f", "plain", + assertMainReturnCode(0, "-c", getPath("InputMainConfig-classname.xml"), "-f", "plain", "-o", outputFile, getPath("InputMain.java")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) @@ -671,7 +658,7 @@ public void testCreateNonExistentOutputFile() throws IOException { assertWithMessage("File must not exist") .that(new File(outputFile).exists()) .isFalse(); - Main.main("-c", getPath("InputMainConfig-classname.xml"), "-f", "plain", + assertMainReturnCode(0, "-c", getPath("InputMainConfig-classname.xml"), "-f", "plain", "-o", outputFile, getPath("InputMain.java")); assertWithMessage("File must exist") .that(new File(outputFile).exists()) @@ -680,8 +667,8 @@ public void testCreateNonExistentOutputFile() throws IOException { @Test public void testExistingTargetFilePlainOutputProperties(@SysErr Capturable systemErr, - @SysOut Capturable systemOut) throws IOException { - Main.main("-c", getPath("InputMainConfig-classname-prop.xml"), + @SysOut Capturable systemOut) { + assertMainReturnCode(0, "-c", getPath("InputMainConfig-classname-prop.xml"), "-p", getPath("InputMainMycheckstyle.properties"), getPath("InputMain.java")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) @@ -694,8 +681,8 @@ public void testExistingTargetFilePlainOutputProperties(@SysErr Capturable syste @Test public void testPropertyFileWithPropertyChaining(@SysErr Capturable systemErr, - @SysOut Capturable systemOut) throws IOException { - Main.main("-c", getPath("InputMainConfig-classname-prop.xml"), + @SysOut Capturable systemOut) { + assertMainReturnCode(0, "-c", getPath("InputMainConfig-classname-prop.xml"), "-p", getPath("InputMainPropertyChaining.properties"), getPath("InputMain.java")); assertWithMessage("Unexpected output log") @@ -710,11 +697,9 @@ public void testPropertyFileWithPropertyChaining(@SysErr Capturable systemErr, @Test public void testPropertyFileWithPropertyChainingUndefinedProperty(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { - assertExitWithStatus(-2, () -> { - invokeMain("-c", getPath("InputMainConfig-classname-prop.xml"), + assertMainReturnCode(-2, "-c", getPath("InputMainConfig-classname-prop.xml"), "-p", getPath("InputMainPropertyChainingUndefinedProperty.properties"), getPath("InputMain.java")); - }); assertWithMessage("Invalid error message") .that(systemErr.getCapturedData()) @@ -727,10 +712,8 @@ public void testPropertyFileWithPropertyChainingUndefinedProperty(@SysErr Captur @Test public void testExistingTargetFilePlainOutputNonexistentProperties(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { - assertExitWithStatus(-1, () -> { - invokeMain("-c", getPath("InputMainConfig-classname-prop.xml"), + assertMainReturnCode(-1, "-c", getPath("InputMainConfig-classname-prop.xml"), "-p", "nonexistent.properties", getPath("InputMain.java")); - }); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo("Could not find file 'nonexistent.properties'." @@ -742,9 +725,8 @@ public void testExistingTargetFilePlainOutputNonexistentProperties(@SysErr Captu @Test public void testExistingIncorrectConfigFile(@SysErr Capturable systemErr) { - assertExitWithStatus(-2, () -> { - invokeMain("-c", getPath("InputMainConfig-Incorrect.xml"), getPath("InputMain.java")); - }); + assertMainReturnCode(-2, "-c", getPath("InputMainConfig-Incorrect.xml"), + getPath("InputMain.java")); final String errorOutput = "com.puppycrawl.tools.checkstyle.api." + "CheckstyleException: unable to parse configuration stream - "; assertWithMessage("Unexpected system error log") @@ -754,10 +736,8 @@ public void testExistingIncorrectConfigFile(@SysErr Capturable systemErr) { @Test public void testExistingIncorrectChildrenInConfigFile(@SysErr Capturable systemErr) { - assertExitWithStatus(-2, () -> { - invokeMain("-c", getPath("InputMainConfig-incorrectChildren.xml"), + assertMainReturnCode(-2, "-c", getPath("InputMainConfig-incorrectChildren.xml"), getPath("InputMain.java")); - }); final String errorOutput = "com.puppycrawl.tools.checkstyle.api." + "CheckstyleException: cannot initialize module RegexpSingleline" + " - RegexpSingleline is not allowed as a child in RegexpSingleline"; @@ -768,10 +748,8 @@ public void testExistingIncorrectChildrenInConfigFile(@SysErr Capturable systemE @Test public void testExistingIncorrectChildrenInConfigFile2(@SysErr Capturable systemErr) { - assertExitWithStatus(-2, () -> { - invokeMain("-c", getPath("InputMainConfig-incorrectChildren2.xml"), + assertMainReturnCode(-2, "-c", getPath("InputMainConfig-incorrectChildren2.xml"), getPath("InputMain.java")); - }); final String errorOutput = "com.puppycrawl.tools.checkstyle.api." + "CheckstyleException: cannot initialize module TreeWalker - " + "cannot initialize module JavadocMethod - " @@ -833,7 +811,7 @@ public void testExistingDirectoryWithViolations(@SysErr Capturable systemErr, final String msgKey = "maxLen.file"; final String bundle = "com.puppycrawl.tools.checkstyle.checks.sizes.messages"; - Main.main("-c", getPath("InputMainConfig-filelength.xml"), + assertMainReturnCode(0, "-c", getPath("InputMainConfig-filelength.xml"), getPath("")); final String expectedPath = getFilePath("") + File.separator; final StringBuilder sb = new StringBuilder(28); @@ -928,10 +906,8 @@ public File[] listFiles() { @Test public void testFileReferenceDuringException(@SysErr Capturable systemErr) { // We put xml as source to cause parse exception - assertExitWithStatus(-2, () -> { - invokeMain("-c", getPath("InputMainConfig-classname.xml"), + assertMainReturnCode(-2, "-c", getPath("InputMainConfig-classname.xml"), getNonCompilablePath("InputMainIncorrectClass.java")); - }); final String exceptionMessage = addEndOfLine("com.puppycrawl.tools.checkstyle.api." + "CheckstyleException: Exception was thrown while processing " + new File(getNonCompilablePath("InputMainIncorrectClass.java")).getPath()); @@ -942,9 +918,7 @@ public void testFileReferenceDuringException(@SysErr Capturable systemErr) { @Test public void testRemoveLexerDefaultErrorListener(@SysErr Capturable systemErr) { - assertExitWithStatus(-2, () -> { - invokeMain("-t", getNonCompilablePath("InputMainIncorrectClass.java")); - }); + assertMainReturnCode(-2, "-t", getNonCompilablePath("InputMainIncorrectClass.java")); assertWithMessage("First line of exception message should not contain lexer error.") .that(systemErr.getCapturedData().startsWith("line 2:2 token recognition error")) @@ -953,10 +927,7 @@ public void testRemoveLexerDefaultErrorListener(@SysErr Capturable systemErr) { @Test public void testRemoveParserDefaultErrorListener(@SysErr Capturable systemErr) { - assertExitWithStatus(-2, () -> { - invokeMain("-t", getNonCompilablePath("InputMainIncorrectClass.java")); - }); - + assertMainReturnCode(-2, "-t", getNonCompilablePath("InputMainIncorrectClass.java")); final String capturedData = systemErr.getCapturedData(); assertWithMessage("First line of exception message should not contain parser error.") @@ -971,7 +942,7 @@ public void testRemoveParserDefaultErrorListener(@SysErr Capturable systemErr) { @Test public void testPrintTreeOnMoreThanOneFile(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { - assertExitWithStatus(-1, () -> invokeMain("-t", getPath(""))); + assertMainReturnCode(-1, "-t", getPath("")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo("Printing AST is allowed for only one file." + System.lineSeparator()); @@ -981,8 +952,7 @@ public void testPrintTreeOnMoreThanOneFile(@SysErr Capturable systemErr, } @Test - public void testPrintTreeOption(@SysErr Capturable systemErr, @SysOut Capturable systemOut) - throws IOException { + public void testPrintTreeOption(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { final String expected = addEndOfLine( "COMPILATION_UNIT -> COMPILATION_UNIT [1:0]", "|--PACKAGE_DEF -> package [1:0]", @@ -1013,7 +983,7 @@ public void testPrintTreeOption(@SysErr Capturable systemErr, @SysOut Capturable " |--LCURLY -> { [5:21]", " `--RCURLY -> } [6:0]"); - Main.main("-t", getPath("InputMain.java")); + assertMainReturnCode(0, "-t", getPath("InputMain.java")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo(expected); @@ -1023,8 +993,7 @@ public void testPrintTreeOption(@SysErr Capturable systemErr, @SysOut Capturable } @Test - public void testPrintXpathOption(@SysErr Capturable systemErr, @SysOut Capturable systemOut) - throws IOException { + public void testPrintXpathOption(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { final String expected = addEndOfLine( "COMPILATION_UNIT -> COMPILATION_UNIT [1:0]", "|--CLASS_DEF -> CLASS_DEF [3:0]", @@ -1033,7 +1002,8 @@ public void testPrintXpathOption(@SysErr Capturable systemErr, @SysOut Capturabl "| | `--SLIST -> { [4:20]", "| | |--VARIABLE_DEF -> VARIABLE_DEF [5:8]", "| | | |--IDENT -> a [5:12]"); - Main.main("-b", "/COMPILATION_UNIT/CLASS_DEF//METHOD_DEF[./IDENT[@text='methodOne']]" + assertMainReturnCode(0, "-b", + "/COMPILATION_UNIT/CLASS_DEF//METHOD_DEF[./IDENT[@text='methodOne']]" + "//VARIABLE_DEF/IDENT", getPath("InputMainXPath.java")); assertWithMessage("Unexpected output log") @@ -1046,14 +1016,14 @@ public void testPrintXpathOption(@SysErr Capturable systemErr, @SysOut Capturabl @Test public void testPrintXpathCommentNode(@SysErr Capturable systemErr, - @SysOut Capturable systemOut) throws IOException { + @SysOut Capturable systemOut) { final String expected = addEndOfLine( "COMPILATION_UNIT -> COMPILATION_UNIT [1:0]", "`--CLASS_DEF -> CLASS_DEF [17:0]", " `--OBJBLOCK -> OBJBLOCK [17:19]", " |--CTOR_DEF -> CTOR_DEF [19:4]", " | |--BLOCK_COMMENT_BEGIN -> /* [18:4]"); - Main.main("-b", "/COMPILATION_UNIT/CLASS_DEF//BLOCK_COMMENT_BEGIN", + assertMainReturnCode(0, "-b", "/COMPILATION_UNIT/CLASS_DEF//BLOCK_COMMENT_BEGIN", getPath("InputMainXPath.java")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) @@ -1065,9 +1035,9 @@ public void testPrintXpathCommentNode(@SysErr Capturable systemErr, @Test public void testPrintXpathNodeParentNull(@SysErr Capturable systemErr, - @SysOut Capturable systemOut) throws IOException { + @SysOut Capturable systemOut) { final String expected = addEndOfLine("COMPILATION_UNIT -> COMPILATION_UNIT [1:0]"); - Main.main("-b", "/COMPILATION_UNIT", getPath("InputMainXPath.java")); + assertMainReturnCode(0, "-b", "/COMPILATION_UNIT", getPath("InputMainXPath.java")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo(expected); @@ -1077,8 +1047,8 @@ public void testPrintXpathNodeParentNull(@SysErr Capturable systemErr, } @Test - public void testPrintXpathFullOption(@SysErr Capturable systemErr, @SysOut Capturable systemOut) - throws IOException { + public void testPrintXpathFullOption( + @SysErr Capturable systemErr, @SysOut Capturable systemOut) { final String expected = addEndOfLine( "COMPILATION_UNIT -> COMPILATION_UNIT [1:0]", "|--CLASS_DEF -> CLASS_DEF [3:0]", @@ -1089,7 +1059,7 @@ public void testPrintXpathFullOption(@SysErr Capturable systemErr, @SysOut Captu "| | | |--IDENT -> a [9:12]"); final String xpath = "/COMPILATION_UNIT/CLASS_DEF//METHOD_DEF[./IDENT[@text='method']]" + "//VARIABLE_DEF/IDENT"; - Main.main("--branch-matching-xpath", xpath, getPath("InputMainXPath.java")); + assertMainReturnCode(0, "--branch-matching-xpath", xpath, getPath("InputMainXPath.java")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo(expected); @@ -1099,8 +1069,8 @@ public void testPrintXpathFullOption(@SysErr Capturable systemErr, @SysOut Captu } @Test - public void testPrintXpathTwoResults(@SysErr Capturable systemErr, @SysOut Capturable systemOut) - throws IOException { + public void testPrintXpathTwoResults( + @SysErr Capturable systemErr, @SysOut Capturable systemOut) { final String expected = addEndOfLine( "COMPILATION_UNIT -> COMPILATION_UNIT [1:0]", "|--CLASS_DEF -> CLASS_DEF [12:0]", @@ -1111,8 +1081,8 @@ public void testPrintXpathTwoResults(@SysErr Capturable systemErr, @SysOut Captu "|--CLASS_DEF -> CLASS_DEF [12:0]", "| `--OBJBLOCK -> OBJBLOCK [12:10]", "| |--METHOD_DEF -> METHOD_DEF [14:4]"); - Main.main("--branch-matching-xpath", "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='Two']]" - + "//METHOD_DEF", + assertMainReturnCode(0, "--branch-matching-xpath", + "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='Two']]//METHOD_DEF", getPath("InputMainXPath.java")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) @@ -1127,9 +1097,7 @@ public void testPrintXpathInvalidXpath(@SysErr Capturable systemErr) throws Exce final String invalidXpath = "\\/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='Two']]" + "//METHOD_DEF"; final String filePath = getFilePath("InputMainXPath.java"); - assertExitWithStatus(-2, () -> { - invokeMain("--branch-matching-xpath", invalidXpath, filePath); - }); + assertMainReturnCode(-2, "--branch-matching-xpath", invalidXpath, filePath); final String exceptionFirstLine = addEndOfLine("com.puppycrawl.tools.checkstyle.api." + "CheckstyleException: Error during evaluation for xpath: " + invalidXpath + ", file: " + filePath); @@ -1140,7 +1108,7 @@ public void testPrintXpathInvalidXpath(@SysErr Capturable systemErr) throws Exce @Test public void testPrintTreeCommentsOption(@SysErr Capturable systemErr, - @SysOut Capturable systemOut) throws IOException { + @SysOut Capturable systemOut) { final String expected = addEndOfLine( "COMPILATION_UNIT -> COMPILATION_UNIT [1:0]", "|--PACKAGE_DEF -> package [1:0]", @@ -1174,7 +1142,7 @@ public void testPrintTreeCommentsOption(@SysErr Capturable systemErr, " |--LCURLY -> { [5:21]", " `--RCURLY -> } [6:0]"); - Main.main("-T", getPath("InputMain.java")); + assertMainReturnCode(0, "-T", getPath("InputMain.java")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo(expected); @@ -1190,7 +1158,7 @@ public void testPrintTreeJavadocOption(@SysErr Capturable systemErr, getPath("InputMainExpectedInputJavadocComment.txt"))), StandardCharsets.UTF_8) .replaceAll("\\\\r\\\\n", "\\\\n").replaceAll("\r\n", "\n"); - Main.main("-j", getPath("InputMainJavadocComment.javadoc")); + assertMainReturnCode(0, "-j", getPath("InputMainJavadocComment.javadoc")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData().replaceAll("\\\\r\\\\n", "\\\\n") .replaceAll("\r\n", "\n")) @@ -1202,7 +1170,7 @@ public void testPrintTreeJavadocOption(@SysErr Capturable systemErr, @Test public void testPrintSuppressionOption(@SysErr Capturable systemErr, - @SysOut Capturable systemOut) throws IOException { + @SysOut Capturable systemOut) { final String expected = addEndOfLine( "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputMainSuppressionsStringPrinter']]", "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputMainSuppressionsStringPrinter']]" @@ -1210,7 +1178,7 @@ public void testPrintSuppressionOption(@SysErr Capturable systemErr, "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputMainSuppressionsStringPrinter']" + "]/LITERAL_CLASS"); - Main.main(getPath("InputMainSuppressionsStringPrinter.java"), "-s", "3:1"); + assertMainReturnCode(0, getPath("InputMainSuppressionsStringPrinter.java"), "-s", "3:1"); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo(expected); @@ -1221,7 +1189,7 @@ public void testPrintSuppressionOption(@SysErr Capturable systemErr, @Test public void testPrintSuppressionAndTabWidthOption(@SysErr Capturable systemErr, - @SysOut Capturable systemOut) throws IOException { + @SysOut Capturable systemOut) { final String expected = addEndOfLine( "/COMPILATION_UNIT/CLASS_DEF" + "[./IDENT[@text='InputMainSuppressionsStringPrinter']]/OBJBLOCK" @@ -1240,7 +1208,7 @@ public void testPrintSuppressionAndTabWidthOption(@SysErr Capturable systemErr, + "/METHOD_DEF[./IDENT[@text='getName']]/SLIST" + "/VARIABLE_DEF[./IDENT[@text='var']]/TYPE/LITERAL_INT"); - Main.main(getPath("InputMainSuppressionsStringPrinter.java"), + assertMainReturnCode(0, getPath("InputMainSuppressionsStringPrinter.java"), "-s", "7:9", "--tabWidth", "2"); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) @@ -1253,9 +1221,7 @@ public void testPrintSuppressionAndTabWidthOption(@SysErr Capturable systemErr, @Test public void testPrintSuppressionConflictingOptionsTvsC(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { - assertExitWithStatus(-1, () -> { - invokeMain("-c", "/google_checks.xml", getPath(""), "-s", "2:4"); - }); + assertMainReturnCode(-1, "-c", "/google_checks.xml", getPath(""), "-s", "2:4"); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo("Option '-s' cannot be used with other options." @@ -1268,9 +1234,8 @@ public void testPrintSuppressionConflictingOptionsTvsC(@SysErr Capturable system @Test public void testPrintSuppressionConflictingOptionsTvsP(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { - assertExitWithStatus(-1, () -> { - invokeMain("-p", getPath("InputMainMycheckstyle.properties"), "-s", "2:4", getPath("")); - }); + assertMainReturnCode(-1, "-p", getPath("InputMainMycheckstyle.properties"), "-s", "2:4", + getPath("")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo("Option '-s' cannot be used with other options." @@ -1283,7 +1248,7 @@ public void testPrintSuppressionConflictingOptionsTvsP(@SysErr Capturable system @Test public void testPrintSuppressionConflictingOptionsTvsF(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { - assertExitWithStatus(-1, () -> invokeMain("-f", "plain", "-s", "2:4", getPath(""))); + assertMainReturnCode(-1, "-f", "plain", "-s", "2:4", getPath("")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo("Option '-s' cannot be used with other options." @@ -1298,7 +1263,7 @@ public void testPrintSuppressionConflictingOptionsTvsO(@SysErr Capturable system @SysOut Capturable systemOut) throws IOException { final String outputPath = new File(temporaryFolder, "file.output").getCanonicalPath(); - assertExitWithStatus(-1, () -> invokeMain("-o", outputPath, "-s", "2:4", getPath(""))); + assertMainReturnCode(-1, "-o", outputPath, "-s", "2:4", getPath("")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo("Option '-s' cannot be used with other options." @@ -1311,7 +1276,7 @@ public void testPrintSuppressionConflictingOptionsTvsO(@SysErr Capturable system @Test public void testPrintSuppressionOnMoreThanOneFile(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { - assertExitWithStatus(-1, () -> invokeMain("-s", "2:4", getPath(""), getPath(""))); + assertMainReturnCode(-1, "-s", "2:4", getPath(""), getPath("")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo("Printing xpath suppressions is allowed for only one file." @@ -1323,7 +1288,7 @@ public void testPrintSuppressionOnMoreThanOneFile(@SysErr Capturable systemErr, @Test public void testGenerateXpathSuppressionOptionOne(@SysErr Capturable systemErr, - @SysOut Capturable systemOut) throws IOException { + @SysOut Capturable systemOut) { final String expected = addEndOfLine( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>", "<!DOCTYPE suppressions PUBLIC", @@ -1425,7 +1390,7 @@ public void testGenerateXpathSuppressionOptionOne(@SysErr Capturable systemErr, + "/LITERAL_IF/SLIST/LITERAL_IF/SLIST/LITERAL_IF/SLIST\"/>", "</suppressions>"); - Main.main("-c", "/google_checks.xml", "--generate-xpath-suppression", + assertMainReturnCode(0, "-c", "/google_checks.xml", "--generate-xpath-suppression", getPath("InputMainComplexityOverflow.java")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) @@ -1437,7 +1402,7 @@ public void testGenerateXpathSuppressionOptionOne(@SysErr Capturable systemErr, @Test public void testGenerateXpathSuppressionOptionTwo(@SysErr Capturable systemErr, - @SysOut Capturable systemOut) throws IOException { + @SysOut Capturable systemOut) { final String expected = addEndOfLine( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>", "<!DOCTYPE suppressions PUBLIC", @@ -1467,7 +1432,7 @@ public void testGenerateXpathSuppressionOptionTwo(@SysErr Capturable systemErr, + "/LITERAL_FOR/SLIST/LITERAL_FOR\"/>", "</suppressions>"); - Main.main("-c", getPath("InputMainConfig-xpath-suppressions.xml"), + assertMainReturnCode(0, "-c", getPath("InputMainConfig-xpath-suppressions.xml"), "--generate-xpath-suppression", getPath("InputMainGenerateXpathSuppressions.java")); assertWithMessage("Unexpected output log") @@ -1480,11 +1445,11 @@ public void testGenerateXpathSuppressionOptionTwo(@SysErr Capturable systemErr, @Test public void testGenerateXpathSuppressionOptionEmptyConfig(@SysErr Capturable systemErr, - @SysOut Capturable systemOut) throws IOException { + @SysOut Capturable systemOut) { final String expected = ""; - Main.main("-c", getPath("InputMainConfig-empty.xml"), "--generate-xpath-suppression", - getPath("InputMainComplexityOverflow.java")); + assertMainReturnCode(0, "-c", getPath("InputMainConfig-empty.xml"), + "--generate-xpath-suppression", getPath("InputMainComplexityOverflow.java")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo(expected); @@ -1511,8 +1476,8 @@ public void testGenerateXpathSuppressionOptionCustomOutput(@SysErr Capturable sy + "/OBJBLOCK/VARIABLE_DEF/IDENT[@text='low']\"/>", "</suppressions>"); final File file = new File(temporaryFolder, "file.output"); - Main.main("-c", getPath("InputMainConfig-xpath-suppressions.xml"), "-o", file.getPath(), - "--generate-xpath-suppression", + assertMainReturnCode(0, "-c", getPath("InputMainConfig-xpath-suppressions.xml"), "-o", + file.getPath(), "--generate-xpath-suppression", getPath("InputMainGenerateXpathSuppressionsTabWidth.java")); try (BufferedReader br = Files.newBufferedReader(file.toPath())) { final String fileContent = br.lines().collect(Collectors.joining(EOL, "", EOL)); @@ -1527,7 +1492,7 @@ public void testGenerateXpathSuppressionOptionCustomOutput(@SysErr Capturable sy @Test public void testGenerateXpathSuppressionOptionDefaultTabWidth(@SysErr Capturable systemErr, - @SysOut Capturable systemOut) throws IOException { + @SysOut Capturable systemOut) { final String expected = addEndOfLine( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>", "<!DOCTYPE suppressions PUBLIC", @@ -1543,7 +1508,7 @@ public void testGenerateXpathSuppressionOptionDefaultTabWidth(@SysErr Capturable + "/OBJBLOCK/VARIABLE_DEF/IDENT[@text='low']\"/>", "</suppressions>"); - Main.main("-c", getPath("InputMainConfig-xpath-suppressions.xml"), + assertMainReturnCode(0, "-c", getPath("InputMainConfig-xpath-suppressions.xml"), "--generate-xpath-suppression", getPath("InputMainGenerateXpathSuppressionsTabWidth.java")); assertWithMessage("Unexpected output log") @@ -1556,10 +1521,10 @@ public void testGenerateXpathSuppressionOptionDefaultTabWidth(@SysErr Capturable @Test public void testGenerateXpathSuppressionOptionCustomTabWidth(@SysErr Capturable systemErr, - @SysOut Capturable systemOut) throws IOException { + @SysOut Capturable systemOut) { final String expected = ""; - Main.main("-c", getPath("InputMainConfig-xpath-suppressions.xml"), + assertMainReturnCode(0, "-c", getPath("InputMainConfig-xpath-suppressions.xml"), "--generate-xpath-suppression", "--tabWidth", "20", getPath("InputMainGenerateXpathSuppressionsTabWidth.java")); assertWithMessage("Unexpected output log") @@ -1578,7 +1543,7 @@ public void testPrintFullTreeOption(@SysErr Capturable systemErr, @SysOut Captur StandardCharsets.UTF_8).replaceAll("\\\\r\\\\n", "\\\\n") .replaceAll("\r\n", "\n"); - Main.main("-J", getPath("InputMainAstTreeStringPrinterJavadoc.java")); + assertMainReturnCode(0, "-J", getPath("InputMainAstTreeStringPrinterJavadoc.java")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData().replaceAll("\\\\r\\\\n", "\\\\n") .replaceAll("\r\n", "\n")) @@ -1591,7 +1556,7 @@ public void testPrintFullTreeOption(@SysErr Capturable systemErr, @SysOut Captur @Test public void testConflictingOptionsTvsC(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { - assertExitWithStatus(-1, () -> invokeMain("-c", "/google_checks.xml", "-t", getPath(""))); + assertMainReturnCode(-1, "-c", "/google_checks.xml", "-t", getPath("")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo("Option '-t' cannot be used with other options." + System.lineSeparator()); @@ -1603,9 +1568,8 @@ public void testConflictingOptionsTvsC(@SysErr Capturable systemErr, @Test public void testConflictingOptionsTvsP(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { - assertExitWithStatus(-1, () -> { - invokeMain("-p", getPath("InputMainMycheckstyle.properties"), "-t", getPath("")); - }); + assertMainReturnCode(-1, "-p", getPath("InputMainMycheckstyle.properties"), "-t", + getPath("")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo("Option '-t' cannot be used with other options." + System.lineSeparator()); @@ -1617,7 +1581,7 @@ public void testConflictingOptionsTvsP(@SysErr Capturable systemErr, @Test public void testConflictingOptionsTvsF(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { - assertExitWithStatus(-1, () -> invokeMain("-f", "plain", "-t", getPath(""))); + assertMainReturnCode(-1, "-f", "plain", "-t", getPath("")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo("Option '-t' cannot be used with other options." + System.lineSeparator()); @@ -1631,7 +1595,7 @@ public void testConflictingOptionsTvsS(@SysErr Capturable systemErr, @SysOut Capturable systemOut) throws IOException { final String outputPath = new File(temporaryFolder, "file.output").getCanonicalPath(); - assertExitWithStatus(-1, () -> invokeMain("-s", outputPath, "-t", getPath(""))); + assertMainReturnCode(-1, "-s", outputPath, "-t", getPath("")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo("Option '-t' cannot be used with other options." + System.lineSeparator()); @@ -1645,7 +1609,7 @@ public void testConflictingOptionsTvsO(@SysErr Capturable systemErr, @SysOut Capturable systemOut) throws IOException { final String outputPath = new File(temporaryFolder, "file.output").getCanonicalPath(); - assertExitWithStatus(-1, () -> invokeMain("-o", outputPath, "-t", getPath(""))); + assertMainReturnCode(-1, "-o", outputPath, "-t", getPath("")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo("Option '-t' cannot be used with other options." + System.lineSeparator()); @@ -1655,8 +1619,8 @@ public void testConflictingOptionsTvsO(@SysErr Capturable systemErr, } @Test - public void testDebugOption(@SysErr Capturable systemErr) throws IOException { - Main.main("-c", "/google_checks.xml", getPath("InputMain.java"), "-d"); + public void testDebugOption(@SysErr Capturable systemErr) { + assertMainReturnCode(0, "-c", "/google_checks.xml", getPath("InputMain.java"), "-d"); assertWithMessage("Unexpected system error log") .that(systemErr.getCapturedData()) .isNotEqualTo(""); @@ -1666,9 +1630,7 @@ public void testDebugOption(@SysErr Capturable systemErr) throws IOException { public void testExcludeOption(@SysErr Capturable systemErr, @SysOut Capturable systemOut) throws IOException { final String filePath = getFilePath(""); - assertExitWithStatus(-1, () -> { - invokeMain("-c", "/google_checks.xml", filePath, "-e", filePath); - }); + assertMainReturnCode(-1, "-c", "/google_checks.xml", filePath, "-e", filePath); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo("Files to process must be specified, found 0." + System.lineSeparator()); @@ -1681,9 +1643,7 @@ public void testExcludeOption(@SysErr Capturable systemErr, @SysOut Capturable s public void testExcludeOptionFile(@SysErr Capturable systemErr, @SysOut Capturable systemOut) throws IOException { final String filePath = getFilePath("InputMain.java"); - assertExitWithStatus(-1, () -> { - invokeMain("-c", "/google_checks.xml", filePath, "-e", filePath); - }); + assertMainReturnCode(-1, "-c", "/google_checks.xml", filePath, "-e", filePath); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo("Files to process must be specified, found 0." + System.lineSeparator()); @@ -1696,9 +1656,7 @@ public void testExcludeOptionFile(@SysErr Capturable systemErr, @SysOut Capturab public void testExcludeRegexpOption(@SysErr Capturable systemErr, @SysOut Capturable systemOut) throws IOException { final String filePath = getFilePath(""); - assertExitWithStatus(-1, () -> { - invokeMain("-c", "/google_checks.xml", filePath, "-x", "."); - }); + assertMainReturnCode(-1, "-c", "/google_checks.xml", filePath, "-x", "."); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo("Files to process must be specified, found 0." + System.lineSeparator()); @@ -1711,9 +1669,7 @@ public void testExcludeRegexpOption(@SysErr Capturable systemErr, @SysOut Captur public void testExcludeRegexpOptionFile(@SysErr Capturable systemErr, @SysOut Capturable systemOut) throws IOException { final String filePath = getFilePath("InputMain.java"); - assertExitWithStatus(-1, () -> { - invokeMain("-c", "/google_checks.xml", filePath, "-x", "."); - }); + assertMainReturnCode(-1, "-c", "/google_checks.xml", filePath, "-x", "."); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo("Files to process must be specified, found 0." + System.lineSeparator()); @@ -1739,11 +1695,10 @@ public void testExcludeDirectoryNotMatch() throws Exception { } @Test - public void testCustomRootModule(@SysErr Capturable systemErr, @SysOut Capturable systemOut) - throws IOException { + public void testCustomRootModule(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { TestRootModuleChecker.reset(); - Main.main("-c", getPath("InputMainConfig-custom-root-module.xml"), + assertMainReturnCode(0, "-c", getPath("InputMainConfig-custom-root-module.xml"), getPath("InputMain.java")); assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) @@ -1762,10 +1717,8 @@ public void testCustomRootModule(@SysErr Capturable systemErr, @SysOut Capturabl @Test public void testCustomSimpleRootModule(@SysErr Capturable systemErr) { TestRootModuleChecker.reset(); - assertExitWithStatus(-2, () -> { - invokeMain("-c", getPath("InputMainConfig-custom-simple-root-module.xml"), + assertMainReturnCode(-2, "-c", getPath("InputMainConfig-custom-simple-root-module.xml"), getPath("InputMain.java")); - }); final String checkstylePackage = "com.puppycrawl.tools.checkstyle."; final Violation unableToInstantiateExceptionMessage = new Violation(1, Definitions.CHECKSTYLE_BUNDLE, @@ -1789,10 +1742,8 @@ public void testCustomSimpleRootModule(@SysErr Capturable systemErr) { @Test public void testExceptionOnExecuteIgnoredModuleWithUnknownModuleName( @SysErr Capturable systemErr) { - assertExitWithStatus(-2, () -> { - invokeMain("-c", getPath("InputMainConfig-non-existent-classname-ignore.xml"), + assertMainReturnCode(-2, "-c", getPath("InputMainConfig-non-existent-classname-ignore.xml"), "--executeIgnoredModules", getPath("InputMain.java")); - }); final String cause = "com.puppycrawl.tools.checkstyle.api.CheckstyleException:" + " cannot initialize module TreeWalker - "; assertWithMessage("Unexpected system error log") @@ -1803,10 +1754,8 @@ public void testExceptionOnExecuteIgnoredModuleWithUnknownModuleName( @Test public void testExceptionOnExecuteIgnoredModuleWithBadPropertyValue( @SysErr Capturable systemErr) { - assertExitWithStatus(-2, () -> { - invokeMain("-c", getPath("InputMainConfig-TypeName-bad-value.xml"), + assertMainReturnCode(-2, "-c", getPath("InputMainConfig-TypeName-bad-value.xml"), "--executeIgnoredModules", getPath("InputMain.java")); - }); final String cause = "com.puppycrawl.tools.checkstyle.api.CheckstyleException:" + " cannot initialize module TreeWalker - "; final String causeDetail = "it is not a boolean"; @@ -1820,8 +1769,8 @@ public void testExceptionOnExecuteIgnoredModuleWithBadPropertyValue( @Test public void testNoProblemOnExecuteIgnoredModuleWithBadPropertyValue( - @SysErr Capturable systemErr) throws IOException { - Main.main("-c", getPath("InputMainConfig-TypeName-bad-value.xml"), + @SysErr Capturable systemErr) { + assertMainReturnCode(0, "-c", getPath("InputMainConfig-TypeName-bad-value.xml"), "", getPath("InputMain.java")); assertWithMessage("Unexpected system error log") .that(systemErr.getCapturedData()) @@ -1830,7 +1779,7 @@ public void testNoProblemOnExecuteIgnoredModuleWithBadPropertyValue( @Test public void testMissingFiles(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { - assertExitWithStatus(-1, MainTest::invokeMain); + assertMainReturnCode(-1); final String usage = "Missing required parameter: '<files>'" + EOL + SHORT_USAGE; assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) @@ -1881,17 +1830,25 @@ public void testPlainOutputFormatCreateListener() throws IOException { } /** - * Helper method to run {@link Main#main(String...)} as {@link Runnable}. + * Helper method to run {@link Main#main(String...)} and verify the exit code. + * Uses {@link Mockito#mockStatic(Class)} to mock method {@link Runtime#exit(int)} + * to avoid VM termination. * + * @param expectedExitCode the expected exit code to verify * @param arguments the command line arguments + * @noinspection CallToSystemExit, ResultOfMethodCallIgnored */ - private static void invokeMain(String... arguments) { - try { + private static void assertMainReturnCode(int expectedExitCode, String... arguments) { + final Runtime mock = mock(Runtime.class); + try (MockedStatic<Runtime> runtime = mockStatic(Runtime.class)) { + runtime.when(Runtime::getRuntime) + .thenReturn(mock); Main.main(arguments); } catch (IOException exception) { - assertWithMessage("Unexpected exception: " + exception).fail(); + assertWithMessage("Unexpected exception: %s", exception).fail(); } + verify(mock).exit(expectedExitCode); } /**
Replace System.exit with Runtime.exit Prerequisite for #9146 Switching to Java11 breaks pitest-main report: ![image](https://user-images.githubusercontent.com/900805/148722335-3682b9e5-49b8-4353-b91a-059f2311866e.png) There is one "uncovered" line may be related to https://openjdk.java.net/jeps/181 The bytecode generated by JDK8 compiler almost the same as bytecode generated by JDK11 compiler. With one difference: JDK11 invokes `ExitHelper#exit` directly, JDK8 generates a helper method named `access$100`. We need another way to test the `Main.main` method. One possibility is to replace `System#exit` with `Runtime#exit`. From the [docs](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/System.html#exit(int)): > The call `System.exit(n)` is effectively equivalent to the call `Runtime.getRuntime().exit(n)` It is possible to mock `Runtime#exit` method and use `Mockito#verify` method to check the exit code passed.
2022-01-10T06:26:23Z
9.2
checkstyle/checkstyle
10,930
checkstyle__checkstyle-10930
[ "7504" ]
55dfdcdec20d3246dd5a0fc5aeac7ce822779e13
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnusedLocalVariableTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnusedLocalVariableTest.java new file mode 100644 --- /dev/null +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnusedLocalVariableTest.java @@ -0,0 +1,108 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2022 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package org.checkstyle.suppressionxpathfilter; + +import java.io.File; +import java.util.Arrays; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import com.puppycrawl.tools.checkstyle.DefaultConfiguration; +import com.puppycrawl.tools.checkstyle.checks.coding.UnusedLocalVariableCheck; + +public class XpathRegressionUnusedLocalVariableTest extends AbstractXpathTestSupport { + private final String checkName = UnusedLocalVariableCheck.class.getSimpleName(); + + @Override + protected String getCheckName() { + return checkName; + } + + @Test + public void testOne() throws Exception { + final File fileToProcess = new File(getPath( + "SuppressionXpathRegressionUnusedLocalVariableOne.java")); + + final DefaultConfiguration moduleConfig = + createModuleConfig(UnusedLocalVariableCheck.class); + + final String[] expectedViolation = { + "6:9: " + getCheckMessage(UnusedLocalVariableCheck.class, + UnusedLocalVariableCheck.MSG_UNUSED_LOCAL_VARIABLE, "a"), + }; + + final List<String> expectedXpathQueries = Arrays.asList( + "/COMPILATION_UNIT/CLASS_DEF[./IDENT[" + + "@text='SuppressionXpathRegressionUnusedLocalVariableOne']]/OBJBLOCK/" + + "METHOD_DEF[./IDENT[@text='foo']]/SLIST/VARIABLE_DEF[./IDENT[@text='a']]", + "/COMPILATION_UNIT/CLASS_DEF[./IDENT[" + + "@text='SuppressionXpathRegressionUnusedLocalVariableOne']]/OBJBLOCK/" + + "METHOD_DEF[./IDENT[@text='foo']]/SLIST/VARIABLE_DEF[" + + "./IDENT[@text='a']]/MODIFIERS", + "/COMPILATION_UNIT/CLASS_DEF[./IDENT[" + + "@text='SuppressionXpathRegressionUnusedLocalVariableOne']]/OBJBLOCK/" + + "METHOD_DEF[./IDENT[@text='foo']]/SLIST/VARIABLE_DEF[" + + "./IDENT[@text='a']]/TYPE", + "/COMPILATION_UNIT/CLASS_DEF[./IDENT[" + + "@text='SuppressionXpathRegressionUnusedLocalVariableOne']]/OBJBLOCK/" + + "METHOD_DEF[./IDENT[@text='foo']]/SLIST/VARIABLE_DEF[" + + "./IDENT[@text='a']]/TYPE/LITERAL_INT" + ); + + runVerifications(moduleConfig, fileToProcess, expectedViolation, + expectedXpathQueries); + } + + @Test + public void testTwo() throws Exception { + final File fileToProcess = new File(getPath( + "SuppressionXpathRegressionUnusedLocalVariableTwo.java")); + + final DefaultConfiguration moduleConfig = + createModuleConfig(UnusedLocalVariableCheck.class); + + final String[] expectedViolation = { + "10:9: " + getCheckMessage(UnusedLocalVariableCheck.class, + UnusedLocalVariableCheck.MSG_UNUSED_LOCAL_VARIABLE, "b"), + }; + + final List<String> expectedXpathQueries = Arrays.asList( + "/COMPILATION_UNIT/CLASS_DEF[./IDENT[" + + "@text='SuppressionXpathRegressionUnusedLocalVariableTwo']]/OBJBLOCK/" + + "METHOD_DEF[./IDENT[@text='foo']]/SLIST/VARIABLE_DEF[./IDENT[@text='b']]", + "/COMPILATION_UNIT/CLASS_DEF[./IDENT[" + + "@text='SuppressionXpathRegressionUnusedLocalVariableTwo']]/OBJBLOCK/" + + "METHOD_DEF[./IDENT[@text='foo']]/SLIST/VARIABLE_DEF[" + + "./IDENT[@text='b']]/MODIFIERS", + "/COMPILATION_UNIT/CLASS_DEF[./IDENT[" + + "@text='SuppressionXpathRegressionUnusedLocalVariableTwo']]/OBJBLOCK/" + + "METHOD_DEF[./IDENT[@text='foo']]/SLIST/VARIABLE_DEF[" + + "./IDENT[@text='b']]/TYPE", "/COMPILATION_UNIT/CLASS_DEF[" + + "./IDENT[@text='SuppressionXpathRegressionUnusedLocalVariableTwo']]/" + + "OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]/SLIST/VARIABLE_DEF[" + + "./IDENT[@text='b']]/TYPE/LITERAL_INT" + ); + + runVerifications(moduleConfig, fileToProcess, expectedViolation, + expectedXpathQueries); + + } +} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedlocalvariable/SuppressionXpathRegressionUnusedLocalVariableOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedlocalvariable/SuppressionXpathRegressionUnusedLocalVariableOne.java new file mode 100644 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedlocalvariable/SuppressionXpathRegressionUnusedLocalVariableOne.java @@ -0,0 +1,8 @@ +package org.checkstyle.suppressionxpathfilter.unusedlocalvariable; + +public class SuppressionXpathRegressionUnusedLocalVariableOne { + + public void foo() { + int a = 20; // warn + } +} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedlocalvariable/SuppressionXpathRegressionUnusedLocalVariableTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedlocalvariable/SuppressionXpathRegressionUnusedLocalVariableTwo.java new file mode 100644 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedlocalvariable/SuppressionXpathRegressionUnusedLocalVariableTwo.java @@ -0,0 +1,17 @@ +package org.checkstyle.suppressionxpathfilter.unusedlocalvariable; + +import java.util.function.Predicate; + +public class SuppressionXpathRegressionUnusedLocalVariableTwo { + + int b = 21; + + void foo() { + int b = 12; // warn + a(this.b); + } + + static void a(int a) { + } + +} diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java b/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java @@ -571,6 +571,8 @@ private static void fillChecksFromCodingPackage() { BASE_PACKAGE + ".checks.coding.NoArrayTrailingCommaCheck"); NAME_TO_FULL_MODULE_NAME.put("MatchXpathCheck", BASE_PACKAGE + ".checks.coding.MatchXpathCheck"); + NAME_TO_FULL_MODULE_NAME.put("UnusedLocalVariableCheck", + BASE_PACKAGE + ".checks.coding.UnusedLocalVariableCheck"); } /** diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/FullIdent.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/FullIdent.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/FullIdent.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/FullIdent.java @@ -85,7 +85,13 @@ private static void extractFullIdent(FullIdent full, DetailAST ast) { || nextSibling.getType() == TokenTypes.ANNOTATIONS) && isArrayTypeDeclaration(nextSibling); - if (ast.getType() == TokenTypes.DOT) { + final int typeOfAst = ast.getType(); + if (typeOfAst == TokenTypes.LITERAL_NEW + && ast.hasChildren()) { + final DetailAST firstChild = ast.getFirstChild(); + extractFullIdent(full, firstChild); + } + else if (typeOfAst == TokenTypes.DOT) { final DetailAST firstChild = ast.getFirstChild(); extractFullIdent(full, firstChild); full.append("."); @@ -96,7 +102,7 @@ else if (isArrayTypeDeclarationStart) { full.append(ast); appendBrackets(full, ast); } - else if (ast.getType() != TokenTypes.ANNOTATIONS) { + else if (typeOfAst != TokenTypes.ANNOTATIONS) { full.append(ast); } } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.java new file mode 100644 --- /dev/null +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.java @@ -0,0 +1,1135 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2022 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package com.puppycrawl.tools.checkstyle.checks.coding; + +import java.util.ArrayDeque; +import java.util.Collections; +import java.util.Deque; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Queue; +import java.util.stream.Collectors; + +import com.puppycrawl.tools.checkstyle.FileStatefulCheck; +import com.puppycrawl.tools.checkstyle.api.AbstractCheck; +import com.puppycrawl.tools.checkstyle.api.DetailAST; +import com.puppycrawl.tools.checkstyle.api.FullIdent; +import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption; +import com.puppycrawl.tools.checkstyle.utils.CheckUtil; +import com.puppycrawl.tools.checkstyle.utils.TokenUtil; + +/** + * <p> + * Checks that a local variable is declared and/or assigned, but not used. + * Doesn't support + * <a href="https://docs.oracle.com/javase/specs/jls/se17/html/jls-14.html#jls-14.30"> + * pattern variables yet</a>. + * Doesn't check + * <a href="https://docs.oracle.com/javase/specs/jls/se17/html/jls-4.html#jls-4.12.3"> + * array components</a> as array + * components are classified as different kind of variables by + * <a href="https://docs.oracle.com/javase/specs/jls/se17/html/index.html">JLS</a>. + * </p> + * <p> + * To configure the check: + * </p> + * <pre> + * &lt;module name=&quot;UnusedLocalVariable&quot;/&gt; + * </pre> + * <p> + * Example: + * </p> + * <pre> + * class Test { + * + * int a; + * + * { + * int k = 12; // violation, assigned and updated but never used + * k++; + * } + * + * Test(int a) { // ok as 'a' is a constructor parameter not a local variable + * this.a = 12; + * } + * + * void method(int b) { + * int a = 10; // violation + * int[] arr = {1, 2, 3}; // violation + * int[] anotherArr = {1}; // ok + * anotherArr[0] = 4; + * } + * + * String convertValue(String newValue) { + * String s = newValue.toLowerCase(); // violation + * return newValue.toLowerCase(); + * } + * + * void read() throws IOException { + * BufferedReader reader = new BufferedReader(new InputStreamReader(System.in)); + * String s; // violation + * while ((s = reader.readLine()) != null) { + * } + * try (BufferedReader reader1 // ok as 'reader1' is a resource and resources are closed + * // at the end of the statement + * = new BufferedReader(new FileReader("abc.txt"))) { + * } + * try { + * } catch (Exception e) { // ok as e is an exception parameter + * } + * } + * + * void loops() { + * int j = 12; + * for (int i = 0; j &lt; 11; i++) { // violation, unused local variable 'i'. + * } + * for (int p = 0; j &lt; 11; p++) // ok + * p /= 2; + * } + * + * void lambdas() { + * Predicate&lt;String&gt; obj = (String str) -&gt; { // ok as 'str' is a lambda parameter + * return true; + * }; + * obj.test("test"); + * } + * } + * </pre> + * <p> + * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker} + * </p> + * <p> + * Violation Message Keys: + * </p> + * <ul> + * <li> + * {@code unused.local.var} + * </li> + * </ul> + * + * @since 9.3 + */ +@FileStatefulCheck +public class UnusedLocalVariableCheck extends AbstractCheck { + + /** + * A key is pointing to the warning message text in "messages.properties" + * file. + */ + public static final String MSG_UNUSED_LOCAL_VARIABLE = "unused.local.var"; + + /** + * An array of increment and decrement tokens. + */ + private static final int[] INCREMENT_AND_DECREMENT_TOKENS = { + TokenTypes.POST_INC, + TokenTypes.POST_DEC, + TokenTypes.INC, + TokenTypes.DEC, + }; + + /** + * An array of scope tokens. + */ + private static final int[] SCOPES = { + TokenTypes.SLIST, + TokenTypes.LITERAL_FOR, + TokenTypes.OBJBLOCK, + }; + + /** + * An array of unacceptable children of ast of type {@link TokenTypes#DOT}. + */ + private static final int[] UNACCEPTABLE_CHILD_OF_DOT = { + TokenTypes.DOT, + TokenTypes.METHOD_CALL, + TokenTypes.LITERAL_NEW, + TokenTypes.LITERAL_SUPER, + TokenTypes.LITERAL_CLASS, + TokenTypes.LITERAL_THIS, + }; + + /** + * An array of unacceptable parent of ast of type {@link TokenTypes#IDENT}. + */ + private static final int[] UNACCEPTABLE_PARENT_OF_IDENT = { + TokenTypes.VARIABLE_DEF, + TokenTypes.DOT, + TokenTypes.LITERAL_NEW, + TokenTypes.PATTERN_VARIABLE_DEF, + TokenTypes.METHOD_CALL, + TokenTypes.TYPE, + }; + + /** + * An array of blocks in which local anon inner classes can exist. + */ + private static final int[] CONTAINERS_FOR_ANON_INNERS = { + TokenTypes.METHOD_DEF, + TokenTypes.CTOR_DEF, + TokenTypes.STATIC_INIT, + TokenTypes.INSTANCE_INIT, + TokenTypes.COMPACT_CTOR_DEF, + }; + + /** Package separator. */ + private static final String PACKAGE_SEPARATOR = "."; + + /** + * Keeps tracks of the variables declared in file. + */ + private final Deque<VariableDesc> variables; + + /** + * Keeps track of all the type declarations present in the file. + * Pops the type out of the stack while leaving the type + * in visitor pattern. + */ + private final Deque<TypeDeclDesc> typeDeclarations; + + /** + * Maps type declaration ast to their respective TypeDeclDesc objects. + */ + private final Map<DetailAST, TypeDeclDesc> typeDeclAstToTypeDeclDesc; + + /** + * Maps local anonymous inner class to the TypeDeclDesc object + * containing it. + */ + private final Map<DetailAST, TypeDeclDesc> anonInnerAstToTypeDeclDesc; + + /** + * Queue of tokens of type {@link UnusedLocalVariableCheck#CONTAINERS_FOR_ANON_INNERS} + * and {@link TokenTypes#LAMBDA} in some cases. + */ + private final Queue<DetailAST> anonInnerClassHolders; + + /** + * Name of the package. + */ + private String packageName; + + /** + * Depth at which a type declaration is nested, 0 for top level type declarations. + */ + private int depth; + + /** + * Block containing local anon inner class, keeps updating throughout the check. + * Acts as a tracker and checks whether the current node being visited is present + * inside the block containing a local anonymous inner class. + */ + private DetailAST blockContainingLocalAnonInnerClass; + + /** + * Creates a new {@code UnusedLocalVariableCheck} instance. + */ + public UnusedLocalVariableCheck() { + variables = new ArrayDeque<>(); + typeDeclarations = new ArrayDeque<>(); + typeDeclAstToTypeDeclDesc = new HashMap<>(); + anonInnerAstToTypeDeclDesc = new HashMap<>(); + anonInnerClassHolders = new ArrayDeque<>(); + blockContainingLocalAnonInnerClass = null; + packageName = ""; + depth = 0; + } + + @Override + public int[] getDefaultTokens() { + return new int[] { + TokenTypes.DOT, + TokenTypes.VARIABLE_DEF, + TokenTypes.IDENT, + TokenTypes.SLIST, + TokenTypes.LITERAL_FOR, + TokenTypes.OBJBLOCK, + TokenTypes.CLASS_DEF, + TokenTypes.INTERFACE_DEF, + TokenTypes.ANNOTATION_DEF, + TokenTypes.PACKAGE_DEF, + TokenTypes.LITERAL_NEW, + TokenTypes.METHOD_DEF, + TokenTypes.CTOR_DEF, + TokenTypes.STATIC_INIT, + TokenTypes.INSTANCE_INIT, + TokenTypes.COMPILATION_UNIT, + TokenTypes.LAMBDA, + TokenTypes.ENUM_DEF, + TokenTypes.RECORD_DEF, + TokenTypes.COMPACT_CTOR_DEF, + }; + } + + @Override + public int[] getAcceptableTokens() { + return getDefaultTokens(); + } + + @Override + public int[] getRequiredTokens() { + return getDefaultTokens(); + } + + @Override + public void beginTree(DetailAST root) { + // No need to set blockContainingLocalAnonInnerClass to null, if + // its value gets changed during the check then it is changed back to null + // inside the check only. + variables.clear(); + typeDeclarations.clear(); + typeDeclAstToTypeDeclDesc.clear(); + anonInnerAstToTypeDeclDesc.clear(); + anonInnerClassHolders.clear(); + packageName = ""; + depth = 0; + } + + @Override + public void visitToken(DetailAST ast) { + final int type = ast.getType(); + if (type == TokenTypes.DOT) { + visitDotToken(ast, variables); + } + else if (type == TokenTypes.VARIABLE_DEF) { + visitVariableDefToken(ast); + } + else if (type == TokenTypes.IDENT) { + visitIdentToken(ast, variables); + } + else if (TokenUtil.isTypeDeclaration(type)) { + visitTypeDeclarationToken(ast); + } + else if (type == TokenTypes.PACKAGE_DEF) { + packageName = extractQualifiedName(ast.getFirstChild().getNextSibling()); + } + else if (type == TokenTypes.LITERAL_NEW + && isInsideLocalAnonInnerClass(ast)) { + visitLocalAnonInnerClass(ast); + } + } + + @Override + public void leaveToken(DetailAST ast) { + if (TokenUtil.isOfType(ast, SCOPES)) { + logViolations(ast, variables); + } + else if (ast.getType() == TokenTypes.COMPILATION_UNIT) { + leaveCompilationUnit(); + } + else if (ast.equals(blockContainingLocalAnonInnerClass)) { + blockContainingLocalAnonInnerClass = null; + } + else if (isNonLocalTypeDeclaration(ast)) { + depth--; + typeDeclarations.pop(); + } + } + + /** + * Visit ast of type {@link TokenTypes#DOT}. + * + * @param dotAst dotAst + * @param variablesStack stack of all the relevant variables in the scope + */ + private void visitDotToken(DetailAST dotAst, Deque<VariableDesc> variablesStack) { + if (blockContainingLocalAnonInnerClass == null + && dotAst.getParent().getType() != TokenTypes.LITERAL_NEW + && shouldCheckIdentTokenNestedUnderDot(dotAst)) { + checkIdentifierAst(dotAst.findFirstToken(TokenTypes.IDENT), variablesStack); + } + } + + /** + * Visit ast of type {@link TokenTypes#VARIABLE_DEF}. + * + * @param varDefAst varDefAst + */ + private void visitVariableDefToken(DetailAST varDefAst) { + if (blockContainingLocalAnonInnerClass == null) { + addLocalVariables(varDefAst, variables); + addInstanceOrClassVar(varDefAst); + } + } + + /** + * Visit ast of type {@link TokenTypes#IDENT}. + * + * @param identAst identAst + * @param variablesStack stack of all the relevant variables in the scope + */ + private void visitIdentToken(DetailAST identAst, Deque<VariableDesc> variablesStack) { + if (blockContainingLocalAnonInnerClass == null) { + final DetailAST parentAst = identAst.getParent(); + if (!TokenUtil.isOfType(parentAst, UNACCEPTABLE_PARENT_OF_IDENT) + && shouldCheckIdentWithMethodRefParent(identAst)) { + checkIdentifierAst(identAst, variablesStack); + } + } + } + + /** + * Visit the type declaration token. + * + * @param typeDeclAst type declaration ast + */ + private void visitTypeDeclarationToken(DetailAST typeDeclAst) { + if (isNonLocalTypeDeclaration(typeDeclAst)) { + final String qualifiedName = getQualifiedTypeDeclarationName(typeDeclAst); + final TypeDeclDesc currTypeDecl = new TypeDeclDesc(qualifiedName, depth, typeDeclAst); + depth++; + typeDeclarations.push(currTypeDecl); + typeDeclAstToTypeDeclDesc.put(typeDeclAst, currTypeDecl); + } + } + + /** + * Visit the local anon inner class. + * + * @param literalNewAst literalNewAst + */ + private void visitLocalAnonInnerClass(DetailAST literalNewAst) { + anonInnerAstToTypeDeclDesc.put(literalNewAst, typeDeclarations.peek()); + if (blockContainingLocalAnonInnerClass == null) { + blockContainingLocalAnonInnerClass = getBlockContainingLocalAnonInnerClass( + literalNewAst); + anonInnerClassHolders.add(blockContainingLocalAnonInnerClass); + } + } + + /** + * Get name of package and super class of anon inner class by concatenating + * the identifier values under {@link TokenTypes#DOT}. + * Duplicated, until <a>https://github.com/checkstyle/checkstyle/issues/11201</a> + * + * @param ast ast to extract superclass or package name from + * @return qualified name + */ + private static String extractQualifiedName(DetailAST ast) { + return FullIdent.createFullIdent(ast).getText(); + } + + /** + * Whether ast node of type {@link TokenTypes#LITERAL_NEW} is a part of a local + * anonymous inner class. + * + * @param literalNewAst ast node of type {@link TokenTypes#LITERAL_NEW} + * @return true if variableDefAst is an instance variable in local anonymous inner class + */ + private static boolean isInsideLocalAnonInnerClass(DetailAST literalNewAst) { + boolean result = false; + final DetailAST lastChild = literalNewAst.getLastChild(); + if (lastChild != null && lastChild.getType() == TokenTypes.OBJBLOCK) { + DetailAST parentAst = literalNewAst.getParent(); + while (parentAst.getType() != TokenTypes.SLIST) { + if (parentAst.getType() == TokenTypes.ENUM_CONSTANT_DEF + || parentAst.getType() == TokenTypes.OBJBLOCK + && TokenUtil.isTypeDeclaration(parentAst.getParent().getType())) { + break; + } + parentAst = parentAst.getParent(); + } + result = parentAst.getType() == TokenTypes.SLIST; + } + return result; + } + + /** + * Traverse {@code variablesStack} stack and log the violations. + * + * @param scopeAst ast node of type {@link UnusedLocalVariableCheck#SCOPES} + * @param variablesStack stack of all the relevant variables in the scope + */ + private void logViolations(DetailAST scopeAst, Deque<VariableDesc> variablesStack) { + while (!variablesStack.isEmpty() && variablesStack.peek().getScope() == scopeAst) { + final VariableDesc variableDesc = variablesStack.pop(); + if (blockContainingLocalAnonInnerClass == null + && !variableDesc.isUsed() + && !variableDesc.isInstVarOrClassVar()) { + final DetailAST typeAst = variableDesc.getTypeAst(); + log(typeAst, MSG_UNUSED_LOCAL_VARIABLE, variableDesc.getName()); + } + } + } + + /** + * We process all the blocks containing local anonymous inner classes + * separately after processing all the other nodes. This is being done + * due to the fact the instance variables of local anon inner classes can + * cast a shadow on local variables. + */ + private void leaveCompilationUnit() { + while (!anonInnerClassHolders.isEmpty()) { + final DetailAST holder = anonInnerClassHolders.remove(); + iterateOverBlockContainingLocalAnonInnerClass(holder, new ArrayDeque<>()); + } + } + + /** + * Whether a type declaration is non-local. Annotated interfaces are always non-local. + * + * @param typeDeclAst type declaration ast + * @return true if type declaration is non-local + */ + private static boolean isNonLocalTypeDeclaration(DetailAST typeDeclAst) { + return typeDeclAst.getParent().getType() != TokenTypes.SLIST + && TokenUtil.isTypeDeclaration(typeDeclAst.getType()); + } + + /** + * Get the block containing local anon inner class. + * + * @param literalNewAst ast node of type {@link TokenTypes#LITERAL_NEW} + * @return the block containing local anon inner class + */ + private static DetailAST getBlockContainingLocalAnonInnerClass(DetailAST literalNewAst) { + DetailAST parentAst = literalNewAst.getParent(); + DetailAST result = null; + while (!TokenUtil.isOfType(parentAst, CONTAINERS_FOR_ANON_INNERS)) { + if (parentAst.getType() == TokenTypes.LAMBDA + && parentAst.getParent() + .getParent().getParent().getType() == TokenTypes.OBJBLOCK) { + result = parentAst; + break; + } + parentAst = parentAst.getParent(); + result = parentAst; + } + return result; + } + + /** + * Add local variables to the {@code variablesStack} stack. + * Also adds the instance variables defined in a local anonymous inner class. + * + * @param varDefAst ast node of type {@link TokenTypes#VARIABLE_DEF} + * @param variablesStack stack of all the relevant variables in the scope + */ + private static void addLocalVariables(DetailAST varDefAst, Deque<VariableDesc> variablesStack) { + final DetailAST parentAst = varDefAst.getParent(); + final DetailAST grandParent = parentAst.getParent(); + final boolean isInstanceVarInLocalAnonymousInnerClass = + grandParent.getType() == TokenTypes.LITERAL_NEW + && isInsideLocalAnonInnerClass(grandParent); + if (isInstanceVarInLocalAnonymousInnerClass + || parentAst.getType() != TokenTypes.OBJBLOCK) { + final DetailAST ident = varDefAst.findFirstToken(TokenTypes.IDENT); + final VariableDesc desc = new VariableDesc(ident.getText(), + varDefAst.findFirstToken(TokenTypes.TYPE), findScopeOfVariable(varDefAst)); + if (isInstanceVarInLocalAnonymousInnerClass) { + desc.registerAsInstOrClassVar(); + } + variablesStack.push(desc); + } + } + + /** + * Add instance variables and class variables to the + * {@link TypeDeclDesc#instanceAndClassVarStack}. + * + * @param varDefAst ast node of type {@link TokenTypes#VARIABLE_DEF} + */ + private void addInstanceOrClassVar(DetailAST varDefAst) { + final DetailAST parentAst = varDefAst.getParent(); + if (parentAst.getType() == TokenTypes.OBJBLOCK + && isNonLocalTypeDeclaration(parentAst.getParent()) + && !isPrivateInstanceVariable(varDefAst)) { + final DetailAST ident = varDefAst.findFirstToken(TokenTypes.IDENT); + final VariableDesc desc = new VariableDesc(ident.getText(), + varDefAst.findFirstToken(TokenTypes.TYPE), findScopeOfVariable(varDefAst)); + typeDeclAstToTypeDeclDesc.get(parentAst.getParent()).addInstOrClassVar(desc); + } + } + + /** + * Whether instance variable or class variable have private access modifier. + * + * @param varDefAst ast node of type {@link TokenTypes#VARIABLE_DEF} + * @return true if instance variable or class variable have private access modifier + */ + private static boolean isPrivateInstanceVariable(DetailAST varDefAst) { + final AccessModifierOption varAccessModifier = + CheckUtil.getAccessModifierFromModifiersToken(varDefAst); + return varAccessModifier == AccessModifierOption.PRIVATE; + } + + /** + * Get the {@link TypeDeclDesc} of the super class of anonymous inner class. + * + * @param literalNewAst ast node of type {@link TokenTypes#LITERAL_NEW} + * @return {@link TypeDeclDesc} of the super class of anonymous inner class + */ + private TypeDeclDesc getSuperClassOfAnonInnerClass(DetailAST literalNewAst) { + TypeDeclDesc obtainedClass = null; + final String shortNameOfClass = getShortNameOfAnonInnerClass(literalNewAst); + + final List<TypeDeclDesc> typeDeclWithSameName = typeDeclWithSameName(shortNameOfClass); + if (!typeDeclWithSameName.isEmpty()) { + obtainedClass = getTheNearestClass( + anonInnerAstToTypeDeclDesc.get(literalNewAst).getQualifiedName(), + typeDeclWithSameName); + } + return obtainedClass; + } + + /** + * Get the short name of super class of anonymous inner class. + * Example- + * <pre> + * TestClass.NestedClass obj = new Test().new NestedClass() {}; + * // Short name will be Test.NestedClass + * </pre> + * + * @param literalNewAst ast node of type {@link TokenTypes#LITERAL_NEW} + * @return short name of base class of anonymous inner class + */ + public static String getShortNameOfAnonInnerClass(DetailAST literalNewAst) { + DetailAST parentAst = literalNewAst.getParent(); + while (TokenUtil.isOfType(parentAst, TokenTypes.LITERAL_NEW, TokenTypes.DOT)) { + parentAst = parentAst.getParent(); + } + final DetailAST firstChild = parentAst.getFirstChild(); + return extractQualifiedName(firstChild); + } + + /** + * Add non-private instance and class variables of the super class of the anonymous class + * to the variables stack. + * + * @param obtainedClass super class of the anon inner class + * @param variablesStack stack of all the relevant variables in the scope + * @param literalNewAst ast node of type {@link TokenTypes#LITERAL_NEW} + */ + private void modifyVariablesStack(TypeDeclDesc obtainedClass, + Deque<VariableDesc> variablesStack, + DetailAST literalNewAst) { + if (obtainedClass != null) { + final Deque<VariableDesc> instAndClassVarDeque = typeDeclAstToTypeDeclDesc + .get(obtainedClass.getTypeDeclAst()) + .getUpdatedCopyOfVarStack(literalNewAst); + instAndClassVarDeque.forEach(variablesStack::push); + } + } + + /** + * Checks if there is a type declaration with same name as the super class. + * Duplicated, until <a>https://github.com/checkstyle/checkstyle/issues/11201</a> + * + * @param superClassName name of the super class + * @return true if there is another type declaration with same name. + * @noinspection CallToStringConcatCanBeReplacedByOperator + */ + private List<TypeDeclDesc> typeDeclWithSameName(String superClassName) { + return typeDeclAstToTypeDeclDesc.values().stream() + .filter(typeDeclDesc -> { + return typeDeclDesc.getQualifiedName() + .endsWith(PACKAGE_SEPARATOR.concat(superClassName)); + }) + .collect(Collectors.toList()); + } + + /** + * For all type declarations with the same name as the superclass, gets the nearest type + * declaration. + * Duplicated, until <a>https://github.com/checkstyle/checkstyle/issues/11201</a> + * + * @param outerTypeDeclName outer type declaration of anonymous inner class + * @param typeDeclWithSameName typeDeclarations which have the same name as the super class + * @return the nearest class + */ + private static TypeDeclDesc getTheNearestClass(String outerTypeDeclName, + List<TypeDeclDesc> typeDeclWithSameName) { + return Collections.min(typeDeclWithSameName, (first, second) -> { + int diff = Integer.compare( + typeDeclNameMatchingCount(outerTypeDeclName, second.getQualifiedName()), + typeDeclNameMatchingCount(outerTypeDeclName, first.getQualifiedName())); + if (diff == 0) { + diff = Integer.compare(first.getDepth(), second.getDepth()); + } + return diff; + }); + } + + /** + * Calculates and returns the type declaration name matching count. + * + * <p> + * Suppose our pattern class is {@code foo.a.b} and class to be matched is + * {@code foo.a.ball} then type declaration name matching count would be calculated by + * comparing every character, and updating main counter when we hit "." to prevent matching + * "a.b" with "a.ball". In this case type declaration name matching count + * would be equal to 6 and not 7 (b of ball is not counted). + * </p> + * Duplicated, until <a>https://github.com/checkstyle/checkstyle/issues/11201</a> + * + * @param patternClass class against which the given class has to be matched + * @param classToBeMatched class to be matched + * @return class name matching count + */ + private static int typeDeclNameMatchingCount(String patternClass, String classToBeMatched) { + final char packageSeparator = PACKAGE_SEPARATOR.charAt(0); + final int length = Math.min(classToBeMatched.length(), patternClass.length()); + int result = 0; + for (int i = 0; i < length && patternClass.charAt(i) == classToBeMatched.charAt(i); ++i) { + if (patternClass.charAt(i) == packageSeparator) { + result = i; + } + } + return result; + } + + /** + * Get qualified type declaration name from type ast. + * Duplicated, until <a>https://github.com/checkstyle/checkstyle/issues/11201</a> + * + * @param typeDeclAst type declaration ast + * @return qualified name of type declaration + */ + private String getQualifiedTypeDeclarationName(DetailAST typeDeclAst) { + final String className = typeDeclAst.findFirstToken(TokenTypes.IDENT).getText(); + String outerClassQualifiedName = null; + if (!typeDeclarations.isEmpty()) { + outerClassQualifiedName = typeDeclarations.peek().getQualifiedName(); + } + return getQualifiedTypeDeclarationName(packageName, outerClassQualifiedName, className); + } + + /** + * Get the qualified name of type declaration by combining {@code packageName}, + * {@code outerClassQualifiedName} and {@code className}. + * Duplicated, until <a>https://github.com/checkstyle/checkstyle/issues/11201</a> + * + * @param packageName packageName + * @param outerClassQualifiedName outerClassQualifiedName + * @param className className + * @return the qualified name of type declaration by combining {@code packageName}, + * {@code outerClassQualifiedName} and {@code className} + */ + private static String getQualifiedTypeDeclarationName(String packageName, + String outerClassQualifiedName, String className) { + final String qualifiedClassName; + + if (outerClassQualifiedName == null) { + if (packageName.isEmpty()) { + qualifiedClassName = className; + } + else { + qualifiedClassName = packageName + PACKAGE_SEPARATOR + className; + } + } + else { + qualifiedClassName = outerClassQualifiedName + PACKAGE_SEPARATOR + className; + } + return qualifiedClassName; + } + + /** + * Iterate over all the ast nodes present under {@code ast}. + * + * @param ast ast + * @param variablesStack stack of all the relevant variables in the scope + */ + private void iterateOverBlockContainingLocalAnonInnerClass( + DetailAST ast, Deque<VariableDesc> variablesStack) { + DetailAST currNode = ast; + while (currNode != null) { + customVisitToken(currNode, variablesStack); + DetailAST toVisit = currNode.getFirstChild(); + while (currNode != ast && toVisit == null) { + customLeaveToken(currNode, variablesStack); + toVisit = currNode.getNextSibling(); + currNode = currNode.getParent(); + } + currNode = toVisit; + } + } + + /** + * Visit all ast nodes under {@link UnusedLocalVariableCheck#anonInnerClassHolders} once + * again. + * + * @param ast ast + * @param variablesStack stack of all the relevant variables in the scope + */ + private void customVisitToken(DetailAST ast, Deque<VariableDesc> variablesStack) { + final int type = ast.getType(); + if (type == TokenTypes.DOT) { + visitDotToken(ast, variablesStack); + } + else if (type == TokenTypes.VARIABLE_DEF) { + addLocalVariables(ast, variablesStack); + } + else if (type == TokenTypes.IDENT) { + visitIdentToken(ast, variablesStack); + } + else if (type == TokenTypes.LITERAL_NEW + && isInsideLocalAnonInnerClass(ast)) { + final TypeDeclDesc obtainedClass = getSuperClassOfAnonInnerClass(ast); + modifyVariablesStack(obtainedClass, variablesStack, ast); + } + } + + /** + * Visit all ast nodes under {@link UnusedLocalVariableCheck#anonInnerClassHolders} once + * again. + * + * @param ast ast + * @param variablesStack stack of all the relevant variables in the scope + */ + private void customLeaveToken(DetailAST ast, Deque<VariableDesc> variablesStack) { + if (TokenUtil.isOfType(ast, SCOPES)) { + logViolations(ast, variablesStack); + } + } + + /** + * Whether an ident with parent node of type {@link TokenTypes#METHOD_REF} + * should be checked or not. + * + * @param identAst identAst + * @return true if an ident with parent node of type {@link TokenTypes#METHOD_REF} + * should be checked or if the parent type is not {@link TokenTypes#METHOD_REF} + */ + public static boolean shouldCheckIdentWithMethodRefParent(DetailAST identAst) { + final DetailAST parent = identAst.getParent(); + boolean result = true; + if (parent.getType() == TokenTypes.METHOD_REF) { + result = parent.getFirstChild() == identAst + && parent.getLastChild().getType() != TokenTypes.LITERAL_NEW; + } + return result; + } + + /** + * Whether to check identifier token nested under dotAst. + * + * @param dotAst dotAst + * @return true if ident nested under dotAst should be checked + */ + public static boolean shouldCheckIdentTokenNestedUnderDot(DetailAST dotAst) { + + return !TokenUtil.findFirstTokenByPredicate(dotAst, + childAst -> { + return TokenUtil.isOfType(childAst, + UNACCEPTABLE_CHILD_OF_DOT); + }) + .isPresent(); + } + + /** + * Checks the identifier ast. + * + * @param identAst ast of type {@link TokenTypes#IDENT} + * @param variablesStack stack of all the relevant variables in the scope + */ + private static void checkIdentifierAst(DetailAST identAst, Deque<VariableDesc> variablesStack) { + for (VariableDesc variableDesc : variablesStack) { + if (identAst.getText().equals(variableDesc.getName()) + && !isLeftHandSideValue(identAst)) { + if (!variableDesc.isInstVarOrClassVar()) { + variableDesc.registerAsUsed(); + } + break; + } + } + } + + /** + * Find the scope of variable. + * + * @param variableDef ast of type {@link TokenTypes#VARIABLE_DEF} + * @return scope of variableDef + */ + private static DetailAST findScopeOfVariable(DetailAST variableDef) { + final DetailAST result; + final DetailAST parentAst = variableDef.getParent(); + if (TokenUtil.isOfType(parentAst, TokenTypes.SLIST, TokenTypes.OBJBLOCK)) { + result = parentAst; + } + else { + final DetailAST grandParent = parentAst.getParent(); + final DetailAST scopeAst = grandParent.findFirstToken(TokenTypes.SLIST); + if (scopeAst == null) { + result = grandParent; + } + else { + result = scopeAst; + } + } + return result; + } + + /** + * Checks whether the ast of type {@link TokenTypes#IDENT} is + * used as left-hand side value. An identifier is being used as a left-hand side + * value if it is used as the left operand of an assignment or as an + * operand of a stand-alone increment or decrement. + * + * @param identAst ast of type {@link TokenTypes#IDENT} + * @return true if identAst is used as a left-hand side value + */ + private static boolean isLeftHandSideValue(DetailAST identAst) { + final DetailAST parent = identAst.getParent(); + return isStandAloneIncrementOrDecrement(identAst) + || parent.getType() == TokenTypes.ASSIGN + && identAst != parent.getLastChild(); + } + + /** + * Checks whether the ast of type {@link TokenTypes#IDENT} is used as + * an operand of a stand-alone increment or decrement. + * + * @param identAst ast of type {@link TokenTypes#IDENT} + * @return true if identAst is used as an operand of stand-alone + * increment or decrement + */ + private static boolean isStandAloneIncrementOrDecrement(DetailAST identAst) { + final DetailAST parent = identAst.getParent(); + final DetailAST grandParent = parent.getParent(); + return TokenUtil.isOfType(parent, INCREMENT_AND_DECREMENT_TOKENS) + && TokenUtil.isOfType(grandParent, TokenTypes.EXPR) + && !isIncrementOrDecrementVariableUsed(grandParent); + } + + /** + * A variable with increment or decrement operator is considered used if it + * is used as an argument or as an array index or for assigning value + * to a variable. + * + * @param exprAst ast of type {@link TokenTypes#EXPR} + * @return true if variable nested in exprAst is used + */ + private static boolean isIncrementOrDecrementVariableUsed(DetailAST exprAst) { + return TokenUtil.isOfType(exprAst.getParent(), + TokenTypes.ELIST, TokenTypes.INDEX_OP, TokenTypes.ASSIGN) + && exprAst.getParent().getParent().getType() != TokenTypes.FOR_ITERATOR; + } + + /** + * Maintains information about the variable. + */ + private static final class VariableDesc { + + /** + * The name of the variable. + */ + private final String name; + + /** + * Ast of type {@link TokenTypes#TYPE}. + */ + private final DetailAST typeAst; + + /** + * The scope of variable is determined by the ast of type + * {@link TokenTypes#SLIST} or {@link TokenTypes#LITERAL_FOR} + * or {@link TokenTypes#OBJBLOCK} which is enclosing the variable. + */ + private final DetailAST scope; + + /** + * Is an instance variable or a class variable. + */ + private boolean instVarOrClassVar; + + /** + * Is the variable used. + */ + private boolean used; + + /** + * Create a new VariableDesc instance. + * + * @param name name of the variable + * @param typeAst ast of type {@link TokenTypes#TYPE} + * @param scope ast of type {@link TokenTypes#SLIST} or + * {@link TokenTypes#LITERAL_FOR} or {@link TokenTypes#OBJBLOCK} + * which is enclosing the variable + */ + /* package */ VariableDesc(String name, DetailAST typeAst, DetailAST scope) { + this.name = name; + this.typeAst = typeAst; + this.scope = scope; + } + + /** + * Get the name of variable. + * + * @return name of variable + */ + public String getName() { + return name; + } + + /** + * Get the associated ast node of type {@link TokenTypes#TYPE}. + * + * @return the associated ast node of type {@link TokenTypes#TYPE} + */ + public DetailAST getTypeAst() { + return typeAst; + } + + /** + * Get ast of type {@link TokenTypes#SLIST} + * or {@link TokenTypes#LITERAL_FOR} or {@link TokenTypes#OBJBLOCK} + * which is enclosing the variable i.e. its scope. + * + * @return the scope associated with the variable + */ + public DetailAST getScope() { + return scope; + } + + /** + * Register the variable as used. + */ + public void registerAsUsed() { + used = true; + } + + /** + * Register the variable as an instance variable or + * class variable. + */ + public void registerAsInstOrClassVar() { + instVarOrClassVar = true; + } + + /** + * Is the variable used or not. + * + * @return true if variable is used + */ + public boolean isUsed() { + return used; + } + + /** + * Is an instance variable or a class variable. + * + * @return true if is an instance variable or a class variable + */ + public boolean isInstVarOrClassVar() { + return instVarOrClassVar; + } + } + + /** + * Maintains information about the type declaration. + * Any ast node of type {@link TokenTypes#CLASS_DEF} or {@link TokenTypes#INTERFACE_DEF} + * or {@link TokenTypes#ENUM_DEF} or {@link TokenTypes#ANNOTATION_DEF} + * or {@link TokenTypes#RECORD_DEF} is considered as a type declaration. + */ + private static class TypeDeclDesc { + + /** + * Complete type declaration name with package name and outer type declaration name. + */ + private final String qualifiedName; + + /** + * Depth of nesting of type declaration. + */ + private final int depth; + + /** + * Type declaration ast node. + */ + private final DetailAST typeDeclAst; + + /** + * A stack of type declaration's instance and static variables. + */ + private final Deque<VariableDesc> instanceAndClassVarStack; + + /** + * Create a new TypeDeclDesc instance. + * + * @param qualifiedName qualified name + * @param depth depth of nesting + * @param typeDeclAst type declaration ast node + */ + /* package */ TypeDeclDesc(String qualifiedName, int depth, + DetailAST typeDeclAst) { + this.qualifiedName = qualifiedName; + this.depth = depth; + this.typeDeclAst = typeDeclAst; + instanceAndClassVarStack = new ArrayDeque<>(); + } + + /** + * Get the complete type declaration name i.e. type declaration name with package name + * and outer type declaration name. + * + * @return qualified class name + */ + public String getQualifiedName() { + return qualifiedName; + } + + /** + * Get the depth of type declaration. + * + * @return the depth of nesting of type declaration + */ + public int getDepth() { + return depth; + } + + /** + * Get the type declaration ast node. + * + * @return ast node of the type declaration + */ + public DetailAST getTypeDeclAst() { + return typeDeclAst; + } + + /** + * Get the copy of variables in instanceAndClassVar stack with updated scope. + * + * @param literalNewAst ast node of type {@link TokenTypes#LITERAL_NEW} + * @return copy of variables in instanceAndClassVar stack with updated scope. + */ + public Deque<VariableDesc> getUpdatedCopyOfVarStack(DetailAST literalNewAst) { + final DetailAST updatedScope = literalNewAst.getLastChild(); + final Deque<VariableDesc> instAndClassVarDeque = new ArrayDeque<>(); + instanceAndClassVarStack.forEach(instVar -> { + final VariableDesc variableDesc = new VariableDesc(instVar.getName(), + instVar.getTypeAst(), updatedScope); + variableDesc.registerAsInstOrClassVar(); + instAndClassVarDeque.push(variableDesc); + }); + return instAndClassVarDeque; + } + + /** + * Add an instance variable or class variable to the stack. + * + * @param variableDesc variable to be added + */ + public void addInstOrClassVar(VariableDesc variableDesc) { + instanceAndClassVarStack.push(variableDesc); + } + } +}
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheckTest.java new file mode 100644 --- /dev/null +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheckTest.java @@ -0,0 +1,350 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2022 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package com.puppycrawl.tools.checkstyle.checks.coding; + +import static com.google.common.truth.Truth.assertWithMessage; +import static com.puppycrawl.tools.checkstyle.checks.coding.UnusedLocalVariableCheck.MSG_UNUSED_LOCAL_VARIABLE; + +import java.io.File; +import java.util.Collection; +import java.util.Map; +import java.util.Optional; +import java.util.function.Predicate; + +import org.junit.jupiter.api.Test; + +import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport; +import com.puppycrawl.tools.checkstyle.JavaParser; +import com.puppycrawl.tools.checkstyle.api.DetailAST; +import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.internal.utils.TestUtil; + +public class UnusedLocalVariableCheckTest extends AbstractModuleTestSupport { + + @Override + protected String getPackageLocation() { + return "com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable"; + } + + @Test + public void testGetRequiredTokens() { + final UnusedLocalVariableCheck checkObj = + new UnusedLocalVariableCheck(); + final int[] actual = checkObj.getRequiredTokens(); + final int[] expected = { + TokenTypes.DOT, + TokenTypes.VARIABLE_DEF, + TokenTypes.IDENT, + TokenTypes.SLIST, + TokenTypes.LITERAL_FOR, + TokenTypes.OBJBLOCK, + TokenTypes.CLASS_DEF, + TokenTypes.INTERFACE_DEF, + TokenTypes.ANNOTATION_DEF, + TokenTypes.PACKAGE_DEF, + TokenTypes.LITERAL_NEW, + TokenTypes.METHOD_DEF, + TokenTypes.CTOR_DEF, + TokenTypes.STATIC_INIT, + TokenTypes.INSTANCE_INIT, + TokenTypes.COMPILATION_UNIT, + TokenTypes.LAMBDA, + TokenTypes.ENUM_DEF, + TokenTypes.RECORD_DEF, + TokenTypes.COMPACT_CTOR_DEF, + }; + assertWithMessage("Required tokens are invalid") + .that(actual) + .isEqualTo(expected); + } + + @Test + public void testGetAcceptableTokens() { + final UnusedLocalVariableCheck typeParameterNameCheckObj = + new UnusedLocalVariableCheck(); + final int[] actual = typeParameterNameCheckObj.getAcceptableTokens(); + final int[] expected = { + TokenTypes.DOT, + TokenTypes.VARIABLE_DEF, + TokenTypes.IDENT, + TokenTypes.SLIST, + TokenTypes.LITERAL_FOR, + TokenTypes.OBJBLOCK, + TokenTypes.CLASS_DEF, + TokenTypes.INTERFACE_DEF, + TokenTypes.ANNOTATION_DEF, + TokenTypes.PACKAGE_DEF, + TokenTypes.LITERAL_NEW, + TokenTypes.METHOD_DEF, + TokenTypes.CTOR_DEF, + TokenTypes.STATIC_INIT, + TokenTypes.INSTANCE_INIT, + TokenTypes.COMPILATION_UNIT, + TokenTypes.LAMBDA, + TokenTypes.ENUM_DEF, + TokenTypes.RECORD_DEF, + TokenTypes.COMPACT_CTOR_DEF, + }; + assertWithMessage("Acceptable tokens are invalid") + .that(actual) + .isEqualTo(expected); + } + + @Test + public void testUnusedLocalVariable() throws Exception { + final String[] expected = { + "27:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "sameName"), + "28:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "b"), + "31:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "testInLambdas"), + "33:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "coding"), + "34:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, + "InputUnusedLocalVariable"), + "50:13: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "b"), + "54:13: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "c"), + "65:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "b"), + "67:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "c"), + "71:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "p"), + "81:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "f"), + "84:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "foo"), + "91:13: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "a"), + }; + verifyWithInlineConfigParser( + getPath("InputUnusedLocalVariable.java"), expected); + } + + @Test + public void testUnusedLocalVar2() throws Exception { + final String[] expected = { + "17:14: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "i"), + "19:14: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "j"), + "30:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "a"), + "31:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "b"), + "39:13: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "b"), + "40:13: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "Test"), + "41:13: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "obj"), + "61:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "a"), + "76:17: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "b"), + }; + verifyWithInlineConfigParser( + getPath("InputUnusedLocalVariable2.java"), + expected); + } + + @Test + public void testUnusedLocalVarInAnonInnerClasses() throws Exception { + final String[] expected = { + "14:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "a"), + "15:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "b"), + "17:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "obj"), + "22:17: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "obj"), + "32:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "obj2"), + "46:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "m"), + "47:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "l"), + "59:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "h"), + "62:17: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "v"), + }; + verifyWithInlineConfigParser( + getPath("InputUnusedLocalVariableAnonInnerClasses.java"), + expected); + } + + @Test + public void testUnusedLocalVarGenericAnonInnerClasses() throws Exception { + final String[] expected = { + "13:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "l"), + "14:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "obj"), + "33:13: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "l"), + "34:13: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "obj2"), + "47:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "s"), + "67:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "variable"), + "69:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "anotherVar"), + "78:47: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "obj2"), + }; + verifyWithInlineConfigParser( + getPath("InputUnusedLocalVariableGenericAnonInnerClasses.java"), + expected); + } + + @Test + public void testUnusedLocalVarDepthOfClasses() throws Exception { + final String[] expected = { + "28:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "r"), + "49:21: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "a"), + "64:13: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "a"), + "94:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "variable"), + }; + verifyWithInlineConfigParser( + getPath("InputUnusedLocalVariableDepthOfClasses.java"), + expected); + } + + @Test + public void testUnusedLocalVarNestedClasses() throws Exception { + final String[] expected = { + "21:13: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "V"), + "23:13: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "S"), + "24:13: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "Q"), + "36:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "variable"), + "44:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "anotherVariable"), + "67:21: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "s"), + "68:21: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "n"), + }; + verifyWithInlineConfigParser( + getPath("InputUnusedLocalVariableNestedClasses.java"), + expected); + } + + @Test + public void testUnusedLocalVarEnum() throws Exception { + final String[] expected = { + "22:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "a"), + "50:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "a"), + "77:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "a"), + "80:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "j"), + "92:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "d"), + }; + verifyWithInlineConfigParser( + getPath("InputUnusedLocalVariableEnum.java"), + expected); + } + + @Test + public void testUnusedLocalVarRecords() throws Exception { + final String[] expected = { + "16:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "var1"), + "25:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "var1"), + "26:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "obj"), + "36:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "var2"), + }; + verifyWithInlineConfigParser( + getNonCompilablePath("InputUnusedLocalVariableRecords.java"), + expected); + } + + @Test + public void testClearStateVariables() throws Exception { + final UnusedLocalVariableCheck check = new UnusedLocalVariableCheck(); + final Optional<DetailAST> methodDef = TestUtil.findTokenInAstByPredicate( + JavaParser.parseFile( + new File(getPath("InputUnusedLocalVariable.java")), + JavaParser.Options.WITHOUT_COMMENTS), + ast -> ast.getType() == TokenTypes.METHOD_DEF); + assertWithMessage("Ast should contain METHOD_DEF") + .that(methodDef.isPresent()) + .isTrue(); + final DetailAST variableDef = methodDef.get().getLastChild() + .findFirstToken(TokenTypes.VARIABLE_DEF); + assertWithMessage("State is not cleared on beginTree") + .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, variableDef, + "variables", + variables -> { + return ((Collection<?>) variables).isEmpty(); + })) + .isTrue(); + } + + @Test + public void testClearStateClasses() throws Exception { + final UnusedLocalVariableCheck check = new UnusedLocalVariableCheck(); + final Optional<DetailAST> classDef = TestUtil.findTokenInAstByPredicate( + JavaParser.parseFile( + new File(getPath("InputUnusedLocalVariable.java")), + JavaParser.Options.WITHOUT_COMMENTS), + ast -> ast.getType() == TokenTypes.CLASS_DEF); + assertWithMessage("Ast should contain CLASS_DEF") + .that(classDef.isPresent()) + .isTrue(); + final DetailAST classDefToken = classDef.get(); + assertWithMessage("State is not cleared on beginTree") + .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, classDefToken, + "typeDeclarations", + typeDeclarations -> { + return ((Collection<?>) typeDeclarations).isEmpty(); + })) + .isTrue(); + assertWithMessage("State is not cleared on beginTree") + .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, classDefToken, + "typeDeclAstToTypeDeclDesc", + typeDeclAstToTypeDeclDesc -> { + return ((Map<?, ?>) typeDeclAstToTypeDeclDesc).isEmpty(); + })) + .isTrue(); + assertWithMessage("State is not cleared on beginTree") + .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, classDefToken, + "depth", + depth -> { + return (int) depth == 0; + })) + .isTrue(); + } + + @Test + public void testClearStateAnonInnerClass() throws Exception { + final UnusedLocalVariableCheck check = new UnusedLocalVariableCheck(); + final DetailAST root = JavaParser.parseFile( + new File(getPath("InputUnusedLocalVariableAnonInnerClasses.java")), + JavaParser.Options.WITHOUT_COMMENTS); + // Not using TestUtil.isStatefulFieldClearedDuringBeginTree(..) because other + // nodes need to be processed first as those collections, maps are dependent on them. + final DetailAST classDefAst = root.findFirstToken(TokenTypes.CLASS_DEF); + final Optional<DetailAST> literalNew = TestUtil.findTokenInAstByPredicate(root, + ast -> ast.getType() == TokenTypes.LITERAL_NEW); + assertWithMessage("Ast should contain LITERAL_NEW") + .that(literalNew.isPresent()) + .isTrue(); + check.beginTree(root); + check.visitToken(classDefAst); + check.visitToken(literalNew.get()); + check.beginTree(null); + final Predicate<Object> isClear = anonInnerAstToTypeDesc -> { + return ((Map<?, ?>) anonInnerAstToTypeDesc).isEmpty(); + }; + assertWithMessage("State is not cleared on beginTree") + .that(isClear.test(TestUtil.getInternalState( + check, "anonInnerAstToTypeDeclDesc"))) + .isTrue(); + final Predicate<Object> isQueueClear = anonInnerClassHolders -> { + return ((Collection<?>) anonInnerClassHolders).isEmpty(); + }; + assertWithMessage("State is not cleared on beginTree") + .that(isQueueClear.test(TestUtil.getInternalState( + check, "anonInnerClassHolders"))) + .isTrue(); + } + + @Test + public void testClearStatePackageDef() throws Exception { + final UnusedLocalVariableCheck check = new UnusedLocalVariableCheck(); + final Optional<DetailAST> packageDef = TestUtil.findTokenInAstByPredicate( + JavaParser.parseFile( + new File(getPath("InputUnusedLocalVariable.java")), + JavaParser.Options.WITHOUT_COMMENTS), + ast -> ast.getType() == TokenTypes.PACKAGE_DEF); + assertWithMessage("Ast should contain PACKAGE_DEF") + .that(packageDef.isPresent()) + .isTrue(); + final DetailAST packageDefToken = packageDef.get(); + assertWithMessage("State is not cleared on beginTree") + .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, packageDefToken, + "packageName", + ""::equals)) + .isTrue(); + } +} diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReaderTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReaderTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReaderTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReaderTest.java @@ -46,20 +46,20 @@ protected String getPackageLocation() { @Test public void test() { - assertThat(XmlMetaReader.readAllModulesIncludingThirdPartyIfAny()).hasSize(198); + assertThat(XmlMetaReader.readAllModulesIncludingThirdPartyIfAny()).hasSize(199); } @Test public void testDuplicatePackage() { assertThat(XmlMetaReader .readAllModulesIncludingThirdPartyIfAny("com.puppycrawl.tools.checkstyle.meta")) - .hasSize(198); + .hasSize(199); } @Test public void testBadPackage() { assertThat(XmlMetaReader.readAllModulesIncludingThirdPartyIfAny("DOES.NOT.EXIST")) - .hasSize(198); + .hasSize(199); } @Test diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableRecords.java new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableRecords.java @@ -0,0 +1,53 @@ +/* +UnusedLocalVariable + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.coding.unusedlocalvariable; + +import java.util.function.Predicate; + +//non-compiled with javac: Compilable with Java14 +public record InputUnusedLocalVariableRecords(int a, int b) { + public InputUnusedLocalVariableRecords { + int ab = 12; // ok + ab += a; + int var1 = 1; // violation + new nested() { + void method() { + var1 += 12; + } + }; + } + + static Predicate<Integer> obj = a -> { + int var1 = 1; // violation + nested obj = new nested() { // violation + void method() { + var1 += 12; + } + }; + return a == 12; + }; + + public InputUnusedLocalVariableRecords(int a) { + this(a, -1); + int var2 = 12; // violation + inner obj = new InputUnusedLocalVariableRecords.inner() { + { + var2 += 12; + } + }; + obj.getClass(); + } + + + static class nested { + int var1 = 12; + } + + class inner { + int var2 = 1; + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariable.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariable.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariable.java @@ -0,0 +1,116 @@ +/* +UnusedLocalVariable + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.coding.unusedlocalvariable; + +import java.util.function.Predicate; + +public class InputUnusedLocalVariable { + + int sameName = 20; + + static int a = 12; + + static int b = 12; + + String s; + + Obj obj = new Obj() { + int a = 12; // ok + int b = 12; // ok + }; + + private void sameName(int unusedParameter) { + int sameName = 10; // violation + int b = 12; // violation + b = 23; + this.sameName /= 2; + int testInLambdas = 0; // violation + testInLambdas = 12; + int coding = 0; // violation + int InputUnusedLocalVariable = 1; // violation + com.puppycrawl.tools.checkstyle.checks + .coding.unusedlocalvariable + .InputUnusedLocalVariable.testInLambdas(a); + } + + public void testCallingMethods() { + int var = 21; // ok + sameName(var); + var = sameName; + } + + public static void testInLambdas(int q) { + int test = 21; // ok + int isInOuterScope = 32; // ok + Predicate<Integer> foo = integer -> { + int b; // violation + int a = integer; // ok + b = integer; + boolean ans = a > 12; // ok + int c = 21; // violation + c = -isInOuterScope; + return ans; + }; + foo.test(test); + } + + public void testMultipleIdentifiers() { + int[] arr = {1}; + int a = 21; + arr[0] = a; + Class<Integer> b = int.class; // violation + @SuppressWarnings("unused") + int c = 41; // violation + } + + public void testChainedCalls() throws InterruptedException { + Obj p; // violation + Obj q = null; // ok + p = q.foo().p; + if (s instanceof String) { + } + Boolean r = false; + while (r.booleanValue() != true) { + } + int a = 13, b = 21; + q.getClass().wait(a, b); + int f = 12; // violation + Predicate<String> obj = InputUnusedLocalVariable::f; + obj.test("test"); + int foo = 12; // violation + foo(q); + } + + class SubClass extends InputUnusedLocalVariable { + + void testSuperKeyword() { + int a = 12; // violation + a = super.a; + } + } + + class Obj { + Obj p; + + Obj foo() { + return new Obj(); + } + } + + Object foo(Object a) { + return a; + } + + public static boolean f(String a) { + + class k { // local class not to be added to "classes" stack + int a = 12; + } + return true; + } + +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariable2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariable2.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariable2.java @@ -0,0 +1,107 @@ +/* +UnusedLocalVariable + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.coding.unusedlocalvariable; + +import java.util.ArrayList; +import java.util.function.Predicate; + +public class InputUnusedLocalVariable2 { + int a = 12; + + public void testStatementsWithoutSlistToken() { + int k = 1; + for (int i = 0; k < 1; i++) // violation + i++; + for (int j = 0; ; ) { // violation + j++; + break; + } + ArrayList<String> obj = new ArrayList<>(); + for (String s : obj) { + System.out.println(s); + } + } + + public void testChainedCallsWithNewKeyword() { + Object a; // violation + Object b; // violation + a = testDifferentAssignments(new c.b(new d.a())); + a = testDifferentAssignments(new b().new a()); + b = testDifferentAssignments(new a.d()); + } + + static class Test implements a { + public void testMethodReference() { + int b = 12; // violation + int Test = 12; // violation + a obj = Test::new; // violation + Test ab = new Test(); + Predicate<String> a = ab::b; + a.test("abc"); + } + + private boolean b(String s) { + return true; + } + + public static boolean ba(String s) { + return true; + } + + @Override + public void method() { + } + } + + public Object testDifferentAssignments(Object obj) { + int a = 12; // violation + a = 13; + int b = 13; // ok + b /= 12; + int c = 1; // ok + c -= this.a; + int h = 1; // ok + h <<= 12; + return null; + } + + public void testDoWhileLoops(int s) { + do { + int a = 12; // ok + do { + int b = 1; // violation + b = a; + } + while (s > 1); + } + while (s > 0); + } + + interface a { + void method(); + + class d { + } + } + + static class c { + static class b { + public b(Object a) { + } + } + } + + static class d { + public static class a { + } + } + + class b { + class a { + } + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableAnonInnerClasses.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableAnonInnerClasses.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableAnonInnerClasses.java @@ -0,0 +1,86 @@ +/* +UnusedLocalVariable + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.coding.unusedlocalvariable; + +public class InputUnusedLocalVariableAnonInnerClasses { + + static int a = 12, b = 13, c = 14; + + public void testAnonymousInnerClass() { + int a = 12; // violation + int b = 12; // violation + int k = 14; // ok + Test obj = new Test() { // violation + int a = 2; + + private void testSameName(int s) { + s = a + InputUnusedLocalVariable.a; + Test obj = new Test() { // violation + int b = 1; + + private void testSameNameNested(int s) { + s = b + InputUnusedLocalVariable.b + InputUnusedLocalVariable.a + a + k; + } + }; + } + }; + + Test obj2; // violation + obj2 = new Test() { + int a = 1; + int b = 1; + int c = 0; // ok + + private void testSameName(int s) { + s = a + b + this.a + this.b + InputUnusedLocalVariableAnonInnerClasses.a + + InputUnusedLocalVariableAnonInnerClasses.b; + } + }; + } + + { + int m = 12; // violation + int l = 2; // violation + d obj = new d() { + void method() { + m += l; + } + }; + obj.getClass(); + } + + static { + int a = 1; + int x = 2; + int h = 3; // violation + m.Test obj = new m().new Test() { + void method() { + boolean v = // violation + a == x == (h == 2); + } + }; + obj.getClass(); + } + + class Test { + private int k = 1; + } + + static class m { + public int x = 1; + + class Test { + public int h = 12; + } + } + + class d { + protected int m = 11; + int l = 14; + } + +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableDepthOfClasses.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableDepthOfClasses.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableDepthOfClasses.java @@ -0,0 +1,102 @@ +/* +UnusedLocalVariable + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.coding.unusedlocalvariable; + +public class InputUnusedLocalVariableDepthOfClasses { + + int variable = 1; + + class k { + class n { + } + } + + class n { + int r = 1; + } + + class f { + class n { + } + } + + void method() { + int r = 1; // violation + n obj = new n() { + void method() { + r += 12; + } + }; + obj.getClass(); + } + + class r { + class k { + int p = 12; + } + } + + static class p { + class r { + class k { + int a = 13; + + void method() { + int a = 1; // violation + int p = 1; + r.k obj = new r().new k() { + void method() { + a += p; + } + }; + obj.getClass(); + } + } + } + } + + class P { + void method() { + int a = 1; // violation + Q obj = new Q() { + void method() { + a += 1; + } + + }; + obj.getClass(); + } + } + + class Q { + int a = 1; + } + + class PR { + class P { + class Q { + } + } + } +} + +class anotherClass { + class InputUnusedLocalVariableDepthOfClasses { + } +} + +class Clazz { + void method() { + int variable = 1; // violation + InputUnusedLocalVariableDepthOfClasses obj = new InputUnusedLocalVariableDepthOfClasses() { + void method() { + variable += 1; + } + }; + obj.getClass(); + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableEnum.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableEnum.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableEnum.java @@ -0,0 +1,101 @@ +/* +UnusedLocalVariable + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.coding.unusedlocalvariable; + +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; + +public enum InputUnusedLocalVariableEnum { + + CONST_1, + CONST_2(new a() { + }), + CONST_3(new a() { + }); + + InputUnusedLocalVariableEnum(Object obj) { + int a = 12; // violation + a = (int) obj; + } + + InputUnusedLocalVariableEnum() { + } + + public static class nestedClass { + int d = 12; + } + + public class innerClass { + int k = 1; + } + + public void testTryWithResources(int a) { + try (BufferedReader br = + new BufferedReader(new FileReader("someFile.txt"))) { // ok + br.readLine(); + } + catch (IOException e) { + e.printStackTrace(); + } + } + + static int a = 12; + + public void testIncrementAndDecrementKinds() { + int a = 0; // violation + a = ++this.a; + a++; + a--; + int index = 1; + int[] arr = {1}; + arr[--index] = 3; + int ind = 0; + testTryWithResources(--ind); + int k = 1; + if (++k > 12) { + } + int p = 2; + if ((++p - --p) > 21) { + } + int m = 2; + int h = ++m; + h += 1; + } + + public void testBooleanExpressions() { + boolean b = false; // ok + if (!b) { + } + boolean b1 = true; // ok + if (b1) { + } + boolean a; // violation + if ((a = true) != false) { + } + boolean j; // violation + if (j = true) { + } + boolean k = true, l = false; + if (k && !l) { + } + } +} + +class a { + + void method() { + int d = 12; // violation + InputUnusedLocalVariableEnum.nestedClass obj = + new InputUnusedLocalVariableEnum.nestedClass() { + void method() { + d += 12; + } + }; + obj.getClass(); + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableGenericAnonInnerClasses.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableGenericAnonInnerClasses.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableGenericAnonInnerClasses.java @@ -0,0 +1,99 @@ +/* +UnusedLocalVariable + + +*/ +package com.puppycrawl.tools.checkstyle.checks.coding.unusedlocalvariable; + +import java.util.function.Function; + +public class InputUnusedLocalVariableGenericAnonInnerClasses { + + Function<Integer, Integer> obj = a -> { + int l = 12; // violation + testClass obj = new testClass() { // violation + void method() { + l += 1; + } + }; + return a; + }; + + testClass obj2 = new testClass() { + int l = 13; // ok, instance var + testClass obj2 = new testClass() { // ok, instance var + void method() { + l += 1; + } + }; + }; + + testClass obj3 = new testClass() { + void method() { + int l = 13; // violation + testClass obj2 = new testClass() { // violation + void method() { + l += 1; + } + }; + } + }; +} + +class testClass { + int l = 12; + + void method2() { + int s = 12; // violation + int j = 13; + hoo k = () -> { + Integer.valueOf(j); + hoo obj2 = () -> { + testClass obj3 = new testClass() { + void foo() { + s += 12; + } + }; + obj3.getClass(); + }; + obj2.anotherMethod(); + }; + k.anotherMethod(); + } + + int s = 2; + + void test() { + int variable = 1; // violation + int mainVar = 2; // ok + int anotherVar = 1; // violation + testingGenerics<Integer>.nested obj + = new testingGenerics<Integer>().new nested() { + void method() { + anotherVar += 1; + } + }; + obj.getClass(); + + testingGenerics<Integer>.clazz<String>.nested obj2 // violation + = new testingGenerics<Integer>().new clazz<String>().new nested() { + void method() { + variable += 1; + Integer.valueOf(mainVar); + } + }; + } +} +class testingGenerics<T> { + int mainVar = 2; + + class clazz<T> { + class nested { + int variable = 1; + } + } + + class nested { + int anotherVar = 2; + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses.java @@ -0,0 +1,103 @@ +/* +UnusedLocalVariable + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.coding.unusedlocalvariable; + +import java.lang.annotation.Annotation; + +public class InputUnusedLocalVariableNestedClasses { + + public int V = 1; + private int G = 1; + protected int S = 1; + int Q = 1; + + class AnotherClass { + + void method() { + int V = 1; // violation + int G = 1; + int S = 1; // violation + int Q = 1; // violation + InputUnusedLocalVariableNestedClasses obj + = new InputUnusedLocalVariableNestedClasses() { + void method() { + Integer.valueOf(V + G + S + Q); + } + }; + obj.getClass(); + } + } + + void method() { + int variable = 1; // violation + A.B obj = new A.B() { + void method() { + variable += 1; + } + }; + obj.getClass(); + + int anotherVariable = 2; // violation + A.B.innerClass obj2 = new A.B().new innerClass() { + void method() { + anotherVariable += 1; + } + }; + obj2.getClass(); + + InputUnusedLocalVariable obj3 + = new InputUnusedLocalVariable() { // cross file checking not supported + }; + obj3.getClass(); + } + + static class A { + static class B { + int variable = 1; + + class innerClass { + protected int anotherVariable = 1; + public int k = 1; + + void testInterfaces() { + int s = 12; // violation + int n = 13; // violation + foo obj = new foo() { + @Override + public Class<? extends Annotation> annotationType() { + Integer.valueOf(s); + + hoo obj = () -> { + hoo anotherObj = new hoo() { + @Override + public void anotherMethod() { + Integer.valueOf(n); + } + }; + anotherObj.getClass(); + String outsideAnonInner = "n is accessible by " + hoo.n; + outsideAnonInner.isEmpty(); + }; + obj.getClass(); + return null; + } + }; + obj.getClass(); + } + } + } + } +} + +@interface foo { + int s = 2; +} + +interface hoo { + int n = 12; + void anotherMethod(); +}
New Check: UnusedVariable I'd like to request an unused variable module. The following should fail: public void foo() { Integer bar = 1; // This should fail since bar is not used } Where as: public Integer foo() { Integer bar = 1; return bar } Should not since it is used. Thanks
Agree, this would be useful. Hello, I would like to work on this issue. @eriklansner-blip If you are new to checkstyle then I would not recommend this issue as a first time. To be able to see if a variable is used or not would require some degree of tracking the variable in the code. There could be name conflicts like a field with the same name, or an anonymous class. It may require some degree of difficulty like the `RequireThisCheck`. We are welcoming you to make a fix, we will guide you on how to make it and we will assist you. We just try to warn you in advance that it might be not that easy when it comes to edge cases. Thank you for the responses. I am part of a student group that has been tasked with resolving an issue on an open-source project. We chose this particular issue and we understand that it will not be that easy. We will give it some amount of hours and we will get back to you with the results. sadly we did not solve the issue of shadowing and stopped working on it. I am on it I think that this check should verify usage of pattern variables, since they are just a special case of local variable. Example: ```bash public class Test { void method1(Object o) { if (o instanceof String s) { // ok System.out.println(s); } else if(o instanceof Integer i) { // violation System.out.println("not using 'i'!"); } else { System.out.println("something else!"); } } } ``` Read more about pattern variables at https://openjdk.java.net/jeps/394 @nmancus1 @pbludov @strkkk While adding support for pattern variables ( adding support for if-then-else right now, will discuss later adding support for ternary, etc.) I would need to negate the expression apply de morgans law to an expression to check whether it will exist in else statement. Examples will explain better- ``` String p,s,n; // instance variables // inside some method Object o = 45; if (!(o instanceof String p && p.equals("sd")) || !p.equals("wq")) { p = ""; // local var p not in scope here } else if (!(o instanceof Integer s && o instanceof String n)) { p = "a"; // local var p in scope here s = ""; // local var s not in scope here n = ""; // local var n not in scope here } else { p = "a"; // local var p in scope here s = 41; // local var s in scope here n = ""; // local var n in scope here } ``` So to evaluate the scopes of variables I would have to negate the expression apply de morgans law on an expression and obtain that expression in form of an AST. For something like- ``` !(o instanceof String p && p.equals("sd")) || !p.equals("wq") --EXPR -> EXPR [82:63] `--LOR -> || [82:63] |--LNOT -> ! [82:20] | |--LPAREN -> ( [82:21] | |--LAND -> && [82:44] | | |--LITERAL_INSTANCEOF -> instanceof [82:24] | | | |--IDENT -> o [82:22] | | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [82:35] | | | |--MODIFIERS -> MODIFIERS [82:35] | | | |--TYPE -> TYPE [82:35] | | | | `--IDENT -> String [82:35] | | | `--IDENT -> p [82:42] | | `--METHOD_CALL -> ( [82:55] | | |--DOT -> . [82:48] | | | |--IDENT -> p [82:47] | | | `--IDENT -> equals [82:49] | | |--ELIST -> ELIST [82:56] | | | `--EXPR -> EXPR [82:56] | | | `--STRING_LITERAL -> "sd" [82:56] | | `--RPAREN -> ) [82:60] | `--RPAREN -> ) [82:61] `--LNOT -> ! [82:66] `--METHOD_CALL -> ( [82:75] |--DOT -> . [82:68] | |--IDENT -> p [82:67] | `--IDENT -> equals [82:69] |--ELIST -> ELIST [82:76] | `--EXPR -> EXPR [82:76] | `--STRING_LITERAL -> "wq" [82:76] `--RPAREN -> ) [82:80] ``` I would like something like- ``` (o instanceof String p && p.equals("sd")) && p.equals("wq") --EXPR -> EXPR [82:62] `--LAND -> && [82:62] |--LPAREN -> ( [82:20] |--LAND -> && [82:43] | |--LITERAL_INSTANCEOF -> instanceof [82:23] | | |--IDENT -> o [82:21] | | `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [82:34] | | |--MODIFIERS -> MODIFIERS [82:34] | | |--TYPE -> TYPE [82:34] | | | `--IDENT -> String [82:34] | | `--IDENT -> p [82:41] | `--METHOD_CALL -> ( [82:54] | |--DOT -> . [82:47] | | |--IDENT -> p [82:46] | | `--IDENT -> equals [82:48] | |--ELIST -> ELIST [82:55] | | `--EXPR -> EXPR [82:55] | | `--STRING_LITERAL -> "sd" [82:55] | `--RPAREN -> ) [82:59] |--RPAREN -> ) [82:60] `--METHOD_CALL -> ( [82:73] |--DOT -> . [82:66] | |--IDENT -> p [82:65] | `--IDENT -> equals [82:67] |--ELIST -> ELIST [82:74] | `--EXPR -> EXPR [82:74] | `--STRING_LITERAL -> "wq" [82:74] `--RPAREN -> ) [82:78] ``` The only option I can see is to take the `EXPR` node and create new nodes according to the logic and add the respective descendants. Any ideas will be appreciated. @Vyom-Yadav thanks for your investigation and explanation of nuances of implementing pattern variable support. I think in light of complicated implementation, and recent extension of pattern variables proposed by https://openjdk.java.net/jeps/405 and https://openjdk.java.net/jeps/406, perhaps pattern variables are a special enough case to require their own check. We should clearly mention this limitation in the documentation (that it does not check pattern variables) for `UnusedLocalVariableCheck`. @pbludov @strkkk what do you think? Edit: Just leaving my thoughts about proposed pattern variable check: > The only option I can see is to take the EXPR node and create new nodes according to the logic and add the respective descendants. Any ideas will be appreciated. This is a good idea; I would probably take the expression AST, and write some method to "reduce" the tree (having helper methods as "operators" for the reduction process), then evaluate the resulting reduced expression. > While adding support for pattern variables ( adding support for if-then-else right now, will discuss later adding support for ternary, etc.) I would need to negate the expression apply de morgans law to an expression to check whether it will exist in else statement. You basically need to track the frames like `RequireThisCheck` to understand if `p` is the first local variable or if it is the pattern variable instead. Also the pattern variable is basically another local variable, so I can see someone wanting it to check those too sometime. You may want to check how `RequireThisCheck` does this. I think it is better to build the check in small steps and create new issues for the missing functionality. I can see people wanting pattern support. This also makes me ask if `RequireThisCheck` has the necessary support for for patterns. > You basically need to track the frames like RequireThisCheck to understand if p is the first local variable or if it is the pattern variable instead. Support for pattern variables is more complicated than this; the expressions in the conditionals must be evaluated to determine the scope of the variable. > the expressions in the conditionals must be evaluated to determine the scope of the variable. Which is what `RequireThisCheck` attempts to do with it's "frames". It sees `{}` as a separate frame and see the distinction between the different scopes. But like you said, the scope/frame is not connected to the `{}` in that instance. > p = "a"; // local var p in scope here Shouldn't this be the instance variable here? The scope of local p expired after the `if`. The same with some of the others. Shouldn't everything in the final `else` be the instance variables? Edit: Like @nmancus1 said, I didn't realize how far the scope was for these variables. I thought they only applied to their blocks and not further. `if (!(o instanceof String p && p.equals("sd"))....` means that pattern variable `p` is in scope of the else block, since the condition is basically `!(o instanceof String p && p.equals("sd"`). This is why we must evaluate the conditionals to verify the scope of a pattern variable, and also use frames like `RequireThisCheck` as well. Edit: Working example: ```java public class Test { static String a = "instance var a!"; static void method1(Object c) { if (c instanceof String a) { System.out.println("in if block: " + a); } else { System.out.println("in else block: " + a); } } static void method2(Object c) { if (!(c instanceof String a)) { System.out.println("in if block: " + a); } else { System.out.println("in else block: " + a); } } public static void main(String[] args) { method1("pattern variable a!"); method2("pattern variable a!"); } } ``` Yields: ```bash in if block: pattern variable a! in else block: pattern variable a! ```
2021-11-07T05:19:38Z
9.2
checkstyle/checkstyle
10,958
checkstyle__checkstyle-10958
[ "10817" ]
5bceb5dccf260e338345ba33a5b5154175973979
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java @@ -111,7 +111,7 @@ * <li> * Property {@code memberModifiers} - Control whether to check only methods and fields with any * of the specified modifiers. - * This property does not affect method calls nor method references. + * This property does not affect method calls nor method references nor record components. * Type is {@code java.lang.String[]}. * Validation type is {@code tokenTypesSet}. * Default value is {@code ""}. @@ -380,7 +380,7 @@ public final class IllegalTypeCheck extends AbstractCheck { private final Set<String> ignoredMethodNames = new HashSet<>(); /** * Control whether to check only methods and fields with any of the specified modifiers. - * This property does not affect method calls nor method references. + * This property does not affect method calls nor method references nor record components. */ private List<Integer> memberModifiers = Collections.emptyList(); @@ -473,9 +473,11 @@ public void visitToken(DetailAST ast) { case TokenTypes.VARIABLE_DEF: case TokenTypes.ANNOTATION_FIELD_DEF: case TokenTypes.PATTERN_VARIABLE_DEF: - case TokenTypes.RECORD_COMPONENT_DEF: visitVariableDef(ast); break; + case TokenTypes.RECORD_COMPONENT_DEF: + checkClassName(ast); + break; case TokenTypes.PARAMETER_DEF: visitParameterDef(ast); break; @@ -852,7 +854,7 @@ public void setLegalAbstractClassNames(String... classNames) { /** * Setter to control whether to check only methods and fields with any of * the specified modifiers. - * This property does not affect method calls nor method references. + * This property does not affect method calls nor method references nor record components. * * @param modifiers String contains modifiers. */
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java @@ -340,6 +340,56 @@ public void testIllegalTypeNewArrayStructure() throws Exception { expected); } + @Test + public void testRecordComponentsDefault() throws Exception { + final String[] expected = { + "45:9: " + getCheckMessage(MSG_KEY, "HashSet"), + "53:23: " + getCheckMessage(MSG_KEY, "HashSet"), + }; + + verifyWithInlineConfigParser( + getNonCompilablePath( + "InputIllegalTypeRecordsWithMemberModifiersDefault.java"), + expected); + } + + @Test + public void testRecordComponentsFinal() throws Exception { + final String[] expected = { + "45:9: " + getCheckMessage(MSG_KEY, "HashSet"), + "53:23: " + getCheckMessage(MSG_KEY, "HashSet"), + }; + + verifyWithInlineConfigParser( + getNonCompilablePath( + "InputIllegalTypeRecordsWithMemberModifiersFinal.java"), + expected); + } + + @Test + public void testRecordComponentsPrivateFinal() throws Exception { + final String[] expected = { + "45:9: " + getCheckMessage(MSG_KEY, "HashSet"), + "53:23: " + getCheckMessage(MSG_KEY, "HashSet"), + }; + + verifyWithInlineConfigParser( + getNonCompilablePath( + "InputIllegalTypeRecordsWithMemberModifiersPrivateFinal.java"), + expected); + } + + @Test + public void testRecordComponentsPublicProtectedStatic() throws Exception { + final String[] expected = { + "45:9: " + getCheckMessage(MSG_KEY, "HashSet")}; + + verifyWithInlineConfigParser( + getNonCompilablePath( + "InputIllegalTypeRecordsWithMemberModifiersPublicProtectedStatic.java"), + expected); + } + @Test public void testTokensNotNull() { final IllegalTypeCheck check = new IllegalTypeCheck(); diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersDefault.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersDefault.java new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersDefault.java @@ -0,0 +1,63 @@ +/* +IllegalType +validateAbstractClassNames = (default)false +illegalClassNames = (default)HashMap, HashSet, LinkedHashMap, LinkedHashSet, TreeMap, TreeSet, \ + java.util.HashMap, java.util.HashSet, java.util.LinkedHashMap, \ + java.util.LinkedHashSet, java.util.TreeMap, java.util.TreeSet +legalAbstractClassNames = (default) +ignoredMethodNames = (default)getEnvironment, getInitialContext +illegalAbstractClassNameFormat = (default)^(.*[.])?Abstract.*$ +memberModifiers = (default) +tokens = (default)ANNOTATION_FIELD_DEF, CLASS_DEF, INTERFACE_DEF, METHOD_CALL, METHOD_DEF, \ + METHOD_REF, PARAMETER_DEF, VARIABLE_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF, \ + RECORD_COMPONENT_DEF + + +*/ + +//non-compiled with javac: Compilable with Java14 +package com.puppycrawl.tools.checkstyle.checks.coding.illegaltype; + +import java.util.*; + +public class InputIllegalTypeRecordsWithMemberModifiersDefault +{ + + public record IdentifiersPair( + UUID productId, // ok + String identifier // ok + ) + { + + } + + public class IdentifiersPairEquivalent { + private final UUID productId; // ok + private final String identifier; // ok + + public IdentifiersPairEquivalent(UUID productId, String identifier) { + this.productId = productId; + this.identifier = identifier; + } + } + + public record IdentifiersPair2( + HashSet x, // violation + String identifier // ok + ) + { + + } + + public class IdentifiersPairEquivalent2 { + private final HashSet x; // violation + private final String identifier; // ok + + public IdentifiersPairEquivalent2(Set x, String identifier) { // ok + this.x = (HashSet) x; // ok + this.identifier = identifier; + } + } + +} + diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersFinal.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersFinal.java new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersFinal.java @@ -0,0 +1,62 @@ +/* +IllegalType +validateAbstractClassNames = (default)false +illegalClassNames = (default)HashMap, HashSet, LinkedHashMap, LinkedHashSet, TreeMap, TreeSet, \ + java.util.HashMap, java.util.HashSet, java.util.LinkedHashMap, \ + java.util.LinkedHashSet, java.util.TreeMap, java.util.TreeSet +legalAbstractClassNames = (default) +ignoredMethodNames = (default)getEnvironment, getInitialContext +illegalAbstractClassNameFormat = (default)^(.*[.])?Abstract.*$ +memberModifiers = FINAL +tokens = (default)ANNOTATION_FIELD_DEF, CLASS_DEF, INTERFACE_DEF, METHOD_CALL, METHOD_DEF, \ + METHOD_REF, PARAMETER_DEF, VARIABLE_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF, \ + RECORD_COMPONENT_DEF + + +*/ + +//non-compiled with javac: Compilable with Java14 +package com.puppycrawl.tools.checkstyle.checks.coding.illegaltype; + +import java.util.*; + +public class InputIllegalTypeRecordsWithMemberModifiersFinal +{ + + public record IdentifiersPair( + UUID productId, // ok + String identifier // ok + ) + { + + } + + public class IdentifiersPairEquivalent { + private final UUID productId; // ok + private final String identifier; // ok + + public IdentifiersPairEquivalent(UUID productId, String identifier) { + this.productId = productId; + this.identifier = identifier; + } + } + + public record IdentifiersPair2( + HashSet x, // violation + String identifier // ok + ) + { + + } + + public class IdentifiersPairEquivalent2 { + private final HashSet x; // violation + private final String identifier; // ok + + public IdentifiersPairEquivalent2(Set x, String identifier) { // ok + this.x = (HashSet) x; // ok + this.identifier = identifier; + } + } + +} diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersPrivateFinal.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersPrivateFinal.java new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersPrivateFinal.java @@ -0,0 +1,62 @@ +/* +IllegalType +validateAbstractClassNames = (default)false +illegalClassNames = (default)HashMap, HashSet, LinkedHashMap, LinkedHashSet, TreeMap, TreeSet, \ + java.util.HashMap, java.util.HashSet, java.util.LinkedHashMap, \ + java.util.LinkedHashSet, java.util.TreeMap, java.util.TreeSet +legalAbstractClassNames = (default) +ignoredMethodNames = (default)getEnvironment, getInitialContext +illegalAbstractClassNameFormat = (default)^(.*[.])?Abstract.*$ +memberModifiers = LITERAL_PRIVATE, FINAL +tokens = (default)ANNOTATION_FIELD_DEF, CLASS_DEF, INTERFACE_DEF, METHOD_CALL, METHOD_DEF, \ + METHOD_REF, PARAMETER_DEF, VARIABLE_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF, \ + RECORD_COMPONENT_DEF + + +*/ + +//non-compiled with javac: Compilable with Java14 +package com.puppycrawl.tools.checkstyle.checks.coding.illegaltype; + +import java.util.*; + +public class InputIllegalTypeRecordsWithMemberModifiersPrivateFinal +{ + + public record IdentifiersPair( + UUID productId, // ok + String identifier // ok + ) + { + + } + + public class IdentifiersPairEquivalent { + private final UUID productId; // ok + private final String identifier; // ok + + public IdentifiersPairEquivalent(UUID productId, String identifier) { + this.productId = productId; + this.identifier = identifier; + } + } + + public record IdentifiersPair2( + HashSet x, // violation + String identifier // ok + ) + { + + } + + public class IdentifiersPairEquivalent2 { + private final HashSet x; // violation + private final String identifier; // ok + + public IdentifiersPairEquivalent2(Set x, String identifier) { // ok + this.x = (HashSet) x; // ok + this.identifier = identifier; + } + } + +} diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersPublicProtectedStatic.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersPublicProtectedStatic.java new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersPublicProtectedStatic.java @@ -0,0 +1,63 @@ +/* +IllegalType +validateAbstractClassNames = (default)false +illegalClassNames = (default)HashMap, HashSet, LinkedHashMap, LinkedHashSet, TreeMap, TreeSet, \ + java.util.HashMap, java.util.HashSet, java.util.LinkedHashMap, \ + java.util.LinkedHashSet, java.util.TreeMap, java.util.TreeSet +legalAbstractClassNames = (default) +ignoredMethodNames = (default)getEnvironment, getInitialContext +illegalAbstractClassNameFormat = (default)^(.*[.])?Abstract.*$ +memberModifiers = LITERAL_PUBLIC, LITERAL_PROTECTED, LITERAL_STATIC +tokens = (default)ANNOTATION_FIELD_DEF, CLASS_DEF, INTERFACE_DEF, METHOD_CALL, METHOD_DEF, \ + METHOD_REF, PARAMETER_DEF, VARIABLE_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF, \ + RECORD_COMPONENT_DEF + + +*/ + +//non-compiled with javac: Compilable with Java14 +package com.puppycrawl.tools.checkstyle.checks.coding.illegaltype; + +import java.util.*; + +public class InputIllegalTypeRecordsWithMemberModifiersPublicProtectedStatic +{ + + public record IdentifiersPair( + UUID productId, // ok + String identifier // ok + ) + { + + } + + public class IdentifiersPairEquivalent { + private final UUID productId; // ok + private final String identifier; // ok + + public IdentifiersPairEquivalent(UUID productId, String identifier) { + this.productId = productId; + this.identifier = identifier; + } + } + + public record IdentifiersPair2( + HashSet x, // violation + String identifier // ok + ) + { + + } + + public class IdentifiersPairEquivalent2 { + private final HashSet x; // ok + private final String identifier; // ok + + public IdentifiersPairEquivalent2(Set x, String identifier) { // ok + this.x = (HashSet) x; // ok + this.identifier = identifier; + } + } + +} +
NPE in IllegalTypeCheck when checking a record (Java 14) Hello, https://checkstyle.org/config_coding.html#IllegalType I'm trying JDK 16 with language-level 16 I've run into an NPE. I've discovered this on Checkstyle 9.0, but the same problem is still unresolved on the `master` branch. Since the build is configured to run on `1.8`, I had to modify the source+target language to allow for the reproducer test-case, which I've prepared here: https://github.com/fprochazka/checkstyle/commit/0e18223a4fd8e91cb3264fd970573f0e6e1c0a5d, it's probably not ideal, but IMHO it should pass a verifiable reproducer. if you run the `IllegalTypeCheckTest` from my commit, you'll see the following errors: <details> <summary>InputIllegalTypeTestRecordsPass fail</summary> ``` com.puppycrawl.tools.checkstyle.api.CheckstyleException: Exception was thrown while processing /home/fprochazka/devel/libs/checkstyle/checkstyle/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestRecordsPass.java at com.puppycrawl.tools.checkstyle.Checker.processFiles(Checker.java:302) at com.puppycrawl.tools.checkstyle.Checker.process(Checker.java:221) at com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport.getActualViolationsForFile(AbstractModuleTestSupport.java:442) at com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport.verifyViolations(AbstractModuleTestSupport.java:416) at com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport.verifyWithInlineConfigParser(AbstractModuleTestSupport.java:269) at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheckTest.testValidateRecordsPass(IllegalTypeCheckTest.java:66) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:78) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:567) at org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:725) at org.junit.jupiter.engine.execution.MethodInvocation.proceed(MethodInvocation.java:60) at org.junit.jupiter.engine.execution.InvocationInterceptorChain$ValidatingInvocation.proceed(InvocationInterceptorChain.java:131) at org.junit.jupiter.engine.extension.TimeoutExtension.intercept(TimeoutExtension.java:149) at org.junit.jupiter.engine.extension.TimeoutExtension.interceptTestableMethod(TimeoutExtension.java:140) at org.junit.jupiter.engine.extension.TimeoutExtension.interceptTestMethod(TimeoutExtension.java:84) at org.junit.jupiter.engine.execution.ExecutableInvoker$ReflectiveInterceptorCall.lambda$ofVoidMethod$0(ExecutableInvoker.java:115) at org.junit.jupiter.engine.execution.ExecutableInvoker.lambda$invoke$0(ExecutableInvoker.java:105) at org.junit.jupiter.engine.execution.InvocationInterceptorChain$InterceptedInvocation.proceed(InvocationInterceptorChain.java:106) at org.junit.jupiter.engine.execution.InvocationInterceptorChain.proceed(InvocationInterceptorChain.java:64) at org.junit.jupiter.engine.execution.InvocationInterceptorChain.chainAndInvoke(InvocationInterceptorChain.java:45) at org.junit.jupiter.engine.execution.InvocationInterceptorChain.invoke(InvocationInterceptorChain.java:37) at org.junit.jupiter.engine.execution.ExecutableInvoker.invoke(ExecutableInvoker.java:104) at org.junit.jupiter.engine.execution.ExecutableInvoker.invoke(ExecutableInvoker.java:98) at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.lambda$invokeTestMethod$7(TestMethodTestDescriptor.java:214) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.invokeTestMethod(TestMethodTestDescriptor.java:210) at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.execute(TestMethodTestDescriptor.java:135) at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.execute(TestMethodTestDescriptor.java:66) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$6(NodeTestTask.java:151) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:141) at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:137) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$9(NodeTestTask.java:139) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:138) at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:95) at java.base/java.util.ArrayList.forEach(ArrayList.java:1511) at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.invokeAll(SameThreadHierarchicalTestExecutorService.java:41) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$6(NodeTestTask.java:155) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:141) at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:137) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$9(NodeTestTask.java:139) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:138) at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:95) at java.base/java.util.ArrayList.forEach(ArrayList.java:1511) at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.invokeAll(SameThreadHierarchicalTestExecutorService.java:41) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$6(NodeTestTask.java:155) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:141) at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:137) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$9(NodeTestTask.java:139) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:138) at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:95) at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.submit(SameThreadHierarchicalTestExecutorService.java:35) at org.junit.platform.engine.support.hierarchical.HierarchicalTestExecutor.execute(HierarchicalTestExecutor.java:57) at org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine.execute(HierarchicalTestEngine.java:54) at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:108) at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:88) at org.junit.platform.launcher.core.EngineExecutionOrchestrator.lambda$execute$0(EngineExecutionOrchestrator.java:54) at org.junit.platform.launcher.core.EngineExecutionOrchestrator.withInterceptedStreams(EngineExecutionOrchestrator.java:67) at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:52) at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:96) at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:75) at com.intellij.junit5.JUnit5IdeaTestRunner.startRunnerWithArgs(JUnit5IdeaTestRunner.java:71) at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:33) at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235) at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54) Caused by: java.lang.NullPointerException: Cannot invoke "com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()" because "modifiers" is null at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.isContainVerifiableType(IllegalTypeCheck.java:516) at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.isVerifiable(IllegalTypeCheck.java:502) at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.visitVariableDef(IllegalTypeCheck.java:577) at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.visitToken(IllegalTypeCheck.java:477) at com.puppycrawl.tools.checkstyle.TreeWalker.notifyVisit(TreeWalker.java:335) at com.puppycrawl.tools.checkstyle.TreeWalker.processIter(TreeWalker.java:406) at com.puppycrawl.tools.checkstyle.TreeWalker.walk(TreeWalker.java:273) at com.puppycrawl.tools.checkstyle.TreeWalker.processFiltered(TreeWalker.java:154) at com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.process(AbstractFileSetCheck.java:87) at com.puppycrawl.tools.checkstyle.Checker.processFile(Checker.java:328) at com.puppycrawl.tools.checkstyle.Checker.processFiles(Checker.java:289) ... 70 more ``` </details> <details> <summary>InputIllegalTypeTestInnerRecordsPass fail</summary> ``` com.puppycrawl.tools.checkstyle.api.CheckstyleException: Exception was thrown while processing /home/fprochazka/devel/libs/checkstyle/checkstyle/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestInnerRecordsPass.java at com.puppycrawl.tools.checkstyle.Checker.processFiles(Checker.java:302) at com.puppycrawl.tools.checkstyle.Checker.process(Checker.java:221) at com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport.getActualViolationsForFile(AbstractModuleTestSupport.java:442) at com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport.verifyViolations(AbstractModuleTestSupport.java:416) at com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport.verifyWithInlineConfigParser(AbstractModuleTestSupport.java:269) at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheckTest.testValidateInnerRecordsPass(IllegalTypeCheckTest.java:74) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:78) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:567) at org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:725) at org.junit.jupiter.engine.execution.MethodInvocation.proceed(MethodInvocation.java:60) at org.junit.jupiter.engine.execution.InvocationInterceptorChain$ValidatingInvocation.proceed(InvocationInterceptorChain.java:131) at org.junit.jupiter.engine.extension.TimeoutExtension.intercept(TimeoutExtension.java:149) at org.junit.jupiter.engine.extension.TimeoutExtension.interceptTestableMethod(TimeoutExtension.java:140) at org.junit.jupiter.engine.extension.TimeoutExtension.interceptTestMethod(TimeoutExtension.java:84) at org.junit.jupiter.engine.execution.ExecutableInvoker$ReflectiveInterceptorCall.lambda$ofVoidMethod$0(ExecutableInvoker.java:115) at org.junit.jupiter.engine.execution.ExecutableInvoker.lambda$invoke$0(ExecutableInvoker.java:105) at org.junit.jupiter.engine.execution.InvocationInterceptorChain$InterceptedInvocation.proceed(InvocationInterceptorChain.java:106) at org.junit.jupiter.engine.execution.InvocationInterceptorChain.proceed(InvocationInterceptorChain.java:64) at org.junit.jupiter.engine.execution.InvocationInterceptorChain.chainAndInvoke(InvocationInterceptorChain.java:45) at org.junit.jupiter.engine.execution.InvocationInterceptorChain.invoke(InvocationInterceptorChain.java:37) at org.junit.jupiter.engine.execution.ExecutableInvoker.invoke(ExecutableInvoker.java:104) at org.junit.jupiter.engine.execution.ExecutableInvoker.invoke(ExecutableInvoker.java:98) at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.lambda$invokeTestMethod$7(TestMethodTestDescriptor.java:214) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.invokeTestMethod(TestMethodTestDescriptor.java:210) at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.execute(TestMethodTestDescriptor.java:135) at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.execute(TestMethodTestDescriptor.java:66) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$6(NodeTestTask.java:151) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:141) at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:137) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$9(NodeTestTask.java:139) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:138) at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:95) at java.base/java.util.ArrayList.forEach(ArrayList.java:1511) at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.invokeAll(SameThreadHierarchicalTestExecutorService.java:41) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$6(NodeTestTask.java:155) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:141) at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:137) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$9(NodeTestTask.java:139) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:138) at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:95) at java.base/java.util.ArrayList.forEach(ArrayList.java:1511) at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.invokeAll(SameThreadHierarchicalTestExecutorService.java:41) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$6(NodeTestTask.java:155) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:141) at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:137) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$9(NodeTestTask.java:139) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:138) at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:95) at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.submit(SameThreadHierarchicalTestExecutorService.java:35) at org.junit.platform.engine.support.hierarchical.HierarchicalTestExecutor.execute(HierarchicalTestExecutor.java:57) at org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine.execute(HierarchicalTestEngine.java:54) at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:108) at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:88) at org.junit.platform.launcher.core.EngineExecutionOrchestrator.lambda$execute$0(EngineExecutionOrchestrator.java:54) at org.junit.platform.launcher.core.EngineExecutionOrchestrator.withInterceptedStreams(EngineExecutionOrchestrator.java:67) at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:52) at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:96) at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:75) at com.intellij.junit5.JUnit5IdeaTestRunner.startRunnerWithArgs(JUnit5IdeaTestRunner.java:71) at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:33) at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235) at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54) Caused by: java.lang.NullPointerException: Cannot invoke "com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()" because "modifiers" is null at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.isContainVerifiableType(IllegalTypeCheck.java:516) at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.isVerifiable(IllegalTypeCheck.java:502) at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.visitVariableDef(IllegalTypeCheck.java:577) at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.visitToken(IllegalTypeCheck.java:477) at com.puppycrawl.tools.checkstyle.TreeWalker.notifyVisit(TreeWalker.java:335) at com.puppycrawl.tools.checkstyle.TreeWalker.processIter(TreeWalker.java:406) at com.puppycrawl.tools.checkstyle.TreeWalker.walk(TreeWalker.java:273) at com.puppycrawl.tools.checkstyle.TreeWalker.processFiltered(TreeWalker.java:154) at com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.process(AbstractFileSetCheck.java:87) at com.puppycrawl.tools.checkstyle.Checker.processFile(Checker.java:328) at com.puppycrawl.tools.checkstyle.Checker.processFiles(Checker.java:289) ... 70 more ``` </details> The interesting part is IMHO this: ``` java.lang.NullPointerException: Cannot invoke "com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()" because "modifiers" is null at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.isContainVerifiableType(IllegalTypeCheck.java:516) at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.isVerifiable(IllegalTypeCheck.java:502) at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.visitVariableDef(IllegalTypeCheck.java:577) at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.visitToken(IllegalTypeCheck.java:477) at com.puppycrawl.tools.checkstyle.TreeWalker.notifyVisit(TreeWalker.java:335) at com.puppycrawl.tools.checkstyle.TreeWalker.processIter(TreeWalker.java:406) at com.puppycrawl.tools.checkstyle.TreeWalker.walk(TreeWalker.java:273) at com.puppycrawl.tools.checkstyle.TreeWalker.processFiltered(TreeWalker.java:154) at com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.process(AbstractFileSetCheck.java:87) at com.puppycrawl.tools.checkstyle.Checker.processFile(Checker.java:328) at com.puppycrawl.tools.checkstyle.Checker.processFiles(Checker.java:289) ``` My configuration of the check is baked into the comment in the tested source file. If I change ``` memberModifiers = LITERAL_PUBLIC, LITERAL_PROTECTED, LITERAL_STATIC ``` to ``` memberModifiers = (default) ``` it starts to pass ... Am I configuring it incorrectly? IMHO it should not throw an NPE even when configured incorrectly.
> fprochazka@0e18223 > NullPointerException I'm sorry, I am not clearly following the issue from just reading this. From your commit, which input file causes the exception? The simplest way to report and reproduce an issue is exactly like https://checkstyle.org/report_issue.html#How_to_report_a_bug.3F . Both `InputIllegalTypeTestInnerRecordsPass` and `InputIllegalTypeTestRecordsPass` Reproducable issue: ```` $ cat TestClass.java package com.puppycrawl.tools.checkstyle.checks.coding.illegaltype; import javax.annotation.Nullable; import java.util.*; public class InputIllegalTypeTestInnerRecordsPass { public record IdentifiersPair( UUID productId, @Nullable String identifier ) { } } $ cat TestConfig.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <property name="charset" value="UTF-8"/> <module name="TreeWalker"> <module name="IllegalType"> <property name="memberModifiers" value="LITERAL_PUBLIC, LITERAL_PROTECTED, LITERAL_STATIC" /> </module> </module> </module> $ java -jar checkstyle-9.0-all.jar -c TestConfig.xml TestClass.java Starting audit... com.puppycrawl.tools.checkstyle.api.CheckstyleException: Exception was thrown while processing TestClass.java at com.puppycrawl.tools.checkstyle.Checker.processFiles(Checker.java:302) at com.puppycrawl.tools.checkstyle.Checker.process(Checker.java:221) at com.puppycrawl.tools.checkstyle.Main.runCheckstyle(Main.java:409) at com.puppycrawl.tools.checkstyle.Main.runCli(Main.java:332) at com.puppycrawl.tools.checkstyle.Main.execute(Main.java:191) at com.puppycrawl.tools.checkstyle.Main.main(Main.java:126) Caused by: java.lang.NullPointerException at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.isContainVerifiableType(IllegalTypeCheck.java:516) at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.isVerifiable(IllegalTypeCheck.java:502) at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.visitVariableDef(IllegalTypeCheck.java:577) at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.visitToken(IllegalTypeCheck.java:477) at com.puppycrawl.tools.checkstyle.TreeWalker.notifyVisit(TreeWalker.java:335) at com.puppycrawl.tools.checkstyle.TreeWalker.processIter(TreeWalker.java:406) at com.puppycrawl.tools.checkstyle.TreeWalker.walk(TreeWalker.java:273) at com.puppycrawl.tools.checkstyle.TreeWalker.processFiltered(TreeWalker.java:154) at com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.process(AbstractFileSetCheck.java:87) at com.puppycrawl.tools.checkstyle.Checker.processFile(Checker.java:328) at com.puppycrawl.tools.checkstyle.Checker.processFiles(Checker.java:289) ... 5 more Checkstyle ends with 1 errors. ```` I'm happy to try to fix this, but I have no idea where to even begin. How do you test Java 16 features, when the build forces Java 8 in the maven build? > > > I'm happy to try to fix this, but I have no idea where to even begin. How do you test Java 16 features, when the build forces Java 8 in the maven build? inputs for java version > 8 have to be placed in specific folder and have comment like https://github.com/checkstyle/checkstyle/blob/e43c5b84acc8dae1141ed0cd3aeaeda1ff8cea23/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/typename/InputTypeNameRecords.java#L13 you can check existing checks for records as an example (e.g. RecordComponentNumberCheck), they all have inputs for java14 Good place to start is TDD approach, you can first extend existing tests with your case, and then debug it to specific point in code with the problem. Thanks, that helped! Now I have a nice reproducer in tests https://github.com/fprochazka/checkstyle/commit/7fa92879f7a382abf04ead31c69297c4bb5d97a2 I've tried debugging to see if it's something simple... ![image](https://user-images.githubusercontent.com/158625/134563625-1d57f5a1-1f81-4f29-86e7-756304e20dca.png) Now I'm thinking that [record components don't have visibility modifiers at all](https://openjdk.java.net/jeps/359) and maybe the filtering should not apply (all members will have public accessors) -> https://github.com/checkstyle/checkstyle/pull/10820 ![Untitled](https://user-images.githubusercontent.com/71710042/140963345-c36dcfd0-6365-4103-8610-20f5f8cbddec.png) I am getting this error: `java.lang.StringIndexOutOfBoundsException: begin 73, end -1, length 186` I really don't have any idea of how to resolve this. There is some problem with header comment in Input file related to Fully qualified name of Check, make sure it is spelled properly. Recheck other Input files to see difference and spot a problem. Complex exception is partially due to https://github.com/checkstyle/checkstyle/pull/10766 being incomplete. @romani It is waiting on your review. @Rahulkhinchi03, referenced PR is merged, please rebase on latest code. @romani I am really sorry @romani I have my end-semester exams going on. Kindly give me some days to resolve the issues.
2021-11-17T16:25:27Z
9.2
checkstyle/checkstyle
10,904
checkstyle__checkstyle-10904
[ "10747" ]
aec751dfba46e7ce6eae351cd93fde43f2cf3105
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/MetadataGeneratorLogger.java b/src/main/java/com/puppycrawl/tools/checkstyle/MetadataGeneratorLogger.java new file mode 100644 --- /dev/null +++ b/src/main/java/com/puppycrawl/tools/checkstyle/MetadataGeneratorLogger.java @@ -0,0 +1,111 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2022 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package com.puppycrawl.tools.checkstyle; + +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.io.Writer; +import java.nio.charset.StandardCharsets; + +import com.puppycrawl.tools.checkstyle.api.AuditEvent; +import com.puppycrawl.tools.checkstyle.api.AuditListener; +import com.puppycrawl.tools.checkstyle.api.AutomaticBean; +import com.puppycrawl.tools.checkstyle.api.SeverityLevel; + +/** + * Simple logger for metadata generator util. + */ +public class MetadataGeneratorLogger extends AutomaticBean implements AuditListener { + + /** + * Where to write error messages. + */ + private final PrintWriter errorWriter; + + /** + * Formatter for the log message. + */ + private final AuditEventFormatter formatter; + + /** + * Close output stream in audit finished. + */ + private final boolean closeErrorWriter; + + /** + * Creates a new MetadataGeneratorLogger instance. + * + * @param outputStream where to log audit events + * @param outputStreamOptions if {@code CLOSE} error should be closed in auditFinished() + */ + public MetadataGeneratorLogger(OutputStream outputStream, + OutputStreamOptions outputStreamOptions) { + final Writer errorStreamWriter = new OutputStreamWriter(outputStream, + StandardCharsets.UTF_8); + errorWriter = new PrintWriter(errorStreamWriter); + formatter = new AuditEventDefaultFormatter(); + closeErrorWriter = outputStreamOptions == OutputStreamOptions.CLOSE; + } + + @Override + public void auditStarted(AuditEvent event) { + errorWriter.flush(); + } + + @Override + public void auditFinished(AuditEvent event) { + errorWriter.flush(); + if (closeErrorWriter) { + errorWriter.close(); + } + } + + @Override + public void fileStarted(AuditEvent event) { + // No code by default. + } + + @Override + public void fileFinished(AuditEvent event) { + errorWriter.flush(); + } + + @Override + public void addError(AuditEvent event) { + final SeverityLevel severityLevel = event.getSeverityLevel(); + if (severityLevel != SeverityLevel.IGNORE) { + final String errorMessage = formatter.format(event); + errorWriter.println(errorMessage); + } + } + + @Override + public void addException(AuditEvent event, Throwable throwable) { + synchronized (errorWriter) { + throwable.printStackTrace(errorWriter); + } + } + + @Override + protected void finishLocalSetup() { + // No code by default. + } +} diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.java b/src/main/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.java @@ -236,7 +236,9 @@ public void finishJavadocTree(DetailNode rootAst) { moduleDetails.setDescription(getDescriptionText()); if (isTopLevelClassJavadoc()) { if (moduleDetails.getDescription().isEmpty()) { - log(rootAst.getLineNumber(), MSG_DESC_MISSING, moduleDetails.getName()); + final String fullQualifiedName = moduleDetails.getFullQualifiedName(); + log(rootAst.getLineNumber(), MSG_DESC_MISSING, + fullQualifiedName.substring(fullQualifiedName.lastIndexOf('.') + 1)); } else if (writeXmlOutput) { try { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtil.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtil.java @@ -21,6 +21,7 @@ import java.io.File; import java.io.IOException; +import java.io.OutputStream; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; @@ -32,7 +33,9 @@ import com.puppycrawl.tools.checkstyle.Checker; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; +import com.puppycrawl.tools.checkstyle.MetadataGeneratorLogger; import com.puppycrawl.tools.checkstyle.TreeWalker; +import com.puppycrawl.tools.checkstyle.api.AutomaticBean; import com.puppycrawl.tools.checkstyle.api.CheckstyleException; /** Class which handles all the metadata generation and writing calls. */ @@ -46,11 +49,12 @@ private MetadataGeneratorUtil() { * Generate metadata from the module source files available in the input argument path. * * @param path arguments + * @param out OutputStream for error messages * @param moduleFolders folders to check * @throws IOException ioException * @throws CheckstyleException checkstyleException */ - public static void generate(String path, String... moduleFolders) + public static void generate(String path, OutputStream out, String... moduleFolders) throws IOException, CheckstyleException { JavadocMetadataScraper.resetModuleDetailsStore(); @@ -58,13 +62,18 @@ public static void generate(String path, String... moduleFolders) checker.setModuleClassLoader(Checker.class.getClassLoader()); final DefaultConfiguration scraperCheckConfig = new DefaultConfiguration(JavadocMetadataScraper.class.getName()); - final DefaultConfiguration defaultConfiguration = new DefaultConfiguration("configuration"); + final DefaultConfiguration defaultConfiguration = + new DefaultConfiguration("configuration"); final DefaultConfiguration treeWalkerConfig = new DefaultConfiguration(TreeWalker.class.getName()); defaultConfiguration.addProperty("charset", StandardCharsets.UTF_8.name()); defaultConfiguration.addChild(treeWalkerConfig); treeWalkerConfig.addChild(scraperCheckConfig); checker.configure(defaultConfiguration); + + checker.addListener(new MetadataGeneratorLogger(out, + AutomaticBean.OutputStreamOptions.NONE)); + dumpMetadata(checker, path, moduleFolders); } @@ -94,7 +103,6 @@ private static void dumpMetadata(Checker checker, String path, String... moduleF .collect(Collectors.toList())); } } - checker.process(validFiles); } }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/MetadataGeneratorLoggerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/MetadataGeneratorLoggerTest.java new file mode 100644 --- /dev/null +++ b/src/test/java/com/puppycrawl/tools/checkstyle/MetadataGeneratorLoggerTest.java @@ -0,0 +1,112 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2022 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package com.puppycrawl.tools.checkstyle; + +import static com.google.common.truth.Truth.assertWithMessage; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; + +import org.junit.jupiter.api.Test; + +import com.puppycrawl.tools.checkstyle.api.AuditEvent; +import com.puppycrawl.tools.checkstyle.api.AutomaticBean; +import com.puppycrawl.tools.checkstyle.api.SeverityLevel; +import com.puppycrawl.tools.checkstyle.api.Violation; +import com.puppycrawl.tools.checkstyle.internal.utils.CloseAndFlushTestByteArrayOutputStream; + +public class MetadataGeneratorLoggerTest { + + @Test + public void testIgnoreSeverityLevel() { + final OutputStream outputStream = new ByteArrayOutputStream(); + final MetadataGeneratorLogger logger = new MetadataGeneratorLogger(outputStream, + AutomaticBean.OutputStreamOptions.CLOSE); + final AuditEvent event = new AuditEvent(this, "fileName", + new Violation(1, 2, "bundle", "key", + null, SeverityLevel.IGNORE, null, getClass(), "customViolation")); + logger.finishLocalSetup(); + logger.addError(event); + logger.auditFinished(event); + assertWithMessage("Output stream should be empty") + .that(outputStream.toString()) + .isEmpty(); + } + + @Test + public void testAddException() { + final OutputStream outputStream = new ByteArrayOutputStream(); + final MetadataGeneratorLogger logger = new MetadataGeneratorLogger(outputStream, + AutomaticBean.OutputStreamOptions.CLOSE); + final AuditEvent event = new AuditEvent(1); + logger.addException(event, new IllegalStateException("Test Exception")); + logger.auditFinished(event); + assertWithMessage("Violation should contain exception message") + .that(outputStream.toString()) + .contains("java.lang.IllegalStateException: Test Exception"); + } + + @Test + public void testClose() throws IOException { + try (CloseAndFlushTestByteArrayOutputStream outputStream = + new CloseAndFlushTestByteArrayOutputStream()) { + final MetadataGeneratorLogger logger = new MetadataGeneratorLogger(outputStream, + AutomaticBean.OutputStreamOptions.CLOSE); + logger.auditFinished(new AuditEvent(1)); + assertWithMessage("Unexpected close count") + .that(outputStream.getCloseCount()) + .isEqualTo(1); + } + } + + @Test + public void testCloseOutputStreamOptionNone() throws IOException { + try (CloseAndFlushTestByteArrayOutputStream outputStream = + new CloseAndFlushTestByteArrayOutputStream()) { + final MetadataGeneratorLogger logger = new MetadataGeneratorLogger(outputStream, + AutomaticBean.OutputStreamOptions.NONE); + final AuditEvent event = new AuditEvent(1); + logger.auditFinished(event); + assertWithMessage("Unexpected close count") + .that(outputStream.getCloseCount()) + .isEqualTo(0); + } + } + + @Test + public void testFlushStreams() throws Exception { + try (CloseAndFlushTestByteArrayOutputStream outputStream = + new CloseAndFlushTestByteArrayOutputStream()) { + final MetadataGeneratorLogger logger = new MetadataGeneratorLogger(outputStream, + AutomaticBean.OutputStreamOptions.NONE); + final AuditEvent event = new AuditEvent(1); + logger.auditStarted(event); + logger.fileFinished(event); + assertWithMessage("Unexpected flush count") + .that(outputStream.getFlushCount()) + .isEqualTo(2); + logger.auditFinished(event); + assertWithMessage("Unexpected flush count") + .that(outputStream.getFlushCount()) + .isEqualTo(3); + } + } +} diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraperTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraperTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraperTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraperTest.java @@ -199,7 +199,7 @@ public void testEmptyDescription() throws Exception { final String[] expected = { "19: " + getCheckMessage(MSG_DESC_MISSING, - "InputJavadocMetadataScraperAbstractSuper"), + "InputJavadocMetadataScraperAbstractSuperCheck"), }; verifyWithInlineConfigParser(getPath( "InputJavadocMetadataScraperAbstractSuperCheck.java"), expected); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtilTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtilTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtilTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtilTest.java @@ -20,6 +20,7 @@ package com.puppycrawl.tools.checkstyle.meta; import static com.google.common.truth.Truth.assertWithMessage; +import static com.puppycrawl.tools.checkstyle.meta.JavadocMetadataScraper.MSG_DESC_MISSING; import java.nio.file.Files; import java.nio.file.Path; @@ -28,14 +29,21 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.itsallcode.io.Capturable; +import org.itsallcode.junit.sysextensions.SystemOutGuard; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport; import com.puppycrawl.tools.checkstyle.internal.utils.CheckUtil; -public final class MetadataGeneratorUtilTest { +@ExtendWith(SystemOutGuard.class) +public final class MetadataGeneratorUtilTest extends AbstractModuleTestSupport { private final List<String> modulesContainingNoMetadataFile = Arrays.asList( "Checker", @@ -43,14 +51,55 @@ public final class MetadataGeneratorUtilTest { "JavadocMetadataScraper" ); + @Override + protected String getPackageLocation() { + return null; + } + + /** + * Generates metadata for checkstyle modules and verifies number of + * generated metadata modules match the number of checkstyle modules. + * Also verifies whether every checkstyle module contains description. + * + * @param systemOut wrapper for {@code System.out} + * @throws Exception if exception occurs during generating metadata or + * if an I/O error is thrown when accessing the starting file. + * @noinspection UseOfSystemOutOrSystemErr + */ @Test - public void testMetadataFilesGenerationAllFiles() throws Exception { + public void testMetadataFilesGenerationAllFiles(@SystemOutGuard.SysOut Capturable systemOut) + throws Exception { + systemOut.captureMuted(); MetadataGeneratorUtil.generate(System.getProperty("user.dir") + "/src/main/java/com/puppycrawl/tools/checkstyle", - "checks", "filters", "filefilters"); - final Set<String> metaFiles; + System.out, "checks", "filters", "filefilters"); + final String[] expectedErrorMessages = { + "31: " + getCheckMessage(MSG_DESC_MISSING, "AbstractSuperCheck"), + "45: " + getCheckMessage(MSG_DESC_MISSING, "AbstractHeaderCheck"), + "42: " + getCheckMessage(MSG_DESC_MISSING, "AbstractJavadocCheck"), + "45: " + getCheckMessage(MSG_DESC_MISSING, "AbstractClassCouplingCheck"), + "26: " + getCheckMessage(MSG_DESC_MISSING, "AbstractAccessControlNameCheck"), + "30: " + getCheckMessage(MSG_DESC_MISSING, "AbstractNameCheck"), + "29: " + getCheckMessage(MSG_DESC_MISSING, "AbstractParenPadCheck"), + }; + + final String[] actualViolations = systemOut.getCapturedData().split("\\n"); + final Pattern violationExtractingPattern = Pattern.compile("((?<=:)\\d.*:.*(?=\\s\\[))"); + + Arrays.setAll(actualViolations, id -> { + final Matcher matcher = violationExtractingPattern.matcher(actualViolations[id]); + matcher.find(); + return matcher.group(1); + }); + + assertWithMessage("Expected and actual errors do not match") + .that(expectedErrorMessages) + .asList() + .containsExactlyElementsIn(actualViolations); + + final Set<String> metaFiles; try (Stream<Path> fileStream = Files.walk( Paths.get(System.getProperty("user.dir") + "/src/main/resources/com/puppycrawl" + "/tools/checkstyle/meta"))) { @@ -67,8 +116,10 @@ public void testMetadataFilesGenerationAllFiles() throws Exception { .sorted() .collect(Collectors.toCollection(LinkedHashSet::new)); checkstyleModules.removeAll(modulesContainingNoMetadataFile); - assertWithMessage("Number of generated metadata files dont match with number of checkstyle " - + "module").that(metaFiles).isEqualTo(checkstyleModules); + assertWithMessage("Number of generated metadata files dont match with " + + "number of checkstyle module") + .that(metaFiles) + .isEqualTo(checkstyleModules); } /**
JavadocMetadataScraper fails silently if it can't write the XML files Identified through https://github.com/sevntu-checkstyle/sevntu.checkstyle/issues/857 , At https://github.com/checkstyle/checkstyle/blob/13481f2c410e4944ecf5ab93ec49948a523a0c82/src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaWriter.java#L179 , checkstyle will fail silently if there are no descriptions to write for the file it scrapped. I was expecting the files to be generated, or give me an error why they couldn't be generated. Since there was no message and no files, this required me to debug through the code to find out why it wasn't generating my files or complaining. I feel we should print an error message while continuing to process other files. I also feel `MetadataGeneratorUtil` should report any errors back somehow so the client and calling tests can handle the situation appropriately.
I am working on it. The issue is split into 2 PRs. The first will add the error message to the module. The second will have the util print out the errors to the user when it is run. @Vyom-Yadav, what is left to be done ? @romani, Currently the error messages will not be shown to users as `JavadovMetadataScraper` is not executed as a normal check on all the files, we have to separately run it on all the files in `MetadataGeneratorUtilTest`. So modifying `generate(String... args)` method in `MetadataGeneratorUtil` to give the user the violations by adding `DefaultLogger` and a few more modifications. I will send a PR shortly.
2021-10-25T07:40:08Z
9.3
checkstyle/checkstyle
10,922
checkstyle__checkstyle-10922
[ "10920" ]
2a6a18a31978aa468db669b564929efd00c321c4
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheck.java @@ -211,13 +211,14 @@ public int[] getRequiredTokens() { public void visitToken(DetailAST ast) { final String line = getLine(ast.getLineNo() - 1); final int before = ast.getColumnNo() - 1; + final int[] codePoints = line.codePoints().toArray(); - if ((before == -1 || Character.isWhitespace(line.charAt(before))) + if ((before == -1 || isWhitespace(codePoints, before)) && !isInEmptyForInitializerOrCondition(ast)) { boolean flag = !allowLineBreaks; // verify all characters before '.' are whitespace for (int i = 0; i <= before - 1; i++) { - if (!Character.isWhitespace(line.charAt(i))) { + if (!isWhitespace(codePoints, i)) { flag = true; break; } @@ -228,6 +229,23 @@ public void visitToken(DetailAST ast) { } } + /** + * Converts the Unicode code point at index {@code index} to it's UTF-16 + * representation, then checks if the character is whitespace. Note that the given + * index {@code index} should correspond to the location of the character + * to check in the string, not in code points. + * + * @param codePoints the array of Unicode code points + * @param index the index of the character to check + * @return true if character at {@code index} is whitespace + */ + private static boolean isWhitespace(int[] codePoints, int index) { + // We only need to check the first member of a surrogate pair to verify that + // it is not whitespace. + final char character = Character.toChars(codePoints[index])[0]; + return Character.isWhitespace(character); + } + /** * Checks that semicolon is in empty for initializer or condition. *
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheckTest.java @@ -127,4 +127,17 @@ public void testNoWhitespaceBeforeTextBlocksWithTabIndent() throws Exception { getNonCompilablePath("InputNoWhitespaceBeforeTextBlocksTabIndent.java"), expected); } + @Test + public void testNoWhitespaceBeforeWithEmoji() throws Exception { + final String[] expected = { + "13:15: " + getCheckMessage(MSG_KEY, ","), + "14:17: " + getCheckMessage(MSG_KEY, ","), + "20:37: " + getCheckMessage(MSG_KEY, ";"), + "21:37: " + getCheckMessage(MSG_KEY, ";"), + }; + + verifyWithInlineConfigParser( + getPath("InputNoWhitespaceBeforeWithEmoji.java"), expected); + } + } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/InputNoWhitespaceBeforeWithEmoji.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/InputNoWhitespaceBeforeWithEmoji.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/InputNoWhitespaceBeforeWithEmoji.java @@ -0,0 +1,22 @@ +/* +NoWhitespaceBefore +allowLineBreaks = (default)false +tokens = (default)COMMA, SEMI, POST_INC, POST_DEC, ELLIPSIS, LABELED_STAT + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.whitespace.nowhitespacebefore; + +public class InputNoWhitespaceBeforeWithEmoji { + private String[] _mVar0 = { + "😃😉🙈" , // violation + "😃 😉 🙈" , // violation + "😃 😉 🙈", // ok + "😃😉🙈" // ok + }; + private String _mVar1 = "😃😉🙈"; // ok + private String _mVar2 = "😃 😉 🙈"; // ok + private String _mVar3 = "😃 😉 🙈" ; // violation + private String _mVar4 = "a b c" ; // violation +}
Version 9.x reports NoWhitespaceBefore error on semicolon or comma after string with emoji I have read check documentation: https://checkstyle.org/config_whitespace.html#NoWhitespaceBefore I have downloaded the latest checkstyle from: https://checkstyle.org/cmdline.html#Download_and_Run I have executed the cli and showed it below, as cli describes the problem better than 1,000 words ```bash /var/tmp $ javac Test.java /var/tmp $ cat config.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <module name="TreeWalker"> <module name="NoWhitespaceBefore"/> </module> </module> /var/tmp $ cat Test.java public class Test { private String[] _mVar0 = { "😃😉🙈" , // should be error "😃 😉 🙈" , // should be error "😃 😉 🙈", // should ok "😃😉🙈" // should be ok }; private String _mVar1 = "😃😉🙈"; // should be ok private String _mVar2 = "😃 😉 🙈"; // should be ok private String _mVar3 = "😃 😉 🙈" ; // should be error private String _mVar4 = "a b c" ; // should be error } /var/tmp $ RUN_LOCALE="-Duser.language=en -Duser.country=US" /var/tmp $ java $RUN_LOCALE -jar checkstyle-8.45.1-all.jar -c config.xml Test.java Starting audit... [ERROR] /home/jogchem/Projects/checkstyle/Test.java:3:18: ',' is preceded with whitespace. [NoWhitespaceBefore] [ERROR] /home/jogchem/Projects/checkstyle/Test.java:4:20: ',' is preceded with whitespace. [NoWhitespaceBefore] [ERROR] /home/jogchem/Projects/checkstyle/Test.java:10:40: ';' is preceded with whitespace. [NoWhitespaceBefore] [ERROR] /home/jogchem/Projects/checkstyle/Test.java:11:37: ';' is preceded with whitespace. [NoWhitespaceBefore] Audit done. Checkstyle ends with 4 errors. /var/tmp $ java $RUN_LOCALE -jar checkstyle-9.1-all.jar -c config.xml Test.java Starting audit... [ERROR] /home/jogchem/Projects/checkstyle/Test.java:5:16: ',' is preceded with whitespace. [NoWhitespaceBefore] [ERROR] /home/jogchem/Projects/checkstyle/Test.java:9:36: ';' is preceded with whitespace. [NoWhitespaceBefore] [ERROR] /home/jogchem/Projects/checkstyle/Test.java:11:37: ';' is preceded with whitespace. [NoWhitespaceBefore] Audit done. Checkstyle ends with 3 errors. ``` For Windows users, please use `type` instead of `cat` and run ```cmd set RUN_LOCALE="-Duser.language=en -Duser.country=US" java %RUN_LOCALE% -jar checkstyle-8.45.1-all.jar -c config.xml Test.java java %RUN_LOCALE% -jar checkstyle-9.1-all.jar -c config.xml Test.java ``` in place of the last 2 commands above. --- I expect the output of version 9.1 to be the same as for version 8.45.1, but instead it does not report errors for whitespace that follows a string with emoji. Even weirder is that I discovered this bug because it did report extra errors after upgrading to 9.1, so it seems that running the checkstyle from the maven plugin leads to different behaviour. I've created a test case to reproduce this as well. I think the root cause of this issue is that ANTLR generates a different offset for the SEMI or COMMA token. Using the test file https://github.com/dijkstraj/checkstyle/blob/emoji-8/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/InputAstRegressionEmojiString.java the generated AST (https://github.com/dijkstraj/checkstyle/blob/emoji-8/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/InputAstRegressionEmojiString.txt) has columns 33 and 34 for the semicolons in version 8.45.1, but columns 31 and 34 in master (https://github.com/dijkstraj/checkstyle/blob/emoji-9/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/InputAstRegressionEmojiString.txt). So it looks like a difference between character and byte offset. The error that I originally ran into is reproducable with this line: https://github.com/dijkstraj/checkstyle/blob/emoji-9/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/InputNoWhitespaceBeforeDefault.java#L309
it looks similar to https://github.com/checkstyle/checkstyle/issues/10837, @nmancus1 can you help?
2021-11-04T04:40:22Z
9.1
checkstyle/checkstyle
10,857
checkstyle__checkstyle-10857
[ "10855" ]
696902eb962e1e3ab5c98be82ce360860dd49839
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.java @@ -272,17 +272,13 @@ private void processIdent(DetailAST ast) { || parentType == TokenTypes.METHOD_DEF; final boolean isQualifiedIdent = parentType == TokenTypes.DOT + && !TokenUtil.isOfType(ast.getPreviousSibling(), TokenTypes.DOT) && ast.getNextSibling() != null; - final boolean isQualifiedNameArrayType = parent.getParent().getType() == TokenTypes.DOT - && ast.getNextSibling() != null - && ast.getNextSibling().getType() == TokenTypes.ARRAY_DECLARATOR; - if (TokenUtil.isTypeDeclaration(parentType)) { currentFrame.addDeclaredType(ast.getText()); } - else if ((!isPossibleDotClassOrInMethod || isQualifiedIdent) - && !isQualifiedNameArrayType) { + else if (!isPossibleDotClassOrInMethod || isQualifiedIdent) { currentFrame.addReferencedType(ast.getText()); } }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckTest.java @@ -145,6 +145,15 @@ public void testAnnotations() throws Exception { getNonCompilablePath("InputUnusedImportsAnnotations.java"), expected); } + @Test + public void testArrayRef() throws Exception { + final String[] expected = { + "13:8: " + getCheckMessage(MSG_KEY, "java.util.ArrayList"), + }; + verifyWithInlineConfigParser( + getPath("InputUnusedImportsArrayRef.java"), expected); + } + @Test public void testBug() throws Exception { final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsArrayRef.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsArrayRef.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsArrayRef.java @@ -0,0 +1,24 @@ +/* +UnusedImports +processJavadoc = (default)true + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.imports.unusedimports; + +import java.util.HashMap; // ok +import java.util.HashSet; +import java.util.Set; +import java.util.ArrayList; // violation + +public class InputUnusedImportsArrayRef { + + private static final Set<String> FOO; + static { + FOO = new HashSet<>(); + + FOO.add( HashMap[].class.getName() ); + FOO.add( java.util.ArrayList[].class.getName() ); + } +}
UnusedImports error if there are only array references to a given class ```bash slovdahl@desk:~/checkstyle-unused-import-bug-reproducer/src/main/java (main)$ javac checkstyle/reproducer/UnusedImportBug.java slovdahl@desk:~/checkstyle-unused-import-bug-reproducer/src/main/java (main)$ slovdahl@desk:~/checkstyle-unused-import-bug-reproducer (main)$ cat gradle/checkstyle/checkstyle.xml <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> <module name="Checker"> <module name="TreeWalker"> <module name="UnusedImports"> <property name="processJavadoc" value="true"/> </module> </module> </module> slovdahl@desk:~/checkstyle-unused-import-bug-reproducer (main)$ cat src/main/java/checkstyle/reproducer/UnusedImportBug.java package checkstyle.reproducer; import java.util.HashMap; import java.util.HashSet; import java.util.Set; public class UnusedImportBug { private static final Set<String> FOO; static { FOO = new HashSet<>(); FOO.add( HashMap[].class.getName() ); } } slovdahl@desk:~/checkstyle-unused-import-bug-reproducer (main)$ RUN_LOCALE="-Duser.language=en -Duser.country=US" slovdahl@desk:~/checkstyle-unused-import-bug-reproducer (main)$ java $RUN_LOCALE -jar checkstyle-9.0.1-all.jar -c gradle/checkstyle/checkstyle.xml src/main/java/checkstyle/reproducer/UnusedImportBug.java Starting audit... [ERROR] /home/slovdahl/checkstyle-unused-import-bug-reproducer/src/main/java/checkstyle/reproducer/UnusedImportBug.java:3:8: Unused import - java.util.HashMap. [UnusedImports] Audit done. Checkstyle ends with 1 errors. ``` --- **Describe what you expect in detail.** The `UnusedImport` error should not be triggered if an import is actually used. --- MCVE: https://github.com/hiboxsystems/checkstyle-unused-import-bug-reproducer
AST: ``` COMPILATION_UNIT -> COMPILATION_UNIT [1:0] |--IMPORT -> import [1:0] | |--DOT -> . [1:16] | | |--DOT -> . [1:11] | | | |--IDENT -> java [1:7] | | | `--IDENT -> util [1:12] | | `--IDENT -> HashMap [1:17] | `--SEMI -> ; [1:24] |--IMPORT -> import [2:0] | |--DOT -> . [2:16] | | |--DOT -> . [2:11] | | | |--IDENT -> java [2:7] | | | `--IDENT -> util [2:12] | | `--IDENT -> HashSet [2:17] | `--SEMI -> ; [2:24] |--IMPORT -> import [3:0] | |--DOT -> . [3:16] | | |--DOT -> . [3:11] | | | |--IDENT -> java [3:7] | | | `--IDENT -> util [3:12] | | `--IDENT -> Set [3:17] | `--SEMI -> ; [3:20] `--CLASS_DEF -> CLASS_DEF [5:0] |--MODIFIERS -> MODIFIERS [5:0] | `--LITERAL_PUBLIC -> public [5:0] |--LITERAL_CLASS -> class [5:7] |--IDENT -> UnusedImportBug [5:13] `--OBJBLOCK -> OBJBLOCK [5:29] |--LCURLY -> { [5:29] |--VARIABLE_DEF -> VARIABLE_DEF [7:4] | |--MODIFIERS -> MODIFIERS [7:4] | | |--LITERAL_PRIVATE -> private [7:4] | | |--LITERAL_STATIC -> static [7:12] | | `--FINAL -> final [7:19] | |--TYPE -> TYPE [7:25] | | |--IDENT -> Set [7:25] | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [7:28] | | |--GENERIC_START -> < [7:28] | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [7:29] | | | `--IDENT -> String [7:29] | | `--GENERIC_END -> > [7:35] | |--IDENT -> FOO [7:37] | `--SEMI -> ; [7:40] |--STATIC_INIT -> STATIC_INIT [8:4] | `--SLIST -> { [8:11] | |--EXPR -> EXPR [9:12] | | `--ASSIGN -> = [9:12] | | |--IDENT -> FOO [9:8] | | `--LITERAL_NEW -> new [9:14] | | |--IDENT -> HashSet [9:18] | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [9:25] | | | |--GENERIC_START -> < [9:25] | | | `--GENERIC_END -> > [9:26] | | |--LPAREN -> ( [9:27] | | |--ELIST -> ELIST [9:28] | | `--RPAREN -> ) [9:28] | |--SEMI -> ; [9:29] | |--EXPR -> EXPR [11:15] | | `--METHOD_CALL -> ( [11:15] | | |--DOT -> . [11:11] | | | |--IDENT -> FOO [11:8] | | | `--IDENT -> add [11:12] | | |--ELIST -> ELIST [11:40] | | | `--EXPR -> EXPR [11:40] | | | `--METHOD_CALL -> ( [11:40] | | | |--DOT -> . [11:32] | | | | |--DOT -> . [11:26] | | | | | |--IDENT -> HashMap [11:17] | | | | | |--ARRAY_DECLARATOR -> [ [11:24] | | | | | | `--RBRACK -> ] [11:25] | | | | | `--LITERAL_CLASS -> class [11:27] | | | | `--IDENT -> getName [11:33] | | | |--ELIST -> ELIST [11:41] | | | `--RPAREN -> ) [11:41] | | `--RPAREN -> ) [11:43] | |--SEMI -> ; [11:44] | `--RCURLY -> } [12:4] `--RCURLY -> } [13:0] ``` This may be related to #10100 I am on it
2021-10-11T18:05:43Z
9
checkstyle/checkstyle
10,762
checkstyle__checkstyle-10762
[ "10760" ]
1acbabe78a6f9a3423b59cdb9b04dec74657b7be
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/Violation.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/Violation.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/Violation.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/Violation.java @@ -528,7 +528,7 @@ public ResourceBundle newBundle(String baseName, Locale locale, String format, if (connection != null) { connection.setUseCaches(!reload); try (Reader streamReader = new InputStreamReader(connection.getInputStream(), - StandardCharsets.UTF_8.name())) { + StandardCharsets.UTF_8)) { // Only this line is changed to make it read property files as UTF-8. resourceBundle = new PropertyResourceBundle(streamReader); } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.java @@ -25,10 +25,10 @@ import java.io.LineNumberReader; import java.io.Reader; import java.io.StringReader; -import java.io.UnsupportedEncodingException; import java.net.URI; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; +import java.nio.charset.UnsupportedCharsetException; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -57,7 +57,8 @@ public abstract class AbstractHeaderCheck extends AbstractFileSetCheck private URI headerFile; /** Specify the character encoding to use when reading the headerFile. */ - private String charset = System.getProperty("file.encoding", StandardCharsets.UTF_8.name()); + private Charset charset = createCharset(System.getProperty("file.encoding", + StandardCharsets.UTF_8.name())); /** * Hook method for post processing header lines. @@ -76,17 +77,12 @@ protected List<String> getHeaderLines() { } /** - * Setter to specify the character encoding to use when reading the headerFile. + * Setter to specify the charset to use when reading the headerFile. * - * @param charset the charset to use for loading the header from a file - * @throws UnsupportedEncodingException if charset is unsupported + * @param charset the charset name to use for loading the header from a file */ - public void setCharset(String charset) throws UnsupportedEncodingException { - if (!Charset.isSupported(charset)) { - final String message = "unsupported charset: '" + charset + "'"; - throw new UnsupportedEncodingException(message); - } - this.charset = charset; + public void setCharset(String charset) { + this.charset = createCharset(charset); } /** @@ -135,6 +131,21 @@ private void checkHeaderNotInitialized() { } } + /** + * Creates charset by name. + * + * @param name charset name + * @return created charset + * @throws UnsupportedCharsetException if charset is unsupported + */ + private static Charset createCharset(String name) { + if (!Charset.isSupported(name)) { + final String message = "unsupported charset: '" + name + "'"; + throw new UnsupportedCharsetException(message); + } + return Charset.forName(name); + } + /** * Set the header to check against. Individual lines in the header * must be separated by '\n' characters.
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTaskTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTaskTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTaskTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTaskTest.java @@ -25,12 +25,12 @@ import java.io.IOException; import java.net.URL; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; -import org.apache.commons.io.FileUtils; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.FileSet; @@ -403,7 +403,7 @@ public final void testExecuteIgnoredModules() throws IOException { null, null, getClass(), null); - final List<String> output = FileUtils.readLines(outputFile, StandardCharsets.UTF_8); + final List<String> output = readWholeFile(outputFile); final String errorMessage = "Content of file with violations differs from expected"; assertWithMessage(errorMessage) .that(output.get(0)) @@ -444,7 +444,7 @@ public final void testConfigurationByUrl() throws IOException { antTask.execute(); - final List<String> output = FileUtils.readLines(outputFile, StandardCharsets.UTF_8); + final List<String> output = readWholeFile(outputFile); final int sizeOfOutputWithNoViolations = 2; assertWithMessage("No violations expected") .that(output.size()) @@ -469,7 +469,7 @@ public final void testConfigurationByResource() throws IOException { antTask.execute(); - final List<String> output = FileUtils.readLines(outputFile, StandardCharsets.UTF_8); + final List<String> output = readWholeFile(outputFile); final int sizeOfOutputWithNoViolations = 2; assertWithMessage("No violations expected") .that(output.size()) @@ -542,10 +542,9 @@ public final void testXmlOutput() throws IOException { antTask.addFormatter(formatter); antTask.execute(); - final List<String> expected = FileUtils.readLines( - new File(getPath("ExpectedCheckstyleAntTaskXmlOutput.xml")), - StandardCharsets.UTF_8); - final List<String> actual = FileUtils.readLines(outputFile, StandardCharsets.UTF_8); + final List<String> expected = readWholeFile( + new File(getPath("ExpectedCheckstyleAntTaskXmlOutput.xml"))); + final List<String> actual = readWholeFile(outputFile); for (int i = 0; i < expected.size(); i++) { final String line = expected.get(i); if (!line.startsWith("<checkstyle version") && !line.startsWith("<file")) { @@ -768,6 +767,10 @@ public void testMaxWarnings() throws IOException { .isTrue(); } + private static List<String> readWholeFile(File outputFile) throws IOException { + return Files.readAllLines(outputFile.toPath(), StandardCharsets.UTF_8); + } + private static class CheckstyleAntTaskLogStub extends CheckstyleAntTask { private final List<String> loggedMessages = new ArrayList<>(); @@ -787,5 +790,4 @@ public List<String> getLoggedMessages() { } } - } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java @@ -41,6 +41,7 @@ import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; import java.net.URI; +import java.nio.charset.Charset; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -1004,7 +1005,7 @@ else if (fieldClass == int[].class) { else if (fieldClass == double[].class) { result = "double[]"; } - else if (fieldClass == String.class) { + else if (fieldClass == String.class || fieldClass == Charset.class) { result = "String"; if ("Checker".equals(sectionName) && "localeCountry".equals(propertyName)) {
Add maven modernizer plugin Plugin link https://github.com/gaul/modernizer-maven-plugin It may be useful, especially for migration to java 11. Cons - some checks can be duplicated by other tools. I have added plugin, exclusions (test inputs) and fixed 2 violations here - https://github.com/strkkk/checkstyle/commit/e3a3a041dc2547c035fe77151edcecb0bbfd5df5 Do we need this in checkstyle code?
Sure, if project is configurable enough and it can find something , let's use it. We need to catch up our goal to use all tools of static analysis, to show them in action, and actually benefit from them. Please don't forget to add `<modernizer.skip>true</>` to [no-validations](https://github.com/checkstyle/checkstyle/blob/master/pom.xml#L1902) and [assembly](https://github.com/checkstyle/checkstyle/blob/master/pom.xml#L1921) profiles. Output from modernizer: ```` [INFO] --- modernizer-maven-plugin:2.3.0:modernizer (modernizer) @ checkstyle --- [ERROR] \checkstyle\src\main\java\com\puppycrawl\tools\checkstyle\api\Violation$Utf8Control.java:531: Prefer java.io.InputStreamReader(java.io.InputStream, java.nio.charset.Charset) [ERROR] \checkstyle\src\main\java\com\puppycrawl\tools\checkstyle\checks\header\AbstractHeaderCheck.java:116: Prefer java.io.InputStreamReader(java.io.InputStream, java.nio.charset.Charset) ````
2021-08-30T12:59:54Z
9
checkstyle/checkstyle
10,280
checkstyle__checkstyle-10280
[ "10272" ]
e28abc7d49a5f176c59b30b7d8d680339215ac29
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/CheckstyleParserErrorStrategy.java b/src/main/java/com/puppycrawl/tools/checkstyle/CheckstyleParserErrorStrategy.java new file mode 100644 --- /dev/null +++ b/src/main/java/com/puppycrawl/tools/checkstyle/CheckstyleParserErrorStrategy.java @@ -0,0 +1,41 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2021 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package com.puppycrawl.tools.checkstyle; + +import org.antlr.v4.runtime.BailErrorStrategy; +import org.antlr.v4.runtime.InputMismatchException; +import org.antlr.v4.runtime.Parser; +import org.antlr.v4.runtime.Token; + +/** + * Extending BailErrorStrategy allows us to report errors while + * cancelling the parsing operation. If input is not syntactically + * correct, we do not need to use antlr's recovery strategy, which + * can add significant overhead. + * + */ +public class CheckstyleParserErrorStrategy extends BailErrorStrategy { + + @Override + public Token recoverInline(Parser recognizer) { + reportError(recognizer, new InputMismatchException(recognizer)); + return super.recoverInline(recognizer); + } +} diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java b/src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java @@ -20,22 +20,21 @@ package com.puppycrawl.tools.checkstyle; import java.util.BitSet; +import java.util.Collections; +import java.util.List; + +import org.antlr.v4.runtime.Token; -import antlr.CommonASTWithHiddenTokens; -import antlr.Token; -import antlr.collections.AST; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.utils.TokenUtil; /** * The implementation of {@link DetailAST}. This should only be directly used to - * create custom AST nodes. + * create custom AST nodes and in 'JavaAstVisitor.java'. * - * @noinspection FieldNotUsedInToString, SerializableHasSerializationMethods + * @noinspection FieldNotUsedInToString */ -public final class DetailAstImpl extends CommonASTWithHiddenTokens implements DetailAST { - - private static final long serialVersionUID = -2580884815577559874L; +public final class DetailAstImpl implements DetailAST { /** Constant to indicate if not calculated the child count. */ private static final int NOT_INITIALIZED = Integer.MIN_VALUE; @@ -52,6 +51,30 @@ public final class DetailAstImpl extends CommonASTWithHiddenTokens implements De /** Previous sibling. */ private DetailAstImpl previousSibling; + /** First child of this DetailAST. */ + private DetailAstImpl firstChild; + + /** First sibling of this DetailAST.*/ + private DetailAstImpl nextSibling; + + /** Text of this DetailAST. */ + private String text; + + /** The type of this DetailAST. */ + private int type; + + /** + * All tokens on COMMENTS channel to the left of the current token up to the + * preceding token on the DEFAULT_TOKEN_CHANNEL. + */ + private List<Token> hiddenBefore; + + /** + * All tokens on COMMENTS channel to the right of the current token up to the + * next token on the DEFAULT_TOKEN_CHANNEL. + */ + private List<Token> hiddenAfter; + /** * All token types in this branch. * Token 'x' (where x is an int) is in this branch @@ -59,47 +82,27 @@ public final class DetailAstImpl extends CommonASTWithHiddenTokens implements De */ private BitSet branchTokenTypes; - @Override - public void initialize(Token token) { - super.initialize(token); - lineNo = token.getLine(); - - // expect columns to start @ 0 - columnNo = token.getColumn() - 1; - } - - @Override - public void initialize(AST ast) { - final DetailAstImpl detailAst = (DetailAstImpl) ast; - setText(detailAst.getText()); - setType(detailAst.getType()); - lineNo = detailAst.getLineNo(); - columnNo = detailAst.getColumnNo(); - hiddenAfter = detailAst.getHiddenAfter(); - hiddenBefore = detailAst.getHiddenBefore(); - } - - @Override - public void setFirstChild(AST ast) { - clearBranchTokenTypes(); - clearChildCountCache(this); - super.setFirstChild(ast); - if (ast != null) { - ((DetailAstImpl) ast).setParent(this); - } + /** + * Initializes this DetailAstImpl. + * + * @param tokenType the type of this DetailAstImpl + * @param tokenText the text of this DetailAstImpl + */ + public void initialize(int tokenType, String tokenText) { + type = tokenType; + text = tokenText; } - @Override - public void setNextSibling(AST ast) { - clearBranchTokenTypes(); - clearChildCountCache(parent); - super.setNextSibling(ast); - if (ast != null && parent != null) { - ((DetailAstImpl) ast).setParent(parent); - } - if (ast != null) { - ((DetailAstImpl) ast).previousSibling = this; - } + /** + * Initializes this DetailAstImpl. + * + * @param token the token to generate this DetailAstImpl from + */ + public void initialize(Token token) { + text = token.getText(); + type = token.getType(); + lineNo = token.getLine(); + columnNo = token.getCharPositionInLine(); } /** @@ -130,22 +133,21 @@ else if (parent != null) { } /** - * Add next sibling. + * Add next sibling, pushes other siblings back. * - * @param ast - * DetailAST object. + * @param ast DetailAST object. */ public void addNextSibling(DetailAST ast) { clearBranchTokenTypes(); clearChildCountCache(parent); if (ast != null) { // parent is set in setNextSibling - final DetailAstImpl nextSibling = getNextSibling(); + final DetailAstImpl sibling = nextSibling; final DetailAstImpl astImpl = (DetailAstImpl) ast; - if (nextSibling != null) { - astImpl.setNextSibling(nextSibling); - nextSibling.previousSibling = astImpl; + if (sibling != null) { + astImpl.setNextSibling(sibling); + sibling.previousSibling = astImpl; } astImpl.previousSibling = this; @@ -153,16 +155,30 @@ public void addNextSibling(DetailAST ast) { } } - @Override - public void addChild(AST ast) { + /** + * Adds a new child to the current AST. + * + * @param child to DetailAST to add as child + */ + public void addChild(DetailAST child) { clearBranchTokenTypes(); clearChildCountCache(this); - if (ast != null) { - final DetailAstImpl astImpl = (DetailAstImpl) ast; + if (child != null) { + final DetailAstImpl astImpl = (DetailAstImpl) child; astImpl.setParent(this); astImpl.previousSibling = (DetailAstImpl) getLastChild(); } - super.addChild(ast); + DetailAST temp = firstChild; + if (temp == null) { + firstChild = (DetailAstImpl) child; + } + else { + while (temp.getNextSibling() != null) { + temp = temp.getNextSibling(); + } + + ((DetailAstImpl) temp).setNextSibling(child); + } } @Override @@ -170,7 +186,7 @@ public int getChildCount() { // lazy init if (childCount == NOT_INITIALIZED) { childCount = 0; - AST child = getFirstChild(); + DetailAST child = firstChild; while (child != null) { childCount += 1; @@ -181,10 +197,10 @@ public int getChildCount() { } @Override - public int getChildCount(int type) { + public int getChildCount(int tokenType) { int count = 0; - for (AST ast = getFirstChild(); ast != null; ast = ast.getNextSibling()) { - if (ast.getType() == type) { + for (DetailAST ast = firstChild; ast != null; ast = ast.getNextSibling()) { + if (ast.getType() == tokenType) { count++; } } @@ -201,7 +217,7 @@ private void setParent(DetailAstImpl parent) { do { instance.clearBranchTokenTypes(); instance.parent = parent; - instance = instance.getNextSibling(); + instance = instance.nextSibling; } while (instance != null); } @@ -210,6 +226,34 @@ public DetailAST getParent() { return parent; } + @Override + public String getText() { + return text; + } + + /** + * Sets the text for this DetailAstImpl. + * + * @param text the text field of this DetailAstImpl + */ + public void setText(String text) { + this.text = text; + } + + @Override + public int getType() { + return type; + } + + /** + * Sets the type of this AST. + * + * @param type the token type of this DetailAstImpl + */ + public void setType(int type) { + this.type = type; + } + @Override public int getLineNo() { int resultNo = -1; @@ -217,10 +261,10 @@ public int getLineNo() { if (lineNo == NOT_INITIALIZED) { // an inner AST that has been initialized // with initialize(String text) - resultNo = findLineNo(getFirstChild()); + resultNo = findLineNo(firstChild); if (resultNo == -1) { - resultNo = findLineNo(getNextSibling()); + resultNo = findLineNo(nextSibling); } } if (resultNo == -1) { @@ -246,10 +290,10 @@ public int getColumnNo() { if (columnNo == NOT_INITIALIZED) { // an inner AST that has been initialized // with initialize(String text) - resultNo = findColumnNo(getFirstChild()); + resultNo = findColumnNo(firstChild); if (resultNo == -1) { - resultNo = findColumnNo(getNextSibling()); + resultNo = findColumnNo(nextSibling); } } if (resultNo == -1) { @@ -270,9 +314,9 @@ public void setColumnNo(int columnNo) { @Override public DetailAST getLastChild() { - DetailAST ast = getFirstChild(); - while (ast != null && ast.getNextSibling() != null) { - ast = ast.getNextSibling(); + DetailAstImpl ast = firstChild; + while (ast != null && ast.nextSibling != null) { + ast = ast.nextSibling; } return ast; } @@ -330,23 +374,23 @@ private BitSet getBranchTokenTypes() { // lazy init if (branchTokenTypes == null) { branchTokenTypes = new BitSet(); - branchTokenTypes.set(getType()); + branchTokenTypes.set(type); // add union of all children - DetailAstImpl child = getFirstChild(); + DetailAstImpl child = firstChild; while (child != null) { final BitSet childTypes = child.getBranchTokenTypes(); branchTokenTypes.or(childTypes); - child = child.getNextSibling(); + child = child.nextSibling; } } return branchTokenTypes; } @Override - public boolean branchContains(int type) { - return getBranchTokenTypes().get(type); + public boolean branchContains(int tokenType) { + return getBranchTokenTypes().get(tokenType); } @Override @@ -355,10 +399,10 @@ public DetailAST getPreviousSibling() { } @Override - public DetailAST findFirstToken(int type) { + public DetailAST findFirstToken(int tokenType) { DetailAST returnValue = null; - for (DetailAST ast = getFirstChild(); ast != null; ast = ast.getNextSibling()) { - if (ast.getType() == type) { + for (DetailAST ast = firstChild; ast != null; ast = ast.getNextSibling()) { + if (ast.getType() == tokenType) { returnValue = ast; break; } @@ -368,22 +412,27 @@ public DetailAST findFirstToken(int type) { @Override public String toString() { - return super.toString() + "[" + getLineNo() + "x" + getColumnNo() + "]"; + return text + "[" + getLineNo() + "x" + getColumnNo() + "]"; } @Override public DetailAstImpl getNextSibling() { - return (DetailAstImpl) super.getNextSibling(); + return nextSibling; } @Override public DetailAstImpl getFirstChild() { - return (DetailAstImpl) super.getFirstChild(); + return firstChild; + } + + @Override + public int getNumberOfChildren() { + return getChildCount(); } @Override public boolean hasChildren() { - return getFirstChild() != null; + return firstChild != null; } /** @@ -409,4 +458,87 @@ private void clearBranchTokenTypes() { } } + /** + * Sets the next sibling of this AST. + * + * @param nextSibling the DetailAST to set as sibling + */ + public void setNextSibling(DetailAST nextSibling) { + clearBranchTokenTypes(); + clearChildCountCache(parent); + this.nextSibling = (DetailAstImpl) nextSibling; + if (nextSibling != null && parent != null) { + ((DetailAstImpl) nextSibling).setParent(parent); + } + if (nextSibling != null) { + ((DetailAstImpl) nextSibling).previousSibling = this; + } + } + + /** + * Sets the first child of this AST. + * + * @param firstChild the DetailAST to set as first child + */ + public void setFirstChild(DetailAST firstChild) { + clearBranchTokenTypes(); + clearChildCountCache(this); + this.firstChild = (DetailAstImpl) firstChild; + if (firstChild != null) { + ((DetailAstImpl) firstChild).setParent(this); + } + } + + /** + * Removes all children of this AST. + */ + public void removeChildren() { + firstChild = null; + } + + /** + * Get list of tokens on COMMENTS channel to the left of the + * current token up to the preceding token on the DEFAULT_TOKEN_CHANNEL. + * + * @return list of comment tokens + */ + public List<Token> getHiddenBefore() { + List<Token> returnList = null; + if (hiddenBefore != null) { + returnList = Collections.unmodifiableList(hiddenBefore); + } + return returnList; + } + + /** + * Get list tokens on COMMENTS channel to the right of the current + * token up to the next token on the DEFAULT_TOKEN_CHANNEL. + * + * @return list of comment tokens + */ + public List<Token> getHiddenAfter() { + List<Token> returnList = null; + if (hiddenAfter != null) { + returnList = Collections.unmodifiableList(hiddenAfter); + } + return returnList; + } + + /** + * Sets the hiddenBefore token field. + * + * @param hiddenBefore comment token preceding this DetailAstImpl + */ + public void setHiddenBefore(List<Token> hiddenBefore) { + this.hiddenBefore = Collections.unmodifiableList(hiddenBefore); + } + + /** + * Sets the hiddenAfter token field. + * + * @param hiddenAfter comment token following this DetailAstImpl + */ + public void setHiddenAfter(List<Token> hiddenAfter) { + this.hiddenAfter = Collections.unmodifiableList(hiddenAfter); + } } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java b/src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java new file mode 100644 --- /dev/null +++ b/src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java @@ -0,0 +1,2163 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2021 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package com.puppycrawl.tools.checkstyle; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Optional; +import java.util.Queue; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.stream.Collectors; + +import org.antlr.v4.runtime.BufferedTokenStream; +import org.antlr.v4.runtime.CommonTokenStream; +import org.antlr.v4.runtime.ParserRuleContext; +import org.antlr.v4.runtime.Token; +import org.antlr.v4.runtime.tree.ParseTree; +import org.antlr.v4.runtime.tree.TerminalNode; + +import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.grammar.java.CheckstyleJavaParser; +import com.puppycrawl.tools.checkstyle.grammar.java.CheckstyleJavaParserBaseVisitor; +import com.puppycrawl.tools.checkstyle.grammar.java.JavaLexer; +import com.puppycrawl.tools.checkstyle.utils.TokenUtil; + +/** + * Visitor class used to build Checkstyle's Java AST from the parse tree produced by + * {@link CheckstyleJavaParser}. In each {@code visit...} method, we visit the children of a node + * (which correspond to subrules) or create terminal nodes (tokens), and return a subtree as a + * result. + * + * <p>Example:</p> + * + * <p>The following package declaration:</p> + * <pre> + * package com.puppycrawl.tools.checkstyle; + * </pre> + * + * <p> + * Will be parsed by the {@code packageDeclaration} rule from {@code CheckstyleJavaParser.g4}: + * </p> + * <pre> + * packageDeclaration + * : annotations[true] LITERAL_PACKAGE qualifiedName SEMI + * ; + * </pre> + * + * <p> + * We override the {@code visitPackageDeclaration} method generated by ANTLR in + * {@code CheckstyleJavaParserBaseVisitor} at + * {@link JavaAstVisitor#visitPackageDeclaration(CheckstyleJavaParser.PackageDeclarationContext)} + * to create a subtree based on the subrules and tokens found in the {@code packageDeclaration} + * subrule accordingly, thus producing the following AST: + * </p> + * <pre> + * PACKAGE_DEF -&gt; package + * |--ANNOTATIONS -&gt; ANNOTATIONS + * |--DOT -&gt; . + * | |--DOT -&gt; . + * | | |--DOT -&gt; . + * | | | |--IDENT -&gt; com + * | | | `--IDENT -&gt; puppycrawl + * | | `--IDENT -&gt; tools + * | `--IDENT -&gt; checkstyle + * `--SEMI -&gt; ; + * </pre> + * <p> + * See https://github.com/checkstyle/checkstyle/pull/10434 for a good example of how + * to make changes to Checkstyle's grammar and AST. + * </p> + * <p> + * The order of {@code visit...} methods in {@code JavaAstVisitor.java} and production rules in + * {@code CheckstyleJavaParser.g4} should be consistent to ease maintenance. + * </p> + */ +public final class JavaAstVisitor extends CheckstyleJavaParserBaseVisitor<DetailAstImpl> { + + /** String representation of the left shift operator. */ + private static final String LEFT_SHIFT = "<<"; + + /** String representation of the unsigned right shift operator. */ + private static final String UNSIGNED_RIGHT_SHIFT = ">>>"; + + /** String representation of the right shift operator. */ + private static final String RIGHT_SHIFT = ">>"; + + /** Token stream to check for hidden tokens. */ + private final BufferedTokenStream tokens; + + /** + * Constructs a JavaAstVisitor with given token stream. + * + * @param tokenStream the token stream to check for hidden tokens + */ + public JavaAstVisitor(CommonTokenStream tokenStream) { + tokens = tokenStream; + } + + @Override + public DetailAstImpl visitCompilationUnit(CheckstyleJavaParser.CompilationUnitContext ctx) { + final DetailAstImpl root = visit(ctx.children.get(0)); + for (int i = 1; i < ctx.children.size(); i++) { + addLastSibling(root, visit(ctx.children.get(i))); + } + return root; + } + + @Override + public DetailAstImpl visitPackageDeclaration( + CheckstyleJavaParser.PackageDeclarationContext ctx) { + final DetailAstImpl packageDeclaration = + create(TokenTypes.PACKAGE_DEF, (Token) ctx.LITERAL_PACKAGE().getPayload()); + packageDeclaration.addChild(visit(ctx.annotations())); + packageDeclaration.addChild(visit(ctx.qualifiedName())); + packageDeclaration.addChild(create(ctx.SEMI())); + return packageDeclaration; + } + + @Override + public DetailAstImpl visitImportDec(CheckstyleJavaParser.ImportDecContext ctx) { + final DetailAstImpl importRoot = create(ctx.start); + + // Static import + if (ctx.LITERAL_STATIC() != null) { + importRoot.setType(TokenTypes.STATIC_IMPORT); + importRoot.addChild(create(ctx.LITERAL_STATIC())); + } + + // Handle star imports + final boolean isStarImport = ctx.STAR() != null; + if (isStarImport) { + final DetailAstImpl dot = create(ctx.DOT()); + dot.addChild(visit(ctx.qualifiedName())); + dot.addChild(create(ctx.STAR())); + importRoot.addChild(dot); + } + else { + importRoot.addChild(visit(ctx.qualifiedName())); + } + + importRoot.addChild(create(ctx.SEMI())); + return importRoot; + } + + @Override + public DetailAstImpl visitSingleSemiImport(CheckstyleJavaParser.SingleSemiImportContext ctx) { + return create(ctx.SEMI()); + } + + @Override + public DetailAstImpl visitTypeDeclaration(CheckstyleJavaParser.TypeDeclarationContext ctx) { + final DetailAstImpl typeDeclaration; + if (ctx.type == null) { + typeDeclaration = create(ctx.semi.get(0)); + ctx.semi.subList(1, ctx.semi.size()) + .forEach(semi -> addLastSibling(typeDeclaration, create(semi))); + } + else { + typeDeclaration = visit(ctx.type); + } + return typeDeclaration; + } + + @Override + public DetailAstImpl visitModifier(CheckstyleJavaParser.ModifierContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitVariableModifier(CheckstyleJavaParser.VariableModifierContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitClassDeclaration(CheckstyleJavaParser.ClassDeclarationContext ctx) { + return createTypeDeclaration(ctx, TokenTypes.CLASS_DEF, ctx.mods); + } + + @Override + public DetailAstImpl visitRecordDeclaration(CheckstyleJavaParser.RecordDeclarationContext ctx) { + return createTypeDeclaration(ctx, TokenTypes.RECORD_DEF, ctx.mods); + } + + @Override + public DetailAstImpl visitRecordComponentsList( + CheckstyleJavaParser.RecordComponentsListContext ctx) { + final DetailAstImpl lparen = create(ctx.LPAREN()); + + // We make a "RECORD_COMPONENTS" node whether components exist or not + if (ctx.recordComponents() == null) { + addLastSibling(lparen, createImaginary(TokenTypes.RECORD_COMPONENTS)); + } + else { + addLastSibling(lparen, visit(ctx.recordComponents())); + } + addLastSibling(lparen, create(ctx.RPAREN())); + return lparen; + } + + @Override + public DetailAstImpl visitRecordComponents(CheckstyleJavaParser.RecordComponentsContext ctx) { + final DetailAstImpl recordComponents = createImaginary(TokenTypes.RECORD_COMPONENTS); + processChildren(recordComponents, ctx.children); + return recordComponents; + } + + @Override + public DetailAstImpl visitRecordComponent(CheckstyleJavaParser.RecordComponentContext ctx) { + final DetailAstImpl recordComponent = createImaginary(TokenTypes.RECORD_COMPONENT_DEF); + processChildren(recordComponent, ctx.children); + return recordComponent; + } + + @Override + public DetailAstImpl visitLastRecordComponent( + CheckstyleJavaParser.LastRecordComponentContext ctx) { + final DetailAstImpl recordComponent = createImaginary(TokenTypes.RECORD_COMPONENT_DEF); + processChildren(recordComponent, ctx.children); + return recordComponent; + } + + @Override + public DetailAstImpl visitRecordBody(CheckstyleJavaParser.RecordBodyContext ctx) { + final DetailAstImpl objBlock = createImaginary(TokenTypes.OBJBLOCK); + processChildren(objBlock, ctx.children); + return objBlock; + } + + @Override + public DetailAstImpl visitCompactConstructorDeclaration( + CheckstyleJavaParser.CompactConstructorDeclarationContext ctx) { + final DetailAstImpl compactConstructor = createImaginary(TokenTypes.COMPACT_CTOR_DEF); + compactConstructor.addChild(createModifiers(ctx.mods)); + compactConstructor.addChild(visit(ctx.id())); + compactConstructor.addChild(visit(ctx.constructorBlock())); + return compactConstructor; + } + + @Override + public DetailAstImpl visitClassExtends(CheckstyleJavaParser.ClassExtendsContext ctx) { + final DetailAstImpl classExtends = create(ctx.EXTENDS_CLAUSE()); + classExtends.addChild(visit(ctx.type)); + return classExtends; + } + + @Override + public DetailAstImpl visitImplementsClause(CheckstyleJavaParser.ImplementsClauseContext ctx) { + final DetailAstImpl classImplements = create(TokenTypes.IMPLEMENTS_CLAUSE, + (Token) ctx.LITERAL_IMPLEMENTS().getPayload()); + classImplements.addChild(visit(ctx.typeList())); + return classImplements; + } + + @Override + public DetailAstImpl visitTypeParameters(CheckstyleJavaParser.TypeParametersContext ctx) { + final DetailAstImpl typeParameters = createImaginary(TokenTypes.TYPE_PARAMETERS); + typeParameters.addChild(create(TokenTypes.GENERIC_START, (Token) ctx.LT().getPayload())); + // Exclude '<' and '>' + processChildren(typeParameters, ctx.children.subList(1, ctx.children.size() - 1)); + typeParameters.addChild(create(TokenTypes.GENERIC_END, (Token) ctx.GT().getPayload())); + return typeParameters; + } + + @Override + public DetailAstImpl visitTypeParameter(CheckstyleJavaParser.TypeParameterContext ctx) { + final DetailAstImpl typeParameter = createImaginary(TokenTypes.TYPE_PARAMETER); + processChildren(typeParameter, ctx.children); + return typeParameter; + } + + @Override + public DetailAstImpl visitTypeUpperBounds(CheckstyleJavaParser.TypeUpperBoundsContext ctx) { + // In this case, we call 'extends` TYPE_UPPER_BOUNDS + final DetailAstImpl typeUpperBounds = create(TokenTypes.TYPE_UPPER_BOUNDS, + (Token) ctx.EXTENDS_CLAUSE().getPayload()); + // 'extends' is child[0] + processChildren(typeUpperBounds, ctx.children.subList(1, ctx.children.size())); + return typeUpperBounds; + } + + @Override + public DetailAstImpl visitTypeBound(CheckstyleJavaParser.TypeBoundContext ctx) { + final DetailAstImpl typeBoundType = visit(ctx.typeBoundType(0)); + final Iterator<CheckstyleJavaParser.TypeBoundTypeContext> typeBoundTypeIterator = + ctx.typeBoundType().listIterator(1); + ctx.BAND().forEach(band -> { + addLastSibling(typeBoundType, create(TokenTypes.TYPE_EXTENSION_AND, + (Token) band.getPayload())); + addLastSibling(typeBoundType, visit(typeBoundTypeIterator.next())); + }); + return typeBoundType; + } + + @Override + public DetailAstImpl visitTypeBoundType(CheckstyleJavaParser.TypeBoundTypeContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitEnumDeclaration(CheckstyleJavaParser.EnumDeclarationContext ctx) { + return createTypeDeclaration(ctx, TokenTypes.ENUM_DEF, ctx.mods); + } + + @Override + public DetailAstImpl visitEnumBody(CheckstyleJavaParser.EnumBodyContext ctx) { + final DetailAstImpl objBlock = createImaginary(TokenTypes.OBJBLOCK); + processChildren(objBlock, ctx.children); + return objBlock; + } + + @Override + public DetailAstImpl visitEnumConstants(CheckstyleJavaParser.EnumConstantsContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitEnumConstant(CheckstyleJavaParser.EnumConstantContext ctx) { + final DetailAstImpl enumConstant = + createImaginary(TokenTypes.ENUM_CONSTANT_DEF); + processChildren(enumConstant, ctx.children); + return enumConstant; + } + + @Override + public DetailAstImpl visitEnumBodyDeclarations( + CheckstyleJavaParser.EnumBodyDeclarationsContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitInterfaceDeclaration( + CheckstyleJavaParser.InterfaceDeclarationContext ctx) { + return createTypeDeclaration(ctx, TokenTypes.INTERFACE_DEF, ctx.mods); + } + + @Override + public DetailAstImpl visitInterfaceExtends(CheckstyleJavaParser.InterfaceExtendsContext ctx) { + final DetailAstImpl interfaceExtends = create(ctx.EXTENDS_CLAUSE()); + interfaceExtends.addChild(visit(ctx.typeList())); + return interfaceExtends; + } + + @Override + public DetailAstImpl visitClassBody(CheckstyleJavaParser.ClassBodyContext ctx) { + final DetailAstImpl objBlock = createImaginary(TokenTypes.OBJBLOCK); + processChildren(objBlock, ctx.children); + return objBlock; + } + + @Override + public DetailAstImpl visitInterfaceBody(CheckstyleJavaParser.InterfaceBodyContext ctx) { + final DetailAstImpl objBlock = createImaginary(TokenTypes.OBJBLOCK); + processChildren(objBlock, ctx.children); + return objBlock; + } + + @Override + public DetailAstImpl visitEmptyClass(CheckstyleJavaParser.EmptyClassContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitClassBlock(CheckstyleJavaParser.ClassBlockContext ctx) { + final DetailAstImpl classBlock; + if (ctx.LITERAL_STATIC() == null) { + // We call it an INSTANCE_INIT + classBlock = createImaginary(TokenTypes.INSTANCE_INIT); + } + else { + classBlock = create(TokenTypes.STATIC_INIT, (Token) ctx.LITERAL_STATIC().getPayload()); + classBlock.setText(TokenUtil.getTokenName(TokenTypes.STATIC_INIT)); + } + classBlock.addChild(visit(ctx.block())); + return classBlock; + } + + @Override + public DetailAstImpl visitMethodDeclaration(CheckstyleJavaParser.MethodDeclarationContext ctx) { + final DetailAstImpl methodDef = createImaginary(TokenTypes.METHOD_DEF); + methodDef.addChild(createModifiers(ctx.mods)); + + // Process all children except C style array declarators + processChildren(methodDef, ctx.children.stream() + .filter(child -> !(child instanceof CheckstyleJavaParser.ArrayDeclaratorContext)) + .collect(Collectors.toList())); + + // We add C style array declarator brackets to TYPE ast + final DetailAstImpl typeAst = (DetailAstImpl) methodDef.findFirstToken(TokenTypes.TYPE); + ctx.cStyleArrDec.forEach(child -> typeAst.addChild(visit(child))); + + return methodDef; + } + + @Override + public DetailAstImpl visitMethodBody(CheckstyleJavaParser.MethodBodyContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitThrowsList(CheckstyleJavaParser.ThrowsListContext ctx) { + final DetailAstImpl throwsRoot = create(ctx.LITERAL_THROWS()); + throwsRoot.addChild(visit(ctx.qualifiedNameList())); + return throwsRoot; + } + + @Override + public DetailAstImpl visitConstructorDeclaration( + CheckstyleJavaParser.ConstructorDeclarationContext ctx) { + final DetailAstImpl constructorDeclaration = createImaginary(TokenTypes.CTOR_DEF); + constructorDeclaration.addChild(createModifiers(ctx.mods)); + processChildren(constructorDeclaration, ctx.children); + return constructorDeclaration; + } + + @Override + public DetailAstImpl visitFieldDeclaration(CheckstyleJavaParser.FieldDeclarationContext ctx) { + final DetailAstImpl dummyNode = new DetailAstImpl(); + // Since the TYPE AST is built by visitVariableDeclarator(), we skip it here (child [0]) + // We also append the SEMI token to the first child [size() - 1], + // until https://github.com/checkstyle/checkstyle/issues/3151 + processChildren(dummyNode, ctx.children.subList(1, ctx.children.size() - 1)); + dummyNode.getFirstChild().addChild(create(ctx.SEMI())); + return dummyNode.getFirstChild(); + } + + @Override + public DetailAstImpl visitInterfaceBodyDeclaration( + CheckstyleJavaParser.InterfaceBodyDeclarationContext ctx) { + final DetailAstImpl returnTree; + if (ctx.SEMI() == null) { + returnTree = visit(ctx.interfaceMemberDeclaration()); + } + else { + returnTree = create(ctx.SEMI()); + } + return returnTree; + } + + @Override + public DetailAstImpl visitInterfaceMethodDeclaration( + CheckstyleJavaParser.InterfaceMethodDeclarationContext ctx) { + final DetailAstImpl methodDef = createImaginary(TokenTypes.METHOD_DEF); + methodDef.addChild(createModifiers(ctx.mods)); + + // Process all children except C style array declarators and modifiers + final List<ParseTree> children = ctx.children + .stream() + .filter(child -> !(child instanceof CheckstyleJavaParser.ArrayDeclaratorContext)) + .collect(Collectors.toList()); + processChildren(methodDef, children); + + // We add C style array declarator brackets to TYPE ast + final DetailAstImpl typeAst = (DetailAstImpl) methodDef.findFirstToken(TokenTypes.TYPE); + ctx.cStyleArrDec.forEach(child -> typeAst.addChild(visit(child))); + + return methodDef; + } + + @Override + public DetailAstImpl visitVariableDeclarators( + CheckstyleJavaParser.VariableDeclaratorsContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitVariableDeclarator( + CheckstyleJavaParser.VariableDeclaratorContext ctx) { + final DetailAstImpl variableDef = createImaginary(TokenTypes.VARIABLE_DEF); + variableDef.addChild(createModifiers(ctx.mods)); + + final DetailAstImpl type = visit(ctx.type); + variableDef.addChild(type); + variableDef.addChild(visit(ctx.id())); + + // Add C style array declarator brackets to TYPE ast + ctx.arrayDeclarator().forEach(child -> type.addChild(visit(child))); + + // If this is an assignment statement, ASSIGN becomes the parent of EXPR + if (ctx.ASSIGN() != null) { + final DetailAstImpl assign = create(ctx.ASSIGN()); + variableDef.addChild(assign); + assign.addChild(visit(ctx.variableInitializer())); + } + return variableDef; + } + + @Override + public DetailAstImpl visitVariableDeclaratorId( + CheckstyleJavaParser.VariableDeclaratorIdContext ctx) { + final DetailAstImpl root = new DetailAstImpl(); + root.addChild(createModifiers(ctx.mods)); + final DetailAstImpl type = visit(ctx.type); + root.addChild(type); + + final DetailAstImpl declaratorId; + if (ctx.LITERAL_THIS() == null) { + declaratorId = visit(ctx.id()); + } + else if (ctx.DOT() == null) { + declaratorId = create(ctx.LITERAL_THIS()); + } + else { + declaratorId = create(ctx.DOT()); + declaratorId.addChild(visit(ctx.id())); + declaratorId.addChild(create(ctx.LITERAL_THIS())); + } + + root.addChild(declaratorId); + ctx.arrayDeclarator().forEach(child -> type.addChild(visit(child))); + + return root.getFirstChild(); + } + + @Override + public DetailAstImpl visitArrayInitializer(CheckstyleJavaParser.ArrayInitializerContext ctx) { + final DetailAstImpl arrayInitializer = create(TokenTypes.ARRAY_INIT, ctx.start); + // ARRAY_INIT was child[0] + processChildren(arrayInitializer, ctx.children.subList(1, ctx.children.size())); + return arrayInitializer; + } + + @Override + public DetailAstImpl visitClassOrInterfaceType( + CheckstyleJavaParser.ClassOrInterfaceTypeContext ctx) { + final DetailAstPair currentAST = new DetailAstPair(); + DetailAstPair.addAstChild(currentAST, visit(ctx.id())); + DetailAstPair.addAstChild(currentAST, visit(ctx.typeArguments())); + + // This is how we build the annotations/ qualified name/ type parameters tree + for (int i = 0; i < ctx.extended.size(); i++) { + final ParserRuleContext extendedContext = ctx.extended.get(i); + final DetailAstImpl dot = create(extendedContext.start); + DetailAstPair.makeAstRoot(currentAST, dot); + final List<ParseTree> childList = extendedContext + .children.subList(1, extendedContext.children.size()); + childList.forEach(child -> DetailAstPair.addAstChild(currentAST, visit(child))); + } + + // Create imaginary 'TYPE' parent if specified + final DetailAstImpl returnTree; + if (ctx.createImaginaryNode) { + returnTree = createImaginary(TokenTypes.TYPE); + returnTree.addChild(currentAST.root); + } + else { + returnTree = currentAST.root; + } + return returnTree; + } + + @Override + public DetailAstImpl visitSimpleTypeArgument( + CheckstyleJavaParser.SimpleTypeArgumentContext ctx) { + final DetailAstImpl typeArgument = + createImaginary(TokenTypes.TYPE_ARGUMENT); + typeArgument.addChild(visit(ctx.typeType())); + return typeArgument; + } + + @Override + public DetailAstImpl visitWildCardTypeArgument( + CheckstyleJavaParser.WildCardTypeArgumentContext ctx) { + final DetailAstImpl typeArgument = createImaginary(TokenTypes.TYPE_ARGUMENT); + typeArgument.addChild(visit(ctx.annotations())); + typeArgument.addChild(create(TokenTypes.WILDCARD_TYPE, + (Token) ctx.QUESTION().getPayload())); + + if (ctx.upperBound != null) { + final DetailAstImpl upperBound = create(TokenTypes.TYPE_UPPER_BOUNDS, ctx.upperBound); + upperBound.addChild(visit(ctx.typeType())); + typeArgument.addChild(upperBound); + } + else if (ctx.lowerBound != null) { + final DetailAstImpl lowerBound = create(TokenTypes.TYPE_LOWER_BOUNDS, ctx.lowerBound); + lowerBound.addChild(visit(ctx.typeType())); + typeArgument.addChild(lowerBound); + } + + return typeArgument; + } + + @Override + public DetailAstImpl visitQualifiedNameList(CheckstyleJavaParser.QualifiedNameListContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitFormalParameters(CheckstyleJavaParser.FormalParametersContext ctx) { + final DetailAstImpl lparen = create(ctx.LPAREN()); + + // We make a "PARAMETERS" node whether parameters exist or not + if (ctx.formalParameterList() == null) { + addLastSibling(lparen, createImaginary(TokenTypes.PARAMETERS)); + } + else { + addLastSibling(lparen, visit(ctx.formalParameterList())); + } + addLastSibling(lparen, create(ctx.RPAREN())); + return lparen; + } + + @Override + public DetailAstImpl visitFormalParameterList( + CheckstyleJavaParser.FormalParameterListContext ctx) { + final DetailAstImpl parameters = createImaginary(TokenTypes.PARAMETERS); + processChildren(parameters, ctx.children); + return parameters; + } + + @Override + public DetailAstImpl visitFormalParameter(CheckstyleJavaParser.FormalParameterContext ctx) { + final DetailAstImpl variableDeclaratorId = + visitVariableDeclaratorId(ctx.variableDeclaratorId()); + final DetailAstImpl parameterDef = createImaginary(TokenTypes.PARAMETER_DEF); + parameterDef.addChild(variableDeclaratorId); + return parameterDef; + } + + @Override + public DetailAstImpl visitLastFormalParameter( + CheckstyleJavaParser.LastFormalParameterContext ctx) { + final DetailAstImpl parameterDef = + createImaginary(TokenTypes.PARAMETER_DEF); + parameterDef.addChild(visit(ctx.variableDeclaratorId())); + final DetailAstImpl ident = (DetailAstImpl) parameterDef.findFirstToken(TokenTypes.IDENT); + ident.addPreviousSibling(create(ctx.ELLIPSIS())); + // We attach annotations on ellipses in varargs to the 'TYPE' ast + final DetailAstImpl type = (DetailAstImpl) parameterDef.findFirstToken(TokenTypes.TYPE); + type.addChild(visit(ctx.annotations())); + return parameterDef; + } + + @Override + public DetailAstImpl visitQualifiedName(CheckstyleJavaParser.QualifiedNameContext ctx) { + DetailAstImpl ast = visit(ctx.id(0)); + final DetailAstPair currentAst = new DetailAstPair(); + DetailAstPair.addAstChild(currentAst, ast); + + for (int i = 1; i < ctx.children.size(); i += 2) { + + // Token to become root + final DetailAstImpl temp = create((Token) ctx.children.get(i).getPayload()); + DetailAstPair.makeAstRoot(currentAst, temp); + + // Token to become child or next sibling + final Object child = ctx.children.get(i + 1).getPayload(); + ast = visit((ParseTree) child); + + DetailAstPair.addAstChild(currentAst, ast); + } + return currentAst.getRoot(); + } + + @Override + public DetailAstImpl visitLiteral(CheckstyleJavaParser.LiteralContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitIntegerLiteral(CheckstyleJavaParser.IntegerLiteralContext ctx) { + final int[] longTypes = { + JavaLexer.DECIMAL_LITERAL_LONG, + JavaLexer.HEX_LITERAL_LONG, + JavaLexer.OCT_LITERAL_LONG, + JavaLexer.BINARY_LITERAL_LONG, + }; + + final int tokenType; + if (TokenUtil.isOfType(ctx.start.getType(), longTypes)) { + tokenType = TokenTypes.NUM_LONG; + } + else { + tokenType = TokenTypes.NUM_INT; + } + + return create(tokenType, ctx.start); + } + + @Override + public DetailAstImpl visitFloatLiteral(CheckstyleJavaParser.FloatLiteralContext ctx) { + final DetailAstImpl floatLiteral; + if (TokenUtil.isOfType(ctx.start.getType(), + JavaLexer.DOUBLE_LITERAL, JavaLexer.HEX_DOUBLE_LITERAL)) { + floatLiteral = create(TokenTypes.NUM_DOUBLE, ctx.start); + } + else { + floatLiteral = create(TokenTypes.NUM_FLOAT, ctx.start); + } + return floatLiteral; + } + + @Override + public DetailAstImpl visitTextBlockLiteral(CheckstyleJavaParser.TextBlockLiteralContext ctx) { + final DetailAstImpl textBlockLiteralBegin = create(ctx.TEXT_BLOCK_LITERAL_BEGIN()); + textBlockLiteralBegin.addChild(create(ctx.TEXT_BLOCK_CONTENT())); + textBlockLiteralBegin.addChild(create(ctx.TEXT_BLOCK_LITERAL_END())); + return textBlockLiteralBegin; + } + + @Override + public DetailAstImpl visitAnnotations(CheckstyleJavaParser.AnnotationsContext ctx) { + final DetailAstImpl annotations; + + if (!ctx.createImaginaryNode && ctx.anno.isEmpty()) { + // There are no annotations, and we don't want to create the empty node + annotations = null; + } + else { + // There are annotations, or we just want the empty node + annotations = createImaginary(TokenTypes.ANNOTATIONS); + processChildren(annotations, ctx.anno); + } + + return annotations; + } + + @Override + public DetailAstImpl visitAnnotation(CheckstyleJavaParser.AnnotationContext ctx) { + final DetailAstImpl annotation = createImaginary(TokenTypes.ANNOTATION); + processChildren(annotation, ctx.children); + return annotation; + } + + @Override + public DetailAstImpl visitElementValuePairs(CheckstyleJavaParser.ElementValuePairsContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitElementValuePair(CheckstyleJavaParser.ElementValuePairContext ctx) { + final DetailAstImpl elementValuePair = + createImaginary(TokenTypes.ANNOTATION_MEMBER_VALUE_PAIR); + processChildren(elementValuePair, ctx.children); + return elementValuePair; + } + + @Override + public DetailAstImpl visitElementValue(CheckstyleJavaParser.ElementValueContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitElementValueArrayInitializer( + CheckstyleJavaParser.ElementValueArrayInitializerContext ctx) { + final DetailAstImpl arrayInit = + create(TokenTypes.ANNOTATION_ARRAY_INIT, (Token) ctx.LCURLY().getPayload()); + processChildren(arrayInit, ctx.children.subList(1, ctx.children.size())); + return arrayInit; + } + + @Override + public DetailAstImpl visitAnnotationTypeDeclaration( + CheckstyleJavaParser.AnnotationTypeDeclarationContext ctx) { + return createTypeDeclaration(ctx, TokenTypes.ANNOTATION_DEF, ctx.mods); + } + + @Override + public DetailAstImpl visitAnnotationTypeBody( + CheckstyleJavaParser.AnnotationTypeBodyContext ctx) { + final DetailAstImpl objBlock = createImaginary(TokenTypes.OBJBLOCK); + processChildren(objBlock, ctx.children); + return objBlock; + } + + @Override + public DetailAstImpl visitAnnotationTypeElementDeclaration( + CheckstyleJavaParser.AnnotationTypeElementDeclarationContext ctx) { + final DetailAstImpl returnTree; + if (ctx.SEMI() == null) { + returnTree = visit(ctx.annotationTypeElementRest()); + } + else { + returnTree = create(ctx.SEMI()); + } + return returnTree; + } + + @Override + public DetailAstImpl visitAnnotationField(CheckstyleJavaParser.AnnotationFieldContext ctx) { + final DetailAstImpl dummyNode = new DetailAstImpl(); + // Since the TYPE AST is built by visitAnnotationMethodOrConstantRest(), we skip it + // here (child [0]) + processChildren(dummyNode, Collections.singletonList(ctx.children.get(1))); + // We also append the SEMI token to the first child [size() - 1], + // until https://github.com/checkstyle/checkstyle/issues/3151 + dummyNode.getFirstChild().addChild(create(ctx.SEMI())); + return dummyNode.getFirstChild(); + } + + @Override + public DetailAstImpl visitAnnotationType(CheckstyleJavaParser.AnnotationTypeContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitAnnotationMethodRest( + CheckstyleJavaParser.AnnotationMethodRestContext ctx) { + final DetailAstImpl annotationFieldDef = + createImaginary(TokenTypes.ANNOTATION_FIELD_DEF); + annotationFieldDef.addChild(createModifiers(ctx.mods)); + annotationFieldDef.addChild(visit(ctx.type)); + + // Process all children except C style array declarators + processChildren(annotationFieldDef, ctx.children.stream() + .filter(child -> !(child instanceof CheckstyleJavaParser.ArrayDeclaratorContext)) + .collect(Collectors.toList())); + + // We add C style array declarator brackets to TYPE ast + final DetailAstImpl typeAst = + (DetailAstImpl) annotationFieldDef.findFirstToken(TokenTypes.TYPE); + ctx.cStyleArrDec.forEach(child -> typeAst.addChild(visit(child))); + + return annotationFieldDef; + } + + @Override + public DetailAstImpl visitDefaultValue(CheckstyleJavaParser.DefaultValueContext ctx) { + final DetailAstImpl defaultValue = create(ctx.LITERAL_DEFAULT()); + defaultValue.addChild(visit(ctx.elementValue())); + return defaultValue; + } + + @Override + public DetailAstImpl visitConstructorBlock(CheckstyleJavaParser.ConstructorBlockContext ctx) { + final DetailAstImpl slist = create(TokenTypes.SLIST, ctx.start); + // SLIST was child [0] + processChildren(slist, ctx.children.subList(1, ctx.children.size())); + return slist; + } + + @Override + public DetailAstImpl visitExplicitCtorCall(CheckstyleJavaParser.ExplicitCtorCallContext ctx) { + final DetailAstImpl root; + if (ctx.LITERAL_THIS() == null) { + root = create(TokenTypes.SUPER_CTOR_CALL, (Token) ctx.LITERAL_SUPER().getPayload()); + } + else { + root = create(TokenTypes.CTOR_CALL, (Token) ctx.LITERAL_THIS().getPayload()); + } + root.addChild(visit(ctx.typeArguments())); + root.addChild(visit(ctx.arguments())); + root.addChild(create(ctx.SEMI())); + return root; + } + + @Override + public DetailAstImpl visitPrimaryCtorCall(CheckstyleJavaParser.PrimaryCtorCallContext ctx) { + final DetailAstImpl primaryCtorCall = create(TokenTypes.SUPER_CTOR_CALL, + (Token) ctx.LITERAL_SUPER().getPayload()); + // filter 'LITERAL_SUPER' + processChildren(primaryCtorCall, ctx.children.stream() + .filter(child -> !child.equals(ctx.LITERAL_SUPER())) + .collect(Collectors.toList())); + return primaryCtorCall; + } + + @Override + public DetailAstImpl visitBlock(CheckstyleJavaParser.BlockContext ctx) { + final DetailAstImpl slist = create(TokenTypes.SLIST, ctx.start); + // SLIST was child [0] + processChildren(slist, ctx.children.subList(1, ctx.children.size())); + return slist; + } + + @Override + public DetailAstImpl visitLocalVar(CheckstyleJavaParser.LocalVarContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitBlockStat(CheckstyleJavaParser.BlockStatContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitAssertExp(CheckstyleJavaParser.AssertExpContext ctx) { + final DetailAstImpl assertExp = create(ctx.ASSERT()); + // child[0] is 'ASSERT' + processChildren(assertExp, ctx.children.subList(1, ctx.children.size())); + return assertExp; + } + + @Override + public DetailAstImpl visitIfStat(CheckstyleJavaParser.IfStatContext ctx) { + final DetailAstImpl ifStat = create(ctx.LITERAL_IF()); + // child[0] is 'LITERAL_IF' + processChildren(ifStat, ctx.children.subList(1, ctx.children.size())); + return ifStat; + } + + @Override + public DetailAstImpl visitForStat(CheckstyleJavaParser.ForStatContext ctx) { + final DetailAstImpl forInit = create(ctx.start); + // child[0] is LITERAL_FOR + processChildren(forInit, ctx.children.subList(1, ctx.children.size())); + return forInit; + } + + @Override + public DetailAstImpl visitWhileStat(CheckstyleJavaParser.WhileStatContext ctx) { + final DetailAstImpl whileStatement = create(ctx.start); + // 'LITERAL_WHILE' is child[0] + processChildren(whileStatement, ctx.children.subList(1, ctx.children.size())); + return whileStatement; + } + + @Override + public DetailAstImpl visitDoStat(CheckstyleJavaParser.DoStatContext ctx) { + final DetailAstImpl doStatement = create(ctx.start); + // 'LITERAL_DO' is child[0] + doStatement.addChild(visit(ctx.statement())); + // We make 'LITERAL_WHILE' into 'DO_WHILE' + doStatement.addChild(create(TokenTypes.DO_WHILE, (Token) ctx.LITERAL_WHILE().getPayload())); + doStatement.addChild(visit(ctx.parExpression())); + doStatement.addChild(create(ctx.SEMI())); + return doStatement; + } + + @Override + public DetailAstImpl visitTryStat(CheckstyleJavaParser.TryStatContext ctx) { + final DetailAstImpl tryStat = create(ctx.start); + // child[0] is 'LITERAL_TRY' + processChildren(tryStat, ctx.children.subList(1, ctx.children.size())); + return tryStat; + } + + @Override + public DetailAstImpl visitTryWithResourceStat( + CheckstyleJavaParser.TryWithResourceStatContext ctx) { + final DetailAstImpl tryWithResources = create(ctx.LITERAL_TRY()); + // child[0] is 'LITERAL_TRY' + processChildren(tryWithResources, ctx.children.subList(1, ctx.children.size())); + return tryWithResources; + } + + @Override + public DetailAstImpl visitYieldStat(CheckstyleJavaParser.YieldStatContext ctx) { + final DetailAstImpl yieldParent = create(ctx.LITERAL_YIELD()); + // LITERAL_YIELD is child[0] + processChildren(yieldParent, ctx.children.subList(1, ctx.children.size())); + return yieldParent; + } + + @Override + public DetailAstImpl visitSyncStat(CheckstyleJavaParser.SyncStatContext ctx) { + final DetailAstImpl syncStatement = create(ctx.start); + // child[0] is 'LITERAL_SYNCHRONIZED' + processChildren(syncStatement, ctx.children.subList(1, ctx.children.size())); + return syncStatement; + } + + @Override + public DetailAstImpl visitReturnStat(CheckstyleJavaParser.ReturnStatContext ctx) { + final DetailAstImpl returnStat = create(ctx.LITERAL_RETURN()); + // child[0] is 'LITERAL_RETURN' + processChildren(returnStat, ctx.children.subList(1, ctx.children.size())); + return returnStat; + } + + @Override + public DetailAstImpl visitThrowStat(CheckstyleJavaParser.ThrowStatContext ctx) { + final DetailAstImpl throwStat = create(ctx.LITERAL_THROW()); + // child[0] is 'LITERAL_THROW' + processChildren(throwStat, ctx.children.subList(1, ctx.children.size())); + return throwStat; + } + + @Override + public DetailAstImpl visitBreakStat(CheckstyleJavaParser.BreakStatContext ctx) { + final DetailAstImpl literalBreak = create(ctx.LITERAL_BREAK()); + // child[0] is 'LITERAL_BREAK' + processChildren(literalBreak, ctx.children.subList(1, ctx.children.size())); + return literalBreak; + } + + @Override + public DetailAstImpl visitContinueStat(CheckstyleJavaParser.ContinueStatContext ctx) { + final DetailAstImpl continueStat = create(ctx.LITERAL_CONTINUE()); + // child[0] is 'LITERAL_CONTINUE' + processChildren(continueStat, ctx.children.subList(1, ctx.children.size())); + return continueStat; + } + + @Override + public DetailAstImpl visitEmptyStat(CheckstyleJavaParser.EmptyStatContext ctx) { + return create(TokenTypes.EMPTY_STAT, ctx.start); + } + + @Override + public DetailAstImpl visitExpStat(CheckstyleJavaParser.ExpStatContext ctx) { + final DetailAstImpl expStatRoot = visit(ctx.statementExpression); + addLastSibling(expStatRoot, create(ctx.SEMI())); + return expStatRoot; + } + + @Override + public DetailAstImpl visitLabelStat(CheckstyleJavaParser.LabelStatContext ctx) { + final DetailAstImpl labelStat = create(TokenTypes.LABELED_STAT, + (Token) ctx.COLON().getPayload()); + labelStat.addChild(visit(ctx.id())); + labelStat.addChild(visit(ctx.statement())); + return labelStat; + } + + @Override + public DetailAstImpl visitSwitchExpressionOrStatement( + CheckstyleJavaParser.SwitchExpressionOrStatementContext ctx) { + final DetailAstImpl switchStat = create(ctx.LITERAL_SWITCH()); + switchStat.addChild(visit(ctx.parExpression())); + switchStat.addChild(create(ctx.LCURLY())); + switchStat.addChild(visit(ctx.switchBlock())); + switchStat.addChild(create(ctx.RCURLY())); + return switchStat; + } + + @Override + public DetailAstImpl visitSwitchRules(CheckstyleJavaParser.SwitchRulesContext ctx) { + final DetailAstImpl dummyRoot = new DetailAstImpl(); + ctx.switchLabeledRule().forEach(switchLabeledRuleContext -> { + final DetailAstImpl switchRule = visit(switchLabeledRuleContext); + final DetailAstImpl switchRuleParent = createImaginary(TokenTypes.SWITCH_RULE); + switchRuleParent.addChild(switchRule); + dummyRoot.addChild(switchRuleParent); + }); + return dummyRoot.getFirstChild(); + } + + @Override + public DetailAstImpl visitSwitchBlocks(CheckstyleJavaParser.SwitchBlocksContext ctx) { + final DetailAstImpl dummyRoot = new DetailAstImpl(); + ctx.groups.forEach(group -> dummyRoot.addChild(visit(group))); + + // Add any empty switch labels to end of statement in one 'CASE_GROUP' + if (!ctx.emptyLabels.isEmpty()) { + final DetailAstImpl emptyLabelParent = + createImaginary(TokenTypes.CASE_GROUP); + ctx.emptyLabels.forEach(label -> emptyLabelParent.addChild(visit(label))); + dummyRoot.addChild(emptyLabelParent); + } + return dummyRoot.getFirstChild(); + } + + @Override + public DetailAstImpl visitSwitchLabeledExpression( + CheckstyleJavaParser.SwitchLabeledExpressionContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitSwitchLabeledBlock( + CheckstyleJavaParser.SwitchLabeledBlockContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitSwitchLabeledThrow( + CheckstyleJavaParser.SwitchLabeledThrowContext ctx) { + final DetailAstImpl switchLabel = visit(ctx.switchLabel()); + addLastSibling(switchLabel, create(ctx.LAMBDA())); + final DetailAstImpl literalThrow = create(ctx.LITERAL_THROW()); + literalThrow.addChild(visit(ctx.expression())); + literalThrow.addChild(create(ctx.SEMI())); + addLastSibling(switchLabel, literalThrow); + return switchLabel; + } + + @Override + public DetailAstImpl visitElseStat(CheckstyleJavaParser.ElseStatContext ctx) { + final DetailAstImpl elseStat = create(ctx.LITERAL_ELSE()); + // child[0] is 'LITERAL_ELSE' + processChildren(elseStat, ctx.children.subList(1, ctx.children.size())); + return elseStat; + } + + @Override + public DetailAstImpl visitCatchClause(CheckstyleJavaParser.CatchClauseContext ctx) { + final DetailAstImpl catchClause = create(TokenTypes.LITERAL_CATCH, + (Token) ctx.LITERAL_CATCH().getPayload()); + // 'LITERAL_CATCH' is child[0] + processChildren(catchClause, ctx.children.subList(1, ctx.children.size())); + return catchClause; + } + + @Override + public DetailAstImpl visitCatchParameter(CheckstyleJavaParser.CatchParameterContext ctx) { + final DetailAstImpl catchParameterDef = createImaginary(TokenTypes.PARAMETER_DEF); + catchParameterDef.addChild(createModifiers(ctx.mods)); + // filter mods + processChildren(catchParameterDef, ctx.children.stream() + .filter(child -> !(child instanceof CheckstyleJavaParser.VariableModifierContext)) + .collect(Collectors.toList())); + return catchParameterDef; + } + + @Override + public DetailAstImpl visitCatchType(CheckstyleJavaParser.CatchTypeContext ctx) { + final DetailAstImpl type = createImaginary(TokenTypes.TYPE); + processChildren(type, ctx.children); + return type; + } + + @Override + public DetailAstImpl visitFinallyBlock(CheckstyleJavaParser.FinallyBlockContext ctx) { + final DetailAstImpl finallyBlock = create(ctx.LITERAL_FINALLY()); + // child[0] is 'LITERAL_FINALLY' + processChildren(finallyBlock, ctx.children.subList(1, ctx.children.size())); + return finallyBlock; + } + + @Override + public DetailAstImpl visitResourceSpecification( + CheckstyleJavaParser.ResourceSpecificationContext ctx) { + final DetailAstImpl resourceSpecification = + createImaginary(TokenTypes.RESOURCE_SPECIFICATION); + processChildren(resourceSpecification, ctx.children); + return resourceSpecification; + } + + @Override + public DetailAstImpl visitResources(CheckstyleJavaParser.ResourcesContext ctx) { + final DetailAstImpl firstResource = visit(ctx.resource(0)); + final DetailAstImpl resources = createImaginary(TokenTypes.RESOURCES); + resources.addChild(firstResource); + processChildren(resources, ctx.children.subList(1, ctx.children.size())); + return resources; + } + + @Override + public DetailAstImpl visitResourceDeclaration( + CheckstyleJavaParser.ResourceDeclarationContext ctx) { + final DetailAstImpl resource = createImaginary(TokenTypes.RESOURCE); + resource.addChild(visit(ctx.variableDeclaratorId())); + + final DetailAstImpl assign = create(ctx.ASSIGN()); + resource.addChild(assign); + assign.addChild(visit(ctx.expression())); + return resource; + } + + @Override + public DetailAstImpl visitVariableAccess(CheckstyleJavaParser.VariableAccessContext ctx) { + final DetailAstImpl resource; + if (ctx.accessList.isEmpty()) { + resource = createImaginary(TokenTypes.RESOURCE); + resource.addChild(visit(ctx.id())); + } + else { + final DetailAstPair currentAst = new DetailAstPair(); + ctx.accessList.forEach(fieldAccess -> { + DetailAstPair.addAstChild(currentAst, visit(fieldAccess.expr())); + DetailAstPair.makeAstRoot(currentAst, create(fieldAccess.DOT())); + }); + resource = createImaginary(TokenTypes.RESOURCE); + resource.addChild(currentAst.root); + if (ctx.LITERAL_THIS() == null) { + resource.getFirstChild().addChild(visit(ctx.id())); + } + else { + resource.getFirstChild().addChild(create(ctx.LITERAL_THIS())); + } + } + return resource; + } + + @Override + public DetailAstImpl visitSwitchBlockStatementGroup( + CheckstyleJavaParser.SwitchBlockStatementGroupContext ctx) { + final DetailAstImpl caseGroup = createImaginary(TokenTypes.CASE_GROUP); + processChildren(caseGroup, ctx.switchLabel()); + final DetailAstImpl sList = createImaginary(TokenTypes.SLIST); + processChildren(sList, ctx.slists); + caseGroup.addChild(sList); + return caseGroup; + } + + @Override + public DetailAstImpl visitCaseLabel(CheckstyleJavaParser.CaseLabelContext ctx) { + final DetailAstImpl caseLabel = create(ctx.LITERAL_CASE()); + // child [0] is 'LITERAL_CASE' + processChildren(caseLabel, ctx.children.subList(1, ctx.children.size())); + return caseLabel; + } + + @Override + public DetailAstImpl visitDefaultLabel(CheckstyleJavaParser.DefaultLabelContext ctx) { + final DetailAstImpl defaultLabel = create(ctx.LITERAL_DEFAULT()); + if (ctx.COLON() != null) { + defaultLabel.addChild(create(ctx.COLON())); + } + return defaultLabel; + } + + @Override + public DetailAstImpl visitCaseConstants(CheckstyleJavaParser.CaseConstantsContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitEnhancedFor(CheckstyleJavaParser.EnhancedForContext ctx) { + final DetailAstImpl leftParen = create(ctx.LPAREN()); + final DetailAstImpl enhancedForControl = + visit(ctx.enhancedForControl()); + final DetailAstImpl forEachClause = createImaginary(TokenTypes.FOR_EACH_CLAUSE); + forEachClause.addChild(enhancedForControl); + addLastSibling(leftParen, forEachClause); + addLastSibling(leftParen, create(ctx.RPAREN())); + return leftParen; + } + + @Override + public DetailAstImpl visitForFor(CheckstyleJavaParser.ForForContext ctx) { + final DetailAstImpl dummyRoot = new DetailAstImpl(); + dummyRoot.addChild(create(ctx.LPAREN())); + + if (ctx.forInit() == null) { + final DetailAstImpl imaginaryForInitParent = + createImaginary(TokenTypes.FOR_INIT); + dummyRoot.addChild(imaginaryForInitParent); + } + else { + dummyRoot.addChild(visit(ctx.forInit())); + } + + dummyRoot.addChild(create(ctx.SEMI(0))); + + final DetailAstImpl forCondParent = createImaginary(TokenTypes.FOR_CONDITION); + forCondParent.addChild(visit(ctx.forCond)); + dummyRoot.addChild(forCondParent); + dummyRoot.addChild(create(ctx.SEMI(1))); + + final DetailAstImpl forItParent = createImaginary(TokenTypes.FOR_ITERATOR); + forItParent.addChild(visit(ctx.forUpdate)); + dummyRoot.addChild(forItParent); + + dummyRoot.addChild(create(ctx.RPAREN())); + + return dummyRoot.getFirstChild(); + } + + @Override + public DetailAstImpl visitForInit(CheckstyleJavaParser.ForInitContext ctx) { + final DetailAstImpl forInit = createImaginary(TokenTypes.FOR_INIT); + processChildren(forInit, ctx.children); + return forInit; + } + + @Override + public DetailAstImpl visitEnhancedForControl( + CheckstyleJavaParser.EnhancedForControlContext ctx) { + final DetailAstImpl variableDeclaratorId = + visit(ctx.variableDeclaratorId()); + final DetailAstImpl variableDef = createImaginary(TokenTypes.VARIABLE_DEF); + variableDef.addChild(variableDeclaratorId); + + addLastSibling(variableDef, create(ctx.COLON())); + addLastSibling(variableDef, visit(ctx.expression())); + return variableDef; + } + + @Override + public DetailAstImpl visitParExpression(CheckstyleJavaParser.ParExpressionContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitExpressionList(CheckstyleJavaParser.ExpressionListContext ctx) { + final DetailAstImpl elist = createImaginary(TokenTypes.ELIST); + processChildren(elist, ctx.children); + return elist; + } + + @Override + public DetailAstImpl visitExpression(CheckstyleJavaParser.ExpressionContext ctx) { + final DetailAstImpl expression = visit(ctx.expr()); + DetailAstImpl exprRoot = createImaginary(TokenTypes.EXPR); + exprRoot.addChild(expression); + + final int[] expressionsWithNoExprRoot = { + TokenTypes.CTOR_CALL, + TokenTypes.SUPER_CTOR_CALL, + TokenTypes.LAMBDA, + }; + + if (TokenUtil.isOfType(expression, expressionsWithNoExprRoot)) { + exprRoot = exprRoot.getFirstChild(); + } + + return exprRoot; + } + + @Override + public DetailAstImpl visitRefOp(CheckstyleJavaParser.RefOpContext ctx) { + final DetailAstImpl bop = create(ctx.bop); + final DetailAstImpl leftChild = visit(ctx.expr()); + final DetailAstImpl rightChild = create(TokenTypes.IDENT, ctx.stop); + bop.addChild(leftChild); + bop.addChild(rightChild); + return bop; + } + + @Override + public DetailAstImpl visitSuperExp(CheckstyleJavaParser.SuperExpContext ctx) { + final DetailAstImpl bop = create(ctx.bop); + bop.addChild(visit(ctx.expr())); + bop.addChild(create(ctx.LITERAL_SUPER())); + DetailAstImpl superSuffixParent = visit(ctx.superSuffix()); + + if (superSuffixParent == null) { + superSuffixParent = bop; + } + else { + DetailAstImpl firstChild = superSuffixParent.getFirstChild(); + while (firstChild.getFirstChild() != null) { + firstChild = firstChild.getFirstChild(); + } + firstChild.addPreviousSibling(bop); + } + + return superSuffixParent; + } + + @Override + public DetailAstImpl visitInstanceOfExp(CheckstyleJavaParser.InstanceOfExpContext ctx) { + final DetailAstImpl literalInstanceOf = create(ctx.LITERAL_INSTANCEOF()); + literalInstanceOf.addChild(visit(ctx.expr())); + literalInstanceOf.addChild(visit(ctx.children.get(2))); + return literalInstanceOf; + } + + @Override + public DetailAstImpl visitBitShift(CheckstyleJavaParser.BitShiftContext ctx) { + final DetailAstImpl shiftOperation; + + // We determine the type of shift operation in the parser, instead of the + // lexer as in older grammars. This makes it easier to parse type parameters + // and less than/ greater than operators in general. + if (ctx.LT().size() == LEFT_SHIFT.length()) { + shiftOperation = create(TokenTypes.SL, (Token) ctx.LT(0).getPayload()); + shiftOperation.setText(LEFT_SHIFT); + } + else if (ctx.GT().size() == UNSIGNED_RIGHT_SHIFT.length()) { + shiftOperation = create(TokenTypes.BSR, (Token) ctx.GT(0).getPayload()); + shiftOperation.setText(UNSIGNED_RIGHT_SHIFT); + } + else { + shiftOperation = create(TokenTypes.SR, (Token) ctx.GT(0).getPayload()); + shiftOperation.setText(RIGHT_SHIFT); + } + + shiftOperation.addChild(visit(ctx.expr(0))); + shiftOperation.addChild(visit(ctx.expr(1))); + return shiftOperation; + } + + @Override + public DetailAstImpl visitNewExp(CheckstyleJavaParser.NewExpContext ctx) { + final DetailAstImpl newExp = create(ctx.LITERAL_NEW()); + // child [0] is LITERAL_NEW + processChildren(newExp, ctx.children.subList(1, ctx.children.size())); + return newExp; + } + + @Override + public DetailAstImpl visitPrefix(CheckstyleJavaParser.PrefixContext ctx) { + final int tokenType; + switch (ctx.prefix.getType()) { + case JavaLexer.PLUS: + tokenType = TokenTypes.UNARY_PLUS; + break; + case JavaLexer.MINUS: + tokenType = TokenTypes.UNARY_MINUS; + break; + default: + tokenType = ctx.prefix.getType(); + } + final DetailAstImpl prefix = create(tokenType, ctx.prefix); + prefix.addChild(visit(ctx.expr())); + return prefix; + } + + @Override + public DetailAstImpl visitCastExp(CheckstyleJavaParser.CastExpContext ctx) { + final DetailAstImpl cast = create(TokenTypes.TYPECAST, (Token) ctx.LPAREN().getPayload()); + // child [0] is LPAREN + processChildren(cast, ctx.children.subList(1, ctx.children.size())); + return cast; + } + + @Override + public DetailAstImpl visitIndexOp(CheckstyleJavaParser.IndexOpContext ctx) { + // LBRACK -> INDEX_OP is root of this AST + final DetailAstImpl indexOp = create(TokenTypes.INDEX_OP, + (Token) ctx.LBRACK().getPayload()); + + // add expression(IDENT) on LHS + indexOp.addChild(visit(ctx.expr(0))); + + // create imaginary node for expression on RHS + final DetailAstImpl expr = visit(ctx.expr(1)); + final DetailAstImpl imaginaryExpr = createImaginary(TokenTypes.EXPR); + imaginaryExpr.addChild(expr); + indexOp.addChild(imaginaryExpr); + + // complete AST by adding RBRACK + indexOp.addChild(create(ctx.RBRACK())); + return indexOp; + } + + @Override + public DetailAstImpl visitInvOp(CheckstyleJavaParser.InvOpContext ctx) { + final DetailAstPair currentAst = new DetailAstPair(); + + final DetailAstImpl returnAst = visit(ctx.expr()); + DetailAstPair.addAstChild(currentAst, returnAst); + DetailAstPair.makeAstRoot(currentAst, create(ctx.bop)); + + DetailAstPair.addAstChild(currentAst, + visit(ctx.nonWildcardTypeArguments())); + DetailAstPair.addAstChild(currentAst, visit(ctx.id())); + final DetailAstImpl lparen = create(TokenTypes.METHOD_CALL, + (Token) ctx.LPAREN().getPayload()); + DetailAstPair.makeAstRoot(currentAst, lparen); + + // We always add an 'ELIST' node + final DetailAstImpl expressionList = Optional.ofNullable(visit(ctx.expressionList())) + .orElse(createImaginary(TokenTypes.ELIST)); + + DetailAstPair.addAstChild(currentAst, expressionList); + DetailAstPair.addAstChild(currentAst, create(ctx.RPAREN())); + + return currentAst.root; + } + + @Override + public DetailAstImpl visitInitExp(CheckstyleJavaParser.InitExpContext ctx) { + final DetailAstImpl dot = create(ctx.bop); + dot.addChild(visit(ctx.expr())); + final DetailAstImpl literalNew = create(ctx.LITERAL_NEW()); + literalNew.addChild(visit(ctx.nonWildcardTypeArguments())); + literalNew.addChild(visit(ctx.innerCreator())); + dot.addChild(literalNew); + return dot; + } + + @Override + public DetailAstImpl visitSimpleMethodCall(CheckstyleJavaParser.SimpleMethodCallContext ctx) { + final DetailAstImpl methodCall = create(TokenTypes.METHOD_CALL, + (Token) ctx.LPAREN().getPayload()); + methodCall.addChild(visit(ctx.id())); + // We always add an 'ELIST' node + final DetailAstImpl expressionList = Optional.ofNullable(visit(ctx.expressionList())) + .orElse(createImaginary(TokenTypes.ELIST)); + + methodCall.addChild(expressionList); + methodCall.addChild(create((Token) ctx.RPAREN().getPayload())); + return methodCall; + } + + @Override + public DetailAstImpl visitLambdaExp(CheckstyleJavaParser.LambdaExpContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitThisExp(CheckstyleJavaParser.ThisExpContext ctx) { + final DetailAstImpl bop = create(ctx.bop); + bop.addChild(visit(ctx.expr())); + bop.addChild(create(ctx.LITERAL_THIS())); + return bop; + } + + @Override + public DetailAstImpl visitPrimaryExp(CheckstyleJavaParser.PrimaryExpContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitPostfix(CheckstyleJavaParser.PostfixContext ctx) { + final DetailAstImpl postfix; + if (ctx.postfix.getType() == JavaLexer.INC) { + postfix = create(TokenTypes.POST_INC, ctx.postfix); + } + else { + postfix = create(TokenTypes.POST_DEC, ctx.postfix); + } + postfix.addChild(visit(ctx.expr())); + return postfix; + } + + @Override + public DetailAstImpl visitMethodRef(CheckstyleJavaParser.MethodRefContext ctx) { + final DetailAstImpl doubleColon = create(TokenTypes.METHOD_REF, + (Token) ctx.DOUBLE_COLON().getPayload()); + final List<ParseTree> children = ctx.children.stream() + .filter(child -> !child.equals(ctx.DOUBLE_COLON())) + .collect(Collectors.toList()); + processChildren(doubleColon, children); + return doubleColon; + } + + @Override + public DetailAstImpl visitTernaryOp(CheckstyleJavaParser.TernaryOpContext ctx) { + final DetailAstImpl root = create(ctx.QUESTION()); + processChildren(root, ctx.children.stream() + .filter(child -> !child.equals(ctx.QUESTION())) + .collect(Collectors.toList())); + return root; + } + + @Override + public DetailAstImpl visitBinOp(CheckstyleJavaParser.BinOpContext ctx) { + final DetailAstImpl bop = create(ctx.bop); + + // To improve performance, we iterate through binary operations + // since they are frequently deeply nested. + final List<CheckstyleJavaParser.BinOpContext> binOpList = new ArrayList<>(); + ParseTree firstExpression = ctx.expr(0); + while (firstExpression instanceof CheckstyleJavaParser.BinOpContext) { + // Get all nested binOps + binOpList.add((CheckstyleJavaParser.BinOpContext) firstExpression); + firstExpression = ((CheckstyleJavaParser.BinOpContext) firstExpression).expr(0); + } + + if (binOpList.isEmpty()) { + final DetailAstImpl leftChild = visit(ctx.children.get(0)); + bop.addChild(leftChild); + } + else { + // Map all descendants to individual AST's since we can parallelize this + // operation + final Queue<DetailAstImpl> descendantList = binOpList.parallelStream() + .map(this::getInnerBopAst) + .collect(Collectors.toCollection(ConcurrentLinkedQueue::new)); + + bop.addChild(descendantList.poll()); + DetailAstImpl pointer = bop.getFirstChild(); + // Build tree + for (DetailAstImpl descendant : descendantList) { + pointer.getFirstChild().addPreviousSibling(descendant); + pointer = descendant; + } + } + + bop.addChild(visit(ctx.children.get(2))); + return bop; + } + + /** + * Builds the binary operation (binOp) AST. + * + * @param descendant the BinOpContext to build AST from + * @return binOp AST + */ + private DetailAstImpl getInnerBopAst(CheckstyleJavaParser.BinOpContext descendant) { + final DetailAstImpl innerBop = create(descendant.bop); + if (!(descendant.expr(0) instanceof CheckstyleJavaParser.BinOpContext)) { + innerBop.addChild(visit(descendant.expr(0))); + } + innerBop.addChild(visit(descendant.expr(1))); + return innerBop; + } + + @Override + public DetailAstImpl visitMethodCall(CheckstyleJavaParser.MethodCallContext ctx) { + final DetailAstImpl methodCall = create(TokenTypes.METHOD_CALL, + (Token) ctx.LPAREN().getPayload()); + // We always add an 'ELIST' node + final DetailAstImpl expressionList = Optional.ofNullable(visit(ctx.expressionList())) + .orElse(createImaginary(TokenTypes.ELIST)); + + final DetailAstImpl dot = create(ctx.DOT()); + dot.addChild(visit(ctx.expr())); + dot.addChild(visit(ctx.id())); + methodCall.addChild(dot); + methodCall.addChild(expressionList); + methodCall.addChild(create((Token) ctx.RPAREN().getPayload())); + return methodCall; + } + + @Override + public DetailAstImpl visitTypeCastParameters( + CheckstyleJavaParser.TypeCastParametersContext ctx) { + final DetailAstImpl typeType = visit(ctx.typeType(0)); + for (int i = 0; i < ctx.BAND().size(); i++) { + addLastSibling(typeType, create(TokenTypes.TYPE_EXTENSION_AND, + (Token) ctx.BAND(i).getPayload())); + addLastSibling(typeType, visit(ctx.typeType(i + 1))); + } + return typeType; + } + + @Override + public DetailAstImpl visitLambdaExpression(CheckstyleJavaParser.LambdaExpressionContext ctx) { + final DetailAstImpl lambda = create(ctx.LAMBDA()); + lambda.addChild(visit(ctx.lambdaParameters())); + lambda.addChild(visit(ctx.lambdaBody())); + return lambda; + } + + @Override + public DetailAstImpl visitSingleLambdaParam(CheckstyleJavaParser.SingleLambdaParamContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitFormalLambdaParam(CheckstyleJavaParser.FormalLambdaParamContext ctx) { + final DetailAstImpl lparen = create(ctx.LPAREN()); + + // We add an 'PARAMETERS' node here whether it exists or not + final DetailAstImpl parameters = Optional.ofNullable(visit(ctx.formalParameterList())) + .orElse(createImaginary(TokenTypes.PARAMETERS)); + addLastSibling(lparen, parameters); + addLastSibling(lparen, create(ctx.RPAREN())); + return lparen; + } + + @Override + public DetailAstImpl visitMultiLambdaParam(CheckstyleJavaParser.MultiLambdaParamContext ctx) { + final DetailAstImpl lparen = create(ctx.LPAREN()); + addLastSibling(lparen, visit(ctx.multiLambdaParams())); + addLastSibling(lparen, create(ctx.RPAREN())); + return lparen; + } + + @Override + public DetailAstImpl visitMultiLambdaParams(CheckstyleJavaParser.MultiLambdaParamsContext ctx) { + final DetailAstImpl parameters = createImaginary(TokenTypes.PARAMETERS); + parameters.addChild(createLambdaParameter(ctx.id(0))); + + for (int i = 0; i < ctx.COMMA().size(); i++) { + parameters.addChild(create(ctx.COMMA(i))); + parameters.addChild(createLambdaParameter(ctx.id(i + 1))); + } + return parameters; + } + + /** + * Creates a 'PARAMETER_DEF' node for a lambda expression, with + * imaginary modifier and type nodes. + * + * @param ctx the IdContext to create imaginary nodes for + * @return DetailAstImpl of lambda parameter + */ + private DetailAstImpl createLambdaParameter(CheckstyleJavaParser.IdContext ctx) { + final DetailAstImpl ident = visitId(ctx); + final DetailAstImpl parameter = createImaginary(TokenTypes.PARAMETER_DEF); + final DetailAstImpl modifiers = createImaginary(TokenTypes.MODIFIERS); + final DetailAstImpl type = createImaginary(TokenTypes.TYPE); + parameter.addChild(modifiers); + parameter.addChild(type); + parameter.addChild(ident); + return parameter; + } + + @Override + public DetailAstImpl visitParenPrimary(CheckstyleJavaParser.ParenPrimaryContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitTokenPrimary(CheckstyleJavaParser.TokenPrimaryContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitClassRefPrimary(CheckstyleJavaParser.ClassRefPrimaryContext ctx) { + final DetailAstImpl dot = create(ctx.DOT()); + final DetailAstImpl primaryTypeNoArray = visit(ctx.type); + dot.addChild(primaryTypeNoArray); + if (TokenUtil.isOfType(primaryTypeNoArray, TokenTypes.DOT)) { + // We append '[]' to the qualified name 'TYPE' `ast + ctx.arrayDeclarator() + .forEach(child -> primaryTypeNoArray.addChild(visit(child))); + } + else { + ctx.arrayDeclarator() + .forEach(child -> addLastSibling(primaryTypeNoArray, visit(child))); + } + dot.addChild(create(ctx.LITERAL_CLASS())); + return dot; + } + + @Override + public DetailAstImpl visitPrimitivePrimary(CheckstyleJavaParser.PrimitivePrimaryContext ctx) { + final DetailAstImpl dot = create(ctx.DOT()); + final DetailAstImpl primaryTypeNoArray = visit(ctx.type); + dot.addChild(primaryTypeNoArray); + ctx.arrayDeclarator().forEach(child -> dot.addChild(visit(child))); + dot.addChild(create(ctx.LITERAL_CLASS())); + return dot; + } + + @Override + public DetailAstImpl visitCreator(CheckstyleJavaParser.CreatorContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitCreatedNameObject(CheckstyleJavaParser.CreatedNameObjectContext ctx) { + final DetailAstPair currentAST = new DetailAstPair(); + DetailAstPair.addAstChild(currentAST, visit(ctx.id())); + DetailAstPair.addAstChild(currentAST, visit(ctx.typeArgumentsOrDiamond())); + + // This is how we build the type arguments/ qualified name tree + for (int i = 0; i < ctx.extended.size(); i++) { + final ParserRuleContext extendedContext = ctx.extended.get(i); + final DetailAstImpl dot = create(extendedContext.start); + DetailAstPair.makeAstRoot(currentAST, dot); + final List<ParseTree> childList = extendedContext + .children.subList(1, extendedContext.children.size()); + processChildren(dot, childList); + } + + return currentAST.root; + } + + @Override + public DetailAstImpl visitCreatedNamePrimitive( + CheckstyleJavaParser.CreatedNamePrimitiveContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitInnerCreator(CheckstyleJavaParser.InnerCreatorContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitArrayCreatorRest(CheckstyleJavaParser.ArrayCreatorRestContext ctx) { + final DetailAstImpl arrayDeclarator = create(TokenTypes.ARRAY_DECLARATOR, + (Token) ctx.LBRACK().getPayload()); + // child[0] is LBRACK + for (int i = 1; i < ctx.children.size(); i++) { + if (ctx.children.get(i) == ctx.RBRACK()) { + arrayDeclarator.addChild(create(ctx.RBRACK())); + } + else if (ctx.children.get(i) == ctx.expression()) { + // Handle '[8]', etc. + arrayDeclarator.addChild(visit(ctx.expression())); + } + else { + addLastSibling(arrayDeclarator, visit(ctx.children.get(i))); + } + } + return arrayDeclarator; + } + + @Override + public DetailAstImpl visitBracketsWithExp(CheckstyleJavaParser.BracketsWithExpContext ctx) { + final DetailAstImpl dummyRoot = new DetailAstImpl(); + dummyRoot.addChild(visit(ctx.annotations())); + final DetailAstImpl arrayDeclarator = + create(TokenTypes.ARRAY_DECLARATOR, (Token) ctx.LBRACK().getPayload()); + arrayDeclarator.addChild(visit(ctx.expression())); + arrayDeclarator.addChild(create(ctx.stop)); + dummyRoot.addChild(arrayDeclarator); + return dummyRoot.getFirstChild(); + } + + @Override + public DetailAstImpl visitClassCreatorRest(CheckstyleJavaParser.ClassCreatorRestContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitDiamond(CheckstyleJavaParser.DiamondContext ctx) { + final DetailAstImpl typeArguments = + createImaginary(TokenTypes.TYPE_ARGUMENTS); + typeArguments.addChild(create(TokenTypes.GENERIC_START, + (Token) ctx.LT().getPayload())); + typeArguments.addChild(create(TokenTypes.GENERIC_END, + (Token) ctx.GT().getPayload())); + return typeArguments; + } + + @Override + public DetailAstImpl visitTypeArgs(CheckstyleJavaParser.TypeArgsContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitNonWildcardDiamond( + CheckstyleJavaParser.NonWildcardDiamondContext ctx) { + final DetailAstImpl typeArguments = + createImaginary(TokenTypes.TYPE_ARGUMENTS); + typeArguments.addChild(create(TokenTypes.GENERIC_START, + (Token) ctx.LT().getPayload())); + typeArguments.addChild(create(TokenTypes.GENERIC_END, + (Token) ctx.GT().getPayload())); + return typeArguments; + } + + @Override + public DetailAstImpl visitNonWildcardTypeArguments( + CheckstyleJavaParser.NonWildcardTypeArgumentsContext ctx) { + final DetailAstImpl typeArguments = createImaginary(TokenTypes.TYPE_ARGUMENTS); + typeArguments.addChild(create(TokenTypes.GENERIC_START, (Token) ctx.LT().getPayload())); + typeArguments.addChild(visit(ctx.typeArgumentsTypeList())); + typeArguments.addChild(create(TokenTypes.GENERIC_END, (Token) ctx.GT().getPayload())); + return typeArguments; + } + + @Override + public DetailAstImpl visitTypeArgumentsTypeList( + CheckstyleJavaParser.TypeArgumentsTypeListContext ctx) { + final DetailAstImpl firstIdent = visit(ctx.typeType(0)); + final DetailAstImpl firstTypeArgument = createImaginary(TokenTypes.TYPE_ARGUMENT); + firstTypeArgument.addChild(firstIdent); + + for (int i = 0; i < ctx.COMMA().size(); i++) { + addLastSibling(firstTypeArgument, create(ctx.COMMA(i))); + final DetailAstImpl ident = visit(ctx.typeType(i + 1)); + final DetailAstImpl typeArgument = createImaginary(TokenTypes.TYPE_ARGUMENT); + typeArgument.addChild(ident); + addLastSibling(firstTypeArgument, typeArgument); + } + return firstTypeArgument; + } + + @Override + public DetailAstImpl visitTypeList(CheckstyleJavaParser.TypeListContext ctx) { + return flattenedTree(ctx); + } + + @Override + public DetailAstImpl visitTypeType(CheckstyleJavaParser.TypeTypeContext ctx) { + final DetailAstImpl type = createImaginary(TokenTypes.TYPE); + processChildren(type, ctx.children); + + final DetailAstImpl returnTree; + if (ctx.createImaginaryNode) { + returnTree = type; + } + else { + returnTree = type.getFirstChild(); + } + return returnTree; + } + + @Override + public DetailAstImpl visitArrayDeclarator(CheckstyleJavaParser.ArrayDeclaratorContext ctx) { + final DetailAstImpl arrayDeclarator = create(TokenTypes.ARRAY_DECLARATOR, + (Token) ctx.LBRACK().getPayload()); + arrayDeclarator.addChild(create(ctx.RBRACK())); + + final DetailAstImpl returnTree; + final DetailAstImpl annotations = visit(ctx.anno); + if (annotations == null) { + returnTree = arrayDeclarator; + } + else { + returnTree = annotations; + addLastSibling(returnTree, arrayDeclarator); + } + return returnTree; + } + + @Override + public DetailAstImpl visitPrimitiveType(CheckstyleJavaParser.PrimitiveTypeContext ctx) { + return create(ctx.start); + } + + @Override + public DetailAstImpl visitTypeArguments(CheckstyleJavaParser.TypeArgumentsContext ctx) { + final DetailAstImpl typeArguments = createImaginary(TokenTypes.TYPE_ARGUMENTS); + typeArguments.addChild(create(TokenTypes.GENERIC_START, (Token) ctx.LT().getPayload())); + // Exclude '<' and '>' + processChildren(typeArguments, ctx.children.subList(1, ctx.children.size() - 1)); + typeArguments.addChild(create(TokenTypes.GENERIC_END, (Token) ctx.GT().getPayload())); + return typeArguments; + } + + @Override + public DetailAstImpl visitSuperSuffixDot(CheckstyleJavaParser.SuperSuffixDotContext ctx) { + final DetailAstImpl root; + if (ctx.LPAREN() == null) { + root = create(ctx.DOT()); + root.addChild(visit(ctx.id())); + } + else { + root = create(TokenTypes.METHOD_CALL, (Token) ctx.LPAREN().getPayload()); + + final DetailAstImpl dot = create(ctx.DOT()); + dot.addChild(visit(ctx.id())); + root.addChild(dot); + + final DetailAstImpl expressionList = Optional.ofNullable(visit(ctx.expressionList())) + .orElse(createImaginary(TokenTypes.ELIST)); + root.addChild(expressionList); + + root.addChild(create(ctx.RPAREN())); + } + + return root; + } + + @Override + public DetailAstImpl visitArguments(CheckstyleJavaParser.ArgumentsContext ctx) { + final DetailAstImpl lparen = create(ctx.LPAREN()); + + // We always add an 'ELIST' node + final DetailAstImpl expressionList = Optional.ofNullable(visit(ctx.expressionList())) + .orElse(createImaginary(TokenTypes.ELIST)); + addLastSibling(lparen, expressionList); + addLastSibling(lparen, create(ctx.RPAREN())); + return lparen; + } + + @Override + public DetailAstImpl visitPatternVariableDefinition( + CheckstyleJavaParser.PatternVariableDefinitionContext ctx) { + final DetailAstImpl type = visit(ctx.type); + final DetailAstImpl patternVariableDef = createImaginary(TokenTypes.PATTERN_VARIABLE_DEF); + patternVariableDef.addChild(createModifiers(ctx.mods)); + patternVariableDef.addChild(type); + patternVariableDef.addChild(visit(ctx.id())); + return patternVariableDef; + } + + @Override + public DetailAstImpl visitPermittedSubclassesAndInterfaces( + CheckstyleJavaParser.PermittedSubclassesAndInterfacesContext ctx) { + final DetailAstImpl literalPermits = + create(TokenTypes.PERMITS_CLAUSE, (Token) ctx.LITERAL_PERMITS().getPayload()); + // 'LITERAL_PERMITS' is child[0] + processChildren(literalPermits, ctx.children.subList(1, ctx.children.size())); + return literalPermits; + } + + @Override + public DetailAstImpl visitId(CheckstyleJavaParser.IdContext ctx) { + return create(TokenTypes.IDENT, ctx.start); + } + + /** + * Builds the AST for a particular node, then returns a "flattened" tree + * of siblings. This method should be used in rule contexts such as + * {@code variableDeclarators}, where we have both terminals and non-terminals. + * + * @param ctx the ParserRuleContext to base tree on + * @return flattened DetailAstImpl + */ + private DetailAstImpl flattenedTree(ParserRuleContext ctx) { + final DetailAstImpl dummyNode = new DetailAstImpl(); + processChildren(dummyNode, ctx.children); + return dummyNode.getFirstChild(); + } + + /** + * Adds all the children from the given ParseTree or JavaParserContext + * list to the parent DetailAstImpl. + * + * @param parent the DetailAstImpl to add children to + * @param children the list of children to add + */ + private void processChildren(DetailAstImpl parent, List<? extends ParseTree> children) { + children.forEach(child -> { + if (child instanceof TerminalNode) { + // Child is a token, create a new DetailAstImpl and add it to parent + parent.addChild(create((TerminalNode) child)); + } + else { + // Child is another rule context; visit it, create token, and add to parent + parent.addChild(visit(child)); + } + }); + } + + /** + * Create a DetailAstImpl from a given token and token type. This method + * should be used for imaginary nodes only, i.e. 'OBJBLOCK -> OBJBLOCK', + * where the text on the RHS matches the text on the LHS. + * + * @param tokenType the token type of this DetailAstImpl + * @return new DetailAstImpl of given type + */ + private static DetailAstImpl createImaginary(int tokenType) { + final DetailAstImpl detailAst = new DetailAstImpl(); + detailAst.setType(tokenType); + detailAst.setText(TokenUtil.getTokenName(tokenType)); + return detailAst; + } + + /** + * Create a DetailAstImpl from a given token and token type. This method + * should be used for literal nodes only, i.e. 'PACKAGE_DEF -> package'. + * + * @param tokenType the token type of this DetailAstImpl + * @param startToken the first token that appears in this DetailAstImpl. + * @return new DetailAstImpl of given type + */ + private DetailAstImpl create(int tokenType, Token startToken) { + final DetailAstImpl ast = create(startToken); + ast.setType(tokenType); + return ast; + } + + /** + * Create a DetailAstImpl from a given token. This method should be + * used for terminal nodes, i.e. {@code LCURLY}, when we are building + * an AST for a specific token, regardless of position. + * + * @param token the token to build the DetailAstImpl from + * @return new DetailAstImpl of given type + */ + private DetailAstImpl create(Token token) { + final int tokenIndex = token.getTokenIndex(); + final List<Token> tokensToLeft = + tokens.getHiddenTokensToLeft(tokenIndex, JavaLexer.COMMENTS); + final List<Token> tokensToRight = + tokens.getHiddenTokensToRight(tokenIndex, JavaLexer.COMMENTS); + + final DetailAstImpl detailAst = new DetailAstImpl(); + detailAst.initialize(token); + if (tokensToLeft != null) { + detailAst.setHiddenBefore(tokensToLeft); + } + if (tokensToRight != null) { + detailAst.setHiddenAfter(tokensToRight); + } + return detailAst; + } + + /** + * Create a DetailAstImpl from a given TerminalNode. This method should be + * used for terminal nodes, i.e. {@code @}. + * + * @param node the TerminalNode to build the DetailAstImpl from + * @return new DetailAstImpl of given type + */ + private DetailAstImpl create(TerminalNode node) { + return create((Token) node.getPayload()); + } + + /** + * Creates a type declaration DetailAstImpl from a given rule context. + * + * @param ctx ParserRuleContext we are in + * @param type the type declaration to create + * @param modifierList respective modifiers + * @return type declaration DetailAstImpl + */ + private DetailAstImpl createTypeDeclaration(ParserRuleContext ctx, int type, + List<? extends ParseTree> modifierList) { + final DetailAstImpl typeDeclaration = createImaginary(type); + typeDeclaration.addChild(createModifiers(modifierList)); + processChildren(typeDeclaration, ctx.children); + return typeDeclaration; + } + + /** + * Builds the modifiers AST. + * + * @param modifierList the list of modifier contexts + * @return "MODIFIERS" ast + */ + private DetailAstImpl createModifiers(List<? extends ParseTree> modifierList) { + final DetailAstImpl mods = createImaginary(TokenTypes.MODIFIERS); + processChildren(mods, modifierList); + return mods; + } + + /** + * Add new sibling to the end of existing siblings. + * + * @param self DetailAstImpl to add last sibling to + * @param sibling DetailAstImpl sibling to add + */ + private static void addLastSibling(DetailAstImpl self, DetailAstImpl sibling) { + DetailAstImpl nextSibling = self; + if (nextSibling != null) { + while (nextSibling.getNextSibling() != null) { + nextSibling = nextSibling.getNextSibling(); + } + nextSibling.setNextSibling(sibling); + } + } + + @Override + public DetailAstImpl visit(ParseTree tree) { + DetailAstImpl ast = null; + if (tree != null) { + ast = tree.accept(this); + } + return ast; + } + + /** + * Used to swap and organize DetailAstImpl subtrees. + */ + private static final class DetailAstPair { + + /** The root DetailAstImpl of this pair. */ + private DetailAstImpl root; + + /** The child (potentially with siblings) of this pair. */ + private DetailAstImpl child; + + /** + * Moves child reference to the last child. + */ + private void advanceChildToEnd() { + while (child.getNextSibling() != null) { + child = child.getNextSibling(); + } + } + + private DetailAstImpl getRoot() { + return root; + } + + /** + * This method is used to replace the {@code ^} (set as root node) ANTLR2 + * operator. + * + * @param pair the DetailAstPair to use for swapping nodes + * @param ast the new root + */ + private static void makeAstRoot(DetailAstPair pair, DetailAstImpl ast) { + ast.addChild(pair.root); + pair.child = pair.root; + pair.advanceChildToEnd(); + pair.root = ast; + } + + /** + * Adds a child (or new root) to the given DetailAstPair. + * + * @param pair the DetailAstPair to add child to + * @param ast the child to add + */ + private static void addAstChild(DetailAstPair pair, DetailAstImpl ast) { + if (ast != null) { + if (pair.root == null) { + pair.root = ast; + } + else { + pair.child.setNextSibling(ast); + } + pair.child = ast; + pair.advanceChildToEnd(); + } + } + } +} diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/JavaParser.java b/src/main/java/com/puppycrawl/tools/checkstyle/JavaParser.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/JavaParser.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/JavaParser.java @@ -21,26 +21,27 @@ import java.io.File; import java.io.IOException; -import java.io.Reader; -import java.io.StringReader; import java.nio.charset.StandardCharsets; +import java.util.List; +import java.util.ListIterator; import java.util.Locale; -import antlr.CommonASTWithHiddenTokens; -import antlr.CommonHiddenStreamToken; -import antlr.RecognitionException; -import antlr.Token; -import antlr.TokenStreamException; -import antlr.TokenStreamHiddenTokenFilter; -import antlr.TokenStreamSelector; +import org.antlr.v4.runtime.BaseErrorListener; +import org.antlr.v4.runtime.CharStream; +import org.antlr.v4.runtime.CharStreams; +import org.antlr.v4.runtime.CommonToken; +import org.antlr.v4.runtime.CommonTokenStream; +import org.antlr.v4.runtime.RecognitionException; +import org.antlr.v4.runtime.Recognizer; +import org.antlr.v4.runtime.Token; + import com.puppycrawl.tools.checkstyle.api.CheckstyleException; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.FileContents; import com.puppycrawl.tools.checkstyle.api.FileText; import com.puppycrawl.tools.checkstyle.api.TokenTypes; -import com.puppycrawl.tools.checkstyle.grammar.GeneratedJavaLexer; -import com.puppycrawl.tools.checkstyle.grammar.GeneratedJavaRecognizer; -import com.puppycrawl.tools.checkstyle.grammar.GeneratedTextBlockLexer; +import com.puppycrawl.tools.checkstyle.grammar.java.CheckstyleJavaParser; +import com.puppycrawl.tools.checkstyle.grammar.java.JavaLexer; import com.puppycrawl.tools.checkstyle.utils.ParserUtil; /** @@ -81,46 +82,29 @@ private JavaParser() { public static DetailAST parse(FileContents contents) throws CheckstyleException { final String fullText = contents.getText().getFullText().toString(); - final Reader reader = new StringReader(fullText); - final GeneratedJavaLexer lexer = new GeneratedJavaLexer(reader); + final CharStream codePointCharStream = CharStreams.fromString(fullText); + final JavaLexer lexer = new JavaLexer(codePointCharStream, true); lexer.setCommentListener(contents); + lexer.removeErrorListeners(); - final GeneratedTextBlockLexer textBlockLexer = - new GeneratedTextBlockLexer(lexer.getInputState()); - - final String tokenObjectClass = "antlr.CommonHiddenStreamToken"; - lexer.setTokenObjectClass(tokenObjectClass); - textBlockLexer.setTokenObjectClass(tokenObjectClass); - - final TokenStreamHiddenTokenFilter filter = new TokenStreamHiddenTokenFilter(lexer); - filter.hide(TokenTypes.SINGLE_LINE_COMMENT); - filter.hide(TokenTypes.BLOCK_COMMENT_BEGIN); - - final TokenStreamSelector selector = new TokenStreamSelector(); - lexer.selector = selector; - textBlockLexer.selector = selector; - selector.addInputStream(textBlockLexer, "textBlockLexer"); - selector.select(filter); + final CommonTokenStream tokenStream = new CommonTokenStream(lexer); + final CheckstyleJavaParser parser = new CheckstyleJavaParser(tokenStream); + parser.setErrorHandler(new CheckstyleParserErrorStrategy()); + parser.removeErrorListeners(); + parser.addErrorListener(new CheckstyleErrorListener()); - final GeneratedJavaRecognizer parser = new GeneratedJavaRecognizer(selector) { - @Override - public void reportError(RecognitionException ex) { - throw new IllegalStateException(ex); - } - }; - parser.setFilename(contents.getFileName()); - parser.setASTNodeClass(DetailAstImpl.class.getName()); + final CheckstyleJavaParser.CompilationUnitContext compilationUnit; try { - parser.compilationUnit(); + compilationUnit = parser.compilationUnit(); } - catch (RecognitionException | TokenStreamException | IllegalStateException ex) { + catch (IllegalStateException ex) { final String exceptionMsg = String.format(Locale.ROOT, "%s occurred while parsing file %s.", ex.getClass().getSimpleName(), contents.getFileName()); throw new CheckstyleException(exceptionMsg, ex); } - return (DetailAST) parser.getAST(); + return new JavaAstVisitor(tokenStream).visit(compilationUnit); } /** @@ -173,21 +157,24 @@ public static DetailAST appendHiddenCommentNodes(DetailAST root) { while (curNode != null) { lastNode = curNode; - CommonHiddenStreamToken tokenBefore = ((CommonASTWithHiddenTokens) curNode) - .getHiddenBefore(); - DetailAST currentSibling = curNode; - while (tokenBefore != null) { - final DetailAST newCommentNode = - createCommentAstFromToken(tokenBefore); + if (((DetailAstImpl) curNode).getHiddenBefore() != null) { + DetailAST currentSibling = curNode; - ((DetailAstImpl) currentSibling).addPreviousSibling(newCommentNode); + final List<Token> commentsList = ((DetailAstImpl) curNode).getHiddenBefore(); + final ListIterator<Token> reverseCommentsIterator = + commentsList.listIterator(commentsList.size()); - if (currentSibling == result) { - result = newCommentNode; - } + while (reverseCommentsIterator.hasPrevious()) { + final DetailAST newCommentNode = + createCommentAstFromToken((CommonToken) + reverseCommentsIterator.previous()); + ((DetailAstImpl) currentSibling).addPreviousSibling(newCommentNode); - currentSibling = newCommentNode; - tokenBefore = tokenBefore.getHiddenBefore(); + if (currentSibling == result) { + result = newCommentNode; + } + currentSibling = newCommentNode; + } } DetailAST toVisit = curNode.getFirstChild(); @@ -197,18 +184,15 @@ public static DetailAST appendHiddenCommentNodes(DetailAST root) { } curNode = toVisit; } - if (lastNode != null) { - CommonHiddenStreamToken tokenAfter = ((CommonASTWithHiddenTokens) lastNode) - .getHiddenAfter(); + if (lastNode != null && ((DetailAstImpl) lastNode).getHiddenAfter() != null) { DetailAST currentSibling = lastNode; - while (tokenAfter != null) { + for (Token token: ((DetailAstImpl) lastNode).getHiddenAfter()) { final DetailAST newCommentNode = - createCommentAstFromToken(tokenAfter); + createCommentAstFromToken((CommonToken) token); ((DetailAstImpl) currentSibling).addNextSibling(newCommentNode); currentSibling = newCommentNode; - tokenAfter = tokenAfter.getHiddenAfter(); } } return result; @@ -221,7 +205,7 @@ public static DetailAST appendHiddenCommentNodes(DetailAST root) { * @param token to create the AST * @return DetailAST of comment node */ - private static DetailAST createCommentAstFromToken(Token token) { + private static DetailAST createCommentAstFromToken(CommonToken token) { final DetailAST commentAst; if (token.getType() == TokenTypes.SINGLE_LINE_COMMENT) { commentAst = createSlCommentNode(token); @@ -238,21 +222,19 @@ private static DetailAST createCommentAstFromToken(Token token) { * @param token to create the AST * @return DetailAST with SINGLE_LINE_COMMENT type */ - private static DetailAST createSlCommentNode(Token token) { + private static DetailAST createSlCommentNode(CommonToken token) { final DetailAstImpl slComment = new DetailAstImpl(); slComment.setType(TokenTypes.SINGLE_LINE_COMMENT); slComment.setText("//"); - // column counting begins from 0 - slComment.setColumnNo(token.getColumn() - 1); + slComment.setColumnNo(token.getCharPositionInLine()); slComment.setLineNo(token.getLine()); final DetailAstImpl slCommentContent = new DetailAstImpl(); slCommentContent.setType(TokenTypes.COMMENT_CONTENT); - // column counting begins from 0 // plus length of '//' - slCommentContent.setColumnNo(token.getColumn() - 1 + 2); + slCommentContent.setColumnNo(token.getCharPositionInLine() + 2); slCommentContent.setLineNo(token.getLine()); slCommentContent.setText(token.getText()); @@ -260,4 +242,17 @@ private static DetailAST createSlCommentNode(Token token) { return slComment; } + /** + * Custom error listener to provide detailed exception message. + */ + private static class CheckstyleErrorListener extends BaseErrorListener { + + @Override + public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, + int line, int charPositionInLine, + String msg, RecognitionException ex) { + final String message = line + ":" + charPositionInLine + ": " + msg; + throw new IllegalStateException(message, ex); + } + } } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java b/src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java @@ -23,16 +23,13 @@ import java.util.Deque; import java.util.List; -import org.antlr.v4.runtime.BailErrorStrategy; import org.antlr.v4.runtime.BaseErrorListener; import org.antlr.v4.runtime.BufferedTokenStream; import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CommonToken; import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.FailedPredicateException; -import org.antlr.v4.runtime.InputMismatchException; import org.antlr.v4.runtime.NoViableAltException; -import org.antlr.v4.runtime.Parser; import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.RecognitionException; import org.antlr.v4.runtime.Recognizer; @@ -180,7 +177,7 @@ private static JavadocParser createJavadocParser(String blockComment, // JavadocParserErrorStrategy stops parsing on first parse error encountered unlike the // DefaultErrorStrategy used by ANTLR which rather attempts error recovery. - parser.setErrorHandler(new JavadocParserErrorStrategy()); + parser.setErrorHandler(new CheckstyleParserErrorStrategy()); return parser; } @@ -779,29 +776,4 @@ public Object[] getMessageArguments() { } } - - /** - * The DefaultErrorStrategy used by ANTLR attempts to recover from parse errors - * which might result in a performance overhead. Also, a parse error indicate - * that javadoc doesn't follow checkstyle Javadoc grammar and the user should be made aware - * of it. - * <a href="https://www.antlr.org/api/Java/org/antlr/v4/runtime/BailErrorStrategy.html"> - * BailErrorStrategy</a> is used to make ANTLR generated parser bail out on the first error - * in parser and not attempt any recovery methods but it doesn't report error to the - * listeners. This class is to ensure proper error reporting. - * - * @see DescriptiveErrorListener - * @see <a href="https://www.antlr.org/api/Java/org/antlr/v4/runtime/ANTLRErrorStrategy.html"> - * ANTLRErrorStrategy</a> - */ - private static class JavadocParserErrorStrategy extends BailErrorStrategy { - - @Override - public Token recoverInline(Parser recognizer) { - reportError(recognizer, new InputMismatchException(recognizer)); - return super.recoverInline(recognizer); - } - - } - } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/TokenTypes.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/TokenTypes.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/TokenTypes.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/TokenTypes.java @@ -19,7 +19,9 @@ package com.puppycrawl.tools.checkstyle.api; -import com.puppycrawl.tools.checkstyle.grammar.GeneratedJavaTokenTypes; +import org.antlr.v4.runtime.Recognizer; + +import com.puppycrawl.tools.checkstyle.grammar.java.JavaLexer; /** * Contains the constants for all the tokens contained in the Abstract @@ -43,7 +45,7 @@ public final class TokenTypes { * @see #CLASS_DEF * @see #INTERFACE_DEF **/ - public static final int EOF = GeneratedJavaTokenTypes.EOF; + public static final int EOF = Recognizer.EOF; /** * Modifiers for type, method, and field declarations. The * modifiers element is always present even though it may have no @@ -80,7 +82,7 @@ public final class TokenTypes { * @see #ANNOTATION * @see #LITERAL_DEFAULT **/ - public static final int MODIFIERS = GeneratedJavaTokenTypes.MODIFIERS; + public static final int MODIFIERS = JavaLexer.MODIFIERS; /** * An object block. These are children of class, interface, enum, @@ -116,7 +118,7 @@ public final class TokenTypes { * @see #ENUM_CONSTANT_DEF * @see #ANNOTATION_DEF **/ - public static final int OBJBLOCK = GeneratedJavaTokenTypes.OBJBLOCK; + public static final int OBJBLOCK = JavaLexer.OBJBLOCK; /** * A list of statements. * @@ -158,7 +160,7 @@ public final class TokenTypes { * @see #LITERAL_ELSE * @see #CASE_GROUP **/ - public static final int SLIST = GeneratedJavaTokenTypes.SLIST; + public static final int SLIST = JavaLexer.SLIST; /** * A constructor declaration. * @@ -211,7 +213,7 @@ public final class TokenTypes { * @see #OBJBLOCK * @see #CLASS_DEF **/ - public static final int CTOR_DEF = GeneratedJavaTokenTypes.CTOR_DEF; + public static final int CTOR_DEF = JavaLexer.CTOR_DEF; /** * A method declaration. The children are modifiers, type parameters, * return type, method name, parameter list, an optional throws list, and @@ -267,7 +269,7 @@ public final class TokenTypes { * @see #SLIST * @see #OBJBLOCK **/ - public static final int METHOD_DEF = GeneratedJavaTokenTypes.METHOD_DEF; + public static final int METHOD_DEF = JavaLexer.METHOD_DEF; /** * A field or local variable declaration. The children are * modifiers, type, the identifier name, and an optional @@ -297,7 +299,7 @@ public final class TokenTypes { * @see #ASSIGN **/ public static final int VARIABLE_DEF = - GeneratedJavaTokenTypes.VARIABLE_DEF; + JavaLexer.VARIABLE_DEF; /** * An instance initializer. Zero or more instance initializers @@ -311,7 +313,7 @@ public final class TokenTypes { * @see #OBJBLOCK **/ public static final int INSTANCE_INIT = - GeneratedJavaTokenTypes.INSTANCE_INIT; + JavaLexer.INSTANCE_INIT; /** * A static initialization block. Zero or more static @@ -344,7 +346,7 @@ public final class TokenTypes { * @see #OBJBLOCK **/ public static final int STATIC_INIT = - GeneratedJavaTokenTypes.STATIC_INIT; + JavaLexer.STATIC_INIT; /** * A type. This is either a return type of a method or a type of @@ -385,7 +387,7 @@ public final class TokenTypes { * @see #ARRAY_DECLARATOR * @see #TYPE_ARGUMENTS **/ - public static final int TYPE = GeneratedJavaTokenTypes.TYPE; + public static final int TYPE = JavaLexer.TYPE; /** * A class declaration. * @@ -416,7 +418,7 @@ public final class TokenTypes { * @see #OBJBLOCK * @see #LITERAL_NEW **/ - public static final int CLASS_DEF = GeneratedJavaTokenTypes.CLASS_DEF; + public static final int CLASS_DEF = JavaLexer.CLASS_DEF; /** * An interface declaration. * @@ -450,7 +452,7 @@ public final class TokenTypes { * @see #OBJBLOCK **/ public static final int INTERFACE_DEF = - GeneratedJavaTokenTypes.INTERFACE_DEF; + JavaLexer.INTERFACE_DEF; /** * The package declaration. This is optional, but if it is @@ -491,7 +493,7 @@ public final class TokenTypes { * @see #ANNOTATIONS * @see FullIdent **/ - public static final int PACKAGE_DEF = GeneratedJavaTokenTypes.PACKAGE_DEF; + public static final int PACKAGE_DEF = JavaLexer.PACKAGE_DEF; /** * An array declaration. * @@ -529,7 +531,7 @@ public final class TokenTypes { * @see #ARRAY_INIT **/ public static final int ARRAY_DECLARATOR = - GeneratedJavaTokenTypes.ARRAY_DECLARATOR; + JavaLexer.ARRAY_DECLARATOR; /** * An extends clause. This appear as part of class and interface @@ -563,7 +565,7 @@ public final class TokenTypes { * @see FullIdent **/ public static final int EXTENDS_CLAUSE = - GeneratedJavaTokenTypes.EXTENDS_CLAUSE; + JavaLexer.EXTENDS_CLAUSE; /** * An implements clause. This always appears in a class or enum @@ -598,7 +600,7 @@ public final class TokenTypes { * @see #ENUM_DEF **/ public static final int IMPLEMENTS_CLAUSE = - GeneratedJavaTokenTypes.IMPLEMENTS_CLAUSE; + JavaLexer.IMPLEMENTS_CLAUSE; /** * A list of parameters to a method or constructor. The children @@ -634,7 +636,7 @@ public final class TokenTypes { * @see #METHOD_DEF * @see #CTOR_DEF **/ - public static final int PARAMETERS = GeneratedJavaTokenTypes.PARAMETERS; + public static final int PARAMETERS = JavaLexer.PARAMETERS; /** * A parameter declaration. The last parameter in a list of parameters may * be variable length (indicated by the ELLIPSIS child node immediately @@ -676,7 +678,7 @@ public final class TokenTypes { * @see #ELLIPSIS **/ public static final int PARAMETER_DEF = - GeneratedJavaTokenTypes.PARAMETER_DEF; + JavaLexer.PARAMETER_DEF; /** * A labeled statement. @@ -725,7 +727,7 @@ public final class TokenTypes { * @see #SLIST **/ public static final int LABELED_STAT = - GeneratedJavaTokenTypes.LABELED_STAT; + JavaLexer.LABELED_STAT; /** * A type-cast. @@ -756,7 +758,7 @@ public final class TokenTypes { * @see #TYPE_ARGUMENTS * @see #RPAREN **/ - public static final int TYPECAST = GeneratedJavaTokenTypes.TYPECAST; + public static final int TYPECAST = JavaLexer.TYPECAST; /** * The array index operator. * @@ -779,7 +781,7 @@ public final class TokenTypes { * * @see #EXPR **/ - public static final int INDEX_OP = GeneratedJavaTokenTypes.INDEX_OP; + public static final int INDEX_OP = JavaLexer.INDEX_OP; /** * The {@code ++} (postfix increment) operator. * @@ -801,7 +803,7 @@ public final class TokenTypes { * @see #EXPR * @see #INC **/ - public static final int POST_INC = GeneratedJavaTokenTypes.POST_INC; + public static final int POST_INC = JavaLexer.POST_INC; /** * The {@code --} (postfix decrement) operator. * @@ -823,7 +825,7 @@ public final class TokenTypes { * @see #EXPR * @see #DEC **/ - public static final int POST_DEC = GeneratedJavaTokenTypes.POST_DEC; + public static final int POST_DEC = JavaLexer.POST_DEC; /** * A method call. A method call may have type arguments however these * are attached to the appropriate node in the qualified method name. @@ -855,7 +857,7 @@ public final class TokenTypes { * @see #RPAREN * @see FullIdent **/ - public static final int METHOD_CALL = GeneratedJavaTokenTypes.METHOD_CALL; + public static final int METHOD_CALL = JavaLexer.METHOD_CALL; /** * A reference to a method or constructor without arguments. Part of Java 8 syntax. @@ -890,7 +892,7 @@ public final class TokenTypes { * @see #IDENT * @see #DOUBLE_COLON */ - public static final int METHOD_REF = GeneratedJavaTokenTypes.METHOD_REF; + public static final int METHOD_REF = JavaLexer.METHOD_REF; /** * An expression. Operators with lower precedence appear at a * higher level in the tree than operators with higher precedence. @@ -936,7 +938,7 @@ public final class TokenTypes { * @see #LPAREN * @see #RPAREN **/ - public static final int EXPR = GeneratedJavaTokenTypes.EXPR; + public static final int EXPR = JavaLexer.EXPR; /** * An array initialization. This may occur as part of an array * declaration or inline with {@code new}. @@ -1009,7 +1011,7 @@ public final class TokenTypes { * @see #LITERAL_NEW * @see #COMMA **/ - public static final int ARRAY_INIT = GeneratedJavaTokenTypes.ARRAY_INIT; + public static final int ARRAY_INIT = JavaLexer.ARRAY_INIT; /** * An import declaration. Import declarations are option, but * must appear after the package declaration and before the first type @@ -1042,7 +1044,7 @@ public final class TokenTypes { * @see #SEMI * @see FullIdent **/ - public static final int IMPORT = GeneratedJavaTokenTypes.IMPORT; + public static final int IMPORT = JavaLexer.IMPORT; /** * The {@code -} (unary minus) operator. * <p>For example:</p> @@ -1064,7 +1066,7 @@ public final class TokenTypes { * Language Specification, &sect;15.15.4</a> * @see #EXPR **/ - public static final int UNARY_MINUS = GeneratedJavaTokenTypes.UNARY_MINUS; + public static final int UNARY_MINUS = JavaLexer.UNARY_MINUS; /** * The {@code +} (unary plus) operator. * <p>For example:</p> @@ -1086,7 +1088,7 @@ public final class TokenTypes { * Language Specification, &sect;15.15.3</a> * @see #EXPR **/ - public static final int UNARY_PLUS = GeneratedJavaTokenTypes.UNARY_PLUS; + public static final int UNARY_PLUS = JavaLexer.UNARY_PLUS; /** * A group of case clauses. Case clauses with no associated * statements are grouped together into a case group. The last @@ -1131,7 +1133,7 @@ public final class TokenTypes { * @see #LITERAL_SWITCH * @see #LITERAL_YIELD **/ - public static final int CASE_GROUP = GeneratedJavaTokenTypes.CASE_GROUP; + public static final int CASE_GROUP = JavaLexer.CASE_GROUP; /** * An expression list. The children are a comma separated list of * expressions. @@ -1144,7 +1146,7 @@ public final class TokenTypes { * @see #CTOR_CALL * @see #SUPER_CTOR_CALL **/ - public static final int ELIST = GeneratedJavaTokenTypes.ELIST; + public static final int ELIST = JavaLexer.ELIST; /** * A for loop initializer. This is a child of * {@code LITERAL_FOR}. The children of this element may be @@ -1191,7 +1193,7 @@ public final class TokenTypes { * @see #ELIST * @see #LITERAL_FOR **/ - public static final int FOR_INIT = GeneratedJavaTokenTypes.FOR_INIT; + public static final int FOR_INIT = JavaLexer.FOR_INIT; /** * A for loop condition. This is a child of * {@code LITERAL_FOR}. The child of this element is an @@ -1237,7 +1239,7 @@ public final class TokenTypes { * @see #LITERAL_FOR **/ public static final int FOR_CONDITION = - GeneratedJavaTokenTypes.FOR_CONDITION; + JavaLexer.FOR_CONDITION; /** * A for loop iterator. This is a child of @@ -1284,7 +1286,7 @@ public final class TokenTypes { * @see #LITERAL_FOR **/ public static final int FOR_ITERATOR = - GeneratedJavaTokenTypes.FOR_ITERATOR; + JavaLexer.FOR_ITERATOR; /** * The empty statement. This goes in place of an @@ -1297,7 +1299,7 @@ public final class TokenTypes { * @see #LITERAL_FOR * @see #LITERAL_WHILE **/ - public static final int EMPTY_STAT = GeneratedJavaTokenTypes.EMPTY_STAT; + public static final int EMPTY_STAT = JavaLexer.EMPTY_STAT; /** * The {@code final} keyword. * @@ -1322,7 +1324,7 @@ public final class TokenTypes { * * @see #MODIFIERS **/ - public static final int FINAL = GeneratedJavaTokenTypes.FINAL; + public static final int FINAL = JavaLexer.FINAL; /** * The {@code abstract} keyword. * @@ -1347,7 +1349,7 @@ public final class TokenTypes { * * @see #MODIFIERS **/ - public static final int ABSTRACT = GeneratedJavaTokenTypes.ABSTRACT; + public static final int ABSTRACT = JavaLexer.ABSTRACT; /** * The {@code strictfp} keyword. * @@ -1369,7 +1371,7 @@ public final class TokenTypes { * * @see #MODIFIERS **/ - public static final int STRICTFP = GeneratedJavaTokenTypes.STRICTFP; + public static final int STRICTFP = JavaLexer.STRICTFP; /** * A super constructor call. * @@ -1379,7 +1381,7 @@ public final class TokenTypes { * @see #CTOR_CALL **/ public static final int SUPER_CTOR_CALL = - GeneratedJavaTokenTypes.SUPER_CTOR_CALL; + JavaLexer.SUPER_CTOR_CALL; /** * A constructor call. @@ -1407,7 +1409,7 @@ public final class TokenTypes { * @see #SEMI * @see #SUPER_CTOR_CALL **/ - public static final int CTOR_CALL = GeneratedJavaTokenTypes.CTOR_CALL; + public static final int CTOR_CALL = JavaLexer.CTOR_CALL; /** * The statement terminator ({@code ;}). Depending on the @@ -1436,7 +1438,7 @@ public final class TokenTypes { * @see #ARRAY_INIT * @see #LITERAL_FOR **/ - public static final int SEMI = GeneratedJavaTokenTypes.SEMI; + public static final int SEMI = JavaLexer.SEMI; /** * The {@code ]} symbol. @@ -1460,13 +1462,13 @@ public final class TokenTypes { * @see #INDEX_OP * @see #ARRAY_DECLARATOR **/ - public static final int RBRACK = GeneratedJavaTokenTypes.RBRACK; + public static final int RBRACK = JavaLexer.RBRACK; /** * The {@code void} keyword. * * <p>For example:</p> * <pre> - * {@code void literal_void(){}} + * {@code void LITERAL_VOID(){}} * </pre> * <p>'void' parses as:</p> * <pre> @@ -1474,13 +1476,13 @@ public final class TokenTypes { * |--MODIFIERS -&gt; MODIFIERS * |--TYPE -&gt; TYPE * | `--LITERAL_VOID -&gt; void - * |--IDENT -&gt; literal_void + * |--IDENT -&gt; LITERAL_VOID * </pre> * * @see #TYPE **/ public static final int LITERAL_VOID = - GeneratedJavaTokenTypes.LITERAL_void; + JavaLexer.LITERAL_VOID; /** * The {@code boolean} keyword. @@ -1488,7 +1490,7 @@ public final class TokenTypes { * @see #TYPE **/ public static final int LITERAL_BOOLEAN = - GeneratedJavaTokenTypes.LITERAL_boolean; + JavaLexer.LITERAL_BOOLEAN; /** * The {@code byte} keyword. @@ -1511,7 +1513,7 @@ public final class TokenTypes { * @see #TYPE **/ public static final int LITERAL_BYTE = - GeneratedJavaTokenTypes.LITERAL_byte; + JavaLexer.LITERAL_BYTE; /** * The {@code char} keyword. @@ -1536,7 +1538,7 @@ public final class TokenTypes { * @see #TYPE **/ public static final int LITERAL_CHAR = - GeneratedJavaTokenTypes.LITERAL_char; + JavaLexer.LITERAL_CHAR; /** * The {@code short} keyword. @@ -1559,7 +1561,7 @@ public final class TokenTypes { * @see #TYPE **/ public static final int LITERAL_SHORT = - GeneratedJavaTokenTypes.LITERAL_short; + JavaLexer.LITERAL_SHORT; /** * The {@code int} keyword. @@ -1581,7 +1583,7 @@ public final class TokenTypes { * * @see #TYPE **/ - public static final int LITERAL_INT = GeneratedJavaTokenTypes.LITERAL_int; + public static final int LITERAL_INT = JavaLexer.LITERAL_INT; /** * The {@code float} keyword. * @@ -1603,7 +1605,7 @@ public final class TokenTypes { * @see #TYPE **/ public static final int LITERAL_FLOAT = - GeneratedJavaTokenTypes.LITERAL_float; + JavaLexer.LITERAL_FLOAT; /** * The {@code long} keyword. @@ -1626,7 +1628,7 @@ public final class TokenTypes { * @see #TYPE **/ public static final int LITERAL_LONG = - GeneratedJavaTokenTypes.LITERAL_long; + JavaLexer.LITERAL_LONG; /** * The {@code double} keyword. @@ -1649,13 +1651,13 @@ public final class TokenTypes { * @see #TYPE **/ public static final int LITERAL_DOUBLE = - GeneratedJavaTokenTypes.LITERAL_double; + JavaLexer.LITERAL_DOUBLE; /** * An identifier. These can be names of types, subpackages, * fields, methods, parameters, and local variables. **/ - public static final int IDENT = GeneratedJavaTokenTypes.IDENT; + public static final int IDENT = JavaLexer.IDENT; /** * The <code>&#46;</code> (dot) operator. * @@ -1676,7 +1678,7 @@ public final class TokenTypes { * @see FullIdent * @noinspection HtmlTagCanBeJavadocTag **/ - public static final int DOT = GeneratedJavaTokenTypes.DOT; + public static final int DOT = JavaLexer.DOT; /** * The {@code *} (multiplication or wildcard) operator. * @@ -1704,7 +1706,7 @@ public final class TokenTypes { * @see #EXPR * @see #IMPORT **/ - public static final int STAR = GeneratedJavaTokenTypes.STAR; + public static final int STAR = JavaLexer.STAR; /** * The {@code private} keyword. * @@ -1726,7 +1728,7 @@ public final class TokenTypes { * @see #MODIFIERS **/ public static final int LITERAL_PRIVATE = - GeneratedJavaTokenTypes.LITERAL_private; + JavaLexer.LITERAL_PRIVATE; /** * The {@code public} keyword. @@ -1749,7 +1751,7 @@ public final class TokenTypes { * @see #MODIFIERS **/ public static final int LITERAL_PUBLIC = - GeneratedJavaTokenTypes.LITERAL_public; + JavaLexer.LITERAL_PUBLIC; /** * The {@code protected} keyword. @@ -1772,7 +1774,7 @@ public final class TokenTypes { * @see #MODIFIERS **/ public static final int LITERAL_PROTECTED = - GeneratedJavaTokenTypes.LITERAL_protected; + JavaLexer.LITERAL_PROTECTED; /** * The {@code static} keyword. @@ -1796,7 +1798,7 @@ public final class TokenTypes { * @see #MODIFIERS **/ public static final int LITERAL_STATIC = - GeneratedJavaTokenTypes.LITERAL_static; + JavaLexer.LITERAL_STATIC; /** * The {@code transient} keyword. @@ -1819,7 +1821,7 @@ public final class TokenTypes { * @see #MODIFIERS **/ public static final int LITERAL_TRANSIENT = - GeneratedJavaTokenTypes.LITERAL_transient; + JavaLexer.LITERAL_TRANSIENT; /** * The {@code native} keyword. @@ -1827,7 +1829,7 @@ public final class TokenTypes { * @see #MODIFIERS **/ public static final int LITERAL_NATIVE = - GeneratedJavaTokenTypes.LITERAL_native; + JavaLexer.LITERAL_NATIVE; /** * The {@code synchronized} keyword. This may be used as a @@ -1868,7 +1870,7 @@ public final class TokenTypes { * @see #RCURLY **/ public static final int LITERAL_SYNCHRONIZED = - GeneratedJavaTokenTypes.LITERAL_synchronized; + JavaLexer.LITERAL_SYNCHRONIZED; /** * The {@code volatile} keyword. This may be used as a @@ -1892,7 +1894,7 @@ public final class TokenTypes { * @see #MODIFIERS **/ public static final int LITERAL_VOLATILE = - GeneratedJavaTokenTypes.LITERAL_volatile; + JavaLexer.LITERAL_VOLATILE; /** * The {@code class} keyword. This element appears both @@ -1932,7 +1934,7 @@ public final class TokenTypes { * @see FullIdent **/ public static final int LITERAL_CLASS = - GeneratedJavaTokenTypes.LITERAL_class; + JavaLexer.LITERAL_CLASS; /** * The {@code interface} keyword. This token appears in @@ -1962,7 +1964,7 @@ public final class TokenTypes { * @see #INTERFACE_DEF **/ public static final int LITERAL_INTERFACE = - GeneratedJavaTokenTypes.LITERAL_interface; + JavaLexer.LITERAL_INTERFACE; /** * A left curly brace (<code>{</code>). @@ -1995,7 +1997,7 @@ public final class TokenTypes { * @see #ARRAY_INIT * @see #SLIST **/ - public static final int LCURLY = GeneratedJavaTokenTypes.LCURLY; + public static final int LCURLY = JavaLexer.LCURLY; /** * A right curly brace (<code>}</code>). * @@ -2023,7 +2025,7 @@ public final class TokenTypes { * @see #ARRAY_INIT * @see #SLIST **/ - public static final int RCURLY = GeneratedJavaTokenTypes.RCURLY; + public static final int RCURLY = JavaLexer.RCURLY; /** * The {@code ,} (comma) operator. @@ -2054,7 +2056,7 @@ public final class TokenTypes { * @see #LITERAL_THROWS * @see #IMPLEMENTS_CLAUSE **/ - public static final int COMMA = GeneratedJavaTokenTypes.COMMA; + public static final int COMMA = JavaLexer.COMMA; /** * A left parenthesis ({@code (}). @@ -2104,7 +2106,7 @@ public final class TokenTypes { * @see #LITERAL_SWITCH * @see #LITERAL_CATCH **/ - public static final int LPAREN = GeneratedJavaTokenTypes.LPAREN; + public static final int LPAREN = JavaLexer.LPAREN; /** * A right parenthesis ({@code )}). * @@ -2135,7 +2137,7 @@ public final class TokenTypes { * @see #LITERAL_SWITCH * @see #LITERAL_CATCH **/ - public static final int RPAREN = GeneratedJavaTokenTypes.RPAREN; + public static final int RPAREN = JavaLexer.RPAREN; /** * The {@code this} keyword use to refer the current object. * This can also be used to call the constructor. @@ -2176,7 +2178,7 @@ public final class TokenTypes { * @see #CTOR_CALL **/ public static final int LITERAL_THIS = - GeneratedJavaTokenTypes.LITERAL_this; + JavaLexer.LITERAL_THIS; /** * The {@code super} keyword. @@ -2201,7 +2203,7 @@ public final class TokenTypes { * @see #SUPER_CTOR_CALL **/ public static final int LITERAL_SUPER = - GeneratedJavaTokenTypes.LITERAL_super; + JavaLexer.LITERAL_SUPER; /** * The {@code =} (assignment) operator. @@ -2224,7 +2226,7 @@ public final class TokenTypes { * Language Specification, &sect;15.26.1</a> * @see #EXPR **/ - public static final int ASSIGN = GeneratedJavaTokenTypes.ASSIGN; + public static final int ASSIGN = JavaLexer.ASSIGN; /** * The {@code throws} keyword. The children are a number of * one or more identifiers separated by commas. @@ -2263,7 +2265,7 @@ public final class TokenTypes { * @see FullIdent **/ public static final int LITERAL_THROWS = - GeneratedJavaTokenTypes.LITERAL_throws; + JavaLexer.LITERAL_THROWS; /** * The {@code :} (colon) operator. This will appear as part @@ -2289,7 +2291,7 @@ public final class TokenTypes { * @see #LABELED_STAT * @see #CASE_GROUP **/ - public static final int COLON = GeneratedJavaTokenTypes.COLON; + public static final int COLON = JavaLexer.COLON; /** * The {@code ::} (double colon) separator. @@ -2298,7 +2300,7 @@ public final class TokenTypes { * * @see #METHOD_REF */ - public static final int DOUBLE_COLON = GeneratedJavaTokenTypes.DOUBLE_COLON; + public static final int DOUBLE_COLON = JavaLexer.DOUBLE_COLON; /** * The {@code if} keyword. * @@ -2344,7 +2346,7 @@ public final class TokenTypes { * @see #EMPTY_STAT * @see #LITERAL_ELSE **/ - public static final int LITERAL_IF = GeneratedJavaTokenTypes.LITERAL_if; + public static final int LITERAL_IF = JavaLexer.LITERAL_IF; /** * The {@code for} keyword. The children are {@code (}, * an initializer, a condition, an iterator, a {@code )} and @@ -2397,7 +2399,7 @@ public final class TokenTypes { * @see #EMPTY_STAT * @see #EXPR **/ - public static final int LITERAL_FOR = GeneratedJavaTokenTypes.LITERAL_for; + public static final int LITERAL_FOR = JavaLexer.LITERAL_FOR; /** * The {@code while} keyword. * @@ -2425,7 +2427,7 @@ public final class TokenTypes { * </pre> **/ public static final int LITERAL_WHILE = - GeneratedJavaTokenTypes.LITERAL_while; + JavaLexer.LITERAL_WHILE; /** * The {@code do} keyword. Note the the while token does not @@ -2469,7 +2471,7 @@ public final class TokenTypes { * @see #RPAREN * @see #SEMI **/ - public static final int LITERAL_DO = GeneratedJavaTokenTypes.LITERAL_do; + public static final int LITERAL_DO = JavaLexer.LITERAL_DO; /** * Literal {@code while} in do-while loop. * @@ -2496,7 +2498,7 @@ public final class TokenTypes { * * @see #LITERAL_DO */ - public static final int DO_WHILE = GeneratedJavaTokenTypes.DO_WHILE; + public static final int DO_WHILE = JavaLexer.DO_WHILE; /** * The {@code break} keyword. The first child is an optional * identifier and the last child is a semicolon. @@ -2506,7 +2508,7 @@ public final class TokenTypes { * @see #SLIST **/ public static final int LITERAL_BREAK = - GeneratedJavaTokenTypes.LITERAL_break; + JavaLexer.LITERAL_BREAK; /** * The {@code continue} keyword. The first child is an @@ -2539,7 +2541,7 @@ public final class TokenTypes { * @see #SLIST **/ public static final int LITERAL_CONTINUE = - GeneratedJavaTokenTypes.LITERAL_continue; + JavaLexer.LITERAL_CONTINUE; /** * The {@code return} keyword. The first child is an @@ -2583,7 +2585,7 @@ public final class TokenTypes { * @see #SLIST **/ public static final int LITERAL_RETURN = - GeneratedJavaTokenTypes.LITERAL_return; + JavaLexer.LITERAL_RETURN; /** * The {@code switch} keyword. @@ -2666,7 +2668,7 @@ public final class TokenTypes { * @see #SWITCH_RULE **/ public static final int LITERAL_SWITCH = - GeneratedJavaTokenTypes.LITERAL_switch; + JavaLexer.LITERAL_SWITCH; /** * The {@code throw} keyword. The first child is an @@ -2679,7 +2681,7 @@ public final class TokenTypes { * @see #EXPR **/ public static final int LITERAL_THROW = - GeneratedJavaTokenTypes.LITERAL_throw; + JavaLexer.LITERAL_THROW; /** * The {@code else} keyword. This appears as a child of an @@ -2713,7 +2715,7 @@ public final class TokenTypes { * @see #LITERAL_IF **/ public static final int LITERAL_ELSE = - GeneratedJavaTokenTypes.LITERAL_else; + JavaLexer.LITERAL_ELSE; /** * The {@code case} keyword. The first child is a constant @@ -2766,7 +2768,7 @@ public final class TokenTypes { * @see #EXPR **/ public static final int LITERAL_CASE = - GeneratedJavaTokenTypes.LITERAL_case; + JavaLexer.LITERAL_CASE; /** * The {@code default} keyword. This element has no @@ -2820,7 +2822,7 @@ public final class TokenTypes { * @see #SWITCH_RULE **/ public static final int LITERAL_DEFAULT = - GeneratedJavaTokenTypes.LITERAL_default; + JavaLexer.LITERAL_DEFAULT; /** * The {@code try} keyword. The children are a statement @@ -2848,7 +2850,7 @@ public final class TokenTypes { * @see #LITERAL_CATCH * @see #LITERAL_FINALLY **/ - public static final int LITERAL_TRY = GeneratedJavaTokenTypes.LITERAL_try; + public static final int LITERAL_TRY = JavaLexer.LITERAL_TRY; /** * The Java 7 try-with-resources construct. @@ -2938,7 +2940,7 @@ public final class TokenTypes { * @see #LITERAL_TRY **/ public static final int RESOURCE_SPECIFICATION = - GeneratedJavaTokenTypes.RESOURCE_SPECIFICATION; + JavaLexer.RESOURCE_SPECIFICATION; /** * A list of resources in the Java 7 try-with-resources construct. @@ -2980,7 +2982,7 @@ public final class TokenTypes { * @see #RESOURCE_SPECIFICATION **/ public static final int RESOURCES = - GeneratedJavaTokenTypes.RESOURCES; + JavaLexer.RESOURCES; /** * A resource in the Java 7 try-with-resources construct. @@ -3030,7 +3032,7 @@ public final class TokenTypes { * @see #RESOURCE_SPECIFICATION **/ public static final int RESOURCE = - GeneratedJavaTokenTypes.RESOURCE; + JavaLexer.RESOURCE; /** * The {@code catch} keyword. @@ -3082,7 +3084,7 @@ public final class TokenTypes { * @see #LITERAL_TRY **/ public static final int LITERAL_CATCH = - GeneratedJavaTokenTypes.LITERAL_catch; + JavaLexer.LITERAL_CATCH; /** * The {@code finally} keyword. @@ -3105,7 +3107,7 @@ public final class TokenTypes { * @see #LITERAL_TRY **/ public static final int LITERAL_FINALLY = - GeneratedJavaTokenTypes.LITERAL_finally; + JavaLexer.LITERAL_FINALLY; /** * The {@code +=} (addition assignment) operator. @@ -3128,7 +3130,7 @@ public final class TokenTypes { * Language Specification, &sect;15.26.2</a> * @see #EXPR **/ - public static final int PLUS_ASSIGN = GeneratedJavaTokenTypes.PLUS_ASSIGN; + public static final int PLUS_ASSIGN = JavaLexer.PLUS_ASSIGN; /** * The {@code -=} (subtraction assignment) operator. * @@ -3151,7 +3153,7 @@ public final class TokenTypes { * @see #EXPR **/ public static final int MINUS_ASSIGN = - GeneratedJavaTokenTypes.MINUS_ASSIGN; + JavaLexer.MINUS_ASSIGN; /** * The {@code *=} (multiplication assignment) operator. @@ -3174,7 +3176,7 @@ public final class TokenTypes { * Language Specification, &sect;15.26.2</a> * @see #EXPR **/ - public static final int STAR_ASSIGN = GeneratedJavaTokenTypes.STAR_ASSIGN; + public static final int STAR_ASSIGN = JavaLexer.STAR_ASSIGN; /** * The {@code /=} (division assignment) operator. * @@ -3196,7 +3198,7 @@ public final class TokenTypes { * Language Specification, &sect;15.26.2</a> * @see #EXPR **/ - public static final int DIV_ASSIGN = GeneratedJavaTokenTypes.DIV_ASSIGN; + public static final int DIV_ASSIGN = JavaLexer.DIV_ASSIGN; /** * The {@code %=} (remainder assignment) operator. * <p>For example:</p> @@ -3215,7 +3217,7 @@ public final class TokenTypes { * Language Specification, &sect;15.26.2</a> * @see #EXPR **/ - public static final int MOD_ASSIGN = GeneratedJavaTokenTypes.MOD_ASSIGN; + public static final int MOD_ASSIGN = JavaLexer.MOD_ASSIGN; /** * The {@code >>=} (signed right shift assignment) * operator. @@ -3238,7 +3240,7 @@ public final class TokenTypes { * Language Specification, &sect;15.26.2</a> * @see #EXPR **/ - public static final int SR_ASSIGN = GeneratedJavaTokenTypes.SR_ASSIGN; + public static final int SR_ASSIGN = JavaLexer.SR_ASSIGN; /** * The {@code >>>=} (unsigned right shift assignment) * operator. @@ -3261,7 +3263,7 @@ public final class TokenTypes { * Language Specification, &sect;15.26.2</a> * @see #EXPR **/ - public static final int BSR_ASSIGN = GeneratedJavaTokenTypes.BSR_ASSIGN; + public static final int BSR_ASSIGN = JavaLexer.BSR_ASSIGN; /** * The {@code <<=} (left shift assignment) operator. * @@ -3270,7 +3272,7 @@ public final class TokenTypes { * Language Specification, &sect;15.26.2</a> * @see #EXPR **/ - public static final int SL_ASSIGN = GeneratedJavaTokenTypes.SL_ASSIGN; + public static final int SL_ASSIGN = JavaLexer.SL_ASSIGN; /** * The {@code &=} (bitwise AND assignment) operator. * @@ -3292,7 +3294,7 @@ public final class TokenTypes { * Language Specification, &sect;15.26.2</a> * @see #EXPR **/ - public static final int BAND_ASSIGN = GeneratedJavaTokenTypes.BAND_ASSIGN; + public static final int BAND_ASSIGN = JavaLexer.BAND_ASSIGN; /** * The {@code ^=} (bitwise exclusive OR assignment) operator. * @@ -3301,7 +3303,7 @@ public final class TokenTypes { * Language Specification, &sect;15.26.2</a> * @see #EXPR **/ - public static final int BXOR_ASSIGN = GeneratedJavaTokenTypes.BXOR_ASSIGN; + public static final int BXOR_ASSIGN = JavaLexer.BXOR_ASSIGN; /** * The {@code |=} (bitwise OR assignment) operator. * @@ -3323,7 +3325,7 @@ public final class TokenTypes { * Language Specification, &sect;15.26.2</a> * @see #EXPR **/ - public static final int BOR_ASSIGN = GeneratedJavaTokenTypes.BOR_ASSIGN; + public static final int BOR_ASSIGN = JavaLexer.BOR_ASSIGN; /** * The <code>&#63;</code> (conditional) operator. Technically, * the colon is also part of this operator, but it appears as a @@ -3361,7 +3363,7 @@ public final class TokenTypes { * @see #COLON * @noinspection HtmlTagCanBeJavadocTag **/ - public static final int QUESTION = GeneratedJavaTokenTypes.QUESTION; + public static final int QUESTION = JavaLexer.QUESTION; /** * The {@code ||} (conditional OR) operator. * @@ -3390,7 +3392,7 @@ public final class TokenTypes { * Language Specification, &sect;15.24</a> * @see #EXPR **/ - public static final int LOR = GeneratedJavaTokenTypes.LOR; + public static final int LOR = JavaLexer.LOR; /** * The {@code &&} (conditional AND) operator. * @@ -3418,7 +3420,7 @@ public final class TokenTypes { * Language Specification, &sect;15.23</a> * @see #EXPR **/ - public static final int LAND = GeneratedJavaTokenTypes.LAND; + public static final int LAND = JavaLexer.LAND; /** * The {@code |} (bitwise OR) operator. * @@ -3442,7 +3444,7 @@ public final class TokenTypes { * Language Specification, &sect;15.22.1</a> * @see #EXPR **/ - public static final int BOR = GeneratedJavaTokenTypes.BOR; + public static final int BOR = JavaLexer.BOR; /** * The {@code ^} (bitwise exclusive OR) operator. * @@ -3451,7 +3453,7 @@ public final class TokenTypes { * Language Specification, &sect;15.22.1</a> * @see #EXPR **/ - public static final int BXOR = GeneratedJavaTokenTypes.BXOR; + public static final int BXOR = JavaLexer.BXOR; /** * The {@code &} (bitwise AND) operator. * @@ -3475,7 +3477,7 @@ public final class TokenTypes { * Language Specification, &sect;15.22.1</a> * @see #EXPR **/ - public static final int BAND = GeneratedJavaTokenTypes.BAND; + public static final int BAND = JavaLexer.BAND; /** * The <code>&#33;=</code> (not equal) operator. * @@ -3495,7 +3497,7 @@ public final class TokenTypes { * @see #EXPR * @noinspection HtmlTagCanBeJavadocTag **/ - public static final int NOT_EQUAL = GeneratedJavaTokenTypes.NOT_EQUAL; + public static final int NOT_EQUAL = JavaLexer.NOT_EQUAL; /** * The {@code ==} (equal) operator. * @@ -3514,7 +3516,7 @@ public final class TokenTypes { * * @see #EXPR **/ - public static final int EQUAL = GeneratedJavaTokenTypes.EQUAL; + public static final int EQUAL = JavaLexer.EQUAL; /** * The {@code <} (less than) operator. * @@ -3535,7 +3537,7 @@ public final class TokenTypes { * * @see #EXPR **/ - public static final int LT = GeneratedJavaTokenTypes.LT; + public static final int LT = JavaLexer.LT; /** * The {@code >} (greater than) operator. * @@ -3556,7 +3558,7 @@ public final class TokenTypes { * * @see #EXPR **/ - public static final int GT = GeneratedJavaTokenTypes.GT; + public static final int GT = JavaLexer.GT; /** * The {@code <=} (less than or equal) operator. * @@ -3577,13 +3579,13 @@ public final class TokenTypes { * * @see #EXPR **/ - public static final int LE = GeneratedJavaTokenTypes.LE; + public static final int LE = JavaLexer.LE; /** * The {@code >=} (greater than or equal) operator. * * @see #EXPR **/ - public static final int GE = GeneratedJavaTokenTypes.GE; + public static final int GE = JavaLexer.GE; /** * The {@code instanceof} operator. The first child is an * object reference or something that evaluates to an object @@ -3619,7 +3621,7 @@ public final class TokenTypes { * @see FullIdent **/ public static final int LITERAL_INSTANCEOF = - GeneratedJavaTokenTypes.LITERAL_instanceof; + JavaLexer.LITERAL_INSTANCEOF; /** * The {@code <<} (shift left) operator. @@ -3644,7 +3646,7 @@ public final class TokenTypes { * Language Specification, &sect;15.19</a> * @see #EXPR **/ - public static final int SL = GeneratedJavaTokenTypes.SL; + public static final int SL = JavaLexer.SL; /** * The {@code >>} (signed shift right) operator. * @@ -3668,7 +3670,7 @@ public final class TokenTypes { * Language Specification, &sect;15.19</a> * @see #EXPR **/ - public static final int SR = GeneratedJavaTokenTypes.SR; + public static final int SR = JavaLexer.SR; /** * The {@code >>>} (unsigned shift right) operator. * @@ -3690,7 +3692,7 @@ public final class TokenTypes { * Language Specification, &sect;15.19</a> * @see #EXPR **/ - public static final int BSR = GeneratedJavaTokenTypes.BSR; + public static final int BSR = JavaLexer.BSR; /** * The {@code +} (addition) operator. * @@ -3714,7 +3716,7 @@ public final class TokenTypes { * Language Specification, &sect;15.18</a> * @see #EXPR **/ - public static final int PLUS = GeneratedJavaTokenTypes.PLUS; + public static final int PLUS = JavaLexer.PLUS; /** * The {@code -} (subtraction) operator. * @@ -3738,7 +3740,7 @@ public final class TokenTypes { * Language Specification, &sect;15.18</a> * @see #EXPR **/ - public static final int MINUS = GeneratedJavaTokenTypes.MINUS; + public static final int MINUS = JavaLexer.MINUS; /** * The {@code /} (division) operator. * @@ -3762,7 +3764,7 @@ public final class TokenTypes { * Language Specification, &sect;15.17.2</a> * @see #EXPR **/ - public static final int DIV = GeneratedJavaTokenTypes.DIV; + public static final int DIV = JavaLexer.DIV; /** * The {@code %} (remainder) operator. * @@ -3786,7 +3788,7 @@ public final class TokenTypes { * Language Specification, &sect;15.17.3</a> * @see #EXPR **/ - public static final int MOD = GeneratedJavaTokenTypes.MOD; + public static final int MOD = JavaLexer.MOD; /** * The {@code ++} (prefix increment) operator. * @@ -3808,7 +3810,7 @@ public final class TokenTypes { * @see #EXPR * @see #POST_INC **/ - public static final int INC = GeneratedJavaTokenTypes.INC; + public static final int INC = JavaLexer.INC; /** * The {@code --} (prefix decrement) operator. * @@ -3830,7 +3832,7 @@ public final class TokenTypes { * @see #EXPR * @see #POST_DEC **/ - public static final int DEC = GeneratedJavaTokenTypes.DEC; + public static final int DEC = JavaLexer.DEC; /** * The {@code ~} (bitwise complement) operator. * @@ -3853,7 +3855,7 @@ public final class TokenTypes { * Language Specification, &sect;15.15.5</a> * @see #EXPR **/ - public static final int BNOT = GeneratedJavaTokenTypes.BNOT; + public static final int BNOT = JavaLexer.BNOT; /** * The <code>&#33;</code> (logical complement) operator. * @@ -3877,7 +3879,7 @@ public final class TokenTypes { * @see #EXPR * @noinspection HtmlTagCanBeJavadocTag **/ - public static final int LNOT = GeneratedJavaTokenTypes.LNOT; + public static final int LNOT = JavaLexer.LNOT; /** * The {@code true} keyword. * @@ -3905,7 +3907,7 @@ public final class TokenTypes { * @see #LITERAL_FALSE **/ public static final int LITERAL_TRUE = - GeneratedJavaTokenTypes.LITERAL_true; + JavaLexer.LITERAL_TRUE; /** * The {@code false} keyword. @@ -3934,7 +3936,7 @@ public final class TokenTypes { * @see #LITERAL_TRUE **/ public static final int LITERAL_FALSE = - GeneratedJavaTokenTypes.LITERAL_false; + JavaLexer.LITERAL_FALSE; /** * The {@code null} keyword. @@ -3962,7 +3964,7 @@ public final class TokenTypes { * @see #EXPR **/ public static final int LITERAL_NULL = - GeneratedJavaTokenTypes.LITERAL_null; + JavaLexer.LITERAL_NULL; /** * The {@code new} keyword. This element is used to define @@ -4096,7 +4098,7 @@ public final class TokenTypes { * @see #ARRAY_INIT * @see FullIdent **/ - public static final int LITERAL_NEW = GeneratedJavaTokenTypes.LITERAL_new; + public static final int LITERAL_NEW = JavaLexer.LITERAL_NEW; /** * An integer literal. These may be specified in decimal, * hexadecimal, or octal form. @@ -4120,7 +4122,7 @@ public final class TokenTypes { * @see #EXPR * @see #NUM_LONG **/ - public static final int NUM_INT = GeneratedJavaTokenTypes.NUM_INT; + public static final int NUM_INT = JavaLexer.NUM_INT; /** * A character literal. This is a (possibly escaped) character * enclosed in single quotes. @@ -4143,7 +4145,7 @@ public final class TokenTypes { * @see #EXPR **/ public static final int CHAR_LITERAL = - GeneratedJavaTokenTypes.CHAR_LITERAL; + JavaLexer.CHAR_LITERAL; /** * A string literal. This is a sequence of (possibly escaped) @@ -4170,7 +4172,7 @@ public final class TokenTypes { * @see #EXPR **/ public static final int STRING_LITERAL = - GeneratedJavaTokenTypes.STRING_LITERAL; + JavaLexer.STRING_LITERAL; /** * A single precision floating point literal. This is a floating @@ -4195,7 +4197,7 @@ public final class TokenTypes { * @see #EXPR * @see #NUM_DOUBLE **/ - public static final int NUM_FLOAT = GeneratedJavaTokenTypes.NUM_FLOAT; + public static final int NUM_FLOAT = JavaLexer.NUM_FLOAT; /** * A long integer literal. These are almost the same as integer * literals, but they have an {@code L} or {@code l} @@ -4220,7 +4222,7 @@ public final class TokenTypes { * @see #EXPR * @see #NUM_INT **/ - public static final int NUM_LONG = GeneratedJavaTokenTypes.NUM_LONG; + public static final int NUM_LONG = JavaLexer.NUM_LONG; /** * A double precision floating point literal. This is a floating * point number with an optional {@code D} or {@code d} @@ -4245,7 +4247,7 @@ public final class TokenTypes { * @see #EXPR * @see #NUM_FLOAT **/ - public static final int NUM_DOUBLE = GeneratedJavaTokenTypes.NUM_DOUBLE; + public static final int NUM_DOUBLE = JavaLexer.NUM_DOUBLE; /** * The {@code assert} keyword. This is only for Java 1.4 and @@ -4270,7 +4272,7 @@ public final class TokenTypes { * +--SEMI (;) * </pre> **/ - public static final int LITERAL_ASSERT = GeneratedJavaTokenTypes.ASSERT; + public static final int LITERAL_ASSERT = JavaLexer.ASSERT; /** * A static import declaration. Static import declarations are optional, @@ -4303,7 +4305,7 @@ public final class TokenTypes { * @see FullIdent **/ public static final int STATIC_IMPORT = - GeneratedJavaTokenTypes.STATIC_IMPORT; + JavaLexer.STATIC_IMPORT; /** * An enum declaration. Its notable children are @@ -4354,7 +4356,7 @@ public final class TokenTypes { * +--LITERAL_PUBLIC (public) * +--TYPE * | - * +--LITERAL_void (void) + * +--LITERAL_VOID (void) * +--IDENT (someMethod) * +--LPAREN (() * +--PARAMETERS @@ -4377,14 +4379,14 @@ public final class TokenTypes { * @see #ENUM_CONSTANT_DEF **/ public static final int ENUM_DEF = - GeneratedJavaTokenTypes.ENUM_DEF; + JavaLexer.ENUM_DEF; /** * The {@code enum} keyword. This element appears * as part of an enum declaration. **/ public static final int ENUM = - GeneratedJavaTokenTypes.ENUM; + JavaLexer.ENUM; /** * An enum constant declaration. Its notable children are annotations, @@ -4424,7 +4426,7 @@ public final class TokenTypes { * +--LITERAL_PUBLIC (public) * +--TYPE * | - * +--LITERAL_void (void) + * +--LITERAL_VOID (void) * +--IDENT (someMethodOverriddenFromMainBody) * +--LPAREN (() * +--PARAMETERS @@ -4444,7 +4446,7 @@ public final class TokenTypes { * @see #OBJBLOCK **/ public static final int ENUM_CONSTANT_DEF = - GeneratedJavaTokenTypes.ENUM_CONSTANT_DEF; + JavaLexer.ENUM_CONSTANT_DEF; /** * A for-each clause. This is a child of @@ -4486,7 +4488,7 @@ public final class TokenTypes { * @see #LITERAL_FOR **/ public static final int FOR_EACH_CLAUSE = - GeneratedJavaTokenTypes.FOR_EACH_CLAUSE; + JavaLexer.FOR_EACH_CLAUSE; /** * An annotation declaration. The notable children are the name of the @@ -4529,7 +4531,7 @@ public final class TokenTypes { * @see #ANNOTATION_FIELD_DEF **/ public static final int ANNOTATION_DEF = - GeneratedJavaTokenTypes.ANNOTATION_DEF; + JavaLexer.ANNOTATION_DEF; /** * An annotation field declaration. The notable children are modifiers, @@ -4566,7 +4568,7 @@ public final class TokenTypes { * @see #LITERAL_DEFAULT */ public static final int ANNOTATION_FIELD_DEF = - GeneratedJavaTokenTypes.ANNOTATION_FIELD_DEF; + JavaLexer.ANNOTATION_FIELD_DEF; // note: &#064; is the html escape for '@', // used here to avoid confusing the javadoc tool @@ -4605,7 +4607,7 @@ public final class TokenTypes { * @see #IDENT */ public static final int ANNOTATIONS = - GeneratedJavaTokenTypes.ANNOTATIONS; + JavaLexer.ANNOTATIONS; // note: &#064; is the html escape for '@', // used here to avoid confusing the javadoc tool @@ -4655,7 +4657,7 @@ public final class TokenTypes { * @see #ANNOTATION_MEMBER_VALUE_PAIR */ public static final int ANNOTATION = - GeneratedJavaTokenTypes.ANNOTATION; + JavaLexer.ANNOTATION; /** * An initialization of an annotation member with a value. @@ -4668,7 +4670,7 @@ public final class TokenTypes { * @see #IDENT */ public static final int ANNOTATION_MEMBER_VALUE_PAIR = - GeneratedJavaTokenTypes.ANNOTATION_MEMBER_VALUE_PAIR; + JavaLexer.ANNOTATION_MEMBER_VALUE_PAIR; /** * An annotation array member initialization. @@ -4705,7 +4707,7 @@ public final class TokenTypes { * @see #ANNOTATION_MEMBER_VALUE_PAIR */ public static final int ANNOTATION_ARRAY_INIT = - GeneratedJavaTokenTypes.ANNOTATION_ARRAY_INIT; + JavaLexer.ANNOTATION_ARRAY_INIT; /** * A list of type parameters to a class, interface or @@ -4750,7 +4752,7 @@ public final class TokenTypes { * @see #COMMA */ public static final int TYPE_PARAMETERS = - GeneratedJavaTokenTypes.TYPE_PARAMETERS; + JavaLexer.TYPE_PARAMETERS; /** * A type parameter to a class, interface or method definition. @@ -4791,7 +4793,7 @@ public final class TokenTypes { * @see #TYPE_UPPER_BOUNDS */ public static final int TYPE_PARAMETER = - GeneratedJavaTokenTypes.TYPE_PARAMETER; + JavaLexer.TYPE_PARAMETER; /** * A list of type arguments to a type reference or @@ -4828,7 +4830,7 @@ public final class TokenTypes { * @see #COMMA */ public static final int TYPE_ARGUMENTS = - GeneratedJavaTokenTypes.TYPE_ARGUMENTS; + JavaLexer.TYPE_ARGUMENTS; /** * A type arguments to a type reference or a method/ctor invocation. @@ -4860,7 +4862,7 @@ public final class TokenTypes { * @see #TYPE_LOWER_BOUNDS */ public static final int TYPE_ARGUMENT = - GeneratedJavaTokenTypes.TYPE_ARGUMENT; + JavaLexer.TYPE_ARGUMENT; /** * The type that refers to all types. This node has no children. @@ -4891,7 +4893,7 @@ public final class TokenTypes { * @see #TYPE_LOWER_BOUNDS */ public static final int WILDCARD_TYPE = - GeneratedJavaTokenTypes.WILDCARD_TYPE; + JavaLexer.WILDCARD_TYPE; /** * An upper bounds on a wildcard type argument or type parameter. @@ -4924,7 +4926,7 @@ public final class TokenTypes { * @see #WILDCARD_TYPE */ public static final int TYPE_UPPER_BOUNDS = - GeneratedJavaTokenTypes.TYPE_UPPER_BOUNDS; + JavaLexer.TYPE_UPPER_BOUNDS; /** * A lower bounds on a wildcard type argument. This node has one child @@ -4956,7 +4958,7 @@ public final class TokenTypes { * @see #WILDCARD_TYPE */ public static final int TYPE_LOWER_BOUNDS = - GeneratedJavaTokenTypes.TYPE_LOWER_BOUNDS; + JavaLexer.TYPE_LOWER_BOUNDS; /** * An {@code @} symbol - signifying an annotation instance or the prefix @@ -4966,7 +4968,7 @@ public final class TokenTypes { * @see <a href="https://www.jcp.org/en/jsr/detail?id=201"> * JSR201</a> */ - public static final int AT = GeneratedJavaTokenTypes.AT; + public static final int AT = JavaLexer.AT; /** * A triple dot for variable-length parameters. This token only ever occurs @@ -4975,7 +4977,7 @@ public final class TokenTypes { * @see <a href="https://www.jcp.org/en/jsr/detail?id=201"> * JSR201</a> */ - public static final int ELLIPSIS = GeneratedJavaTokenTypes.ELLIPSIS; + public static final int ELLIPSIS = JavaLexer.ELLIPSIS; /** * The {@code &} symbol when used to extend a generic upper or lower bounds constrain @@ -5023,23 +5025,23 @@ public final class TokenTypes { * Java Language Specification, &sect;15.16</a> */ public static final int TYPE_EXTENSION_AND = - GeneratedJavaTokenTypes.TYPE_EXTENSION_AND; + JavaLexer.TYPE_EXTENSION_AND; /** * A {@code <} symbol signifying the start of type arguments or type parameters. */ public static final int GENERIC_START = - GeneratedJavaTokenTypes.GENERIC_START; + JavaLexer.GENERIC_START; /** * A {@code >} symbol signifying the end of type arguments or type parameters. */ - public static final int GENERIC_END = GeneratedJavaTokenTypes.GENERIC_END; + public static final int GENERIC_END = JavaLexer.GENERIC_END; /** * Special lambda symbol {@code ->}. */ - public static final int LAMBDA = GeneratedJavaTokenTypes.LAMBDA; + public static final int LAMBDA = JavaLexer.LAMBDA; /** * Beginning of single line comment: '//'. @@ -5061,7 +5063,7 @@ public final class TokenTypes { * </pre> */ public static final int SINGLE_LINE_COMMENT = - GeneratedJavaTokenTypes.SINGLE_LINE_COMMENT; + JavaLexer.SINGLE_LINE_COMMENT; /** * Beginning of block comment: '/*'. @@ -5078,7 +5080,7 @@ public final class TokenTypes { * </pre> */ public static final int BLOCK_COMMENT_BEGIN = - GeneratedJavaTokenTypes.BLOCK_COMMENT_BEGIN; + JavaLexer.BLOCK_COMMENT_BEGIN; /** * End of block comment: '&#42;/'. @@ -5091,7 +5093,7 @@ public final class TokenTypes { * </pre> */ public static final int BLOCK_COMMENT_END = - GeneratedJavaTokenTypes.BLOCK_COMMENT_END; + JavaLexer.BLOCK_COMMENT_END; /** * Text of single-line or block comment. @@ -5115,7 +5117,7 @@ public final class TokenTypes { * */ public static final int COMMENT_CONTENT = - GeneratedJavaTokenTypes.COMMENT_CONTENT; + JavaLexer.COMMENT_CONTENT; /** * A pattern variable definition; when conditionally matched, @@ -5145,7 +5147,7 @@ public final class TokenTypes { * @since 8.35 */ public static final int PATTERN_VARIABLE_DEF = - GeneratedJavaTokenTypes.PATTERN_VARIABLE_DEF; + JavaLexer.PATTERN_VARIABLE_DEF; /** * The {@code record} keyword. This element appears @@ -5175,7 +5177,7 @@ public final class TokenTypes { * @since 8.35 **/ public static final int LITERAL_RECORD = - GeneratedJavaTokenTypes.LITERAL_record; + JavaLexer.LITERAL_RECORD; /** * A declaration of a record specifies a name, a header, and a body. @@ -5206,7 +5208,7 @@ public final class TokenTypes { * @since 8.35 */ public static final int RECORD_DEF = - GeneratedJavaTokenTypes.RECORD_DEF; + JavaLexer.RECORD_DEF; /** * Record components are a (possibly empty) list containing the components of a record, which @@ -5245,7 +5247,7 @@ public final class TokenTypes { * @since 8.36 */ public static final int RECORD_COMPONENTS = - GeneratedJavaTokenTypes.RECORD_COMPONENTS; + JavaLexer.RECORD_COMPONENTS; /** * A record component is a variable that comprises the state of a record. Record components @@ -5288,7 +5290,7 @@ public final class TokenTypes { * @since 8.36 */ public static final int RECORD_COMPONENT_DEF = - GeneratedJavaTokenTypes.RECORD_COMPONENT_DEF; + JavaLexer.RECORD_COMPONENT_DEF; /** * A compact canonical constructor eliminates the list of formal parameters; they are @@ -5324,7 +5326,7 @@ public final class TokenTypes { * @since 8.36 */ public static final int COMPACT_CTOR_DEF = - GeneratedJavaTokenTypes.COMPACT_CTOR_DEF; + JavaLexer.COMPACT_CTOR_DEF; /** * Beginning of a Java 14 Text Block literal, @@ -5354,7 +5356,7 @@ public final class TokenTypes { * @since 8.36 */ public static final int TEXT_BLOCK_LITERAL_BEGIN = - GeneratedJavaTokenTypes.TEXT_BLOCK_LITERAL_BEGIN; + JavaLexer.TEXT_BLOCK_LITERAL_BEGIN; /** * Content of a Java 14 text block. This is a @@ -5385,7 +5387,7 @@ public final class TokenTypes { * @since 8.36 */ public static final int TEXT_BLOCK_CONTENT = - GeneratedJavaTokenTypes.TEXT_BLOCK_CONTENT; + JavaLexer.TEXT_BLOCK_CONTENT; /** * End of a Java 14 text block literal, delimited by three @@ -5415,7 +5417,7 @@ public final class TokenTypes { * @since 8.36 */ public static final int TEXT_BLOCK_LITERAL_END = - GeneratedJavaTokenTypes.TEXT_BLOCK_LITERAL_END; + JavaLexer.TEXT_BLOCK_LITERAL_END; /** * The {@code yield} keyword. This element appears @@ -5488,7 +5490,7 @@ public final class TokenTypes { * @since 8.36 */ public static final int LITERAL_YIELD = - GeneratedJavaTokenTypes.LITERAL_yield; + JavaLexer.LITERAL_YIELD; /** * Switch Expressions. @@ -5542,7 +5544,7 @@ public final class TokenTypes { * @since 8.36 */ public static final int SWITCH_RULE = - GeneratedJavaTokenTypes.SWITCH_RULE; + JavaLexer.SWITCH_RULE; /** * The {@code non-sealed} keyword. This element appears @@ -5573,7 +5575,7 @@ public final class TokenTypes { * @since 8.42 */ public static final int LITERAL_NON_SEALED = - GeneratedJavaTokenTypes.LITERAL_non_sealed; + JavaLexer.LITERAL_NON_SEALED; /** * The {@code sealed} restricted identifier. This element appears @@ -5609,7 +5611,7 @@ public final class TokenTypes { * @since 8.42 */ public static final int LITERAL_SEALED = - GeneratedJavaTokenTypes.LITERAL_sealed; + JavaLexer.LITERAL_SEALED; /** * The {@code permits} restricted identifier. This element appears @@ -5645,7 +5647,7 @@ public final class TokenTypes { * @since 8.42 */ public static final int LITERAL_PERMITS = - GeneratedJavaTokenTypes.LITERAL_permits; + JavaLexer.LITERAL_PERMITS; /** * A permits clause. A permits clause's children are a comma separated list of one or @@ -5685,7 +5687,7 @@ public final class TokenTypes { * @since 8.42 */ public static final int PERMITS_CLAUSE = - GeneratedJavaTokenTypes.PERMITS_CLAUSE; + JavaLexer.PERMITS_CLAUSE; /** Prevent instantiation. */ private TokenTypes() { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.java @@ -147,8 +147,7 @@ public void visitToken(DetailAST ast) { // force all methods to be Java style (see note in top Javadoc) final boolean isMethodViolation = isMethod && !isJavaStyle; final boolean isVariableViolation = !isMethod - && isJavaStyle != javaStyle - && typeAST.getType() != TokenTypes.TYPE_ARGUMENT; + && isJavaStyle != javaStyle; if (isMethodViolation || isVariableViolation) { log(ast, MSG_KEY); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java @@ -188,11 +188,13 @@ private static boolean isFollowedByWhitespace(DetailAST targetAST, String line) targetAST.getColumnNo() + targetAST.getText().length(); boolean followedByWhitespace = true; - if (after < line.length()) { - final char charAfter = line.charAt(after); - followedByWhitespace = charAfter == ';' - || charAfter == ')' - || Character.isWhitespace(charAfter); + if (after < line.codePointCount(0, line.length())) { + final int[] codePoints = line.codePoints().toArray(); + final int codePoint = codePoints[after]; + + followedByWhitespace = codePoint == ';' + || codePoint == ')' + || Character.isWhitespace(codePoint); } return followedByWhitespace; } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentation.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentation.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentation.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentation.java @@ -22,8 +22,6 @@ import java.util.HashMap; import java.util.Map; -import antlr.ASTFactory; -import antlr.collections.AST; import com.puppycrawl.tools.checkstyle.DetailAstImpl; import com.puppycrawl.tools.checkstyle.JavadocDetailNodeParser; import com.puppycrawl.tools.checkstyle.api.DetailAST; @@ -78,7 +76,7 @@ public ParseTreeTablePresentation(DetailAST parseTree) { * @param parseTree DetailAST parse tree. */ protected final void setParseTree(DetailAST parseTree) { - ((AST) root).setFirstChild((AST) parseTree); + ((DetailAstImpl) root).setFirstChild(parseTree); } /** @@ -193,7 +191,7 @@ public int getChildCount(Object parent) { } else { if (parseMode == ParseMode.JAVA_WITH_JAVADOC_AND_COMMENTS - && ((AST) parent).getType() == TokenTypes.COMMENT_CONTENT + && ((DetailAST) parent).getType() == TokenTypes.COMMENT_CONTENT && JavadocUtil.isJavadocComment(((DetailAST) parent).getParent())) { // getChildCount return 0 on COMMENT_CONTENT, // but we need to attach javadoc tree, that is separate tree @@ -266,9 +264,10 @@ public boolean isCellEditable(int column) { * @return artificial tree root. */ private static DetailAST createArtificialTreeRoot() { - final ASTFactory factory = new ASTFactory(); - factory.setASTNodeClass(DetailAstImpl.class.getName()); - return (DetailAST) factory.create(TokenTypes.EOF, "ROOT"); + final DetailAstImpl root = new DetailAstImpl(); + root.setType(TokenTypes.EOF); + root.setText("ROOT"); + return root; } /** diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtil.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtil.java @@ -59,7 +59,7 @@ public enum JavadocTagType { /** Maps from a token name to value. */ private static final Map<String, Integer> TOKEN_NAME_TO_VALUE; /** Maps from a token value to name. */ - private static final String[] TOKEN_VALUE_TO_NAME; + private static final Map<Integer, String> TOKEN_VALUE_TO_NAME; /** Exception message for unknown JavaDoc token id. */ private static final String UNKNOWN_JAVADOC_TOKEN_ID_EXCEPTION_MESSAGE = "Unknown javadoc" @@ -77,7 +77,7 @@ public enum JavadocTagType { // initialise the constants static { TOKEN_NAME_TO_VALUE = TokenUtil.nameToValueMapFromPublicIntFields(JavadocTokenTypes.class); - TOKEN_VALUE_TO_NAME = TokenUtil.valueToNameArrayFromNameToValueMap(TOKEN_NAME_TO_VALUE); + TOKEN_VALUE_TO_NAME = TokenUtil.invertMap(TOKEN_NAME_TO_VALUE); } /** Prevent instantiation. */ @@ -315,19 +315,10 @@ public static DetailNode getPreviousSibling(DetailNode node) { * @throws IllegalArgumentException if an unknown token ID was specified. */ public static String getTokenName(int id) { - final String name; - if (id == JavadocTokenTypes.EOF) { - name = "EOF"; - } - else if (id > TOKEN_VALUE_TO_NAME.length - 1) { + final String name = TOKEN_VALUE_TO_NAME.get(id); + if (name == null) { throw new IllegalArgumentException(UNKNOWN_JAVADOC_TOKEN_ID_EXCEPTION_MESSAGE + id); } - else { - name = TOKEN_VALUE_TO_NAME[id]; - if (name == null) { - throw new IllegalArgumentException(UNKNOWN_JAVADOC_TOKEN_ID_EXCEPTION_MESSAGE + id); - } - } return name; } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/ParserUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/ParserUtil.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/ParserUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/ParserUtil.java @@ -22,7 +22,8 @@ import java.util.AbstractMap; import java.util.Map; -import antlr.Token; +import org.antlr.v4.runtime.CommonToken; + import com.puppycrawl.tools.checkstyle.DetailAstImpl; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; @@ -79,20 +80,18 @@ public static DetailAST createBlockCommentNode(String content) { * @param token Token object. * @return DetailAST with BLOCK_COMMENT type. */ - public static DetailAST createBlockCommentNode(Token token) { + public static DetailAST createBlockCommentNode(CommonToken token) { final DetailAstImpl blockComment = new DetailAstImpl(); blockComment.initialize(TokenTypes.BLOCK_COMMENT_BEGIN, BLOCK_MULTIPLE_COMMENT_BEGIN); - // column counting begins from 0 - blockComment.setColumnNo(token.getColumn() - 1); + blockComment.setColumnNo(token.getCharPositionInLine()); blockComment.setLineNo(token.getLine()); final DetailAstImpl blockCommentContent = new DetailAstImpl(); blockCommentContent.setType(TokenTypes.COMMENT_CONTENT); - // column counting begins from 0 - // plus length of '/*' - blockCommentContent.setColumnNo(token.getColumn() - 1 + 2); + // Add length of '/*' + blockCommentContent.setColumnNo(token.getCharPositionInLine() + 2); blockCommentContent.setLineNo(token.getLine()); blockCommentContent.setText(token.getText()); @@ -100,7 +99,7 @@ public static DetailAST createBlockCommentNode(Token token) { blockCommentClose.initialize(TokenTypes.BLOCK_COMMENT_END, BLOCK_MULTIPLE_COMMENT_END); final Map.Entry<Integer, Integer> linesColumns = countLinesColumns( - token.getText(), token.getLine(), token.getColumn()); + token.getText(), token.getLine(), token.getCharPositionInLine() + 1); blockCommentClose.setLineNo(linesColumns.getKey()); blockCommentClose.setColumnNo(linesColumns.getValue()); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtil.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtil.java @@ -43,7 +43,7 @@ public final class TokenUtil { /** Maps from a token name to value. */ private static final Map<String, Integer> TOKEN_NAME_TO_VALUE; /** Maps from a token value to name. */ - private static final String[] TOKEN_VALUE_TO_NAME; + private static final Map<Integer, String> TOKEN_VALUE_TO_NAME; /** Array of all token IDs. */ private static final int[] TOKEN_IDS; @@ -57,7 +57,7 @@ public final class TokenUtil { // initialise the constants static { TOKEN_NAME_TO_VALUE = nameToValueMapFromPublicIntFields(TokenTypes.class); - TOKEN_VALUE_TO_NAME = valueToNameArrayFromNameToValueMap(TOKEN_NAME_TO_VALUE); + TOKEN_VALUE_TO_NAME = invertMap(TOKEN_NAME_TO_VALUE); TOKEN_IDS = TOKEN_NAME_TO_VALUE.values().stream().mapToInt(Integer::intValue).toArray(); } @@ -100,27 +100,14 @@ public static Map<String, Integer> nameToValueMapFromPublicIntFields(Class<?> cl } /** - * Creates an array of map keys for quick value-to-name lookup for the map. + * Inverts a given map by exchanging each entry's key and value. * * @param map source map - * @return array of map keys + * @return inverted map */ - public static String[] valueToNameArrayFromNameToValueMap(Map<String, Integer> map) { - String[] valueToNameArray = CommonUtil.EMPTY_STRING_ARRAY; - - for (Map.Entry<String, Integer> entry : map.entrySet()) { - final int value = entry.getValue(); - // JavadocTokenTypes.EOF has value '-1' and is handled explicitly. - if (value >= 0) { - if (value >= valueToNameArray.length) { - final String[] temp = new String[value + 1]; - System.arraycopy(valueToNameArray, 0, temp, 0, valueToNameArray.length); - valueToNameArray = temp; - } - valueToNameArray[value] = entry.getKey(); - } - } - return valueToNameArray; + public static Map<Integer, String> invertMap(Map<String, Integer> map) { + return map.entrySet().stream() + .collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey)); } /** @@ -151,11 +138,7 @@ public static int[] getAllTokenIds() { * @throws IllegalArgumentException when id is not valid */ public static String getTokenName(int id) { - if (id > TOKEN_VALUE_TO_NAME.length - 1) { - throw new IllegalArgumentException( - String.format(Locale.ROOT, TOKEN_ID_EXCEPTION_FORMAT, id)); - } - final String name = TOKEN_VALUE_TO_NAME[id]; + final String name = TOKEN_VALUE_TO_NAME.get(id); if (name == null) { throw new IllegalArgumentException( String.format(Locale.ROOT, TOKEN_ID_EXCEPTION_FORMAT, id));
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinterTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinterTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinterTest.java @@ -34,7 +34,6 @@ import org.junit.jupiter.api.Test; -import antlr.NoViableAltException; import com.puppycrawl.tools.checkstyle.api.CheckstyleException; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.FileText; @@ -61,9 +60,9 @@ public void testParseFileThrowable() throws Exception { fail("exception expected"); } catch (CheckstyleException ex) { - assertSame(NoViableAltException.class, ex.getCause().getClass(), "Invalid class"); - assertEquals(input.getAbsolutePath() + ":2:1: unexpected token: classD", - ex.getCause().toString(), "Invalid exception message"); + assertSame(IllegalStateException.class, ex.getCause().getClass(), "Invalid class"); + assertEquals("2:0: no viable alternative at input 'classD'", + ex.getCause().getMessage(), "Invalid exception message"); } } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/DetailAstImplTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/DetailAstImplTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/DetailAstImplTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/DetailAstImplTest.java @@ -25,6 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; @@ -43,11 +44,11 @@ import java.util.Set; import java.util.function.Consumer; +import org.antlr.v4.runtime.CommonToken; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import org.powermock.reflect.Whitebox; -import antlr.CommonHiddenStreamToken; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; import com.puppycrawl.tools.checkstyle.checks.TodoCommentCheck; @@ -97,7 +98,10 @@ public void testInitialize() { ast.setColumnNo(3); final DetailAstImpl copy = new DetailAstImpl(); - copy.initialize(ast); + copy.setText(ast.getText()); + copy.setType(ast.getType()); + copy.setLineNo(ast.getLineNo()); + copy.setColumnNo(ast.getColumnNo()); assertEquals("test", copy.getText(), "Invalid text"); assertEquals(1, copy.getType(), "Invalid type"); @@ -107,11 +111,10 @@ public void testInitialize() { @Test public void testInitializeToken() { - final CommonHiddenStreamToken token = new CommonHiddenStreamToken(); + final CommonToken token = new CommonToken(1); token.setText("test"); - token.setType(1); token.setLine(2); - token.setColumn(4); + token.setCharPositionInLine(3); final DetailAstImpl ast = new DetailAstImpl(); ast.initialize(token); @@ -144,7 +147,7 @@ public void testGetChildCount() throws Exception { assertEquals(0, firstLevelB.getChildCount(), "Invalid child count"); assertEquals(1, firstLevelA.getChildCount(), "Invalid child count"); assertEquals(2, root.getChildCount(), "Invalid child count"); - assertEquals(2, root.getChildCount(), "Invalid child count"); + assertEquals(2, root.getNumberOfChildren(), "Invalid child count"); assertNull(root.getPreviousSibling(), "Previous sibling should be null"); assertNull(firstLevelA.getPreviousSibling(), "Previous sibling should be null"); @@ -395,7 +398,7 @@ public void testAddNextSiblingNullParent() { assertEquals(oldParent, newSibling.getParent(), "Invalid parent"); assertNull(newSibling.getNextSibling(), "Invalid next sibling"); - assertEquals(newSibling, child.getNextSibling(), "Invalid child"); + assertSame(newSibling, child.getNextSibling(), "Invalid child"); } @Test diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/JavaAstVisitorTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/JavaAstVisitorTest.java new file mode 100644 --- /dev/null +++ b/src/test/java/com/puppycrawl/tools/checkstyle/JavaAstVisitorTest.java @@ -0,0 +1,192 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2021 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package com.puppycrawl.tools.checkstyle; + +import static com.google.common.truth.Truth.assertWithMessage; + +import java.io.File; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +import org.junit.jupiter.api.Test; + +import com.puppycrawl.tools.checkstyle.api.DetailAST; +import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.grammar.java.CheckstyleJavaParserBaseVisitor; + +public class JavaAstVisitorTest { + + /** + * If a visit method is not overridden, we should explain why we do not 'visit' the + * parse tree at this node and construct an AST. Reasons could include that we have + * no terminal symbols (tokens) in the corresponding production rule, or that + * we handle the construction of this particular AST in it's parent node. If we + * have a production rule where we have terminal symbols (tokens), but we do not build + * an AST from tokens in the rule context, the rule is extraneous. + */ + private static final List<String> VISIT_METHODS_NOT_OVERRIDDEN = Arrays.asList( + // no tokens in production rule, so no AST to build + "visitClassOrInterfaceOrPrimitiveType", + "visitNonWildcardTypeArgs", + "visitStat", + "visitAnnotationConstantRest", + "visitSwitchLabeledRule", + "visitLocalVariableDeclaration", + "visitTypes", + "visitSwitchStat", + "visitSwitchPrimary", + "visitClassDef", + "visitInterfaceMemberDeclaration", + "visitMemberDeclaration", + "visitLiteralPrimary", + "visitPatternDefinition", + "visitLocalType", + "visitLocalTypeDeclaration", + "visitRecordBodyDeclaration", + "visitResource", + "visitVariableInitializer", + "visitLambdaBody", + + // AST built in parent rule + "visitCreatedNameExtended", + "visitSuperSuffixSimple", + "visitFieldAccessNoIdent", + "visitClassType", + "visitClassOrInterfaceTypeExtended" + ); + + @Test + public void testAllVisitMethodsAreOverridden() { + final Method[] baseVisitMethods = CheckstyleJavaParserBaseVisitor + .class.getDeclaredMethods(); + final Method[] visitMethods = JavaAstVisitor.class.getDeclaredMethods(); + + final Set<String> filteredBaseVisitMethodNames = Arrays.stream(baseVisitMethods) + .filter(method -> !VISIT_METHODS_NOT_OVERRIDDEN.contains(method.getName())) + .filter(method -> method.getName().contains("visit")) + .filter(method -> method.getModifiers() == Modifier.PUBLIC) + .map(Method::getName) + .collect(Collectors.toSet()); + + final Set<String> filteredVisitMethodNames = Arrays.stream(visitMethods) + .filter(method -> method.getName().contains("visit")) + .filter(method -> method.getModifiers() == Modifier.PUBLIC) + .map(Method::getName) + .collect(Collectors.toSet()); + + // remove overridden 'visit' method from ParseTreeVisitor interface in JavaAstVisitor + filteredVisitMethodNames.removeIf(name -> name.matches("visit")); + + final String message = "Visit methods in 'CheckstyleJavaParserBaseVisitor' generated from " + + "production rules and labeled alternatives in 'CheckstyleJavaParser.g4' should " + + "be overridden in 'JavaAstVisitor' or be added to 'VISIT_METHODS_NOT_OVERRIDDEN' " + + "with comment explaining why."; + + assertWithMessage(message) + .that(filteredVisitMethodNames) + .containsExactlyElementsIn(filteredBaseVisitMethodNames); + } + + @Test + public void testOrderOfVisitMethodsAndProductionRules() throws Exception { + // Order of BaseVisitor's generated 'visit' methods match the order of + // production rules in 'CheckstyleJavaParser.g4'. + final String baseVisitorFilename = "target/generated-sources/antlr/com/puppycrawl" + + "/tools/checkstyle/grammar/java/CheckstyleJavaParserBaseVisitor.java"; + final DetailAST baseVisitorAst = JavaParser.parseFile(new File(baseVisitorFilename), + JavaParser.Options.WITHOUT_COMMENTS); + + final String visitorFilename = "src/main/java/com/puppycrawl/tools/checkstyle" + + "/JavaAstVisitor.java"; + final DetailAST visitorAst = JavaParser.parseFile(new File(visitorFilename), + JavaParser.Options.WITHOUT_COMMENTS); + + final List<String> orderedBaseVisitorMethodNames = + getOrderedVisitMethodNames(baseVisitorAst); + final List<String> orderedVisitorMethodNames = + getOrderedVisitMethodNames(visitorAst); + + orderedBaseVisitorMethodNames.removeAll(VISIT_METHODS_NOT_OVERRIDDEN); + + // remove overridden 'visit' method from ParseTreeVisitor interface in JavaAstVisitor + orderedVisitorMethodNames.removeIf(name -> name.matches("visit")); + + assertWithMessage("Visit methods in 'JavaAstVisitor' should appear in same order as " + + "production rules and labeled alternatives in 'CheckstyleJavaParser.g4'.") + .that(orderedVisitorMethodNames) + .containsExactlyElementsIn(orderedBaseVisitorMethodNames) + .inOrder(); + } + + /** + * Finds all {@code visit...} methods in a source file, and collects + * the method names into a list. This method counts on the simple structure + * of 'JavaAstVisitor' and 'CheckstyleJavaParserBaseVisitor'. + * + * @param root the root of the AST to extract method names from + * @return list of all {@code visit...} method names + */ + private static List<String> getOrderedVisitMethodNames(DetailAST root) { + final List<String> orderedVisitMethodNames = new ArrayList<>(); + + DetailAST classDef = root; + while (classDef.getType() != TokenTypes.CLASS_DEF) { + classDef = classDef.getNextSibling(); + } + + final DetailAST objBlock = classDef.findFirstToken(TokenTypes.OBJBLOCK); + DetailAST objBlockChild = objBlock.findFirstToken(TokenTypes.METHOD_DEF); + while (objBlockChild != null) { + if (isVisitMethod(objBlockChild)) { + orderedVisitMethodNames.add(objBlockChild + .findFirstToken(TokenTypes.IDENT) + .getText()); + } + objBlockChild = objBlockChild.getNextSibling(); + } + return orderedVisitMethodNames; + } + + /** + * Checks if given AST is a visit method. + * + * @param objBlockChild AST to check + * @return true if AST is a visit method + */ + private static boolean isVisitMethod(DetailAST objBlockChild) { + return objBlockChild.getType() == TokenTypes.METHOD_DEF + && objBlockChild.findFirstToken(TokenTypes.IDENT).getText().contains("visit"); + } + + @Test + public void testNullSelfInAddLastSibling() throws Exception { + final Method addLastSibling = JavaAstVisitor.class + .getDeclaredMethod("addLastSibling", DetailAstImpl.class, DetailAstImpl.class); + addLastSibling.setAccessible(true); + assertWithMessage("Method should not throw exception.") + .that(addLastSibling.invoke(JavaAstVisitor.class, null, null)) + .isNull(); + } +} diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/JavaParserTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/JavaParserTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/JavaParserTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/JavaParserTest.java @@ -19,6 +19,7 @@ package com.puppycrawl.tools.checkstyle; +import static com.google.common.truth.Truth.assertWithMessage; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -35,7 +36,6 @@ import org.junit.jupiter.api.Test; -import antlr.NoViableAltException; import com.puppycrawl.tools.checkstyle.api.CheckstyleException; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; @@ -156,11 +156,12 @@ public void testParseException() throws Exception { catch (CheckstyleException ex) { assertEquals( CheckstyleException.class.getName() - + ": NoViableAltException occurred while parsing file " + + ": IllegalStateException occurred while parsing file " + input.getAbsolutePath() + ".", ex.toString(), "Invalid exception message"); - assertSame(NoViableAltException.class, ex.getCause().getClass(), "Invalid class"); - assertEquals(input.getAbsolutePath() + ":2:1: unexpected token: classD", + assertSame(IllegalStateException.class, ex.getCause().getClass(), "Invalid class"); + assertEquals(IllegalStateException.class.getName() + + ": 2:0: no viable alternative at input 'classD'", ex.getCause().toString(), "Invalid exception message"); } } @@ -200,6 +201,15 @@ public void testJava14TextBlocks() throws Exception { assertEquals(expectedContents, content.getText(), "Unexpected text block content"); } + @Test + public void testNoStackOverflowOnDeepStringConcat() throws Exception { + final File file = + new File(getPath("InputJavaParserNoStackOverflowOnDeepStringConcat.java")); + assertWithMessage("File parsing should not throw StackOverflowError.") + .that(JavaParser.parseFile(file, JavaParser.Options.WITH_COMMENTS)) + .isNotNull(); + } + private static final class CountComments { private final List<String> lineComments = new ArrayList<>(); private final List<String> blockComments = new ArrayList<>(); @@ -221,5 +231,4 @@ else if (ast.getType() == TokenTypes.BLOCK_COMMENT_BEGIN) { } } } - } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGeneratorTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGeneratorTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGeneratorTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGeneratorTest.java @@ -39,7 +39,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import antlr.MismatchedTokenException; import com.puppycrawl.tools.checkstyle.api.CheckstyleException; import com.puppycrawl.tools.checkstyle.internal.utils.TestUtil; @@ -278,9 +277,9 @@ public void testParseError() throws Exception { assertTrue(ex.getMessage().contains("InputJavadocPropertiesGeneratorParseError.java"), "Invalid error message"); - final Throwable cause = ex.getCause().getCause(); - assertTrue(cause instanceof MismatchedTokenException, "Invalid error message"); - assertTrue(cause.getMessage().contains("expecting RCURLY, found '!'"), + final Throwable cause = ex.getCause(); + assertTrue(cause instanceof IllegalStateException, "Invalid error message"); + assertTrue(cause.getMessage().contains("9:0: mismatched input '!' expecting '}'"), "Invalid error message"); } } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java @@ -838,13 +838,41 @@ public void testFileReferenceDuringException(@SysErr Capturable systemErr) { invokeMain("-c", getPath("InputMainConfig-classname.xml"), getNonCompilablePath("InputMainIncorrectClass.java")); }); - final String exceptionFirstLine = addEndOfLine("com.puppycrawl.tools.checkstyle.api." + final String exceptionMessage = addEndOfLine("com.puppycrawl.tools.checkstyle.api." + "CheckstyleException: Exception was thrown while processing " + new File(getNonCompilablePath("InputMainIncorrectClass.java")).getPath()); - assertTrue(systemErr.getCapturedData().startsWith(exceptionFirstLine), + assertTrue(systemErr.getCapturedData().contains(exceptionMessage), "Unexpected system error log"); } + @Test + public void testRemoveLexerDefaultErrorListener(@SysErr Capturable systemErr) { + assertExitWithStatus(-2, () -> { + invokeMain("-t", getNonCompilablePath("InputMainIncorrectClass.java")); + }); + + assertWithMessage("First line of exception message should not contain lexer error.") + .that(systemErr.getCapturedData().startsWith("line 2:2 token recognition error")) + .isFalse(); + } + + @Test + public void testRemoveParserDefaultErrorListener(@SysErr Capturable systemErr) { + assertExitWithStatus(-2, () -> { + invokeMain("-t", getNonCompilablePath("InputMainIncorrectClass.java")); + }); + + final String capturedData = systemErr.getCapturedData(); + + assertWithMessage("First line of exception message should not contain parser error.") + .that(capturedData.startsWith("line 2:0 no viable alternative")) + .isFalse(); + assertWithMessage("Second line of exception message should not contain parser error.") + .that(capturedData.startsWith("line 2:0 no viable alternative", + capturedData.indexOf('\n') + 1)) + .isFalse(); + } + @Test public void testPrintTreeOnMoreThanOneFile(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinterTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinterTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinterTest.java @@ -29,7 +29,6 @@ import org.junit.jupiter.api.Test; -import antlr.NoViableAltException; import com.puppycrawl.tools.checkstyle.api.CheckstyleException; public class SuppressionsStringPrinterTest extends AbstractTreeTestSupport { @@ -119,8 +118,9 @@ public void testParseFileTextThrowable() throws Exception { fail("exception expected"); } catch (CheckstyleException ex) { - assertSame(NoViableAltException.class, ex.getCause().getClass(), "Invalid class"); - assertEquals(input.getAbsolutePath() + ":2:1: unexpected token: classD", + assertSame(IllegalStateException.class, ex.getCause().getClass(), "Invalid class"); + assertEquals(IllegalStateException.class.getName() + + ": 2:0: no viable alternative at input 'classD'", ex.getCause().toString(), "Invalid exception message"); } } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java @@ -229,7 +229,7 @@ public void testProcessNonJavaFiles() throws Exception { fail("Exception expected"); } catch (CheckstyleException ex) { - assertEquals("MismatchedTokenException occurred while parsing file input.java.", + assertEquals("IllegalStateException occurred while parsing file input.java.", ex.getMessage(), "Invalid exception message"); } } @@ -301,7 +301,7 @@ public void testProcessWithRecognitionException() throws Exception { } catch (CheckstyleException exception) { assertTrue(exception.getMessage().contains( - "TokenStreamRecognitionException occurred while parsing file"), + "IllegalStateException occurred while parsing file"), "Error message is unexpected"); } } @@ -353,8 +353,7 @@ public void testBehaviourWithOrdinaryAndCommentChecks() throws Exception { fail("file is not compilable, exception is expected"); } catch (CheckstyleException exception) { - final String message = - "TokenStreamRecognitionException occurred while parsing file"; + final String message = "IllegalStateException occurred while parsing file"; assertTrue(exception.getMessage().contains(message), "Error message is unexpected"); } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheckTest.java @@ -25,9 +25,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.fail; +import org.antlr.v4.runtime.CommonToken; import org.junit.jupiter.api.Test; -import antlr.CommonHiddenStreamToken; import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; import com.puppycrawl.tools.checkstyle.DetailAstImpl; @@ -116,7 +116,7 @@ public void testWrongArrayType() throws Exception { public void testIllegalStateException() { final UncommentedMainCheck check = new UncommentedMainCheck(); final DetailAstImpl ast = new DetailAstImpl(); - ast.initialize(new CommonHiddenStreamToken(TokenTypes.CTOR_DEF, "ctor")); + ast.initialize(new CommonToken(TokenTypes.CTOR_DEF, "ctor")); try { check.visitToken(ast); fail("IllegalStateException is expected"); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheckTest.java @@ -31,9 +31,9 @@ import java.util.Optional; import java.util.SortedSet; +import org.antlr.v4.runtime.CommonToken; import org.junit.jupiter.api.Test; -import antlr.CommonHiddenStreamToken; import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; import com.puppycrawl.tools.checkstyle.DetailAstImpl; @@ -207,7 +207,7 @@ public void testDefaultSwitch() { final RequireThisCheck check = new RequireThisCheck(); final DetailAstImpl ast = new DetailAstImpl(); - ast.initialize(new CommonHiddenStreamToken(TokenTypes.ENUM, "ENUM")); + ast.initialize(new CommonToken(TokenTypes.ENUM, "ENUM")); check.visitToken(ast); final SortedSet<Violation> violations = check.getViolations(); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheckTest.java @@ -26,9 +26,9 @@ import java.util.Arrays; import java.util.List; +import org.antlr.v4.runtime.CommonToken; import org.junit.jupiter.api.Test; -import antlr.CommonHiddenStreamToken; import com.google.common.collect.ImmutableMap; import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; @@ -120,7 +120,7 @@ public void testGetRequiredTokens() { public void testWrongTokenType() { final MutableExceptionCheck obj = new MutableExceptionCheck(); final DetailAstImpl ast = new DetailAstImpl(); - ast.initialize(new CommonHiddenStreamToken(TokenTypes.INTERFACE_DEF, "interface")); + ast.initialize(new CommonToken(TokenTypes.INTERFACE_DEF, "interface")); try { obj.visitToken(ast); assertWithMessage("IllegalStateException is expected") diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheckTest.java @@ -24,9 +24,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; +import org.antlr.v4.runtime.CommonToken; import org.junit.jupiter.api.Test; -import antlr.CommonHiddenStreamToken; import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; import com.puppycrawl.tools.checkstyle.DetailAstImpl; @@ -84,7 +84,7 @@ public void testGetRequiredTokens() { public void testWrongTokenType() { final ThrowsCountCheck obj = new ThrowsCountCheck(); final DetailAstImpl ast = new DetailAstImpl(); - ast.initialize(new CommonHiddenStreamToken(TokenTypes.CLASS_DEF, "class")); + ast.initialize(new CommonToken(TokenTypes.CLASS_DEF, "class")); try { obj.visitToken(ast); fail("IllegalStateException is expected"); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheckTest.java @@ -28,10 +28,10 @@ import java.io.File; import java.lang.reflect.Method; +import org.antlr.v4.runtime.CommonToken; import org.junit.jupiter.api.Test; import org.powermock.reflect.Whitebox; -import antlr.CommonHiddenStreamToken; import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; import com.puppycrawl.tools.checkstyle.DetailAstImpl; @@ -419,7 +419,7 @@ public void testPublicFinalFieldInEnum() throws Exception { public void testWrongTokenType() { final VisibilityModifierCheck obj = new VisibilityModifierCheck(); final DetailAstImpl ast = new DetailAstImpl(); - ast.initialize(new CommonHiddenStreamToken(TokenTypes.CLASS_DEF, "class")); + ast.initialize(new CommonToken(TokenTypes.CLASS_DEF, "class")); try { obj.visitToken(ast); fail("exception expected"); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckTest.java @@ -26,9 +26,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; +import org.antlr.v4.runtime.CommonToken; import org.junit.jupiter.api.Test; -import antlr.CommonHiddenStreamToken; import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; import com.puppycrawl.tools.checkstyle.DetailAstImpl; @@ -689,10 +689,10 @@ public void testMultiplePatternMatches() throws Exception { @Test public void testVisitTokenSwitchReflection() throws Exception { // Create mock ast - final DetailAstImpl astImport = mockAST(TokenTypes.IMPORT, "import", "mockfile", 0, 0); - final DetailAstImpl astIdent = mockAST(TokenTypes.IDENT, "myTestImport", "mockfile", 0, 0); + final DetailAstImpl astImport = mockAST(TokenTypes.IMPORT, "import", 0, 0); + final DetailAstImpl astIdent = mockAST(TokenTypes.IDENT, "myTestImport", 0, 0); astImport.addChild(astIdent); - final DetailAST astSemi = mockAST(TokenTypes.SEMI, ";", "mockfile", 0, 0); + final DetailAST astSemi = mockAST(TokenTypes.SEMI, ";", 0, 0); astIdent.addNextSibling(astSemi); // Set unsupported option @@ -714,19 +714,15 @@ public void testVisitTokenSwitchReflection() throws Exception { * * @param tokenType type of token * @param tokenText text of token - * @param tokenFileName file name of token * @param tokenRow token position in a file (row) * @param tokenColumn token position in a file (column) * @return AST node for the token */ private static DetailAstImpl mockAST(final int tokenType, final String tokenText, - final String tokenFileName, final int tokenRow, final int tokenColumn) { - final CommonHiddenStreamToken tokenImportSemi = new CommonHiddenStreamToken(); - tokenImportSemi.setType(tokenType); - tokenImportSemi.setText(tokenText); + final int tokenRow, final int tokenColumn) { + final CommonToken tokenImportSemi = new CommonToken(tokenType, tokenText); tokenImportSemi.setLine(tokenRow); - tokenImportSemi.setColumn(tokenColumn); - tokenImportSemi.setFilename(tokenFileName); + tokenImportSemi.setCharPositionInLine(tokenColumn); final DetailAstImpl astSemi = new DetailAstImpl(); astSemi.initialize(tokenImportSemi); return astSemi; diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheckTest.java @@ -23,9 +23,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; +import org.antlr.v4.runtime.CommonToken; import org.junit.jupiter.api.Test; -import antlr.CommonHiddenStreamToken; import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; import com.puppycrawl.tools.checkstyle.DetailAstImpl; @@ -82,7 +82,7 @@ public void testWrongToken() { final BooleanExpressionComplexityCheck booleanExpressionComplexityCheckObj = new BooleanExpressionComplexityCheck(); final DetailAstImpl ast = new DetailAstImpl(); - ast.initialize(new CommonHiddenStreamToken(TokenTypes.INTERFACE_DEF, "interface")); + ast.initialize(new CommonToken(TokenTypes.INTERFACE_DEF, "interface")); try { booleanExpressionComplexityCheckObj.visitToken(ast); fail("exception expected"); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckTest.java @@ -25,9 +25,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.fail; +import org.antlr.v4.runtime.CommonToken; import org.junit.jupiter.api.Test; -import antlr.CommonHiddenStreamToken; import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; import com.puppycrawl.tools.checkstyle.DetailAstImpl; @@ -172,7 +172,7 @@ public void testWrongToken() { final ClassDataAbstractionCouplingCheck classDataAbstractionCouplingCheckObj = new ClassDataAbstractionCouplingCheck(); final DetailAstImpl ast = new DetailAstImpl(); - ast.initialize(new CommonHiddenStreamToken(TokenTypes.CTOR_DEF, "ctor")); + ast.initialize(new CommonToken(TokenTypes.CTOR_DEF, "ctor")); try { classDataAbstractionCouplingCheckObj.visitToken(ast); fail("exception expected"); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckTest.java @@ -30,9 +30,9 @@ import java.util.Optional; import java.util.SortedSet; +import org.antlr.v4.runtime.CommonToken; import org.junit.jupiter.api.Test; -import antlr.CommonHiddenStreamToken; import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; import com.puppycrawl.tools.checkstyle.DetailAstImpl; @@ -300,7 +300,7 @@ public void testGetRequiredTokens() { public void testDefaultHooks() { final NPathComplexityCheck npathComplexityCheckObj = new NPathComplexityCheck(); final DetailAstImpl ast = new DetailAstImpl(); - ast.initialize(new CommonHiddenStreamToken(TokenTypes.INTERFACE_DEF, "interface")); + ast.initialize(new CommonToken(TokenTypes.INTERFACE_DEF, "interface")); npathComplexityCheckObj.visitToken(ast); final SortedSet<Violation> violations1 = npathComplexityCheckObj.getViolations(); @@ -342,18 +342,18 @@ public void testTokenEndIsAfterSameLineColumn() throws Exception { @Test public void testVisitTokenBeforeExpressionRange() { // Create first ast - final DetailAstImpl astIf = mockAST(TokenTypes.LITERAL_IF, "if", "mockfile", 2, 2); - final DetailAstImpl astIfLeftParen = mockAST(TokenTypes.LPAREN, "(", "mockfile", 3, 3); + final DetailAstImpl astIf = mockAST(TokenTypes.LITERAL_IF, "if", 2, 2); + final DetailAstImpl astIfLeftParen = mockAST(TokenTypes.LPAREN, "(", 3, 3); astIf.addChild(astIfLeftParen); final DetailAstImpl astIfTrue = - mockAST(TokenTypes.LITERAL_TRUE, "true", "mockfile", 3, 3); + mockAST(TokenTypes.LITERAL_TRUE, "true", 3, 3); astIf.addChild(astIfTrue); - final DetailAstImpl astIfRightParen = mockAST(TokenTypes.RPAREN, ")", "mockfile", 4, 4); + final DetailAstImpl astIfRightParen = mockAST(TokenTypes.RPAREN, ")", 4, 4); astIf.addChild(astIfRightParen); // Create ternary ast - final DetailAstImpl astTernary = mockAST(TokenTypes.QUESTION, "?", "mockfile", 1, 1); + final DetailAstImpl astTernary = mockAST(TokenTypes.QUESTION, "?", 1, 1); final DetailAstImpl astTernaryTrue = - mockAST(TokenTypes.LITERAL_TRUE, "true", "mockfile", 1, 2); + mockAST(TokenTypes.LITERAL_TRUE, "true", 1, 2); astTernary.addChild(astTernaryTrue); final NPathComplexityCheck npathComplexityCheckObj = new NPathComplexityCheck(); @@ -376,19 +376,15 @@ public void testVisitTokenBeforeExpressionRange() { * * @param tokenType type of token * @param tokenText text of token - * @param tokenFileName file name of token * @param tokenRow token position in a file (row) * @param tokenColumn token position in a file (column) * @return AST node for the token */ private static DetailAstImpl mockAST(final int tokenType, final String tokenText, - final String tokenFileName, final int tokenRow, final int tokenColumn) { - final CommonHiddenStreamToken tokenImportSemi = new CommonHiddenStreamToken(); - tokenImportSemi.setType(tokenType); - tokenImportSemi.setText(tokenText); + final int tokenRow, final int tokenColumn) { + final CommonToken tokenImportSemi = new CommonToken(tokenType, tokenText); tokenImportSemi.setLine(tokenRow); - tokenImportSemi.setColumn(tokenColumn); - tokenImportSemi.setFilename(tokenFileName); + tokenImportSemi.setCharPositionInLine(tokenColumn); final DetailAstImpl astSemi = new DetailAstImpl(); astSemi.initialize(tokenImportSemi); return astSemi; diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java @@ -26,9 +26,9 @@ import java.util.Collection; +import org.antlr.v4.runtime.CommonToken; import org.junit.jupiter.api.Test; -import antlr.CommonHiddenStreamToken; import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; import com.puppycrawl.tools.checkstyle.DetailAstImpl; @@ -153,7 +153,7 @@ public void testVisitTokenWithWrongTokenType() { new ExecutableStatementCountCheck(); final DetailAstImpl ast = new DetailAstImpl(); ast.initialize( - new CommonHiddenStreamToken(TokenTypes.ENUM, "ENUM")); + new CommonToken(TokenTypes.ENUM, "ENUM")); try { checkObj.visitToken(ast); fail("exception expected"); @@ -169,7 +169,7 @@ public void testLeaveTokenWithWrongTokenType() { new ExecutableStatementCountCheck(); final DetailAstImpl ast = new DetailAstImpl(); ast.initialize( - new CommonHiddenStreamToken(TokenTypes.ENUM, "ENUM")); + new CommonToken(TokenTypes.ENUM, "ENUM")); try { checkObj.leaveToken(ast); fail("exception expected"); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java @@ -27,9 +27,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; +import org.antlr.v4.runtime.CommonToken; import org.junit.jupiter.api.Test; -import antlr.CommonHiddenStreamToken; import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; import com.puppycrawl.tools.checkstyle.DetailAstImpl; @@ -168,7 +168,7 @@ public void testGetAcceptableTokens() { public void testWrongTokenType() { final GenericWhitespaceCheck genericWhitespaceCheckObj = new GenericWhitespaceCheck(); final DetailAstImpl ast = new DetailAstImpl(); - ast.initialize(new CommonHiddenStreamToken(TokenTypes.INTERFACE_DEF, "interface")); + ast.initialize(new CommonToken(TokenTypes.INTERFACE_DEF, "interface")); try { genericWhitespaceCheckObj.visitToken(ast); fail("exception expected"); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java @@ -23,9 +23,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; +import org.antlr.v4.runtime.CommonToken; import org.junit.jupiter.api.Test; -import antlr.CommonHiddenStreamToken; import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; import com.puppycrawl.tools.checkstyle.DetailAstImpl; @@ -231,10 +231,9 @@ public void testArrayDeclarator() throws Exception { @Test public void testVisitTokenSwitchReflection() { // unexpected parent for ARRAY_DECLARATOR token - final DetailAstImpl astImport = mockAST(TokenTypes.IMPORT, "import", "mockfile"); - final DetailAstImpl astArrayDeclarator = mockAST(TokenTypes.ARRAY_DECLARATOR, "[", - "mockfile"); - final DetailAstImpl astRightBracket = mockAST(TokenTypes.RBRACK, "[", "mockfile"); + final DetailAstImpl astImport = mockAST(TokenTypes.IMPORT, "import"); + final DetailAstImpl astArrayDeclarator = mockAST(TokenTypes.ARRAY_DECLARATOR, "["); + final DetailAstImpl astRightBracket = mockAST(TokenTypes.RBRACK, "["); astImport.addChild(astArrayDeclarator); astArrayDeclarator.addChild(astRightBracket); @@ -364,17 +363,11 @@ public void testArrayNewGenericTypeArgument() throws Exception { * * @param tokenType type of token * @param tokenText text of token - * @param tokenFileName file name of token * @return AST node for the token */ - private static DetailAstImpl mockAST(final int tokenType, final String tokenText, - final String tokenFileName) { - final CommonHiddenStreamToken tokenImportSemi = new CommonHiddenStreamToken(); - tokenImportSemi.setType(tokenType); - tokenImportSemi.setText(tokenText); - tokenImportSemi.setFilename(tokenFileName); + private static DetailAstImpl mockAST(final int tokenType, final String tokenText) { final DetailAstImpl astSemi = new DetailAstImpl(); - astSemi.initialize(tokenImportSemi); + astSemi.initialize(new CommonToken(tokenType, tokenText)); return astSemi; } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java @@ -196,4 +196,12 @@ public void test1322879() throws Exception { expected); } + @Test + public void testCountUnicodeCorrectly() throws Exception { + final DefaultConfiguration checkConfig = createModuleConfig(WhitespaceAfterCheck.class); + final String[] expected = { + "9:20: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ";"), + }; + verify(checkConfig, getPath("InputWhitespaceAfterCountUnicodeCorrectly.java"), expected); + } } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/AstRegressionTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/AstRegressionTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/AstRegressionTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/AstRegressionTest.java @@ -20,25 +20,13 @@ package com.puppycrawl.tools.checkstyle.grammar; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; -import java.io.InputStream; -import java.io.Reader; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.nio.charset.StandardCharsets; import java.util.Arrays; import org.junit.jupiter.api.Test; -import antlr.NoViableAltForCharException; -import antlr.ParserSharedInputState; -import antlr.SemanticException; -import antlr.TokenBuffer; import com.puppycrawl.tools.checkstyle.AbstractTreeTestSupport; import com.puppycrawl.tools.checkstyle.AstTreeStringPrinter; import com.puppycrawl.tools.checkstyle.JavaParser; @@ -147,43 +135,6 @@ public void testCharLiteralSurrogatePair() throws Exception { getPath("InputCharLiteralSurrogatePair.java")); } - @Test - public void testUnusedConstructors1() throws Exception { - final Class<?> clss = GeneratedJavaLexer.class; - final Constructor<?> constructor = clss.getDeclaredConstructor(InputStream.class); - - assertNotNull(constructor.newInstance(new Object[] {null}), - "InputStream should not be null"); - } - - @Test - public void testUnusedConstructors2() throws Exception { - final Class<?> clss = GeneratedJavaRecognizer.class; - final Constructor<?> constructor = clss - .getDeclaredConstructor(ParserSharedInputState.class); - - assertNotNull(constructor.newInstance(new Object[] {null}), - "ParserSharedInputState should not be null"); - } - - @Test - public void testUnusedConstructors3() throws Exception { - final Class<?> clss = GeneratedJavaRecognizer.class; - final Constructor<?> constructor = clss.getDeclaredConstructor(TokenBuffer.class); - - assertNotNull(constructor.newInstance(new Object[] {null}), - "TokenBuffer should not be null"); - } - - @Test - public void testUnusedConstructors4() throws Exception { - final Class<?> clss = GeneratedTextBlockLexer.class; - final Constructor<?> constructor = clss.getDeclaredConstructor(Reader.class); - - assertNotNull(constructor.newInstance(new Object[] {null}), - "Reader should not be null"); - } - @Test public void testCustomAstTree() throws Exception { verifyAstRaw(getPath("InputRegressionEmptyAst.txt"), "\t"); @@ -303,79 +254,6 @@ public void testInputManyAlternativesInMultiCatch() throws Exception { getPath("InputAstRegressionManyAlternativesInMultiCatch.java")); } - @Test - public void testImpossibleExceptions() throws Exception { - AssertGeneratedJavaLexer.verifyFail("mSTD_ESC", 'a'); - AssertGeneratedJavaLexer.verifyFail("mSTD_ESC", '0', (char) 0xFFFF); - AssertGeneratedJavaLexer.verifyFail("mSTD_ESC", '4', (char) 0xFFFF); - AssertGeneratedJavaLexer.verifyFail("mCHAR_LITERAL", '\'', '\''); - AssertGeneratedJavaLexer.verifyFail("mHEX_DIGIT", ';'); - AssertGeneratedJavaLexer.verifyFail("mEXPONENT", ';'); - AssertGeneratedJavaLexer.verifyFail("mBINARY_DIGIT", '2'); - AssertGeneratedJavaLexer.verifyFail("mSIGNED_INTEGER", 'a'); - AssertGeneratedJavaLexer.verifyFail("mID_START", '%'); - AssertGeneratedJavaLexer.verifyFail("mID_START", (char) 0xBF); - AssertGeneratedJavaLexer.verifyFailNoGuessing("mID_START", (char) 0xBF); - AssertGeneratedJavaLexer.verifyFail("mID_PART", '%'); - AssertGeneratedJavaLexer.verifyFail("mID_PART", (char) 0xBF); - AssertGeneratedJavaLexer.verifyFailNoGuessing("mID_PART", (char) 0xBF); - AssertGeneratedJavaLexer.verifyFail("mESC", '\\', 'a'); - AssertGeneratedJavaLexer.verifyFail("mLONG_LITERAL", '0', ';'); - AssertGeneratedJavaLexer.verifyFail("mLONG_LITERAL", '1', ';'); - AssertGeneratedJavaLexer.verifyFail("mLONG_LITERAL", ';'); - AssertGeneratedJavaLexer.verifyFail("mINT_LITERAL", ';'); - AssertGeneratedJavaLexer.verifyFail("mHEX_DOUBLE_LITERAL", '0', 'a'); - AssertGeneratedJavaLexer.verifyFail("mHEX_FLOAT_LITERAL", '0', 'a'); - } - - @Test - public void testImpossibleValid() throws Exception { - AssertGeneratedJavaLexer.verifyPass("mSTD_ESC", 'n'); - AssertGeneratedJavaLexer.verifyPass("mELLIPSIS", '.', '.', '.'); - AssertGeneratedJavaLexer.verifyPass("mDOT", '.'); - AssertGeneratedJavaLexer.verifyPass("mBINARY_EXPONENT", 'p', '0', ';'); - AssertGeneratedJavaLexer.verifyPass("mHEX_DIGIT", '0'); - AssertGeneratedJavaLexer.verifyPass("mEXPONENT", 'e', '0', ';'); - AssertGeneratedJavaLexer.verifyPass("mBINARY_DIGIT", '0'); - AssertGeneratedJavaLexer.verifyPass("mSIGNED_INTEGER", '0', ';'); - AssertGeneratedJavaLexer.verifyPass("mWS", ' ', ';'); - AssertGeneratedJavaLexer.verifyPass("mID_START", '$'); - AssertGeneratedJavaLexer.verifyPass("mID_PART", '$'); - AssertGeneratedJavaLexer.verifyPass("mESC", '\\', '\\'); - AssertGeneratedJavaLexer.verifyPass("mLONG_LITERAL", '1', 'L'); - AssertGeneratedJavaLexer.verifyPass("mINT_LITERAL", '0', ';'); - AssertGeneratedJavaLexer.verifyPass("mFLOAT_LITERAL", '0', 'f'); - AssertGeneratedJavaLexer.verifyPass("mDOUBLE_LITERAL", '0', 'd'); - AssertGeneratedJavaLexer.verifyPass("mHEX_FLOAT_LITERAL", '0', 'x', '2', '_', '4', '.', - '4', '4', '.', '4', 'P', '4', ';'); - AssertGeneratedJavaLexer.verifyPass("mHEX_DOUBLE_LITERAL", '0', 'x', '2', '_', '4', '.', - '4', '4', '.', '4', 'P', '4', 'D', ';'); - } - - @Test - public void testImpossibleExceptionsTextBlockLexer() throws Exception { - AssertGenTextBlockLexer.verifyFail("mSTD_ESC", '\\', '*', (char) 0xFFFF); - AssertGenTextBlockLexer.verifyFail("mONE_DOUBLE_QUOTE", '"', '"'); - AssertGenTextBlockLexer.verifyFail("mNEWLINE", '*'); - AssertGenTextBlockLexer.verifyFail("mTEXT_BLOCK_CONTENT", (char) 0xFFFF); - } - - @Test - public void testImpossibleValidTextBlockLexer() throws Exception { - AssertGenTextBlockLexer.verifyPass("mSTD_ESC", '\\', '\\', 'n'); - AssertGenTextBlockLexer.verifyPass("mNEWLINE", '\r', '\n'); - AssertGenTextBlockLexer.verifyPass("mNEWLINE", '\r', '1'); - AssertGenTextBlockLexer.verifyPass("mTEXT_BLOCK_CONTENT", '\\', (char) 0xFFFF); - AssertGenTextBlockLexer.verifyPass("mTEXT_BLOCK_CONTENT", '\r', (char) 0xFFFF); - AssertGenTextBlockLexer.verifyPass("mONE_DOUBLE_QUOTE", '"', 'a'); - AssertGenTextBlockLexer.verifyPass("mTWO_DOUBLE_QUOTES", '"', '"', 'a'); - AssertGenTextBlockLexer.verifyPass("mONE_DOUBLE_QUOTE", '"', '\r', '\r'); - AssertGenTextBlockLexer - .verifyPass("mTWO_DOUBLE_QUOTES", '"', '"', '\r', '\r'); - AssertGenTextBlockLexer - .verifyPass("mTEXT_BLOCK_LITERAL_END", '"', '"', '"', (char) 0xFFFF); - } - private static void verifyAstRaw(String expectedTextPrintFileName, String actualJava) throws Exception { verifyAstRaw(expectedTextPrintFileName, actualJava, JavaParser.Options.WITHOUT_COMMENTS); @@ -396,156 +274,4 @@ private static void verifyAstRaw(String expectedTextPrintFileName, String actual assertEquals(expectedContents, actualContents, "Generated AST from Java code should match pre-defined AST"); } - - private static final class AssertGenTextBlockLexer - extends GeneratedTextBlockLexer { - - private int laPosition; - private char[] laResults; - - private AssertGenTextBlockLexer() { - super((InputStream) null); - } - - public static void verifyPass(String methodName, char... laResults) throws Exception { - verify(methodName, true, 1, laResults); - } - - public static void verifyFail(String methodName, char... laResults) throws Exception { - verify(methodName, false, 1, laResults); - } - - private static void verify(String methodName, boolean expectPass, int guessing, - char... laResults) throws Exception { - final AssertGenTextBlockLexer instance = - new AssertGenTextBlockLexer(); - instance.laPosition = 0; - instance.laResults = laResults.clone(); - instance.inputState.guessing = guessing; - - final Method method = GeneratedTextBlockLexer.class.getDeclaredMethod(methodName, - boolean.class); - boolean exception; - - try { - method.invoke(instance, true); - exception = false; - } - catch (InvocationTargetException ex) { - if (expectPass) { - throw ex; - } - - final Class<?> clss = ex.getTargetException().getClass(); - if (clss != NoViableAltForCharException.class - && clss != SemanticException.class) { - throw ex; - } - exception = true; - } - - if (expectPass) { - assertFalse(exception, "Call to GeneratedTextBlockLexer." + methodName - + " resulted in an exception"); - } - else { - assertTrue(exception, "Call to GeneratedTextBlockLexer." + methodName - + " did not result in an exception"); - } - } - - @Override - public char LA(int i) { - return laResults[laPosition + i - 1]; - } - - @Override - public void consume() { - laPosition++; - } - - @Override - public int mark() { - return 1; - } - - } - - private static final class AssertGeneratedJavaLexer extends GeneratedJavaLexer { - - private int laPosition; - private char[] laResults; - - private AssertGeneratedJavaLexer() { - super((InputStream) null); - } - - public static void verifyFailNoGuessing(String methodName, char... laResults) - throws Exception { - verify(methodName, false, 0, laResults); - } - - public static void verifyPass(String methodName, char... laResults) throws Exception { - verify(methodName, true, 1, laResults); - } - - public static void verifyFail(String methodName, char... laResults) throws Exception { - verify(methodName, false, 1, laResults); - } - - private static void verify(String methodName, boolean expectPass, int guessing, - char... laResults) throws Exception { - final AssertGeneratedJavaLexer instance = new AssertGeneratedJavaLexer(); - instance.laPosition = 0; - instance.laResults = laResults.clone(); - instance.inputState.guessing = guessing; - - final Method method = GeneratedJavaLexer.class.getDeclaredMethod(methodName, - boolean.class); - boolean exception; - - try { - method.invoke(instance, true); - exception = false; - } - catch (InvocationTargetException ex) { - if (expectPass) { - throw ex; - } - - final Class<?> clss = ex.getTargetException().getClass(); - if (clss != NoViableAltForCharException.class - && clss != SemanticException.class) { - throw ex; - } - exception = true; - } - - if (expectPass) { - assertFalse(exception, "Call to GeneratedJavaLexer." + methodName - + " resulted in an exception"); - } - else { - assertTrue(exception, "Call to GeneratedJavaLexer." + methodName - + " did not result in an exception"); - } - } - - @Override - public char LA(int i) { - return laResults[laPosition + i - 1]; - } - - @Override - public void consume() { - laPosition++; - } - - @Override - public int mark() { - return 1; - } - - } - } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/GeneratedJavaTokenTypesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/GeneratedJavaTokenTypesTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/GeneratedJavaTokenTypesTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/GeneratedJavaTokenTypesTest.java @@ -21,8 +21,15 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.Arrays; + +import org.antlr.v4.runtime.Recognizer; import org.junit.jupiter.api.Test; +import com.puppycrawl.tools.checkstyle.grammar.java.JavaLexer; + /** * GeneratedJavaTokenTypesTest. * @@ -40,7 +47,7 @@ public class GeneratedJavaTokenTypesTest { * <p> * The reason behind this is Java inlines static final field values directly * into the compiled Java code. This loses all connections with the original - * class, GeneratedJavaTokenTypes, and so numbering updates are not picked + * class, JavaLexer, and so numbering updates are not picked * up in user-created checks and causes conflicts. * </p> * @@ -57,223 +64,241 @@ public void testTokenNumbering() { + "See Issue: https://github.com/checkstyle/checkstyle/issues/505"; // Read JavaDoc before changing - assertEquals(1, GeneratedJavaTokenTypes.EOF, message); - assertEquals(3, GeneratedJavaTokenTypes.NULL_TREE_LOOKAHEAD, message); - assertEquals(4, GeneratedJavaTokenTypes.BLOCK, message); - assertEquals(5, GeneratedJavaTokenTypes.MODIFIERS, message); - assertEquals(6, GeneratedJavaTokenTypes.OBJBLOCK, message); - assertEquals(7, GeneratedJavaTokenTypes.SLIST, message); - assertEquals(8, GeneratedJavaTokenTypes.CTOR_DEF, message); - assertEquals(9, GeneratedJavaTokenTypes.METHOD_DEF, message); - assertEquals(10, GeneratedJavaTokenTypes.VARIABLE_DEF, message); - assertEquals(11, GeneratedJavaTokenTypes.INSTANCE_INIT, message); - assertEquals(12, GeneratedJavaTokenTypes.STATIC_INIT, message); - assertEquals(13, GeneratedJavaTokenTypes.TYPE, message); - assertEquals(14, GeneratedJavaTokenTypes.CLASS_DEF, message); - assertEquals(15, GeneratedJavaTokenTypes.INTERFACE_DEF, message); - assertEquals(16, GeneratedJavaTokenTypes.PACKAGE_DEF, message); - assertEquals(17, GeneratedJavaTokenTypes.ARRAY_DECLARATOR, message); - assertEquals(18, GeneratedJavaTokenTypes.EXTENDS_CLAUSE, message); - assertEquals(19, GeneratedJavaTokenTypes.IMPLEMENTS_CLAUSE, message); - assertEquals(20, GeneratedJavaTokenTypes.PARAMETERS, message); - assertEquals(21, GeneratedJavaTokenTypes.PARAMETER_DEF, message); - assertEquals(22, GeneratedJavaTokenTypes.LABELED_STAT, message); - assertEquals(23, GeneratedJavaTokenTypes.TYPECAST, message); - assertEquals(24, GeneratedJavaTokenTypes.INDEX_OP, message); - assertEquals(25, GeneratedJavaTokenTypes.POST_INC, message); - assertEquals(26, GeneratedJavaTokenTypes.POST_DEC, message); - assertEquals(27, GeneratedJavaTokenTypes.METHOD_CALL, message); - assertEquals(28, GeneratedJavaTokenTypes.EXPR, message); - assertEquals(29, GeneratedJavaTokenTypes.ARRAY_INIT, message); - assertEquals(30, GeneratedJavaTokenTypes.IMPORT, message); - assertEquals(31, GeneratedJavaTokenTypes.UNARY_MINUS, message); - assertEquals(32, GeneratedJavaTokenTypes.UNARY_PLUS, message); - assertEquals(33, GeneratedJavaTokenTypes.CASE_GROUP, message); - assertEquals(34, GeneratedJavaTokenTypes.ELIST, message); - assertEquals(35, GeneratedJavaTokenTypes.FOR_INIT, message); - assertEquals(36, GeneratedJavaTokenTypes.FOR_CONDITION, message); - assertEquals(37, GeneratedJavaTokenTypes.FOR_ITERATOR, message); - assertEquals(38, GeneratedJavaTokenTypes.EMPTY_STAT, message); - assertEquals(39, GeneratedJavaTokenTypes.FINAL, message); - assertEquals(40, GeneratedJavaTokenTypes.ABSTRACT, message); - assertEquals(41, GeneratedJavaTokenTypes.STRICTFP, message); - assertEquals(42, GeneratedJavaTokenTypes.SUPER_CTOR_CALL, message); - assertEquals(43, GeneratedJavaTokenTypes.CTOR_CALL, message); - assertEquals(44, GeneratedJavaTokenTypes.LITERAL_package, message); - assertEquals(45, GeneratedJavaTokenTypes.SEMI, message); - assertEquals(46, GeneratedJavaTokenTypes.LITERAL_import, message); - assertEquals(47, GeneratedJavaTokenTypes.LBRACK, message); - assertEquals(48, GeneratedJavaTokenTypes.RBRACK, message); - assertEquals(49, GeneratedJavaTokenTypes.LITERAL_void, message); - assertEquals(50, GeneratedJavaTokenTypes.LITERAL_boolean, message); - assertEquals(51, GeneratedJavaTokenTypes.LITERAL_byte, message); - assertEquals(52, GeneratedJavaTokenTypes.LITERAL_char, message); - assertEquals(53, GeneratedJavaTokenTypes.LITERAL_short, message); - assertEquals(54, GeneratedJavaTokenTypes.LITERAL_int, message); - assertEquals(55, GeneratedJavaTokenTypes.LITERAL_float, message); - assertEquals(56, GeneratedJavaTokenTypes.LITERAL_long, message); - assertEquals(57, GeneratedJavaTokenTypes.LITERAL_double, message); - assertEquals(58, GeneratedJavaTokenTypes.IDENT, message); - assertEquals(59, GeneratedJavaTokenTypes.DOT, message); - assertEquals(60, GeneratedJavaTokenTypes.STAR, message); - assertEquals(61, GeneratedJavaTokenTypes.LITERAL_private, message); - assertEquals(62, GeneratedJavaTokenTypes.LITERAL_public, message); - assertEquals(63, GeneratedJavaTokenTypes.LITERAL_protected, message); - assertEquals(64, GeneratedJavaTokenTypes.LITERAL_static, message); - assertEquals(65, GeneratedJavaTokenTypes.LITERAL_transient, message); - assertEquals(66, GeneratedJavaTokenTypes.LITERAL_native, message); - assertEquals(67, GeneratedJavaTokenTypes.LITERAL_synchronized, message); - assertEquals(68, GeneratedJavaTokenTypes.LITERAL_volatile, message); - assertEquals(69, GeneratedJavaTokenTypes.LITERAL_class, message); - assertEquals(70, GeneratedJavaTokenTypes.LITERAL_extends, message); - assertEquals(71, GeneratedJavaTokenTypes.LITERAL_interface, message); - assertEquals(72, GeneratedJavaTokenTypes.LCURLY, message); - assertEquals(73, GeneratedJavaTokenTypes.RCURLY, message); - assertEquals(74, GeneratedJavaTokenTypes.COMMA, message); - assertEquals(75, GeneratedJavaTokenTypes.LITERAL_implements, message); - assertEquals(76, GeneratedJavaTokenTypes.LPAREN, message); - assertEquals(77, GeneratedJavaTokenTypes.RPAREN, message); - assertEquals(78, GeneratedJavaTokenTypes.LITERAL_this, message); - assertEquals(79, GeneratedJavaTokenTypes.LITERAL_super, message); - assertEquals(80, GeneratedJavaTokenTypes.ASSIGN, message); - assertEquals(81, GeneratedJavaTokenTypes.LITERAL_throws, message); - assertEquals(82, GeneratedJavaTokenTypes.COLON, message); - assertEquals(83, GeneratedJavaTokenTypes.LITERAL_if, message); - assertEquals(84, GeneratedJavaTokenTypes.LITERAL_while, message); - assertEquals(85, GeneratedJavaTokenTypes.LITERAL_do, message); - assertEquals(86, GeneratedJavaTokenTypes.LITERAL_break, message); - assertEquals(87, GeneratedJavaTokenTypes.LITERAL_continue, message); - assertEquals(88, GeneratedJavaTokenTypes.LITERAL_return, message); - assertEquals(89, GeneratedJavaTokenTypes.LITERAL_switch, message); - assertEquals(90, GeneratedJavaTokenTypes.LITERAL_throw, message); - assertEquals(91, GeneratedJavaTokenTypes.LITERAL_for, message); - assertEquals(92, GeneratedJavaTokenTypes.LITERAL_else, message); - assertEquals(93, GeneratedJavaTokenTypes.LITERAL_case, message); - assertEquals(94, GeneratedJavaTokenTypes.LITERAL_default, message); - assertEquals(95, GeneratedJavaTokenTypes.LITERAL_try, message); - assertEquals(96, GeneratedJavaTokenTypes.LITERAL_catch, message); - assertEquals(97, GeneratedJavaTokenTypes.LITERAL_finally, message); - assertEquals(98, GeneratedJavaTokenTypes.PLUS_ASSIGN, message); - assertEquals(99, GeneratedJavaTokenTypes.MINUS_ASSIGN, message); - assertEquals(100, GeneratedJavaTokenTypes.STAR_ASSIGN, message); - assertEquals(101, GeneratedJavaTokenTypes.DIV_ASSIGN, message); - assertEquals(102, GeneratedJavaTokenTypes.MOD_ASSIGN, message); - assertEquals(103, GeneratedJavaTokenTypes.SR_ASSIGN, message); - assertEquals(104, GeneratedJavaTokenTypes.BSR_ASSIGN, message); - assertEquals(105, GeneratedJavaTokenTypes.SL_ASSIGN, message); - assertEquals(106, GeneratedJavaTokenTypes.BAND_ASSIGN, message); - assertEquals(107, GeneratedJavaTokenTypes.BXOR_ASSIGN, message); - assertEquals(108, GeneratedJavaTokenTypes.BOR_ASSIGN, message); - assertEquals(109, GeneratedJavaTokenTypes.QUESTION, message); - assertEquals(110, GeneratedJavaTokenTypes.LOR, message); - assertEquals(111, GeneratedJavaTokenTypes.LAND, message); - assertEquals(112, GeneratedJavaTokenTypes.BOR, message); - assertEquals(113, GeneratedJavaTokenTypes.BXOR, message); - assertEquals(114, GeneratedJavaTokenTypes.BAND, message); - assertEquals(115, GeneratedJavaTokenTypes.NOT_EQUAL, message); - assertEquals(116, GeneratedJavaTokenTypes.EQUAL, message); - assertEquals(117, GeneratedJavaTokenTypes.LT, message); - assertEquals(118, GeneratedJavaTokenTypes.GT, message); - assertEquals(119, GeneratedJavaTokenTypes.LE, message); - assertEquals(120, GeneratedJavaTokenTypes.GE, message); - assertEquals(121, GeneratedJavaTokenTypes.LITERAL_instanceof, message); - assertEquals(122, GeneratedJavaTokenTypes.SL, message); - assertEquals(123, GeneratedJavaTokenTypes.SR, message); - assertEquals(124, GeneratedJavaTokenTypes.BSR, message); - assertEquals(125, GeneratedJavaTokenTypes.PLUS, message); - assertEquals(126, GeneratedJavaTokenTypes.MINUS, message); - assertEquals(127, GeneratedJavaTokenTypes.DIV, message); - assertEquals(128, GeneratedJavaTokenTypes.MOD, message); - assertEquals(129, GeneratedJavaTokenTypes.INC, message); - assertEquals(130, GeneratedJavaTokenTypes.DEC, message); - assertEquals(131, GeneratedJavaTokenTypes.BNOT, message); - assertEquals(132, GeneratedJavaTokenTypes.LNOT, message); - assertEquals(133, GeneratedJavaTokenTypes.LITERAL_true, message); - assertEquals(134, GeneratedJavaTokenTypes.LITERAL_false, message); - assertEquals(135, GeneratedJavaTokenTypes.LITERAL_null, message); - assertEquals(136, GeneratedJavaTokenTypes.LITERAL_new, message); - assertEquals(137, GeneratedJavaTokenTypes.NUM_INT, message); - assertEquals(138, GeneratedJavaTokenTypes.CHAR_LITERAL, message); - assertEquals(139, GeneratedJavaTokenTypes.STRING_LITERAL, message); - assertEquals(140, GeneratedJavaTokenTypes.NUM_FLOAT, message); - assertEquals(141, GeneratedJavaTokenTypes.NUM_LONG, message); - assertEquals(142, GeneratedJavaTokenTypes.NUM_DOUBLE, message); - assertEquals(143, GeneratedJavaTokenTypes.WS, message); - assertEquals(144, GeneratedJavaTokenTypes.SINGLE_LINE_COMMENT, message); - assertEquals(145, GeneratedJavaTokenTypes.BLOCK_COMMENT_BEGIN, message); - assertEquals(146, GeneratedJavaTokenTypes.ESC, message); - assertEquals(147, GeneratedJavaTokenTypes.HEX_DIGIT, message); - assertEquals(148, GeneratedJavaTokenTypes.VOCAB, message); - assertEquals(149, GeneratedJavaTokenTypes.EXPONENT, message); - assertEquals(150, GeneratedJavaTokenTypes.FLOAT_SUFFIX, message); - assertEquals(151, GeneratedJavaTokenTypes.ASSERT, message); - assertEquals(152, GeneratedJavaTokenTypes.STATIC_IMPORT, message); - assertEquals(153, GeneratedJavaTokenTypes.ENUM, message); - assertEquals(154, GeneratedJavaTokenTypes.ENUM_DEF, message); - assertEquals(155, GeneratedJavaTokenTypes.ENUM_CONSTANT_DEF, message); - assertEquals(156, GeneratedJavaTokenTypes.FOR_EACH_CLAUSE, message); - assertEquals(157, GeneratedJavaTokenTypes.ANNOTATION_DEF, message); - assertEquals(158, GeneratedJavaTokenTypes.ANNOTATIONS, message); - assertEquals(159, GeneratedJavaTokenTypes.ANNOTATION, message); - assertEquals(160, GeneratedJavaTokenTypes.ANNOTATION_MEMBER_VALUE_PAIR, message); - assertEquals(161, GeneratedJavaTokenTypes.ANNOTATION_FIELD_DEF, message); - assertEquals(162, GeneratedJavaTokenTypes.ANNOTATION_ARRAY_INIT, message); - assertEquals(163, GeneratedJavaTokenTypes.TYPE_ARGUMENTS, message); - assertEquals(164, GeneratedJavaTokenTypes.TYPE_ARGUMENT, message); - assertEquals(165, GeneratedJavaTokenTypes.TYPE_PARAMETERS, message); - assertEquals(166, GeneratedJavaTokenTypes.TYPE_PARAMETER, message); - assertEquals(167, GeneratedJavaTokenTypes.WILDCARD_TYPE, message); - assertEquals(168, GeneratedJavaTokenTypes.TYPE_UPPER_BOUNDS, message); - assertEquals(169, GeneratedJavaTokenTypes.TYPE_LOWER_BOUNDS, message); - assertEquals(170, GeneratedJavaTokenTypes.AT, message); - assertEquals(171, GeneratedJavaTokenTypes.ELLIPSIS, message); - assertEquals(172, GeneratedJavaTokenTypes.GENERIC_START, message); - assertEquals(173, GeneratedJavaTokenTypes.GENERIC_END, message); - assertEquals(174, GeneratedJavaTokenTypes.TYPE_EXTENSION_AND, message); - assertEquals(175, GeneratedJavaTokenTypes.DO_WHILE, message); - assertEquals(176, GeneratedJavaTokenTypes.RESOURCE_SPECIFICATION, message); - assertEquals(177, GeneratedJavaTokenTypes.RESOURCES, message); - assertEquals(178, GeneratedJavaTokenTypes.RESOURCE, message); - assertEquals(179, GeneratedJavaTokenTypes.DOUBLE_COLON, message); - assertEquals(180, GeneratedJavaTokenTypes.METHOD_REF, message); - assertEquals(181, GeneratedJavaTokenTypes.LAMBDA, message); - assertEquals(182, GeneratedJavaTokenTypes.BLOCK_COMMENT_END, message); - assertEquals(183, GeneratedJavaTokenTypes.COMMENT_CONTENT, message); - assertEquals(184, GeneratedJavaTokenTypes.SINGLE_LINE_COMMENT_CONTENT, message); - assertEquals(185, GeneratedJavaTokenTypes.BLOCK_COMMENT_CONTENT, message); - assertEquals(186, GeneratedJavaTokenTypes.STD_ESC, message); - assertEquals(187, GeneratedJavaTokenTypes.BINARY_DIGIT, message); - assertEquals(188, GeneratedJavaTokenTypes.ID_START, message); - assertEquals(189, GeneratedJavaTokenTypes.ID_PART, message); - assertEquals(190, GeneratedJavaTokenTypes.INT_LITERAL, message); - assertEquals(191, GeneratedJavaTokenTypes.LONG_LITERAL, message); - assertEquals(192, GeneratedJavaTokenTypes.FLOAT_LITERAL, message); - assertEquals(193, GeneratedJavaTokenTypes.DOUBLE_LITERAL, message); - assertEquals(194, GeneratedJavaTokenTypes.HEX_FLOAT_LITERAL, message); - assertEquals(195, GeneratedJavaTokenTypes.HEX_DOUBLE_LITERAL, message); - assertEquals(196, GeneratedJavaTokenTypes.SIGNED_INTEGER, message); - assertEquals(197, GeneratedJavaTokenTypes.BINARY_EXPONENT, message); - assertEquals(198, GeneratedJavaTokenTypes.PATTERN_VARIABLE_DEF, message); - assertEquals(199, GeneratedJavaTokenTypes.RECORD_DEF, message); - assertEquals(200, GeneratedJavaTokenTypes.LITERAL_record, message); - assertEquals(201, GeneratedJavaTokenTypes.RECORD_COMPONENTS, message); - assertEquals(202, GeneratedJavaTokenTypes.RECORD_COMPONENT_DEF, message); - assertEquals(203, GeneratedJavaTokenTypes.COMPACT_CTOR_DEF, message); - assertEquals(204, GeneratedJavaTokenTypes.TEXT_BLOCK_LITERAL_BEGIN, message); - assertEquals(205, GeneratedJavaTokenTypes.TEXT_BLOCK_CONTENT, message); - assertEquals(206, GeneratedJavaTokenTypes.TEXT_BLOCK_LITERAL_END, message); - assertEquals(207, GeneratedJavaTokenTypes.LITERAL_yield, message); - assertEquals(208, GeneratedJavaTokenTypes.SWITCH_RULE, message); - assertEquals(209, GeneratedJavaTokenTypes.LITERAL_non_sealed, message); - assertEquals(210, GeneratedJavaTokenTypes.LITERAL_sealed, message); - assertEquals(211, GeneratedJavaTokenTypes.LITERAL_permits, message); - assertEquals(212, GeneratedJavaTokenTypes.PERMITS_CLAUSE, message); + assertEquals(-1, Recognizer.EOF, message); + assertEquals(3, JavaLexer.NULL_TREE_LOOKAHEAD, message); + assertEquals(4, JavaLexer.BLOCK, message); + assertEquals(5, JavaLexer.MODIFIERS, message); + assertEquals(6, JavaLexer.OBJBLOCK, message); + assertEquals(7, JavaLexer.SLIST, message); + assertEquals(8, JavaLexer.CTOR_DEF, message); + assertEquals(9, JavaLexer.METHOD_DEF, message); + assertEquals(10, JavaLexer.VARIABLE_DEF, message); + assertEquals(11, JavaLexer.INSTANCE_INIT, message); + assertEquals(12, JavaLexer.STATIC_INIT, message); + assertEquals(13, JavaLexer.TYPE, message); + assertEquals(14, JavaLexer.CLASS_DEF, message); + assertEquals(15, JavaLexer.INTERFACE_DEF, message); + assertEquals(16, JavaLexer.PACKAGE_DEF, message); + assertEquals(17, JavaLexer.ARRAY_DECLARATOR, message); + assertEquals(18, JavaLexer.EXTENDS_CLAUSE, message); + assertEquals(19, JavaLexer.IMPLEMENTS_CLAUSE, message); + assertEquals(20, JavaLexer.PARAMETERS, message); + assertEquals(21, JavaLexer.PARAMETER_DEF, message); + assertEquals(22, JavaLexer.LABELED_STAT, message); + assertEquals(23, JavaLexer.TYPECAST, message); + assertEquals(24, JavaLexer.INDEX_OP, message); + assertEquals(25, JavaLexer.POST_INC, message); + assertEquals(26, JavaLexer.POST_DEC, message); + assertEquals(27, JavaLexer.METHOD_CALL, message); + assertEquals(28, JavaLexer.EXPR, message); + assertEquals(29, JavaLexer.ARRAY_INIT, message); + assertEquals(30, JavaLexer.IMPORT, message); + assertEquals(31, JavaLexer.UNARY_MINUS, message); + assertEquals(32, JavaLexer.UNARY_PLUS, message); + assertEquals(33, JavaLexer.CASE_GROUP, message); + assertEquals(34, JavaLexer.ELIST, message); + assertEquals(35, JavaLexer.FOR_INIT, message); + assertEquals(36, JavaLexer.FOR_CONDITION, message); + assertEquals(37, JavaLexer.FOR_ITERATOR, message); + assertEquals(38, JavaLexer.EMPTY_STAT, message); + assertEquals(39, JavaLexer.FINAL, message); + assertEquals(40, JavaLexer.ABSTRACT, message); + assertEquals(41, JavaLexer.STRICTFP, message); + assertEquals(42, JavaLexer.SUPER_CTOR_CALL, message); + assertEquals(43, JavaLexer.CTOR_CALL, message); + assertEquals(44, JavaLexer.LITERAL_PACKAGE, message); + assertEquals(45, JavaLexer.SEMI, message); + assertEquals(46, JavaLexer.LITERAL_IMPORT, message); + assertEquals(47, JavaLexer.LBRACK, message); + assertEquals(48, JavaLexer.RBRACK, message); + assertEquals(49, JavaLexer.LITERAL_VOID, message); + assertEquals(50, JavaLexer.LITERAL_BOOLEAN, message); + assertEquals(51, JavaLexer.LITERAL_BYTE, message); + assertEquals(52, JavaLexer.LITERAL_CHAR, message); + assertEquals(53, JavaLexer.LITERAL_SHORT, message); + assertEquals(54, JavaLexer.LITERAL_INT, message); + assertEquals(55, JavaLexer.LITERAL_FLOAT, message); + assertEquals(56, JavaLexer.LITERAL_LONG, message); + assertEquals(57, JavaLexer.LITERAL_DOUBLE, message); + assertEquals(58, JavaLexer.IDENT, message); + assertEquals(59, JavaLexer.DOT, message); + assertEquals(60, JavaLexer.STAR, message); + assertEquals(61, JavaLexer.LITERAL_PRIVATE, message); + assertEquals(62, JavaLexer.LITERAL_PUBLIC, message); + assertEquals(63, JavaLexer.LITERAL_PROTECTED, message); + assertEquals(64, JavaLexer.LITERAL_STATIC, message); + assertEquals(65, JavaLexer.LITERAL_TRANSIENT, message); + assertEquals(66, JavaLexer.LITERAL_NATIVE, message); + assertEquals(67, JavaLexer.LITERAL_SYNCHRONIZED, message); + assertEquals(68, JavaLexer.LITERAL_VOLATILE, message); + assertEquals(69, JavaLexer.LITERAL_CLASS, message); + assertEquals(70, JavaLexer.LITERAL_EXTENDS, message); + assertEquals(71, JavaLexer.LITERAL_INTERFACE, message); + assertEquals(72, JavaLexer.LCURLY, message); + assertEquals(73, JavaLexer.RCURLY, message); + assertEquals(74, JavaLexer.COMMA, message); + assertEquals(75, JavaLexer.LITERAL_IMPLEMENTS, message); + assertEquals(76, JavaLexer.LPAREN, message); + assertEquals(77, JavaLexer.RPAREN, message); + assertEquals(78, JavaLexer.LITERAL_THIS, message); + assertEquals(79, JavaLexer.LITERAL_SUPER, message); + assertEquals(80, JavaLexer.ASSIGN, message); + assertEquals(81, JavaLexer.LITERAL_THROWS, message); + assertEquals(82, JavaLexer.COLON, message); + assertEquals(83, JavaLexer.LITERAL_IF, message); + assertEquals(84, JavaLexer.LITERAL_WHILE, message); + assertEquals(85, JavaLexer.LITERAL_DO, message); + assertEquals(86, JavaLexer.LITERAL_BREAK, message); + assertEquals(87, JavaLexer.LITERAL_CONTINUE, message); + assertEquals(88, JavaLexer.LITERAL_RETURN, message); + assertEquals(89, JavaLexer.LITERAL_SWITCH, message); + assertEquals(90, JavaLexer.LITERAL_THROW, message); + assertEquals(91, JavaLexer.LITERAL_FOR, message); + assertEquals(92, JavaLexer.LITERAL_ELSE, message); + assertEquals(93, JavaLexer.LITERAL_CASE, message); + assertEquals(94, JavaLexer.LITERAL_DEFAULT, message); + assertEquals(95, JavaLexer.LITERAL_TRY, message); + assertEquals(96, JavaLexer.LITERAL_CATCH, message); + assertEquals(97, JavaLexer.LITERAL_FINALLY, message); + assertEquals(98, JavaLexer.PLUS_ASSIGN, message); + assertEquals(99, JavaLexer.MINUS_ASSIGN, message); + assertEquals(100, JavaLexer.STAR_ASSIGN, message); + assertEquals(101, JavaLexer.DIV_ASSIGN, message); + assertEquals(102, JavaLexer.MOD_ASSIGN, message); + assertEquals(103, JavaLexer.SR_ASSIGN, message); + assertEquals(104, JavaLexer.BSR_ASSIGN, message); + assertEquals(105, JavaLexer.SL_ASSIGN, message); + assertEquals(106, JavaLexer.BAND_ASSIGN, message); + assertEquals(107, JavaLexer.BXOR_ASSIGN, message); + assertEquals(108, JavaLexer.BOR_ASSIGN, message); + assertEquals(109, JavaLexer.QUESTION, message); + assertEquals(110, JavaLexer.LOR, message); + assertEquals(111, JavaLexer.LAND, message); + assertEquals(112, JavaLexer.BOR, message); + assertEquals(113, JavaLexer.BXOR, message); + assertEquals(114, JavaLexer.BAND, message); + assertEquals(115, JavaLexer.NOT_EQUAL, message); + assertEquals(116, JavaLexer.EQUAL, message); + assertEquals(117, JavaLexer.LT, message); + assertEquals(118, JavaLexer.GT, message); + assertEquals(119, JavaLexer.LE, message); + assertEquals(120, JavaLexer.GE, message); + assertEquals(121, JavaLexer.LITERAL_INSTANCEOF, message); + assertEquals(122, JavaLexer.SL, message); + assertEquals(123, JavaLexer.SR, message); + assertEquals(124, JavaLexer.BSR, message); + assertEquals(125, JavaLexer.PLUS, message); + assertEquals(126, JavaLexer.MINUS, message); + assertEquals(127, JavaLexer.DIV, message); + assertEquals(128, JavaLexer.MOD, message); + assertEquals(129, JavaLexer.INC, message); + assertEquals(130, JavaLexer.DEC, message); + assertEquals(131, JavaLexer.BNOT, message); + assertEquals(132, JavaLexer.LNOT, message); + assertEquals(133, JavaLexer.LITERAL_TRUE, message); + assertEquals(134, JavaLexer.LITERAL_FALSE, message); + assertEquals(135, JavaLexer.LITERAL_NULL, message); + assertEquals(136, JavaLexer.LITERAL_NEW, message); + assertEquals(137, JavaLexer.NUM_INT, message); + assertEquals(138, JavaLexer.CHAR_LITERAL, message); + assertEquals(139, JavaLexer.STRING_LITERAL, message); + assertEquals(140, JavaLexer.NUM_FLOAT, message); + assertEquals(141, JavaLexer.NUM_LONG, message); + assertEquals(142, JavaLexer.NUM_DOUBLE, message); + assertEquals(143, JavaLexer.WS, message); + assertEquals(144, JavaLexer.SINGLE_LINE_COMMENT, message); + assertEquals(145, JavaLexer.BLOCK_COMMENT_BEGIN, message); + assertEquals(146, JavaLexer.ESC, message); + assertEquals(147, JavaLexer.HEX_DIGIT, message); + assertEquals(148, JavaLexer.VOCAB, message); + assertEquals(149, JavaLexer.EXPONENT, message); + assertEquals(150, JavaLexer.FLOAT_SUFFIX, message); + assertEquals(151, JavaLexer.ASSERT, message); + assertEquals(152, JavaLexer.STATIC_IMPORT, message); + assertEquals(153, JavaLexer.ENUM, message); + assertEquals(154, JavaLexer.ENUM_DEF, message); + assertEquals(155, JavaLexer.ENUM_CONSTANT_DEF, message); + assertEquals(156, JavaLexer.FOR_EACH_CLAUSE, message); + assertEquals(157, JavaLexer.ANNOTATION_DEF, message); + assertEquals(158, JavaLexer.ANNOTATIONS, message); + assertEquals(159, JavaLexer.ANNOTATION, message); + assertEquals(160, JavaLexer.ANNOTATION_MEMBER_VALUE_PAIR, message); + assertEquals(161, JavaLexer.ANNOTATION_FIELD_DEF, message); + assertEquals(162, JavaLexer.ANNOTATION_ARRAY_INIT, message); + assertEquals(163, JavaLexer.TYPE_ARGUMENTS, message); + assertEquals(164, JavaLexer.TYPE_ARGUMENT, message); + assertEquals(165, JavaLexer.TYPE_PARAMETERS, message); + assertEquals(166, JavaLexer.TYPE_PARAMETER, message); + assertEquals(167, JavaLexer.WILDCARD_TYPE, message); + assertEquals(168, JavaLexer.TYPE_UPPER_BOUNDS, message); + assertEquals(169, JavaLexer.TYPE_LOWER_BOUNDS, message); + assertEquals(170, JavaLexer.AT, message); + assertEquals(171, JavaLexer.ELLIPSIS, message); + assertEquals(172, JavaLexer.GENERIC_START, message); + assertEquals(173, JavaLexer.GENERIC_END, message); + assertEquals(174, JavaLexer.TYPE_EXTENSION_AND, message); + assertEquals(175, JavaLexer.DO_WHILE, message); + assertEquals(176, JavaLexer.RESOURCE_SPECIFICATION, message); + assertEquals(177, JavaLexer.RESOURCES, message); + assertEquals(178, JavaLexer.RESOURCE, message); + assertEquals(179, JavaLexer.DOUBLE_COLON, message); + assertEquals(180, JavaLexer.METHOD_REF, message); + assertEquals(181, JavaLexer.LAMBDA, message); + assertEquals(182, JavaLexer.BLOCK_COMMENT_END, message); + assertEquals(183, JavaLexer.COMMENT_CONTENT, message); + assertEquals(184, JavaLexer.SINGLE_LINE_COMMENT_CONTENT, message); + assertEquals(185, JavaLexer.BLOCK_COMMENT_CONTENT, message); + assertEquals(186, JavaLexer.STD_ESC, message); + assertEquals(187, JavaLexer.BINARY_DIGIT, message); + assertEquals(188, JavaLexer.ID_START, message); + assertEquals(189, JavaLexer.ID_PART, message); + assertEquals(190, JavaLexer.INT_LITERAL, message); + assertEquals(191, JavaLexer.LONG_LITERAL, message); + assertEquals(192, JavaLexer.FLOAT_LITERAL, message); + assertEquals(193, JavaLexer.DOUBLE_LITERAL, message); + assertEquals(194, JavaLexer.HEX_FLOAT_LITERAL, message); + assertEquals(195, JavaLexer.HEX_DOUBLE_LITERAL, message); + assertEquals(196, JavaLexer.SIGNED_INTEGER, message); + assertEquals(197, JavaLexer.BINARY_EXPONENT, message); + assertEquals(198, JavaLexer.PATTERN_VARIABLE_DEF, message); + assertEquals(199, JavaLexer.RECORD_DEF, message); + assertEquals(200, JavaLexer.LITERAL_RECORD, message); + assertEquals(201, JavaLexer.RECORD_COMPONENTS, message); + assertEquals(202, JavaLexer.RECORD_COMPONENT_DEF, message); + assertEquals(203, JavaLexer.COMPACT_CTOR_DEF, message); + assertEquals(204, JavaLexer.TEXT_BLOCK_LITERAL_BEGIN, message); + assertEquals(205, JavaLexer.TEXT_BLOCK_CONTENT, message); + assertEquals(206, JavaLexer.TEXT_BLOCK_LITERAL_END, message); + assertEquals(207, JavaLexer.LITERAL_YIELD, message); + assertEquals(208, JavaLexer.SWITCH_RULE, message); + assertEquals(209, JavaLexer.LITERAL_NON_SEALED, message); + assertEquals(210, JavaLexer.LITERAL_SEALED, message); + assertEquals(211, JavaLexer.LITERAL_PERMITS, message); + assertEquals(212, JavaLexer.PERMITS_CLAUSE, message); // Read JavaDoc before changing - assertEquals(212, GeneratedJavaTokenTypes.class.getDeclaredFields().length, + final int tokenCount = (int) Arrays.stream(JavaLexer.class.getDeclaredFields()) + .filter(GeneratedJavaTokenTypesTest::isPublicStaticFinalInt) + .count(); + + assertEquals(224, tokenCount, "all tokens must be added to list in" + " 'GeneratedJavaTokenTypesTest' and verified" + " that their old numbering didn't change"); } + /** + * Checks that a given field is 'public static final int'. + * + * @param field field to verify type and visibility of + * @return true if field is declared as 'public static final int' + */ + private static boolean isPublicStaticFinalInt(Field field) { + final Class<?> fieldType = field.getType(); + final int mods = field.getModifiers(); + return fieldType.equals(Integer.TYPE) + && Modifier.isPublic(mods) + && Modifier.isStatic(mods) + && Modifier.isFinal(mods); + } } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/antlr4/Antlr4AstRegressionTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/antlr4/Antlr4AstRegressionTest.java new file mode 100644 --- /dev/null +++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/antlr4/Antlr4AstRegressionTest.java @@ -0,0 +1,269 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2021 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +import org.junit.jupiter.api.Test; + +import com.puppycrawl.tools.checkstyle.AbstractTreeTestSupport; +import com.puppycrawl.tools.checkstyle.JavaParser; + +public class Antlr4AstRegressionTest extends AbstractTreeTestSupport { + + @Override + protected String getPackageLocation() { + return "com/puppycrawl/tools/checkstyle/grammar/antlr4"; + } + + @Test + public void testPackage() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionPackage.txt"), + getPath("InputAntlr4AstRegressionPackage.java")); + } + + @Test + public void testSimple() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionSimple.txt"), + getPath("InputAntlr4AstRegressionSimple.java")); + } + + @Test + public void testAnno() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionSimpleWithAnno.txt"), + getPath("InputAntlr4AstRegressionSimpleWithAnno.java")); + } + + @Test + public void testImports() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionImports.txt"), + getPath("InputAntlr4AstRegressionImports.java")); + } + + @Test + public void testConstructorCall() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionConstructorCall.txt"), + getPath("InputAntlr4AstRegressionConstructorCall.java")); + } + + @Test + public void testMethodCall() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionMethodCall.txt"), + getPath("InputAntlr4AstRegressionMethodCall.java")); + } + + @Test + public void testRegressionJavaClass1() throws Exception { + verifyAst(getPath("InputRegressionJavaClass1Ast.txt"), + getPath("InputRegressionJavaClass1.java")); + } + + @Test + public void testRegressionAnnotationLocation() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionAnnotationLocation.txt"), + getPath("InputAntlr4AstRegressionAnnotationLocation.java")); + } + + @Test + public void testRegressionKeywordsAndOperators() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionKeywordsAndOperators.txt"), + getPath("InputAntlr4AstRegressionKeywordsAndOperators.java")); + } + + @Test + public void testRegressionDiamondOperators() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionKeywordsAndOperators.txt"), + getPath("InputAntlr4AstRegressionKeywordsAndOperators.java")); + } + + @Test + public void testSingleLineBlocks() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionSingleLineBlocks.txt"), + getPath("InputAntlr4AstRegressionSingleLineBlocks.java")); + } + + @Test + public void testExpressionList() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionExpressionList.txt"), + getPath("InputAntlr4AstRegressionExpressionList.java")); + } + + @Test + public void testNewTypeTree() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionNewTypeTree.txt"), + getPath("InputAntlr4AstRegressionNewTypeTree.java")); + } + + @Test + public void testFallThroughDefault() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionFallThroughDefault.txt"), + getPath("InputAntlr4AstRegressionFallThroughDefault.java")); + } + + @Test + public void testPackageAnnotation() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionPackageAnnotation.txt"), + getPath("package-info.java")); + } + + @Test + public void testAnnotationOnSameLine1() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionAnnotationOnSameLine.txt"), + getPath("InputAntlr4AstRegressionAnnotationOnSameLine.java")); + } + + @Test + public void testAnnotationOnSameLine2() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionAnnotationOnSameLine2.txt"), + getPath("InputAntlr4AstRegressionAnnotationOnSameLine2.java")); + } + + @Test + public void testSuppressWarnings() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionSuppressWarnings.txt"), + getPath("InputAntlr4AstRegressionSuppressWarnings.java")); + } + + @Test + public void testBadOverride() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionBadOverride.txt"), + getPath("InputAntlr4AstRegressionBadOverride.java")); + } + + @Test + public void testTrickySwitch() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionTrickySwitch.txt"), + getPath("InputAntlr4AstRegressionTrickySwitch.java")); + } + + @Test + public void testExplicitInitialization() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionExplicitInitialization.txt"), + getPath("InputAntlr4AstRegressionExplicitInitialization.java")); + } + + @Test + public void testTypeParams() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionTypeParams.txt"), + getPath("InputAntlr4AstRegressionTypeParams.java")); + } + + @Test + public void testForLoops() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionForLoops.txt"), + getPath("InputAntlr4AstRegressionForLoops.java")); + } + + @Test + public void testIllegalCatch() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionIllegalCatch.txt"), + getPath("InputAntlr4AstRegressionIllegalCatch.java")); + } + + @Test + public void testNewLineAtEndOfFileCr() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionNewLineAtEndOfFileCr.txt"), + getPath("InputAntlr4AstRegressionNewLineAtEndOfFileCr.java")); + } + + @Test + public void testWeirdCtor() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionWeirdCtor.txt"), + getPath("InputAntlr4AstRegressionWeirdCtor.java")); + } + + @Test + public void testAnnotationOnQualifiedTypes() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionAnnotationOnQualifiedTypes.txt"), + getPath("InputAntlr4AstRegressionAnnotationOnQualifiedTypes.java")); + } + + @Test + public void testAnnotationOnArrays() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionAnnotationOnArrays.txt"), + getPath("InputAntlr4AstRegressionAnnotationOnArrays.java")); + } + + @Test + public void testMethodRefs() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionMethodRefs.txt"), + getPath("InputAntlr4AstRegressionMethodRefs.java")); + } + + @Test + public void testEmbeddedBlockComments() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionEmbeddedBlockComments.txt"), + getPath("InputAntlr4AstRegressionEmbeddedBlockComments.java")); + } + + @Test + public void testTrickySwitchWithComments() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionTrickySwitchWithComments.txt"), + getPath("InputAntlr4AstRegressionTrickySwitchWithComments.java"), + JavaParser.Options.WITH_COMMENTS); + } + + @Test + public void testCassandraInputWithComments() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionCassandraInputWithComments.txt"), + getPath("InputAntlr4AstRegressionCassandraInputWithComments.java"), + JavaParser.Options.WITH_COMMENTS); + } + + @Test + public void testCommentsOnAnnotationsAndEnums() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionCommentsOnAnnotationsAndEnums.txt"), + getPath("InputAntlr4AstRegressionCommentsOnAnnotationsAndEnums.java"), + JavaParser.Options.WITH_COMMENTS); + } + + @Test + public void testUncommon() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionUncommon.txt"), + getNonCompilablePath("InputAntlr4AstRegressionUncommon.java"), + JavaParser.Options.WITH_COMMENTS); + } + + @Test + public void testUncommon2() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionUncommon2.txt"), + getNonCompilablePath("InputAntlr4AstRegressionUncommon2.java"), + JavaParser.Options.WITH_COMMENTS); + } + + @Test + public void testTrickyYield() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionTrickyYield.txt"), + getPath("InputAntlr4AstRegressionTrickyYield.java"), + JavaParser.Options.WITH_COMMENTS); + } + + @Test + public void testUncommon3() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionUncommon3.txt"), + getNonCompilablePath("InputAntlr4AstRegressionUncommon3.java"), + JavaParser.Options.WITH_COMMENTS); + } + + @Test + public void testUncommon4() throws Exception { + verifyAst(getPath("InputAntlr4AstRegressionUncommon4.txt"), + getPath("InputAntlr4AstRegressionUncommon4.java"), + JavaParser.Options.WITH_COMMENTS); + } +} diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainFrameModelTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainFrameModelTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainFrameModelTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainFrameModelTest.java @@ -154,7 +154,7 @@ public void testOpenFileNonCompilableFile() throws IOException { } catch (CheckstyleException ex) { final String expectedMsg = String.format(Locale.ROOT, - "NoViableAltException occurred while parsing file %s.", + "IllegalStateException occurred while parsing file %s.", nonCompilableFile.getPath()); assertEquals(expectedMsg, ex.getMessage(), "Invalid exception message"); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtilTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtilTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtilTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtilTest.java @@ -26,7 +26,6 @@ import org.junit.jupiter.api.Test; -import antlr.collections.AST; import com.puppycrawl.tools.checkstyle.DetailAstImpl; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.Scope; @@ -296,7 +295,7 @@ private static DetailAST getNodeWithParentScope(int literal, String scope, final DetailAstImpl ast = getNode(parentTokenType, TokenTypes.MODIFIERS, literal); ast.setText(scope); final DetailAstImpl ast2 = getNode(TokenTypes.OBJBLOCK); - ((AST) ast.getParent().getParent()).addChild(ast2); + ((DetailAstImpl) ast.getParent().getParent()).addChild(ast2); return ast; } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/utils/TokenUtilTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/utils/TokenUtilTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/TokenUtilTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/TokenUtilTest.java @@ -19,8 +19,8 @@ package com.puppycrawl.tools.checkstyle.utils; +import static com.google.common.truth.Truth.assertWithMessage; import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.isUtilsClassHasPrivateConstructor; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -89,18 +89,21 @@ public void testNameToValueMapFromPublicIntFields() { } @Test - public void testValueToNameArrayFromNameToValueMap() { + public void testInvertMap() { final Map<String, Integer> map = new TreeMap<>(); map.put("ZERO", 0); map.put("ONE", 1); map.put("TWO", 2); map.put("NEGATIVE", -1); - final String[] actualArray = - TokenUtil.valueToNameArrayFromNameToValueMap(map); - final String[] expectedArray = {"ZERO", "ONE", "TWO"}; + final Map<Integer, String> invertedMap = TokenUtil.invertMap(map); - assertArrayEquals(expectedArray, actualArray, "Unexpected value to name array"); + assertWithMessage("Key set of 'map' and values of 'invertedMap' should be the same.") + .that(invertedMap.values()) + .containsExactlyElementsIn(map.keySet()); + assertWithMessage("Values of 'map' and key set of 'invertedMap' should be the same.") + .that(invertedMap.keySet()) + .containsExactlyElementsIn(map.values()); } @Test @@ -217,7 +220,7 @@ public void testGetAllTokenIds() { final int sum = Arrays.stream(allTokenIds).sum(); assertEquals(184, allTokenIds.length, "Invalid token length"); - assertEquals(18737, sum, "invalid sum"); + assertEquals(18735, sum, "invalid sum"); } @Test diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon.java new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon.java @@ -0,0 +1,272 @@ +//non-compiled with javac: Compilable with Java16 +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +import java.io.Serializable; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; +import java.util.function.IntFunction; + +import com.sun.tools.javac.Main; + +public class InputAntlr4AstRegressionUncommon + implements MyInterface { + int x[], y[], z[][]; + + public Double method1()[] { + return null; + } + + protected <B, Z, A> OtherClass.Q<A,B,Z> m() { + return null; + } +} + +interface MyInterface { + Double method1()[]; +} + +class OtherClass extends InputAntlr4AstRegressionUncommon { + OtherClass (int z){ + super(); + } + class Q<A, B, Z>{} + + ; + public <Z, B, A> Q<A, Z, B> m() { return null;} + + OtherClass (int z, String s){ + new OtherClass(2); + } + + class Inner { + Inner(int x) {} + Inner() { + this(2); + List<String> list = new List<>() { + @Override + public int size() { + return 0; + } + + @Override + public boolean isEmpty() { + return false; + } + + @Override + public boolean contains(Object o) { + return false; + } + + @Override + public Iterator<String> iterator() { + return null; + } + + @Override + public Object[] toArray() { + return new Object[0]; + } + + @Override + public <T> T[] toArray(T[] a) { + return null; + } + + @Override + public boolean add(String s) { + return false; + } + + @Override + public boolean remove(Object o) { + return false; + } + + @Override + public boolean containsAll(Collection<?> c) { + return false; + } + + @Override + public boolean addAll(Collection<? extends String> c) { + return false; + } + + @Override + public boolean addAll(int index, Collection<? extends String> c) { + return false; + } + + @Override + public boolean removeAll(Collection<?> c) { + return false; + } + + @Override + public boolean retainAll(Collection<?> c) { + return false; + } + + @Override + public void clear() { + + } + + @Override + public String get(int index) { + return null; + } + + @Override + public String set(int index, String element) { + return null; + } + + @Override + public void add(int index, String element) { + + } + + @Override + public String remove(int index) { + return null; + } + + @Override + public int indexOf(Object o) { + return 0; + } + + @Override + public int lastIndexOf(Object o) { + return 0; + } + + @Override + public ListIterator<String> listIterator() { + return null; + } + + @Override + public ListIterator<String> listIterator(int index) { + return null; + } + + @Override + public List<String> subList(int fromIndex, int toIndex) { + return null; + } + }; + } + } + + class OtherInner<E> { + OtherInner(int w){} + <T extends Serializable> OtherInner(T element) { + + } + OtherInner() { + <E>this(2); + } + } + + private void killAll() { + boolean oneAlive = false; + if (oneAlive) { + Thread.yield(); + } + + } + class SuperClassA{ + protected SuperClassA bs; + protected SuperClassA s; + Object s2; + } + class SuperClassA2{} + + + /* + * Note: inherited fields of a nested class shadow outer scope variables + * Note: only if they are accessible! + */ + public class FieldAccessSuper extends SuperClassA { + private SuperClassA s; + + public void foo() { + // simple super field access + // Primary[Prefix[Name[s]]] + s = new SuperClassA(); + + // access inherited field through primary + // Primary[ Prefix[Primary[(this)]], Suffix[s], Suffix[s2] ] + (this).s.s2 = new SuperClassA2(); + + // access inherited field, second 's' has inherited field 's2' + // Primary[Prefix[Name[s.s.s2]]] + s.s.s2 = new SuperClassA2(); + + // field access through super + // Primary[Prefix["super"], Suffix["field"]] + super.s = new SuperClassA(); + + // fully qualified case + // Primary[Prefix[Name[net...FieldAccessSuper]], Suffix[this], Suffix[s]] + FieldAccessSuper.this.s + = new SuperClassA(); + } + + public class Nested extends SuperClassA { + SuperClassA a; + class SubscriptionAdapter{} + final /* synthetic */ SubscriptionAdapter this$0 = null; + final /* synthetic */ Object val$argHolder = null; + + public void foo() { + // access enclosing super field + // Primary[Prefix[Name[s]]] + s = new SuperClassA(); + + // access Nested inherited field + // Primary[Prefix[Name[bs]]] + bs = new SuperClassA(); + + // access super field with fully qualified stuff + // Primary[Prefix["FieldAccessSuper"], Suffix[Nested], + // Suffix["super"], Suffix["bs"]] + FieldAccessSuper.Nested.super.bs = new SuperClassA(); + + // refers to the enclosing class's immediate super class's field + // Primary[Prefix["FieldAccessSuper"], Suffix["super"], Suffix["s"]] + FieldAccessSuper.super.s = new SuperClassA(); + } + Object x = Collections .<String, Integer>emptyMap(); + + Nested() { + super(); + } + + int bar() { + return super.hashCode(); + } + + boolean method() { + return super.equals(new Object()); + } + } + } + + +} + +record TestRecord(int[] x, int[]... y) { + void foo() { + Runnable r11 = Main::<String>new; + IntFunction<int[]> r13 = int[]::<String>new; // produces the same results + } +} + +;;; diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon2.java new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon2.java @@ -0,0 +1,52 @@ +package + com .puppycrawl. + tools. + checkstyle + .grammar. + antlr4 + ; + +import java.util.ArrayList; +import java.util.List; + +public class InputAntlr4AstRegressionUncommon2 { + public @interface PackgeAnno { + } + @Nullable List<Integer> x = new ArrayList<Integer>(); + enum + FPMethodArgs + { + + IGNN, + IIGNN, + GNNII, + GNNC;;;;; + } + public + interface + IntEnum + { + } + + private + @interface + MyOtherAnno + { + public class + Test {} + enum + TestEnum{} + public @interface + InnerAnnoDeclaration{} + int x = 0; + int method(); + ;;;;; + } + private String str = "" + +""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""; + int z = 42 + 42; + @ interface Foo { + String v1()[]; + } + @interface Nullable{} +} diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon3.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon3.java new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon3.java @@ -0,0 +1,70 @@ +//non-compiled with javac: Compilable with Java16 +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +public class InputAntlr4AstRegressionUncommon3 implements AutoCloseable { + @Override + public void close() throws Exception { + + } + + interface SAM { + int m(); + } + + interface SuperI { + public default int foo() { return 1234; } + } + + interface I extends SuperI { + } + + interface T extends I { + public default SAM boo() { return I.super::foo; } + } + + interface DSPRI { String m(String a); } + + interface DSPRA { + default String xsA__(String s) { + return "A__xsA:" + s; + } + + default String xsAB_(String s) { + return "AB_xsA:" + s; + } + + } + + interface DSPRB extends DSPRA { + + default String xsAB_(String s) { + return "AB_xsB:" + s; + } + + default String xs_B_(String s) { + return "_B_xsB:" + s; + } + + } + + public class MethodReferenceTestSuperDefault implements DSPRB { + + public void testMethodReferenceSuper() { + DSPRI q; + + q = DSPRB.super::xsA__; + + q = DSPRB.super::xsAB_; + + q = DSPRB.super::xs_B_; + } + + } + + void test() throws Exception { + try (InputAntlr4AstRegressionUncommon3.this) { + System.out.println("Unable to process"); + } + } + +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterCountUnicodeCorrectly.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterCountUnicodeCorrectly.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterCountUnicodeCorrectly.java @@ -0,0 +1,11 @@ +package com.puppycrawl.tools.checkstyle.checks.whitespace.whitespaceafter; + +/* Config: + * default + */ +public class InputWhitespaceAfterCountUnicodeCorrectly { + String a = " "; + String b = "💩💩"; + String c = "💩💩";// violation + String d = "💩💩"; // ok +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationLocation.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationLocation.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationLocation.java @@ -0,0 +1,31 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Repeatable; +import java.lang.annotation.Target; + + +@AnnotationAnnotation(value = "foo") + @AnnotationAnnotation // violation +@AnnotationAnnotation("bar") @interface InputAntlr4AstRegressionAnnotationLocation { // violation + + @AnnotationAnnotation(value = "foo") + @AnnotationAnnotation // violation + @AnnotationAnnotation("bar") String value(); // violation + +} + +@Repeatable(AnnotationAnnotations.class) +@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD}) +@interface AnnotationAnnotation { + + String value() default ""; + +} + +@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD}) +@interface AnnotationAnnotations { + + AnnotationAnnotation[] value(); + +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationLocation.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationLocation.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationLocation.txt @@ -0,0 +1,175 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +IMPORT -> import [3:0] +|--DOT -> . [3:27] +| |--DOT -> . [3:16] +| | |--DOT -> . [3:11] +| | | |--IDENT -> java [3:7] +| | | `--IDENT -> lang [3:12] +| | `--IDENT -> annotation [3:17] +| `--IDENT -> ElementType [3:28] +`--SEMI -> ; [3:39] +IMPORT -> import [4:0] +|--DOT -> . [4:27] +| |--DOT -> . [4:16] +| | |--DOT -> . [4:11] +| | | |--IDENT -> java [4:7] +| | | `--IDENT -> lang [4:12] +| | `--IDENT -> annotation [4:17] +| `--IDENT -> Repeatable [4:28] +`--SEMI -> ; [4:38] +IMPORT -> import [5:0] +|--DOT -> . [5:27] +| |--DOT -> . [5:16] +| | |--DOT -> . [5:11] +| | | |--IDENT -> java [5:7] +| | | `--IDENT -> lang [5:12] +| | `--IDENT -> annotation [5:17] +| `--IDENT -> Target [5:28] +`--SEMI -> ; [5:34] +ANNOTATION_DEF -> ANNOTATION_DEF [8:0] +|--MODIFIERS -> MODIFIERS [8:0] +| |--ANNOTATION -> ANNOTATION [8:0] +| | |--AT -> @ [8:0] +| | |--IDENT -> AnnotationAnnotation [8:1] +| | |--LPAREN -> ( [8:21] +| | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [8:22] +| | | |--IDENT -> value [8:22] +| | | |--ASSIGN -> = [8:28] +| | | `--EXPR -> EXPR [8:30] +| | | `--STRING_LITERAL -> "foo" [8:30] +| | `--RPAREN -> ) [8:35] +| |--ANNOTATION -> ANNOTATION [9:2] +| | |--AT -> @ [9:2] +| | `--IDENT -> AnnotationAnnotation [9:3] +| `--ANNOTATION -> ANNOTATION [10:0] +| |--AT -> @ [10:0] +| |--IDENT -> AnnotationAnnotation [10:1] +| |--LPAREN -> ( [10:21] +| |--EXPR -> EXPR [10:22] +| | `--STRING_LITERAL -> "bar" [10:22] +| `--RPAREN -> ) [10:27] +|--AT -> @ [10:29] +|--LITERAL_INTERFACE -> interface [10:30] +|--IDENT -> InputAntlr4AstRegressionAnnotationLocation [10:40] +`--OBJBLOCK -> OBJBLOCK [10:83] + |--LCURLY -> { [10:83] + |--ANNOTATION_FIELD_DEF -> ANNOTATION_FIELD_DEF [12:4] + | |--MODIFIERS -> MODIFIERS [12:4] + | | |--ANNOTATION -> ANNOTATION [12:4] + | | | |--AT -> @ [12:4] + | | | |--IDENT -> AnnotationAnnotation [12:5] + | | | |--LPAREN -> ( [12:25] + | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [12:26] + | | | | |--IDENT -> value [12:26] + | | | | |--ASSIGN -> = [12:32] + | | | | `--EXPR -> EXPR [12:34] + | | | | `--STRING_LITERAL -> "foo" [12:34] + | | | `--RPAREN -> ) [12:39] + | | |--ANNOTATION -> ANNOTATION [13:6] + | | | |--AT -> @ [13:6] + | | | `--IDENT -> AnnotationAnnotation [13:7] + | | `--ANNOTATION -> ANNOTATION [14:4] + | | |--AT -> @ [14:4] + | | |--IDENT -> AnnotationAnnotation [14:5] + | | |--LPAREN -> ( [14:25] + | | |--EXPR -> EXPR [14:26] + | | | `--STRING_LITERAL -> "bar" [14:26] + | | `--RPAREN -> ) [14:31] + | |--TYPE -> TYPE [14:33] + | | `--IDENT -> String [14:33] + | |--IDENT -> value [14:40] + | |--LPAREN -> ( [14:45] + | |--RPAREN -> ) [14:46] + | `--SEMI -> ; [14:47] + `--RCURLY -> } [16:0] +ANNOTATION_DEF -> ANNOTATION_DEF [18:0] +|--MODIFIERS -> MODIFIERS [18:0] +| |--ANNOTATION -> ANNOTATION [18:0] +| | |--AT -> @ [18:0] +| | |--IDENT -> Repeatable [18:1] +| | |--LPAREN -> ( [18:11] +| | |--EXPR -> EXPR [18:33] +| | | `--DOT -> . [18:33] +| | | |--IDENT -> AnnotationAnnotations [18:12] +| | | `--LITERAL_CLASS -> class [18:34] +| | `--RPAREN -> ) [18:39] +| `--ANNOTATION -> ANNOTATION [19:0] +| |--AT -> @ [19:0] +| |--IDENT -> Target [19:1] +| |--LPAREN -> ( [19:7] +| |--ANNOTATION_ARRAY_INIT -> { [19:8] +| | |--EXPR -> EXPR [19:20] +| | | `--DOT -> . [19:20] +| | | |--IDENT -> ElementType [19:9] +| | | `--IDENT -> ANNOTATION_TYPE [19:21] +| | |--COMMA -> , [19:36] +| | |--EXPR -> EXPR [19:49] +| | | `--DOT -> . [19:49] +| | | |--IDENT -> ElementType [19:38] +| | | `--IDENT -> METHOD [19:50] +| | `--RCURLY -> } [19:56] +| `--RPAREN -> ) [19:57] +|--AT -> @ [20:0] +|--LITERAL_INTERFACE -> interface [20:1] +|--IDENT -> AnnotationAnnotation [20:11] +`--OBJBLOCK -> OBJBLOCK [20:33] + |--LCURLY -> { [20:33] + |--ANNOTATION_FIELD_DEF -> ANNOTATION_FIELD_DEF [22:4] + | |--MODIFIERS -> MODIFIERS [22:4] + | |--TYPE -> TYPE [22:4] + | | `--IDENT -> String [22:4] + | |--IDENT -> value [22:11] + | |--LPAREN -> ( [22:16] + | |--RPAREN -> ) [22:17] + | |--LITERAL_DEFAULT -> default [22:19] + | | `--EXPR -> EXPR [22:27] + | | `--STRING_LITERAL -> "" [22:27] + | `--SEMI -> ; [22:29] + `--RCURLY -> } [24:0] +ANNOTATION_DEF -> ANNOTATION_DEF [26:0] +|--MODIFIERS -> MODIFIERS [26:0] +| `--ANNOTATION -> ANNOTATION [26:0] +| |--AT -> @ [26:0] +| |--IDENT -> Target [26:1] +| |--LPAREN -> ( [26:7] +| |--ANNOTATION_ARRAY_INIT -> { [26:8] +| | |--EXPR -> EXPR [26:20] +| | | `--DOT -> . [26:20] +| | | |--IDENT -> ElementType [26:9] +| | | `--IDENT -> ANNOTATION_TYPE [26:21] +| | |--COMMA -> , [26:36] +| | |--EXPR -> EXPR [26:49] +| | | `--DOT -> . [26:49] +| | | |--IDENT -> ElementType [26:38] +| | | `--IDENT -> METHOD [26:50] +| | `--RCURLY -> } [26:56] +| `--RPAREN -> ) [26:57] +|--AT -> @ [27:0] +|--LITERAL_INTERFACE -> interface [27:1] +|--IDENT -> AnnotationAnnotations [27:11] +`--OBJBLOCK -> OBJBLOCK [27:33] + |--LCURLY -> { [27:33] + |--ANNOTATION_FIELD_DEF -> ANNOTATION_FIELD_DEF [29:4] + | |--MODIFIERS -> MODIFIERS [29:4] + | |--TYPE -> TYPE [29:4] + | | |--IDENT -> AnnotationAnnotation [29:4] + | | `--ARRAY_DECLARATOR -> [ [29:24] + | | `--RBRACK -> ] [29:25] + | |--IDENT -> value [29:27] + | |--LPAREN -> ( [29:32] + | |--RPAREN -> ) [29:33] + | `--SEMI -> ; [29:34] + `--RCURLY -> } [31:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnArrays.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnArrays.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnArrays.java @@ -0,0 +1,53 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +import static java.lang.annotation.ElementType.TYPE_USE; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +public class InputAntlr4AstRegressionAnnotationOnArrays { + + private String array1 @Nullable []; + private @Nullable int array2 @Nullable [] @Nullable []; + + private InputAntlr4AstRegressionAnnotationOnArrays() { + } + + public static <T> T[] checkNotNullContents(T @Nullable [] array) { + if (array == null) { + throw new NullPointerException(); + } + + return array; + } + + public static <T> T[][] checkNotNullContents2(T @Nullable [] @Nullable [] array) { + if (array == null) { + throw new NullPointerException(); + } + + return array; + } + + public static <T> T @Nullable [] checkNotNullContents3(T array @Nullable []) { + if (array == null) { + throw new NullPointerException(); + } + + return array; + } + + public <T> T checkNotNullContents4(T @Nullable [] array) @Nullable [] { + if (array == null) { + throw new NullPointerException(); + } + String tmp1 @Nullable []; + @Nullable Object[] tmp2 = new @Nullable Integer[3]; + @Nullable int[] tmp3 = new @Nullable int[3]; + @Nullable Object tmp4 = new @Nullable String @Nullable [3] @Nullable [2]; + @Nullable Object tmp5 = new @Nullable int @Nullable [3] @Nullable [2]; + + return array; + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnArrays.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnArrays.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnArrays.txt @@ -0,0 +1,448 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +STATIC_IMPORT -> import [3:0] +|--LITERAL_STATIC -> static [3:7] +|--DOT -> . [3:46] +| |--DOT -> . [3:34] +| | |--DOT -> . [3:23] +| | | |--DOT -> . [3:18] +| | | | |--IDENT -> java [3:14] +| | | | `--IDENT -> lang [3:19] +| | | `--IDENT -> annotation [3:24] +| | `--IDENT -> ElementType [3:35] +| `--IDENT -> TYPE_USE [3:47] +`--SEMI -> ; [3:55] +IMPORT -> import [5:0] +|--DOT -> . [5:27] +| |--DOT -> . [5:16] +| | |--DOT -> . [5:11] +| | | |--IDENT -> java [5:7] +| | | `--IDENT -> lang [5:12] +| | `--IDENT -> annotation [5:17] +| `--IDENT -> Retention [5:28] +`--SEMI -> ; [5:37] +IMPORT -> import [6:0] +|--DOT -> . [6:27] +| |--DOT -> . [6:16] +| | |--DOT -> . [6:11] +| | | |--IDENT -> java [6:7] +| | | `--IDENT -> lang [6:12] +| | `--IDENT -> annotation [6:17] +| `--IDENT -> RetentionPolicy [6:28] +`--SEMI -> ; [6:43] +IMPORT -> import [7:0] +|--DOT -> . [7:27] +| |--DOT -> . [7:16] +| | |--DOT -> . [7:11] +| | | |--IDENT -> java [7:7] +| | | `--IDENT -> lang [7:12] +| | `--IDENT -> annotation [7:17] +| `--IDENT -> Target [7:28] +`--SEMI -> ; [7:34] +CLASS_DEF -> CLASS_DEF [9:0] +|--MODIFIERS -> MODIFIERS [9:0] +| `--LITERAL_PUBLIC -> public [9:0] +|--LITERAL_CLASS -> class [9:7] +|--IDENT -> InputAntlr4AstRegressionAnnotationOnArrays [9:13] +`--OBJBLOCK -> OBJBLOCK [9:56] + |--LCURLY -> { [9:56] + |--VARIABLE_DEF -> VARIABLE_DEF [11:4] + | |--MODIFIERS -> MODIFIERS [11:4] + | | `--LITERAL_PRIVATE -> private [11:4] + | |--TYPE -> TYPE [11:12] + | | |--IDENT -> String [11:12] + | | |--ANNOTATIONS -> ANNOTATIONS [11:26] + | | | `--ANNOTATION -> ANNOTATION [11:26] + | | | |--AT -> @ [11:26] + | | | `--IDENT -> Nullable [11:27] + | | `--ARRAY_DECLARATOR -> [ [11:36] + | | `--RBRACK -> ] [11:37] + | |--IDENT -> array1 [11:19] + | `--SEMI -> ; [11:38] + |--VARIABLE_DEF -> VARIABLE_DEF [12:4] + | |--MODIFIERS -> MODIFIERS [12:4] + | | |--LITERAL_PRIVATE -> private [12:4] + | | `--ANNOTATION -> ANNOTATION [12:12] + | | |--AT -> @ [12:12] + | | `--IDENT -> Nullable [12:13] + | |--TYPE -> TYPE [12:22] + | | |--LITERAL_INT -> int [12:22] + | | |--ANNOTATIONS -> ANNOTATIONS [12:33] + | | | `--ANNOTATION -> ANNOTATION [12:33] + | | | |--AT -> @ [12:33] + | | | `--IDENT -> Nullable [12:34] + | | |--ARRAY_DECLARATOR -> [ [12:43] + | | | `--RBRACK -> ] [12:44] + | | |--ANNOTATIONS -> ANNOTATIONS [12:46] + | | | `--ANNOTATION -> ANNOTATION [12:46] + | | | |--AT -> @ [12:46] + | | | `--IDENT -> Nullable [12:47] + | | `--ARRAY_DECLARATOR -> [ [12:56] + | | `--RBRACK -> ] [12:57] + | |--IDENT -> array2 [12:26] + | `--SEMI -> ; [12:58] + |--CTOR_DEF -> CTOR_DEF [14:4] + | |--MODIFIERS -> MODIFIERS [14:4] + | | `--LITERAL_PRIVATE -> private [14:4] + | |--IDENT -> InputAntlr4AstRegressionAnnotationOnArrays [14:12] + | |--LPAREN -> ( [14:54] + | |--PARAMETERS -> PARAMETERS [14:55] + | |--RPAREN -> ) [14:55] + | `--SLIST -> { [14:57] + | `--RCURLY -> } [15:4] + |--METHOD_DEF -> METHOD_DEF [17:4] + | |--MODIFIERS -> MODIFIERS [17:4] + | | |--LITERAL_PUBLIC -> public [17:4] + | | `--LITERAL_STATIC -> static [17:11] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [17:18] + | | |--GENERIC_START -> < [17:18] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [17:19] + | | | `--IDENT -> T [17:19] + | | `--GENERIC_END -> > [17:20] + | |--TYPE -> TYPE [17:22] + | | |--IDENT -> T [17:22] + | | `--ARRAY_DECLARATOR -> [ [17:23] + | | `--RBRACK -> ] [17:24] + | |--IDENT -> checkNotNullContents [17:26] + | |--LPAREN -> ( [17:46] + | |--PARAMETERS -> PARAMETERS [17:47] + | | `--PARAMETER_DEF -> PARAMETER_DEF [17:47] + | | |--MODIFIERS -> MODIFIERS [17:47] + | | |--TYPE -> TYPE [17:47] + | | | |--IDENT -> T [17:47] + | | | |--ANNOTATIONS -> ANNOTATIONS [17:49] + | | | | `--ANNOTATION -> ANNOTATION [17:49] + | | | | |--AT -> @ [17:49] + | | | | `--IDENT -> Nullable [17:50] + | | | `--ARRAY_DECLARATOR -> [ [17:59] + | | | `--RBRACK -> ] [17:60] + | | `--IDENT -> array [17:62] + | |--RPAREN -> ) [17:67] + | `--SLIST -> { [17:69] + | |--LITERAL_IF -> if [18:8] + | | |--LPAREN -> ( [18:11] + | | |--EXPR -> EXPR [18:18] + | | | `--EQUAL -> == [18:18] + | | | |--IDENT -> array [18:12] + | | | `--LITERAL_NULL -> null [18:21] + | | |--RPAREN -> ) [18:25] + | | `--SLIST -> { [18:27] + | | |--LITERAL_THROW -> throw [19:12] + | | | |--EXPR -> EXPR [19:18] + | | | | `--LITERAL_NEW -> new [19:18] + | | | | |--IDENT -> NullPointerException [19:22] + | | | | |--LPAREN -> ( [19:42] + | | | | |--ELIST -> ELIST [19:43] + | | | | `--RPAREN -> ) [19:43] + | | | `--SEMI -> ; [19:44] + | | `--RCURLY -> } [20:8] + | |--LITERAL_RETURN -> return [22:8] + | | |--EXPR -> EXPR [22:15] + | | | `--IDENT -> array [22:15] + | | `--SEMI -> ; [22:20] + | `--RCURLY -> } [23:4] + |--METHOD_DEF -> METHOD_DEF [25:4] + | |--MODIFIERS -> MODIFIERS [25:4] + | | |--LITERAL_PUBLIC -> public [25:4] + | | `--LITERAL_STATIC -> static [25:11] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [25:18] + | | |--GENERIC_START -> < [25:18] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [25:19] + | | | `--IDENT -> T [25:19] + | | `--GENERIC_END -> > [25:20] + | |--TYPE -> TYPE [25:22] + | | |--IDENT -> T [25:22] + | | |--ARRAY_DECLARATOR -> [ [25:23] + | | | `--RBRACK -> ] [25:24] + | | `--ARRAY_DECLARATOR -> [ [25:25] + | | `--RBRACK -> ] [25:26] + | |--IDENT -> checkNotNullContents2 [25:28] + | |--LPAREN -> ( [25:49] + | |--PARAMETERS -> PARAMETERS [25:50] + | | `--PARAMETER_DEF -> PARAMETER_DEF [25:50] + | | |--MODIFIERS -> MODIFIERS [25:50] + | | |--TYPE -> TYPE [25:50] + | | | |--IDENT -> T [25:50] + | | | |--ANNOTATIONS -> ANNOTATIONS [25:52] + | | | | `--ANNOTATION -> ANNOTATION [25:52] + | | | | |--AT -> @ [25:52] + | | | | `--IDENT -> Nullable [25:53] + | | | |--ARRAY_DECLARATOR -> [ [25:62] + | | | | `--RBRACK -> ] [25:63] + | | | |--ANNOTATIONS -> ANNOTATIONS [25:65] + | | | | `--ANNOTATION -> ANNOTATION [25:65] + | | | | |--AT -> @ [25:65] + | | | | `--IDENT -> Nullable [25:66] + | | | `--ARRAY_DECLARATOR -> [ [25:75] + | | | `--RBRACK -> ] [25:76] + | | `--IDENT -> array [25:78] + | |--RPAREN -> ) [25:83] + | `--SLIST -> { [25:85] + | |--LITERAL_IF -> if [26:8] + | | |--LPAREN -> ( [26:11] + | | |--EXPR -> EXPR [26:18] + | | | `--EQUAL -> == [26:18] + | | | |--IDENT -> array [26:12] + | | | `--LITERAL_NULL -> null [26:21] + | | |--RPAREN -> ) [26:25] + | | `--SLIST -> { [26:27] + | | |--LITERAL_THROW -> throw [27:12] + | | | |--EXPR -> EXPR [27:18] + | | | | `--LITERAL_NEW -> new [27:18] + | | | | |--IDENT -> NullPointerException [27:22] + | | | | |--LPAREN -> ( [27:42] + | | | | |--ELIST -> ELIST [27:43] + | | | | `--RPAREN -> ) [27:43] + | | | `--SEMI -> ; [27:44] + | | `--RCURLY -> } [28:8] + | |--LITERAL_RETURN -> return [30:8] + | | |--EXPR -> EXPR [30:15] + | | | `--IDENT -> array [30:15] + | | `--SEMI -> ; [30:20] + | `--RCURLY -> } [31:4] + |--METHOD_DEF -> METHOD_DEF [33:4] + | |--MODIFIERS -> MODIFIERS [33:4] + | | |--LITERAL_PUBLIC -> public [33:4] + | | `--LITERAL_STATIC -> static [33:11] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [33:18] + | | |--GENERIC_START -> < [33:18] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [33:19] + | | | `--IDENT -> T [33:19] + | | `--GENERIC_END -> > [33:20] + | |--TYPE -> TYPE [33:22] + | | |--IDENT -> T [33:22] + | | |--ANNOTATIONS -> ANNOTATIONS [33:24] + | | | `--ANNOTATION -> ANNOTATION [33:24] + | | | |--AT -> @ [33:24] + | | | `--IDENT -> Nullable [33:25] + | | `--ARRAY_DECLARATOR -> [ [33:34] + | | `--RBRACK -> ] [33:35] + | |--IDENT -> checkNotNullContents3 [33:37] + | |--LPAREN -> ( [33:58] + | |--PARAMETERS -> PARAMETERS [33:59] + | | `--PARAMETER_DEF -> PARAMETER_DEF [33:59] + | | |--MODIFIERS -> MODIFIERS [33:59] + | | |--TYPE -> TYPE [33:59] + | | | |--IDENT -> T [33:59] + | | | |--ANNOTATIONS -> ANNOTATIONS [33:67] + | | | | `--ANNOTATION -> ANNOTATION [33:67] + | | | | |--AT -> @ [33:67] + | | | | `--IDENT -> Nullable [33:68] + | | | `--ARRAY_DECLARATOR -> [ [33:77] + | | | `--RBRACK -> ] [33:78] + | | `--IDENT -> array [33:61] + | |--RPAREN -> ) [33:79] + | `--SLIST -> { [33:81] + | |--LITERAL_IF -> if [34:8] + | | |--LPAREN -> ( [34:11] + | | |--EXPR -> EXPR [34:18] + | | | `--EQUAL -> == [34:18] + | | | |--IDENT -> array [34:12] + | | | `--LITERAL_NULL -> null [34:21] + | | |--RPAREN -> ) [34:25] + | | `--SLIST -> { [34:27] + | | |--LITERAL_THROW -> throw [35:12] + | | | |--EXPR -> EXPR [35:18] + | | | | `--LITERAL_NEW -> new [35:18] + | | | | |--IDENT -> NullPointerException [35:22] + | | | | |--LPAREN -> ( [35:42] + | | | | |--ELIST -> ELIST [35:43] + | | | | `--RPAREN -> ) [35:43] + | | | `--SEMI -> ; [35:44] + | | `--RCURLY -> } [36:8] + | |--LITERAL_RETURN -> return [38:8] + | | |--EXPR -> EXPR [38:15] + | | | `--IDENT -> array [38:15] + | | `--SEMI -> ; [38:20] + | `--RCURLY -> } [39:4] + |--METHOD_DEF -> METHOD_DEF [41:4] + | |--MODIFIERS -> MODIFIERS [41:4] + | | `--LITERAL_PUBLIC -> public [41:4] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [41:11] + | | |--GENERIC_START -> < [41:11] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [41:12] + | | | `--IDENT -> T [41:12] + | | `--GENERIC_END -> > [41:13] + | |--TYPE -> TYPE [41:15] + | | |--IDENT -> T [41:15] + | | |--ANNOTATIONS -> ANNOTATIONS [41:61] + | | | `--ANNOTATION -> ANNOTATION [41:61] + | | | |--AT -> @ [41:61] + | | | `--IDENT -> Nullable [41:62] + | | `--ARRAY_DECLARATOR -> [ [41:71] + | | `--RBRACK -> ] [41:72] + | |--IDENT -> checkNotNullContents4 [41:17] + | |--LPAREN -> ( [41:38] + | |--PARAMETERS -> PARAMETERS [41:39] + | | `--PARAMETER_DEF -> PARAMETER_DEF [41:39] + | | |--MODIFIERS -> MODIFIERS [41:39] + | | |--TYPE -> TYPE [41:39] + | | | |--IDENT -> T [41:39] + | | | |--ANNOTATIONS -> ANNOTATIONS [41:41] + | | | | `--ANNOTATION -> ANNOTATION [41:41] + | | | | |--AT -> @ [41:41] + | | | | `--IDENT -> Nullable [41:42] + | | | `--ARRAY_DECLARATOR -> [ [41:51] + | | | `--RBRACK -> ] [41:52] + | | `--IDENT -> array [41:54] + | |--RPAREN -> ) [41:59] + | `--SLIST -> { [41:74] + | |--LITERAL_IF -> if [42:8] + | | |--LPAREN -> ( [42:11] + | | |--EXPR -> EXPR [42:18] + | | | `--EQUAL -> == [42:18] + | | | |--IDENT -> array [42:12] + | | | `--LITERAL_NULL -> null [42:21] + | | |--RPAREN -> ) [42:25] + | | `--SLIST -> { [42:27] + | | |--LITERAL_THROW -> throw [43:12] + | | | |--EXPR -> EXPR [43:18] + | | | | `--LITERAL_NEW -> new [43:18] + | | | | |--IDENT -> NullPointerException [43:22] + | | | | |--LPAREN -> ( [43:42] + | | | | |--ELIST -> ELIST [43:43] + | | | | `--RPAREN -> ) [43:43] + | | | `--SEMI -> ; [43:44] + | | `--RCURLY -> } [44:8] + | |--VARIABLE_DEF -> VARIABLE_DEF [45:8] + | | |--MODIFIERS -> MODIFIERS [45:8] + | | |--TYPE -> TYPE [45:8] + | | | |--IDENT -> String [45:8] + | | | |--ANNOTATIONS -> ANNOTATIONS [45:20] + | | | | `--ANNOTATION -> ANNOTATION [45:20] + | | | | |--AT -> @ [45:20] + | | | | `--IDENT -> Nullable [45:21] + | | | `--ARRAY_DECLARATOR -> [ [45:30] + | | | `--RBRACK -> ] [45:31] + | | `--IDENT -> tmp1 [45:15] + | |--SEMI -> ; [45:32] + | |--VARIABLE_DEF -> VARIABLE_DEF [46:8] + | | |--MODIFIERS -> MODIFIERS [46:8] + | | | `--ANNOTATION -> ANNOTATION [46:8] + | | | |--AT -> @ [46:8] + | | | `--IDENT -> Nullable [46:9] + | | |--TYPE -> TYPE [46:18] + | | | |--IDENT -> Object [46:18] + | | | `--ARRAY_DECLARATOR -> [ [46:24] + | | | `--RBRACK -> ] [46:25] + | | |--IDENT -> tmp2 [46:27] + | | `--ASSIGN -> = [46:32] + | | `--EXPR -> EXPR [46:34] + | | `--LITERAL_NEW -> new [46:34] + | | |--ANNOTATIONS -> ANNOTATIONS [46:38] + | | | `--ANNOTATION -> ANNOTATION [46:38] + | | | |--AT -> @ [46:38] + | | | `--IDENT -> Nullable [46:39] + | | |--IDENT -> Integer [46:48] + | | `--ARRAY_DECLARATOR -> [ [46:55] + | | |--EXPR -> EXPR [46:56] + | | | `--NUM_INT -> 3 [46:56] + | | `--RBRACK -> ] [46:57] + | |--SEMI -> ; [46:58] + | |--VARIABLE_DEF -> VARIABLE_DEF [47:8] + | | |--MODIFIERS -> MODIFIERS [47:8] + | | | `--ANNOTATION -> ANNOTATION [47:8] + | | | |--AT -> @ [47:8] + | | | `--IDENT -> Nullable [47:9] + | | |--TYPE -> TYPE [47:18] + | | | |--LITERAL_INT -> int [47:18] + | | | `--ARRAY_DECLARATOR -> [ [47:21] + | | | `--RBRACK -> ] [47:22] + | | |--IDENT -> tmp3 [47:24] + | | `--ASSIGN -> = [47:29] + | | `--EXPR -> EXPR [47:31] + | | `--LITERAL_NEW -> new [47:31] + | | |--ANNOTATIONS -> ANNOTATIONS [47:35] + | | | `--ANNOTATION -> ANNOTATION [47:35] + | | | |--AT -> @ [47:35] + | | | `--IDENT -> Nullable [47:36] + | | |--LITERAL_INT -> int [47:45] + | | `--ARRAY_DECLARATOR -> [ [47:48] + | | |--EXPR -> EXPR [47:49] + | | | `--NUM_INT -> 3 [47:49] + | | `--RBRACK -> ] [47:50] + | |--SEMI -> ; [47:51] + | |--VARIABLE_DEF -> VARIABLE_DEF [48:8] + | | |--MODIFIERS -> MODIFIERS [48:8] + | | | `--ANNOTATION -> ANNOTATION [48:8] + | | | |--AT -> @ [48:8] + | | | `--IDENT -> Nullable [48:9] + | | |--TYPE -> TYPE [48:18] + | | | `--IDENT -> Object [48:18] + | | |--IDENT -> tmp4 [48:25] + | | `--ASSIGN -> = [48:30] + | | `--EXPR -> EXPR [48:32] + | | `--LITERAL_NEW -> new [48:32] + | | |--ANNOTATIONS -> ANNOTATIONS [48:36] + | | | `--ANNOTATION -> ANNOTATION [48:36] + | | | |--AT -> @ [48:36] + | | | `--IDENT -> Nullable [48:37] + | | |--IDENT -> String [48:46] + | | |--ANNOTATIONS -> ANNOTATIONS [48:53] + | | | `--ANNOTATION -> ANNOTATION [48:53] + | | | |--AT -> @ [48:53] + | | | `--IDENT -> Nullable [48:54] + | | |--ARRAY_DECLARATOR -> [ [48:63] + | | | |--EXPR -> EXPR [48:64] + | | | | `--NUM_INT -> 3 [48:64] + | | | `--RBRACK -> ] [48:65] + | | |--ANNOTATIONS -> ANNOTATIONS [48:67] + | | | `--ANNOTATION -> ANNOTATION [48:67] + | | | |--AT -> @ [48:67] + | | | `--IDENT -> Nullable [48:68] + | | `--ARRAY_DECLARATOR -> [ [48:77] + | | |--EXPR -> EXPR [48:78] + | | | `--NUM_INT -> 2 [48:78] + | | `--RBRACK -> ] [48:79] + | |--SEMI -> ; [48:80] + | |--VARIABLE_DEF -> VARIABLE_DEF [49:8] + | | |--MODIFIERS -> MODIFIERS [49:8] + | | | `--ANNOTATION -> ANNOTATION [49:8] + | | | |--AT -> @ [49:8] + | | | `--IDENT -> Nullable [49:9] + | | |--TYPE -> TYPE [49:18] + | | | `--IDENT -> Object [49:18] + | | |--IDENT -> tmp5 [49:25] + | | `--ASSIGN -> = [49:30] + | | `--EXPR -> EXPR [49:32] + | | `--LITERAL_NEW -> new [49:32] + | | |--ANNOTATIONS -> ANNOTATIONS [49:36] + | | | `--ANNOTATION -> ANNOTATION [49:36] + | | | |--AT -> @ [49:36] + | | | `--IDENT -> Nullable [49:37] + | | |--LITERAL_INT -> int [49:46] + | | |--ANNOTATIONS -> ANNOTATIONS [49:50] + | | | `--ANNOTATION -> ANNOTATION [49:50] + | | | |--AT -> @ [49:50] + | | | `--IDENT -> Nullable [49:51] + | | |--ARRAY_DECLARATOR -> [ [49:60] + | | | |--EXPR -> EXPR [49:61] + | | | | `--NUM_INT -> 3 [49:61] + | | | `--RBRACK -> ] [49:62] + | | |--ANNOTATIONS -> ANNOTATIONS [49:64] + | | | `--ANNOTATION -> ANNOTATION [49:64] + | | | |--AT -> @ [49:64] + | | | `--IDENT -> Nullable [49:65] + | | `--ARRAY_DECLARATOR -> [ [49:74] + | | |--EXPR -> EXPR [49:75] + | | | `--NUM_INT -> 2 [49:75] + | | `--RBRACK -> ] [49:76] + | |--SEMI -> ; [49:77] + | |--LITERAL_RETURN -> return [51:8] + | | |--EXPR -> EXPR [51:15] + | | | `--IDENT -> array [51:15] + | | `--SEMI -> ; [51:20] + | `--RCURLY -> } [52:4] + `--RCURLY -> } [53:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnQualifiedTypes.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnQualifiedTypes.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnQualifiedTypes.java @@ -0,0 +1,30 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +import java.awt.geom.Rectangle2D; +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; + +public class InputAntlr4AstRegressionAnnotationOnQualifiedTypes { + /* Causes parse failure */ + Rectangle2D.@Ann Double rect = null; + + /* Causes parse failure */ + public final Rectangle2D.@Ann Double getRect1() { + return new Rectangle2D.Double(); + } + + /* Causes parse failure */ + public final Rectangle2D.Double getRect2() { + return new Rectangle2D.@Ann Double(); + } + + /* Amazingly does not cause parse failure */ + public final Rectangle2D.Double getRect3() { + Rectangle2D.@Ann Double rect = null; + return rect; + } +} + +@Target({ ElementType.TYPE_USE }) +@interface Anno { +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnQualifiedTypes.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnQualifiedTypes.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnQualifiedTypes.txt @@ -0,0 +1,172 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +IMPORT -> import [3:0] +|--DOT -> . [3:20] +| |--DOT -> . [3:15] +| | |--DOT -> . [3:11] +| | | |--IDENT -> java [3:7] +| | | `--IDENT -> awt [3:12] +| | `--IDENT -> geom [3:16] +| `--IDENT -> Rectangle2D [3:21] +`--SEMI -> ; [3:32] +IMPORT -> import [4:0] +|--DOT -> . [4:27] +| |--DOT -> . [4:16] +| | |--DOT -> . [4:11] +| | | |--IDENT -> java [4:7] +| | | `--IDENT -> lang [4:12] +| | `--IDENT -> annotation [4:17] +| `--IDENT -> ElementType [4:28] +`--SEMI -> ; [4:39] +IMPORT -> import [5:0] +|--DOT -> . [5:27] +| |--DOT -> . [5:16] +| | |--DOT -> . [5:11] +| | | |--IDENT -> java [5:7] +| | | `--IDENT -> lang [5:12] +| | `--IDENT -> annotation [5:17] +| `--IDENT -> Target [5:28] +`--SEMI -> ; [5:34] +CLASS_DEF -> CLASS_DEF [7:0] +|--MODIFIERS -> MODIFIERS [7:0] +| `--LITERAL_PUBLIC -> public [7:0] +|--LITERAL_CLASS -> class [7:7] +|--IDENT -> InputAntlr4AstRegressionAnnotationOnQualifiedTypes [7:13] +`--OBJBLOCK -> OBJBLOCK [7:64] + |--LCURLY -> { [7:64] + |--VARIABLE_DEF -> VARIABLE_DEF [9:15] + | |--MODIFIERS -> MODIFIERS [9:15] + | |--TYPE -> TYPE [9:15] + | | `--DOT -> . [9:15] + | | |--IDENT -> Rectangle2D [9:4] + | | |--ANNOTATIONS -> ANNOTATIONS [9:16] + | | | `--ANNOTATION -> ANNOTATION [9:16] + | | | |--AT -> @ [9:16] + | | | `--IDENT -> Ann [9:17] + | | `--IDENT -> Double [9:21] + | |--IDENT -> rect [9:28] + | |--ASSIGN -> = [9:33] + | | `--EXPR -> EXPR [9:35] + | | `--LITERAL_NULL -> null [9:35] + | `--SEMI -> ; [9:39] + |--METHOD_DEF -> METHOD_DEF [12:4] + | |--MODIFIERS -> MODIFIERS [12:4] + | | |--LITERAL_PUBLIC -> public [12:4] + | | `--FINAL -> final [12:11] + | |--TYPE -> TYPE [12:28] + | | `--DOT -> . [12:28] + | | |--IDENT -> Rectangle2D [12:17] + | | |--ANNOTATIONS -> ANNOTATIONS [12:29] + | | | `--ANNOTATION -> ANNOTATION [12:29] + | | | |--AT -> @ [12:29] + | | | `--IDENT -> Ann [12:30] + | | `--IDENT -> Double [12:34] + | |--IDENT -> getRect1 [12:41] + | |--LPAREN -> ( [12:49] + | |--PARAMETERS -> PARAMETERS [12:50] + | |--RPAREN -> ) [12:50] + | `--SLIST -> { [12:52] + | |--LITERAL_RETURN -> return [13:8] + | | |--EXPR -> EXPR [13:15] + | | | `--LITERAL_NEW -> new [13:15] + | | | |--DOT -> . [13:30] + | | | | |--IDENT -> Rectangle2D [13:19] + | | | | `--IDENT -> Double [13:31] + | | | |--LPAREN -> ( [13:37] + | | | |--ELIST -> ELIST [13:38] + | | | `--RPAREN -> ) [13:38] + | | `--SEMI -> ; [13:39] + | `--RCURLY -> } [14:4] + |--METHOD_DEF -> METHOD_DEF [17:4] + | |--MODIFIERS -> MODIFIERS [17:4] + | | |--LITERAL_PUBLIC -> public [17:4] + | | `--FINAL -> final [17:11] + | |--TYPE -> TYPE [17:28] + | | `--DOT -> . [17:28] + | | |--IDENT -> Rectangle2D [17:17] + | | `--IDENT -> Double [17:29] + | |--IDENT -> getRect2 [17:36] + | |--LPAREN -> ( [17:44] + | |--PARAMETERS -> PARAMETERS [17:45] + | |--RPAREN -> ) [17:45] + | `--SLIST -> { [17:47] + | |--LITERAL_RETURN -> return [18:8] + | | |--EXPR -> EXPR [18:15] + | | | `--LITERAL_NEW -> new [18:15] + | | | |--DOT -> . [18:30] + | | | | |--IDENT -> Rectangle2D [18:19] + | | | | |--ANNOTATIONS -> ANNOTATIONS [18:31] + | | | | | `--ANNOTATION -> ANNOTATION [18:31] + | | | | | |--AT -> @ [18:31] + | | | | | `--IDENT -> Ann [18:32] + | | | | `--IDENT -> Double [18:36] + | | | |--LPAREN -> ( [18:42] + | | | |--ELIST -> ELIST [18:43] + | | | `--RPAREN -> ) [18:43] + | | `--SEMI -> ; [18:44] + | `--RCURLY -> } [19:4] + |--METHOD_DEF -> METHOD_DEF [22:4] + | |--MODIFIERS -> MODIFIERS [22:4] + | | |--LITERAL_PUBLIC -> public [22:4] + | | `--FINAL -> final [22:11] + | |--TYPE -> TYPE [22:28] + | | `--DOT -> . [22:28] + | | |--IDENT -> Rectangle2D [22:17] + | | `--IDENT -> Double [22:29] + | |--IDENT -> getRect3 [22:36] + | |--LPAREN -> ( [22:44] + | |--PARAMETERS -> PARAMETERS [22:45] + | |--RPAREN -> ) [22:45] + | `--SLIST -> { [22:47] + | |--VARIABLE_DEF -> VARIABLE_DEF [23:19] + | | |--MODIFIERS -> MODIFIERS [23:19] + | | |--TYPE -> TYPE [23:19] + | | | `--DOT -> . [23:19] + | | | |--IDENT -> Rectangle2D [23:8] + | | | |--ANNOTATIONS -> ANNOTATIONS [23:20] + | | | | `--ANNOTATION -> ANNOTATION [23:20] + | | | | |--AT -> @ [23:20] + | | | | `--IDENT -> Ann [23:21] + | | | `--IDENT -> Double [23:25] + | | |--IDENT -> rect [23:32] + | | `--ASSIGN -> = [23:37] + | | `--EXPR -> EXPR [23:39] + | | `--LITERAL_NULL -> null [23:39] + | |--SEMI -> ; [23:43] + | |--LITERAL_RETURN -> return [24:8] + | | |--EXPR -> EXPR [24:15] + | | | `--IDENT -> rect [24:15] + | | `--SEMI -> ; [24:19] + | `--RCURLY -> } [25:4] + `--RCURLY -> } [26:0] +ANNOTATION_DEF -> ANNOTATION_DEF [28:0] +|--MODIFIERS -> MODIFIERS [28:0] +| `--ANNOTATION -> ANNOTATION [28:0] +| |--AT -> @ [28:0] +| |--IDENT -> Target [28:1] +| |--LPAREN -> ( [28:7] +| |--ANNOTATION_ARRAY_INIT -> { [28:8] +| | |--EXPR -> EXPR [28:21] +| | | `--DOT -> . [28:21] +| | | |--IDENT -> ElementType [28:10] +| | | `--IDENT -> TYPE_USE [28:22] +| | `--RCURLY -> } [28:31] +| `--RPAREN -> ) [28:32] +|--AT -> @ [29:0] +|--LITERAL_INTERFACE -> interface [29:1] +|--IDENT -> Anno [29:11] +`--OBJBLOCK -> OBJBLOCK [29:16] + |--LCURLY -> { [29:16] + `--RCURLY -> } [30:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnSameLine.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnSameLine.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnSameLine.java @@ -0,0 +1,38 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.ElementType.TYPE_PARAMETER; +import static java.lang.annotation.ElementType.TYPE_USE; + +import java.lang.annotation.Target; +import java.util.ArrayList; +import java.util.List; + +public class InputAntlr4AstRegressionAnnotationOnSameLine { + @Ann // ok + private List<String> names = new ArrayList<>(); + + @Ann private List<String> names2 = new ArrayList<>(); // violation + + @SuppressWarnings("deprecation") // violation + @Ann Integer x; + + @SuppressWarnings("deprecation") // violation + @Ann // violation + Integer x2; + + @SuppressWarnings("deprecation") @Ann @Ann2 @Ann3 @Ann4 Integer x3; // ok + +} + +@Target({CONSTRUCTOR, FIELD, METHOD, PARAMETER, TYPE, TYPE_PARAMETER, TYPE_USE}) @interface Ann {} + +@Target({CONSTRUCTOR, FIELD, METHOD, PARAMETER, TYPE, TYPE_PARAMETER, TYPE_USE}) @interface Ann2 {} + +@interface Ann3 {} + +@interface Ann4 {} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnSameLine.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnSameLine.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnSameLine.txt @@ -0,0 +1,322 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +STATIC_IMPORT -> import [3:0] +|--LITERAL_STATIC -> static [3:7] +|--DOT -> . [3:46] +| |--DOT -> . [3:34] +| | |--DOT -> . [3:23] +| | | |--DOT -> . [3:18] +| | | | |--IDENT -> java [3:14] +| | | | `--IDENT -> lang [3:19] +| | | `--IDENT -> annotation [3:24] +| | `--IDENT -> ElementType [3:35] +| `--IDENT -> CONSTRUCTOR [3:47] +`--SEMI -> ; [3:58] +STATIC_IMPORT -> import [4:0] +|--LITERAL_STATIC -> static [4:7] +|--DOT -> . [4:46] +| |--DOT -> . [4:34] +| | |--DOT -> . [4:23] +| | | |--DOT -> . [4:18] +| | | | |--IDENT -> java [4:14] +| | | | `--IDENT -> lang [4:19] +| | | `--IDENT -> annotation [4:24] +| | `--IDENT -> ElementType [4:35] +| `--IDENT -> FIELD [4:47] +`--SEMI -> ; [4:52] +STATIC_IMPORT -> import [5:0] +|--LITERAL_STATIC -> static [5:7] +|--DOT -> . [5:46] +| |--DOT -> . [5:34] +| | |--DOT -> . [5:23] +| | | |--DOT -> . [5:18] +| | | | |--IDENT -> java [5:14] +| | | | `--IDENT -> lang [5:19] +| | | `--IDENT -> annotation [5:24] +| | `--IDENT -> ElementType [5:35] +| `--IDENT -> METHOD [5:47] +`--SEMI -> ; [5:53] +STATIC_IMPORT -> import [6:0] +|--LITERAL_STATIC -> static [6:7] +|--DOT -> . [6:46] +| |--DOT -> . [6:34] +| | |--DOT -> . [6:23] +| | | |--DOT -> . [6:18] +| | | | |--IDENT -> java [6:14] +| | | | `--IDENT -> lang [6:19] +| | | `--IDENT -> annotation [6:24] +| | `--IDENT -> ElementType [6:35] +| `--IDENT -> PARAMETER [6:47] +`--SEMI -> ; [6:56] +STATIC_IMPORT -> import [7:0] +|--LITERAL_STATIC -> static [7:7] +|--DOT -> . [7:46] +| |--DOT -> . [7:34] +| | |--DOT -> . [7:23] +| | | |--DOT -> . [7:18] +| | | | |--IDENT -> java [7:14] +| | | | `--IDENT -> lang [7:19] +| | | `--IDENT -> annotation [7:24] +| | `--IDENT -> ElementType [7:35] +| `--IDENT -> TYPE [7:47] +`--SEMI -> ; [7:51] +STATIC_IMPORT -> import [8:0] +|--LITERAL_STATIC -> static [8:7] +|--DOT -> . [8:46] +| |--DOT -> . [8:34] +| | |--DOT -> . [8:23] +| | | |--DOT -> . [8:18] +| | | | |--IDENT -> java [8:14] +| | | | `--IDENT -> lang [8:19] +| | | `--IDENT -> annotation [8:24] +| | `--IDENT -> ElementType [8:35] +| `--IDENT -> TYPE_PARAMETER [8:47] +`--SEMI -> ; [8:61] +STATIC_IMPORT -> import [9:0] +|--LITERAL_STATIC -> static [9:7] +|--DOT -> . [9:46] +| |--DOT -> . [9:34] +| | |--DOT -> . [9:23] +| | | |--DOT -> . [9:18] +| | | | |--IDENT -> java [9:14] +| | | | `--IDENT -> lang [9:19] +| | | `--IDENT -> annotation [9:24] +| | `--IDENT -> ElementType [9:35] +| `--IDENT -> TYPE_USE [9:47] +`--SEMI -> ; [9:55] +IMPORT -> import [11:0] +|--DOT -> . [11:27] +| |--DOT -> . [11:16] +| | |--DOT -> . [11:11] +| | | |--IDENT -> java [11:7] +| | | `--IDENT -> lang [11:12] +| | `--IDENT -> annotation [11:17] +| `--IDENT -> Target [11:28] +`--SEMI -> ; [11:34] +IMPORT -> import [12:0] +|--DOT -> . [12:16] +| |--DOT -> . [12:11] +| | |--IDENT -> java [12:7] +| | `--IDENT -> util [12:12] +| `--IDENT -> ArrayList [12:17] +`--SEMI -> ; [12:26] +IMPORT -> import [13:0] +|--DOT -> . [13:16] +| |--DOT -> . [13:11] +| | |--IDENT -> java [13:7] +| | `--IDENT -> util [13:12] +| `--IDENT -> List [13:17] +`--SEMI -> ; [13:21] +CLASS_DEF -> CLASS_DEF [15:0] +|--MODIFIERS -> MODIFIERS [15:0] +| `--LITERAL_PUBLIC -> public [15:0] +|--LITERAL_CLASS -> class [15:7] +|--IDENT -> InputAntlr4AstRegressionAnnotationOnSameLine [15:13] +`--OBJBLOCK -> OBJBLOCK [15:58] + |--LCURLY -> { [15:58] + |--VARIABLE_DEF -> VARIABLE_DEF [16:4] + | |--MODIFIERS -> MODIFIERS [16:4] + | | |--ANNOTATION -> ANNOTATION [16:4] + | | | |--AT -> @ [16:4] + | | | `--IDENT -> Ann [16:5] + | | `--LITERAL_PRIVATE -> private [17:4] + | |--TYPE -> TYPE [17:12] + | | |--IDENT -> List [17:12] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [17:16] + | | |--GENERIC_START -> < [17:16] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [17:17] + | | | `--IDENT -> String [17:17] + | | `--GENERIC_END -> > [17:23] + | |--IDENT -> names [17:25] + | |--ASSIGN -> = [17:31] + | | `--EXPR -> EXPR [17:33] + | | `--LITERAL_NEW -> new [17:33] + | | |--IDENT -> ArrayList [17:37] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [17:46] + | | | |--GENERIC_START -> < [17:46] + | | | `--GENERIC_END -> > [17:47] + | | |--LPAREN -> ( [17:48] + | | |--ELIST -> ELIST [17:49] + | | `--RPAREN -> ) [17:49] + | `--SEMI -> ; [17:50] + |--VARIABLE_DEF -> VARIABLE_DEF [19:4] + | |--MODIFIERS -> MODIFIERS [19:4] + | | |--ANNOTATION -> ANNOTATION [19:4] + | | | |--AT -> @ [19:4] + | | | `--IDENT -> Ann [19:5] + | | `--LITERAL_PRIVATE -> private [19:9] + | |--TYPE -> TYPE [19:17] + | | |--IDENT -> List [19:17] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [19:21] + | | |--GENERIC_START -> < [19:21] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [19:22] + | | | `--IDENT -> String [19:22] + | | `--GENERIC_END -> > [19:28] + | |--IDENT -> names2 [19:30] + | |--ASSIGN -> = [19:37] + | | `--EXPR -> EXPR [19:39] + | | `--LITERAL_NEW -> new [19:39] + | | |--IDENT -> ArrayList [19:43] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [19:52] + | | | |--GENERIC_START -> < [19:52] + | | | `--GENERIC_END -> > [19:53] + | | |--LPAREN -> ( [19:54] + | | |--ELIST -> ELIST [19:55] + | | `--RPAREN -> ) [19:55] + | `--SEMI -> ; [19:56] + |--VARIABLE_DEF -> VARIABLE_DEF [21:4] + | |--MODIFIERS -> MODIFIERS [21:4] + | | |--ANNOTATION -> ANNOTATION [21:4] + | | | |--AT -> @ [21:4] + | | | |--IDENT -> SuppressWarnings [21:5] + | | | |--LPAREN -> ( [21:21] + | | | |--EXPR -> EXPR [21:22] + | | | | `--STRING_LITERAL -> "deprecation" [21:22] + | | | `--RPAREN -> ) [21:35] + | | `--ANNOTATION -> ANNOTATION [22:4] + | | |--AT -> @ [22:4] + | | `--IDENT -> Ann [22:5] + | |--TYPE -> TYPE [22:9] + | | `--IDENT -> Integer [22:9] + | |--IDENT -> x [22:17] + | `--SEMI -> ; [22:18] + |--VARIABLE_DEF -> VARIABLE_DEF [24:4] + | |--MODIFIERS -> MODIFIERS [24:4] + | | |--ANNOTATION -> ANNOTATION [24:4] + | | | |--AT -> @ [24:4] + | | | |--IDENT -> SuppressWarnings [24:5] + | | | |--LPAREN -> ( [24:21] + | | | |--EXPR -> EXPR [24:22] + | | | | `--STRING_LITERAL -> "deprecation" [24:22] + | | | `--RPAREN -> ) [24:35] + | | `--ANNOTATION -> ANNOTATION [25:4] + | | |--AT -> @ [25:4] + | | `--IDENT -> Ann [25:5] + | |--TYPE -> TYPE [26:4] + | | `--IDENT -> Integer [26:4] + | |--IDENT -> x2 [26:12] + | `--SEMI -> ; [26:14] + |--VARIABLE_DEF -> VARIABLE_DEF [28:4] + | |--MODIFIERS -> MODIFIERS [28:4] + | | |--ANNOTATION -> ANNOTATION [28:4] + | | | |--AT -> @ [28:4] + | | | |--IDENT -> SuppressWarnings [28:5] + | | | |--LPAREN -> ( [28:21] + | | | |--EXPR -> EXPR [28:22] + | | | | `--STRING_LITERAL -> "deprecation" [28:22] + | | | `--RPAREN -> ) [28:35] + | | |--ANNOTATION -> ANNOTATION [28:37] + | | | |--AT -> @ [28:37] + | | | `--IDENT -> Ann [28:38] + | | |--ANNOTATION -> ANNOTATION [28:42] + | | | |--AT -> @ [28:42] + | | | `--IDENT -> Ann2 [28:43] + | | |--ANNOTATION -> ANNOTATION [28:48] + | | | |--AT -> @ [28:48] + | | | `--IDENT -> Ann3 [28:49] + | | `--ANNOTATION -> ANNOTATION [28:54] + | | |--AT -> @ [28:54] + | | `--IDENT -> Ann4 [28:55] + | |--TYPE -> TYPE [28:60] + | | `--IDENT -> Integer [28:60] + | |--IDENT -> x3 [28:68] + | `--SEMI -> ; [28:70] + `--RCURLY -> } [30:0] +ANNOTATION_DEF -> ANNOTATION_DEF [32:0] +|--MODIFIERS -> MODIFIERS [32:0] +| `--ANNOTATION -> ANNOTATION [32:0] +| |--AT -> @ [32:0] +| |--IDENT -> Target [32:1] +| |--LPAREN -> ( [32:7] +| |--ANNOTATION_ARRAY_INIT -> { [32:8] +| | |--EXPR -> EXPR [32:9] +| | | `--IDENT -> CONSTRUCTOR [32:9] +| | |--COMMA -> , [32:20] +| | |--EXPR -> EXPR [32:22] +| | | `--IDENT -> FIELD [32:22] +| | |--COMMA -> , [32:27] +| | |--EXPR -> EXPR [32:29] +| | | `--IDENT -> METHOD [32:29] +| | |--COMMA -> , [32:35] +| | |--EXPR -> EXPR [32:37] +| | | `--IDENT -> PARAMETER [32:37] +| | |--COMMA -> , [32:46] +| | |--EXPR -> EXPR [32:48] +| | | `--IDENT -> TYPE [32:48] +| | |--COMMA -> , [32:52] +| | |--EXPR -> EXPR [32:54] +| | | `--IDENT -> TYPE_PARAMETER [32:54] +| | |--COMMA -> , [32:68] +| | |--EXPR -> EXPR [32:70] +| | | `--IDENT -> TYPE_USE [32:70] +| | `--RCURLY -> } [32:78] +| `--RPAREN -> ) [32:79] +|--AT -> @ [32:81] +|--LITERAL_INTERFACE -> interface [32:82] +|--IDENT -> Ann [32:92] +`--OBJBLOCK -> OBJBLOCK [32:96] + |--LCURLY -> { [32:96] + `--RCURLY -> } [32:97] +ANNOTATION_DEF -> ANNOTATION_DEF [34:0] +|--MODIFIERS -> MODIFIERS [34:0] +| `--ANNOTATION -> ANNOTATION [34:0] +| |--AT -> @ [34:0] +| |--IDENT -> Target [34:1] +| |--LPAREN -> ( [34:7] +| |--ANNOTATION_ARRAY_INIT -> { [34:8] +| | |--EXPR -> EXPR [34:9] +| | | `--IDENT -> CONSTRUCTOR [34:9] +| | |--COMMA -> , [34:20] +| | |--EXPR -> EXPR [34:22] +| | | `--IDENT -> FIELD [34:22] +| | |--COMMA -> , [34:27] +| | |--EXPR -> EXPR [34:29] +| | | `--IDENT -> METHOD [34:29] +| | |--COMMA -> , [34:35] +| | |--EXPR -> EXPR [34:37] +| | | `--IDENT -> PARAMETER [34:37] +| | |--COMMA -> , [34:46] +| | |--EXPR -> EXPR [34:48] +| | | `--IDENT -> TYPE [34:48] +| | |--COMMA -> , [34:52] +| | |--EXPR -> EXPR [34:54] +| | | `--IDENT -> TYPE_PARAMETER [34:54] +| | |--COMMA -> , [34:68] +| | |--EXPR -> EXPR [34:70] +| | | `--IDENT -> TYPE_USE [34:70] +| | `--RCURLY -> } [34:78] +| `--RPAREN -> ) [34:79] +|--AT -> @ [34:81] +|--LITERAL_INTERFACE -> interface [34:82] +|--IDENT -> Ann2 [34:92] +`--OBJBLOCK -> OBJBLOCK [34:97] + |--LCURLY -> { [34:97] + `--RCURLY -> } [34:98] +ANNOTATION_DEF -> ANNOTATION_DEF [36:0] +|--MODIFIERS -> MODIFIERS [36:0] +|--AT -> @ [36:0] +|--LITERAL_INTERFACE -> interface [36:1] +|--IDENT -> Ann3 [36:11] +`--OBJBLOCK -> OBJBLOCK [36:16] + |--LCURLY -> { [36:16] + `--RCURLY -> } [36:17] +ANNOTATION_DEF -> ANNOTATION_DEF [38:0] +|--MODIFIERS -> MODIFIERS [38:0] +|--AT -> @ [38:0] +|--LITERAL_INTERFACE -> interface [38:1] +|--IDENT -> Ann4 [38:11] +`--OBJBLOCK -> OBJBLOCK [38:16] + |--LCURLY -> { [38:16] + `--RCURLY -> } [38:17] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnSameLine2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnSameLine2.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnSameLine2.java @@ -0,0 +1,103 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +public class InputAntlr4AstRegressionAnnotationOnSameLine2 { + /** + * @deprecated bleh + * @deprecated boo + */ + public int i; + + /** + * @deprecated + */ + public void foo() { + + } + + /** + * @deprecated + */ + @Deprecated + public void foo2() { + + } + + /** + * @deprecated + * @deprecated + */ + @Deprecated + public void foo3() { + + } + + /** + * @deprecated bleh + * @deprecated + */ + @Deprecated + public void foo4() { + + } + + /** + * @deprecated + * @deprecated bleh + */ + @Deprecated + public void foo5() { + + } + + void local(@Deprecated String s) { + + } + + void local2( + /** @deprecated bleh*/ + String s) { + + } + + void local3(/** @deprecated */ @Deprecated String s) { + + } + + /** + * @Deprecated + */ + void dontUse() { + + } + + /** + * @Deprecated + * @deprecated + * because I said. + */ + @Deprecated + void dontUse2() { + + } + + /** + * @deprecated + */ + int[] dontUse3() { + return null; + } + + /** + * @deprecated + */ + <T> T dontUse4() { + return null; + } + + /** + * @deprecated + */ + java.lang.String dontUse5() { + return null; + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnSameLine2.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnSameLine2.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionAnnotationOnSameLine2.txt @@ -0,0 +1,223 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +CLASS_DEF -> CLASS_DEF [3:0] +|--MODIFIERS -> MODIFIERS [3:0] +| `--LITERAL_PUBLIC -> public [3:0] +|--LITERAL_CLASS -> class [3:7] +|--IDENT -> InputAntlr4AstRegressionAnnotationOnSameLine2 [3:13] +`--OBJBLOCK -> OBJBLOCK [3:59] + |--LCURLY -> { [3:59] + |--VARIABLE_DEF -> VARIABLE_DEF [8:8] + | |--MODIFIERS -> MODIFIERS [8:8] + | | `--LITERAL_PUBLIC -> public [8:8] + | |--TYPE -> TYPE [8:15] + | | `--LITERAL_INT -> int [8:15] + | |--IDENT -> i [8:19] + | `--SEMI -> ; [8:20] + |--METHOD_DEF -> METHOD_DEF [13:8] + | |--MODIFIERS -> MODIFIERS [13:8] + | | `--LITERAL_PUBLIC -> public [13:8] + | |--TYPE -> TYPE [13:15] + | | `--LITERAL_VOID -> void [13:15] + | |--IDENT -> foo [13:20] + | |--LPAREN -> ( [13:23] + | |--PARAMETERS -> PARAMETERS [13:24] + | |--RPAREN -> ) [13:24] + | `--SLIST -> { [13:26] + | `--RCURLY -> } [15:8] + |--METHOD_DEF -> METHOD_DEF [20:8] + | |--MODIFIERS -> MODIFIERS [20:8] + | | |--ANNOTATION -> ANNOTATION [20:8] + | | | |--AT -> @ [20:8] + | | | `--IDENT -> Deprecated [20:9] + | | `--LITERAL_PUBLIC -> public [21:8] + | |--TYPE -> TYPE [21:15] + | | `--LITERAL_VOID -> void [21:15] + | |--IDENT -> foo2 [21:20] + | |--LPAREN -> ( [21:24] + | |--PARAMETERS -> PARAMETERS [21:25] + | |--RPAREN -> ) [21:25] + | `--SLIST -> { [21:27] + | `--RCURLY -> } [23:8] + |--METHOD_DEF -> METHOD_DEF [29:8] + | |--MODIFIERS -> MODIFIERS [29:8] + | | |--ANNOTATION -> ANNOTATION [29:8] + | | | |--AT -> @ [29:8] + | | | `--IDENT -> Deprecated [29:9] + | | `--LITERAL_PUBLIC -> public [30:8] + | |--TYPE -> TYPE [30:15] + | | `--LITERAL_VOID -> void [30:15] + | |--IDENT -> foo3 [30:20] + | |--LPAREN -> ( [30:24] + | |--PARAMETERS -> PARAMETERS [30:25] + | |--RPAREN -> ) [30:25] + | `--SLIST -> { [30:27] + | `--RCURLY -> } [32:8] + |--METHOD_DEF -> METHOD_DEF [38:8] + | |--MODIFIERS -> MODIFIERS [38:8] + | | |--ANNOTATION -> ANNOTATION [38:8] + | | | |--AT -> @ [38:8] + | | | `--IDENT -> Deprecated [38:9] + | | `--LITERAL_PUBLIC -> public [39:8] + | |--TYPE -> TYPE [39:15] + | | `--LITERAL_VOID -> void [39:15] + | |--IDENT -> foo4 [39:20] + | |--LPAREN -> ( [39:24] + | |--PARAMETERS -> PARAMETERS [39:25] + | |--RPAREN -> ) [39:25] + | `--SLIST -> { [39:27] + | `--RCURLY -> } [41:8] + |--METHOD_DEF -> METHOD_DEF [47:8] + | |--MODIFIERS -> MODIFIERS [47:8] + | | |--ANNOTATION -> ANNOTATION [47:8] + | | | |--AT -> @ [47:8] + | | | `--IDENT -> Deprecated [47:9] + | | `--LITERAL_PUBLIC -> public [48:8] + | |--TYPE -> TYPE [48:15] + | | `--LITERAL_VOID -> void [48:15] + | |--IDENT -> foo5 [48:20] + | |--LPAREN -> ( [48:24] + | |--PARAMETERS -> PARAMETERS [48:25] + | |--RPAREN -> ) [48:25] + | `--SLIST -> { [48:27] + | `--RCURLY -> } [50:8] + |--METHOD_DEF -> METHOD_DEF [52:8] + | |--MODIFIERS -> MODIFIERS [52:8] + | |--TYPE -> TYPE [52:8] + | | `--LITERAL_VOID -> void [52:8] + | |--IDENT -> local [52:13] + | |--LPAREN -> ( [52:18] + | |--PARAMETERS -> PARAMETERS [52:19] + | | `--PARAMETER_DEF -> PARAMETER_DEF [52:19] + | | |--MODIFIERS -> MODIFIERS [52:19] + | | | `--ANNOTATION -> ANNOTATION [52:19] + | | | |--AT -> @ [52:19] + | | | `--IDENT -> Deprecated [52:20] + | | |--TYPE -> TYPE [52:31] + | | | `--IDENT -> String [52:31] + | | `--IDENT -> s [52:38] + | |--RPAREN -> ) [52:39] + | `--SLIST -> { [52:41] + | `--RCURLY -> } [54:8] + |--METHOD_DEF -> METHOD_DEF [56:8] + | |--MODIFIERS -> MODIFIERS [56:8] + | |--TYPE -> TYPE [56:8] + | | `--LITERAL_VOID -> void [56:8] + | |--IDENT -> local2 [56:13] + | |--LPAREN -> ( [56:19] + | |--PARAMETERS -> PARAMETERS [58:12] + | | `--PARAMETER_DEF -> PARAMETER_DEF [58:12] + | | |--MODIFIERS -> MODIFIERS [58:12] + | | |--TYPE -> TYPE [58:12] + | | | `--IDENT -> String [58:12] + | | `--IDENT -> s [58:19] + | |--RPAREN -> ) [58:20] + | `--SLIST -> { [58:22] + | `--RCURLY -> } [60:8] + |--METHOD_DEF -> METHOD_DEF [62:8] + | |--MODIFIERS -> MODIFIERS [62:8] + | |--TYPE -> TYPE [62:8] + | | `--LITERAL_VOID -> void [62:8] + | |--IDENT -> local3 [62:13] + | |--LPAREN -> ( [62:19] + | |--PARAMETERS -> PARAMETERS [62:39] + | | `--PARAMETER_DEF -> PARAMETER_DEF [62:39] + | | |--MODIFIERS -> MODIFIERS [62:39] + | | | `--ANNOTATION -> ANNOTATION [62:39] + | | | |--AT -> @ [62:39] + | | | `--IDENT -> Deprecated [62:40] + | | |--TYPE -> TYPE [62:51] + | | | `--IDENT -> String [62:51] + | | `--IDENT -> s [62:58] + | |--RPAREN -> ) [62:59] + | `--SLIST -> { [62:61] + | `--RCURLY -> } [64:8] + |--METHOD_DEF -> METHOD_DEF [69:8] + | |--MODIFIERS -> MODIFIERS [69:8] + | |--TYPE -> TYPE [69:8] + | | `--LITERAL_VOID -> void [69:8] + | |--IDENT -> dontUse [69:13] + | |--LPAREN -> ( [69:20] + | |--PARAMETERS -> PARAMETERS [69:21] + | |--RPAREN -> ) [69:21] + | `--SLIST -> { [69:23] + | `--RCURLY -> } [71:8] + |--METHOD_DEF -> METHOD_DEF [78:8] + | |--MODIFIERS -> MODIFIERS [78:8] + | | `--ANNOTATION -> ANNOTATION [78:8] + | | |--AT -> @ [78:8] + | | `--IDENT -> Deprecated [78:9] + | |--TYPE -> TYPE [79:8] + | | `--LITERAL_VOID -> void [79:8] + | |--IDENT -> dontUse2 [79:13] + | |--LPAREN -> ( [79:21] + | |--PARAMETERS -> PARAMETERS [79:22] + | |--RPAREN -> ) [79:22] + | `--SLIST -> { [79:24] + | `--RCURLY -> } [81:8] + |--METHOD_DEF -> METHOD_DEF [86:8] + | |--MODIFIERS -> MODIFIERS [86:8] + | |--TYPE -> TYPE [86:8] + | | |--LITERAL_INT -> int [86:8] + | | `--ARRAY_DECLARATOR -> [ [86:11] + | | `--RBRACK -> ] [86:12] + | |--IDENT -> dontUse3 [86:14] + | |--LPAREN -> ( [86:22] + | |--PARAMETERS -> PARAMETERS [86:23] + | |--RPAREN -> ) [86:23] + | `--SLIST -> { [86:25] + | |--LITERAL_RETURN -> return [87:12] + | | |--EXPR -> EXPR [87:19] + | | | `--LITERAL_NULL -> null [87:19] + | | `--SEMI -> ; [87:23] + | `--RCURLY -> } [88:8] + |--METHOD_DEF -> METHOD_DEF [93:8] + | |--MODIFIERS -> MODIFIERS [93:8] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [93:8] + | | |--GENERIC_START -> < [93:8] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [93:9] + | | | `--IDENT -> T [93:9] + | | `--GENERIC_END -> > [93:10] + | |--TYPE -> TYPE [93:12] + | | `--IDENT -> T [93:12] + | |--IDENT -> dontUse4 [93:14] + | |--LPAREN -> ( [93:22] + | |--PARAMETERS -> PARAMETERS [93:23] + | |--RPAREN -> ) [93:23] + | `--SLIST -> { [93:25] + | |--LITERAL_RETURN -> return [94:12] + | | |--EXPR -> EXPR [94:19] + | | | `--LITERAL_NULL -> null [94:19] + | | `--SEMI -> ; [94:23] + | `--RCURLY -> } [95:8] + |--METHOD_DEF -> METHOD_DEF [100:17] + | |--MODIFIERS -> MODIFIERS [100:17] + | |--TYPE -> TYPE [100:17] + | | `--DOT -> . [100:17] + | | |--DOT -> . [100:12] + | | | |--IDENT -> java [100:8] + | | | `--IDENT -> lang [100:13] + | | `--IDENT -> String [100:18] + | |--IDENT -> dontUse5 [100:25] + | |--LPAREN -> ( [100:33] + | |--PARAMETERS -> PARAMETERS [100:34] + | |--RPAREN -> ) [100:34] + | `--SLIST -> { [100:36] + | |--LITERAL_RETURN -> return [101:12] + | | |--EXPR -> EXPR [101:19] + | | | `--LITERAL_NULL -> null [101:19] + | | `--SEMI -> ; [101:23] + | `--RCURLY -> } [102:8] + `--RCURLY -> } [103:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionBadOverride.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionBadOverride.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionBadOverride.java @@ -0,0 +1,61 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +import java.io.Serializable; + +public class InputAntlr4AstRegressionBadOverride { + /** + * {@inheritDoc} + */ + public void doFoo() {} // violation + + public void doFoo2() {} + +} + +interface IFoo2 { + + void doFoo(); +} + +interface IBar2 extends IFoo2 { + + /** + * {@inheritDoc} + */ + public void doFoo(); // violation +} + +class MoreJunk2 extends InputAntlr4AstRegressionBadOverride { + + /** + * {@inheritDoc} + */ + public void doFoo() {} // violation + + /** + * {@inheritDoc} + */ + public void doFoo2() {} // violation + + class EvenMoreJunk extends MoreJunk2 implements Serializable { + + /** + * {@inheritDoc} + */ + public void doFoo() {} // violation + + /** + * {@inheritDoc} + */ + public void doFoo2() {} // violation + } +} + +enum Football2 implements IFoo2, IBar2 { + Detroit_Lions; + + /** + * {@inheritDoc} + */ + public void doFoo() {} // violation +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionBadOverride.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionBadOverride.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionBadOverride.txt @@ -0,0 +1,176 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +IMPORT -> import [3:0] +|--DOT -> . [3:14] +| |--DOT -> . [3:11] +| | |--IDENT -> java [3:7] +| | `--IDENT -> io [3:12] +| `--IDENT -> Serializable [3:15] +`--SEMI -> ; [3:27] +CLASS_DEF -> CLASS_DEF [5:0] +|--MODIFIERS -> MODIFIERS [5:0] +| `--LITERAL_PUBLIC -> public [5:0] +|--LITERAL_CLASS -> class [5:7] +|--IDENT -> InputAntlr4AstRegressionBadOverride [5:13] +`--OBJBLOCK -> OBJBLOCK [5:49] + |--LCURLY -> { [5:49] + |--METHOD_DEF -> METHOD_DEF [9:4] + | |--MODIFIERS -> MODIFIERS [9:4] + | | `--LITERAL_PUBLIC -> public [9:4] + | |--TYPE -> TYPE [9:11] + | | `--LITERAL_VOID -> void [9:11] + | |--IDENT -> doFoo [9:16] + | |--LPAREN -> ( [9:21] + | |--PARAMETERS -> PARAMETERS [9:22] + | |--RPAREN -> ) [9:22] + | `--SLIST -> { [9:24] + | `--RCURLY -> } [9:25] + |--METHOD_DEF -> METHOD_DEF [11:4] + | |--MODIFIERS -> MODIFIERS [11:4] + | | `--LITERAL_PUBLIC -> public [11:4] + | |--TYPE -> TYPE [11:11] + | | `--LITERAL_VOID -> void [11:11] + | |--IDENT -> doFoo2 [11:16] + | |--LPAREN -> ( [11:22] + | |--PARAMETERS -> PARAMETERS [11:23] + | |--RPAREN -> ) [11:23] + | `--SLIST -> { [11:25] + | `--RCURLY -> } [11:26] + `--RCURLY -> } [13:0] +INTERFACE_DEF -> INTERFACE_DEF [15:0] +|--MODIFIERS -> MODIFIERS [15:0] +|--LITERAL_INTERFACE -> interface [15:0] +|--IDENT -> IFoo2 [15:10] +`--OBJBLOCK -> OBJBLOCK [15:16] + |--LCURLY -> { [15:16] + |--METHOD_DEF -> METHOD_DEF [17:4] + | |--MODIFIERS -> MODIFIERS [17:4] + | |--TYPE -> TYPE [17:4] + | | `--LITERAL_VOID -> void [17:4] + | |--IDENT -> doFoo [17:9] + | |--LPAREN -> ( [17:14] + | |--PARAMETERS -> PARAMETERS [17:15] + | |--RPAREN -> ) [17:15] + | `--SEMI -> ; [17:16] + `--RCURLY -> } [18:0] +INTERFACE_DEF -> INTERFACE_DEF [20:0] +|--MODIFIERS -> MODIFIERS [20:0] +|--LITERAL_INTERFACE -> interface [20:0] +|--IDENT -> IBar2 [20:10] +|--EXTENDS_CLAUSE -> extends [20:16] +| `--IDENT -> IFoo2 [20:24] +`--OBJBLOCK -> OBJBLOCK [20:30] + |--LCURLY -> { [20:30] + |--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 -> doFoo [25:16] + | |--LPAREN -> ( [25:21] + | |--PARAMETERS -> PARAMETERS [25:22] + | |--RPAREN -> ) [25:22] + | `--SEMI -> ; [25:23] + `--RCURLY -> } [26:0] +CLASS_DEF -> CLASS_DEF [28:0] +|--MODIFIERS -> MODIFIERS [28:0] +|--LITERAL_CLASS -> class [28:0] +|--IDENT -> MoreJunk2 [28:6] +|--EXTENDS_CLAUSE -> extends [28:16] +| `--IDENT -> InputAntlr4AstRegressionBadOverride [28:24] +`--OBJBLOCK -> OBJBLOCK [28:60] + |--LCURLY -> { [28:60] + |--METHOD_DEF -> METHOD_DEF [33:4] + | |--MODIFIERS -> MODIFIERS [33:4] + | | `--LITERAL_PUBLIC -> public [33:4] + | |--TYPE -> TYPE [33:11] + | | `--LITERAL_VOID -> void [33:11] + | |--IDENT -> doFoo [33:16] + | |--LPAREN -> ( [33:21] + | |--PARAMETERS -> PARAMETERS [33:22] + | |--RPAREN -> ) [33:22] + | `--SLIST -> { [33:24] + | `--RCURLY -> } [33:25] + |--METHOD_DEF -> METHOD_DEF [38:4] + | |--MODIFIERS -> MODIFIERS [38:4] + | | `--LITERAL_PUBLIC -> public [38:4] + | |--TYPE -> TYPE [38:11] + | | `--LITERAL_VOID -> void [38:11] + | |--IDENT -> doFoo2 [38:16] + | |--LPAREN -> ( [38:22] + | |--PARAMETERS -> PARAMETERS [38:23] + | |--RPAREN -> ) [38:23] + | `--SLIST -> { [38:25] + | `--RCURLY -> } [38:26] + |--CLASS_DEF -> CLASS_DEF [40:4] + | |--MODIFIERS -> MODIFIERS [40:4] + | |--LITERAL_CLASS -> class [40:4] + | |--IDENT -> EvenMoreJunk [40:10] + | |--EXTENDS_CLAUSE -> extends [40:23] + | | `--IDENT -> MoreJunk2 [40:31] + | |--IMPLEMENTS_CLAUSE -> implements [40:41] + | | `--IDENT -> Serializable [40:52] + | `--OBJBLOCK -> OBJBLOCK [40:65] + | |--LCURLY -> { [40:65] + | |--METHOD_DEF -> METHOD_DEF [45:8] + | | |--MODIFIERS -> MODIFIERS [45:8] + | | | `--LITERAL_PUBLIC -> public [45:8] + | | |--TYPE -> TYPE [45:15] + | | | `--LITERAL_VOID -> void [45:15] + | | |--IDENT -> doFoo [45:20] + | | |--LPAREN -> ( [45:25] + | | |--PARAMETERS -> PARAMETERS [45:26] + | | |--RPAREN -> ) [45:26] + | | `--SLIST -> { [45:28] + | | `--RCURLY -> } [45:29] + | |--METHOD_DEF -> METHOD_DEF [50:8] + | | |--MODIFIERS -> MODIFIERS [50:8] + | | | `--LITERAL_PUBLIC -> public [50:8] + | | |--TYPE -> TYPE [50:15] + | | | `--LITERAL_VOID -> void [50:15] + | | |--IDENT -> doFoo2 [50:20] + | | |--LPAREN -> ( [50:26] + | | |--PARAMETERS -> PARAMETERS [50:27] + | | |--RPAREN -> ) [50:27] + | | `--SLIST -> { [50:29] + | | `--RCURLY -> } [50:30] + | `--RCURLY -> } [51:4] + `--RCURLY -> } [52:0] +ENUM_DEF -> ENUM_DEF [54:0] +|--MODIFIERS -> MODIFIERS [54:0] +|--ENUM -> enum [54:0] +|--IDENT -> Football2 [54:5] +|--IMPLEMENTS_CLAUSE -> implements [54:15] +| |--IDENT -> IFoo2 [54:26] +| |--COMMA -> , [54:31] +| `--IDENT -> IBar2 [54:33] +`--OBJBLOCK -> OBJBLOCK [54:39] + |--LCURLY -> { [54:39] + |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [55:4] + | |--ANNOTATIONS -> ANNOTATIONS [55:4] + | `--IDENT -> Detroit_Lions [55:4] + |--SEMI -> ; [55:17] + |--METHOD_DEF -> METHOD_DEF [60:4] + | |--MODIFIERS -> MODIFIERS [60:4] + | | `--LITERAL_PUBLIC -> public [60:4] + | |--TYPE -> TYPE [60:11] + | | `--LITERAL_VOID -> void [60:11] + | |--IDENT -> doFoo [60:16] + | |--LPAREN -> ( [60:21] + | |--PARAMETERS -> PARAMETERS [60:22] + | |--RPAREN -> ) [60:22] + | `--SLIST -> { [60:24] + | `--RCURLY -> } [60:25] + `--RCURLY -> } [61:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionCassandraInputWithComments.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionCassandraInputWithComments.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionCassandraInputWithComments.java @@ -0,0 +1,415 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +import java.io.BufferedWriter; +import java.io.IOException; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Properties; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; + +import junit.framework.AssertionFailedError; +import junit.framework.Test; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.util.DOMElementWriter; +import org.apache.tools.ant.util.DateUtils; +import org.apache.tools.ant.util.FileUtils; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Text; + +interface IgnoredTestListener{} +interface JUnitResultFormatter{} +interface XMLConstants{} +/** + * Prints XML output of the test to a specified Writer. + * + * @see FormatterElement + */ +public class InputAntlr4AstRegressionCassandraInputWithComments + implements JUnitResultFormatter, XMLConstants, IgnoredTestListener { + + private static final double ONE_SECOND = 1000.0; + + /** constant for unnnamed testsuites/cases */ + private static final String UNKNOWN = "unknown"; + private static final String ATTR_ERRORS = ""; + private static final String TESTSUITE = ""; + private static final String SYSTEM_OUT = ""; + private static final String SYSTEM_ERR = ""; + + private static DocumentBuilder getDocumentBuilder() { + try { + return DocumentBuilderFactory.newInstance().newDocumentBuilder(); + } catch (final Exception exc) { + throw new ExceptionInInitializerError(exc); + } + } + + private static final String tag = System.getProperty("cassandra.testtag", ""); + + /* + * Set the property for the test suite name so that log configuration can pick it up + * and log to a file specific to this test suite + */ + static + { + String command = System.getProperty("sun.java.command"); + String args[] = command.split(" "); + System.setProperty("suitename", args[1]); + } + + /** + * The XML document. + */ + private Document doc; + + /** + * The wrapper for the whole testsuite. + */ + private Element rootElement; + + /** + * Element for the current test. + * + * The keying of this map is a bit of a hack: tests are keyed by caseName(className) since + * the Test we get for Test-start isn't the same as the Test we get during test-assumption-fail, + * so we can't easily match Test objects without manually iterating over all keys and checking + * individual fields. + */ + private final Hashtable<String, Element> testElements = new Hashtable<String, Element>(); + + /** + * tests that failed. + */ + private final Hashtable failedTests = new Hashtable(); + + /** + * Tests that were skipped. + */ + private final Hashtable<String, Test> skippedTests = new Hashtable<String, Test>(); + /** + * Tests that were ignored. See the note above about the key being a bit of a hack. + */ + private final Hashtable<String, Test> ignoredTests = new Hashtable<String, Test>(); + /** + * Timing helper. + */ + private final Hashtable<String, Long> testStarts = new Hashtable<String, Long>(); + /** + * Where to write the log to. + */ + private OutputStream out; + + /** No arg constructor. */ + public InputAntlr4AstRegressionCassandraInputWithComments() { + } + + /** {@inheritDoc}. */ + public void setOutput(final OutputStream out) { + this.out = out; + } + + /** {@inheritDoc}. */ + public void setSystemOutput(final String out) { + formatOutput(SYSTEM_OUT, out); + } + + /** {@inheritDoc}. */ + public void setSystemError(final String out) { + formatOutput(SYSTEM_ERR, out); + } + + /** + * The whole testsuite started. + * @param suite the testsuite. + */ + public void startTestSuite(final JUnitTest suite) { + doc = getDocumentBuilder().newDocument(); + rootElement = doc.createElement(TESTSUITE); + String n = suite.getName(); + if (n != null && !tag.isEmpty()) + n = n + "-" + tag; + rootElement.setAttribute(ATTR_NAME, n == null ? UNKNOWN : n); + + //add the timestamp + final String timestamp = DateUtils.format(new Date(), + DateUtils.ISO8601_DATETIME_PATTERN); + rootElement.setAttribute(TIMESTAMP, timestamp); + //and the hostname. + rootElement.setAttribute(HOSTNAME, getHostname()); + + // Output properties + final Element propsElement = doc.createElement(PROPERTIES); + rootElement.appendChild(propsElement); + final Properties props = suite.getProperties(); + if (props != null) { + final Enumeration e = props.propertyNames(); + while (e.hasMoreElements()) { + final String name = (String) e.nextElement(); + final Element propElement = doc.createElement(PROPERTY); + propElement.setAttribute(ATTR_NAME, name); + propElement.setAttribute(ATTR_VALUE, props.getProperty(name)); + propsElement.appendChild(propElement); + } + } + } + + private static final String PROPERTIES = ""; + private static final String HOSTNAME = ""; + private static final String TIMESTAMP = ""; + private static final String ATTR_NAME = ""; + private static final String PROPERTY = ""; + private static final String ATTR_VALUE = ""; + + class JUnitTest { + public String getName() { + return null; + } + + public Properties getProperties() { + return null; + } + + public String failureCount() { + return null; + } + + public String getRunTime() { + return null; + } + } + + /** + * get the local hostname + * @return the name of the local host, or "localhost" if we cannot work it out + */ + private String getHostname() { + String hostname = "localhost"; + try { + final InetAddress localHost = InetAddress.getLocalHost(); + if (localHost != null) { + hostname = localHost.getHostName(); + } + } catch (final UnknownHostException e) { + // fall back to default 'localhost' + } + return hostname; + } + + private static final String ATTR_TESTS = ""; + private static final String ATTR_FAILURES = ""; + private static final String ATTR_SKIPPED = ""; + + /** + * The whole testsuite ended. + * @param suite the testsuite. + * @throws BuildException on error. + */ + public void endTestSuite(final JUnitTest suite) throws BuildException { + rootElement.setAttribute(ATTR_SKIPPED, "" + suite.failureCount()); + rootElement.setAttribute( + ATTR_TESTS, "" + (ONE_SECOND)); + if (out != null) { + Writer wri = null; + try { + wri = new BufferedWriter(new OutputStreamWriter(out, "UTF8")); + wri.write("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"); + (new DOMElementWriter()).write(rootElement, wri, 0, " "); + } catch (final IOException exc) { + throw new BuildException("Unable to write log file", exc); + } finally { + if (wri != null) { + try { + wri.flush(); + } catch (final IOException ex) { + // ignore + } + } + if (out != System.out && out != System.err) { + FileUtils.close(wri); + } + } + } + } + + /** + * Interface TestListener. + * + * <p>A new Test is started. + * @param t the test. + */ + public void startTest(final Test t) { + testStarts.put(createDescription(t), + System.currentTimeMillis()); + } + + private static String createDescription(final Test test) throws BuildException { + return null; + } + + /** + * Interface TestListener. + * + * <p>A Test is finished. + * @param test the test. + */ + public void endTest(final Test test) { + final String testDescription = createDescription(test); + + // Fix for bug #5637 - if a junit.extensions.TestSetup is + // used and throws an exception during setUp then startTest + // would never have been called + if (!testStarts.containsKey(testDescription)) { + startTest(test); + } + Element currentTest; + if (!failedTests.containsKey(test) && !skippedTests.containsKey(testDescription) + && !ignoredTests.containsKey(testDescription)) { + currentTest = doc.createElement("TESTCASE"); + String n = ""; + if (n != null && !tag.isEmpty()) + n = n + "-" + tag; + currentTest.setAttribute(ATTR_NAME, + n == null ? UNKNOWN : n); + // a TestSuite can contain Tests from multiple classes, + // even tests with the same name - disambiguate them. + currentTest.setAttribute("ATTR_CLASSNAME", + ""); + rootElement.appendChild(currentTest); + testElements.put(createDescription(test), currentTest); + } else { + currentTest = testElements.get(testDescription); + } + + final Long l = testStarts.get(createDescription(test)); + } + + /** + * Interface TestListener for JUnit &lt;= 3.4. + * + * <p>A Test failed. + * @param test the test. + * @param t the exception. + */ + public void addFailure(final Test test, final Throwable t) { + formatError("FAILURE", test, t); + } + + /** + * Interface TestListener for JUnit &gt; 3.4. + * + * <p>A Test failed. + * @param test the test. + * @param t the assertion. + */ + public void addFailure(final Test test, final AssertionFailedError t) { + addFailure(test, (Throwable) t); + } + + /** + * Interface TestListener. + * + * <p>An error occurred while running the test. + * @param test the test. + * @param t the error. + */ + public void addError(final Test test, final Throwable t) { + formatError("ERROR", test, t); + } + + private void formatError(final String type, final Test test, final Throwable t) { + if (test != null) { + endTest(test); + failedTests.put(test, test); + } + + final Element nested = doc.createElement(type); + Element currentTest; + if (test != null) { + currentTest = testElements.get(createDescription(test)); + } else { + currentTest = rootElement; + } + + currentTest.appendChild(nested); + + final String message = t.getMessage(); + if (message != null && message.length() > 0) { + nested.setAttribute("ATTR_MESSAGE", t.getMessage()); + } + nested.setAttribute("ATTR_TYPE", t.getClass().getName()); + + final String strace = "JUnitTestRunner.getFilteredTrace(t"; + final Text trace = doc.createTextNode(strace); + nested.appendChild(trace); + } + + private void formatOutput(final String type, final String output) { + final Element nested = doc.createElement(type); + rootElement.appendChild(nested); + nested.appendChild(doc.createCDATASection(output)); + } + + public void testIgnored(final Test test) { + formatSkip(test, "JUnitVersionHelper.getIgnoreMessage(test)"); + if (test != null) { + ignoredTests.put(createDescription(test), test); + } + } + + + public void formatSkip(final Test test, final String message) { + if (test != null) { + endTest(test); + } + + final Element nested = doc.createElement("skipped"); + + if (message != null) { + nested.setAttribute("message", message); + } + + Element currentTest; + if (test != null) { + currentTest = testElements.get(createDescription(test)); + } else { + currentTest = rootElement; + } + + currentTest.appendChild(nested); + + } + + public void testAssumptionFailure(final Test test, final Throwable failure) { + formatSkip(test, failure.getMessage()); + skippedTests.put(createDescription(test), test); + + } +} // XMLJUnitResultFormatter, no newline on purpose \ No newline at end of file diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionCassandraInputWithComments.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionCassandraInputWithComments.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionCassandraInputWithComments.txt @@ -0,0 +1,2518 @@ +BLOCK_COMMENT_BEGIN -> /* [1:0] +|--COMMENT_CONTENT -> \n * Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements. See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the "License"); you may not use this file except in compliance with\n * the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n [1:2] +`--BLOCK_COMMENT_END -> */ [17:1] +PACKAGE_DEF -> package [19:0] +|--ANNOTATIONS -> ANNOTATIONS [19:47] +|--DOT -> . [19:47] +| |--DOT -> . [19:39] +| | |--DOT -> . [19:28] +| | | |--DOT -> . [19:22] +| | | | |--DOT -> . [19:11] +| | | | | |--IDENT -> com [19:8] +| | | | | `--IDENT -> puppycrawl [19:12] +| | | | `--IDENT -> tools [19:23] +| | | `--IDENT -> checkstyle [19:29] +| | `--IDENT -> grammar [19:40] +| `--IDENT -> antlr4 [19:48] +`--SEMI -> ; [19:54] +IMPORT -> import [21:0] +|--DOT -> . [21:14] +| |--DOT -> . [21:11] +| | |--IDENT -> java [21:7] +| | `--IDENT -> io [21:12] +| `--IDENT -> BufferedWriter [21:15] +`--SEMI -> ; [21:29] +IMPORT -> import [22:0] +|--DOT -> . [22:14] +| |--DOT -> . [22:11] +| | |--IDENT -> java [22:7] +| | `--IDENT -> io [22:12] +| `--IDENT -> IOException [22:15] +`--SEMI -> ; [22:26] +IMPORT -> import [23:0] +|--DOT -> . [23:14] +| |--DOT -> . [23:11] +| | |--IDENT -> java [23:7] +| | `--IDENT -> io [23:12] +| `--IDENT -> OutputStream [23:15] +`--SEMI -> ; [23:27] +IMPORT -> import [24:0] +|--DOT -> . [24:14] +| |--DOT -> . [24:11] +| | |--IDENT -> java [24:7] +| | `--IDENT -> io [24:12] +| `--IDENT -> OutputStreamWriter [24:15] +`--SEMI -> ; [24:33] +IMPORT -> import [25:0] +|--DOT -> . [25:14] +| |--DOT -> . [25:11] +| | |--IDENT -> java [25:7] +| | `--IDENT -> io [25:12] +| `--IDENT -> Writer [25:15] +`--SEMI -> ; [25:21] +IMPORT -> import [26:0] +|--DOT -> . [26:15] +| |--DOT -> . [26:11] +| | |--IDENT -> java [26:7] +| | `--IDENT -> net [26:12] +| `--IDENT -> InetAddress [26:16] +`--SEMI -> ; [26:27] +IMPORT -> import [27:0] +|--DOT -> . [27:15] +| |--DOT -> . [27:11] +| | |--IDENT -> java [27:7] +| | `--IDENT -> net [27:12] +| `--IDENT -> UnknownHostException [27:16] +`--SEMI -> ; [27:36] +IMPORT -> import [28:0] +|--DOT -> . [28:16] +| |--DOT -> . [28:11] +| | |--IDENT -> java [28:7] +| | `--IDENT -> util [28:12] +| `--IDENT -> Date [28:17] +`--SEMI -> ; [28:21] +IMPORT -> import [29:0] +|--DOT -> . [29:16] +| |--DOT -> . [29:11] +| | |--IDENT -> java [29:7] +| | `--IDENT -> util [29:12] +| `--IDENT -> Enumeration [29:17] +`--SEMI -> ; [29:28] +IMPORT -> import [30:0] +|--DOT -> . [30:16] +| |--DOT -> . [30:11] +| | |--IDENT -> java [30:7] +| | `--IDENT -> util [30:12] +| `--IDENT -> Hashtable [30:17] +`--SEMI -> ; [30:26] +IMPORT -> import [31:0] +|--DOT -> . [31:16] +| |--DOT -> . [31:11] +| | |--IDENT -> java [31:7] +| | `--IDENT -> util [31:12] +| `--IDENT -> Properties [31:17] +`--SEMI -> ; [31:27] +IMPORT -> import [33:0] +|--DOT -> . [33:24] +| |--DOT -> . [33:16] +| | |--DOT -> . [33:12] +| | | |--IDENT -> javax [33:7] +| | | `--IDENT -> xml [33:13] +| | `--IDENT -> parsers [33:17] +| `--IDENT -> DocumentBuilder [33:25] +`--SEMI -> ; [33:40] +IMPORT -> import [34:0] +|--DOT -> . [34:24] +| |--DOT -> . [34:16] +| | |--DOT -> . [34:12] +| | | |--IDENT -> javax [34:7] +| | | `--IDENT -> xml [34:13] +| | `--IDENT -> parsers [34:17] +| `--IDENT -> DocumentBuilderFactory [34:25] +`--SEMI -> ; [34:47] +IMPORT -> import [36:0] +|--DOT -> . [36:22] +| |--DOT -> . [36:12] +| | |--IDENT -> junit [36:7] +| | `--IDENT -> framework [36:13] +| `--IDENT -> AssertionFailedError [36:23] +`--SEMI -> ; [36:43] +IMPORT -> import [37:0] +|--DOT -> . [37:22] +| |--DOT -> . [37:12] +| | |--IDENT -> junit [37:7] +| | `--IDENT -> framework [37:13] +| `--IDENT -> Test [37:23] +`--SEMI -> ; [37:27] +IMPORT -> import [39:0] +|--DOT -> . [39:27] +| |--DOT -> . [39:23] +| | |--DOT -> . [39:17] +| | | |--DOT -> . [39:10] +| | | | |--IDENT -> org [39:7] +| | | | `--IDENT -> apache [39:11] +| | | `--IDENT -> tools [39:18] +| | `--IDENT -> ant [39:24] +| `--IDENT -> BuildException [39:28] +`--SEMI -> ; [39:42] +IMPORT -> import [40:0] +|--DOT -> . [40:32] +| |--DOT -> . [40:27] +| | |--DOT -> . [40:23] +| | | |--DOT -> . [40:17] +| | | | |--DOT -> . [40:10] +| | | | | |--IDENT -> org [40:7] +| | | | | `--IDENT -> apache [40:11] +| | | | `--IDENT -> tools [40:18] +| | | `--IDENT -> ant [40:24] +| | `--IDENT -> util [40:28] +| `--IDENT -> DOMElementWriter [40:33] +`--SEMI -> ; [40:49] +IMPORT -> import [41:0] +|--DOT -> . [41:32] +| |--DOT -> . [41:27] +| | |--DOT -> . [41:23] +| | | |--DOT -> . [41:17] +| | | | |--DOT -> . [41:10] +| | | | | |--IDENT -> org [41:7] +| | | | | `--IDENT -> apache [41:11] +| | | | `--IDENT -> tools [41:18] +| | | `--IDENT -> ant [41:24] +| | `--IDENT -> util [41:28] +| `--IDENT -> DateUtils [41:33] +`--SEMI -> ; [41:42] +IMPORT -> import [42:0] +|--DOT -> . [42:32] +| |--DOT -> . [42:27] +| | |--DOT -> . [42:23] +| | | |--DOT -> . [42:17] +| | | | |--DOT -> . [42:10] +| | | | | |--IDENT -> org [42:7] +| | | | | `--IDENT -> apache [42:11] +| | | | `--IDENT -> tools [42:18] +| | | `--IDENT -> ant [42:24] +| | `--IDENT -> util [42:28] +| `--IDENT -> FileUtils [42:33] +`--SEMI -> ; [42:42] +IMPORT -> import [43:0] +|--DOT -> . [43:18] +| |--DOT -> . [43:14] +| | |--DOT -> . [43:10] +| | | |--IDENT -> org [43:7] +| | | `--IDENT -> w3c [43:11] +| | `--IDENT -> dom [43:15] +| `--IDENT -> Document [43:19] +`--SEMI -> ; [43:27] +IMPORT -> import [44:0] +|--DOT -> . [44:18] +| |--DOT -> . [44:14] +| | |--DOT -> . [44:10] +| | | |--IDENT -> org [44:7] +| | | `--IDENT -> w3c [44:11] +| | `--IDENT -> dom [44:15] +| `--IDENT -> Element [44:19] +`--SEMI -> ; [44:26] +IMPORT -> import [45:0] +|--DOT -> . [45:18] +| |--DOT -> . [45:14] +| | |--DOT -> . [45:10] +| | | |--IDENT -> org [45:7] +| | | `--IDENT -> w3c [45:11] +| | `--IDENT -> dom [45:15] +| `--IDENT -> Text [45:19] +`--SEMI -> ; [45:23] +INTERFACE_DEF -> INTERFACE_DEF [47:0] +|--MODIFIERS -> MODIFIERS [47:0] +|--LITERAL_INTERFACE -> interface [47:0] +|--IDENT -> IgnoredTestListener [47:10] +`--OBJBLOCK -> OBJBLOCK [47:29] + |--LCURLY -> { [47:29] + `--RCURLY -> } [47:30] +INTERFACE_DEF -> INTERFACE_DEF [48:0] +|--MODIFIERS -> MODIFIERS [48:0] +|--LITERAL_INTERFACE -> interface [48:0] +|--IDENT -> JUnitResultFormatter [48:10] +`--OBJBLOCK -> OBJBLOCK [48:30] + |--LCURLY -> { [48:30] + `--RCURLY -> } [48:31] +INTERFACE_DEF -> INTERFACE_DEF [49:0] +|--MODIFIERS -> MODIFIERS [49:0] +|--LITERAL_INTERFACE -> interface [49:0] +|--IDENT -> XMLConstants [49:10] +`--OBJBLOCK -> OBJBLOCK [49:22] + |--LCURLY -> { [49:22] + `--RCURLY -> } [49:23] +CLASS_DEF -> CLASS_DEF [55:0] +|--MODIFIERS -> MODIFIERS [55:0] +| |--BLOCK_COMMENT_BEGIN -> /* [50:0] +| | |--COMMENT_CONTENT -> *\n * Prints XML output of the test to a specified Writer.\n *\n * @see FormatterElement\n [50:2] +| | `--BLOCK_COMMENT_END -> */ [54:1] +| `--LITERAL_PUBLIC -> public [55:0] +|--LITERAL_CLASS -> class [55:7] +|--IDENT -> InputAntlr4AstRegressionCassandraInputWithComments [55:13] +|--IMPLEMENTS_CLAUSE -> implements [56:8] +| |--IDENT -> JUnitResultFormatter [56:19] +| |--COMMA -> , [56:39] +| |--IDENT -> XMLConstants [56:41] +| |--COMMA -> , [56:53] +| `--IDENT -> IgnoredTestListener [56:55] +`--OBJBLOCK -> OBJBLOCK [56:75] + |--LCURLY -> { [56:75] + |--VARIABLE_DEF -> VARIABLE_DEF [58:4] + | |--MODIFIERS -> MODIFIERS [58:4] + | | |--LITERAL_PRIVATE -> private [58:4] + | | |--LITERAL_STATIC -> static [58:12] + | | `--FINAL -> final [58:19] + | |--TYPE -> TYPE [58:25] + | | `--LITERAL_DOUBLE -> double [58:25] + | |--IDENT -> ONE_SECOND [58:32] + | |--ASSIGN -> = [58:43] + | | `--EXPR -> EXPR [58:45] + | | `--NUM_FLOAT -> 1000.0 [58:45] + | `--SEMI -> ; [58:51] + |--VARIABLE_DEF -> VARIABLE_DEF [61:4] + | |--MODIFIERS -> MODIFIERS [61:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [60:4] + | | | |--COMMENT_CONTENT -> * constant for unnnamed testsuites/cases [60:6] + | | | `--BLOCK_COMMENT_END -> */ [60:46] + | | |--LITERAL_PRIVATE -> private [61:4] + | | |--LITERAL_STATIC -> static [61:12] + | | `--FINAL -> final [61:19] + | |--TYPE -> TYPE [61:25] + | | `--IDENT -> String [61:25] + | |--IDENT -> UNKNOWN [61:32] + | |--ASSIGN -> = [61:40] + | | `--EXPR -> EXPR [61:42] + | | `--STRING_LITERAL -> "unknown" [61:42] + | `--SEMI -> ; [61:51] + |--VARIABLE_DEF -> VARIABLE_DEF [62:4] + | |--MODIFIERS -> MODIFIERS [62:4] + | | |--LITERAL_PRIVATE -> private [62:4] + | | |--LITERAL_STATIC -> static [62:12] + | | `--FINAL -> final [62:19] + | |--TYPE -> TYPE [62:25] + | | `--IDENT -> String [62:25] + | |--IDENT -> ATTR_ERRORS [62:32] + | |--ASSIGN -> = [62:44] + | | `--EXPR -> EXPR [62:46] + | | `--STRING_LITERAL -> "" [62:46] + | `--SEMI -> ; [62:48] + |--VARIABLE_DEF -> VARIABLE_DEF [63:4] + | |--MODIFIERS -> MODIFIERS [63:4] + | | |--LITERAL_PRIVATE -> private [63:4] + | | |--LITERAL_STATIC -> static [63:12] + | | `--FINAL -> final [63:19] + | |--TYPE -> TYPE [63:25] + | | `--IDENT -> String [63:25] + | |--IDENT -> TESTSUITE [63:32] + | |--ASSIGN -> = [63:42] + | | `--EXPR -> EXPR [63:44] + | | `--STRING_LITERAL -> "" [63:44] + | `--SEMI -> ; [63:46] + |--VARIABLE_DEF -> VARIABLE_DEF [64:4] + | |--MODIFIERS -> MODIFIERS [64:4] + | | |--LITERAL_PRIVATE -> private [64:4] + | | |--LITERAL_STATIC -> static [64:12] + | | `--FINAL -> final [64:19] + | |--TYPE -> TYPE [64:25] + | | `--IDENT -> String [64:25] + | |--IDENT -> SYSTEM_OUT [64:32] + | |--ASSIGN -> = [64:43] + | | `--EXPR -> EXPR [64:45] + | | `--STRING_LITERAL -> "" [64:45] + | `--SEMI -> ; [64:47] + |--VARIABLE_DEF -> VARIABLE_DEF [65:4] + | |--MODIFIERS -> MODIFIERS [65:4] + | | |--LITERAL_PRIVATE -> private [65:4] + | | |--LITERAL_STATIC -> static [65:12] + | | `--FINAL -> final [65:19] + | |--TYPE -> TYPE [65:25] + | | `--IDENT -> String [65:25] + | |--IDENT -> SYSTEM_ERR [65:32] + | |--ASSIGN -> = [65:43] + | | `--EXPR -> EXPR [65:45] + | | `--STRING_LITERAL -> "" [65:45] + | `--SEMI -> ; [65:47] + |--METHOD_DEF -> METHOD_DEF [67:4] + | |--MODIFIERS -> MODIFIERS [67:4] + | | |--LITERAL_PRIVATE -> private [67:4] + | | `--LITERAL_STATIC -> static [67:12] + | |--TYPE -> TYPE [67:19] + | | `--IDENT -> DocumentBuilder [67:19] + | |--IDENT -> getDocumentBuilder [67:35] + | |--LPAREN -> ( [67:53] + | |--PARAMETERS -> PARAMETERS [67:54] + | |--RPAREN -> ) [67:54] + | `--SLIST -> { [67:56] + | |--LITERAL_TRY -> try [68:8] + | | |--SLIST -> { [68:12] + | | | |--LITERAL_RETURN -> return [69:12] + | | | | |--EXPR -> EXPR [69:74] + | | | | | `--METHOD_CALL -> ( [69:74] + | | | | | |--DOT -> . [69:55] + | | | | | | |--METHOD_CALL -> ( [69:53] + | | | | | | | |--DOT -> . [69:41] + | | | | | | | | |--IDENT -> DocumentBuilderFactory [69:19] + | | | | | | | | `--IDENT -> newInstance [69:42] + | | | | | | | |--ELIST -> ELIST [69:54] + | | | | | | | `--RPAREN -> ) [69:54] + | | | | | | `--IDENT -> newDocumentBuilder [69:56] + | | | | | |--ELIST -> ELIST [69:75] + | | | | | `--RPAREN -> ) [69:75] + | | | | `--SEMI -> ; [69:76] + | | | `--RCURLY -> } [70:8] + | | `--LITERAL_CATCH -> catch [70:10] + | | |--LPAREN -> ( [70:16] + | | |--PARAMETER_DEF -> PARAMETER_DEF [70:17] + | | | |--MODIFIERS -> MODIFIERS [70:17] + | | | | `--FINAL -> final [70:17] + | | | |--TYPE -> TYPE [70:23] + | | | | `--IDENT -> Exception [70:23] + | | | `--IDENT -> exc [70:33] + | | |--RPAREN -> ) [70:36] + | | `--SLIST -> { [70:38] + | | |--LITERAL_THROW -> throw [71:12] + | | | |--EXPR -> EXPR [71:18] + | | | | `--LITERAL_NEW -> new [71:18] + | | | | |--IDENT -> ExceptionInInitializerError [71:22] + | | | | |--LPAREN -> ( [71:49] + | | | | |--ELIST -> ELIST [71:50] + | | | | | `--EXPR -> EXPR [71:50] + | | | | | `--IDENT -> exc [71:50] + | | | | `--RPAREN -> ) [71:53] + | | | `--SEMI -> ; [71:54] + | | `--RCURLY -> } [72:8] + | `--RCURLY -> } [73:4] + |--VARIABLE_DEF -> VARIABLE_DEF [75:4] + | |--MODIFIERS -> MODIFIERS [75:4] + | | |--LITERAL_PRIVATE -> private [75:4] + | | |--LITERAL_STATIC -> static [75:12] + | | `--FINAL -> final [75:19] + | |--TYPE -> TYPE [75:25] + | | `--IDENT -> String [75:25] + | |--IDENT -> tag [75:32] + | |--ASSIGN -> = [75:36] + | | `--EXPR -> EXPR [75:56] + | | `--METHOD_CALL -> ( [75:56] + | | |--DOT -> . [75:44] + | | | |--IDENT -> System [75:38] + | | | `--IDENT -> getProperty [75:45] + | | |--ELIST -> ELIST [75:57] + | | | |--EXPR -> EXPR [75:57] + | | | | `--STRING_LITERAL -> "cassandra.testtag" [75:57] + | | | |--COMMA -> , [75:76] + | | | `--EXPR -> EXPR [75:78] + | | | `--STRING_LITERAL -> "" [75:78] + | | `--RPAREN -> ) [75:80] + | `--SEMI -> ; [75:81] + |--BLOCK_COMMENT_BEGIN -> /* [77:4] + | |--COMMENT_CONTENT -> \n * Set the property for the test suite name so that log configuration can pick it up\n * and log to a file specific to this test suite\n [77:6] + | `--BLOCK_COMMENT_END -> */ [80:5] + |--STATIC_INIT -> STATIC_INIT [81:4] + | `--SLIST -> { [82:4] + | |--VARIABLE_DEF -> VARIABLE_DEF [83:8] + | | |--MODIFIERS -> MODIFIERS [83:8] + | | |--TYPE -> TYPE [83:8] + | | | `--IDENT -> String [83:8] + | | |--IDENT -> command [83:15] + | | `--ASSIGN -> = [83:23] + | | `--EXPR -> EXPR [83:43] + | | `--METHOD_CALL -> ( [83:43] + | | |--DOT -> . [83:31] + | | | |--IDENT -> System [83:25] + | | | `--IDENT -> getProperty [83:32] + | | |--ELIST -> ELIST [83:44] + | | | `--EXPR -> EXPR [83:44] + | | | `--STRING_LITERAL -> "sun.java.command" [83:44] + | | `--RPAREN -> ) [83:62] + | |--SEMI -> ; [83:63] + | |--VARIABLE_DEF -> VARIABLE_DEF [84:8] + | | |--MODIFIERS -> MODIFIERS [84:8] + | | |--TYPE -> TYPE [84:8] + | | | |--IDENT -> String [84:8] + | | | `--ARRAY_DECLARATOR -> [ [84:19] + | | | `--RBRACK -> ] [84:20] + | | |--IDENT -> args [84:15] + | | `--ASSIGN -> = [84:22] + | | `--EXPR -> EXPR [84:37] + | | `--METHOD_CALL -> ( [84:37] + | | |--DOT -> . [84:31] + | | | |--IDENT -> command [84:24] + | | | `--IDENT -> split [84:32] + | | |--ELIST -> ELIST [84:38] + | | | `--EXPR -> EXPR [84:38] + | | | `--STRING_LITERAL -> " " [84:38] + | | `--RPAREN -> ) [84:41] + | |--SEMI -> ; [84:42] + | |--EXPR -> EXPR [85:26] + | | `--METHOD_CALL -> ( [85:26] + | | |--DOT -> . [85:14] + | | | |--IDENT -> System [85:8] + | | | `--IDENT -> setProperty [85:15] + | | |--ELIST -> ELIST [85:27] + | | | |--EXPR -> EXPR [85:27] + | | | | `--STRING_LITERAL -> "suitename" [85:27] + | | | |--COMMA -> , [85:38] + | | | `--EXPR -> EXPR [85:44] + | | | `--INDEX_OP -> [ [85:44] + | | | |--IDENT -> args [85:40] + | | | |--EXPR -> EXPR [85:45] + | | | | `--NUM_INT -> 1 [85:45] + | | | `--RBRACK -> ] [85:46] + | | `--RPAREN -> ) [85:47] + | |--SEMI -> ; [85:48] + | `--RCURLY -> } [86:4] + |--VARIABLE_DEF -> VARIABLE_DEF [91:4] + | |--MODIFIERS -> MODIFIERS [91:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [88:4] + | | | |--COMMENT_CONTENT -> *\n * The XML document.\n [88:6] + | | | `--BLOCK_COMMENT_END -> */ [90:5] + | | `--LITERAL_PRIVATE -> private [91:4] + | |--TYPE -> TYPE [91:12] + | | `--IDENT -> Document [91:12] + | |--IDENT -> doc [91:21] + | `--SEMI -> ; [91:24] + |--VARIABLE_DEF -> VARIABLE_DEF [96:4] + | |--MODIFIERS -> MODIFIERS [96:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [93:4] + | | | |--COMMENT_CONTENT -> *\n * The wrapper for the whole testsuite.\n [93:6] + | | | `--BLOCK_COMMENT_END -> */ [95:5] + | | `--LITERAL_PRIVATE -> private [96:4] + | |--TYPE -> TYPE [96:12] + | | `--IDENT -> Element [96:12] + | |--IDENT -> rootElement [96:20] + | `--SEMI -> ; [96:31] + |--VARIABLE_DEF -> VARIABLE_DEF [106:4] + | |--MODIFIERS -> MODIFIERS [106:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [98:4] + | | | |--COMMENT_CONTENT -> *\n * Element for the current test.\n *\n * The keying of this map is a bit of a hack: tests are keyed by caseName(className) since\n * the Test we get for Test-start isn't the same as the Test we get during test-assumption-fail,\n * so we can't easily match Test objects without manually iterating over all keys and checking\n * individual fields.\n [98:6] + | | | `--BLOCK_COMMENT_END -> */ [105:5] + | | |--LITERAL_PRIVATE -> private [106:4] + | | `--FINAL -> final [106:12] + | |--TYPE -> TYPE [106:18] + | | |--IDENT -> Hashtable [106:18] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [106:27] + | | |--GENERIC_START -> < [106:27] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [106:28] + | | | `--IDENT -> String [106:28] + | | |--COMMA -> , [106:34] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [106:36] + | | | `--IDENT -> Element [106:36] + | | `--GENERIC_END -> > [106:43] + | |--IDENT -> testElements [106:45] + | |--ASSIGN -> = [106:58] + | | `--EXPR -> EXPR [106:60] + | | `--LITERAL_NEW -> new [106:60] + | | |--IDENT -> Hashtable [106:64] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [106:73] + | | | |--GENERIC_START -> < [106:73] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [106:74] + | | | | `--IDENT -> String [106:74] + | | | |--COMMA -> , [106:80] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [106:82] + | | | | `--IDENT -> Element [106:82] + | | | `--GENERIC_END -> > [106:89] + | | |--LPAREN -> ( [106:90] + | | |--ELIST -> ELIST [106:91] + | | `--RPAREN -> ) [106:91] + | `--SEMI -> ; [106:92] + |--VARIABLE_DEF -> VARIABLE_DEF [111:4] + | |--MODIFIERS -> MODIFIERS [111:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [108:4] + | | | |--COMMENT_CONTENT -> *\n * tests that failed.\n [108:6] + | | | `--BLOCK_COMMENT_END -> */ [110:5] + | | |--LITERAL_PRIVATE -> private [111:4] + | | `--FINAL -> final [111:12] + | |--TYPE -> TYPE [111:18] + | | `--IDENT -> Hashtable [111:18] + | |--IDENT -> failedTests [111:28] + | |--ASSIGN -> = [111:40] + | | `--EXPR -> EXPR [111:42] + | | `--LITERAL_NEW -> new [111:42] + | | |--IDENT -> Hashtable [111:46] + | | |--LPAREN -> ( [111:55] + | | |--ELIST -> ELIST [111:56] + | | `--RPAREN -> ) [111:56] + | `--SEMI -> ; [111:57] + |--VARIABLE_DEF -> VARIABLE_DEF [116:4] + | |--MODIFIERS -> MODIFIERS [116:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [113:4] + | | | |--COMMENT_CONTENT -> *\n * Tests that were skipped.\n [113:6] + | | | `--BLOCK_COMMENT_END -> */ [115:5] + | | |--LITERAL_PRIVATE -> private [116:4] + | | `--FINAL -> final [116:12] + | |--TYPE -> TYPE [116:18] + | | |--IDENT -> Hashtable [116:18] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [116:27] + | | |--GENERIC_START -> < [116:27] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [116:28] + | | | `--IDENT -> String [116:28] + | | |--COMMA -> , [116:34] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [116:36] + | | | `--IDENT -> Test [116:36] + | | `--GENERIC_END -> > [116:40] + | |--IDENT -> skippedTests [116:42] + | |--ASSIGN -> = [116:55] + | | `--EXPR -> EXPR [116:57] + | | `--LITERAL_NEW -> new [116:57] + | | |--IDENT -> Hashtable [116:61] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [116:70] + | | | |--GENERIC_START -> < [116:70] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [116:71] + | | | | `--IDENT -> String [116:71] + | | | |--COMMA -> , [116:77] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [116:79] + | | | | `--IDENT -> Test [116:79] + | | | `--GENERIC_END -> > [116:83] + | | |--LPAREN -> ( [116:84] + | | |--ELIST -> ELIST [116:85] + | | `--RPAREN -> ) [116:85] + | `--SEMI -> ; [116:86] + |--VARIABLE_DEF -> VARIABLE_DEF [120:4] + | |--MODIFIERS -> MODIFIERS [120:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [117:4] + | | | |--COMMENT_CONTENT -> *\n * Tests that were ignored. See the note above about the key being a bit of a hack.\n [117:6] + | | | `--BLOCK_COMMENT_END -> */ [119:5] + | | |--LITERAL_PRIVATE -> private [120:4] + | | `--FINAL -> final [120:12] + | |--TYPE -> TYPE [120:18] + | | |--IDENT -> Hashtable [120:18] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [120:27] + | | |--GENERIC_START -> < [120:27] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [120:28] + | | | `--IDENT -> String [120:28] + | | |--COMMA -> , [120:34] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [120:36] + | | | `--IDENT -> Test [120:36] + | | `--GENERIC_END -> > [120:40] + | |--IDENT -> ignoredTests [120:42] + | |--ASSIGN -> = [120:55] + | | `--EXPR -> EXPR [120:57] + | | `--LITERAL_NEW -> new [120:57] + | | |--IDENT -> Hashtable [120:61] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [120:70] + | | | |--GENERIC_START -> < [120:70] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [120:71] + | | | | `--IDENT -> String [120:71] + | | | |--COMMA -> , [120:77] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [120:79] + | | | | `--IDENT -> Test [120:79] + | | | `--GENERIC_END -> > [120:83] + | | |--LPAREN -> ( [120:84] + | | |--ELIST -> ELIST [120:85] + | | `--RPAREN -> ) [120:85] + | `--SEMI -> ; [120:86] + |--VARIABLE_DEF -> VARIABLE_DEF [124:4] + | |--MODIFIERS -> MODIFIERS [124:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [121:4] + | | | |--COMMENT_CONTENT -> *\n * Timing helper.\n [121:6] + | | | `--BLOCK_COMMENT_END -> */ [123:5] + | | |--LITERAL_PRIVATE -> private [124:4] + | | `--FINAL -> final [124:12] + | |--TYPE -> TYPE [124:18] + | | |--IDENT -> Hashtable [124:18] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [124:27] + | | |--GENERIC_START -> < [124:27] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [124:28] + | | | `--IDENT -> String [124:28] + | | |--COMMA -> , [124:34] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [124:36] + | | | `--IDENT -> Long [124:36] + | | `--GENERIC_END -> > [124:40] + | |--IDENT -> testStarts [124:42] + | |--ASSIGN -> = [124:53] + | | `--EXPR -> EXPR [124:55] + | | `--LITERAL_NEW -> new [124:55] + | | |--IDENT -> Hashtable [124:59] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [124:68] + | | | |--GENERIC_START -> < [124:68] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [124:69] + | | | | `--IDENT -> String [124:69] + | | | |--COMMA -> , [124:75] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [124:77] + | | | | `--IDENT -> Long [124:77] + | | | `--GENERIC_END -> > [124:81] + | | |--LPAREN -> ( [124:82] + | | |--ELIST -> ELIST [124:83] + | | `--RPAREN -> ) [124:83] + | `--SEMI -> ; [124:84] + |--VARIABLE_DEF -> VARIABLE_DEF [128:4] + | |--MODIFIERS -> MODIFIERS [128:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [125:4] + | | | |--COMMENT_CONTENT -> *\n * Where to write the log to.\n [125:6] + | | | `--BLOCK_COMMENT_END -> */ [127:5] + | | `--LITERAL_PRIVATE -> private [128:4] + | |--TYPE -> TYPE [128:12] + | | `--IDENT -> OutputStream [128:12] + | |--IDENT -> out [128:25] + | `--SEMI -> ; [128:28] + |--CTOR_DEF -> CTOR_DEF [131:4] + | |--MODIFIERS -> MODIFIERS [131:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [130:4] + | | | |--COMMENT_CONTENT -> * No arg constructor. [130:6] + | | | `--BLOCK_COMMENT_END -> */ [130:27] + | | `--LITERAL_PUBLIC -> public [131:4] + | |--IDENT -> InputAntlr4AstRegressionCassandraInputWithComments [131:11] + | |--LPAREN -> ( [131:61] + | |--PARAMETERS -> PARAMETERS [131:62] + | |--RPAREN -> ) [131:62] + | `--SLIST -> { [131:64] + | `--RCURLY -> } [132:4] + |--METHOD_DEF -> METHOD_DEF [135:4] + | |--MODIFIERS -> MODIFIERS [135:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [134:4] + | | | |--COMMENT_CONTENT -> * {@inheritDoc}. [134:6] + | | | `--BLOCK_COMMENT_END -> */ [134:22] + | | `--LITERAL_PUBLIC -> public [135:4] + | |--TYPE -> TYPE [135:11] + | | `--LITERAL_VOID -> void [135:11] + | |--IDENT -> setOutput [135:16] + | |--LPAREN -> ( [135:25] + | |--PARAMETERS -> PARAMETERS [135:26] + | | `--PARAMETER_DEF -> PARAMETER_DEF [135:26] + | | |--MODIFIERS -> MODIFIERS [135:26] + | | | `--FINAL -> final [135:26] + | | |--TYPE -> TYPE [135:32] + | | | `--IDENT -> OutputStream [135:32] + | | `--IDENT -> out [135:45] + | |--RPAREN -> ) [135:48] + | `--SLIST -> { [135:50] + | |--EXPR -> EXPR [136:17] + | | `--ASSIGN -> = [136:17] + | | |--DOT -> . [136:12] + | | | |--LITERAL_THIS -> this [136:8] + | | | `--IDENT -> out [136:13] + | | `--IDENT -> out [136:19] + | |--SEMI -> ; [136:22] + | `--RCURLY -> } [137:4] + |--METHOD_DEF -> METHOD_DEF [140:4] + | |--MODIFIERS -> MODIFIERS [140:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [139:4] + | | | |--COMMENT_CONTENT -> * {@inheritDoc}. [139:6] + | | | `--BLOCK_COMMENT_END -> */ [139:22] + | | `--LITERAL_PUBLIC -> public [140:4] + | |--TYPE -> TYPE [140:11] + | | `--LITERAL_VOID -> void [140:11] + | |--IDENT -> setSystemOutput [140:16] + | |--LPAREN -> ( [140:31] + | |--PARAMETERS -> PARAMETERS [140:32] + | | `--PARAMETER_DEF -> PARAMETER_DEF [140:32] + | | |--MODIFIERS -> MODIFIERS [140:32] + | | | `--FINAL -> final [140:32] + | | |--TYPE -> TYPE [140:38] + | | | `--IDENT -> String [140:38] + | | `--IDENT -> out [140:45] + | |--RPAREN -> ) [140:48] + | `--SLIST -> { [140:50] + | |--EXPR -> EXPR [141:20] + | | `--METHOD_CALL -> ( [141:20] + | | |--IDENT -> formatOutput [141:8] + | | |--ELIST -> ELIST [141:21] + | | | |--EXPR -> EXPR [141:21] + | | | | `--IDENT -> SYSTEM_OUT [141:21] + | | | |--COMMA -> , [141:31] + | | | `--EXPR -> EXPR [141:33] + | | | `--IDENT -> out [141:33] + | | `--RPAREN -> ) [141:36] + | |--SEMI -> ; [141:37] + | `--RCURLY -> } [142:4] + |--METHOD_DEF -> METHOD_DEF [145:4] + | |--MODIFIERS -> MODIFIERS [145:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [144:4] + | | | |--COMMENT_CONTENT -> * {@inheritDoc}. [144:6] + | | | `--BLOCK_COMMENT_END -> */ [144:22] + | | `--LITERAL_PUBLIC -> public [145:4] + | |--TYPE -> TYPE [145:11] + | | `--LITERAL_VOID -> void [145:11] + | |--IDENT -> setSystemError [145:16] + | |--LPAREN -> ( [145:30] + | |--PARAMETERS -> PARAMETERS [145:31] + | | `--PARAMETER_DEF -> PARAMETER_DEF [145:31] + | | |--MODIFIERS -> MODIFIERS [145:31] + | | | `--FINAL -> final [145:31] + | | |--TYPE -> TYPE [145:37] + | | | `--IDENT -> String [145:37] + | | `--IDENT -> out [145:44] + | |--RPAREN -> ) [145:47] + | `--SLIST -> { [145:49] + | |--EXPR -> EXPR [146:20] + | | `--METHOD_CALL -> ( [146:20] + | | |--IDENT -> formatOutput [146:8] + | | |--ELIST -> ELIST [146:21] + | | | |--EXPR -> EXPR [146:21] + | | | | `--IDENT -> SYSTEM_ERR [146:21] + | | | |--COMMA -> , [146:31] + | | | `--EXPR -> EXPR [146:33] + | | | `--IDENT -> out [146:33] + | | `--RPAREN -> ) [146:36] + | |--SEMI -> ; [146:37] + | `--RCURLY -> } [147:4] + |--METHOD_DEF -> METHOD_DEF [153:4] + | |--MODIFIERS -> MODIFIERS [153:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [149:4] + | | | |--COMMENT_CONTENT -> *\n * The whole testsuite started.\n * @param suite the testsuite.\n [149:6] + | | | `--BLOCK_COMMENT_END -> */ [152:5] + | | `--LITERAL_PUBLIC -> public [153:4] + | |--TYPE -> TYPE [153:11] + | | `--LITERAL_VOID -> void [153:11] + | |--IDENT -> startTestSuite [153:16] + | |--LPAREN -> ( [153:30] + | |--PARAMETERS -> PARAMETERS [153:31] + | | `--PARAMETER_DEF -> PARAMETER_DEF [153:31] + | | |--MODIFIERS -> MODIFIERS [153:31] + | | | `--FINAL -> final [153:31] + | | |--TYPE -> TYPE [153:37] + | | | `--IDENT -> JUnitTest [153:37] + | | `--IDENT -> suite [153:47] + | |--RPAREN -> ) [153:52] + | `--SLIST -> { [153:54] + | |--EXPR -> EXPR [154:12] + | | `--ASSIGN -> = [154:12] + | | |--IDENT -> doc [154:8] + | | `--METHOD_CALL -> ( [154:46] + | | |--DOT -> . [154:34] + | | | |--METHOD_CALL -> ( [154:32] + | | | | |--IDENT -> getDocumentBuilder [154:14] + | | | | |--ELIST -> ELIST [154:33] + | | | | `--RPAREN -> ) [154:33] + | | | `--IDENT -> newDocument [154:35] + | | |--ELIST -> ELIST [154:47] + | | `--RPAREN -> ) [154:47] + | |--SEMI -> ; [154:48] + | |--EXPR -> EXPR [155:20] + | | `--ASSIGN -> = [155:20] + | | |--IDENT -> rootElement [155:8] + | | `--METHOD_CALL -> ( [155:39] + | | |--DOT -> . [155:25] + | | | |--IDENT -> doc [155:22] + | | | `--IDENT -> createElement [155:26] + | | |--ELIST -> ELIST [155:40] + | | | `--EXPR -> EXPR [155:40] + | | | `--IDENT -> TESTSUITE [155:40] + | | `--RPAREN -> ) [155:49] + | |--SEMI -> ; [155:50] + | |--VARIABLE_DEF -> VARIABLE_DEF [156:8] + | | |--MODIFIERS -> MODIFIERS [156:8] + | | |--TYPE -> TYPE [156:8] + | | | `--IDENT -> String [156:8] + | | |--IDENT -> n [156:15] + | | `--ASSIGN -> = [156:17] + | | `--EXPR -> EXPR [156:32] + | | `--METHOD_CALL -> ( [156:32] + | | |--DOT -> . [156:24] + | | | |--IDENT -> suite [156:19] + | | | `--IDENT -> getName [156:25] + | | |--ELIST -> ELIST [156:33] + | | `--RPAREN -> ) [156:33] + | |--SEMI -> ; [156:34] + | |--LITERAL_IF -> if [157:8] + | | |--LPAREN -> ( [157:11] + | | |--EXPR -> EXPR [157:22] + | | | `--LAND -> && [157:22] + | | | |--NOT_EQUAL -> != [157:14] + | | | | |--IDENT -> n [157:12] + | | | | `--LITERAL_NULL -> null [157:17] + | | | `--LNOT -> ! [157:25] + | | | `--METHOD_CALL -> ( [157:37] + | | | |--DOT -> . [157:29] + | | | | |--IDENT -> tag [157:26] + | | | | `--IDENT -> isEmpty [157:30] + | | | |--ELIST -> ELIST [157:38] + | | | `--RPAREN -> ) [157:38] + | | |--RPAREN -> ) [157:39] + | | |--EXPR -> EXPR [158:14] + | | | `--ASSIGN -> = [158:14] + | | | |--IDENT -> n [158:12] + | | | `--PLUS -> + [158:24] + | | | |--PLUS -> + [158:18] + | | | | |--IDENT -> n [158:16] + | | | | `--STRING_LITERAL -> "-" [158:20] + | | | `--IDENT -> tag [158:26] + | | `--SEMI -> ; [158:29] + | |--EXPR -> EXPR [159:32] + | | `--METHOD_CALL -> ( [159:32] + | | |--DOT -> . [159:19] + | | | |--IDENT -> rootElement [159:8] + | | | `--IDENT -> setAttribute [159:20] + | | |--ELIST -> ELIST [159:33] + | | | |--EXPR -> EXPR [159:33] + | | | | `--IDENT -> ATTR_NAME [159:33] + | | | |--COMMA -> , [159:42] + | | | `--EXPR -> EXPR [159:54] + | | | `--QUESTION -> ? [159:54] + | | | |--EQUAL -> == [159:46] + | | | | |--IDENT -> n [159:44] + | | | | `--LITERAL_NULL -> null [159:49] + | | | |--IDENT -> UNKNOWN [159:56] + | | | |--COLON -> : [159:64] + | | | `--IDENT -> n [159:66] + | | `--RPAREN -> ) [159:67] + | |--SEMI -> ; [159:68] + | |--VARIABLE_DEF -> VARIABLE_DEF [162:8] + | | |--MODIFIERS -> MODIFIERS [162:8] + | | | |--SINGLE_LINE_COMMENT -> // [161:8] + | | | | `--COMMENT_CONTENT -> add the timestamp\n [161:10] + | | | `--FINAL -> final [162:8] + | | |--TYPE -> TYPE [162:14] + | | | `--IDENT -> String [162:14] + | | |--IDENT -> timestamp [162:21] + | | `--ASSIGN -> = [162:31] + | | `--EXPR -> EXPR [162:49] + | | `--METHOD_CALL -> ( [162:49] + | | |--DOT -> . [162:42] + | | | |--IDENT -> DateUtils [162:33] + | | | `--IDENT -> format [162:43] + | | |--ELIST -> ELIST [162:50] + | | | |--EXPR -> EXPR [162:50] + | | | | `--LITERAL_NEW -> new [162:50] + | | | | |--IDENT -> Date [162:54] + | | | | |--LPAREN -> ( [162:58] + | | | | |--ELIST -> ELIST [162:59] + | | | | `--RPAREN -> ) [162:59] + | | | |--COMMA -> , [162:60] + | | | `--EXPR -> EXPR [163:25] + | | | `--DOT -> . [163:25] + | | | |--IDENT -> DateUtils [163:16] + | | | `--IDENT -> ISO8601_DATETIME_PATTERN [163:26] + | | `--RPAREN -> ) [163:50] + | |--SEMI -> ; [163:51] + | |--EXPR -> EXPR [164:32] + | | `--METHOD_CALL -> ( [164:32] + | | |--DOT -> . [164:19] + | | | |--IDENT -> rootElement [164:8] + | | | `--IDENT -> setAttribute [164:20] + | | |--ELIST -> ELIST [164:33] + | | | |--EXPR -> EXPR [164:33] + | | | | `--IDENT -> TIMESTAMP [164:33] + | | | |--COMMA -> , [164:42] + | | | `--EXPR -> EXPR [164:44] + | | | `--IDENT -> timestamp [164:44] + | | `--RPAREN -> ) [164:53] + | |--SEMI -> ; [164:54] + | |--EXPR -> EXPR [166:32] + | | `--METHOD_CALL -> ( [166:32] + | | |--DOT -> . [166:19] + | | | |--SINGLE_LINE_COMMENT -> // [165:8] + | | | | `--COMMENT_CONTENT -> and the hostname.\n [165:10] + | | | |--IDENT -> rootElement [166:8] + | | | `--IDENT -> setAttribute [166:20] + | | |--ELIST -> ELIST [166:33] + | | | |--EXPR -> EXPR [166:33] + | | | | `--IDENT -> HOSTNAME [166:33] + | | | |--COMMA -> , [166:41] + | | | `--EXPR -> EXPR [166:54] + | | | `--METHOD_CALL -> ( [166:54] + | | | |--IDENT -> getHostname [166:43] + | | | |--ELIST -> ELIST [166:55] + | | | `--RPAREN -> ) [166:55] + | | `--RPAREN -> ) [166:56] + | |--SEMI -> ; [166:57] + | |--VARIABLE_DEF -> VARIABLE_DEF [169:8] + | | |--MODIFIERS -> MODIFIERS [169:8] + | | | |--SINGLE_LINE_COMMENT -> // [168:8] + | | | | `--COMMENT_CONTENT -> Output properties\n [168:10] + | | | `--FINAL -> final [169:8] + | | |--TYPE -> TYPE [169:14] + | | | `--IDENT -> Element [169:14] + | | |--IDENT -> propsElement [169:22] + | | `--ASSIGN -> = [169:35] + | | `--EXPR -> EXPR [169:54] + | | `--METHOD_CALL -> ( [169:54] + | | |--DOT -> . [169:40] + | | | |--IDENT -> doc [169:37] + | | | `--IDENT -> createElement [169:41] + | | |--ELIST -> ELIST [169:55] + | | | `--EXPR -> EXPR [169:55] + | | | `--IDENT -> PROPERTIES [169:55] + | | `--RPAREN -> ) [169:65] + | |--SEMI -> ; [169:66] + | |--EXPR -> EXPR [170:31] + | | `--METHOD_CALL -> ( [170:31] + | | |--DOT -> . [170:19] + | | | |--IDENT -> rootElement [170:8] + | | | `--IDENT -> appendChild [170:20] + | | |--ELIST -> ELIST [170:32] + | | | `--EXPR -> EXPR [170:32] + | | | `--IDENT -> propsElement [170:32] + | | `--RPAREN -> ) [170:44] + | |--SEMI -> ; [170:45] + | |--VARIABLE_DEF -> VARIABLE_DEF [171:8] + | | |--MODIFIERS -> MODIFIERS [171:8] + | | | `--FINAL -> final [171:8] + | | |--TYPE -> TYPE [171:14] + | | | `--IDENT -> Properties [171:14] + | | |--IDENT -> props [171:25] + | | `--ASSIGN -> = [171:31] + | | `--EXPR -> EXPR [171:52] + | | `--METHOD_CALL -> ( [171:52] + | | |--DOT -> . [171:38] + | | | |--IDENT -> suite [171:33] + | | | `--IDENT -> getProperties [171:39] + | | |--ELIST -> ELIST [171:53] + | | `--RPAREN -> ) [171:53] + | |--SEMI -> ; [171:54] + | |--LITERAL_IF -> if [172:8] + | | |--LPAREN -> ( [172:11] + | | |--EXPR -> EXPR [172:18] + | | | `--NOT_EQUAL -> != [172:18] + | | | |--IDENT -> props [172:12] + | | | `--LITERAL_NULL -> null [172:21] + | | |--RPAREN -> ) [172:25] + | | `--SLIST -> { [172:27] + | | |--VARIABLE_DEF -> VARIABLE_DEF [173:12] + | | | |--MODIFIERS -> MODIFIERS [173:12] + | | | | `--FINAL -> final [173:12] + | | | |--TYPE -> TYPE [173:18] + | | | | `--IDENT -> Enumeration [173:18] + | | | |--IDENT -> e [173:30] + | | | `--ASSIGN -> = [173:32] + | | | `--EXPR -> EXPR [173:53] + | | | `--METHOD_CALL -> ( [173:53] + | | | |--DOT -> . [173:39] + | | | | |--IDENT -> props [173:34] + | | | | `--IDENT -> propertyNames [173:40] + | | | |--ELIST -> ELIST [173:54] + | | | `--RPAREN -> ) [173:54] + | | |--SEMI -> ; [173:55] + | | |--LITERAL_WHILE -> while [174:12] + | | | |--LPAREN -> ( [174:18] + | | | |--EXPR -> EXPR [174:36] + | | | | `--METHOD_CALL -> ( [174:36] + | | | | |--DOT -> . [174:20] + | | | | | |--IDENT -> e [174:19] + | | | | | `--IDENT -> hasMoreElements [174:21] + | | | | |--ELIST -> ELIST [174:37] + | | | | `--RPAREN -> ) [174:37] + | | | |--RPAREN -> ) [174:38] + | | | `--SLIST -> { [174:40] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [175:16] + | | | | |--MODIFIERS -> MODIFIERS [175:16] + | | | | | `--FINAL -> final [175:16] + | | | | |--TYPE -> TYPE [175:22] + | | | | | `--IDENT -> String [175:22] + | | | | |--IDENT -> name [175:29] + | | | | `--ASSIGN -> = [175:34] + | | | | `--EXPR -> EXPR [175:36] + | | | | `--TYPECAST -> ( [175:36] + | | | | |--TYPE -> TYPE [175:37] + | | | | | `--IDENT -> String [175:37] + | | | | |--RPAREN -> ) [175:43] + | | | | `--METHOD_CALL -> ( [175:58] + | | | | |--DOT -> . [175:46] + | | | | | |--IDENT -> e [175:45] + | | | | | `--IDENT -> nextElement [175:47] + | | | | |--ELIST -> ELIST [175:59] + | | | | `--RPAREN -> ) [175:59] + | | | |--SEMI -> ; [175:60] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [176:16] + | | | | |--MODIFIERS -> MODIFIERS [176:16] + | | | | | `--FINAL -> final [176:16] + | | | | |--TYPE -> TYPE [176:22] + | | | | | `--IDENT -> Element [176:22] + | | | | |--IDENT -> propElement [176:30] + | | | | `--ASSIGN -> = [176:42] + | | | | `--EXPR -> EXPR [176:61] + | | | | `--METHOD_CALL -> ( [176:61] + | | | | |--DOT -> . [176:47] + | | | | | |--IDENT -> doc [176:44] + | | | | | `--IDENT -> createElement [176:48] + | | | | |--ELIST -> ELIST [176:62] + | | | | | `--EXPR -> EXPR [176:62] + | | | | | `--IDENT -> PROPERTY [176:62] + | | | | `--RPAREN -> ) [176:70] + | | | |--SEMI -> ; [176:71] + | | | |--EXPR -> EXPR [177:40] + | | | | `--METHOD_CALL -> ( [177:40] + | | | | |--DOT -> . [177:27] + | | | | | |--IDENT -> propElement [177:16] + | | | | | `--IDENT -> setAttribute [177:28] + | | | | |--ELIST -> ELIST [177:41] + | | | | | |--EXPR -> EXPR [177:41] + | | | | | | `--IDENT -> ATTR_NAME [177:41] + | | | | | |--COMMA -> , [177:50] + | | | | | `--EXPR -> EXPR [177:52] + | | | | | `--IDENT -> name [177:52] + | | | | `--RPAREN -> ) [177:56] + | | | |--SEMI -> ; [177:57] + | | | |--EXPR -> EXPR [178:40] + | | | | `--METHOD_CALL -> ( [178:40] + | | | | |--DOT -> . [178:27] + | | | | | |--IDENT -> propElement [178:16] + | | | | | `--IDENT -> setAttribute [178:28] + | | | | |--ELIST -> ELIST [178:41] + | | | | | |--EXPR -> EXPR [178:41] + | | | | | | `--IDENT -> ATTR_VALUE [178:41] + | | | | | |--COMMA -> , [178:51] + | | | | | `--EXPR -> EXPR [178:70] + | | | | | `--METHOD_CALL -> ( [178:70] + | | | | | |--DOT -> . [178:58] + | | | | | | |--IDENT -> props [178:53] + | | | | | | `--IDENT -> getProperty [178:59] + | | | | | |--ELIST -> ELIST [178:71] + | | | | | | `--EXPR -> EXPR [178:71] + | | | | | | `--IDENT -> name [178:71] + | | | | | `--RPAREN -> ) [178:75] + | | | | `--RPAREN -> ) [178:76] + | | | |--SEMI -> ; [178:77] + | | | |--EXPR -> EXPR [179:40] + | | | | `--METHOD_CALL -> ( [179:40] + | | | | |--DOT -> . [179:28] + | | | | | |--IDENT -> propsElement [179:16] + | | | | | `--IDENT -> appendChild [179:29] + | | | | |--ELIST -> ELIST [179:41] + | | | | | `--EXPR -> EXPR [179:41] + | | | | | `--IDENT -> propElement [179:41] + | | | | `--RPAREN -> ) [179:52] + | | | |--SEMI -> ; [179:53] + | | | `--RCURLY -> } [180:12] + | | `--RCURLY -> } [181:8] + | `--RCURLY -> } [182:4] + |--VARIABLE_DEF -> VARIABLE_DEF [184:4] + | |--MODIFIERS -> MODIFIERS [184:4] + | | |--LITERAL_PRIVATE -> private [184:4] + | | |--LITERAL_STATIC -> static [184:12] + | | `--FINAL -> final [184:19] + | |--TYPE -> TYPE [184:25] + | | `--IDENT -> String [184:25] + | |--IDENT -> PROPERTIES [184:32] + | |--ASSIGN -> = [184:43] + | | `--EXPR -> EXPR [184:45] + | | `--STRING_LITERAL -> "" [184:45] + | `--SEMI -> ; [184:47] + |--VARIABLE_DEF -> VARIABLE_DEF [185:4] + | |--MODIFIERS -> MODIFIERS [185:4] + | | |--LITERAL_PRIVATE -> private [185:4] + | | |--LITERAL_STATIC -> static [185:12] + | | `--FINAL -> final [185:19] + | |--TYPE -> TYPE [185:25] + | | `--IDENT -> String [185:25] + | |--IDENT -> HOSTNAME [185:32] + | |--ASSIGN -> = [185:41] + | | `--EXPR -> EXPR [185:43] + | | `--STRING_LITERAL -> "" [185:43] + | `--SEMI -> ; [185:45] + |--VARIABLE_DEF -> VARIABLE_DEF [186:4] + | |--MODIFIERS -> MODIFIERS [186:4] + | | |--LITERAL_PRIVATE -> private [186:4] + | | |--LITERAL_STATIC -> static [186:12] + | | `--FINAL -> final [186:19] + | |--TYPE -> TYPE [186:25] + | | `--IDENT -> String [186:25] + | |--IDENT -> TIMESTAMP [186:32] + | |--ASSIGN -> = [186:42] + | | `--EXPR -> EXPR [186:44] + | | `--STRING_LITERAL -> "" [186:44] + | `--SEMI -> ; [186:46] + |--VARIABLE_DEF -> VARIABLE_DEF [187:4] + | |--MODIFIERS -> MODIFIERS [187:4] + | | |--LITERAL_PRIVATE -> private [187:4] + | | |--LITERAL_STATIC -> static [187:12] + | | `--FINAL -> final [187:19] + | |--TYPE -> TYPE [187:25] + | | `--IDENT -> String [187:25] + | |--IDENT -> ATTR_NAME [187:32] + | |--ASSIGN -> = [187:42] + | | `--EXPR -> EXPR [187:44] + | | `--STRING_LITERAL -> "" [187:44] + | `--SEMI -> ; [187:46] + |--VARIABLE_DEF -> VARIABLE_DEF [188:4] + | |--MODIFIERS -> MODIFIERS [188:4] + | | |--LITERAL_PRIVATE -> private [188:4] + | | |--LITERAL_STATIC -> static [188:12] + | | `--FINAL -> final [188:19] + | |--TYPE -> TYPE [188:25] + | | `--IDENT -> String [188:25] + | |--IDENT -> PROPERTY [188:32] + | |--ASSIGN -> = [188:41] + | | `--EXPR -> EXPR [188:43] + | | `--STRING_LITERAL -> "" [188:43] + | `--SEMI -> ; [188:45] + |--VARIABLE_DEF -> VARIABLE_DEF [189:4] + | |--MODIFIERS -> MODIFIERS [189:4] + | | |--LITERAL_PRIVATE -> private [189:4] + | | |--LITERAL_STATIC -> static [189:12] + | | `--FINAL -> final [189:19] + | |--TYPE -> TYPE [189:25] + | | `--IDENT -> String [189:25] + | |--IDENT -> ATTR_VALUE [189:32] + | |--ASSIGN -> = [189:43] + | | `--EXPR -> EXPR [189:45] + | | `--STRING_LITERAL -> "" [189:45] + | `--SEMI -> ; [189:47] + |--CLASS_DEF -> CLASS_DEF [191:4] + | |--MODIFIERS -> MODIFIERS [191:4] + | |--LITERAL_CLASS -> class [191:4] + | |--IDENT -> JUnitTest [191:10] + | `--OBJBLOCK -> OBJBLOCK [191:20] + | |--LCURLY -> { [191:20] + | |--METHOD_DEF -> METHOD_DEF [192:8] + | | |--MODIFIERS -> MODIFIERS [192:8] + | | | `--LITERAL_PUBLIC -> public [192:8] + | | |--TYPE -> TYPE [192:15] + | | | `--IDENT -> String [192:15] + | | |--IDENT -> getName [192:22] + | | |--LPAREN -> ( [192:29] + | | |--PARAMETERS -> PARAMETERS [192:30] + | | |--RPAREN -> ) [192:30] + | | `--SLIST -> { [192:32] + | | |--LITERAL_RETURN -> return [193:12] + | | | |--EXPR -> EXPR [193:19] + | | | | `--LITERAL_NULL -> null [193:19] + | | | `--SEMI -> ; [193:23] + | | `--RCURLY -> } [194:8] + | |--METHOD_DEF -> METHOD_DEF [196:8] + | | |--MODIFIERS -> MODIFIERS [196:8] + | | | `--LITERAL_PUBLIC -> public [196:8] + | | |--TYPE -> TYPE [196:15] + | | | `--IDENT -> Properties [196:15] + | | |--IDENT -> getProperties [196:26] + | | |--LPAREN -> ( [196:39] + | | |--PARAMETERS -> PARAMETERS [196:40] + | | |--RPAREN -> ) [196:40] + | | `--SLIST -> { [196:42] + | | |--LITERAL_RETURN -> return [197:12] + | | | |--EXPR -> EXPR [197:19] + | | | | `--LITERAL_NULL -> null [197:19] + | | | `--SEMI -> ; [197:23] + | | `--RCURLY -> } [198:8] + | |--METHOD_DEF -> METHOD_DEF [200:8] + | | |--MODIFIERS -> MODIFIERS [200:8] + | | | `--LITERAL_PUBLIC -> public [200:8] + | | |--TYPE -> TYPE [200:15] + | | | `--IDENT -> String [200:15] + | | |--IDENT -> failureCount [200:22] + | | |--LPAREN -> ( [200:34] + | | |--PARAMETERS -> PARAMETERS [200:35] + | | |--RPAREN -> ) [200:35] + | | `--SLIST -> { [200:37] + | | |--LITERAL_RETURN -> return [201:12] + | | | |--EXPR -> EXPR [201:19] + | | | | `--LITERAL_NULL -> null [201:19] + | | | `--SEMI -> ; [201:23] + | | `--RCURLY -> } [202:8] + | |--METHOD_DEF -> METHOD_DEF [204:8] + | | |--MODIFIERS -> MODIFIERS [204:8] + | | | `--LITERAL_PUBLIC -> public [204:8] + | | |--TYPE -> TYPE [204:15] + | | | `--IDENT -> String [204:15] + | | |--IDENT -> getRunTime [204:22] + | | |--LPAREN -> ( [204:32] + | | |--PARAMETERS -> PARAMETERS [204:33] + | | |--RPAREN -> ) [204:33] + | | `--SLIST -> { [204:35] + | | |--LITERAL_RETURN -> return [205:12] + | | | |--EXPR -> EXPR [205:19] + | | | | `--LITERAL_NULL -> null [205:19] + | | | `--SEMI -> ; [205:23] + | | `--RCURLY -> } [206:8] + | `--RCURLY -> } [207:4] + |--METHOD_DEF -> METHOD_DEF [213:4] + | |--MODIFIERS -> MODIFIERS [213:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [209:4] + | | | |--COMMENT_CONTENT -> *\n * get the local hostname\n * @return the name of the local host, or "localhost" if we cannot work it out\n [209:6] + | | | `--BLOCK_COMMENT_END -> */ [212:5] + | | `--LITERAL_PRIVATE -> private [213:4] + | |--TYPE -> TYPE [213:12] + | | `--IDENT -> String [213:12] + | |--IDENT -> getHostname [213:19] + | |--LPAREN -> ( [213:30] + | |--PARAMETERS -> PARAMETERS [213:31] + | |--RPAREN -> ) [213:31] + | `--SLIST -> { [213:34] + | |--VARIABLE_DEF -> VARIABLE_DEF [214:8] + | | |--MODIFIERS -> MODIFIERS [214:8] + | | |--TYPE -> TYPE [214:8] + | | | `--IDENT -> String [214:8] + | | |--IDENT -> hostname [214:15] + | | `--ASSIGN -> = [214:24] + | | `--EXPR -> EXPR [214:26] + | | `--STRING_LITERAL -> "localhost" [214:26] + | |--SEMI -> ; [214:37] + | |--LITERAL_TRY -> try [215:8] + | | |--SLIST -> { [215:12] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [216:12] + | | | | |--MODIFIERS -> MODIFIERS [216:12] + | | | | | `--FINAL -> final [216:12] + | | | | |--TYPE -> TYPE [216:18] + | | | | | `--IDENT -> InetAddress [216:18] + | | | | |--IDENT -> localHost [216:30] + | | | | `--ASSIGN -> = [216:40] + | | | | `--EXPR -> EXPR [216:66] + | | | | `--METHOD_CALL -> ( [216:66] + | | | | |--DOT -> . [216:53] + | | | | | |--IDENT -> InetAddress [216:42] + | | | | | `--IDENT -> getLocalHost [216:54] + | | | | |--ELIST -> ELIST [216:67] + | | | | `--RPAREN -> ) [216:67] + | | | |--SEMI -> ; [216:68] + | | | |--LITERAL_IF -> if [217:12] + | | | | |--LPAREN -> ( [217:15] + | | | | |--EXPR -> EXPR [217:26] + | | | | | `--NOT_EQUAL -> != [217:26] + | | | | | |--IDENT -> localHost [217:16] + | | | | | `--LITERAL_NULL -> null [217:29] + | | | | |--RPAREN -> ) [217:33] + | | | | `--SLIST -> { [217:35] + | | | | |--EXPR -> EXPR [218:25] + | | | | | `--ASSIGN -> = [218:25] + | | | | | |--IDENT -> hostname [218:16] + | | | | | `--METHOD_CALL -> ( [218:48] + | | | | | |--DOT -> . [218:36] + | | | | | | |--IDENT -> localHost [218:27] + | | | | | | `--IDENT -> getHostName [218:37] + | | | | | |--ELIST -> ELIST [218:49] + | | | | | `--RPAREN -> ) [218:49] + | | | | |--SEMI -> ; [218:50] + | | | | `--RCURLY -> } [219:12] + | | | `--RCURLY -> } [220:8] + | | `--LITERAL_CATCH -> catch [220:10] + | | |--LPAREN -> ( [220:16] + | | |--PARAMETER_DEF -> PARAMETER_DEF [220:17] + | | | |--MODIFIERS -> MODIFIERS [220:17] + | | | | `--FINAL -> final [220:17] + | | | |--TYPE -> TYPE [220:23] + | | | | `--IDENT -> UnknownHostException [220:23] + | | | `--IDENT -> e [220:44] + | | |--RPAREN -> ) [220:45] + | | `--SLIST -> { [220:47] + | | |--SINGLE_LINE_COMMENT -> // [221:12] + | | | `--COMMENT_CONTENT -> fall back to default 'localhost'\n [221:14] + | | `--RCURLY -> } [222:8] + | |--LITERAL_RETURN -> return [223:8] + | | |--EXPR -> EXPR [223:15] + | | | `--IDENT -> hostname [223:15] + | | `--SEMI -> ; [223:23] + | `--RCURLY -> } [224:4] + |--VARIABLE_DEF -> VARIABLE_DEF [226:4] + | |--MODIFIERS -> MODIFIERS [226:4] + | | |--LITERAL_PRIVATE -> private [226:4] + | | |--LITERAL_STATIC -> static [226:12] + | | `--FINAL -> final [226:19] + | |--TYPE -> TYPE [226:25] + | | `--IDENT -> String [226:25] + | |--IDENT -> ATTR_TESTS [226:32] + | |--ASSIGN -> = [226:43] + | | `--EXPR -> EXPR [226:45] + | | `--STRING_LITERAL -> "" [226:45] + | `--SEMI -> ; [226:47] + |--VARIABLE_DEF -> VARIABLE_DEF [227:4] + | |--MODIFIERS -> MODIFIERS [227:4] + | | |--LITERAL_PRIVATE -> private [227:4] + | | |--LITERAL_STATIC -> static [227:12] + | | `--FINAL -> final [227:19] + | |--TYPE -> TYPE [227:25] + | | `--IDENT -> String [227:25] + | |--IDENT -> ATTR_FAILURES [227:32] + | |--ASSIGN -> = [227:46] + | | `--EXPR -> EXPR [227:48] + | | `--STRING_LITERAL -> "" [227:48] + | `--SEMI -> ; [227:50] + |--VARIABLE_DEF -> VARIABLE_DEF [228:4] + | |--MODIFIERS -> MODIFIERS [228:4] + | | |--LITERAL_PRIVATE -> private [228:4] + | | |--LITERAL_STATIC -> static [228:12] + | | `--FINAL -> final [228:19] + | |--TYPE -> TYPE [228:25] + | | `--IDENT -> String [228:25] + | |--IDENT -> ATTR_SKIPPED [228:32] + | |--ASSIGN -> = [228:45] + | | `--EXPR -> EXPR [228:47] + | | `--STRING_LITERAL -> "" [228:47] + | `--SEMI -> ; [228:49] + |--METHOD_DEF -> METHOD_DEF [235:4] + | |--MODIFIERS -> MODIFIERS [235:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [230:4] + | | | |--COMMENT_CONTENT -> *\n * The whole testsuite ended.\n * @param suite the testsuite.\n * @throws BuildException on error.\n [230:6] + | | | `--BLOCK_COMMENT_END -> */ [234:5] + | | `--LITERAL_PUBLIC -> public [235:4] + | |--TYPE -> TYPE [235:11] + | | `--LITERAL_VOID -> void [235:11] + | |--IDENT -> endTestSuite [235:16] + | |--LPAREN -> ( [235:28] + | |--PARAMETERS -> PARAMETERS [235:29] + | | `--PARAMETER_DEF -> PARAMETER_DEF [235:29] + | | |--MODIFIERS -> MODIFIERS [235:29] + | | | `--FINAL -> final [235:29] + | | |--TYPE -> TYPE [235:35] + | | | `--IDENT -> JUnitTest [235:35] + | | `--IDENT -> suite [235:45] + | |--RPAREN -> ) [235:50] + | |--LITERAL_THROWS -> throws [235:52] + | | `--IDENT -> BuildException [235:59] + | `--SLIST -> { [235:74] + | |--EXPR -> EXPR [236:32] + | | `--METHOD_CALL -> ( [236:32] + | | |--DOT -> . [236:19] + | | | |--IDENT -> rootElement [236:8] + | | | `--IDENT -> setAttribute [236:20] + | | |--ELIST -> ELIST [236:33] + | | | |--EXPR -> EXPR [236:33] + | | | | `--IDENT -> ATTR_SKIPPED [236:33] + | | | |--COMMA -> , [236:45] + | | | `--EXPR -> EXPR [236:50] + | | | `--PLUS -> + [236:50] + | | | |--STRING_LITERAL -> "" [236:47] + | | | `--METHOD_CALL -> ( [236:70] + | | | |--DOT -> . [236:57] + | | | | |--IDENT -> suite [236:52] + | | | | `--IDENT -> failureCount [236:58] + | | | |--ELIST -> ELIST [236:71] + | | | `--RPAREN -> ) [236:71] + | | `--RPAREN -> ) [236:72] + | |--SEMI -> ; [236:73] + | |--EXPR -> EXPR [237:32] + | | `--METHOD_CALL -> ( [237:32] + | | |--DOT -> . [237:19] + | | | |--IDENT -> rootElement [237:8] + | | | `--IDENT -> setAttribute [237:20] + | | |--ELIST -> ELIST [238:16] + | | | |--EXPR -> EXPR [238:16] + | | | | `--IDENT -> ATTR_TESTS [238:16] + | | | |--COMMA -> , [238:26] + | | | `--EXPR -> EXPR [238:31] + | | | `--PLUS -> + [238:31] + | | | |--STRING_LITERAL -> "" [238:28] + | | | |--LPAREN -> ( [238:33] + | | | |--IDENT -> ONE_SECOND [238:34] + | | | `--RPAREN -> ) [238:44] + | | `--RPAREN -> ) [238:45] + | |--SEMI -> ; [238:46] + | |--LITERAL_IF -> if [239:8] + | | |--LPAREN -> ( [239:11] + | | |--EXPR -> EXPR [239:16] + | | | `--NOT_EQUAL -> != [239:16] + | | | |--IDENT -> out [239:12] + | | | `--LITERAL_NULL -> null [239:19] + | | |--RPAREN -> ) [239:23] + | | `--SLIST -> { [239:25] + | | |--VARIABLE_DEF -> VARIABLE_DEF [240:12] + | | | |--MODIFIERS -> MODIFIERS [240:12] + | | | |--TYPE -> TYPE [240:12] + | | | | `--IDENT -> Writer [240:12] + | | | |--IDENT -> wri [240:19] + | | | `--ASSIGN -> = [240:23] + | | | `--EXPR -> EXPR [240:25] + | | | `--LITERAL_NULL -> null [240:25] + | | |--SEMI -> ; [240:29] + | | |--LITERAL_TRY -> try [241:12] + | | | |--SLIST -> { [241:16] + | | | | |--EXPR -> EXPR [242:20] + | | | | | `--ASSIGN -> = [242:20] + | | | | | |--IDENT -> wri [242:16] + | | | | | `--LITERAL_NEW -> new [242:22] + | | | | | |--IDENT -> BufferedWriter [242:26] + | | | | | |--LPAREN -> ( [242:40] + | | | | | |--ELIST -> ELIST [242:41] + | | | | | | `--EXPR -> EXPR [242:41] + | | | | | | `--LITERAL_NEW -> new [242:41] + | | | | | | |--IDENT -> OutputStreamWriter [242:45] + | | | | | | |--LPAREN -> ( [242:63] + | | | | | | |--ELIST -> ELIST [242:64] + | | | | | | | |--EXPR -> EXPR [242:64] + | | | | | | | | `--IDENT -> out [242:64] + | | | | | | | |--COMMA -> , [242:67] + | | | | | | | `--EXPR -> EXPR [242:69] + | | | | | | | `--STRING_LITERAL -> "UTF8" [242:69] + | | | | | | `--RPAREN -> ) [242:75] + | | | | | `--RPAREN -> ) [242:76] + | | | | |--SEMI -> ; [242:77] + | | | | |--EXPR -> EXPR [243:25] + | | | | | `--METHOD_CALL -> ( [243:25] + | | | | | |--DOT -> . [243:19] + | | | | | | |--IDENT -> wri [243:16] + | | | | | | `--IDENT -> write [243:20] + | | | | | |--ELIST -> ELIST [243:26] + | | | | | | `--EXPR -> EXPR [243:26] + | | | | | | `--STRING_LITERAL -> "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" [243:26] + | | | | | `--RPAREN -> ) [243:73] + | | | | |--SEMI -> ; [243:74] + | | | | |--EXPR -> EXPR [244:46] + | | | | | `--METHOD_CALL -> ( [244:46] + | | | | | |--DOT -> . [244:40] + | | | | | | |--LPAREN -> ( [244:16] + | | | | | | |--LITERAL_NEW -> new [244:17] + | | | | | | | |--IDENT -> DOMElementWriter [244:21] + | | | | | | | |--LPAREN -> ( [244:37] + | | | | | | | |--ELIST -> ELIST [244:38] + | | | | | | | `--RPAREN -> ) [244:38] + | | | | | | |--RPAREN -> ) [244:39] + | | | | | | `--IDENT -> write [244:41] + | | | | | |--ELIST -> ELIST [244:47] + | | | | | | |--EXPR -> EXPR [244:47] + | | | | | | | `--IDENT -> rootElement [244:47] + | | | | | | |--COMMA -> , [244:58] + | | | | | | |--EXPR -> EXPR [244:60] + | | | | | | | `--IDENT -> wri [244:60] + | | | | | | |--COMMA -> , [244:63] + | | | | | | |--EXPR -> EXPR [244:65] + | | | | | | | `--NUM_INT -> 0 [244:65] + | | | | | | |--COMMA -> , [244:66] + | | | | | | `--EXPR -> EXPR [244:68] + | | | | | | `--STRING_LITERAL -> " " [244:68] + | | | | | `--RPAREN -> ) [244:72] + | | | | |--SEMI -> ; [244:73] + | | | | `--RCURLY -> } [245:12] + | | | |--LITERAL_CATCH -> catch [245:14] + | | | | |--LPAREN -> ( [245:20] + | | | | |--PARAMETER_DEF -> PARAMETER_DEF [245:21] + | | | | | |--MODIFIERS -> MODIFIERS [245:21] + | | | | | | `--FINAL -> final [245:21] + | | | | | |--TYPE -> TYPE [245:27] + | | | | | | `--IDENT -> IOException [245:27] + | | | | | `--IDENT -> exc [245:39] + | | | | |--RPAREN -> ) [245:42] + | | | | `--SLIST -> { [245:44] + | | | | |--LITERAL_THROW -> throw [246:16] + | | | | | |--EXPR -> EXPR [246:22] + | | | | | | `--LITERAL_NEW -> new [246:22] + | | | | | | |--IDENT -> BuildException [246:26] + | | | | | | |--LPAREN -> ( [246:40] + | | | | | | |--ELIST -> ELIST [246:41] + | | | | | | | |--EXPR -> EXPR [246:41] + | | | | | | | | `--STRING_LITERAL -> "Unable to write log file" [246:41] + | | | | | | | |--COMMA -> , [246:67] + | | | | | | | `--EXPR -> EXPR [246:69] + | | | | | | | `--IDENT -> exc [246:69] + | | | | | | `--RPAREN -> ) [246:72] + | | | | | `--SEMI -> ; [246:73] + | | | | `--RCURLY -> } [247:12] + | | | `--LITERAL_FINALLY -> finally [247:14] + | | | `--SLIST -> { [247:22] + | | | |--LITERAL_IF -> if [248:16] + | | | | |--LPAREN -> ( [248:19] + | | | | |--EXPR -> EXPR [248:24] + | | | | | `--NOT_EQUAL -> != [248:24] + | | | | | |--IDENT -> wri [248:20] + | | | | | `--LITERAL_NULL -> null [248:27] + | | | | |--RPAREN -> ) [248:31] + | | | | `--SLIST -> { [248:33] + | | | | |--LITERAL_TRY -> try [249:20] + | | | | | |--SLIST -> { [249:24] + | | | | | | |--EXPR -> EXPR [250:33] + | | | | | | | `--METHOD_CALL -> ( [250:33] + | | | | | | | |--DOT -> . [250:27] + | | | | | | | | |--IDENT -> wri [250:24] + | | | | | | | | `--IDENT -> flush [250:28] + | | | | | | | |--ELIST -> ELIST [250:34] + | | | | | | | `--RPAREN -> ) [250:34] + | | | | | | |--SEMI -> ; [250:35] + | | | | | | `--RCURLY -> } [251:20] + | | | | | `--LITERAL_CATCH -> catch [251:22] + | | | | | |--LPAREN -> ( [251:28] + | | | | | |--PARAMETER_DEF -> PARAMETER_DEF [251:29] + | | | | | | |--MODIFIERS -> MODIFIERS [251:29] + | | | | | | | `--FINAL -> final [251:29] + | | | | | | |--TYPE -> TYPE [251:35] + | | | | | | | `--IDENT -> IOException [251:35] + | | | | | | `--IDENT -> ex [251:47] + | | | | | |--RPAREN -> ) [251:49] + | | | | | `--SLIST -> { [251:51] + | | | | | |--SINGLE_LINE_COMMENT -> // [252:24] + | | | | | | `--COMMENT_CONTENT -> ignore\n [252:26] + | | | | | `--RCURLY -> } [253:20] + | | | | `--RCURLY -> } [254:16] + | | | |--LITERAL_IF -> if [255:16] + | | | | |--LPAREN -> ( [255:19] + | | | | |--EXPR -> EXPR [255:38] + | | | | | `--LAND -> && [255:38] + | | | | | |--NOT_EQUAL -> != [255:24] + | | | | | | |--IDENT -> out [255:20] + | | | | | | `--DOT -> . [255:33] + | | | | | | |--IDENT -> System [255:27] + | | | | | | `--IDENT -> out [255:34] + | | | | | `--NOT_EQUAL -> != [255:45] + | | | | | |--IDENT -> out [255:41] + | | | | | `--DOT -> . [255:54] + | | | | | |--IDENT -> System [255:48] + | | | | | `--IDENT -> err [255:55] + | | | | |--RPAREN -> ) [255:58] + | | | | `--SLIST -> { [255:60] + | | | | |--EXPR -> EXPR [256:35] + | | | | | `--METHOD_CALL -> ( [256:35] + | | | | | |--DOT -> . [256:29] + | | | | | | |--IDENT -> FileUtils [256:20] + | | | | | | `--IDENT -> close [256:30] + | | | | | |--ELIST -> ELIST [256:36] + | | | | | | `--EXPR -> EXPR [256:36] + | | | | | | `--IDENT -> wri [256:36] + | | | | | `--RPAREN -> ) [256:39] + | | | | |--SEMI -> ; [256:40] + | | | | `--RCURLY -> } [257:16] + | | | `--RCURLY -> } [258:12] + | | `--RCURLY -> } [259:8] + | `--RCURLY -> } [260:4] + |--METHOD_DEF -> METHOD_DEF [268:4] + | |--MODIFIERS -> MODIFIERS [268:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [262:4] + | | | |--COMMENT_CONTENT -> *\n * Interface TestListener.\n *\n * <p>A new Test is started.\n * @param t the test.\n [262:6] + | | | `--BLOCK_COMMENT_END -> */ [267:5] + | | `--LITERAL_PUBLIC -> public [268:4] + | |--TYPE -> TYPE [268:11] + | | `--LITERAL_VOID -> void [268:11] + | |--IDENT -> startTest [268:16] + | |--LPAREN -> ( [268:25] + | |--PARAMETERS -> PARAMETERS [268:26] + | | `--PARAMETER_DEF -> PARAMETER_DEF [268:26] + | | |--MODIFIERS -> MODIFIERS [268:26] + | | | `--FINAL -> final [268:26] + | | |--TYPE -> TYPE [268:32] + | | | `--IDENT -> Test [268:32] + | | `--IDENT -> t [268:37] + | |--RPAREN -> ) [268:38] + | `--SLIST -> { [268:40] + | |--EXPR -> EXPR [269:22] + | | `--METHOD_CALL -> ( [269:22] + | | |--DOT -> . [269:18] + | | | |--IDENT -> testStarts [269:8] + | | | `--IDENT -> put [269:19] + | | |--ELIST -> ELIST [269:40] + | | | |--EXPR -> EXPR [269:40] + | | | | `--METHOD_CALL -> ( [269:40] + | | | | |--IDENT -> createDescription [269:23] + | | | | |--ELIST -> ELIST [269:41] + | | | | | `--EXPR -> EXPR [269:41] + | | | | | `--IDENT -> t [269:41] + | | | | `--RPAREN -> ) [269:42] + | | | |--COMMA -> , [269:43] + | | | `--EXPR -> EXPR [270:40] + | | | `--METHOD_CALL -> ( [270:40] + | | | |--DOT -> . [270:22] + | | | | |--IDENT -> System [270:16] + | | | | `--IDENT -> currentTimeMillis [270:23] + | | | |--ELIST -> ELIST [270:41] + | | | `--RPAREN -> ) [270:41] + | | `--RPAREN -> ) [270:42] + | |--SEMI -> ; [270:43] + | `--RCURLY -> } [271:4] + |--METHOD_DEF -> METHOD_DEF [273:4] + | |--MODIFIERS -> MODIFIERS [273:4] + | | |--LITERAL_PRIVATE -> private [273:4] + | | `--LITERAL_STATIC -> static [273:12] + | |--TYPE -> TYPE [273:19] + | | `--IDENT -> String [273:19] + | |--IDENT -> createDescription [273:26] + | |--LPAREN -> ( [273:43] + | |--PARAMETERS -> PARAMETERS [273:44] + | | `--PARAMETER_DEF -> PARAMETER_DEF [273:44] + | | |--MODIFIERS -> MODIFIERS [273:44] + | | | `--FINAL -> final [273:44] + | | |--TYPE -> TYPE [273:50] + | | | `--IDENT -> Test [273:50] + | | `--IDENT -> test [273:55] + | |--RPAREN -> ) [273:59] + | |--LITERAL_THROWS -> throws [273:61] + | | `--IDENT -> BuildException [273:68] + | `--SLIST -> { [273:83] + | |--LITERAL_RETURN -> return [274:8] + | | |--EXPR -> EXPR [274:15] + | | | `--LITERAL_NULL -> null [274:15] + | | `--SEMI -> ; [274:19] + | `--RCURLY -> } [275:4] + |--METHOD_DEF -> METHOD_DEF [283:4] + | |--MODIFIERS -> MODIFIERS [283:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [277:4] + | | | |--COMMENT_CONTENT -> *\n * Interface TestListener.\n *\n * <p>A Test is finished.\n * @param test the test.\n [277:6] + | | | `--BLOCK_COMMENT_END -> */ [282:5] + | | `--LITERAL_PUBLIC -> public [283:4] + | |--TYPE -> TYPE [283:11] + | | `--LITERAL_VOID -> void [283:11] + | |--IDENT -> endTest [283:16] + | |--LPAREN -> ( [283:23] + | |--PARAMETERS -> PARAMETERS [283:24] + | | `--PARAMETER_DEF -> PARAMETER_DEF [283:24] + | | |--MODIFIERS -> MODIFIERS [283:24] + | | | `--FINAL -> final [283:24] + | | |--TYPE -> TYPE [283:30] + | | | `--IDENT -> Test [283:30] + | | `--IDENT -> test [283:35] + | |--RPAREN -> ) [283:39] + | `--SLIST -> { [283:41] + | |--VARIABLE_DEF -> VARIABLE_DEF [284:8] + | | |--MODIFIERS -> MODIFIERS [284:8] + | | | `--FINAL -> final [284:8] + | | |--TYPE -> TYPE [284:14] + | | | `--IDENT -> String [284:14] + | | |--IDENT -> testDescription [284:21] + | | `--ASSIGN -> = [284:37] + | | `--EXPR -> EXPR [284:56] + | | `--METHOD_CALL -> ( [284:56] + | | |--IDENT -> createDescription [284:39] + | | |--ELIST -> ELIST [284:57] + | | | `--EXPR -> EXPR [284:57] + | | | `--IDENT -> test [284:57] + | | `--RPAREN -> ) [284:61] + | |--SEMI -> ; [284:62] + | |--SINGLE_LINE_COMMENT -> // [286:8] + | | `--COMMENT_CONTENT -> Fix for bug #5637 - if a junit.extensions.TestSetup is\n [286:10] + | |--SINGLE_LINE_COMMENT -> // [287:8] + | | `--COMMENT_CONTENT -> used and throws an exception during setUp then startTest\n [287:10] + | |--SINGLE_LINE_COMMENT -> // [288:8] + | | `--COMMENT_CONTENT -> would never have been called\n [288:10] + | |--LITERAL_IF -> if [289:8] + | | |--LPAREN -> ( [289:11] + | | |--EXPR -> EXPR [289:12] + | | | `--LNOT -> ! [289:12] + | | | `--METHOD_CALL -> ( [289:35] + | | | |--DOT -> . [289:23] + | | | | |--IDENT -> testStarts [289:13] + | | | | `--IDENT -> containsKey [289:24] + | | | |--ELIST -> ELIST [289:36] + | | | | `--EXPR -> EXPR [289:36] + | | | | `--IDENT -> testDescription [289:36] + | | | `--RPAREN -> ) [289:51] + | | |--RPAREN -> ) [289:52] + | | `--SLIST -> { [289:54] + | | |--EXPR -> EXPR [290:21] + | | | `--METHOD_CALL -> ( [290:21] + | | | |--IDENT -> startTest [290:12] + | | | |--ELIST -> ELIST [290:22] + | | | | `--EXPR -> EXPR [290:22] + | | | | `--IDENT -> test [290:22] + | | | `--RPAREN -> ) [290:26] + | | |--SEMI -> ; [290:27] + | | `--RCURLY -> } [291:8] + | |--VARIABLE_DEF -> VARIABLE_DEF [292:8] + | | |--MODIFIERS -> MODIFIERS [292:8] + | | |--TYPE -> TYPE [292:8] + | | | `--IDENT -> Element [292:8] + | | `--IDENT -> currentTest [292:16] + | |--SEMI -> ; [292:27] + | |--LITERAL_IF -> if [293:8] + | | |--LPAREN -> ( [293:11] + | | |--EXPR -> EXPR [294:16] + | | | `--LAND -> && [294:16] + | | | |--LAND -> && [293:43] + | | | | |--LNOT -> ! [293:12] + | | | | | `--METHOD_CALL -> ( [293:36] + | | | | | |--DOT -> . [293:24] + | | | | | | |--IDENT -> failedTests [293:13] + | | | | | | `--IDENT -> containsKey [293:25] + | | | | | |--ELIST -> ELIST [293:37] + | | | | | | `--EXPR -> EXPR [293:37] + | | | | | | `--IDENT -> test [293:37] + | | | | | `--RPAREN -> ) [293:41] + | | | | `--LNOT -> ! [293:46] + | | | | `--METHOD_CALL -> ( [293:71] + | | | | |--DOT -> . [293:59] + | | | | | |--IDENT -> skippedTests [293:47] + | | | | | `--IDENT -> containsKey [293:60] + | | | | |--ELIST -> ELIST [293:72] + | | | | | `--EXPR -> EXPR [293:72] + | | | | | `--IDENT -> testDescription [293:72] + | | | | `--RPAREN -> ) [293:87] + | | | `--LNOT -> ! [294:19] + | | | `--METHOD_CALL -> ( [294:44] + | | | |--DOT -> . [294:32] + | | | | |--IDENT -> ignoredTests [294:20] + | | | | `--IDENT -> containsKey [294:33] + | | | |--ELIST -> ELIST [294:45] + | | | | `--EXPR -> EXPR [294:45] + | | | | `--IDENT -> testDescription [294:45] + | | | `--RPAREN -> ) [294:60] + | | |--RPAREN -> ) [294:61] + | | |--SLIST -> { [294:63] + | | | |--EXPR -> EXPR [295:24] + | | | | `--ASSIGN -> = [295:24] + | | | | |--IDENT -> currentTest [295:12] + | | | | `--METHOD_CALL -> ( [295:43] + | | | | |--DOT -> . [295:29] + | | | | | |--IDENT -> doc [295:26] + | | | | | `--IDENT -> createElement [295:30] + | | | | |--ELIST -> ELIST [295:44] + | | | | | `--EXPR -> EXPR [295:44] + | | | | | `--STRING_LITERAL -> "TESTCASE" [295:44] + | | | | `--RPAREN -> ) [295:54] + | | | |--SEMI -> ; [295:55] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [296:12] + | | | | |--MODIFIERS -> MODIFIERS [296:12] + | | | | |--TYPE -> TYPE [296:12] + | | | | | `--IDENT -> String [296:12] + | | | | |--IDENT -> n [296:19] + | | | | `--ASSIGN -> = [296:21] + | | | | `--EXPR -> EXPR [296:23] + | | | | `--STRING_LITERAL -> "" [296:23] + | | | |--SEMI -> ; [296:25] + | | | |--LITERAL_IF -> if [297:12] + | | | | |--LPAREN -> ( [297:15] + | | | | |--EXPR -> EXPR [297:26] + | | | | | `--LAND -> && [297:26] + | | | | | |--NOT_EQUAL -> != [297:18] + | | | | | | |--IDENT -> n [297:16] + | | | | | | `--LITERAL_NULL -> null [297:21] + | | | | | `--LNOT -> ! [297:29] + | | | | | `--METHOD_CALL -> ( [297:41] + | | | | | |--DOT -> . [297:33] + | | | | | | |--IDENT -> tag [297:30] + | | | | | | `--IDENT -> isEmpty [297:34] + | | | | | |--ELIST -> ELIST [297:42] + | | | | | `--RPAREN -> ) [297:42] + | | | | |--RPAREN -> ) [297:43] + | | | | |--EXPR -> EXPR [298:18] + | | | | | `--ASSIGN -> = [298:18] + | | | | | |--IDENT -> n [298:16] + | | | | | `--PLUS -> + [298:28] + | | | | | |--PLUS -> + [298:22] + | | | | | | |--IDENT -> n [298:20] + | | | | | | `--STRING_LITERAL -> "-" [298:24] + | | | | | `--IDENT -> tag [298:30] + | | | | `--SEMI -> ; [298:33] + | | | |--EXPR -> EXPR [299:36] + | | | | `--METHOD_CALL -> ( [299:36] + | | | | |--DOT -> . [299:23] + | | | | | |--IDENT -> currentTest [299:12] + | | | | | `--IDENT -> setAttribute [299:24] + | | | | |--ELIST -> ELIST [299:37] + | | | | | |--EXPR -> EXPR [299:37] + | | | | | | `--IDENT -> ATTR_NAME [299:37] + | | | | | |--COMMA -> , [299:46] + | | | | | `--EXPR -> EXPR [300:47] + | | | | | `--QUESTION -> ? [300:47] + | | | | | |--EQUAL -> == [300:39] + | | | | | | |--IDENT -> n [300:37] + | | | | | | `--LITERAL_NULL -> null [300:42] + | | | | | |--IDENT -> UNKNOWN [300:49] + | | | | | |--COLON -> : [300:57] + | | | | | `--IDENT -> n [300:59] + | | | | `--RPAREN -> ) [300:60] + | | | |--SEMI -> ; [300:61] + | | | |--EXPR -> EXPR [303:36] + | | | | `--METHOD_CALL -> ( [303:36] + | | | | |--DOT -> . [303:23] + | | | | | |--SINGLE_LINE_COMMENT -> // [301:12] + | | | | | | `--COMMENT_CONTENT -> a TestSuite can contain Tests from multiple classes,\n [301:14] + | | | | | |--SINGLE_LINE_COMMENT -> // [302:12] + | | | | | | `--COMMENT_CONTENT -> even tests with the same name - disambiguate them.\n [302:14] + | | | | | |--IDENT -> currentTest [303:12] + | | | | | `--IDENT -> setAttribute [303:24] + | | | | |--ELIST -> ELIST [303:37] + | | | | | |--EXPR -> EXPR [303:37] + | | | | | | `--STRING_LITERAL -> "ATTR_CLASSNAME" [303:37] + | | | | | |--COMMA -> , [303:53] + | | | | | `--EXPR -> EXPR [304:20] + | | | | | `--STRING_LITERAL -> "" [304:20] + | | | | `--RPAREN -> ) [304:22] + | | | |--SEMI -> ; [304:23] + | | | |--EXPR -> EXPR [305:35] + | | | | `--METHOD_CALL -> ( [305:35] + | | | | |--DOT -> . [305:23] + | | | | | |--IDENT -> rootElement [305:12] + | | | | | `--IDENT -> appendChild [305:24] + | | | | |--ELIST -> ELIST [305:36] + | | | | | `--EXPR -> EXPR [305:36] + | | | | | `--IDENT -> currentTest [305:36] + | | | | `--RPAREN -> ) [305:47] + | | | |--SEMI -> ; [305:48] + | | | |--EXPR -> EXPR [306:28] + | | | | `--METHOD_CALL -> ( [306:28] + | | | | |--DOT -> . [306:24] + | | | | | |--IDENT -> testElements [306:12] + | | | | | `--IDENT -> put [306:25] + | | | | |--ELIST -> ELIST [306:46] + | | | | | |--EXPR -> EXPR [306:46] + | | | | | | `--METHOD_CALL -> ( [306:46] + | | | | | | |--IDENT -> createDescription [306:29] + | | | | | | |--ELIST -> ELIST [306:47] + | | | | | | | `--EXPR -> EXPR [306:47] + | | | | | | | `--IDENT -> test [306:47] + | | | | | | `--RPAREN -> ) [306:51] + | | | | | |--COMMA -> , [306:52] + | | | | | `--EXPR -> EXPR [306:54] + | | | | | `--IDENT -> currentTest [306:54] + | | | | `--RPAREN -> ) [306:65] + | | | |--SEMI -> ; [306:66] + | | | `--RCURLY -> } [307:8] + | | `--LITERAL_ELSE -> else [307:10] + | | `--SLIST -> { [307:15] + | | |--EXPR -> EXPR [308:24] + | | | `--ASSIGN -> = [308:24] + | | | |--IDENT -> currentTest [308:12] + | | | `--METHOD_CALL -> ( [308:42] + | | | |--DOT -> . [308:38] + | | | | |--IDENT -> testElements [308:26] + | | | | `--IDENT -> get [308:39] + | | | |--ELIST -> ELIST [308:43] + | | | | `--EXPR -> EXPR [308:43] + | | | | `--IDENT -> testDescription [308:43] + | | | `--RPAREN -> ) [308:58] + | | |--SEMI -> ; [308:59] + | | `--RCURLY -> } [309:8] + | |--VARIABLE_DEF -> VARIABLE_DEF [311:8] + | | |--MODIFIERS -> MODIFIERS [311:8] + | | | `--FINAL -> final [311:8] + | | |--TYPE -> TYPE [311:14] + | | | `--IDENT -> Long [311:14] + | | |--IDENT -> l [311:19] + | | `--ASSIGN -> = [311:21] + | | `--EXPR -> EXPR [311:37] + | | `--METHOD_CALL -> ( [311:37] + | | |--DOT -> . [311:33] + | | | |--IDENT -> testStarts [311:23] + | | | `--IDENT -> get [311:34] + | | |--ELIST -> ELIST [311:55] + | | | `--EXPR -> EXPR [311:55] + | | | `--METHOD_CALL -> ( [311:55] + | | | |--IDENT -> createDescription [311:38] + | | | |--ELIST -> ELIST [311:56] + | | | | `--EXPR -> EXPR [311:56] + | | | | `--IDENT -> test [311:56] + | | | `--RPAREN -> ) [311:60] + | | `--RPAREN -> ) [311:61] + | |--SEMI -> ; [311:62] + | `--RCURLY -> } [312:4] + |--METHOD_DEF -> METHOD_DEF [321:4] + | |--MODIFIERS -> MODIFIERS [321:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [314:4] + | | | |--COMMENT_CONTENT -> *\n * Interface TestListener for JUnit &lt;= 3.4.\n *\n * <p>A Test failed.\n * @param test the test.\n * @param t the exception.\n [314:6] + | | | `--BLOCK_COMMENT_END -> */ [320:5] + | | `--LITERAL_PUBLIC -> public [321:4] + | |--TYPE -> TYPE [321:11] + | | `--LITERAL_VOID -> void [321:11] + | |--IDENT -> addFailure [321:16] + | |--LPAREN -> ( [321:26] + | |--PARAMETERS -> PARAMETERS [321:27] + | | |--PARAMETER_DEF -> PARAMETER_DEF [321:27] + | | | |--MODIFIERS -> MODIFIERS [321:27] + | | | | `--FINAL -> final [321:27] + | | | |--TYPE -> TYPE [321:33] + | | | | `--IDENT -> Test [321:33] + | | | `--IDENT -> test [321:38] + | | |--COMMA -> , [321:42] + | | `--PARAMETER_DEF -> PARAMETER_DEF [321:44] + | | |--MODIFIERS -> MODIFIERS [321:44] + | | | `--FINAL -> final [321:44] + | | |--TYPE -> TYPE [321:50] + | | | `--IDENT -> Throwable [321:50] + | | `--IDENT -> t [321:60] + | |--RPAREN -> ) [321:61] + | `--SLIST -> { [321:63] + | |--EXPR -> EXPR [322:19] + | | `--METHOD_CALL -> ( [322:19] + | | |--IDENT -> formatError [322:8] + | | |--ELIST -> ELIST [322:20] + | | | |--EXPR -> EXPR [322:20] + | | | | `--STRING_LITERAL -> "FAILURE" [322:20] + | | | |--COMMA -> , [322:29] + | | | |--EXPR -> EXPR [322:31] + | | | | `--IDENT -> test [322:31] + | | | |--COMMA -> , [322:35] + | | | `--EXPR -> EXPR [322:37] + | | | `--IDENT -> t [322:37] + | | `--RPAREN -> ) [322:38] + | |--SEMI -> ; [322:39] + | `--RCURLY -> } [323:4] + |--METHOD_DEF -> METHOD_DEF [332:4] + | |--MODIFIERS -> MODIFIERS [332:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [325:4] + | | | |--COMMENT_CONTENT -> *\n * Interface TestListener for JUnit &gt; 3.4.\n *\n * <p>A Test failed.\n * @param test the test.\n * @param t the assertion.\n [325:6] + | | | `--BLOCK_COMMENT_END -> */ [331:5] + | | `--LITERAL_PUBLIC -> public [332:4] + | |--TYPE -> TYPE [332:11] + | | `--LITERAL_VOID -> void [332:11] + | |--IDENT -> addFailure [332:16] + | |--LPAREN -> ( [332:26] + | |--PARAMETERS -> PARAMETERS [332:27] + | | |--PARAMETER_DEF -> PARAMETER_DEF [332:27] + | | | |--MODIFIERS -> MODIFIERS [332:27] + | | | | `--FINAL -> final [332:27] + | | | |--TYPE -> TYPE [332:33] + | | | | `--IDENT -> Test [332:33] + | | | `--IDENT -> test [332:38] + | | |--COMMA -> , [332:42] + | | `--PARAMETER_DEF -> PARAMETER_DEF [332:44] + | | |--MODIFIERS -> MODIFIERS [332:44] + | | | `--FINAL -> final [332:44] + | | |--TYPE -> TYPE [332:50] + | | | `--IDENT -> AssertionFailedError [332:50] + | | `--IDENT -> t [332:71] + | |--RPAREN -> ) [332:72] + | `--SLIST -> { [332:74] + | |--EXPR -> EXPR [333:18] + | | `--METHOD_CALL -> ( [333:18] + | | |--IDENT -> addFailure [333:8] + | | |--ELIST -> ELIST [333:19] + | | | |--EXPR -> EXPR [333:19] + | | | | `--IDENT -> test [333:19] + | | | |--COMMA -> , [333:23] + | | | `--EXPR -> EXPR [333:25] + | | | `--TYPECAST -> ( [333:25] + | | | |--TYPE -> TYPE [333:26] + | | | | `--IDENT -> Throwable [333:26] + | | | |--RPAREN -> ) [333:35] + | | | `--IDENT -> t [333:37] + | | `--RPAREN -> ) [333:38] + | |--SEMI -> ; [333:39] + | `--RCURLY -> } [334:4] + |--METHOD_DEF -> METHOD_DEF [343:4] + | |--MODIFIERS -> MODIFIERS [343:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [336:4] + | | | |--COMMENT_CONTENT -> *\n * Interface TestListener.\n *\n * <p>An error occurred while running the test.\n * @param test the test.\n * @param t the error.\n [336:6] + | | | `--BLOCK_COMMENT_END -> */ [342:5] + | | `--LITERAL_PUBLIC -> public [343:4] + | |--TYPE -> TYPE [343:11] + | | `--LITERAL_VOID -> void [343:11] + | |--IDENT -> addError [343:16] + | |--LPAREN -> ( [343:24] + | |--PARAMETERS -> PARAMETERS [343:25] + | | |--PARAMETER_DEF -> PARAMETER_DEF [343:25] + | | | |--MODIFIERS -> MODIFIERS [343:25] + | | | | `--FINAL -> final [343:25] + | | | |--TYPE -> TYPE [343:31] + | | | | `--IDENT -> Test [343:31] + | | | `--IDENT -> test [343:36] + | | |--COMMA -> , [343:40] + | | `--PARAMETER_DEF -> PARAMETER_DEF [343:42] + | | |--MODIFIERS -> MODIFIERS [343:42] + | | | `--FINAL -> final [343:42] + | | |--TYPE -> TYPE [343:48] + | | | `--IDENT -> Throwable [343:48] + | | `--IDENT -> t [343:58] + | |--RPAREN -> ) [343:59] + | `--SLIST -> { [343:61] + | |--EXPR -> EXPR [344:19] + | | `--METHOD_CALL -> ( [344:19] + | | |--IDENT -> formatError [344:8] + | | |--ELIST -> ELIST [344:20] + | | | |--EXPR -> EXPR [344:20] + | | | | `--STRING_LITERAL -> "ERROR" [344:20] + | | | |--COMMA -> , [344:27] + | | | |--EXPR -> EXPR [344:29] + | | | | `--IDENT -> test [344:29] + | | | |--COMMA -> , [344:33] + | | | `--EXPR -> EXPR [344:35] + | | | `--IDENT -> t [344:35] + | | `--RPAREN -> ) [344:36] + | |--SEMI -> ; [344:37] + | `--RCURLY -> } [345:4] + |--METHOD_DEF -> METHOD_DEF [347:4] + | |--MODIFIERS -> MODIFIERS [347:4] + | | `--LITERAL_PRIVATE -> private [347:4] + | |--TYPE -> TYPE [347:12] + | | `--LITERAL_VOID -> void [347:12] + | |--IDENT -> formatError [347:17] + | |--LPAREN -> ( [347:28] + | |--PARAMETERS -> PARAMETERS [347:29] + | | |--PARAMETER_DEF -> PARAMETER_DEF [347:29] + | | | |--MODIFIERS -> MODIFIERS [347:29] + | | | | `--FINAL -> final [347:29] + | | | |--TYPE -> TYPE [347:35] + | | | | `--IDENT -> String [347:35] + | | | `--IDENT -> type [347:42] + | | |--COMMA -> , [347:46] + | | |--PARAMETER_DEF -> PARAMETER_DEF [347:48] + | | | |--MODIFIERS -> MODIFIERS [347:48] + | | | | `--FINAL -> final [347:48] + | | | |--TYPE -> TYPE [347:54] + | | | | `--IDENT -> Test [347:54] + | | | `--IDENT -> test [347:59] + | | |--COMMA -> , [347:63] + | | `--PARAMETER_DEF -> PARAMETER_DEF [347:65] + | | |--MODIFIERS -> MODIFIERS [347:65] + | | | `--FINAL -> final [347:65] + | | |--TYPE -> TYPE [347:71] + | | | `--IDENT -> Throwable [347:71] + | | `--IDENT -> t [347:81] + | |--RPAREN -> ) [347:82] + | `--SLIST -> { [347:84] + | |--LITERAL_IF -> if [348:8] + | | |--LPAREN -> ( [348:11] + | | |--EXPR -> EXPR [348:17] + | | | `--NOT_EQUAL -> != [348:17] + | | | |--IDENT -> test [348:12] + | | | `--LITERAL_NULL -> null [348:20] + | | |--RPAREN -> ) [348:24] + | | `--SLIST -> { [348:26] + | | |--EXPR -> EXPR [349:19] + | | | `--METHOD_CALL -> ( [349:19] + | | | |--IDENT -> endTest [349:12] + | | | |--ELIST -> ELIST [349:20] + | | | | `--EXPR -> EXPR [349:20] + | | | | `--IDENT -> test [349:20] + | | | `--RPAREN -> ) [349:24] + | | |--SEMI -> ; [349:25] + | | |--EXPR -> EXPR [350:27] + | | | `--METHOD_CALL -> ( [350:27] + | | | |--DOT -> . [350:23] + | | | | |--IDENT -> failedTests [350:12] + | | | | `--IDENT -> put [350:24] + | | | |--ELIST -> ELIST [350:28] + | | | | |--EXPR -> EXPR [350:28] + | | | | | `--IDENT -> test [350:28] + | | | | |--COMMA -> , [350:32] + | | | | `--EXPR -> EXPR [350:34] + | | | | `--IDENT -> test [350:34] + | | | `--RPAREN -> ) [350:38] + | | |--SEMI -> ; [350:39] + | | `--RCURLY -> } [351:8] + | |--VARIABLE_DEF -> VARIABLE_DEF [353:8] + | | |--MODIFIERS -> MODIFIERS [353:8] + | | | `--FINAL -> final [353:8] + | | |--TYPE -> TYPE [353:14] + | | | `--IDENT -> Element [353:14] + | | |--IDENT -> nested [353:22] + | | `--ASSIGN -> = [353:29] + | | `--EXPR -> EXPR [353:48] + | | `--METHOD_CALL -> ( [353:48] + | | |--DOT -> . [353:34] + | | | |--IDENT -> doc [353:31] + | | | `--IDENT -> createElement [353:35] + | | |--ELIST -> ELIST [353:49] + | | | `--EXPR -> EXPR [353:49] + | | | `--IDENT -> type [353:49] + | | `--RPAREN -> ) [353:53] + | |--SEMI -> ; [353:54] + | |--VARIABLE_DEF -> VARIABLE_DEF [354:8] + | | |--MODIFIERS -> MODIFIERS [354:8] + | | |--TYPE -> TYPE [354:8] + | | | `--IDENT -> Element [354:8] + | | `--IDENT -> currentTest [354:16] + | |--SEMI -> ; [354:27] + | |--LITERAL_IF -> if [355:8] + | | |--LPAREN -> ( [355:11] + | | |--EXPR -> EXPR [355:17] + | | | `--NOT_EQUAL -> != [355:17] + | | | |--IDENT -> test [355:12] + | | | `--LITERAL_NULL -> null [355:20] + | | |--RPAREN -> ) [355:24] + | | |--SLIST -> { [355:26] + | | | |--EXPR -> EXPR [356:24] + | | | | `--ASSIGN -> = [356:24] + | | | | |--IDENT -> currentTest [356:12] + | | | | `--METHOD_CALL -> ( [356:42] + | | | | |--DOT -> . [356:38] + | | | | | |--IDENT -> testElements [356:26] + | | | | | `--IDENT -> get [356:39] + | | | | |--ELIST -> ELIST [356:60] + | | | | | `--EXPR -> EXPR [356:60] + | | | | | `--METHOD_CALL -> ( [356:60] + | | | | | |--IDENT -> createDescription [356:43] + | | | | | |--ELIST -> ELIST [356:61] + | | | | | | `--EXPR -> EXPR [356:61] + | | | | | | `--IDENT -> test [356:61] + | | | | | `--RPAREN -> ) [356:65] + | | | | `--RPAREN -> ) [356:66] + | | | |--SEMI -> ; [356:67] + | | | `--RCURLY -> } [357:8] + | | `--LITERAL_ELSE -> else [357:10] + | | `--SLIST -> { [357:15] + | | |--EXPR -> EXPR [358:24] + | | | `--ASSIGN -> = [358:24] + | | | |--IDENT -> currentTest [358:12] + | | | `--IDENT -> rootElement [358:26] + | | |--SEMI -> ; [358:37] + | | `--RCURLY -> } [359:8] + | |--EXPR -> EXPR [361:31] + | | `--METHOD_CALL -> ( [361:31] + | | |--DOT -> . [361:19] + | | | |--IDENT -> currentTest [361:8] + | | | `--IDENT -> appendChild [361:20] + | | |--ELIST -> ELIST [361:32] + | | | `--EXPR -> EXPR [361:32] + | | | `--IDENT -> nested [361:32] + | | `--RPAREN -> ) [361:38] + | |--SEMI -> ; [361:39] + | |--VARIABLE_DEF -> VARIABLE_DEF [363:8] + | | |--MODIFIERS -> MODIFIERS [363:8] + | | | `--FINAL -> final [363:8] + | | |--TYPE -> TYPE [363:14] + | | | `--IDENT -> String [363:14] + | | |--IDENT -> message [363:21] + | | `--ASSIGN -> = [363:29] + | | `--EXPR -> EXPR [363:43] + | | `--METHOD_CALL -> ( [363:43] + | | |--DOT -> . [363:32] + | | | |--IDENT -> t [363:31] + | | | `--IDENT -> getMessage [363:33] + | | |--ELIST -> ELIST [363:44] + | | `--RPAREN -> ) [363:44] + | |--SEMI -> ; [363:45] + | |--LITERAL_IF -> if [364:8] + | | |--LPAREN -> ( [364:11] + | | |--EXPR -> EXPR [364:28] + | | | `--LAND -> && [364:28] + | | | |--NOT_EQUAL -> != [364:20] + | | | | |--IDENT -> message [364:12] + | | | | `--LITERAL_NULL -> null [364:23] + | | | `--GT -> > [364:48] + | | | |--METHOD_CALL -> ( [364:45] + | | | | |--DOT -> . [364:38] + | | | | | |--IDENT -> message [364:31] + | | | | | `--IDENT -> length [364:39] + | | | | |--ELIST -> ELIST [364:46] + | | | | `--RPAREN -> ) [364:46] + | | | `--NUM_INT -> 0 [364:50] + | | |--RPAREN -> ) [364:51] + | | `--SLIST -> { [364:53] + | | |--EXPR -> EXPR [365:31] + | | | `--METHOD_CALL -> ( [365:31] + | | | |--DOT -> . [365:18] + | | | | |--IDENT -> nested [365:12] + | | | | `--IDENT -> setAttribute [365:19] + | | | |--ELIST -> ELIST [365:32] + | | | | |--EXPR -> EXPR [365:32] + | | | | | `--STRING_LITERAL -> "ATTR_MESSAGE" [365:32] + | | | | |--COMMA -> , [365:46] + | | | | `--EXPR -> EXPR [365:60] + | | | | `--METHOD_CALL -> ( [365:60] + | | | | |--DOT -> . [365:49] + | | | | | |--IDENT -> t [365:48] + | | | | | `--IDENT -> getMessage [365:50] + | | | | |--ELIST -> ELIST [365:61] + | | | | `--RPAREN -> ) [365:61] + | | | `--RPAREN -> ) [365:62] + | | |--SEMI -> ; [365:63] + | | `--RCURLY -> } [366:8] + | |--EXPR -> EXPR [367:27] + | | `--METHOD_CALL -> ( [367:27] + | | |--DOT -> . [367:14] + | | | |--IDENT -> nested [367:8] + | | | `--IDENT -> setAttribute [367:15] + | | |--ELIST -> ELIST [367:28] + | | | |--EXPR -> EXPR [367:28] + | | | | `--STRING_LITERAL -> "ATTR_TYPE" [367:28] + | | | |--COMMA -> , [367:39] + | | | `--EXPR -> EXPR [367:61] + | | | `--METHOD_CALL -> ( [367:61] + | | | |--DOT -> . [367:53] + | | | | |--METHOD_CALL -> ( [367:51] + | | | | | |--DOT -> . [367:42] + | | | | | | |--IDENT -> t [367:41] + | | | | | | `--IDENT -> getClass [367:43] + | | | | | |--ELIST -> ELIST [367:52] + | | | | | `--RPAREN -> ) [367:52] + | | | | `--IDENT -> getName [367:54] + | | | |--ELIST -> ELIST [367:62] + | | | `--RPAREN -> ) [367:62] + | | `--RPAREN -> ) [367:63] + | |--SEMI -> ; [367:64] + | |--VARIABLE_DEF -> VARIABLE_DEF [369:8] + | | |--MODIFIERS -> MODIFIERS [369:8] + | | | `--FINAL -> final [369:8] + | | |--TYPE -> TYPE [369:14] + | | | `--IDENT -> String [369:14] + | | |--IDENT -> strace [369:21] + | | `--ASSIGN -> = [369:28] + | | `--EXPR -> EXPR [369:30] + | | `--STRING_LITERAL -> "JUnitTestRunner.getFilteredTrace(t" [369:30] + | |--SEMI -> ; [369:66] + | |--VARIABLE_DEF -> VARIABLE_DEF [370:8] + | | |--MODIFIERS -> MODIFIERS [370:8] + | | | `--FINAL -> final [370:8] + | | |--TYPE -> TYPE [370:14] + | | | `--IDENT -> Text [370:14] + | | |--IDENT -> trace [370:19] + | | `--ASSIGN -> = [370:25] + | | `--EXPR -> EXPR [370:45] + | | `--METHOD_CALL -> ( [370:45] + | | |--DOT -> . [370:30] + | | | |--IDENT -> doc [370:27] + | | | `--IDENT -> createTextNode [370:31] + | | |--ELIST -> ELIST [370:46] + | | | `--EXPR -> EXPR [370:46] + | | | `--IDENT -> strace [370:46] + | | `--RPAREN -> ) [370:52] + | |--SEMI -> ; [370:53] + | |--EXPR -> EXPR [371:26] + | | `--METHOD_CALL -> ( [371:26] + | | |--DOT -> . [371:14] + | | | |--IDENT -> nested [371:8] + | | | `--IDENT -> appendChild [371:15] + | | |--ELIST -> ELIST [371:27] + | | | `--EXPR -> EXPR [371:27] + | | | `--IDENT -> trace [371:27] + | | `--RPAREN -> ) [371:32] + | |--SEMI -> ; [371:33] + | `--RCURLY -> } [372:4] + |--METHOD_DEF -> METHOD_DEF [374:4] + | |--MODIFIERS -> MODIFIERS [374:4] + | | `--LITERAL_PRIVATE -> private [374:4] + | |--TYPE -> TYPE [374:12] + | | `--LITERAL_VOID -> void [374:12] + | |--IDENT -> formatOutput [374:17] + | |--LPAREN -> ( [374:29] + | |--PARAMETERS -> PARAMETERS [374:30] + | | |--PARAMETER_DEF -> PARAMETER_DEF [374:30] + | | | |--MODIFIERS -> MODIFIERS [374:30] + | | | | `--FINAL -> final [374:30] + | | | |--TYPE -> TYPE [374:36] + | | | | `--IDENT -> String [374:36] + | | | `--IDENT -> type [374:43] + | | |--COMMA -> , [374:47] + | | `--PARAMETER_DEF -> PARAMETER_DEF [374:49] + | | |--MODIFIERS -> MODIFIERS [374:49] + | | | `--FINAL -> final [374:49] + | | |--TYPE -> TYPE [374:55] + | | | `--IDENT -> String [374:55] + | | `--IDENT -> output [374:62] + | |--RPAREN -> ) [374:68] + | `--SLIST -> { [374:70] + | |--VARIABLE_DEF -> VARIABLE_DEF [375:8] + | | |--MODIFIERS -> MODIFIERS [375:8] + | | | `--FINAL -> final [375:8] + | | |--TYPE -> TYPE [375:14] + | | | `--IDENT -> Element [375:14] + | | |--IDENT -> nested [375:22] + | | `--ASSIGN -> = [375:29] + | | `--EXPR -> EXPR [375:48] + | | `--METHOD_CALL -> ( [375:48] + | | |--DOT -> . [375:34] + | | | |--IDENT -> doc [375:31] + | | | `--IDENT -> createElement [375:35] + | | |--ELIST -> ELIST [375:49] + | | | `--EXPR -> EXPR [375:49] + | | | `--IDENT -> type [375:49] + | | `--RPAREN -> ) [375:53] + | |--SEMI -> ; [375:54] + | |--EXPR -> EXPR [376:31] + | | `--METHOD_CALL -> ( [376:31] + | | |--DOT -> . [376:19] + | | | |--IDENT -> rootElement [376:8] + | | | `--IDENT -> appendChild [376:20] + | | |--ELIST -> ELIST [376:32] + | | | `--EXPR -> EXPR [376:32] + | | | `--IDENT -> nested [376:32] + | | `--RPAREN -> ) [376:38] + | |--SEMI -> ; [376:39] + | |--EXPR -> EXPR [377:26] + | | `--METHOD_CALL -> ( [377:26] + | | |--DOT -> . [377:14] + | | | |--IDENT -> nested [377:8] + | | | `--IDENT -> appendChild [377:15] + | | |--ELIST -> ELIST [377:49] + | | | `--EXPR -> EXPR [377:49] + | | | `--METHOD_CALL -> ( [377:49] + | | | |--DOT -> . [377:30] + | | | | |--IDENT -> doc [377:27] + | | | | `--IDENT -> createCDATASection [377:31] + | | | |--ELIST -> ELIST [377:50] + | | | | `--EXPR -> EXPR [377:50] + | | | | `--IDENT -> output [377:50] + | | | `--RPAREN -> ) [377:56] + | | `--RPAREN -> ) [377:57] + | |--SEMI -> ; [377:58] + | `--RCURLY -> } [378:4] + |--METHOD_DEF -> METHOD_DEF [380:4] + | |--MODIFIERS -> MODIFIERS [380:4] + | | `--LITERAL_PUBLIC -> public [380:4] + | |--TYPE -> TYPE [380:11] + | | `--LITERAL_VOID -> void [380:11] + | |--IDENT -> testIgnored [380:16] + | |--LPAREN -> ( [380:27] + | |--PARAMETERS -> PARAMETERS [380:28] + | | `--PARAMETER_DEF -> PARAMETER_DEF [380:28] + | | |--MODIFIERS -> MODIFIERS [380:28] + | | | `--FINAL -> final [380:28] + | | |--TYPE -> TYPE [380:34] + | | | `--IDENT -> Test [380:34] + | | `--IDENT -> test [380:39] + | |--RPAREN -> ) [380:43] + | `--SLIST -> { [380:45] + | |--EXPR -> EXPR [381:18] + | | `--METHOD_CALL -> ( [381:18] + | | |--IDENT -> formatSkip [381:8] + | | |--ELIST -> ELIST [381:19] + | | | |--EXPR -> EXPR [381:19] + | | | | `--IDENT -> test [381:19] + | | | |--COMMA -> , [381:23] + | | | `--EXPR -> EXPR [381:25] + | | | `--STRING_LITERAL -> "JUnitVersionHelper.getIgnoreMessage(test)" [381:25] + | | `--RPAREN -> ) [381:68] + | |--SEMI -> ; [381:69] + | |--LITERAL_IF -> if [382:8] + | | |--LPAREN -> ( [382:11] + | | |--EXPR -> EXPR [382:17] + | | | `--NOT_EQUAL -> != [382:17] + | | | |--IDENT -> test [382:12] + | | | `--LITERAL_NULL -> null [382:20] + | | |--RPAREN -> ) [382:24] + | | `--SLIST -> { [382:26] + | | |--EXPR -> EXPR [383:28] + | | | `--METHOD_CALL -> ( [383:28] + | | | |--DOT -> . [383:24] + | | | | |--IDENT -> ignoredTests [383:12] + | | | | `--IDENT -> put [383:25] + | | | |--ELIST -> ELIST [383:46] + | | | | |--EXPR -> EXPR [383:46] + | | | | | `--METHOD_CALL -> ( [383:46] + | | | | | |--IDENT -> createDescription [383:29] + | | | | | |--ELIST -> ELIST [383:47] + | | | | | | `--EXPR -> EXPR [383:47] + | | | | | | `--IDENT -> test [383:47] + | | | | | `--RPAREN -> ) [383:51] + | | | | |--COMMA -> , [383:52] + | | | | `--EXPR -> EXPR [383:54] + | | | | `--IDENT -> test [383:54] + | | | `--RPAREN -> ) [383:58] + | | |--SEMI -> ; [383:59] + | | `--RCURLY -> } [384:8] + | `--RCURLY -> } [385:4] + |--METHOD_DEF -> METHOD_DEF [388:4] + | |--MODIFIERS -> MODIFIERS [388:4] + | | `--LITERAL_PUBLIC -> public [388:4] + | |--TYPE -> TYPE [388:11] + | | `--LITERAL_VOID -> void [388:11] + | |--IDENT -> formatSkip [388:16] + | |--LPAREN -> ( [388:26] + | |--PARAMETERS -> PARAMETERS [388:27] + | | |--PARAMETER_DEF -> PARAMETER_DEF [388:27] + | | | |--MODIFIERS -> MODIFIERS [388:27] + | | | | `--FINAL -> final [388:27] + | | | |--TYPE -> TYPE [388:33] + | | | | `--IDENT -> Test [388:33] + | | | `--IDENT -> test [388:38] + | | |--COMMA -> , [388:42] + | | `--PARAMETER_DEF -> PARAMETER_DEF [388:44] + | | |--MODIFIERS -> MODIFIERS [388:44] + | | | `--FINAL -> final [388:44] + | | |--TYPE -> TYPE [388:50] + | | | `--IDENT -> String [388:50] + | | `--IDENT -> message [388:57] + | |--RPAREN -> ) [388:64] + | `--SLIST -> { [388:66] + | |--LITERAL_IF -> if [389:8] + | | |--LPAREN -> ( [389:11] + | | |--EXPR -> EXPR [389:17] + | | | `--NOT_EQUAL -> != [389:17] + | | | |--IDENT -> test [389:12] + | | | `--LITERAL_NULL -> null [389:20] + | | |--RPAREN -> ) [389:24] + | | `--SLIST -> { [389:26] + | | |--EXPR -> EXPR [390:19] + | | | `--METHOD_CALL -> ( [390:19] + | | | |--IDENT -> endTest [390:12] + | | | |--ELIST -> ELIST [390:20] + | | | | `--EXPR -> EXPR [390:20] + | | | | `--IDENT -> test [390:20] + | | | `--RPAREN -> ) [390:24] + | | |--SEMI -> ; [390:25] + | | `--RCURLY -> } [391:8] + | |--VARIABLE_DEF -> VARIABLE_DEF [393:8] + | | |--MODIFIERS -> MODIFIERS [393:8] + | | | `--FINAL -> final [393:8] + | | |--TYPE -> TYPE [393:14] + | | | `--IDENT -> Element [393:14] + | | |--IDENT -> nested [393:22] + | | `--ASSIGN -> = [393:29] + | | `--EXPR -> EXPR [393:48] + | | `--METHOD_CALL -> ( [393:48] + | | |--DOT -> . [393:34] + | | | |--IDENT -> doc [393:31] + | | | `--IDENT -> createElement [393:35] + | | |--ELIST -> ELIST [393:49] + | | | `--EXPR -> EXPR [393:49] + | | | `--STRING_LITERAL -> "skipped" [393:49] + | | `--RPAREN -> ) [393:58] + | |--SEMI -> ; [393:59] + | |--LITERAL_IF -> if [395:8] + | | |--LPAREN -> ( [395:11] + | | |--EXPR -> EXPR [395:20] + | | | `--NOT_EQUAL -> != [395:20] + | | | |--IDENT -> message [395:12] + | | | `--LITERAL_NULL -> null [395:23] + | | |--RPAREN -> ) [395:27] + | | `--SLIST -> { [395:29] + | | |--EXPR -> EXPR [396:31] + | | | `--METHOD_CALL -> ( [396:31] + | | | |--DOT -> . [396:18] + | | | | |--IDENT -> nested [396:12] + | | | | `--IDENT -> setAttribute [396:19] + | | | |--ELIST -> ELIST [396:32] + | | | | |--EXPR -> EXPR [396:32] + | | | | | `--STRING_LITERAL -> "message" [396:32] + | | | | |--COMMA -> , [396:41] + | | | | `--EXPR -> EXPR [396:43] + | | | | `--IDENT -> message [396:43] + | | | `--RPAREN -> ) [396:50] + | | |--SEMI -> ; [396:51] + | | `--RCURLY -> } [397:8] + | |--VARIABLE_DEF -> VARIABLE_DEF [399:8] + | | |--MODIFIERS -> MODIFIERS [399:8] + | | |--TYPE -> TYPE [399:8] + | | | `--IDENT -> Element [399:8] + | | `--IDENT -> currentTest [399:16] + | |--SEMI -> ; [399:27] + | |--LITERAL_IF -> if [400:8] + | | |--LPAREN -> ( [400:11] + | | |--EXPR -> EXPR [400:17] + | | | `--NOT_EQUAL -> != [400:17] + | | | |--IDENT -> test [400:12] + | | | `--LITERAL_NULL -> null [400:20] + | | |--RPAREN -> ) [400:24] + | | |--SLIST -> { [400:26] + | | | |--EXPR -> EXPR [401:24] + | | | | `--ASSIGN -> = [401:24] + | | | | |--IDENT -> currentTest [401:12] + | | | | `--METHOD_CALL -> ( [401:42] + | | | | |--DOT -> . [401:38] + | | | | | |--IDENT -> testElements [401:26] + | | | | | `--IDENT -> get [401:39] + | | | | |--ELIST -> ELIST [401:60] + | | | | | `--EXPR -> EXPR [401:60] + | | | | | `--METHOD_CALL -> ( [401:60] + | | | | | |--IDENT -> createDescription [401:43] + | | | | | |--ELIST -> ELIST [401:61] + | | | | | | `--EXPR -> EXPR [401:61] + | | | | | | `--IDENT -> test [401:61] + | | | | | `--RPAREN -> ) [401:65] + | | | | `--RPAREN -> ) [401:66] + | | | |--SEMI -> ; [401:67] + | | | `--RCURLY -> } [402:8] + | | `--LITERAL_ELSE -> else [402:10] + | | `--SLIST -> { [402:15] + | | |--EXPR -> EXPR [403:24] + | | | `--ASSIGN -> = [403:24] + | | | |--IDENT -> currentTest [403:12] + | | | `--IDENT -> rootElement [403:26] + | | |--SEMI -> ; [403:37] + | | `--RCURLY -> } [404:8] + | |--EXPR -> EXPR [406:31] + | | `--METHOD_CALL -> ( [406:31] + | | |--DOT -> . [406:19] + | | | |--IDENT -> currentTest [406:8] + | | | `--IDENT -> appendChild [406:20] + | | |--ELIST -> ELIST [406:32] + | | | `--EXPR -> EXPR [406:32] + | | | `--IDENT -> nested [406:32] + | | `--RPAREN -> ) [406:38] + | |--SEMI -> ; [406:39] + | `--RCURLY -> } [408:4] + |--METHOD_DEF -> METHOD_DEF [410:4] + | |--MODIFIERS -> MODIFIERS [410:4] + | | `--LITERAL_PUBLIC -> public [410:4] + | |--TYPE -> TYPE [410:11] + | | `--LITERAL_VOID -> void [410:11] + | |--IDENT -> testAssumptionFailure [410:16] + | |--LPAREN -> ( [410:37] + | |--PARAMETERS -> PARAMETERS [410:38] + | | |--PARAMETER_DEF -> PARAMETER_DEF [410:38] + | | | |--MODIFIERS -> MODIFIERS [410:38] + | | | | `--FINAL -> final [410:38] + | | | |--TYPE -> TYPE [410:44] + | | | | `--IDENT -> Test [410:44] + | | | `--IDENT -> test [410:49] + | | |--COMMA -> , [410:53] + | | `--PARAMETER_DEF -> PARAMETER_DEF [410:55] + | | |--MODIFIERS -> MODIFIERS [410:55] + | | | `--FINAL -> final [410:55] + | | |--TYPE -> TYPE [410:61] + | | | `--IDENT -> Throwable [410:61] + | | `--IDENT -> failure [410:71] + | |--RPAREN -> ) [410:78] + | `--SLIST -> { [410:80] + | |--EXPR -> EXPR [411:18] + | | `--METHOD_CALL -> ( [411:18] + | | |--IDENT -> formatSkip [411:8] + | | |--ELIST -> ELIST [411:19] + | | | |--EXPR -> EXPR [411:19] + | | | | `--IDENT -> test [411:19] + | | | |--COMMA -> , [411:23] + | | | `--EXPR -> EXPR [411:43] + | | | `--METHOD_CALL -> ( [411:43] + | | | |--DOT -> . [411:32] + | | | | |--IDENT -> failure [411:25] + | | | | `--IDENT -> getMessage [411:33] + | | | |--ELIST -> ELIST [411:44] + | | | `--RPAREN -> ) [411:44] + | | `--RPAREN -> ) [411:45] + | |--SEMI -> ; [411:46] + | |--EXPR -> EXPR [412:24] + | | `--METHOD_CALL -> ( [412:24] + | | |--DOT -> . [412:20] + | | | |--IDENT -> skippedTests [412:8] + | | | `--IDENT -> put [412:21] + | | |--ELIST -> ELIST [412:42] + | | | |--EXPR -> EXPR [412:42] + | | | | `--METHOD_CALL -> ( [412:42] + | | | | |--IDENT -> createDescription [412:25] + | | | | |--ELIST -> ELIST [412:43] + | | | | | `--EXPR -> EXPR [412:43] + | | | | | `--IDENT -> test [412:43] + | | | | `--RPAREN -> ) [412:47] + | | | |--COMMA -> , [412:48] + | | | `--EXPR -> EXPR [412:50] + | | | `--IDENT -> test [412:50] + | | `--RPAREN -> ) [412:54] + | |--SEMI -> ; [412:55] + | `--RCURLY -> } [414:4] + |--RCURLY -> } [415:0] + `--SINGLE_LINE_COMMENT -> // [415:2] + `--COMMENT_CONTENT -> XMLJUnitResultFormatter, no newline on purpose [415:4] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionCommentsOnAnnotationsAndEnums.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionCommentsOnAnnotationsAndEnums.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionCommentsOnAnnotationsAndEnums.java @@ -0,0 +1,143 @@ +/* + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +import static com.puppycrawl.tools.checkstyle.grammar.antlr4.LifecyclePhase.GENERATE_RESOURCES; +import static java.lang.String.format; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Set; + +import org.junit.platform.commons.logging.Logger; + +class Artifact{} +class ArtifactRepository{} +class License{} +class Model{} +class Organization{} +class ProcessRemoteResourcesMojo{} +@interface Component{ + Class<MavenProjectBuilder> role(); +} +class LifecyclePhase{ + public static final Object GENERATE_RESOURCES = null; +} +@interface Mojo{ + String name(); +} +@interface Parameter{ + String defaultValue(); + + boolean readonly(); +} +class ResolutionScope{ + public static final Object RUNTIME = null; +} +class InvalidProjectModelException{} +class MavenProject{} +class MavenProjectBuilder{} +class ProjectBuildingException{} + +/** + * Extends the Maven Remote Resources plugin to fix memory issue found in it, see + * <a href="https://jira.xwiki.org/browse/XCOMMONS-1421">XCOMMONS-1421</a>. + * <p> + * To be removed when <a href="https://issues.apache.org/jira/browse/MRRESOURCES-106">MRRESOURCES-106</a> is fixed on + * the Maven side. + * + * @version $Id: 45afe6a790dc2b72fec66a9f5b0e95e95105bd43 $ + * @since 9.11.5 + * @since 10.5RC1 + */ +@Mojo(name = "") +public class InputAntlr4AstRegressionCommentsOnAnnotationsAndEnums + extends ProcessRemoteResourcesMojo +{ + /** + * Control what is injected in the "projects" Velocity binding. + * + * @version $Id: 45afe6a790dc2b72fec66a9f5b0e95e95105bd43 $ + */ + public enum ProjectData + { + /** + * "projects" is empty. + */ + NONE, + + /** + * "projects" only contains licenses. + */ + LICENSES, + + /** + * "projects" contains full MavenProject metadata + * (very expensive but standard Maven Resource plugin behavior). + */ + FULL + } + + @Parameter(defaultValue = "NONE", readonly = false) + protected ProjectData projectsData; + + @Parameter(defaultValue = "${localRepository}", readonly = true) + private ArtifactRepository localRepositoryThis; + + @Component(role = MavenProjectBuilder.class) + private MavenProjectBuilder mavenProjectBuilderThis; + + /** + * List of Remote Repositories used by the resolver. + */ + @Parameter(defaultValue = "${project.remoteArtifactRepositories}", readonly = true) + private List<ArtifactRepository> remoteArtifactRepositoriesThis; + + private Logger getLog() { + return null; + } + + enum InputJavadocVariableTagsEnum + { + CONSTANT_A, // violation + + /** + * + */ + CONSTANT_B, + + CONSTANT_C // violation + { + /** + * + */ + public void someMethod() + { + } + + public void someOtherMethod() + { + + } + } + } + +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionCommentsOnAnnotationsAndEnums.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionCommentsOnAnnotationsAndEnums.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionCommentsOnAnnotationsAndEnums.txt @@ -0,0 +1,473 @@ +BLOCK_COMMENT_BEGIN -> /* [1:0] +|--COMMENT_CONTENT -> \n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http://www.fsf.org.\n [1:2] +`--BLOCK_COMMENT_END -> */ [19:1] +PACKAGE_DEF -> package [20:0] +|--ANNOTATIONS -> ANNOTATIONS [20:47] +|--DOT -> . [20:47] +| |--DOT -> . [20:39] +| | |--DOT -> . [20:28] +| | | |--DOT -> . [20:22] +| | | | |--DOT -> . [20:11] +| | | | | |--IDENT -> com [20:8] +| | | | | `--IDENT -> puppycrawl [20:12] +| | | | `--IDENT -> tools [20:23] +| | | `--IDENT -> checkstyle [20:29] +| | `--IDENT -> grammar [20:40] +| `--IDENT -> antlr4 [20:48] +`--SEMI -> ; [20:54] +STATIC_IMPORT -> import [22:0] +|--LITERAL_STATIC -> static [22:7] +|--DOT -> . [22:75] +| |--DOT -> . [22:60] +| | |--DOT -> . [22:53] +| | | |--DOT -> . [22:45] +| | | | |--DOT -> . [22:34] +| | | | | |--DOT -> . [22:28] +| | | | | | |--DOT -> . [22:17] +| | | | | | | |--IDENT -> com [22:14] +| | | | | | | `--IDENT -> puppycrawl [22:18] +| | | | | | `--IDENT -> tools [22:29] +| | | | | `--IDENT -> checkstyle [22:35] +| | | | `--IDENT -> grammar [22:46] +| | | `--IDENT -> antlr4 [22:54] +| | `--IDENT -> LifecyclePhase [22:61] +| `--IDENT -> GENERATE_RESOURCES [22:76] +`--SEMI -> ; [22:94] +STATIC_IMPORT -> import [23:0] +|--LITERAL_STATIC -> static [23:7] +|--DOT -> . [23:30] +| |--DOT -> . [23:23] +| | |--DOT -> . [23:18] +| | | |--IDENT -> java [23:14] +| | | `--IDENT -> lang [23:19] +| | `--IDENT -> String [23:24] +| `--IDENT -> format [23:31] +`--SEMI -> ; [23:37] +IMPORT -> import [25:0] +|--DOT -> . [25:16] +| |--DOT -> . [25:11] +| | |--IDENT -> java [25:7] +| | `--IDENT -> util [25:12] +| `--IDENT -> ArrayList [25:17] +`--SEMI -> ; [25:26] +IMPORT -> import [26:0] +|--DOT -> . [26:16] +| |--DOT -> . [26:11] +| | |--IDENT -> java [26:7] +| | `--IDENT -> util [26:12] +| `--IDENT -> Collections [26:17] +`--SEMI -> ; [26:28] +IMPORT -> import [27:0] +|--DOT -> . [27:16] +| |--DOT -> . [27:11] +| | |--IDENT -> java [27:7] +| | `--IDENT -> util [27:12] +| `--IDENT -> List [27:17] +`--SEMI -> ; [27:21] +IMPORT -> import [28:0] +|--DOT -> . [28:16] +| |--DOT -> . [28:11] +| | |--IDENT -> java [28:7] +| | `--IDENT -> util [28:12] +| `--IDENT -> Set [28:17] +`--SEMI -> ; [28:20] +IMPORT -> import [30:0] +|--DOT -> . [30:41] +| |--DOT -> . [30:33] +| | |--DOT -> . [30:25] +| | | |--DOT -> . [30:16] +| | | | |--DOT -> . [30:10] +| | | | | |--IDENT -> org [30:7] +| | | | | `--IDENT -> junit [30:11] +| | | | `--IDENT -> platform [30:17] +| | | `--IDENT -> commons [30:26] +| | `--IDENT -> logging [30:34] +| `--IDENT -> Logger [30:42] +`--SEMI -> ; [30:48] +CLASS_DEF -> CLASS_DEF [32:0] +|--MODIFIERS -> MODIFIERS [32:0] +|--LITERAL_CLASS -> class [32:0] +|--IDENT -> Artifact [32:6] +`--OBJBLOCK -> OBJBLOCK [32:14] + |--LCURLY -> { [32:14] + `--RCURLY -> } [32:15] +CLASS_DEF -> CLASS_DEF [33:0] +|--MODIFIERS -> MODIFIERS [33:0] +|--LITERAL_CLASS -> class [33:0] +|--IDENT -> ArtifactRepository [33:6] +`--OBJBLOCK -> OBJBLOCK [33:24] + |--LCURLY -> { [33:24] + `--RCURLY -> } [33:25] +CLASS_DEF -> CLASS_DEF [34:0] +|--MODIFIERS -> MODIFIERS [34:0] +|--LITERAL_CLASS -> class [34:0] +|--IDENT -> License [34:6] +`--OBJBLOCK -> OBJBLOCK [34:13] + |--LCURLY -> { [34:13] + `--RCURLY -> } [34:14] +CLASS_DEF -> CLASS_DEF [35:0] +|--MODIFIERS -> MODIFIERS [35:0] +|--LITERAL_CLASS -> class [35:0] +|--IDENT -> Model [35:6] +`--OBJBLOCK -> OBJBLOCK [35:11] + |--LCURLY -> { [35:11] + `--RCURLY -> } [35:12] +CLASS_DEF -> CLASS_DEF [36:0] +|--MODIFIERS -> MODIFIERS [36:0] +|--LITERAL_CLASS -> class [36:0] +|--IDENT -> Organization [36:6] +`--OBJBLOCK -> OBJBLOCK [36:18] + |--LCURLY -> { [36:18] + `--RCURLY -> } [36:19] +CLASS_DEF -> CLASS_DEF [37:0] +|--MODIFIERS -> MODIFIERS [37:0] +|--LITERAL_CLASS -> class [37:0] +|--IDENT -> ProcessRemoteResourcesMojo [37:6] +`--OBJBLOCK -> OBJBLOCK [37:32] + |--LCURLY -> { [37:32] + `--RCURLY -> } [37:33] +ANNOTATION_DEF -> ANNOTATION_DEF [38:0] +|--MODIFIERS -> MODIFIERS [38:0] +|--AT -> @ [38:0] +|--LITERAL_INTERFACE -> interface [38:1] +|--IDENT -> Component [38:11] +`--OBJBLOCK -> OBJBLOCK [38:20] + |--LCURLY -> { [38:20] + |--ANNOTATION_FIELD_DEF -> ANNOTATION_FIELD_DEF [39:4] + | |--MODIFIERS -> MODIFIERS [39:4] + | |--TYPE -> TYPE [39:4] + | | |--IDENT -> Class [39:4] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [39:9] + | | |--GENERIC_START -> < [39:9] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [39:10] + | | | `--IDENT -> MavenProjectBuilder [39:10] + | | `--GENERIC_END -> > [39:29] + | |--IDENT -> role [39:31] + | |--LPAREN -> ( [39:35] + | |--RPAREN -> ) [39:36] + | `--SEMI -> ; [39:37] + `--RCURLY -> } [40:0] +CLASS_DEF -> CLASS_DEF [41:0] +|--MODIFIERS -> MODIFIERS [41:0] +|--LITERAL_CLASS -> class [41:0] +|--IDENT -> LifecyclePhase [41:6] +`--OBJBLOCK -> OBJBLOCK [41:20] + |--LCURLY -> { [41:20] + |--VARIABLE_DEF -> VARIABLE_DEF [42:4] + | |--MODIFIERS -> MODIFIERS [42:4] + | | |--LITERAL_PUBLIC -> public [42:4] + | | |--LITERAL_STATIC -> static [42:11] + | | `--FINAL -> final [42:18] + | |--TYPE -> TYPE [42:24] + | | `--IDENT -> Object [42:24] + | |--IDENT -> GENERATE_RESOURCES [42:31] + | |--ASSIGN -> = [42:50] + | | `--EXPR -> EXPR [42:52] + | | `--LITERAL_NULL -> null [42:52] + | `--SEMI -> ; [42:56] + `--RCURLY -> } [43:0] +ANNOTATION_DEF -> ANNOTATION_DEF [44:0] +|--MODIFIERS -> MODIFIERS [44:0] +|--AT -> @ [44:0] +|--LITERAL_INTERFACE -> interface [44:1] +|--IDENT -> Mojo [44:11] +`--OBJBLOCK -> OBJBLOCK [44:15] + |--LCURLY -> { [44:15] + |--ANNOTATION_FIELD_DEF -> ANNOTATION_FIELD_DEF [45:4] + | |--MODIFIERS -> MODIFIERS [45:4] + | |--TYPE -> TYPE [45:4] + | | `--IDENT -> String [45:4] + | |--IDENT -> name [45:11] + | |--LPAREN -> ( [45:15] + | |--RPAREN -> ) [45:16] + | `--SEMI -> ; [45:17] + `--RCURLY -> } [46:0] +ANNOTATION_DEF -> ANNOTATION_DEF [47:0] +|--MODIFIERS -> MODIFIERS [47:0] +|--AT -> @ [47:0] +|--LITERAL_INTERFACE -> interface [47:1] +|--IDENT -> Parameter [47:11] +`--OBJBLOCK -> OBJBLOCK [47:20] + |--LCURLY -> { [47:20] + |--ANNOTATION_FIELD_DEF -> ANNOTATION_FIELD_DEF [48:4] + | |--MODIFIERS -> MODIFIERS [48:4] + | |--TYPE -> TYPE [48:4] + | | `--IDENT -> String [48:4] + | |--IDENT -> defaultValue [48:11] + | |--LPAREN -> ( [48:23] + | |--RPAREN -> ) [48:24] + | `--SEMI -> ; [48:25] + |--ANNOTATION_FIELD_DEF -> ANNOTATION_FIELD_DEF [50:4] + | |--MODIFIERS -> MODIFIERS [50:4] + | |--TYPE -> TYPE [50:4] + | | `--LITERAL_BOOLEAN -> boolean [50:4] + | |--IDENT -> readonly [50:12] + | |--LPAREN -> ( [50:20] + | |--RPAREN -> ) [50:21] + | `--SEMI -> ; [50:22] + `--RCURLY -> } [51:0] +CLASS_DEF -> CLASS_DEF [52:0] +|--MODIFIERS -> MODIFIERS [52:0] +|--LITERAL_CLASS -> class [52:0] +|--IDENT -> ResolutionScope [52:6] +`--OBJBLOCK -> OBJBLOCK [52:21] + |--LCURLY -> { [52:21] + |--VARIABLE_DEF -> VARIABLE_DEF [53:4] + | |--MODIFIERS -> MODIFIERS [53:4] + | | |--LITERAL_PUBLIC -> public [53:4] + | | |--LITERAL_STATIC -> static [53:11] + | | `--FINAL -> final [53:18] + | |--TYPE -> TYPE [53:24] + | | `--IDENT -> Object [53:24] + | |--IDENT -> RUNTIME [53:31] + | |--ASSIGN -> = [53:39] + | | `--EXPR -> EXPR [53:41] + | | `--LITERAL_NULL -> null [53:41] + | `--SEMI -> ; [53:45] + `--RCURLY -> } [54:0] +CLASS_DEF -> CLASS_DEF [55:0] +|--MODIFIERS -> MODIFIERS [55:0] +|--LITERAL_CLASS -> class [55:0] +|--IDENT -> InvalidProjectModelException [55:6] +`--OBJBLOCK -> OBJBLOCK [55:34] + |--LCURLY -> { [55:34] + `--RCURLY -> } [55:35] +CLASS_DEF -> CLASS_DEF [56:0] +|--MODIFIERS -> MODIFIERS [56:0] +|--LITERAL_CLASS -> class [56:0] +|--IDENT -> MavenProject [56:6] +`--OBJBLOCK -> OBJBLOCK [56:18] + |--LCURLY -> { [56:18] + `--RCURLY -> } [56:19] +CLASS_DEF -> CLASS_DEF [57:0] +|--MODIFIERS -> MODIFIERS [57:0] +|--LITERAL_CLASS -> class [57:0] +|--IDENT -> MavenProjectBuilder [57:6] +`--OBJBLOCK -> OBJBLOCK [57:25] + |--LCURLY -> { [57:25] + `--RCURLY -> } [57:26] +CLASS_DEF -> CLASS_DEF [58:0] +|--MODIFIERS -> MODIFIERS [58:0] +|--LITERAL_CLASS -> class [58:0] +|--IDENT -> ProjectBuildingException [58:6] +`--OBJBLOCK -> OBJBLOCK [58:30] + |--LCURLY -> { [58:30] + `--RCURLY -> } [58:31] +CLASS_DEF -> CLASS_DEF [71:0] +|--MODIFIERS -> MODIFIERS [71:0] +| |--ANNOTATION -> ANNOTATION [71:0] +| | |--BLOCK_COMMENT_BEGIN -> /* [60:0] +| | | |--COMMENT_CONTENT -> *\n * Extends the Maven Remote Resources plugin to fix memory issue found in it, see\n * <a href="https://jira.xwiki.org/browse/XCOMMONS-1421">XCOMMONS-1421</a>.\n * <p>\n * To be removed when <a href="https://issues.apache.org/jira/browse/MRRESOURCES-106">MRRESOURCES-106</a> is fixed on\n * the Maven side.\n *\n * @version $Id: 45afe6a790dc2b72fec66a9f5b0e95e95105bd43 $\n * @since 9.11.5\n * @since 10.5RC1\n [60:2] +| | | `--BLOCK_COMMENT_END -> */ [70:1] +| | |--AT -> @ [71:0] +| | |--IDENT -> Mojo [71:1] +| | |--LPAREN -> ( [71:5] +| | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [71:6] +| | | |--IDENT -> name [71:6] +| | | |--ASSIGN -> = [71:11] +| | | `--EXPR -> EXPR [71:13] +| | | `--STRING_LITERAL -> "" [71:13] +| | `--RPAREN -> ) [71:15] +| `--LITERAL_PUBLIC -> public [72:0] +|--LITERAL_CLASS -> class [72:7] +|--IDENT -> InputAntlr4AstRegressionCommentsOnAnnotationsAndEnums [72:13] +|--EXTENDS_CLAUSE -> extends [73:8] +| `--IDENT -> ProcessRemoteResourcesMojo [73:16] +`--OBJBLOCK -> OBJBLOCK [74:0] + |--LCURLY -> { [74:0] + |--ENUM_DEF -> ENUM_DEF [80:4] + | |--MODIFIERS -> MODIFIERS [80:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [75:4] + | | | |--COMMENT_CONTENT -> *\n * Control what is injected in the "projects" Velocity binding.\n *\n * @version $Id: 45afe6a790dc2b72fec66a9f5b0e95e95105bd43 $\n [75:6] + | | | `--BLOCK_COMMENT_END -> */ [79:5] + | | `--LITERAL_PUBLIC -> public [80:4] + | |--ENUM -> enum [80:11] + | |--IDENT -> ProjectData [80:16] + | `--OBJBLOCK -> OBJBLOCK [81:4] + | |--LCURLY -> { [81:4] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [85:8] + | | |--ANNOTATIONS -> ANNOTATIONS [85:8] + | | |--BLOCK_COMMENT_BEGIN -> /* [82:8] + | | | |--COMMENT_CONTENT -> *\n * "projects" is empty.\n [82:10] + | | | `--BLOCK_COMMENT_END -> */ [84:9] + | | `--IDENT -> NONE [85:8] + | |--COMMA -> , [85:12] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [90:8] + | | |--ANNOTATIONS -> ANNOTATIONS [90:8] + | | |--BLOCK_COMMENT_BEGIN -> /* [87:8] + | | | |--COMMENT_CONTENT -> *\n * "projects" only contains licenses.\n [87:10] + | | | `--BLOCK_COMMENT_END -> */ [89:9] + | | `--IDENT -> LICENSES [90:8] + | |--COMMA -> , [90:16] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [96:8] + | | |--ANNOTATIONS -> ANNOTATIONS [96:8] + | | |--BLOCK_COMMENT_BEGIN -> /* [92:8] + | | | |--COMMENT_CONTENT -> *\n * "projects" contains full MavenProject metadata\n * (very expensive but standard Maven Resource plugin behavior).\n [92:10] + | | | `--BLOCK_COMMENT_END -> */ [95:9] + | | `--IDENT -> FULL [96:8] + | `--RCURLY -> } [97:4] + |--VARIABLE_DEF -> VARIABLE_DEF [99:4] + | |--MODIFIERS -> MODIFIERS [99:4] + | | |--ANNOTATION -> ANNOTATION [99:4] + | | | |--AT -> @ [99:4] + | | | |--IDENT -> Parameter [99:5] + | | | |--LPAREN -> ( [99:14] + | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [99:15] + | | | | |--IDENT -> defaultValue [99:15] + | | | | |--ASSIGN -> = [99:28] + | | | | `--EXPR -> EXPR [99:30] + | | | | `--STRING_LITERAL -> "NONE" [99:30] + | | | |--COMMA -> , [99:36] + | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [99:38] + | | | | |--IDENT -> readonly [99:38] + | | | | |--ASSIGN -> = [99:47] + | | | | `--EXPR -> EXPR [99:49] + | | | | `--LITERAL_FALSE -> false [99:49] + | | | `--RPAREN -> ) [99:54] + | | `--LITERAL_PROTECTED -> protected [100:4] + | |--TYPE -> TYPE [100:14] + | | `--IDENT -> ProjectData [100:14] + | |--IDENT -> projectsData [100:26] + | `--SEMI -> ; [100:38] + |--VARIABLE_DEF -> VARIABLE_DEF [102:4] + | |--MODIFIERS -> MODIFIERS [102:4] + | | |--ANNOTATION -> ANNOTATION [102:4] + | | | |--AT -> @ [102:4] + | | | |--IDENT -> Parameter [102:5] + | | | |--LPAREN -> ( [102:14] + | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [102:15] + | | | | |--IDENT -> defaultValue [102:15] + | | | | |--ASSIGN -> = [102:28] + | | | | `--EXPR -> EXPR [102:30] + | | | | `--STRING_LITERAL -> "${localRepository}" [102:30] + | | | |--COMMA -> , [102:50] + | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [102:52] + | | | | |--IDENT -> readonly [102:52] + | | | | |--ASSIGN -> = [102:61] + | | | | `--EXPR -> EXPR [102:63] + | | | | `--LITERAL_TRUE -> true [102:63] + | | | `--RPAREN -> ) [102:67] + | | `--LITERAL_PRIVATE -> private [103:4] + | |--TYPE -> TYPE [103:12] + | | `--IDENT -> ArtifactRepository [103:12] + | |--IDENT -> localRepositoryThis [103:31] + | `--SEMI -> ; [103:50] + |--VARIABLE_DEF -> VARIABLE_DEF [105:4] + | |--MODIFIERS -> MODIFIERS [105:4] + | | |--ANNOTATION -> ANNOTATION [105:4] + | | | |--AT -> @ [105:4] + | | | |--IDENT -> Component [105:5] + | | | |--LPAREN -> ( [105:14] + | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [105:15] + | | | | |--IDENT -> role [105:15] + | | | | |--ASSIGN -> = [105:20] + | | | | `--EXPR -> EXPR [105:41] + | | | | `--DOT -> . [105:41] + | | | | |--IDENT -> MavenProjectBuilder [105:22] + | | | | `--LITERAL_CLASS -> class [105:42] + | | | `--RPAREN -> ) [105:47] + | | `--LITERAL_PRIVATE -> private [106:4] + | |--TYPE -> TYPE [106:12] + | | `--IDENT -> MavenProjectBuilder [106:12] + | |--IDENT -> mavenProjectBuilderThis [106:32] + | `--SEMI -> ; [106:55] + |--VARIABLE_DEF -> VARIABLE_DEF [111:4] + | |--MODIFIERS -> MODIFIERS [111:4] + | | |--ANNOTATION -> ANNOTATION [111:4] + | | | |--BLOCK_COMMENT_BEGIN -> /* [108:4] + | | | | |--COMMENT_CONTENT -> *\n * List of Remote Repositories used by the resolver.\n [108:6] + | | | | `--BLOCK_COMMENT_END -> */ [110:5] + | | | |--AT -> @ [111:4] + | | | |--IDENT -> Parameter [111:5] + | | | |--LPAREN -> ( [111:14] + | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [111:15] + | | | | |--IDENT -> defaultValue [111:15] + | | | | |--ASSIGN -> = [111:28] + | | | | `--EXPR -> EXPR [111:30] + | | | | `--STRING_LITERAL -> "${project.remoteArtifactRepositories}" [111:30] + | | | |--COMMA -> , [111:69] + | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [111:71] + | | | | |--IDENT -> readonly [111:71] + | | | | |--ASSIGN -> = [111:80] + | | | | `--EXPR -> EXPR [111:82] + | | | | `--LITERAL_TRUE -> true [111:82] + | | | `--RPAREN -> ) [111:86] + | | `--LITERAL_PRIVATE -> private [112:4] + | |--TYPE -> TYPE [112:12] + | | |--IDENT -> List [112:12] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [112:16] + | | |--GENERIC_START -> < [112:16] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [112:17] + | | | `--IDENT -> ArtifactRepository [112:17] + | | `--GENERIC_END -> > [112:35] + | |--IDENT -> remoteArtifactRepositoriesThis [112:37] + | `--SEMI -> ; [112:67] + |--METHOD_DEF -> METHOD_DEF [114:4] + | |--MODIFIERS -> MODIFIERS [114:4] + | | `--LITERAL_PRIVATE -> private [114:4] + | |--TYPE -> TYPE [114:12] + | | `--IDENT -> Logger [114:12] + | |--IDENT -> getLog [114:19] + | |--LPAREN -> ( [114:25] + | |--PARAMETERS -> PARAMETERS [114:26] + | |--RPAREN -> ) [114:26] + | `--SLIST -> { [114:28] + | |--LITERAL_RETURN -> return [115:8] + | | |--EXPR -> EXPR [115:15] + | | | `--LITERAL_NULL -> null [115:15] + | | `--SEMI -> ; [115:19] + | `--RCURLY -> } [116:4] + |--ENUM_DEF -> ENUM_DEF [118:4] + | |--MODIFIERS -> MODIFIERS [118:4] + | |--ENUM -> enum [118:4] + | |--IDENT -> InputJavadocVariableTagsEnum [118:9] + | `--OBJBLOCK -> OBJBLOCK [119:4] + | |--LCURLY -> { [119:4] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [120:8] + | | |--ANNOTATIONS -> ANNOTATIONS [120:8] + | | `--IDENT -> CONSTANT_A [120:8] + | |--COMMA -> , [120:18] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [125:8] + | | |--ANNOTATIONS -> ANNOTATIONS [125:8] + | | |--SINGLE_LINE_COMMENT -> // [120:20] + | | | `--COMMENT_CONTENT -> violation\n [120:22] + | | |--BLOCK_COMMENT_BEGIN -> /* [122:8] + | | | |--COMMENT_CONTENT -> *\n *\n [122:10] + | | | `--BLOCK_COMMENT_END -> */ [124:9] + | | `--IDENT -> CONSTANT_B [125:8] + | |--COMMA -> , [125:18] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [127:8] + | | |--ANNOTATIONS -> ANNOTATIONS [127:8] + | | |--IDENT -> CONSTANT_C [127:8] + | | `--OBJBLOCK -> OBJBLOCK [128:8] + | | |--SINGLE_LINE_COMMENT -> // [127:19] + | | | `--COMMENT_CONTENT -> violation\n [127:21] + | | |--LCURLY -> { [128:8] + | | |--METHOD_DEF -> METHOD_DEF [132:12] + | | | |--MODIFIERS -> MODIFIERS [132:12] + | | | | |--BLOCK_COMMENT_BEGIN -> /* [129:12] + | | | | | |--COMMENT_CONTENT -> *\n *\n [129:14] + | | | | | `--BLOCK_COMMENT_END -> */ [131:13] + | | | | `--LITERAL_PUBLIC -> public [132:12] + | | | |--TYPE -> TYPE [132:19] + | | | | `--LITERAL_VOID -> void [132:19] + | | | |--IDENT -> someMethod [132:24] + | | | |--LPAREN -> ( [132:34] + | | | |--PARAMETERS -> PARAMETERS [132:35] + | | | |--RPAREN -> ) [132:35] + | | | `--SLIST -> { [133:12] + | | | `--RCURLY -> } [134:12] + | | |--METHOD_DEF -> METHOD_DEF [136:12] + | | | |--MODIFIERS -> MODIFIERS [136:12] + | | | | `--LITERAL_PUBLIC -> public [136:12] + | | | |--TYPE -> TYPE [136:19] + | | | | `--LITERAL_VOID -> void [136:19] + | | | |--IDENT -> someOtherMethod [136:24] + | | | |--LPAREN -> ( [136:39] + | | | |--PARAMETERS -> PARAMETERS [136:40] + | | | |--RPAREN -> ) [136:40] + | | | `--SLIST -> { [137:12] + | | | `--RCURLY -> } [139:12] + | | `--RCURLY -> } [140:8] + | `--RCURLY -> } [141:4] + `--RCURLY -> } [143:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionConstructorCall.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionConstructorCall.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionConstructorCall.java @@ -0,0 +1,14 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +public class InputAntlr4AstRegressionConstructorCall { + private int f; + + public InputAntlr4AstRegressionConstructorCall(int i) { + f = i; + } + + public InputAntlr4AstRegressionConstructorCall(float f) { + this((int) f); + } + +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionConstructorCall.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionConstructorCall.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionConstructorCall.txt @@ -0,0 +1,73 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +CLASS_DEF -> CLASS_DEF [3:0] +|--MODIFIERS -> MODIFIERS [3:0] +| `--LITERAL_PUBLIC -> public [3:0] +|--LITERAL_CLASS -> class [3:7] +|--IDENT -> InputAntlr4AstRegressionConstructorCall [3:13] +`--OBJBLOCK -> OBJBLOCK [3:53] + |--LCURLY -> { [3:53] + |--VARIABLE_DEF -> VARIABLE_DEF [4:4] + | |--MODIFIERS -> MODIFIERS [4:4] + | | `--LITERAL_PRIVATE -> private [4:4] + | |--TYPE -> TYPE [4:12] + | | `--LITERAL_INT -> int [4:12] + | |--IDENT -> f [4:16] + | `--SEMI -> ; [4:17] + |--CTOR_DEF -> CTOR_DEF [6:4] + | |--MODIFIERS -> MODIFIERS [6:4] + | | `--LITERAL_PUBLIC -> public [6:4] + | |--IDENT -> InputAntlr4AstRegressionConstructorCall [6:11] + | |--LPAREN -> ( [6:50] + | |--PARAMETERS -> PARAMETERS [6:51] + | | `--PARAMETER_DEF -> PARAMETER_DEF [6:51] + | | |--MODIFIERS -> MODIFIERS [6:51] + | | |--TYPE -> TYPE [6:51] + | | | `--LITERAL_INT -> int [6:51] + | | `--IDENT -> i [6:55] + | |--RPAREN -> ) [6:56] + | `--SLIST -> { [6:58] + | |--EXPR -> EXPR [7:10] + | | `--ASSIGN -> = [7:10] + | | |--IDENT -> f [7:8] + | | `--IDENT -> i [7:12] + | |--SEMI -> ; [7:13] + | `--RCURLY -> } [8:4] + |--CTOR_DEF -> CTOR_DEF [10:4] + | |--MODIFIERS -> MODIFIERS [10:4] + | | `--LITERAL_PUBLIC -> public [10:4] + | |--IDENT -> InputAntlr4AstRegressionConstructorCall [10:11] + | |--LPAREN -> ( [10:50] + | |--PARAMETERS -> PARAMETERS [10:51] + | | `--PARAMETER_DEF -> PARAMETER_DEF [10:51] + | | |--MODIFIERS -> MODIFIERS [10:51] + | | |--TYPE -> TYPE [10:51] + | | | `--LITERAL_FLOAT -> float [10:51] + | | `--IDENT -> f [10:57] + | |--RPAREN -> ) [10:58] + | `--SLIST -> { [10:60] + | |--CTOR_CALL -> this [11:8] + | | |--LPAREN -> ( [11:12] + | | |--ELIST -> ELIST [11:13] + | | | `--EXPR -> EXPR [11:13] + | | | `--TYPECAST -> ( [11:13] + | | | |--TYPE -> TYPE [11:14] + | | | | `--LITERAL_INT -> int [11:14] + | | | |--RPAREN -> ) [11:17] + | | | `--IDENT -> f [11:19] + | | |--RPAREN -> ) [11:20] + | | `--SEMI -> ; [11:21] + | `--RCURLY -> } [12:4] + `--RCURLY -> } [14:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionEmbeddedBlockComments.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionEmbeddedBlockComments.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionEmbeddedBlockComments.java @@ -0,0 +1 @@ +package/*2*/com.puppycrawl.tools.checkstyle.grammar.antlr4; /*13*/ public/*15*/class/*16*/InputAntlr4AstRegressionEmbeddedBlockComments/*49*/{/* 21 */} \ No newline at end of file diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionEmbeddedBlockComments.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionEmbeddedBlockComments.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionEmbeddedBlockComments.txt @@ -0,0 +1,22 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:51] +|--DOT -> . [1:51] +| |--DOT -> . [1:43] +| | |--DOT -> . [1:32] +| | | |--DOT -> . [1:26] +| | | | |--DOT -> . [1:15] +| | | | | |--IDENT -> com [1:12] +| | | | | `--IDENT -> puppycrawl [1:16] +| | | | `--IDENT -> tools [1:27] +| | | `--IDENT -> checkstyle [1:33] +| | `--IDENT -> grammar [1:44] +| `--IDENT -> antlr4 [1:52] +`--SEMI -> ; [1:58] +CLASS_DEF -> CLASS_DEF [3:0] +|--MODIFIERS -> MODIFIERS [3:0] +| `--LITERAL_PUBLIC -> public [3:0] +|--LITERAL_CLASS -> class [3:12] +|--IDENT -> InputAntlr4AstRegressionEmbeddedBlockComments [3:23] +`--OBJBLOCK -> OBJBLOCK [3:74] + |--LCURLY -> { [3:74] + `--RCURLY -> } [5:2] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionExplicitInitialization.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionExplicitInitialization.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionExplicitInitialization.java @@ -0,0 +1,91 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +public class InputAntlr4AstRegressionExplicitInitialization { + private int x = 0; + private Object bar = /* comment test */null; + private int y = 1; + private long y1 = 1 - 1; + private long y3; + private long y4 = 0L; + private boolean b1 = false; + private boolean b2 = true; + private boolean b3; + private String str = ""; + java.lang.String str1 = null, str3 = null; + int ar1[] = null; + int ar2[] = new int[1]; + int ar3[]; + float f1 = 0f; + double d1 = 0.0; + + static char ch; + static char ch1 = 0; + static char ch2 = '\0'; + static char ch3 = '\1'; + + void method() { + int xx = 0; + String s = null; + } +} + +interface interface1{ + int TOKEN_first = 0x00; + int TOKEN_second = 0x01; + int TOKEN_third = 0x02; +} + +class InputExplicitInit2 { + private Bar<String> bar = null; + private Bar<String>[] barArray = null; +} + +enum InputExplicitInit3 { + A, + B + { + private int x = 0; + private Bar<String> bar = null; + private Bar<String>[] barArray = null; + private int y = 1; + }; + private int x = 0; + private Bar<String> bar = null; + private Bar<String>[] barArray = null; + private int y = 1; + private Boolean booleanAtt = false; +} + +@interface annotation1{ + int TOKEN_first = 0x00; + int TOKEN_second = 0x01; + int TOKEN_third = 0x02; +} + +class ForEach { + public ForEach(java.util.Collection<String> strings) + { + for(String s : strings) //this should not even be checked + { + + } + } +} + +class Bar<T> { +} + +class Chars { + char a; + char b = a; + byte c = 1; + short d = 1; + final long e = 0; +} + +class Doubles { + final double subZero = -0.0; + final double nan = Double.NaN; + private short shortVariable = 0; + private byte bite = 0; +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionExplicitInitialization.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionExplicitInitialization.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionExplicitInitialization.txt @@ -0,0 +1,658 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +CLASS_DEF -> CLASS_DEF [3:0] +|--MODIFIERS -> MODIFIERS [3:0] +| `--LITERAL_PUBLIC -> public [3:0] +|--LITERAL_CLASS -> class [3:7] +|--IDENT -> InputAntlr4AstRegressionExplicitInitialization [3:13] +`--OBJBLOCK -> OBJBLOCK [3:60] + |--LCURLY -> { [3:60] + |--VARIABLE_DEF -> VARIABLE_DEF [4:4] + | |--MODIFIERS -> MODIFIERS [4:4] + | | `--LITERAL_PRIVATE -> private [4:4] + | |--TYPE -> TYPE [4:12] + | | `--LITERAL_INT -> int [4:12] + | |--IDENT -> x [4:16] + | |--ASSIGN -> = [4:18] + | | `--EXPR -> EXPR [4:20] + | | `--NUM_INT -> 0 [4:20] + | `--SEMI -> ; [4:21] + |--VARIABLE_DEF -> VARIABLE_DEF [5:4] + | |--MODIFIERS -> MODIFIERS [5:4] + | | `--LITERAL_PRIVATE -> private [5:4] + | |--TYPE -> TYPE [5:12] + | | `--IDENT -> Object [5:12] + | |--IDENT -> bar [5:19] + | |--ASSIGN -> = [5:23] + | | `--EXPR -> EXPR [5:43] + | | `--LITERAL_NULL -> null [5:43] + | `--SEMI -> ; [5:47] + |--VARIABLE_DEF -> VARIABLE_DEF [6:4] + | |--MODIFIERS -> MODIFIERS [6:4] + | | `--LITERAL_PRIVATE -> private [6:4] + | |--TYPE -> TYPE [6:12] + | | `--LITERAL_INT -> int [6:12] + | |--IDENT -> y [6:16] + | |--ASSIGN -> = [6:18] + | | `--EXPR -> EXPR [6:20] + | | `--NUM_INT -> 1 [6:20] + | `--SEMI -> ; [6:21] + |--VARIABLE_DEF -> VARIABLE_DEF [7:4] + | |--MODIFIERS -> MODIFIERS [7:4] + | | `--LITERAL_PRIVATE -> private [7:4] + | |--TYPE -> TYPE [7:12] + | | `--LITERAL_LONG -> long [7:12] + | |--IDENT -> y1 [7:17] + | |--ASSIGN -> = [7:20] + | | `--EXPR -> EXPR [7:24] + | | `--MINUS -> - [7:24] + | | |--NUM_INT -> 1 [7:22] + | | `--NUM_INT -> 1 [7:26] + | `--SEMI -> ; [7:27] + |--VARIABLE_DEF -> VARIABLE_DEF [8:4] + | |--MODIFIERS -> MODIFIERS [8:4] + | | `--LITERAL_PRIVATE -> private [8:4] + | |--TYPE -> TYPE [8:12] + | | `--LITERAL_LONG -> long [8:12] + | |--IDENT -> y3 [8:17] + | `--SEMI -> ; [8:19] + |--VARIABLE_DEF -> VARIABLE_DEF [9:4] + | |--MODIFIERS -> MODIFIERS [9:4] + | | `--LITERAL_PRIVATE -> private [9:4] + | |--TYPE -> TYPE [9:12] + | | `--LITERAL_LONG -> long [9:12] + | |--IDENT -> y4 [9:17] + | |--ASSIGN -> = [9:20] + | | `--EXPR -> EXPR [9:22] + | | `--NUM_LONG -> 0L [9:22] + | `--SEMI -> ; [9:24] + |--VARIABLE_DEF -> VARIABLE_DEF [10:4] + | |--MODIFIERS -> MODIFIERS [10:4] + | | `--LITERAL_PRIVATE -> private [10:4] + | |--TYPE -> TYPE [10:12] + | | `--LITERAL_BOOLEAN -> boolean [10:12] + | |--IDENT -> b1 [10:20] + | |--ASSIGN -> = [10:23] + | | `--EXPR -> EXPR [10:25] + | | `--LITERAL_FALSE -> false [10:25] + | `--SEMI -> ; [10:30] + |--VARIABLE_DEF -> VARIABLE_DEF [11:4] + | |--MODIFIERS -> MODIFIERS [11:4] + | | `--LITERAL_PRIVATE -> private [11:4] + | |--TYPE -> TYPE [11:12] + | | `--LITERAL_BOOLEAN -> boolean [11:12] + | |--IDENT -> b2 [11:20] + | |--ASSIGN -> = [11:23] + | | `--EXPR -> EXPR [11:25] + | | `--LITERAL_TRUE -> true [11:25] + | `--SEMI -> ; [11:29] + |--VARIABLE_DEF -> VARIABLE_DEF [12:4] + | |--MODIFIERS -> MODIFIERS [12:4] + | | `--LITERAL_PRIVATE -> private [12:4] + | |--TYPE -> TYPE [12:12] + | | `--LITERAL_BOOLEAN -> boolean [12:12] + | |--IDENT -> b3 [12:20] + | `--SEMI -> ; [12:22] + |--VARIABLE_DEF -> VARIABLE_DEF [13:4] + | |--MODIFIERS -> MODIFIERS [13:4] + | | `--LITERAL_PRIVATE -> private [13:4] + | |--TYPE -> TYPE [13:12] + | | `--IDENT -> String [13:12] + | |--IDENT -> str [13:19] + | |--ASSIGN -> = [13:23] + | | `--EXPR -> EXPR [13:25] + | | `--STRING_LITERAL -> "" [13:25] + | `--SEMI -> ; [13:27] + |--VARIABLE_DEF -> VARIABLE_DEF [14:13] + | |--MODIFIERS -> MODIFIERS [14:13] + | |--TYPE -> TYPE [14:13] + | | `--DOT -> . [14:13] + | | |--DOT -> . [14:8] + | | | |--IDENT -> java [14:4] + | | | `--IDENT -> lang [14:9] + | | `--IDENT -> String [14:14] + | |--IDENT -> str1 [14:21] + | |--ASSIGN -> = [14:26] + | | `--EXPR -> EXPR [14:28] + | | `--LITERAL_NULL -> null [14:28] + | `--SEMI -> ; [14:45] + |--COMMA -> , [14:32] + |--VARIABLE_DEF -> VARIABLE_DEF [14:13] + | |--MODIFIERS -> MODIFIERS [14:13] + | |--TYPE -> TYPE [14:13] + | | `--DOT -> . [14:13] + | | |--DOT -> . [14:8] + | | | |--IDENT -> java [14:4] + | | | `--IDENT -> lang [14:9] + | | `--IDENT -> String [14:14] + | |--IDENT -> str3 [14:34] + | `--ASSIGN -> = [14:39] + | `--EXPR -> EXPR [14:41] + | `--LITERAL_NULL -> null [14:41] + |--VARIABLE_DEF -> VARIABLE_DEF [15:4] + | |--MODIFIERS -> MODIFIERS [15:4] + | |--TYPE -> TYPE [15:4] + | | |--LITERAL_INT -> int [15:4] + | | `--ARRAY_DECLARATOR -> [ [15:11] + | | `--RBRACK -> ] [15:12] + | |--IDENT -> ar1 [15:8] + | |--ASSIGN -> = [15:14] + | | `--EXPR -> EXPR [15:16] + | | `--LITERAL_NULL -> null [15:16] + | `--SEMI -> ; [15:20] + |--VARIABLE_DEF -> VARIABLE_DEF [16:4] + | |--MODIFIERS -> MODIFIERS [16:4] + | |--TYPE -> TYPE [16:4] + | | |--LITERAL_INT -> int [16:4] + | | `--ARRAY_DECLARATOR -> [ [16:11] + | | `--RBRACK -> ] [16:12] + | |--IDENT -> ar2 [16:8] + | |--ASSIGN -> = [16:14] + | | `--EXPR -> EXPR [16:16] + | | `--LITERAL_NEW -> new [16:16] + | | |--LITERAL_INT -> int [16:20] + | | `--ARRAY_DECLARATOR -> [ [16:23] + | | |--EXPR -> EXPR [16:24] + | | | `--NUM_INT -> 1 [16:24] + | | `--RBRACK -> ] [16:25] + | `--SEMI -> ; [16:26] + |--VARIABLE_DEF -> VARIABLE_DEF [17:4] + | |--MODIFIERS -> MODIFIERS [17:4] + | |--TYPE -> TYPE [17:4] + | | |--LITERAL_INT -> int [17:4] + | | `--ARRAY_DECLARATOR -> [ [17:11] + | | `--RBRACK -> ] [17:12] + | |--IDENT -> ar3 [17:8] + | `--SEMI -> ; [17:13] + |--VARIABLE_DEF -> VARIABLE_DEF [18:4] + | |--MODIFIERS -> MODIFIERS [18:4] + | |--TYPE -> TYPE [18:4] + | | `--LITERAL_FLOAT -> float [18:4] + | |--IDENT -> f1 [18:10] + | |--ASSIGN -> = [18:13] + | | `--EXPR -> EXPR [18:15] + | | `--NUM_FLOAT -> 0f [18:15] + | `--SEMI -> ; [18:17] + |--VARIABLE_DEF -> VARIABLE_DEF [19:4] + | |--MODIFIERS -> MODIFIERS [19:4] + | |--TYPE -> TYPE [19:4] + | | `--LITERAL_DOUBLE -> double [19:4] + | |--IDENT -> d1 [19:11] + | |--ASSIGN -> = [19:14] + | | `--EXPR -> EXPR [19:16] + | | `--NUM_FLOAT -> 0.0 [19:16] + | `--SEMI -> ; [19:19] + |--VARIABLE_DEF -> VARIABLE_DEF [21:4] + | |--MODIFIERS -> MODIFIERS [21:4] + | | `--LITERAL_STATIC -> static [21:4] + | |--TYPE -> TYPE [21:11] + | | `--LITERAL_CHAR -> char [21:11] + | |--IDENT -> ch [21:16] + | `--SEMI -> ; [21:18] + |--VARIABLE_DEF -> VARIABLE_DEF [22:4] + | |--MODIFIERS -> MODIFIERS [22:4] + | | `--LITERAL_STATIC -> static [22:4] + | |--TYPE -> TYPE [22:11] + | | `--LITERAL_CHAR -> char [22:11] + | |--IDENT -> ch1 [22:16] + | |--ASSIGN -> = [22:20] + | | `--EXPR -> EXPR [22:22] + | | `--NUM_INT -> 0 [22:22] + | `--SEMI -> ; [22:23] + |--VARIABLE_DEF -> VARIABLE_DEF [23:4] + | |--MODIFIERS -> MODIFIERS [23:4] + | | `--LITERAL_STATIC -> static [23:4] + | |--TYPE -> TYPE [23:11] + | | `--LITERAL_CHAR -> char [23:11] + | |--IDENT -> ch2 [23:16] + | |--ASSIGN -> = [23:20] + | | `--EXPR -> EXPR [23:22] + | | `--CHAR_LITERAL -> '\0' [23:22] + | `--SEMI -> ; [23:26] + |--VARIABLE_DEF -> VARIABLE_DEF [24:4] + | |--MODIFIERS -> MODIFIERS [24:4] + | | `--LITERAL_STATIC -> static [24:4] + | |--TYPE -> TYPE [24:11] + | | `--LITERAL_CHAR -> char [24:11] + | |--IDENT -> ch3 [24:16] + | |--ASSIGN -> = [24:20] + | | `--EXPR -> EXPR [24:22] + | | `--CHAR_LITERAL -> '\1' [24:22] + | `--SEMI -> ; [24:26] + |--METHOD_DEF -> METHOD_DEF [26:4] + | |--MODIFIERS -> MODIFIERS [26:4] + | |--TYPE -> TYPE [26:4] + | | `--LITERAL_VOID -> void [26:4] + | |--IDENT -> method [26:9] + | |--LPAREN -> ( [26:15] + | |--PARAMETERS -> PARAMETERS [26:16] + | |--RPAREN -> ) [26:16] + | `--SLIST -> { [26:18] + | |--VARIABLE_DEF -> VARIABLE_DEF [27:8] + | | |--MODIFIERS -> MODIFIERS [27:8] + | | |--TYPE -> TYPE [27:8] + | | | `--LITERAL_INT -> int [27:8] + | | |--IDENT -> xx [27:12] + | | `--ASSIGN -> = [27:15] + | | `--EXPR -> EXPR [27:17] + | | `--NUM_INT -> 0 [27:17] + | |--SEMI -> ; [27:18] + | |--VARIABLE_DEF -> VARIABLE_DEF [28:8] + | | |--MODIFIERS -> MODIFIERS [28:8] + | | |--TYPE -> TYPE [28:8] + | | | `--IDENT -> String [28:8] + | | |--IDENT -> s [28:15] + | | `--ASSIGN -> = [28:17] + | | `--EXPR -> EXPR [28:19] + | | `--LITERAL_NULL -> null [28:19] + | |--SEMI -> ; [28:23] + | `--RCURLY -> } [29:4] + `--RCURLY -> } [30:0] +INTERFACE_DEF -> INTERFACE_DEF [32:0] +|--MODIFIERS -> MODIFIERS [32:0] +|--LITERAL_INTERFACE -> interface [32:0] +|--IDENT -> interface1 [32:10] +`--OBJBLOCK -> OBJBLOCK [32:20] + |--LCURLY -> { [32:20] + |--VARIABLE_DEF -> VARIABLE_DEF [33:4] + | |--MODIFIERS -> MODIFIERS [33:4] + | |--TYPE -> TYPE [33:4] + | | `--LITERAL_INT -> int [33:4] + | |--IDENT -> TOKEN_first [33:8] + | |--ASSIGN -> = [33:20] + | | `--EXPR -> EXPR [33:22] + | | `--NUM_INT -> 0x00 [33:22] + | `--SEMI -> ; [33:26] + |--VARIABLE_DEF -> VARIABLE_DEF [34:4] + | |--MODIFIERS -> MODIFIERS [34:4] + | |--TYPE -> TYPE [34:4] + | | `--LITERAL_INT -> int [34:4] + | |--IDENT -> TOKEN_second [34:8] + | |--ASSIGN -> = [34:21] + | | `--EXPR -> EXPR [34:23] + | | `--NUM_INT -> 0x01 [34:23] + | `--SEMI -> ; [34:27] + |--VARIABLE_DEF -> VARIABLE_DEF [35:4] + | |--MODIFIERS -> MODIFIERS [35:4] + | |--TYPE -> TYPE [35:4] + | | `--LITERAL_INT -> int [35:4] + | |--IDENT -> TOKEN_third [35:8] + | |--ASSIGN -> = [35:20] + | | `--EXPR -> EXPR [35:22] + | | `--NUM_INT -> 0x02 [35:22] + | `--SEMI -> ; [35:26] + `--RCURLY -> } [36:0] +CLASS_DEF -> CLASS_DEF [38:0] +|--MODIFIERS -> MODIFIERS [38:0] +|--LITERAL_CLASS -> class [38:0] +|--IDENT -> InputExplicitInit2 [38:6] +`--OBJBLOCK -> OBJBLOCK [38:25] + |--LCURLY -> { [38:25] + |--VARIABLE_DEF -> VARIABLE_DEF [39:4] + | |--MODIFIERS -> MODIFIERS [39:4] + | | `--LITERAL_PRIVATE -> private [39:4] + | |--TYPE -> TYPE [39:12] + | | |--IDENT -> Bar [39:12] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [39:15] + | | |--GENERIC_START -> < [39:15] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [39:16] + | | | `--IDENT -> String [39:16] + | | `--GENERIC_END -> > [39:22] + | |--IDENT -> bar [39:24] + | |--ASSIGN -> = [39:28] + | | `--EXPR -> EXPR [39:30] + | | `--LITERAL_NULL -> null [39:30] + | `--SEMI -> ; [39:34] + |--VARIABLE_DEF -> VARIABLE_DEF [40:4] + | |--MODIFIERS -> MODIFIERS [40:4] + | | `--LITERAL_PRIVATE -> private [40:4] + | |--TYPE -> TYPE [40:12] + | | |--IDENT -> Bar [40:12] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [40:15] + | | | |--GENERIC_START -> < [40:15] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [40:16] + | | | | `--IDENT -> String [40:16] + | | | `--GENERIC_END -> > [40:22] + | | `--ARRAY_DECLARATOR -> [ [40:23] + | | `--RBRACK -> ] [40:24] + | |--IDENT -> barArray [40:26] + | |--ASSIGN -> = [40:35] + | | `--EXPR -> EXPR [40:37] + | | `--LITERAL_NULL -> null [40:37] + | `--SEMI -> ; [40:41] + `--RCURLY -> } [41:0] +ENUM_DEF -> ENUM_DEF [43:0] +|--MODIFIERS -> MODIFIERS [43:0] +|--ENUM -> enum [43:0] +|--IDENT -> InputExplicitInit3 [43:5] +`--OBJBLOCK -> OBJBLOCK [43:24] + |--LCURLY -> { [43:24] + |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [44:4] + | |--ANNOTATIONS -> ANNOTATIONS [44:4] + | `--IDENT -> A [44:4] + |--COMMA -> , [44:5] + |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [45:4] + | |--ANNOTATIONS -> ANNOTATIONS [45:4] + | |--IDENT -> B [45:4] + | `--OBJBLOCK -> OBJBLOCK [46:4] + | |--LCURLY -> { [46:4] + | |--VARIABLE_DEF -> VARIABLE_DEF [47:8] + | | |--MODIFIERS -> MODIFIERS [47:8] + | | | `--LITERAL_PRIVATE -> private [47:8] + | | |--TYPE -> TYPE [47:16] + | | | `--LITERAL_INT -> int [47:16] + | | |--IDENT -> x [47:20] + | | |--ASSIGN -> = [47:22] + | | | `--EXPR -> EXPR [47:24] + | | | `--NUM_INT -> 0 [47:24] + | | `--SEMI -> ; [47:25] + | |--VARIABLE_DEF -> VARIABLE_DEF [48:8] + | | |--MODIFIERS -> MODIFIERS [48:8] + | | | `--LITERAL_PRIVATE -> private [48:8] + | | |--TYPE -> TYPE [48:16] + | | | |--IDENT -> Bar [48:16] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [48:19] + | | | |--GENERIC_START -> < [48:19] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [48:20] + | | | | `--IDENT -> String [48:20] + | | | `--GENERIC_END -> > [48:26] + | | |--IDENT -> bar [48:28] + | | |--ASSIGN -> = [48:32] + | | | `--EXPR -> EXPR [48:34] + | | | `--LITERAL_NULL -> null [48:34] + | | `--SEMI -> ; [48:38] + | |--VARIABLE_DEF -> VARIABLE_DEF [49:8] + | | |--MODIFIERS -> MODIFIERS [49:8] + | | | `--LITERAL_PRIVATE -> private [49:8] + | | |--TYPE -> TYPE [49:16] + | | | |--IDENT -> Bar [49:16] + | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [49:19] + | | | | |--GENERIC_START -> < [49:19] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [49:20] + | | | | | `--IDENT -> String [49:20] + | | | | `--GENERIC_END -> > [49:26] + | | | `--ARRAY_DECLARATOR -> [ [49:27] + | | | `--RBRACK -> ] [49:28] + | | |--IDENT -> barArray [49:30] + | | |--ASSIGN -> = [49:39] + | | | `--EXPR -> EXPR [49:41] + | | | `--LITERAL_NULL -> null [49:41] + | | `--SEMI -> ; [49:45] + | |--VARIABLE_DEF -> VARIABLE_DEF [50:8] + | | |--MODIFIERS -> MODIFIERS [50:8] + | | | `--LITERAL_PRIVATE -> private [50:8] + | | |--TYPE -> TYPE [50:16] + | | | `--LITERAL_INT -> int [50:16] + | | |--IDENT -> y [50:20] + | | |--ASSIGN -> = [50:22] + | | | `--EXPR -> EXPR [50:24] + | | | `--NUM_INT -> 1 [50:24] + | | `--SEMI -> ; [50:25] + | `--RCURLY -> } [51:4] + |--SEMI -> ; [51:5] + |--VARIABLE_DEF -> VARIABLE_DEF [52:4] + | |--MODIFIERS -> MODIFIERS [52:4] + | | `--LITERAL_PRIVATE -> private [52:4] + | |--TYPE -> TYPE [52:12] + | | `--LITERAL_INT -> int [52:12] + | |--IDENT -> x [52:16] + | |--ASSIGN -> = [52:18] + | | `--EXPR -> EXPR [52:20] + | | `--NUM_INT -> 0 [52:20] + | `--SEMI -> ; [52:21] + |--VARIABLE_DEF -> VARIABLE_DEF [53:4] + | |--MODIFIERS -> MODIFIERS [53:4] + | | `--LITERAL_PRIVATE -> private [53:4] + | |--TYPE -> TYPE [53:12] + | | |--IDENT -> Bar [53:12] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [53:15] + | | |--GENERIC_START -> < [53:15] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [53:16] + | | | `--IDENT -> String [53:16] + | | `--GENERIC_END -> > [53:22] + | |--IDENT -> bar [53:24] + | |--ASSIGN -> = [53:28] + | | `--EXPR -> EXPR [53:30] + | | `--LITERAL_NULL -> null [53:30] + | `--SEMI -> ; [53:34] + |--VARIABLE_DEF -> VARIABLE_DEF [54:4] + | |--MODIFIERS -> MODIFIERS [54:4] + | | `--LITERAL_PRIVATE -> private [54:4] + | |--TYPE -> TYPE [54:12] + | | |--IDENT -> Bar [54:12] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [54:15] + | | | |--GENERIC_START -> < [54:15] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [54:16] + | | | | `--IDENT -> String [54:16] + | | | `--GENERIC_END -> > [54:22] + | | `--ARRAY_DECLARATOR -> [ [54:23] + | | `--RBRACK -> ] [54:24] + | |--IDENT -> barArray [54:26] + | |--ASSIGN -> = [54:35] + | | `--EXPR -> EXPR [54:37] + | | `--LITERAL_NULL -> null [54:37] + | `--SEMI -> ; [54:41] + |--VARIABLE_DEF -> VARIABLE_DEF [55:4] + | |--MODIFIERS -> MODIFIERS [55:4] + | | `--LITERAL_PRIVATE -> private [55:4] + | |--TYPE -> TYPE [55:12] + | | `--LITERAL_INT -> int [55:12] + | |--IDENT -> y [55:16] + | |--ASSIGN -> = [55:18] + | | `--EXPR -> EXPR [55:20] + | | `--NUM_INT -> 1 [55:20] + | `--SEMI -> ; [55:21] + |--VARIABLE_DEF -> VARIABLE_DEF [56:4] + | |--MODIFIERS -> MODIFIERS [56:4] + | | `--LITERAL_PRIVATE -> private [56:4] + | |--TYPE -> TYPE [56:12] + | | `--IDENT -> Boolean [56:12] + | |--IDENT -> booleanAtt [56:20] + | |--ASSIGN -> = [56:31] + | | `--EXPR -> EXPR [56:33] + | | `--LITERAL_FALSE -> false [56:33] + | `--SEMI -> ; [56:38] + `--RCURLY -> } [57:0] +ANNOTATION_DEF -> ANNOTATION_DEF [59:0] +|--MODIFIERS -> MODIFIERS [59:0] +|--AT -> @ [59:0] +|--LITERAL_INTERFACE -> interface [59:1] +|--IDENT -> annotation1 [59:11] +`--OBJBLOCK -> OBJBLOCK [59:22] + |--LCURLY -> { [59:22] + |--VARIABLE_DEF -> VARIABLE_DEF [60:4] + | |--MODIFIERS -> MODIFIERS [60:4] + | |--TYPE -> TYPE [60:4] + | | `--LITERAL_INT -> int [60:4] + | |--IDENT -> TOKEN_first [60:8] + | |--ASSIGN -> = [60:20] + | | `--EXPR -> EXPR [60:22] + | | `--NUM_INT -> 0x00 [60:22] + | `--SEMI -> ; [60:26] + |--VARIABLE_DEF -> VARIABLE_DEF [61:4] + | |--MODIFIERS -> MODIFIERS [61:4] + | |--TYPE -> TYPE [61:4] + | | `--LITERAL_INT -> int [61:4] + | |--IDENT -> TOKEN_second [61:8] + | |--ASSIGN -> = [61:21] + | | `--EXPR -> EXPR [61:23] + | | `--NUM_INT -> 0x01 [61:23] + | `--SEMI -> ; [61:27] + |--VARIABLE_DEF -> VARIABLE_DEF [62:4] + | |--MODIFIERS -> MODIFIERS [62:4] + | |--TYPE -> TYPE [62:4] + | | `--LITERAL_INT -> int [62:4] + | |--IDENT -> TOKEN_third [62:8] + | |--ASSIGN -> = [62:20] + | | `--EXPR -> EXPR [62:22] + | | `--NUM_INT -> 0x02 [62:22] + | `--SEMI -> ; [62:26] + `--RCURLY -> } [63:0] +CLASS_DEF -> CLASS_DEF [65:0] +|--MODIFIERS -> MODIFIERS [65:0] +|--LITERAL_CLASS -> class [65:0] +|--IDENT -> ForEach [65:6] +`--OBJBLOCK -> OBJBLOCK [65:14] + |--LCURLY -> { [65:14] + |--CTOR_DEF -> CTOR_DEF [66:4] + | |--MODIFIERS -> MODIFIERS [66:4] + | | `--LITERAL_PUBLIC -> public [66:4] + | |--IDENT -> ForEach [66:11] + | |--LPAREN -> ( [66:18] + | |--PARAMETERS -> PARAMETERS [66:28] + | | `--PARAMETER_DEF -> PARAMETER_DEF [66:28] + | | |--MODIFIERS -> MODIFIERS [66:28] + | | |--TYPE -> TYPE [66:28] + | | | `--DOT -> . [66:28] + | | | |--DOT -> . [66:23] + | | | | |--IDENT -> java [66:19] + | | | | `--IDENT -> util [66:24] + | | | |--IDENT -> Collection [66:29] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [66:39] + | | | |--GENERIC_START -> < [66:39] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [66:40] + | | | | `--IDENT -> String [66:40] + | | | `--GENERIC_END -> > [66:46] + | | `--IDENT -> strings [66:48] + | |--RPAREN -> ) [66:55] + | `--SLIST -> { [67:4] + | |--LITERAL_FOR -> for [68:8] + | | |--LPAREN -> ( [68:11] + | | |--FOR_EACH_CLAUSE -> FOR_EACH_CLAUSE [68:12] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [68:12] + | | | | |--MODIFIERS -> MODIFIERS [68:12] + | | | | |--TYPE -> TYPE [68:12] + | | | | | `--IDENT -> String [68:12] + | | | | `--IDENT -> s [68:19] + | | | |--COLON -> : [68:21] + | | | `--EXPR -> EXPR [68:23] + | | | `--IDENT -> strings [68:23] + | | |--RPAREN -> ) [68:30] + | | `--SLIST -> { [69:8] + | | `--RCURLY -> } [71:8] + | `--RCURLY -> } [72:4] + `--RCURLY -> } [73:0] +CLASS_DEF -> CLASS_DEF [75:0] +|--MODIFIERS -> MODIFIERS [75:0] +|--LITERAL_CLASS -> class [75:0] +|--IDENT -> Bar [75:6] +|--TYPE_PARAMETERS -> TYPE_PARAMETERS [75:9] +| |--GENERIC_START -> < [75:9] +| |--TYPE_PARAMETER -> TYPE_PARAMETER [75:10] +| | `--IDENT -> T [75:10] +| `--GENERIC_END -> > [75:11] +`--OBJBLOCK -> OBJBLOCK [75:13] + |--LCURLY -> { [75:13] + `--RCURLY -> } [76:0] +CLASS_DEF -> CLASS_DEF [78:0] +|--MODIFIERS -> MODIFIERS [78:0] +|--LITERAL_CLASS -> class [78:0] +|--IDENT -> Chars [78:6] +`--OBJBLOCK -> OBJBLOCK [78:12] + |--LCURLY -> { [78:12] + |--VARIABLE_DEF -> VARIABLE_DEF [79:4] + | |--MODIFIERS -> MODIFIERS [79:4] + | |--TYPE -> TYPE [79:4] + | | `--LITERAL_CHAR -> char [79:4] + | |--IDENT -> a [79:9] + | `--SEMI -> ; [79:10] + |--VARIABLE_DEF -> VARIABLE_DEF [80:4] + | |--MODIFIERS -> MODIFIERS [80:4] + | |--TYPE -> TYPE [80:4] + | | `--LITERAL_CHAR -> char [80:4] + | |--IDENT -> b [80:9] + | |--ASSIGN -> = [80:11] + | | `--EXPR -> EXPR [80:13] + | | `--IDENT -> a [80:13] + | `--SEMI -> ; [80:14] + |--VARIABLE_DEF -> VARIABLE_DEF [81:4] + | |--MODIFIERS -> MODIFIERS [81:4] + | |--TYPE -> TYPE [81:4] + | | `--LITERAL_BYTE -> byte [81:4] + | |--IDENT -> c [81:9] + | |--ASSIGN -> = [81:11] + | | `--EXPR -> EXPR [81:13] + | | `--NUM_INT -> 1 [81:13] + | `--SEMI -> ; [81:14] + |--VARIABLE_DEF -> VARIABLE_DEF [82:4] + | |--MODIFIERS -> MODIFIERS [82:4] + | |--TYPE -> TYPE [82:4] + | | `--LITERAL_SHORT -> short [82:4] + | |--IDENT -> d [82:10] + | |--ASSIGN -> = [82:12] + | | `--EXPR -> EXPR [82:14] + | | `--NUM_INT -> 1 [82:14] + | `--SEMI -> ; [82:15] + |--VARIABLE_DEF -> VARIABLE_DEF [83:4] + | |--MODIFIERS -> MODIFIERS [83:4] + | | `--FINAL -> final [83:4] + | |--TYPE -> TYPE [83:10] + | | `--LITERAL_LONG -> long [83:10] + | |--IDENT -> e [83:15] + | |--ASSIGN -> = [83:17] + | | `--EXPR -> EXPR [83:19] + | | `--NUM_INT -> 0 [83:19] + | `--SEMI -> ; [83:20] + `--RCURLY -> } [84:0] +CLASS_DEF -> CLASS_DEF [86:0] +|--MODIFIERS -> MODIFIERS [86:0] +|--LITERAL_CLASS -> class [86:0] +|--IDENT -> Doubles [86:6] +`--OBJBLOCK -> OBJBLOCK [86:14] + |--LCURLY -> { [86:14] + |--VARIABLE_DEF -> VARIABLE_DEF [87:4] + | |--MODIFIERS -> MODIFIERS [87:4] + | | `--FINAL -> final [87:4] + | |--TYPE -> TYPE [87:10] + | | `--LITERAL_DOUBLE -> double [87:10] + | |--IDENT -> subZero [87:17] + | |--ASSIGN -> = [87:25] + | | `--EXPR -> EXPR [87:27] + | | `--UNARY_MINUS -> - [87:27] + | | `--NUM_FLOAT -> 0.0 [87:28] + | `--SEMI -> ; [87:31] + |--VARIABLE_DEF -> VARIABLE_DEF [88:4] + | |--MODIFIERS -> MODIFIERS [88:4] + | | `--FINAL -> final [88:4] + | |--TYPE -> TYPE [88:10] + | | `--LITERAL_DOUBLE -> double [88:10] + | |--IDENT -> nan [88:17] + | |--ASSIGN -> = [88:21] + | | `--EXPR -> EXPR [88:29] + | | `--DOT -> . [88:29] + | | |--IDENT -> Double [88:23] + | | `--IDENT -> NaN [88:30] + | `--SEMI -> ; [88:33] + |--VARIABLE_DEF -> VARIABLE_DEF [89:4] + | |--MODIFIERS -> MODIFIERS [89:4] + | | `--LITERAL_PRIVATE -> private [89:4] + | |--TYPE -> TYPE [89:12] + | | `--LITERAL_SHORT -> short [89:12] + | |--IDENT -> shortVariable [89:18] + | |--ASSIGN -> = [89:32] + | | `--EXPR -> EXPR [89:34] + | | `--NUM_INT -> 0 [89:34] + | `--SEMI -> ; [89:35] + |--VARIABLE_DEF -> VARIABLE_DEF [90:4] + | |--MODIFIERS -> MODIFIERS [90:4] + | | `--LITERAL_PRIVATE -> private [90:4] + | |--TYPE -> TYPE [90:12] + | | `--LITERAL_BYTE -> byte [90:12] + | |--IDENT -> bite [90:17] + | |--ASSIGN -> = [90:22] + | | `--EXPR -> EXPR [90:24] + | | `--NUM_INT -> 0 [90:24] + | `--SEMI -> ; [90:25] + `--RCURLY -> } [91:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionExpressionList.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionExpressionList.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionExpressionList.java @@ -0,0 +1,29 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +public class InputAntlr4AstRegressionExpressionList { + protected InputAntlr4AstRegressionExpressionList ( int i ) + { + this (); //whitespace + toString (); + } + protected InputAntlr4AstRegressionExpressionList () + { + super (); + } + + public void enhancedFor () + { + int[] i = new int[2]; + for ( int j: i ) { + System.identityHashCode ( j ); + } + } +} + +@interface CronExpression { + Class<?>[] groups() default {}; +} + +@interface CronExpression1 { + Class<?>[] groups() default { }; // extra space +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionExpressionList.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionExpressionList.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionExpressionList.txt @@ -0,0 +1,164 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +CLASS_DEF -> CLASS_DEF [3:0] +|--MODIFIERS -> MODIFIERS [3:0] +| `--LITERAL_PUBLIC -> public [3:0] +|--LITERAL_CLASS -> class [3:7] +|--IDENT -> InputAntlr4AstRegressionExpressionList [3:13] +`--OBJBLOCK -> OBJBLOCK [3:52] + |--LCURLY -> { [3:52] + |--CTOR_DEF -> CTOR_DEF [4:8] + | |--MODIFIERS -> MODIFIERS [4:8] + | | `--LITERAL_PROTECTED -> protected [4:8] + | |--IDENT -> InputAntlr4AstRegressionExpressionList [4:18] + | |--LPAREN -> ( [4:57] + | |--PARAMETERS -> PARAMETERS [4:59] + | | `--PARAMETER_DEF -> PARAMETER_DEF [4:59] + | | |--MODIFIERS -> MODIFIERS [4:59] + | | |--TYPE -> TYPE [4:59] + | | | `--LITERAL_INT -> int [4:59] + | | `--IDENT -> i [4:63] + | |--RPAREN -> ) [4:65] + | `--SLIST -> { [5:4] + | |--CTOR_CALL -> this [6:8] + | | |--LPAREN -> ( [6:13] + | | |--ELIST -> ELIST [6:14] + | | |--RPAREN -> ) [6:14] + | | `--SEMI -> ; [6:15] + | |--EXPR -> EXPR [7:17] + | | `--METHOD_CALL -> ( [7:17] + | | |--IDENT -> toString [7:8] + | | |--ELIST -> ELIST [7:18] + | | `--RPAREN -> ) [7:18] + | |--SEMI -> ; [7:19] + | `--RCURLY -> } [8:4] + |--CTOR_DEF -> CTOR_DEF [9:4] + | |--MODIFIERS -> MODIFIERS [9:4] + | | `--LITERAL_PROTECTED -> protected [9:4] + | |--IDENT -> InputAntlr4AstRegressionExpressionList [9:14] + | |--LPAREN -> ( [9:53] + | |--PARAMETERS -> PARAMETERS [9:54] + | |--RPAREN -> ) [9:54] + | `--SLIST -> { [10:4] + | |--SUPER_CTOR_CALL -> super [11:8] + | | |--LPAREN -> ( [11:14] + | | |--ELIST -> ELIST [11:15] + | | |--RPAREN -> ) [11:15] + | | `--SEMI -> ; [11:16] + | `--RCURLY -> } [12:4] + |--METHOD_DEF -> METHOD_DEF [14:4] + | |--MODIFIERS -> MODIFIERS [14:4] + | | `--LITERAL_PUBLIC -> public [14:4] + | |--TYPE -> TYPE [14:11] + | | `--LITERAL_VOID -> void [14:11] + | |--IDENT -> enhancedFor [14:16] + | |--LPAREN -> ( [14:28] + | |--PARAMETERS -> PARAMETERS [14:29] + | |--RPAREN -> ) [14:29] + | `--SLIST -> { [15:4] + | |--VARIABLE_DEF -> VARIABLE_DEF [16:8] + | | |--MODIFIERS -> MODIFIERS [16:8] + | | |--TYPE -> TYPE [16:8] + | | | |--LITERAL_INT -> int [16:8] + | | | `--ARRAY_DECLARATOR -> [ [16:11] + | | | `--RBRACK -> ] [16:12] + | | |--IDENT -> i [16:14] + | | `--ASSIGN -> = [16:16] + | | `--EXPR -> EXPR [16:18] + | | `--LITERAL_NEW -> new [16:18] + | | |--LITERAL_INT -> int [16:22] + | | `--ARRAY_DECLARATOR -> [ [16:25] + | | |--EXPR -> EXPR [16:26] + | | | `--NUM_INT -> 2 [16:26] + | | `--RBRACK -> ] [16:27] + | |--SEMI -> ; [16:28] + | |--LITERAL_FOR -> for [17:8] + | | |--LPAREN -> ( [17:12] + | | |--FOR_EACH_CLAUSE -> FOR_EACH_CLAUSE [17:14] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [17:14] + | | | | |--MODIFIERS -> MODIFIERS [17:14] + | | | | |--TYPE -> TYPE [17:14] + | | | | | `--LITERAL_INT -> int [17:14] + | | | | `--IDENT -> j [17:18] + | | | |--COLON -> : [17:19] + | | | `--EXPR -> EXPR [17:21] + | | | `--IDENT -> i [17:21] + | | |--RPAREN -> ) [17:23] + | | `--SLIST -> { [17:25] + | | |--EXPR -> EXPR [18:36] + | | | `--METHOD_CALL -> ( [18:36] + | | | |--DOT -> . [18:18] + | | | | |--IDENT -> System [18:12] + | | | | `--IDENT -> identityHashCode [18:19] + | | | |--ELIST -> ELIST [18:38] + | | | | `--EXPR -> EXPR [18:38] + | | | | `--IDENT -> j [18:38] + | | | `--RPAREN -> ) [18:40] + | | |--SEMI -> ; [18:41] + | | `--RCURLY -> } [19:8] + | `--RCURLY -> } [20:4] + `--RCURLY -> } [21:0] +ANNOTATION_DEF -> ANNOTATION_DEF [23:0] +|--MODIFIERS -> MODIFIERS [23:0] +|--AT -> @ [23:0] +|--LITERAL_INTERFACE -> interface [23:1] +|--IDENT -> CronExpression [23:11] +`--OBJBLOCK -> OBJBLOCK [23:26] + |--LCURLY -> { [23:26] + |--ANNOTATION_FIELD_DEF -> ANNOTATION_FIELD_DEF [24:4] + | |--MODIFIERS -> MODIFIERS [24:4] + | |--TYPE -> TYPE [24:4] + | | |--IDENT -> Class [24:4] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [24:9] + | | | |--GENERIC_START -> < [24:9] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [24:10] + | | | | `--WILDCARD_TYPE -> ? [24:10] + | | | `--GENERIC_END -> > [24:11] + | | `--ARRAY_DECLARATOR -> [ [24:12] + | | `--RBRACK -> ] [24:13] + | |--IDENT -> groups [24:15] + | |--LPAREN -> ( [24:21] + | |--RPAREN -> ) [24:22] + | |--LITERAL_DEFAULT -> default [24:24] + | | `--ANNOTATION_ARRAY_INIT -> { [24:32] + | | `--RCURLY -> } [24:33] + | `--SEMI -> ; [24:34] + `--RCURLY -> } [25:0] +ANNOTATION_DEF -> ANNOTATION_DEF [27:0] +|--MODIFIERS -> MODIFIERS [27:0] +|--AT -> @ [27:0] +|--LITERAL_INTERFACE -> interface [27:1] +|--IDENT -> CronExpression1 [27:11] +`--OBJBLOCK -> OBJBLOCK [27:27] + |--LCURLY -> { [27:27] + |--ANNOTATION_FIELD_DEF -> ANNOTATION_FIELD_DEF [28:4] + | |--MODIFIERS -> MODIFIERS [28:4] + | |--TYPE -> TYPE [28:4] + | | |--IDENT -> Class [28:4] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [28:9] + | | | |--GENERIC_START -> < [28:9] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [28:10] + | | | | `--WILDCARD_TYPE -> ? [28:10] + | | | `--GENERIC_END -> > [28:11] + | | `--ARRAY_DECLARATOR -> [ [28:12] + | | `--RBRACK -> ] [28:13] + | |--IDENT -> groups [28:15] + | |--LPAREN -> ( [28:21] + | |--RPAREN -> ) [28:22] + | |--LITERAL_DEFAULT -> default [28:24] + | | `--ANNOTATION_ARRAY_INIT -> { [28:32] + | | `--RCURLY -> } [28:34] + | `--SEMI -> ; [28:35] + `--RCURLY -> } [29:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionFallThroughDefault.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionFallThroughDefault.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionFallThroughDefault.java @@ -0,0 +1,533 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +public class InputAntlr4AstRegressionFallThroughDefault { + void method(int i, int j, boolean cond) { + while (true) { + switch (i) { + case 0: // no problem + case 1: + i++; + break; + case 2: + i++; + case 3: //fall through!!! + i++; + break; + case 4: + return; + case 5: + throw new RuntimeException(""); + case 6: + continue; + case 7: { + break; + } + case 8: { + return; + } + case 9: { + throw new RuntimeException(""); + } + case 10: { + continue; + } + case 11: { + i++; + } + case 12: //fall through!!! + if (false) + break; + else + break; + case 13: + if (true) { + return; + } + case 14: + if (true) { + return; + } else { + //do nothing + } + case 15: //fall through!!! + do { + System.identityHashCode("something"); + return; + } while(true); + case 16: + for (int j1 = 0; j1 < 10; j1++) { + String.valueOf("something"); + return; + } + case 17: + while (true) + throw new RuntimeException(""); + case 18: + while(cond) { + break; + } + case 19: //fall through!!! + try { + i++; + break; + } catch (RuntimeException e) { + break; + } catch (Error e) { + return; + } + case 20: + try { + i++; + break; + } catch (RuntimeException e) { + } catch (Error e) { + return; + } + case 21: //fall through!!! + try { + i++; + } catch (RuntimeException e) { + i--; + } finally { + break; + } + case 22: + try { + i++; + break; + } catch (RuntimeException e) { + i--; + break; + } finally { + i++; + } + case 23: + switch (j) { + case 1: + continue; + case 2: + return; + default: + return; + } + case 24: + switch (j) { + case 1: + continue; + case 2: + break; + default: + return; + } + default: //fall through!!! + // this is the last label + i++; + } + } + } + + + + /* Like above, but all fall throughs with relief comment */ + void methodFallThru(int i, int j, boolean cond) { + while (true) { + switch (i) { + case -1: // FALLTHRU + + case 0: // no problem + case 1: + i++; + break; + case 2: + i++; + // fallthru + case 3: + i++; + break; + case 4: + return; + case 5: + throw new RuntimeException(""); + case 6: + continue; + case 7: { + break; + } + case 8: { + return; + } + case 9: { + throw new RuntimeException(""); + } + case 10: { + continue; + } + case 11: { + i++; + } + // fallthru + case 12: + if (false) + break; + else + break; + case 13: + if (true) { + return; + } + case 14: + if (true) { + return; + } else { + //do nothing + } + // fallthru + case 15: + do { + System.identityHashCode("something"); + return; + } while(true); + case 16: + for (int j1 = 0; j1 < 10; j1++) { + String.valueOf("something"); + return; + } + case 17: + while (cond) + throw new RuntimeException(""); + case 18: + while(cond) { + break; + } + // fallthru + case 19: + try { + i++; + break; + } catch (RuntimeException e) { + break; + } catch (Error e) { + return; + } + case 20: + try { + i++; + break; + } catch (RuntimeException e) { + } catch (Error e) { + return; + } + // fallthru + case 21: + try { + i++; + } catch (RuntimeException e) { + i--; + } finally { + break; + } + case 22: + try { + i++; + break; + } catch (RuntimeException e) { + i--; + break; + } finally { + i++; + } + + case 23: + switch (j) { + case 1: + continue; + case 2: + return; + default: + return; + } + case 24: + i++; + /* fallthru */ case 25: + i++; + break; + + case 26: + switch (j) { + case 1: + continue; + case 2: + break; + default: + return; + } + // fallthru + default: + // this is the last label + i++; + // fallthru + } + } + } + + /* Test relief comment. */ + void methodFallThruCC(int i, int j, boolean cond) { + while (true) { + switch (i){ + case 0: + i++; // fallthru + + case 1: + i++; + // fallthru + case 2: { + i++; + } + // fallthru + case 3: + i++; + /* fallthru */case 4: + break; + case 5: + i++; + // fallthru + } + } + } + + /* Like above, but C-style comments. */ + void methodFallThruC(int i, int j, boolean cond) { + while (true) { + switch (i){ + case 0: + i++; /* fallthru */ + + case 1: + i++; + /* fallthru */ + case 2: + i++; + /* fallthru */case 3: + break; + case 4: + i++; + /* fallthru */ + } + } + } + + /* Like above, but C-style comments with no spaces. */ + void methodFallThruC2(int i, int j, boolean cond) { + while (true) { + switch (i){ + case 0: + i++; /*fallthru*/ + + case 1: + i++; + /*fallthru*/ + case 2: + i++; + /*fallthru*/case 3: + break; + case 4: + i++; + /*fallthru*/ + } + } + } + + /* C-style comments with other default fallthru-comment. */ + void methodFallThruCOtherWords(int i, int j, boolean cond) { + while (true) { + switch (i){ + case 0: + i++; /* falls through */ + + case 1: + i++; + /* falls through */ + case 2: + i++; + /* falls through */case 3: + break; + case 4: + i++; + /* falls through */ + } + } + } + + /* C-style comments with custom fallthru-comment. */ + void methodFallThruCCustomWords(int i, int j, boolean cond) { + while (true) { + switch (i){ + case 0: + i++; /* Continue with next case */ + + case 1: + i++; + /* Continue with next case */ + case 2: + i++; + /* Continue with next case */case 3: + break; + case 4: + i++; + /* Continue with next case */ + } + } + } + + void methodFallThruLastCaseGroup(int i, int j, boolean cond) { + while (true) { + switch (i){ + case 0: + i++; // fallthru + } + switch (i){ + case 0: + i++; + // fallthru + } + switch (i){ + case 0: + i++; + /* fallthru */ } + } + } + + void method1472228(int i) { + switch(i) { + case 2: + // do nothing + break; + default: + } + } + + void nestedSwitches() { + switch (hashCode()) { + case 1: + switch (hashCode()) { // causing NullPointerException in the past + case 1: + } + default: // violation - no fall through comment + } + } + + void nextedSwitches2() { + switch(hashCode()) { + case 1: + switch(hashCode()){} + case 2: + System.lineSeparator(); + break; + } + } + + void ifWithoutBreak() { + switch(hashCode()) { + case 1: + if (true) { + System.lineSeparator(); + } + case 2: + System.lineSeparator(); + break; + } + } + + void noCommentAtTheEnd() { + switch(hashCode()) { + case 1: System.lineSeparator(); + + case 2: + System.lineSeparator(); + break; + } + } + + void synchronizedStatement() { + switch (hashCode()) { + case 1: + synchronized (this) { + break; + } + case 2: + // synchronized nested in if + if (true) { + synchronized (this) { + break; + } + } else { + synchronized (this) { + break; + } + } + case 3: + synchronized (this) { + } + // fallthru + default: + break; + } + } + + void multipleCasesOnOneLine() { + int i = 0; + switch (i) { + case 0: case 1: i *= i; // fall through + case 2: case 3: i *= i; // fall through + case 4: case 5: i *= i; // fall through + case 6: case 7: i *= i; + break; + default: + throw new RuntimeException(); + } + } + + /* Test relief comment. */ + void methodFallThruWithDash(int i, int j, boolean cond) { + while (true) { + switch (i){ + case 0: + i++; // fallthru + case 1: + i++; // fall thru + case 2: + i++; // fall-thru + case 3: + i++; // fallthrough + case 4: + i++; // fall through + case 5: + i++; // fall-through + case 6: + i++; // fallsthru + case 7: + i++; // falls thru + case 8: + i++; // falls-thru + case 9: + i++; // fallsthrough + case 10: + i++; // falls through + case 11: + i++; // falls-through + case 12: + i++; // fall--through + case 13: //warn + i++; // fall+through + case 14: //warn + i++; // falls_thru + case 15: //warn + i++; // falls=through + case 16: //warn + i++; // falls-throug + default: //warn + throw new RuntimeException(); + } + } + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionFallThroughDefault.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionFallThroughDefault.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionFallThroughDefault.txt @@ -0,0 +1,2340 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +CLASS_DEF -> CLASS_DEF [3:0] +|--MODIFIERS -> MODIFIERS [3:0] +| `--LITERAL_PUBLIC -> public [3:0] +|--LITERAL_CLASS -> class [3:7] +|--IDENT -> InputAntlr4AstRegressionFallThroughDefault [3:13] +`--OBJBLOCK -> OBJBLOCK [3:56] + |--LCURLY -> { [3:56] + |--METHOD_DEF -> METHOD_DEF [4:6] + | |--MODIFIERS -> MODIFIERS [4:6] + | |--TYPE -> TYPE [4:6] + | | `--LITERAL_VOID -> void [4:6] + | |--IDENT -> method [4:11] + | |--LPAREN -> ( [4:17] + | |--PARAMETERS -> PARAMETERS [4:18] + | | |--PARAMETER_DEF -> PARAMETER_DEF [4:18] + | | | |--MODIFIERS -> MODIFIERS [4:18] + | | | |--TYPE -> TYPE [4:18] + | | | | `--LITERAL_INT -> int [4:18] + | | | `--IDENT -> i [4:22] + | | |--COMMA -> , [4:23] + | | |--PARAMETER_DEF -> PARAMETER_DEF [4:25] + | | | |--MODIFIERS -> MODIFIERS [4:25] + | | | |--TYPE -> TYPE [4:25] + | | | | `--LITERAL_INT -> int [4:25] + | | | `--IDENT -> j [4:29] + | | |--COMMA -> , [4:30] + | | `--PARAMETER_DEF -> PARAMETER_DEF [4:32] + | | |--MODIFIERS -> MODIFIERS [4:32] + | | |--TYPE -> TYPE [4:32] + | | | `--LITERAL_BOOLEAN -> boolean [4:32] + | | `--IDENT -> cond [4:40] + | |--RPAREN -> ) [4:44] + | `--SLIST -> { [4:46] + | |--LITERAL_WHILE -> while [5:8] + | | |--LPAREN -> ( [5:14] + | | |--EXPR -> EXPR [5:15] + | | | `--LITERAL_TRUE -> true [5:15] + | | |--RPAREN -> ) [5:19] + | | `--SLIST -> { [5:21] + | | |--LITERAL_SWITCH -> switch [6:12] + | | | |--LPAREN -> ( [6:19] + | | | |--EXPR -> EXPR [6:20] + | | | | `--IDENT -> i [6:20] + | | | |--RPAREN -> ) [6:21] + | | | |--LCURLY -> { [6:23] + | | | |--CASE_GROUP -> CASE_GROUP [7:12] + | | | | |--LITERAL_CASE -> case [7:12] + | | | | | |--EXPR -> EXPR [7:17] + | | | | | | `--NUM_INT -> 0 [7:17] + | | | | | `--COLON -> : [7:18] + | | | | |--LITERAL_CASE -> case [8:12] + | | | | | |--EXPR -> EXPR [8:17] + | | | | | | `--NUM_INT -> 1 [8:17] + | | | | | `--COLON -> : [8:18] + | | | | `--SLIST -> SLIST [9:17] + | | | | |--EXPR -> EXPR [9:17] + | | | | | `--POST_INC -> ++ [9:17] + | | | | | `--IDENT -> i [9:16] + | | | | |--SEMI -> ; [9:19] + | | | | `--LITERAL_BREAK -> break [10:16] + | | | | `--SEMI -> ; [10:21] + | | | |--CASE_GROUP -> CASE_GROUP [11:12] + | | | | |--LITERAL_CASE -> case [11:12] + | | | | | |--EXPR -> EXPR [11:17] + | | | | | | `--NUM_INT -> 2 [11:17] + | | | | | `--COLON -> : [11:18] + | | | | `--SLIST -> SLIST [12:17] + | | | | |--EXPR -> EXPR [12:17] + | | | | | `--POST_INC -> ++ [12:17] + | | | | | `--IDENT -> i [12:16] + | | | | `--SEMI -> ; [12:19] + | | | |--CASE_GROUP -> CASE_GROUP [13:12] + | | | | |--LITERAL_CASE -> case [13:12] + | | | | | |--EXPR -> EXPR [13:17] + | | | | | | `--NUM_INT -> 3 [13:17] + | | | | | `--COLON -> : [13:18] + | | | | `--SLIST -> SLIST [14:17] + | | | | |--EXPR -> EXPR [14:17] + | | | | | `--POST_INC -> ++ [14:17] + | | | | | `--IDENT -> i [14:16] + | | | | |--SEMI -> ; [14:19] + | | | | `--LITERAL_BREAK -> break [15:16] + | | | | `--SEMI -> ; [15:21] + | | | |--CASE_GROUP -> CASE_GROUP [16:12] + | | | | |--LITERAL_CASE -> case [16:12] + | | | | | |--EXPR -> EXPR [16:17] + | | | | | | `--NUM_INT -> 4 [16:17] + | | | | | `--COLON -> : [16:18] + | | | | `--SLIST -> SLIST [17:16] + | | | | `--LITERAL_RETURN -> return [17:16] + | | | | `--SEMI -> ; [17:22] + | | | |--CASE_GROUP -> CASE_GROUP [18:12] + | | | | |--LITERAL_CASE -> case [18:12] + | | | | | |--EXPR -> EXPR [18:17] + | | | | | | `--NUM_INT -> 5 [18:17] + | | | | | `--COLON -> : [18:18] + | | | | `--SLIST -> SLIST [19:16] + | | | | `--LITERAL_THROW -> throw [19:16] + | | | | |--EXPR -> EXPR [19:22] + | | | | | `--LITERAL_NEW -> new [19:22] + | | | | | |--IDENT -> RuntimeException [19:26] + | | | | | |--LPAREN -> ( [19:42] + | | | | | |--ELIST -> ELIST [19:43] + | | | | | | `--EXPR -> EXPR [19:43] + | | | | | | `--STRING_LITERAL -> "" [19:43] + | | | | | `--RPAREN -> ) [19:45] + | | | | `--SEMI -> ; [19:46] + | | | |--CASE_GROUP -> CASE_GROUP [20:12] + | | | | |--LITERAL_CASE -> case [20:12] + | | | | | |--EXPR -> EXPR [20:17] + | | | | | | `--NUM_INT -> 6 [20:17] + | | | | | `--COLON -> : [20:18] + | | | | `--SLIST -> SLIST [21:16] + | | | | `--LITERAL_CONTINUE -> continue [21:16] + | | | | `--SEMI -> ; [21:24] + | | | |--CASE_GROUP -> CASE_GROUP [22:12] + | | | | |--LITERAL_CASE -> case [22:12] + | | | | | |--EXPR -> EXPR [22:17] + | | | | | | `--NUM_INT -> 7 [22:17] + | | | | | `--COLON -> : [22:18] + | | | | `--SLIST -> SLIST [22:20] + | | | | `--SLIST -> { [22:20] + | | | | |--LITERAL_BREAK -> break [23:16] + | | | | | `--SEMI -> ; [23:21] + | | | | `--RCURLY -> } [24:12] + | | | |--CASE_GROUP -> CASE_GROUP [25:12] + | | | | |--LITERAL_CASE -> case [25:12] + | | | | | |--EXPR -> EXPR [25:17] + | | | | | | `--NUM_INT -> 8 [25:17] + | | | | | `--COLON -> : [25:18] + | | | | `--SLIST -> SLIST [25:20] + | | | | `--SLIST -> { [25:20] + | | | | |--LITERAL_RETURN -> return [26:16] + | | | | | `--SEMI -> ; [26:22] + | | | | `--RCURLY -> } [27:12] + | | | |--CASE_GROUP -> CASE_GROUP [28:12] + | | | | |--LITERAL_CASE -> case [28:12] + | | | | | |--EXPR -> EXPR [28:17] + | | | | | | `--NUM_INT -> 9 [28:17] + | | | | | `--COLON -> : [28:18] + | | | | `--SLIST -> SLIST [28:20] + | | | | `--SLIST -> { [28:20] + | | | | |--LITERAL_THROW -> throw [29:16] + | | | | | |--EXPR -> EXPR [29:22] + | | | | | | `--LITERAL_NEW -> new [29:22] + | | | | | | |--IDENT -> RuntimeException [29:26] + | | | | | | |--LPAREN -> ( [29:42] + | | | | | | |--ELIST -> ELIST [29:43] + | | | | | | | `--EXPR -> EXPR [29:43] + | | | | | | | `--STRING_LITERAL -> "" [29:43] + | | | | | | `--RPAREN -> ) [29:45] + | | | | | `--SEMI -> ; [29:46] + | | | | `--RCURLY -> } [30:12] + | | | |--CASE_GROUP -> CASE_GROUP [31:12] + | | | | |--LITERAL_CASE -> case [31:12] + | | | | | |--EXPR -> EXPR [31:17] + | | | | | | `--NUM_INT -> 10 [31:17] + | | | | | `--COLON -> : [31:19] + | | | | `--SLIST -> SLIST [31:21] + | | | | `--SLIST -> { [31:21] + | | | | |--LITERAL_CONTINUE -> continue [32:16] + | | | | | `--SEMI -> ; [32:24] + | | | | `--RCURLY -> } [33:12] + | | | |--CASE_GROUP -> CASE_GROUP [34:12] + | | | | |--LITERAL_CASE -> case [34:12] + | | | | | |--EXPR -> EXPR [34:17] + | | | | | | `--NUM_INT -> 11 [34:17] + | | | | | `--COLON -> : [34:19] + | | | | `--SLIST -> SLIST [34:21] + | | | | `--SLIST -> { [34:21] + | | | | |--EXPR -> EXPR [35:17] + | | | | | `--POST_INC -> ++ [35:17] + | | | | | `--IDENT -> i [35:16] + | | | | |--SEMI -> ; [35:19] + | | | | `--RCURLY -> } [36:12] + | | | |--CASE_GROUP -> CASE_GROUP [37:12] + | | | | |--LITERAL_CASE -> case [37:12] + | | | | | |--EXPR -> EXPR [37:17] + | | | | | | `--NUM_INT -> 12 [37:17] + | | | | | `--COLON -> : [37:19] + | | | | `--SLIST -> SLIST [38:16] + | | | | `--LITERAL_IF -> if [38:16] + | | | | |--LPAREN -> ( [38:19] + | | | | |--EXPR -> EXPR [38:20] + | | | | | `--LITERAL_FALSE -> false [38:20] + | | | | |--RPAREN -> ) [38:25] + | | | | |--LITERAL_BREAK -> break [39:20] + | | | | | `--SEMI -> ; [39:25] + | | | | `--LITERAL_ELSE -> else [40:16] + | | | | `--LITERAL_BREAK -> break [41:20] + | | | | `--SEMI -> ; [41:25] + | | | |--CASE_GROUP -> CASE_GROUP [42:12] + | | | | |--LITERAL_CASE -> case [42:12] + | | | | | |--EXPR -> EXPR [42:17] + | | | | | | `--NUM_INT -> 13 [42:17] + | | | | | `--COLON -> : [42:19] + | | | | `--SLIST -> SLIST [43:16] + | | | | `--LITERAL_IF -> if [43:16] + | | | | |--LPAREN -> ( [43:19] + | | | | |--EXPR -> EXPR [43:20] + | | | | | `--LITERAL_TRUE -> true [43:20] + | | | | |--RPAREN -> ) [43:24] + | | | | `--SLIST -> { [43:26] + | | | | |--LITERAL_RETURN -> return [44:20] + | | | | | `--SEMI -> ; [44:26] + | | | | `--RCURLY -> } [45:16] + | | | |--CASE_GROUP -> CASE_GROUP [46:12] + | | | | |--LITERAL_CASE -> case [46:12] + | | | | | |--EXPR -> EXPR [46:17] + | | | | | | `--NUM_INT -> 14 [46:17] + | | | | | `--COLON -> : [46:19] + | | | | `--SLIST -> SLIST [47:16] + | | | | `--LITERAL_IF -> if [47:16] + | | | | |--LPAREN -> ( [47:19] + | | | | |--EXPR -> EXPR [47:20] + | | | | | `--LITERAL_TRUE -> true [47:20] + | | | | |--RPAREN -> ) [47:24] + | | | | |--SLIST -> { [47:26] + | | | | | |--LITERAL_RETURN -> return [48:20] + | | | | | | `--SEMI -> ; [48:26] + | | | | | `--RCURLY -> } [49:16] + | | | | `--LITERAL_ELSE -> else [49:18] + | | | | `--SLIST -> { [49:23] + | | | | `--RCURLY -> } [51:16] + | | | |--CASE_GROUP -> CASE_GROUP [52:12] + | | | | |--LITERAL_CASE -> case [52:12] + | | | | | |--EXPR -> EXPR [52:17] + | | | | | | `--NUM_INT -> 15 [52:17] + | | | | | `--COLON -> : [52:19] + | | | | `--SLIST -> SLIST [53:16] + | | | | `--LITERAL_DO -> do [53:16] + | | | | |--SLIST -> { [53:19] + | | | | | |--EXPR -> EXPR [54:43] + | | | | | | `--METHOD_CALL -> ( [54:43] + | | | | | | |--DOT -> . [54:26] + | | | | | | | |--IDENT -> System [54:20] + | | | | | | | `--IDENT -> identityHashCode [54:27] + | | | | | | |--ELIST -> ELIST [54:44] + | | | | | | | `--EXPR -> EXPR [54:44] + | | | | | | | `--STRING_LITERAL -> "something" [54:44] + | | | | | | `--RPAREN -> ) [54:55] + | | | | | |--SEMI -> ; [54:56] + | | | | | |--LITERAL_RETURN -> return [55:20] + | | | | | | `--SEMI -> ; [55:26] + | | | | | `--RCURLY -> } [56:16] + | | | | |--DO_WHILE -> while [56:18] + | | | | |--LPAREN -> ( [56:23] + | | | | |--EXPR -> EXPR [56:24] + | | | | | `--LITERAL_TRUE -> true [56:24] + | | | | |--RPAREN -> ) [56:28] + | | | | `--SEMI -> ; [56:29] + | | | |--CASE_GROUP -> CASE_GROUP [57:12] + | | | | |--LITERAL_CASE -> case [57:12] + | | | | | |--EXPR -> EXPR [57:17] + | | | | | | `--NUM_INT -> 16 [57:17] + | | | | | `--COLON -> : [57:19] + | | | | `--SLIST -> SLIST [58:16] + | | | | `--LITERAL_FOR -> for [58:16] + | | | | |--LPAREN -> ( [58:20] + | | | | |--FOR_INIT -> FOR_INIT [58:21] + | | | | | `--VARIABLE_DEF -> VARIABLE_DEF [58:21] + | | | | | |--MODIFIERS -> MODIFIERS [58:21] + | | | | | |--TYPE -> TYPE [58:21] + | | | | | | `--LITERAL_INT -> int [58:21] + | | | | | |--IDENT -> j1 [58:25] + | | | | | `--ASSIGN -> = [58:28] + | | | | | `--EXPR -> EXPR [58:30] + | | | | | `--NUM_INT -> 0 [58:30] + | | | | |--SEMI -> ; [58:31] + | | | | |--FOR_CONDITION -> FOR_CONDITION [58:36] + | | | | | `--EXPR -> EXPR [58:36] + | | | | | `--LT -> < [58:36] + | | | | | |--IDENT -> j1 [58:33] + | | | | | `--NUM_INT -> 10 [58:38] + | | | | |--SEMI -> ; [58:40] + | | | | |--FOR_ITERATOR -> FOR_ITERATOR [58:44] + | | | | | `--ELIST -> ELIST [58:44] + | | | | | `--EXPR -> EXPR [58:44] + | | | | | `--POST_INC -> ++ [58:44] + | | | | | `--IDENT -> j1 [58:42] + | | | | |--RPAREN -> ) [58:46] + | | | | `--SLIST -> { [58:48] + | | | | |--EXPR -> EXPR [59:34] + | | | | | `--METHOD_CALL -> ( [59:34] + | | | | | |--DOT -> . [59:26] + | | | | | | |--IDENT -> String [59:20] + | | | | | | `--IDENT -> valueOf [59:27] + | | | | | |--ELIST -> ELIST [59:35] + | | | | | | `--EXPR -> EXPR [59:35] + | | | | | | `--STRING_LITERAL -> "something" [59:35] + | | | | | `--RPAREN -> ) [59:46] + | | | | |--SEMI -> ; [59:47] + | | | | |--LITERAL_RETURN -> return [60:20] + | | | | | `--SEMI -> ; [60:26] + | | | | `--RCURLY -> } [61:16] + | | | |--CASE_GROUP -> CASE_GROUP [62:12] + | | | | |--LITERAL_CASE -> case [62:12] + | | | | | |--EXPR -> EXPR [62:17] + | | | | | | `--NUM_INT -> 17 [62:17] + | | | | | `--COLON -> : [62:19] + | | | | `--SLIST -> SLIST [63:16] + | | | | `--LITERAL_WHILE -> while [63:16] + | | | | |--LPAREN -> ( [63:22] + | | | | |--EXPR -> EXPR [63:23] + | | | | | `--LITERAL_TRUE -> true [63:23] + | | | | |--RPAREN -> ) [63:27] + | | | | `--LITERAL_THROW -> throw [64:20] + | | | | |--EXPR -> EXPR [64:26] + | | | | | `--LITERAL_NEW -> new [64:26] + | | | | | |--IDENT -> RuntimeException [64:30] + | | | | | |--LPAREN -> ( [64:46] + | | | | | |--ELIST -> ELIST [64:47] + | | | | | | `--EXPR -> EXPR [64:47] + | | | | | | `--STRING_LITERAL -> "" [64:47] + | | | | | `--RPAREN -> ) [64:49] + | | | | `--SEMI -> ; [64:50] + | | | |--CASE_GROUP -> CASE_GROUP [65:12] + | | | | |--LITERAL_CASE -> case [65:12] + | | | | | |--EXPR -> EXPR [65:17] + | | | | | | `--NUM_INT -> 18 [65:17] + | | | | | `--COLON -> : [65:19] + | | | | `--SLIST -> SLIST [66:16] + | | | | `--LITERAL_WHILE -> while [66:16] + | | | | |--LPAREN -> ( [66:21] + | | | | |--EXPR -> EXPR [66:22] + | | | | | `--IDENT -> cond [66:22] + | | | | |--RPAREN -> ) [66:26] + | | | | `--SLIST -> { [66:28] + | | | | |--LITERAL_BREAK -> break [67:20] + | | | | | `--SEMI -> ; [67:25] + | | | | `--RCURLY -> } [68:16] + | | | |--CASE_GROUP -> CASE_GROUP [69:12] + | | | | |--LITERAL_CASE -> case [69:12] + | | | | | |--EXPR -> EXPR [69:17] + | | | | | | `--NUM_INT -> 19 [69:17] + | | | | | `--COLON -> : [69:19] + | | | | `--SLIST -> SLIST [70:16] + | | | | `--LITERAL_TRY -> try [70:16] + | | | | |--SLIST -> { [70:20] + | | | | | |--EXPR -> EXPR [71:21] + | | | | | | `--POST_INC -> ++ [71:21] + | | | | | | `--IDENT -> i [71:20] + | | | | | |--SEMI -> ; [71:23] + | | | | | |--LITERAL_BREAK -> break [72:20] + | | | | | | `--SEMI -> ; [72:25] + | | | | | `--RCURLY -> } [73:16] + | | | | |--LITERAL_CATCH -> catch [73:18] + | | | | | |--LPAREN -> ( [73:24] + | | | | | |--PARAMETER_DEF -> PARAMETER_DEF [73:25] + | | | | | | |--MODIFIERS -> MODIFIERS [73:25] + | | | | | | |--TYPE -> TYPE [73:25] + | | | | | | | `--IDENT -> RuntimeException [73:25] + | | | | | | `--IDENT -> e [73:42] + | | | | | |--RPAREN -> ) [73:43] + | | | | | `--SLIST -> { [73:45] + | | | | | |--LITERAL_BREAK -> break [74:20] + | | | | | | `--SEMI -> ; [74:25] + | | | | | `--RCURLY -> } [75:16] + | | | | `--LITERAL_CATCH -> catch [75:18] + | | | | |--LPAREN -> ( [75:24] + | | | | |--PARAMETER_DEF -> PARAMETER_DEF [75:25] + | | | | | |--MODIFIERS -> MODIFIERS [75:25] + | | | | | |--TYPE -> TYPE [75:25] + | | | | | | `--IDENT -> Error [75:25] + | | | | | `--IDENT -> e [75:31] + | | | | |--RPAREN -> ) [75:32] + | | | | `--SLIST -> { [75:34] + | | | | |--LITERAL_RETURN -> return [76:20] + | | | | | `--SEMI -> ; [76:26] + | | | | `--RCURLY -> } [77:16] + | | | |--CASE_GROUP -> CASE_GROUP [78:12] + | | | | |--LITERAL_CASE -> case [78:12] + | | | | | |--EXPR -> EXPR [78:17] + | | | | | | `--NUM_INT -> 20 [78:17] + | | | | | `--COLON -> : [78:19] + | | | | `--SLIST -> SLIST [79:16] + | | | | `--LITERAL_TRY -> try [79:16] + | | | | |--SLIST -> { [79:20] + | | | | | |--EXPR -> EXPR [80:21] + | | | | | | `--POST_INC -> ++ [80:21] + | | | | | | `--IDENT -> i [80:20] + | | | | | |--SEMI -> ; [80:23] + | | | | | |--LITERAL_BREAK -> break [81:20] + | | | | | | `--SEMI -> ; [81:25] + | | | | | `--RCURLY -> } [82:16] + | | | | |--LITERAL_CATCH -> catch [82:18] + | | | | | |--LPAREN -> ( [82:24] + | | | | | |--PARAMETER_DEF -> PARAMETER_DEF [82:25] + | | | | | | |--MODIFIERS -> MODIFIERS [82:25] + | | | | | | |--TYPE -> TYPE [82:25] + | | | | | | | `--IDENT -> RuntimeException [82:25] + | | | | | | `--IDENT -> e [82:42] + | | | | | |--RPAREN -> ) [82:43] + | | | | | `--SLIST -> { [82:45] + | | | | | `--RCURLY -> } [83:16] + | | | | `--LITERAL_CATCH -> catch [83:18] + | | | | |--LPAREN -> ( [83:24] + | | | | |--PARAMETER_DEF -> PARAMETER_DEF [83:25] + | | | | | |--MODIFIERS -> MODIFIERS [83:25] + | | | | | |--TYPE -> TYPE [83:25] + | | | | | | `--IDENT -> Error [83:25] + | | | | | `--IDENT -> e [83:31] + | | | | |--RPAREN -> ) [83:32] + | | | | `--SLIST -> { [83:34] + | | | | |--LITERAL_RETURN -> return [84:20] + | | | | | `--SEMI -> ; [84:26] + | | | | `--RCURLY -> } [85:16] + | | | |--CASE_GROUP -> CASE_GROUP [86:12] + | | | | |--LITERAL_CASE -> case [86:12] + | | | | | |--EXPR -> EXPR [86:17] + | | | | | | `--NUM_INT -> 21 [86:17] + | | | | | `--COLON -> : [86:19] + | | | | `--SLIST -> SLIST [87:16] + | | | | `--LITERAL_TRY -> try [87:16] + | | | | |--SLIST -> { [87:20] + | | | | | |--EXPR -> EXPR [88:21] + | | | | | | `--POST_INC -> ++ [88:21] + | | | | | | `--IDENT -> i [88:20] + | | | | | |--SEMI -> ; [88:23] + | | | | | `--RCURLY -> } [89:16] + | | | | |--LITERAL_CATCH -> catch [89:18] + | | | | | |--LPAREN -> ( [89:24] + | | | | | |--PARAMETER_DEF -> PARAMETER_DEF [89:25] + | | | | | | |--MODIFIERS -> MODIFIERS [89:25] + | | | | | | |--TYPE -> TYPE [89:25] + | | | | | | | `--IDENT -> RuntimeException [89:25] + | | | | | | `--IDENT -> e [89:42] + | | | | | |--RPAREN -> ) [89:43] + | | | | | `--SLIST -> { [89:45] + | | | | | |--EXPR -> EXPR [90:21] + | | | | | | `--POST_DEC -> -- [90:21] + | | | | | | `--IDENT -> i [90:20] + | | | | | |--SEMI -> ; [90:23] + | | | | | `--RCURLY -> } [91:16] + | | | | `--LITERAL_FINALLY -> finally [91:18] + | | | | `--SLIST -> { [91:26] + | | | | |--LITERAL_BREAK -> break [92:20] + | | | | | `--SEMI -> ; [92:25] + | | | | `--RCURLY -> } [93:16] + | | | |--CASE_GROUP -> CASE_GROUP [94:12] + | | | | |--LITERAL_CASE -> case [94:12] + | | | | | |--EXPR -> EXPR [94:17] + | | | | | | `--NUM_INT -> 22 [94:17] + | | | | | `--COLON -> : [94:19] + | | | | `--SLIST -> SLIST [95:16] + | | | | `--LITERAL_TRY -> try [95:16] + | | | | |--SLIST -> { [95:20] + | | | | | |--EXPR -> EXPR [96:21] + | | | | | | `--POST_INC -> ++ [96:21] + | | | | | | `--IDENT -> i [96:20] + | | | | | |--SEMI -> ; [96:23] + | | | | | |--LITERAL_BREAK -> break [97:20] + | | | | | | `--SEMI -> ; [97:25] + | | | | | `--RCURLY -> } [98:16] + | | | | |--LITERAL_CATCH -> catch [98:18] + | | | | | |--LPAREN -> ( [98:24] + | | | | | |--PARAMETER_DEF -> PARAMETER_DEF [98:25] + | | | | | | |--MODIFIERS -> MODIFIERS [98:25] + | | | | | | |--TYPE -> TYPE [98:25] + | | | | | | | `--IDENT -> RuntimeException [98:25] + | | | | | | `--IDENT -> e [98:42] + | | | | | |--RPAREN -> ) [98:43] + | | | | | `--SLIST -> { [98:45] + | | | | | |--EXPR -> EXPR [99:21] + | | | | | | `--POST_DEC -> -- [99:21] + | | | | | | `--IDENT -> i [99:20] + | | | | | |--SEMI -> ; [99:23] + | | | | | |--LITERAL_BREAK -> break [100:20] + | | | | | | `--SEMI -> ; [100:25] + | | | | | `--RCURLY -> } [101:16] + | | | | `--LITERAL_FINALLY -> finally [101:18] + | | | | `--SLIST -> { [101:26] + | | | | |--EXPR -> EXPR [102:21] + | | | | | `--POST_INC -> ++ [102:21] + | | | | | `--IDENT -> i [102:20] + | | | | |--SEMI -> ; [102:23] + | | | | `--RCURLY -> } [103:16] + | | | |--CASE_GROUP -> CASE_GROUP [104:12] + | | | | |--LITERAL_CASE -> case [104:12] + | | | | | |--EXPR -> EXPR [104:17] + | | | | | | `--NUM_INT -> 23 [104:17] + | | | | | `--COLON -> : [104:19] + | | | | `--SLIST -> SLIST [105:16] + | | | | `--LITERAL_SWITCH -> switch [105:16] + | | | | |--LPAREN -> ( [105:23] + | | | | |--EXPR -> EXPR [105:24] + | | | | | `--IDENT -> j [105:24] + | | | | |--RPAREN -> ) [105:25] + | | | | |--LCURLY -> { [105:27] + | | | | |--CASE_GROUP -> CASE_GROUP [106:16] + | | | | | |--LITERAL_CASE -> case [106:16] + | | | | | | |--EXPR -> EXPR [106:21] + | | | | | | | `--NUM_INT -> 1 [106:21] + | | | | | | `--COLON -> : [106:22] + | | | | | `--SLIST -> SLIST [107:20] + | | | | | `--LITERAL_CONTINUE -> continue [107:20] + | | | | | `--SEMI -> ; [107:28] + | | | | |--CASE_GROUP -> CASE_GROUP [108:16] + | | | | | |--LITERAL_CASE -> case [108:16] + | | | | | | |--EXPR -> EXPR [108:21] + | | | | | | | `--NUM_INT -> 2 [108:21] + | | | | | | `--COLON -> : [108:22] + | | | | | `--SLIST -> SLIST [109:20] + | | | | | `--LITERAL_RETURN -> return [109:20] + | | | | | `--SEMI -> ; [109:26] + | | | | |--CASE_GROUP -> CASE_GROUP [110:16] + | | | | | |--LITERAL_DEFAULT -> default [110:16] + | | | | | | `--COLON -> : [110:23] + | | | | | `--SLIST -> SLIST [111:20] + | | | | | `--LITERAL_RETURN -> return [111:20] + | | | | | `--SEMI -> ; [111:26] + | | | | `--RCURLY -> } [112:16] + | | | |--CASE_GROUP -> CASE_GROUP [113:12] + | | | | |--LITERAL_CASE -> case [113:12] + | | | | | |--EXPR -> EXPR [113:17] + | | | | | | `--NUM_INT -> 24 [113:17] + | | | | | `--COLON -> : [113:19] + | | | | `--SLIST -> SLIST [114:16] + | | | | `--LITERAL_SWITCH -> switch [114:16] + | | | | |--LPAREN -> ( [114:23] + | | | | |--EXPR -> EXPR [114:24] + | | | | | `--IDENT -> j [114:24] + | | | | |--RPAREN -> ) [114:25] + | | | | |--LCURLY -> { [114:27] + | | | | |--CASE_GROUP -> CASE_GROUP [115:16] + | | | | | |--LITERAL_CASE -> case [115:16] + | | | | | | |--EXPR -> EXPR [115:21] + | | | | | | | `--NUM_INT -> 1 [115:21] + | | | | | | `--COLON -> : [115:22] + | | | | | `--SLIST -> SLIST [116:20] + | | | | | `--LITERAL_CONTINUE -> continue [116:20] + | | | | | `--SEMI -> ; [116:28] + | | | | |--CASE_GROUP -> CASE_GROUP [117:16] + | | | | | |--LITERAL_CASE -> case [117:16] + | | | | | | |--EXPR -> EXPR [117:21] + | | | | | | | `--NUM_INT -> 2 [117:21] + | | | | | | `--COLON -> : [117:22] + | | | | | `--SLIST -> SLIST [118:20] + | | | | | `--LITERAL_BREAK -> break [118:20] + | | | | | `--SEMI -> ; [118:25] + | | | | |--CASE_GROUP -> CASE_GROUP [119:16] + | | | | | |--LITERAL_DEFAULT -> default [119:16] + | | | | | | `--COLON -> : [119:23] + | | | | | `--SLIST -> SLIST [120:20] + | | | | | `--LITERAL_RETURN -> return [120:20] + | | | | | `--SEMI -> ; [120:26] + | | | | `--RCURLY -> } [121:16] + | | | |--CASE_GROUP -> CASE_GROUP [122:12] + | | | | |--LITERAL_DEFAULT -> default [122:12] + | | | | | `--COLON -> : [122:19] + | | | | `--SLIST -> SLIST [124:17] + | | | | |--EXPR -> EXPR [124:17] + | | | | | `--POST_INC -> ++ [124:17] + | | | | | `--IDENT -> i [124:16] + | | | | `--SEMI -> ; [124:19] + | | | `--RCURLY -> } [125:12] + | | `--RCURLY -> } [126:8] + | `--RCURLY -> } [127:4] + |--METHOD_DEF -> METHOD_DEF [132:4] + | |--MODIFIERS -> MODIFIERS [132:4] + | |--TYPE -> TYPE [132:4] + | | `--LITERAL_VOID -> void [132:4] + | |--IDENT -> methodFallThru [132:9] + | |--LPAREN -> ( [132:23] + | |--PARAMETERS -> PARAMETERS [132:24] + | | |--PARAMETER_DEF -> PARAMETER_DEF [132:24] + | | | |--MODIFIERS -> MODIFIERS [132:24] + | | | |--TYPE -> TYPE [132:24] + | | | | `--LITERAL_INT -> int [132:24] + | | | `--IDENT -> i [132:28] + | | |--COMMA -> , [132:29] + | | |--PARAMETER_DEF -> PARAMETER_DEF [132:31] + | | | |--MODIFIERS -> MODIFIERS [132:31] + | | | |--TYPE -> TYPE [132:31] + | | | | `--LITERAL_INT -> int [132:31] + | | | `--IDENT -> j [132:35] + | | |--COMMA -> , [132:36] + | | `--PARAMETER_DEF -> PARAMETER_DEF [132:38] + | | |--MODIFIERS -> MODIFIERS [132:38] + | | |--TYPE -> TYPE [132:38] + | | | `--LITERAL_BOOLEAN -> boolean [132:38] + | | `--IDENT -> cond [132:46] + | |--RPAREN -> ) [132:50] + | `--SLIST -> { [132:52] + | |--LITERAL_WHILE -> while [133:6] + | | |--LPAREN -> ( [133:12] + | | |--EXPR -> EXPR [133:13] + | | | `--LITERAL_TRUE -> true [133:13] + | | |--RPAREN -> ) [133:17] + | | `--SLIST -> { [133:19] + | | |--LITERAL_SWITCH -> switch [134:10] + | | | |--LPAREN -> ( [134:17] + | | | |--EXPR -> EXPR [134:18] + | | | | `--IDENT -> i [134:18] + | | | |--RPAREN -> ) [134:19] + | | | |--LCURLY -> { [134:21] + | | | |--CASE_GROUP -> CASE_GROUP [135:10] + | | | | |--LITERAL_CASE -> case [135:10] + | | | | | |--EXPR -> EXPR [135:15] + | | | | | | `--UNARY_MINUS -> - [135:15] + | | | | | | `--NUM_INT -> 1 [135:16] + | | | | | `--COLON -> : [135:17] + | | | | |--LITERAL_CASE -> case [137:10] + | | | | | |--EXPR -> EXPR [137:15] + | | | | | | `--NUM_INT -> 0 [137:15] + | | | | | `--COLON -> : [137:16] + | | | | |--LITERAL_CASE -> case [138:10] + | | | | | |--EXPR -> EXPR [138:15] + | | | | | | `--NUM_INT -> 1 [138:15] + | | | | | `--COLON -> : [138:16] + | | | | `--SLIST -> SLIST [139:15] + | | | | |--EXPR -> EXPR [139:15] + | | | | | `--POST_INC -> ++ [139:15] + | | | | | `--IDENT -> i [139:14] + | | | | |--SEMI -> ; [139:17] + | | | | `--LITERAL_BREAK -> break [140:14] + | | | | `--SEMI -> ; [140:19] + | | | |--CASE_GROUP -> CASE_GROUP [141:10] + | | | | |--LITERAL_CASE -> case [141:10] + | | | | | |--EXPR -> EXPR [141:15] + | | | | | | `--NUM_INT -> 2 [141:15] + | | | | | `--COLON -> : [141:16] + | | | | `--SLIST -> SLIST [142:15] + | | | | |--EXPR -> EXPR [142:15] + | | | | | `--POST_INC -> ++ [142:15] + | | | | | `--IDENT -> i [142:14] + | | | | `--SEMI -> ; [142:17] + | | | |--CASE_GROUP -> CASE_GROUP [144:10] + | | | | |--LITERAL_CASE -> case [144:10] + | | | | | |--EXPR -> EXPR [144:15] + | | | | | | `--NUM_INT -> 3 [144:15] + | | | | | `--COLON -> : [144:16] + | | | | `--SLIST -> SLIST [145:15] + | | | | |--EXPR -> EXPR [145:15] + | | | | | `--POST_INC -> ++ [145:15] + | | | | | `--IDENT -> i [145:14] + | | | | |--SEMI -> ; [145:17] + | | | | `--LITERAL_BREAK -> break [146:14] + | | | | `--SEMI -> ; [146:19] + | | | |--CASE_GROUP -> CASE_GROUP [147:10] + | | | | |--LITERAL_CASE -> case [147:10] + | | | | | |--EXPR -> EXPR [147:15] + | | | | | | `--NUM_INT -> 4 [147:15] + | | | | | `--COLON -> : [147:16] + | | | | `--SLIST -> SLIST [148:14] + | | | | `--LITERAL_RETURN -> return [148:14] + | | | | `--SEMI -> ; [148:20] + | | | |--CASE_GROUP -> CASE_GROUP [149:10] + | | | | |--LITERAL_CASE -> case [149:10] + | | | | | |--EXPR -> EXPR [149:15] + | | | | | | `--NUM_INT -> 5 [149:15] + | | | | | `--COLON -> : [149:16] + | | | | `--SLIST -> SLIST [150:14] + | | | | `--LITERAL_THROW -> throw [150:14] + | | | | |--EXPR -> EXPR [150:20] + | | | | | `--LITERAL_NEW -> new [150:20] + | | | | | |--IDENT -> RuntimeException [150:24] + | | | | | |--LPAREN -> ( [150:40] + | | | | | |--ELIST -> ELIST [150:41] + | | | | | | `--EXPR -> EXPR [150:41] + | | | | | | `--STRING_LITERAL -> "" [150:41] + | | | | | `--RPAREN -> ) [150:43] + | | | | `--SEMI -> ; [150:44] + | | | |--CASE_GROUP -> CASE_GROUP [151:10] + | | | | |--LITERAL_CASE -> case [151:10] + | | | | | |--EXPR -> EXPR [151:15] + | | | | | | `--NUM_INT -> 6 [151:15] + | | | | | `--COLON -> : [151:16] + | | | | `--SLIST -> SLIST [152:14] + | | | | `--LITERAL_CONTINUE -> continue [152:14] + | | | | `--SEMI -> ; [152:22] + | | | |--CASE_GROUP -> CASE_GROUP [153:10] + | | | | |--LITERAL_CASE -> case [153:10] + | | | | | |--EXPR -> EXPR [153:15] + | | | | | | `--NUM_INT -> 7 [153:15] + | | | | | `--COLON -> : [153:16] + | | | | `--SLIST -> SLIST [153:18] + | | | | `--SLIST -> { [153:18] + | | | | |--LITERAL_BREAK -> break [154:14] + | | | | | `--SEMI -> ; [154:19] + | | | | `--RCURLY -> } [155:10] + | | | |--CASE_GROUP -> CASE_GROUP [156:10] + | | | | |--LITERAL_CASE -> case [156:10] + | | | | | |--EXPR -> EXPR [156:15] + | | | | | | `--NUM_INT -> 8 [156:15] + | | | | | `--COLON -> : [156:16] + | | | | `--SLIST -> SLIST [156:18] + | | | | `--SLIST -> { [156:18] + | | | | |--LITERAL_RETURN -> return [157:14] + | | | | | `--SEMI -> ; [157:20] + | | | | `--RCURLY -> } [158:10] + | | | |--CASE_GROUP -> CASE_GROUP [159:10] + | | | | |--LITERAL_CASE -> case [159:10] + | | | | | |--EXPR -> EXPR [159:15] + | | | | | | `--NUM_INT -> 9 [159:15] + | | | | | `--COLON -> : [159:16] + | | | | `--SLIST -> SLIST [159:18] + | | | | `--SLIST -> { [159:18] + | | | | |--LITERAL_THROW -> throw [160:14] + | | | | | |--EXPR -> EXPR [160:20] + | | | | | | `--LITERAL_NEW -> new [160:20] + | | | | | | |--IDENT -> RuntimeException [160:24] + | | | | | | |--LPAREN -> ( [160:40] + | | | | | | |--ELIST -> ELIST [160:41] + | | | | | | | `--EXPR -> EXPR [160:41] + | | | | | | | `--STRING_LITERAL -> "" [160:41] + | | | | | | `--RPAREN -> ) [160:43] + | | | | | `--SEMI -> ; [160:44] + | | | | `--RCURLY -> } [161:10] + | | | |--CASE_GROUP -> CASE_GROUP [162:10] + | | | | |--LITERAL_CASE -> case [162:10] + | | | | | |--EXPR -> EXPR [162:15] + | | | | | | `--NUM_INT -> 10 [162:15] + | | | | | `--COLON -> : [162:17] + | | | | `--SLIST -> SLIST [162:19] + | | | | `--SLIST -> { [162:19] + | | | | |--LITERAL_CONTINUE -> continue [163:14] + | | | | | `--SEMI -> ; [163:22] + | | | | `--RCURLY -> } [164:10] + | | | |--CASE_GROUP -> CASE_GROUP [165:10] + | | | | |--LITERAL_CASE -> case [165:10] + | | | | | |--EXPR -> EXPR [165:15] + | | | | | | `--NUM_INT -> 11 [165:15] + | | | | | `--COLON -> : [165:17] + | | | | `--SLIST -> SLIST [165:19] + | | | | `--SLIST -> { [165:19] + | | | | |--EXPR -> EXPR [166:15] + | | | | | `--POST_INC -> ++ [166:15] + | | | | | `--IDENT -> i [166:14] + | | | | |--SEMI -> ; [166:17] + | | | | `--RCURLY -> } [167:10] + | | | |--CASE_GROUP -> CASE_GROUP [169:10] + | | | | |--LITERAL_CASE -> case [169:10] + | | | | | |--EXPR -> EXPR [169:15] + | | | | | | `--NUM_INT -> 12 [169:15] + | | | | | `--COLON -> : [169:17] + | | | | `--SLIST -> SLIST [170:14] + | | | | `--LITERAL_IF -> if [170:14] + | | | | |--LPAREN -> ( [170:17] + | | | | |--EXPR -> EXPR [170:18] + | | | | | `--LITERAL_FALSE -> false [170:18] + | | | | |--RPAREN -> ) [170:23] + | | | | |--LITERAL_BREAK -> break [171:18] + | | | | | `--SEMI -> ; [171:23] + | | | | `--LITERAL_ELSE -> else [172:14] + | | | | `--LITERAL_BREAK -> break [173:18] + | | | | `--SEMI -> ; [173:23] + | | | |--CASE_GROUP -> CASE_GROUP [174:10] + | | | | |--LITERAL_CASE -> case [174:10] + | | | | | |--EXPR -> EXPR [174:15] + | | | | | | `--NUM_INT -> 13 [174:15] + | | | | | `--COLON -> : [174:17] + | | | | `--SLIST -> SLIST [175:14] + | | | | `--LITERAL_IF -> if [175:14] + | | | | |--LPAREN -> ( [175:17] + | | | | |--EXPR -> EXPR [175:18] + | | | | | `--LITERAL_TRUE -> true [175:18] + | | | | |--RPAREN -> ) [175:22] + | | | | `--SLIST -> { [175:24] + | | | | |--LITERAL_RETURN -> return [176:18] + | | | | | `--SEMI -> ; [176:24] + | | | | `--RCURLY -> } [177:14] + | | | |--CASE_GROUP -> CASE_GROUP [178:10] + | | | | |--LITERAL_CASE -> case [178:10] + | | | | | |--EXPR -> EXPR [178:15] + | | | | | | `--NUM_INT -> 14 [178:15] + | | | | | `--COLON -> : [178:17] + | | | | `--SLIST -> SLIST [179:14] + | | | | `--LITERAL_IF -> if [179:14] + | | | | |--LPAREN -> ( [179:17] + | | | | |--EXPR -> EXPR [179:18] + | | | | | `--LITERAL_TRUE -> true [179:18] + | | | | |--RPAREN -> ) [179:22] + | | | | |--SLIST -> { [179:24] + | | | | | |--LITERAL_RETURN -> return [180:18] + | | | | | | `--SEMI -> ; [180:24] + | | | | | `--RCURLY -> } [181:14] + | | | | `--LITERAL_ELSE -> else [181:16] + | | | | `--SLIST -> { [181:21] + | | | | `--RCURLY -> } [183:14] + | | | |--CASE_GROUP -> CASE_GROUP [185:10] + | | | | |--LITERAL_CASE -> case [185:10] + | | | | | |--EXPR -> EXPR [185:15] + | | | | | | `--NUM_INT -> 15 [185:15] + | | | | | `--COLON -> : [185:17] + | | | | `--SLIST -> SLIST [186:14] + | | | | `--LITERAL_DO -> do [186:14] + | | | | |--SLIST -> { [186:17] + | | | | | |--EXPR -> EXPR [187:41] + | | | | | | `--METHOD_CALL -> ( [187:41] + | | | | | | |--DOT -> . [187:24] + | | | | | | | |--IDENT -> System [187:18] + | | | | | | | `--IDENT -> identityHashCode [187:25] + | | | | | | |--ELIST -> ELIST [187:42] + | | | | | | | `--EXPR -> EXPR [187:42] + | | | | | | | `--STRING_LITERAL -> "something" [187:42] + | | | | | | `--RPAREN -> ) [187:53] + | | | | | |--SEMI -> ; [187:54] + | | | | | |--LITERAL_RETURN -> return [188:18] + | | | | | | `--SEMI -> ; [188:24] + | | | | | `--RCURLY -> } [189:14] + | | | | |--DO_WHILE -> while [189:16] + | | | | |--LPAREN -> ( [189:21] + | | | | |--EXPR -> EXPR [189:22] + | | | | | `--LITERAL_TRUE -> true [189:22] + | | | | |--RPAREN -> ) [189:26] + | | | | `--SEMI -> ; [189:27] + | | | |--CASE_GROUP -> CASE_GROUP [190:10] + | | | | |--LITERAL_CASE -> case [190:10] + | | | | | |--EXPR -> EXPR [190:15] + | | | | | | `--NUM_INT -> 16 [190:15] + | | | | | `--COLON -> : [190:17] + | | | | `--SLIST -> SLIST [191:14] + | | | | `--LITERAL_FOR -> for [191:14] + | | | | |--LPAREN -> ( [191:18] + | | | | |--FOR_INIT -> FOR_INIT [191:19] + | | | | | `--VARIABLE_DEF -> VARIABLE_DEF [191:19] + | | | | | |--MODIFIERS -> MODIFIERS [191:19] + | | | | | |--TYPE -> TYPE [191:19] + | | | | | | `--LITERAL_INT -> int [191:19] + | | | | | |--IDENT -> j1 [191:23] + | | | | | `--ASSIGN -> = [191:26] + | | | | | `--EXPR -> EXPR [191:28] + | | | | | `--NUM_INT -> 0 [191:28] + | | | | |--SEMI -> ; [191:29] + | | | | |--FOR_CONDITION -> FOR_CONDITION [191:34] + | | | | | `--EXPR -> EXPR [191:34] + | | | | | `--LT -> < [191:34] + | | | | | |--IDENT -> j1 [191:31] + | | | | | `--NUM_INT -> 10 [191:36] + | | | | |--SEMI -> ; [191:38] + | | | | |--FOR_ITERATOR -> FOR_ITERATOR [191:42] + | | | | | `--ELIST -> ELIST [191:42] + | | | | | `--EXPR -> EXPR [191:42] + | | | | | `--POST_INC -> ++ [191:42] + | | | | | `--IDENT -> j1 [191:40] + | | | | |--RPAREN -> ) [191:44] + | | | | `--SLIST -> { [191:46] + | | | | |--EXPR -> EXPR [192:32] + | | | | | `--METHOD_CALL -> ( [192:32] + | | | | | |--DOT -> . [192:24] + | | | | | | |--IDENT -> String [192:18] + | | | | | | `--IDENT -> valueOf [192:25] + | | | | | |--ELIST -> ELIST [192:33] + | | | | | | `--EXPR -> EXPR [192:33] + | | | | | | `--STRING_LITERAL -> "something" [192:33] + | | | | | `--RPAREN -> ) [192:44] + | | | | |--SEMI -> ; [192:45] + | | | | |--LITERAL_RETURN -> return [193:18] + | | | | | `--SEMI -> ; [193:24] + | | | | `--RCURLY -> } [194:14] + | | | |--CASE_GROUP -> CASE_GROUP [195:10] + | | | | |--LITERAL_CASE -> case [195:10] + | | | | | |--EXPR -> EXPR [195:15] + | | | | | | `--NUM_INT -> 17 [195:15] + | | | | | `--COLON -> : [195:17] + | | | | `--SLIST -> SLIST [196:14] + | | | | `--LITERAL_WHILE -> while [196:14] + | | | | |--LPAREN -> ( [196:20] + | | | | |--EXPR -> EXPR [196:21] + | | | | | `--IDENT -> cond [196:21] + | | | | |--RPAREN -> ) [196:25] + | | | | `--LITERAL_THROW -> throw [197:18] + | | | | |--EXPR -> EXPR [197:24] + | | | | | `--LITERAL_NEW -> new [197:24] + | | | | | |--IDENT -> RuntimeException [197:28] + | | | | | |--LPAREN -> ( [197:44] + | | | | | |--ELIST -> ELIST [197:45] + | | | | | | `--EXPR -> EXPR [197:45] + | | | | | | `--STRING_LITERAL -> "" [197:45] + | | | | | `--RPAREN -> ) [197:47] + | | | | `--SEMI -> ; [197:48] + | | | |--CASE_GROUP -> CASE_GROUP [198:10] + | | | | |--LITERAL_CASE -> case [198:10] + | | | | | |--EXPR -> EXPR [198:15] + | | | | | | `--NUM_INT -> 18 [198:15] + | | | | | `--COLON -> : [198:17] + | | | | `--SLIST -> SLIST [199:14] + | | | | `--LITERAL_WHILE -> while [199:14] + | | | | |--LPAREN -> ( [199:19] + | | | | |--EXPR -> EXPR [199:20] + | | | | | `--IDENT -> cond [199:20] + | | | | |--RPAREN -> ) [199:24] + | | | | `--SLIST -> { [199:26] + | | | | |--LITERAL_BREAK -> break [200:18] + | | | | | `--SEMI -> ; [200:23] + | | | | `--RCURLY -> } [201:14] + | | | |--CASE_GROUP -> CASE_GROUP [203:10] + | | | | |--LITERAL_CASE -> case [203:10] + | | | | | |--EXPR -> EXPR [203:15] + | | | | | | `--NUM_INT -> 19 [203:15] + | | | | | `--COLON -> : [203:17] + | | | | `--SLIST -> SLIST [204:14] + | | | | `--LITERAL_TRY -> try [204:14] + | | | | |--SLIST -> { [204:18] + | | | | | |--EXPR -> EXPR [205:19] + | | | | | | `--POST_INC -> ++ [205:19] + | | | | | | `--IDENT -> i [205:18] + | | | | | |--SEMI -> ; [205:21] + | | | | | |--LITERAL_BREAK -> break [206:18] + | | | | | | `--SEMI -> ; [206:23] + | | | | | `--RCURLY -> } [207:14] + | | | | |--LITERAL_CATCH -> catch [207:16] + | | | | | |--LPAREN -> ( [207:22] + | | | | | |--PARAMETER_DEF -> PARAMETER_DEF [207:23] + | | | | | | |--MODIFIERS -> MODIFIERS [207:23] + | | | | | | |--TYPE -> TYPE [207:23] + | | | | | | | `--IDENT -> RuntimeException [207:23] + | | | | | | `--IDENT -> e [207:40] + | | | | | |--RPAREN -> ) [207:41] + | | | | | `--SLIST -> { [207:43] + | | | | | |--LITERAL_BREAK -> break [208:18] + | | | | | | `--SEMI -> ; [208:23] + | | | | | `--RCURLY -> } [209:14] + | | | | `--LITERAL_CATCH -> catch [209:16] + | | | | |--LPAREN -> ( [209:22] + | | | | |--PARAMETER_DEF -> PARAMETER_DEF [209:23] + | | | | | |--MODIFIERS -> MODIFIERS [209:23] + | | | | | |--TYPE -> TYPE [209:23] + | | | | | | `--IDENT -> Error [209:23] + | | | | | `--IDENT -> e [209:29] + | | | | |--RPAREN -> ) [209:30] + | | | | `--SLIST -> { [209:32] + | | | | |--LITERAL_RETURN -> return [210:18] + | | | | | `--SEMI -> ; [210:24] + | | | | `--RCURLY -> } [211:14] + | | | |--CASE_GROUP -> CASE_GROUP [212:10] + | | | | |--LITERAL_CASE -> case [212:10] + | | | | | |--EXPR -> EXPR [212:15] + | | | | | | `--NUM_INT -> 20 [212:15] + | | | | | `--COLON -> : [212:17] + | | | | `--SLIST -> SLIST [213:14] + | | | | `--LITERAL_TRY -> try [213:14] + | | | | |--SLIST -> { [213:18] + | | | | | |--EXPR -> EXPR [214:19] + | | | | | | `--POST_INC -> ++ [214:19] + | | | | | | `--IDENT -> i [214:18] + | | | | | |--SEMI -> ; [214:21] + | | | | | |--LITERAL_BREAK -> break [215:18] + | | | | | | `--SEMI -> ; [215:23] + | | | | | `--RCURLY -> } [216:14] + | | | | |--LITERAL_CATCH -> catch [216:16] + | | | | | |--LPAREN -> ( [216:22] + | | | | | |--PARAMETER_DEF -> PARAMETER_DEF [216:23] + | | | | | | |--MODIFIERS -> MODIFIERS [216:23] + | | | | | | |--TYPE -> TYPE [216:23] + | | | | | | | `--IDENT -> RuntimeException [216:23] + | | | | | | `--IDENT -> e [216:40] + | | | | | |--RPAREN -> ) [216:41] + | | | | | `--SLIST -> { [216:43] + | | | | | `--RCURLY -> } [217:14] + | | | | `--LITERAL_CATCH -> catch [217:16] + | | | | |--LPAREN -> ( [217:22] + | | | | |--PARAMETER_DEF -> PARAMETER_DEF [217:23] + | | | | | |--MODIFIERS -> MODIFIERS [217:23] + | | | | | |--TYPE -> TYPE [217:23] + | | | | | | `--IDENT -> Error [217:23] + | | | | | `--IDENT -> e [217:29] + | | | | |--RPAREN -> ) [217:30] + | | | | `--SLIST -> { [217:32] + | | | | |--LITERAL_RETURN -> return [218:18] + | | | | | `--SEMI -> ; [218:24] + | | | | `--RCURLY -> } [219:14] + | | | |--CASE_GROUP -> CASE_GROUP [221:10] + | | | | |--LITERAL_CASE -> case [221:10] + | | | | | |--EXPR -> EXPR [221:15] + | | | | | | `--NUM_INT -> 21 [221:15] + | | | | | `--COLON -> : [221:17] + | | | | `--SLIST -> SLIST [222:14] + | | | | `--LITERAL_TRY -> try [222:14] + | | | | |--SLIST -> { [222:18] + | | | | | |--EXPR -> EXPR [223:19] + | | | | | | `--POST_INC -> ++ [223:19] + | | | | | | `--IDENT -> i [223:18] + | | | | | |--SEMI -> ; [223:21] + | | | | | `--RCURLY -> } [224:14] + | | | | |--LITERAL_CATCH -> catch [224:16] + | | | | | |--LPAREN -> ( [224:22] + | | | | | |--PARAMETER_DEF -> PARAMETER_DEF [224:23] + | | | | | | |--MODIFIERS -> MODIFIERS [224:23] + | | | | | | |--TYPE -> TYPE [224:23] + | | | | | | | `--IDENT -> RuntimeException [224:23] + | | | | | | `--IDENT -> e [224:40] + | | | | | |--RPAREN -> ) [224:41] + | | | | | `--SLIST -> { [224:43] + | | | | | |--EXPR -> EXPR [225:19] + | | | | | | `--POST_DEC -> -- [225:19] + | | | | | | `--IDENT -> i [225:18] + | | | | | |--SEMI -> ; [225:21] + | | | | | `--RCURLY -> } [226:14] + | | | | `--LITERAL_FINALLY -> finally [226:16] + | | | | `--SLIST -> { [226:24] + | | | | |--LITERAL_BREAK -> break [227:18] + | | | | | `--SEMI -> ; [227:23] + | | | | `--RCURLY -> } [228:14] + | | | |--CASE_GROUP -> CASE_GROUP [229:10] + | | | | |--LITERAL_CASE -> case [229:10] + | | | | | |--EXPR -> EXPR [229:15] + | | | | | | `--NUM_INT -> 22 [229:15] + | | | | | `--COLON -> : [229:17] + | | | | `--SLIST -> SLIST [230:14] + | | | | `--LITERAL_TRY -> try [230:14] + | | | | |--SLIST -> { [230:18] + | | | | | |--EXPR -> EXPR [231:19] + | | | | | | `--POST_INC -> ++ [231:19] + | | | | | | `--IDENT -> i [231:18] + | | | | | |--SEMI -> ; [231:21] + | | | | | |--LITERAL_BREAK -> break [232:18] + | | | | | | `--SEMI -> ; [232:23] + | | | | | `--RCURLY -> } [233:14] + | | | | |--LITERAL_CATCH -> catch [233:16] + | | | | | |--LPAREN -> ( [233:22] + | | | | | |--PARAMETER_DEF -> PARAMETER_DEF [233:23] + | | | | | | |--MODIFIERS -> MODIFIERS [233:23] + | | | | | | |--TYPE -> TYPE [233:23] + | | | | | | | `--IDENT -> RuntimeException [233:23] + | | | | | | `--IDENT -> e [233:40] + | | | | | |--RPAREN -> ) [233:41] + | | | | | `--SLIST -> { [233:43] + | | | | | |--EXPR -> EXPR [234:19] + | | | | | | `--POST_DEC -> -- [234:19] + | | | | | | `--IDENT -> i [234:18] + | | | | | |--SEMI -> ; [234:21] + | | | | | |--LITERAL_BREAK -> break [235:18] + | | | | | | `--SEMI -> ; [235:23] + | | | | | `--RCURLY -> } [236:14] + | | | | `--LITERAL_FINALLY -> finally [236:16] + | | | | `--SLIST -> { [236:24] + | | | | |--EXPR -> EXPR [237:19] + | | | | | `--POST_INC -> ++ [237:19] + | | | | | `--IDENT -> i [237:18] + | | | | |--SEMI -> ; [237:21] + | | | | `--RCURLY -> } [238:14] + | | | |--CASE_GROUP -> CASE_GROUP [240:10] + | | | | |--LITERAL_CASE -> case [240:10] + | | | | | |--EXPR -> EXPR [240:15] + | | | | | | `--NUM_INT -> 23 [240:15] + | | | | | `--COLON -> : [240:17] + | | | | `--SLIST -> SLIST [241:14] + | | | | `--LITERAL_SWITCH -> switch [241:14] + | | | | |--LPAREN -> ( [241:21] + | | | | |--EXPR -> EXPR [241:22] + | | | | | `--IDENT -> j [241:22] + | | | | |--RPAREN -> ) [241:23] + | | | | |--LCURLY -> { [241:25] + | | | | |--CASE_GROUP -> CASE_GROUP [242:14] + | | | | | |--LITERAL_CASE -> case [242:14] + | | | | | | |--EXPR -> EXPR [242:19] + | | | | | | | `--NUM_INT -> 1 [242:19] + | | | | | | `--COLON -> : [242:20] + | | | | | `--SLIST -> SLIST [243:18] + | | | | | `--LITERAL_CONTINUE -> continue [243:18] + | | | | | `--SEMI -> ; [243:26] + | | | | |--CASE_GROUP -> CASE_GROUP [244:14] + | | | | | |--LITERAL_CASE -> case [244:14] + | | | | | | |--EXPR -> EXPR [244:19] + | | | | | | | `--NUM_INT -> 2 [244:19] + | | | | | | `--COLON -> : [244:20] + | | | | | `--SLIST -> SLIST [245:18] + | | | | | `--LITERAL_RETURN -> return [245:18] + | | | | | `--SEMI -> ; [245:24] + | | | | |--CASE_GROUP -> CASE_GROUP [246:14] + | | | | | |--LITERAL_DEFAULT -> default [246:14] + | | | | | | `--COLON -> : [246:21] + | | | | | `--SLIST -> SLIST [247:18] + | | | | | `--LITERAL_RETURN -> return [247:18] + | | | | | `--SEMI -> ; [247:24] + | | | | `--RCURLY -> } [248:14] + | | | |--CASE_GROUP -> CASE_GROUP [249:10] + | | | | |--LITERAL_CASE -> case [249:10] + | | | | | |--EXPR -> EXPR [249:15] + | | | | | | `--NUM_INT -> 24 [249:15] + | | | | | `--COLON -> : [249:17] + | | | | `--SLIST -> SLIST [250:15] + | | | | |--EXPR -> EXPR [250:15] + | | | | | `--POST_INC -> ++ [250:15] + | | | | | `--IDENT -> i [250:14] + | | | | `--SEMI -> ; [250:17] + | | | |--CASE_GROUP -> CASE_GROUP [251:25] + | | | | |--LITERAL_CASE -> case [251:25] + | | | | | |--EXPR -> EXPR [251:30] + | | | | | | `--NUM_INT -> 25 [251:30] + | | | | | `--COLON -> : [251:32] + | | | | `--SLIST -> SLIST [252:15] + | | | | |--EXPR -> EXPR [252:15] + | | | | | `--POST_INC -> ++ [252:15] + | | | | | `--IDENT -> i [252:14] + | | | | |--SEMI -> ; [252:17] + | | | | `--LITERAL_BREAK -> break [253:14] + | | | | `--SEMI -> ; [253:19] + | | | |--CASE_GROUP -> CASE_GROUP [255:10] + | | | | |--LITERAL_CASE -> case [255:10] + | | | | | |--EXPR -> EXPR [255:15] + | | | | | | `--NUM_INT -> 26 [255:15] + | | | | | `--COLON -> : [255:17] + | | | | `--SLIST -> SLIST [256:14] + | | | | `--LITERAL_SWITCH -> switch [256:14] + | | | | |--LPAREN -> ( [256:21] + | | | | |--EXPR -> EXPR [256:22] + | | | | | `--IDENT -> j [256:22] + | | | | |--RPAREN -> ) [256:23] + | | | | |--LCURLY -> { [256:25] + | | | | |--CASE_GROUP -> CASE_GROUP [257:14] + | | | | | |--LITERAL_CASE -> case [257:14] + | | | | | | |--EXPR -> EXPR [257:19] + | | | | | | | `--NUM_INT -> 1 [257:19] + | | | | | | `--COLON -> : [257:20] + | | | | | `--SLIST -> SLIST [258:18] + | | | | | `--LITERAL_CONTINUE -> continue [258:18] + | | | | | `--SEMI -> ; [258:26] + | | | | |--CASE_GROUP -> CASE_GROUP [259:14] + | | | | | |--LITERAL_CASE -> case [259:14] + | | | | | | |--EXPR -> EXPR [259:19] + | | | | | | | `--NUM_INT -> 2 [259:19] + | | | | | | `--COLON -> : [259:20] + | | | | | `--SLIST -> SLIST [260:18] + | | | | | `--LITERAL_BREAK -> break [260:18] + | | | | | `--SEMI -> ; [260:23] + | | | | |--CASE_GROUP -> CASE_GROUP [261:14] + | | | | | |--LITERAL_DEFAULT -> default [261:14] + | | | | | | `--COLON -> : [261:21] + | | | | | `--SLIST -> SLIST [262:18] + | | | | | `--LITERAL_RETURN -> return [262:18] + | | | | | `--SEMI -> ; [262:24] + | | | | `--RCURLY -> } [263:14] + | | | |--CASE_GROUP -> CASE_GROUP [265:10] + | | | | |--LITERAL_DEFAULT -> default [265:10] + | | | | | `--COLON -> : [265:17] + | | | | `--SLIST -> SLIST [267:15] + | | | | |--EXPR -> EXPR [267:15] + | | | | | `--POST_INC -> ++ [267:15] + | | | | | `--IDENT -> i [267:14] + | | | | `--SEMI -> ; [267:17] + | | | `--RCURLY -> } [269:9] + | | `--RCURLY -> } [270:6] + | `--RCURLY -> } [271:3] + |--METHOD_DEF -> METHOD_DEF [274:3] + | |--MODIFIERS -> MODIFIERS [274:3] + | |--TYPE -> TYPE [274:3] + | | `--LITERAL_VOID -> void [274:3] + | |--IDENT -> methodFallThruCC [274:8] + | |--LPAREN -> ( [274:24] + | |--PARAMETERS -> PARAMETERS [274:25] + | | |--PARAMETER_DEF -> PARAMETER_DEF [274:25] + | | | |--MODIFIERS -> MODIFIERS [274:25] + | | | |--TYPE -> TYPE [274:25] + | | | | `--LITERAL_INT -> int [274:25] + | | | `--IDENT -> i [274:29] + | | |--COMMA -> , [274:30] + | | |--PARAMETER_DEF -> PARAMETER_DEF [274:32] + | | | |--MODIFIERS -> MODIFIERS [274:32] + | | | |--TYPE -> TYPE [274:32] + | | | | `--LITERAL_INT -> int [274:32] + | | | `--IDENT -> j [274:36] + | | |--COMMA -> , [274:37] + | | `--PARAMETER_DEF -> PARAMETER_DEF [274:39] + | | |--MODIFIERS -> MODIFIERS [274:39] + | | |--TYPE -> TYPE [274:39] + | | | `--LITERAL_BOOLEAN -> boolean [274:39] + | | `--IDENT -> cond [274:47] + | |--RPAREN -> ) [274:51] + | `--SLIST -> { [274:53] + | |--LITERAL_WHILE -> while [275:6] + | | |--LPAREN -> ( [275:12] + | | |--EXPR -> EXPR [275:13] + | | | `--LITERAL_TRUE -> true [275:13] + | | |--RPAREN -> ) [275:17] + | | `--SLIST -> { [275:19] + | | |--LITERAL_SWITCH -> switch [276:10] + | | | |--LPAREN -> ( [276:17] + | | | |--EXPR -> EXPR [276:18] + | | | | `--IDENT -> i [276:18] + | | | |--RPAREN -> ) [276:19] + | | | |--LCURLY -> { [276:20] + | | | |--CASE_GROUP -> CASE_GROUP [277:10] + | | | | |--LITERAL_CASE -> case [277:10] + | | | | | |--EXPR -> EXPR [277:15] + | | | | | | `--NUM_INT -> 0 [277:15] + | | | | | `--COLON -> : [277:16] + | | | | `--SLIST -> SLIST [278:15] + | | | | |--EXPR -> EXPR [278:15] + | | | | | `--POST_INC -> ++ [278:15] + | | | | | `--IDENT -> i [278:14] + | | | | `--SEMI -> ; [278:17] + | | | |--CASE_GROUP -> CASE_GROUP [280:10] + | | | | |--LITERAL_CASE -> case [280:10] + | | | | | |--EXPR -> EXPR [280:15] + | | | | | | `--NUM_INT -> 1 [280:15] + | | | | | `--COLON -> : [280:16] + | | | | `--SLIST -> SLIST [281:15] + | | | | |--EXPR -> EXPR [281:15] + | | | | | `--POST_INC -> ++ [281:15] + | | | | | `--IDENT -> i [281:14] + | | | | `--SEMI -> ; [281:17] + | | | |--CASE_GROUP -> CASE_GROUP [283:10] + | | | | |--LITERAL_CASE -> case [283:10] + | | | | | |--EXPR -> EXPR [283:15] + | | | | | | `--NUM_INT -> 2 [283:15] + | | | | | `--COLON -> : [283:16] + | | | | `--SLIST -> SLIST [283:18] + | | | | `--SLIST -> { [283:18] + | | | | |--EXPR -> EXPR [284:15] + | | | | | `--POST_INC -> ++ [284:15] + | | | | | `--IDENT -> i [284:14] + | | | | |--SEMI -> ; [284:17] + | | | | `--RCURLY -> } [285:10] + | | | |--CASE_GROUP -> CASE_GROUP [287:10] + | | | | |--LITERAL_CASE -> case [287:10] + | | | | | |--EXPR -> EXPR [287:15] + | | | | | | `--NUM_INT -> 3 [287:15] + | | | | | `--COLON -> : [287:16] + | | | | `--SLIST -> SLIST [288:15] + | | | | |--EXPR -> EXPR [288:15] + | | | | | `--POST_INC -> ++ [288:15] + | | | | | `--IDENT -> i [288:14] + | | | | `--SEMI -> ; [288:17] + | | | |--CASE_GROUP -> CASE_GROUP [289:24] + | | | | |--LITERAL_CASE -> case [289:24] + | | | | | |--EXPR -> EXPR [289:29] + | | | | | | `--NUM_INT -> 4 [289:29] + | | | | | `--COLON -> : [289:30] + | | | | `--SLIST -> SLIST [290:16] + | | | | `--LITERAL_BREAK -> break [290:16] + | | | | `--SEMI -> ; [290:21] + | | | |--CASE_GROUP -> CASE_GROUP [291:10] + | | | | |--LITERAL_CASE -> case [291:10] + | | | | | |--EXPR -> EXPR [291:15] + | | | | | | `--NUM_INT -> 5 [291:15] + | | | | | `--COLON -> : [291:16] + | | | | `--SLIST -> SLIST [292:15] + | | | | |--EXPR -> EXPR [292:15] + | | | | | `--POST_INC -> ++ [292:15] + | | | | | `--IDENT -> i [292:14] + | | | | `--SEMI -> ; [292:17] + | | | `--RCURLY -> } [294:10] + | | `--RCURLY -> } [295:6] + | `--RCURLY -> } [296:3] + |--METHOD_DEF -> METHOD_DEF [299:3] + | |--MODIFIERS -> MODIFIERS [299:3] + | |--TYPE -> TYPE [299:3] + | | `--LITERAL_VOID -> void [299:3] + | |--IDENT -> methodFallThruC [299:8] + | |--LPAREN -> ( [299:23] + | |--PARAMETERS -> PARAMETERS [299:24] + | | |--PARAMETER_DEF -> PARAMETER_DEF [299:24] + | | | |--MODIFIERS -> MODIFIERS [299:24] + | | | |--TYPE -> TYPE [299:24] + | | | | `--LITERAL_INT -> int [299:24] + | | | `--IDENT -> i [299:28] + | | |--COMMA -> , [299:29] + | | |--PARAMETER_DEF -> PARAMETER_DEF [299:31] + | | | |--MODIFIERS -> MODIFIERS [299:31] + | | | |--TYPE -> TYPE [299:31] + | | | | `--LITERAL_INT -> int [299:31] + | | | `--IDENT -> j [299:35] + | | |--COMMA -> , [299:36] + | | `--PARAMETER_DEF -> PARAMETER_DEF [299:38] + | | |--MODIFIERS -> MODIFIERS [299:38] + | | |--TYPE -> TYPE [299:38] + | | | `--LITERAL_BOOLEAN -> boolean [299:38] + | | `--IDENT -> cond [299:46] + | |--RPAREN -> ) [299:50] + | `--SLIST -> { [299:52] + | |--LITERAL_WHILE -> while [300:6] + | | |--LPAREN -> ( [300:12] + | | |--EXPR -> EXPR [300:13] + | | | `--LITERAL_TRUE -> true [300:13] + | | |--RPAREN -> ) [300:17] + | | `--SLIST -> { [300:19] + | | |--LITERAL_SWITCH -> switch [301:10] + | | | |--LPAREN -> ( [301:17] + | | | |--EXPR -> EXPR [301:18] + | | | | `--IDENT -> i [301:18] + | | | |--RPAREN -> ) [301:19] + | | | |--LCURLY -> { [301:20] + | | | |--CASE_GROUP -> CASE_GROUP [302:10] + | | | | |--LITERAL_CASE -> case [302:10] + | | | | | |--EXPR -> EXPR [302:15] + | | | | | | `--NUM_INT -> 0 [302:15] + | | | | | `--COLON -> : [302:16] + | | | | `--SLIST -> SLIST [303:15] + | | | | |--EXPR -> EXPR [303:15] + | | | | | `--POST_INC -> ++ [303:15] + | | | | | `--IDENT -> i [303:14] + | | | | `--SEMI -> ; [303:17] + | | | |--CASE_GROUP -> CASE_GROUP [305:10] + | | | | |--LITERAL_CASE -> case [305:10] + | | | | | |--EXPR -> EXPR [305:15] + | | | | | | `--NUM_INT -> 1 [305:15] + | | | | | `--COLON -> : [305:16] + | | | | `--SLIST -> SLIST [306:15] + | | | | |--EXPR -> EXPR [306:15] + | | | | | `--POST_INC -> ++ [306:15] + | | | | | `--IDENT -> i [306:14] + | | | | `--SEMI -> ; [306:17] + | | | |--CASE_GROUP -> CASE_GROUP [308:10] + | | | | |--LITERAL_CASE -> case [308:10] + | | | | | |--EXPR -> EXPR [308:15] + | | | | | | `--NUM_INT -> 2 [308:15] + | | | | | `--COLON -> : [308:16] + | | | | `--SLIST -> SLIST [309:15] + | | | | |--EXPR -> EXPR [309:15] + | | | | | `--POST_INC -> ++ [309:15] + | | | | | `--IDENT -> i [309:14] + | | | | `--SEMI -> ; [309:17] + | | | |--CASE_GROUP -> CASE_GROUP [310:24] + | | | | |--LITERAL_CASE -> case [310:24] + | | | | | |--EXPR -> EXPR [310:29] + | | | | | | `--NUM_INT -> 3 [310:29] + | | | | | `--COLON -> : [310:30] + | | | | `--SLIST -> SLIST [311:16] + | | | | `--LITERAL_BREAK -> break [311:16] + | | | | `--SEMI -> ; [311:21] + | | | |--CASE_GROUP -> CASE_GROUP [312:10] + | | | | |--LITERAL_CASE -> case [312:10] + | | | | | |--EXPR -> EXPR [312:15] + | | | | | | `--NUM_INT -> 4 [312:15] + | | | | | `--COLON -> : [312:16] + | | | | `--SLIST -> SLIST [313:15] + | | | | |--EXPR -> EXPR [313:15] + | | | | | `--POST_INC -> ++ [313:15] + | | | | | `--IDENT -> i [313:14] + | | | | `--SEMI -> ; [313:17] + | | | `--RCURLY -> } [315:10] + | | `--RCURLY -> } [316:6] + | `--RCURLY -> } [317:3] + |--METHOD_DEF -> METHOD_DEF [320:3] + | |--MODIFIERS -> MODIFIERS [320:3] + | |--TYPE -> TYPE [320:3] + | | `--LITERAL_VOID -> void [320:3] + | |--IDENT -> methodFallThruC2 [320:8] + | |--LPAREN -> ( [320:24] + | |--PARAMETERS -> PARAMETERS [320:25] + | | |--PARAMETER_DEF -> PARAMETER_DEF [320:25] + | | | |--MODIFIERS -> MODIFIERS [320:25] + | | | |--TYPE -> TYPE [320:25] + | | | | `--LITERAL_INT -> int [320:25] + | | | `--IDENT -> i [320:29] + | | |--COMMA -> , [320:30] + | | |--PARAMETER_DEF -> PARAMETER_DEF [320:32] + | | | |--MODIFIERS -> MODIFIERS [320:32] + | | | |--TYPE -> TYPE [320:32] + | | | | `--LITERAL_INT -> int [320:32] + | | | `--IDENT -> j [320:36] + | | |--COMMA -> , [320:37] + | | `--PARAMETER_DEF -> PARAMETER_DEF [320:39] + | | |--MODIFIERS -> MODIFIERS [320:39] + | | |--TYPE -> TYPE [320:39] + | | | `--LITERAL_BOOLEAN -> boolean [320:39] + | | `--IDENT -> cond [320:47] + | |--RPAREN -> ) [320:51] + | `--SLIST -> { [320:53] + | |--LITERAL_WHILE -> while [321:6] + | | |--LPAREN -> ( [321:12] + | | |--EXPR -> EXPR [321:13] + | | | `--LITERAL_TRUE -> true [321:13] + | | |--RPAREN -> ) [321:17] + | | `--SLIST -> { [321:19] + | | |--LITERAL_SWITCH -> switch [322:10] + | | | |--LPAREN -> ( [322:17] + | | | |--EXPR -> EXPR [322:18] + | | | | `--IDENT -> i [322:18] + | | | |--RPAREN -> ) [322:19] + | | | |--LCURLY -> { [322:20] + | | | |--CASE_GROUP -> CASE_GROUP [323:10] + | | | | |--LITERAL_CASE -> case [323:10] + | | | | | |--EXPR -> EXPR [323:15] + | | | | | | `--NUM_INT -> 0 [323:15] + | | | | | `--COLON -> : [323:16] + | | | | `--SLIST -> SLIST [324:15] + | | | | |--EXPR -> EXPR [324:15] + | | | | | `--POST_INC -> ++ [324:15] + | | | | | `--IDENT -> i [324:14] + | | | | `--SEMI -> ; [324:17] + | | | |--CASE_GROUP -> CASE_GROUP [326:10] + | | | | |--LITERAL_CASE -> case [326:10] + | | | | | |--EXPR -> EXPR [326:15] + | | | | | | `--NUM_INT -> 1 [326:15] + | | | | | `--COLON -> : [326:16] + | | | | `--SLIST -> SLIST [327:15] + | | | | |--EXPR -> EXPR [327:15] + | | | | | `--POST_INC -> ++ [327:15] + | | | | | `--IDENT -> i [327:14] + | | | | `--SEMI -> ; [327:17] + | | | |--CASE_GROUP -> CASE_GROUP [329:10] + | | | | |--LITERAL_CASE -> case [329:10] + | | | | | |--EXPR -> EXPR [329:15] + | | | | | | `--NUM_INT -> 2 [329:15] + | | | | | `--COLON -> : [329:16] + | | | | `--SLIST -> SLIST [330:15] + | | | | |--EXPR -> EXPR [330:15] + | | | | | `--POST_INC -> ++ [330:15] + | | | | | `--IDENT -> i [330:14] + | | | | `--SEMI -> ; [330:17] + | | | |--CASE_GROUP -> CASE_GROUP [331:22] + | | | | |--LITERAL_CASE -> case [331:22] + | | | | | |--EXPR -> EXPR [331:27] + | | | | | | `--NUM_INT -> 3 [331:27] + | | | | | `--COLON -> : [331:28] + | | | | `--SLIST -> SLIST [332:16] + | | | | `--LITERAL_BREAK -> break [332:16] + | | | | `--SEMI -> ; [332:21] + | | | |--CASE_GROUP -> CASE_GROUP [333:10] + | | | | |--LITERAL_CASE -> case [333:10] + | | | | | |--EXPR -> EXPR [333:15] + | | | | | | `--NUM_INT -> 4 [333:15] + | | | | | `--COLON -> : [333:16] + | | | | `--SLIST -> SLIST [334:15] + | | | | |--EXPR -> EXPR [334:15] + | | | | | `--POST_INC -> ++ [334:15] + | | | | | `--IDENT -> i [334:14] + | | | | `--SEMI -> ; [334:17] + | | | `--RCURLY -> } [336:10] + | | `--RCURLY -> } [337:6] + | `--RCURLY -> } [338:3] + |--METHOD_DEF -> METHOD_DEF [341:3] + | |--MODIFIERS -> MODIFIERS [341:3] + | |--TYPE -> TYPE [341:3] + | | `--LITERAL_VOID -> void [341:3] + | |--IDENT -> methodFallThruCOtherWords [341:8] + | |--LPAREN -> ( [341:33] + | |--PARAMETERS -> PARAMETERS [341:34] + | | |--PARAMETER_DEF -> PARAMETER_DEF [341:34] + | | | |--MODIFIERS -> MODIFIERS [341:34] + | | | |--TYPE -> TYPE [341:34] + | | | | `--LITERAL_INT -> int [341:34] + | | | `--IDENT -> i [341:38] + | | |--COMMA -> , [341:39] + | | |--PARAMETER_DEF -> PARAMETER_DEF [341:41] + | | | |--MODIFIERS -> MODIFIERS [341:41] + | | | |--TYPE -> TYPE [341:41] + | | | | `--LITERAL_INT -> int [341:41] + | | | `--IDENT -> j [341:45] + | | |--COMMA -> , [341:46] + | | `--PARAMETER_DEF -> PARAMETER_DEF [341:48] + | | |--MODIFIERS -> MODIFIERS [341:48] + | | |--TYPE -> TYPE [341:48] + | | | `--LITERAL_BOOLEAN -> boolean [341:48] + | | `--IDENT -> cond [341:56] + | |--RPAREN -> ) [341:60] + | `--SLIST -> { [341:62] + | |--LITERAL_WHILE -> while [342:6] + | | |--LPAREN -> ( [342:12] + | | |--EXPR -> EXPR [342:13] + | | | `--LITERAL_TRUE -> true [342:13] + | | |--RPAREN -> ) [342:17] + | | `--SLIST -> { [342:19] + | | |--LITERAL_SWITCH -> switch [343:10] + | | | |--LPAREN -> ( [343:17] + | | | |--EXPR -> EXPR [343:18] + | | | | `--IDENT -> i [343:18] + | | | |--RPAREN -> ) [343:19] + | | | |--LCURLY -> { [343:20] + | | | |--CASE_GROUP -> CASE_GROUP [344:10] + | | | | |--LITERAL_CASE -> case [344:10] + | | | | | |--EXPR -> EXPR [344:15] + | | | | | | `--NUM_INT -> 0 [344:15] + | | | | | `--COLON -> : [344:16] + | | | | `--SLIST -> SLIST [345:15] + | | | | |--EXPR -> EXPR [345:15] + | | | | | `--POST_INC -> ++ [345:15] + | | | | | `--IDENT -> i [345:14] + | | | | `--SEMI -> ; [345:17] + | | | |--CASE_GROUP -> CASE_GROUP [347:10] + | | | | |--LITERAL_CASE -> case [347:10] + | | | | | |--EXPR -> EXPR [347:15] + | | | | | | `--NUM_INT -> 1 [347:15] + | | | | | `--COLON -> : [347:16] + | | | | `--SLIST -> SLIST [348:15] + | | | | |--EXPR -> EXPR [348:15] + | | | | | `--POST_INC -> ++ [348:15] + | | | | | `--IDENT -> i [348:14] + | | | | `--SEMI -> ; [348:17] + | | | |--CASE_GROUP -> CASE_GROUP [350:10] + | | | | |--LITERAL_CASE -> case [350:10] + | | | | | |--EXPR -> EXPR [350:15] + | | | | | | `--NUM_INT -> 2 [350:15] + | | | | | `--COLON -> : [350:16] + | | | | `--SLIST -> SLIST [351:15] + | | | | |--EXPR -> EXPR [351:15] + | | | | | `--POST_INC -> ++ [351:15] + | | | | | `--IDENT -> i [351:14] + | | | | `--SEMI -> ; [351:17] + | | | |--CASE_GROUP -> CASE_GROUP [352:29] + | | | | |--LITERAL_CASE -> case [352:29] + | | | | | |--EXPR -> EXPR [352:34] + | | | | | | `--NUM_INT -> 3 [352:34] + | | | | | `--COLON -> : [352:35] + | | | | `--SLIST -> SLIST [353:16] + | | | | `--LITERAL_BREAK -> break [353:16] + | | | | `--SEMI -> ; [353:21] + | | | |--CASE_GROUP -> CASE_GROUP [354:10] + | | | | |--LITERAL_CASE -> case [354:10] + | | | | | |--EXPR -> EXPR [354:15] + | | | | | | `--NUM_INT -> 4 [354:15] + | | | | | `--COLON -> : [354:16] + | | | | `--SLIST -> SLIST [355:15] + | | | | |--EXPR -> EXPR [355:15] + | | | | | `--POST_INC -> ++ [355:15] + | | | | | `--IDENT -> i [355:14] + | | | | `--SEMI -> ; [355:17] + | | | `--RCURLY -> } [357:10] + | | `--RCURLY -> } [358:6] + | `--RCURLY -> } [359:3] + |--METHOD_DEF -> METHOD_DEF [362:3] + | |--MODIFIERS -> MODIFIERS [362:3] + | |--TYPE -> TYPE [362:3] + | | `--LITERAL_VOID -> void [362:3] + | |--IDENT -> methodFallThruCCustomWords [362:8] + | |--LPAREN -> ( [362:34] + | |--PARAMETERS -> PARAMETERS [362:35] + | | |--PARAMETER_DEF -> PARAMETER_DEF [362:35] + | | | |--MODIFIERS -> MODIFIERS [362:35] + | | | |--TYPE -> TYPE [362:35] + | | | | `--LITERAL_INT -> int [362:35] + | | | `--IDENT -> i [362:39] + | | |--COMMA -> , [362:40] + | | |--PARAMETER_DEF -> PARAMETER_DEF [362:42] + | | | |--MODIFIERS -> MODIFIERS [362:42] + | | | |--TYPE -> TYPE [362:42] + | | | | `--LITERAL_INT -> int [362:42] + | | | `--IDENT -> j [362:46] + | | |--COMMA -> , [362:47] + | | `--PARAMETER_DEF -> PARAMETER_DEF [362:49] + | | |--MODIFIERS -> MODIFIERS [362:49] + | | |--TYPE -> TYPE [362:49] + | | | `--LITERAL_BOOLEAN -> boolean [362:49] + | | `--IDENT -> cond [362:57] + | |--RPAREN -> ) [362:61] + | `--SLIST -> { [362:63] + | |--LITERAL_WHILE -> while [363:6] + | | |--LPAREN -> ( [363:12] + | | |--EXPR -> EXPR [363:13] + | | | `--LITERAL_TRUE -> true [363:13] + | | |--RPAREN -> ) [363:17] + | | `--SLIST -> { [363:19] + | | |--LITERAL_SWITCH -> switch [364:10] + | | | |--LPAREN -> ( [364:17] + | | | |--EXPR -> EXPR [364:18] + | | | | `--IDENT -> i [364:18] + | | | |--RPAREN -> ) [364:19] + | | | |--LCURLY -> { [364:20] + | | | |--CASE_GROUP -> CASE_GROUP [365:10] + | | | | |--LITERAL_CASE -> case [365:10] + | | | | | |--EXPR -> EXPR [365:15] + | | | | | | `--NUM_INT -> 0 [365:15] + | | | | | `--COLON -> : [365:16] + | | | | `--SLIST -> SLIST [366:15] + | | | | |--EXPR -> EXPR [366:15] + | | | | | `--POST_INC -> ++ [366:15] + | | | | | `--IDENT -> i [366:14] + | | | | `--SEMI -> ; [366:17] + | | | |--CASE_GROUP -> CASE_GROUP [368:10] + | | | | |--LITERAL_CASE -> case [368:10] + | | | | | |--EXPR -> EXPR [368:15] + | | | | | | `--NUM_INT -> 1 [368:15] + | | | | | `--COLON -> : [368:16] + | | | | `--SLIST -> SLIST [369:15] + | | | | |--EXPR -> EXPR [369:15] + | | | | | `--POST_INC -> ++ [369:15] + | | | | | `--IDENT -> i [369:14] + | | | | `--SEMI -> ; [369:17] + | | | |--CASE_GROUP -> CASE_GROUP [371:10] + | | | | |--LITERAL_CASE -> case [371:10] + | | | | | |--EXPR -> EXPR [371:15] + | | | | | | `--NUM_INT -> 2 [371:15] + | | | | | `--COLON -> : [371:16] + | | | | `--SLIST -> SLIST [372:15] + | | | | |--EXPR -> EXPR [372:15] + | | | | | `--POST_INC -> ++ [372:15] + | | | | | `--IDENT -> i [372:14] + | | | | `--SEMI -> ; [372:17] + | | | |--CASE_GROUP -> CASE_GROUP [373:39] + | | | | |--LITERAL_CASE -> case [373:39] + | | | | | |--EXPR -> EXPR [373:44] + | | | | | | `--NUM_INT -> 3 [373:44] + | | | | | `--COLON -> : [373:45] + | | | | `--SLIST -> SLIST [374:16] + | | | | `--LITERAL_BREAK -> break [374:16] + | | | | `--SEMI -> ; [374:21] + | | | |--CASE_GROUP -> CASE_GROUP [375:10] + | | | | |--LITERAL_CASE -> case [375:10] + | | | | | |--EXPR -> EXPR [375:15] + | | | | | | `--NUM_INT -> 4 [375:15] + | | | | | `--COLON -> : [375:16] + | | | | `--SLIST -> SLIST [376:15] + | | | | |--EXPR -> EXPR [376:15] + | | | | | `--POST_INC -> ++ [376:15] + | | | | | `--IDENT -> i [376:14] + | | | | `--SEMI -> ; [376:17] + | | | `--RCURLY -> } [378:10] + | | `--RCURLY -> } [379:6] + | `--RCURLY -> } [380:3] + |--METHOD_DEF -> METHOD_DEF [382:3] + | |--MODIFIERS -> MODIFIERS [382:3] + | |--TYPE -> TYPE [382:3] + | | `--LITERAL_VOID -> void [382:3] + | |--IDENT -> methodFallThruLastCaseGroup [382:8] + | |--LPAREN -> ( [382:35] + | |--PARAMETERS -> PARAMETERS [382:36] + | | |--PARAMETER_DEF -> PARAMETER_DEF [382:36] + | | | |--MODIFIERS -> MODIFIERS [382:36] + | | | |--TYPE -> TYPE [382:36] + | | | | `--LITERAL_INT -> int [382:36] + | | | `--IDENT -> i [382:40] + | | |--COMMA -> , [382:41] + | | |--PARAMETER_DEF -> PARAMETER_DEF [382:43] + | | | |--MODIFIERS -> MODIFIERS [382:43] + | | | |--TYPE -> TYPE [382:43] + | | | | `--LITERAL_INT -> int [382:43] + | | | `--IDENT -> j [382:47] + | | |--COMMA -> , [382:48] + | | `--PARAMETER_DEF -> PARAMETER_DEF [382:50] + | | |--MODIFIERS -> MODIFIERS [382:50] + | | |--TYPE -> TYPE [382:50] + | | | `--LITERAL_BOOLEAN -> boolean [382:50] + | | `--IDENT -> cond [382:58] + | |--RPAREN -> ) [382:62] + | `--SLIST -> { [382:64] + | |--LITERAL_WHILE -> while [383:7] + | | |--LPAREN -> ( [383:13] + | | |--EXPR -> EXPR [383:14] + | | | `--LITERAL_TRUE -> true [383:14] + | | |--RPAREN -> ) [383:18] + | | `--SLIST -> { [383:20] + | | |--LITERAL_SWITCH -> switch [384:11] + | | | |--LPAREN -> ( [384:18] + | | | |--EXPR -> EXPR [384:19] + | | | | `--IDENT -> i [384:19] + | | | |--RPAREN -> ) [384:20] + | | | |--LCURLY -> { [384:21] + | | | |--CASE_GROUP -> CASE_GROUP [385:11] + | | | | |--LITERAL_CASE -> case [385:11] + | | | | | |--EXPR -> EXPR [385:16] + | | | | | | `--NUM_INT -> 0 [385:16] + | | | | | `--COLON -> : [385:17] + | | | | `--SLIST -> SLIST [386:16] + | | | | |--EXPR -> EXPR [386:16] + | | | | | `--POST_INC -> ++ [386:16] + | | | | | `--IDENT -> i [386:15] + | | | | `--SEMI -> ; [386:18] + | | | `--RCURLY -> } [387:11] + | | |--LITERAL_SWITCH -> switch [388:11] + | | | |--LPAREN -> ( [388:18] + | | | |--EXPR -> EXPR [388:19] + | | | | `--IDENT -> i [388:19] + | | | |--RPAREN -> ) [388:20] + | | | |--LCURLY -> { [388:21] + | | | |--CASE_GROUP -> CASE_GROUP [389:11] + | | | | |--LITERAL_CASE -> case [389:11] + | | | | | |--EXPR -> EXPR [389:16] + | | | | | | `--NUM_INT -> 0 [389:16] + | | | | | `--COLON -> : [389:17] + | | | | `--SLIST -> SLIST [390:16] + | | | | |--EXPR -> EXPR [390:16] + | | | | | `--POST_INC -> ++ [390:16] + | | | | | `--IDENT -> i [390:15] + | | | | `--SEMI -> ; [390:18] + | | | `--RCURLY -> } [392:11] + | | |--LITERAL_SWITCH -> switch [393:11] + | | | |--LPAREN -> ( [393:18] + | | | |--EXPR -> EXPR [393:19] + | | | | `--IDENT -> i [393:19] + | | | |--RPAREN -> ) [393:20] + | | | |--LCURLY -> { [393:21] + | | | |--CASE_GROUP -> CASE_GROUP [394:11] + | | | | |--LITERAL_CASE -> case [394:11] + | | | | | |--EXPR -> EXPR [394:16] + | | | | | | `--NUM_INT -> 0 [394:16] + | | | | | `--COLON -> : [394:17] + | | | | `--SLIST -> SLIST [395:16] + | | | | |--EXPR -> EXPR [395:16] + | | | | | `--POST_INC -> ++ [395:16] + | | | | | `--IDENT -> i [395:15] + | | | | `--SEMI -> ; [395:18] + | | | `--RCURLY -> } [396:26] + | | `--RCURLY -> } [397:7] + | `--RCURLY -> } [398:4] + |--METHOD_DEF -> METHOD_DEF [400:4] + | |--MODIFIERS -> MODIFIERS [400:4] + | |--TYPE -> TYPE [400:4] + | | `--LITERAL_VOID -> void [400:4] + | |--IDENT -> method1472228 [400:9] + | |--LPAREN -> ( [400:22] + | |--PARAMETERS -> PARAMETERS [400:23] + | | `--PARAMETER_DEF -> PARAMETER_DEF [400:23] + | | |--MODIFIERS -> MODIFIERS [400:23] + | | |--TYPE -> TYPE [400:23] + | | | `--LITERAL_INT -> int [400:23] + | | `--IDENT -> i [400:27] + | |--RPAREN -> ) [400:28] + | `--SLIST -> { [400:30] + | |--LITERAL_SWITCH -> switch [401:8] + | | |--LPAREN -> ( [401:14] + | | |--EXPR -> EXPR [401:15] + | | | `--IDENT -> i [401:15] + | | |--RPAREN -> ) [401:16] + | | |--LCURLY -> { [401:18] + | | |--CASE_GROUP -> CASE_GROUP [402:8] + | | | |--LITERAL_CASE -> case [402:8] + | | | | |--EXPR -> EXPR [402:13] + | | | | | `--NUM_INT -> 2 [402:13] + | | | | `--COLON -> : [402:14] + | | | `--SLIST -> SLIST [404:12] + | | | `--LITERAL_BREAK -> break [404:12] + | | | `--SEMI -> ; [404:17] + | | |--CASE_GROUP -> CASE_GROUP [405:8] + | | | `--LITERAL_DEFAULT -> default [405:8] + | | | `--COLON -> : [405:15] + | | `--RCURLY -> } [406:8] + | `--RCURLY -> } [407:4] + |--METHOD_DEF -> METHOD_DEF [409:4] + | |--MODIFIERS -> MODIFIERS [409:4] + | |--TYPE -> TYPE [409:4] + | | `--LITERAL_VOID -> void [409:4] + | |--IDENT -> nestedSwitches [409:9] + | |--LPAREN -> ( [409:23] + | |--PARAMETERS -> PARAMETERS [409:24] + | |--RPAREN -> ) [409:24] + | `--SLIST -> { [409:26] + | |--LITERAL_SWITCH -> switch [410:8] + | | |--LPAREN -> ( [410:15] + | | |--EXPR -> EXPR [410:24] + | | | `--METHOD_CALL -> ( [410:24] + | | | |--IDENT -> hashCode [410:16] + | | | |--ELIST -> ELIST [410:25] + | | | `--RPAREN -> ) [410:25] + | | |--RPAREN -> ) [410:26] + | | |--LCURLY -> { [410:28] + | | |--CASE_GROUP -> CASE_GROUP [411:12] + | | | |--LITERAL_CASE -> case [411:12] + | | | | |--EXPR -> EXPR [411:17] + | | | | | `--NUM_INT -> 1 [411:17] + | | | | `--COLON -> : [411:18] + | | | `--SLIST -> SLIST [412:16] + | | | `--LITERAL_SWITCH -> switch [412:16] + | | | |--LPAREN -> ( [412:23] + | | | |--EXPR -> EXPR [412:32] + | | | | `--METHOD_CALL -> ( [412:32] + | | | | |--IDENT -> hashCode [412:24] + | | | | |--ELIST -> ELIST [412:33] + | | | | `--RPAREN -> ) [412:33] + | | | |--RPAREN -> ) [412:34] + | | | |--LCURLY -> { [412:36] + | | | |--CASE_GROUP -> CASE_GROUP [413:20] + | | | | `--LITERAL_CASE -> case [413:20] + | | | | |--EXPR -> EXPR [413:25] + | | | | | `--NUM_INT -> 1 [413:25] + | | | | `--COLON -> : [413:26] + | | | `--RCURLY -> } [414:16] + | | |--CASE_GROUP -> CASE_GROUP [415:12] + | | | `--LITERAL_DEFAULT -> default [415:12] + | | | `--COLON -> : [415:19] + | | `--RCURLY -> } [416:8] + | `--RCURLY -> } [417:4] + |--METHOD_DEF -> METHOD_DEF [419:4] + | |--MODIFIERS -> MODIFIERS [419:4] + | |--TYPE -> TYPE [419:4] + | | `--LITERAL_VOID -> void [419:4] + | |--IDENT -> nextedSwitches2 [419:9] + | |--LPAREN -> ( [419:24] + | |--PARAMETERS -> PARAMETERS [419:25] + | |--RPAREN -> ) [419:25] + | `--SLIST -> { [419:27] + | |--LITERAL_SWITCH -> switch [420:8] + | | |--LPAREN -> ( [420:14] + | | |--EXPR -> EXPR [420:23] + | | | `--METHOD_CALL -> ( [420:23] + | | | |--IDENT -> hashCode [420:15] + | | | |--ELIST -> ELIST [420:24] + | | | `--RPAREN -> ) [420:24] + | | |--RPAREN -> ) [420:25] + | | |--LCURLY -> { [420:27] + | | |--CASE_GROUP -> CASE_GROUP [421:8] + | | | |--LITERAL_CASE -> case [421:8] + | | | | |--EXPR -> EXPR [421:13] + | | | | | `--NUM_INT -> 1 [421:13] + | | | | `--COLON -> : [421:14] + | | | `--SLIST -> SLIST [422:12] + | | | `--LITERAL_SWITCH -> switch [422:12] + | | | |--LPAREN -> ( [422:18] + | | | |--EXPR -> EXPR [422:27] + | | | | `--METHOD_CALL -> ( [422:27] + | | | | |--IDENT -> hashCode [422:19] + | | | | |--ELIST -> ELIST [422:28] + | | | | `--RPAREN -> ) [422:28] + | | | |--RPAREN -> ) [422:29] + | | | |--LCURLY -> { [422:30] + | | | `--RCURLY -> } [422:31] + | | |--CASE_GROUP -> CASE_GROUP [423:8] + | | | |--LITERAL_CASE -> case [423:8] + | | | | |--EXPR -> EXPR [423:13] + | | | | | `--NUM_INT -> 2 [423:13] + | | | | `--COLON -> : [423:14] + | | | `--SLIST -> SLIST [424:32] + | | | |--EXPR -> EXPR [424:32] + | | | | `--METHOD_CALL -> ( [424:32] + | | | | |--DOT -> . [424:18] + | | | | | |--IDENT -> System [424:12] + | | | | | `--IDENT -> lineSeparator [424:19] + | | | | |--ELIST -> ELIST [424:33] + | | | | `--RPAREN -> ) [424:33] + | | | |--SEMI -> ; [424:34] + | | | `--LITERAL_BREAK -> break [425:12] + | | | `--SEMI -> ; [425:17] + | | `--RCURLY -> } [426:8] + | `--RCURLY -> } [427:4] + |--METHOD_DEF -> METHOD_DEF [429:4] + | |--MODIFIERS -> MODIFIERS [429:4] + | |--TYPE -> TYPE [429:4] + | | `--LITERAL_VOID -> void [429:4] + | |--IDENT -> ifWithoutBreak [429:9] + | |--LPAREN -> ( [429:23] + | |--PARAMETERS -> PARAMETERS [429:24] + | |--RPAREN -> ) [429:24] + | `--SLIST -> { [429:26] + | |--LITERAL_SWITCH -> switch [430:8] + | | |--LPAREN -> ( [430:14] + | | |--EXPR -> EXPR [430:23] + | | | `--METHOD_CALL -> ( [430:23] + | | | |--IDENT -> hashCode [430:15] + | | | |--ELIST -> ELIST [430:24] + | | | `--RPAREN -> ) [430:24] + | | |--RPAREN -> ) [430:25] + | | |--LCURLY -> { [430:27] + | | |--CASE_GROUP -> CASE_GROUP [431:8] + | | | |--LITERAL_CASE -> case [431:8] + | | | | |--EXPR -> EXPR [431:13] + | | | | | `--NUM_INT -> 1 [431:13] + | | | | `--COLON -> : [431:14] + | | | `--SLIST -> SLIST [432:12] + | | | `--LITERAL_IF -> if [432:12] + | | | |--LPAREN -> ( [432:15] + | | | |--EXPR -> EXPR [432:16] + | | | | `--LITERAL_TRUE -> true [432:16] + | | | |--RPAREN -> ) [432:20] + | | | `--SLIST -> { [432:22] + | | | |--EXPR -> EXPR [433:36] + | | | | `--METHOD_CALL -> ( [433:36] + | | | | |--DOT -> . [433:22] + | | | | | |--IDENT -> System [433:16] + | | | | | `--IDENT -> lineSeparator [433:23] + | | | | |--ELIST -> ELIST [433:37] + | | | | `--RPAREN -> ) [433:37] + | | | |--SEMI -> ; [433:38] + | | | `--RCURLY -> } [434:12] + | | |--CASE_GROUP -> CASE_GROUP [435:8] + | | | |--LITERAL_CASE -> case [435:8] + | | | | |--EXPR -> EXPR [435:13] + | | | | | `--NUM_INT -> 2 [435:13] + | | | | `--COLON -> : [435:14] + | | | `--SLIST -> SLIST [436:32] + | | | |--EXPR -> EXPR [436:32] + | | | | `--METHOD_CALL -> ( [436:32] + | | | | |--DOT -> . [436:18] + | | | | | |--IDENT -> System [436:12] + | | | | | `--IDENT -> lineSeparator [436:19] + | | | | |--ELIST -> ELIST [436:33] + | | | | `--RPAREN -> ) [436:33] + | | | |--SEMI -> ; [436:34] + | | | `--LITERAL_BREAK -> break [437:12] + | | | `--SEMI -> ; [437:17] + | | `--RCURLY -> } [438:8] + | `--RCURLY -> } [439:4] + |--METHOD_DEF -> METHOD_DEF [441:4] + | |--MODIFIERS -> MODIFIERS [441:4] + | |--TYPE -> TYPE [441:4] + | | `--LITERAL_VOID -> void [441:4] + | |--IDENT -> noCommentAtTheEnd [441:9] + | |--LPAREN -> ( [441:26] + | |--PARAMETERS -> PARAMETERS [441:27] + | |--RPAREN -> ) [441:27] + | `--SLIST -> { [441:29] + | |--LITERAL_SWITCH -> switch [442:8] + | | |--LPAREN -> ( [442:14] + | | |--EXPR -> EXPR [442:23] + | | | `--METHOD_CALL -> ( [442:23] + | | | |--IDENT -> hashCode [442:15] + | | | |--ELIST -> ELIST [442:24] + | | | `--RPAREN -> ) [442:24] + | | |--RPAREN -> ) [442:25] + | | |--LCURLY -> { [442:27] + | | |--CASE_GROUP -> CASE_GROUP [443:8] + | | | |--LITERAL_CASE -> case [443:8] + | | | | |--EXPR -> EXPR [443:13] + | | | | | `--NUM_INT -> 1 [443:13] + | | | | `--COLON -> : [443:14] + | | | `--SLIST -> SLIST [443:36] + | | | |--EXPR -> EXPR [443:36] + | | | | `--METHOD_CALL -> ( [443:36] + | | | | |--DOT -> . [443:22] + | | | | | |--IDENT -> System [443:16] + | | | | | `--IDENT -> lineSeparator [443:23] + | | | | |--ELIST -> ELIST [443:37] + | | | | `--RPAREN -> ) [443:37] + | | | `--SEMI -> ; [443:38] + | | |--CASE_GROUP -> CASE_GROUP [445:8] + | | | |--LITERAL_CASE -> case [445:8] + | | | | |--EXPR -> EXPR [445:13] + | | | | | `--NUM_INT -> 2 [445:13] + | | | | `--COLON -> : [445:14] + | | | `--SLIST -> SLIST [446:32] + | | | |--EXPR -> EXPR [446:32] + | | | | `--METHOD_CALL -> ( [446:32] + | | | | |--DOT -> . [446:18] + | | | | | |--IDENT -> System [446:12] + | | | | | `--IDENT -> lineSeparator [446:19] + | | | | |--ELIST -> ELIST [446:33] + | | | | `--RPAREN -> ) [446:33] + | | | |--SEMI -> ; [446:34] + | | | `--LITERAL_BREAK -> break [447:12] + | | | `--SEMI -> ; [447:17] + | | `--RCURLY -> } [448:8] + | `--RCURLY -> } [449:4] + |--METHOD_DEF -> METHOD_DEF [451:4] + | |--MODIFIERS -> MODIFIERS [451:4] + | |--TYPE -> TYPE [451:4] + | | `--LITERAL_VOID -> void [451:4] + | |--IDENT -> synchronizedStatement [451:9] + | |--LPAREN -> ( [451:30] + | |--PARAMETERS -> PARAMETERS [451:31] + | |--RPAREN -> ) [451:31] + | `--SLIST -> { [451:33] + | |--LITERAL_SWITCH -> switch [452:7] + | | |--LPAREN -> ( [452:14] + | | |--EXPR -> EXPR [452:23] + | | | `--METHOD_CALL -> ( [452:23] + | | | |--IDENT -> hashCode [452:15] + | | | |--ELIST -> ELIST [452:24] + | | | `--RPAREN -> ) [452:24] + | | |--RPAREN -> ) [452:25] + | | |--LCURLY -> { [452:27] + | | |--CASE_GROUP -> CASE_GROUP [453:11] + | | | |--LITERAL_CASE -> case [453:11] + | | | | |--EXPR -> EXPR [453:16] + | | | | | `--NUM_INT -> 1 [453:16] + | | | | `--COLON -> : [453:17] + | | | `--SLIST -> SLIST [454:15] + | | | `--LITERAL_SYNCHRONIZED -> synchronized [454:15] + | | | |--LPAREN -> ( [454:28] + | | | |--EXPR -> EXPR [454:29] + | | | | `--LITERAL_THIS -> this [454:29] + | | | |--RPAREN -> ) [454:33] + | | | `--SLIST -> { [454:35] + | | | |--LITERAL_BREAK -> break [455:19] + | | | | `--SEMI -> ; [455:24] + | | | `--RCURLY -> } [456:15] + | | |--CASE_GROUP -> CASE_GROUP [457:11] + | | | |--LITERAL_CASE -> case [457:11] + | | | | |--EXPR -> EXPR [457:16] + | | | | | `--NUM_INT -> 2 [457:16] + | | | | `--COLON -> : [457:17] + | | | `--SLIST -> SLIST [459:15] + | | | `--LITERAL_IF -> if [459:15] + | | | |--LPAREN -> ( [459:18] + | | | |--EXPR -> EXPR [459:19] + | | | | `--LITERAL_TRUE -> true [459:19] + | | | |--RPAREN -> ) [459:23] + | | | |--SLIST -> { [459:25] + | | | | |--LITERAL_SYNCHRONIZED -> synchronized [460:19] + | | | | | |--LPAREN -> ( [460:32] + | | | | | |--EXPR -> EXPR [460:33] + | | | | | | `--LITERAL_THIS -> this [460:33] + | | | | | |--RPAREN -> ) [460:37] + | | | | | `--SLIST -> { [460:39] + | | | | | |--LITERAL_BREAK -> break [461:23] + | | | | | | `--SEMI -> ; [461:28] + | | | | | `--RCURLY -> } [462:19] + | | | | `--RCURLY -> } [463:15] + | | | `--LITERAL_ELSE -> else [463:17] + | | | `--SLIST -> { [463:22] + | | | |--LITERAL_SYNCHRONIZED -> synchronized [464:19] + | | | | |--LPAREN -> ( [464:32] + | | | | |--EXPR -> EXPR [464:33] + | | | | | `--LITERAL_THIS -> this [464:33] + | | | | |--RPAREN -> ) [464:37] + | | | | `--SLIST -> { [464:39] + | | | | |--LITERAL_BREAK -> break [465:23] + | | | | | `--SEMI -> ; [465:28] + | | | | `--RCURLY -> } [466:19] + | | | `--RCURLY -> } [467:15] + | | |--CASE_GROUP -> CASE_GROUP [468:11] + | | | |--LITERAL_CASE -> case [468:11] + | | | | |--EXPR -> EXPR [468:16] + | | | | | `--NUM_INT -> 3 [468:16] + | | | | `--COLON -> : [468:17] + | | | `--SLIST -> SLIST [469:15] + | | | `--LITERAL_SYNCHRONIZED -> synchronized [469:15] + | | | |--LPAREN -> ( [469:28] + | | | |--EXPR -> EXPR [469:29] + | | | | `--LITERAL_THIS -> this [469:29] + | | | |--RPAREN -> ) [469:33] + | | | `--SLIST -> { [469:35] + | | | `--RCURLY -> } [470:15] + | | |--CASE_GROUP -> CASE_GROUP [472:11] + | | | |--LITERAL_DEFAULT -> default [472:11] + | | | | `--COLON -> : [472:18] + | | | `--SLIST -> SLIST [473:15] + | | | `--LITERAL_BREAK -> break [473:15] + | | | `--SEMI -> ; [473:20] + | | `--RCURLY -> } [474:7] + | `--RCURLY -> } [475:4] + |--METHOD_DEF -> METHOD_DEF [477:4] + | |--MODIFIERS -> MODIFIERS [477:4] + | |--TYPE -> TYPE [477:4] + | | `--LITERAL_VOID -> void [477:4] + | |--IDENT -> multipleCasesOnOneLine [477:9] + | |--LPAREN -> ( [477:31] + | |--PARAMETERS -> PARAMETERS [477:32] + | |--RPAREN -> ) [477:32] + | `--SLIST -> { [477:34] + | |--VARIABLE_DEF -> VARIABLE_DEF [478:8] + | | |--MODIFIERS -> MODIFIERS [478:8] + | | |--TYPE -> TYPE [478:8] + | | | `--LITERAL_INT -> int [478:8] + | | |--IDENT -> i [478:12] + | | `--ASSIGN -> = [478:14] + | | `--EXPR -> EXPR [478:16] + | | `--NUM_INT -> 0 [478:16] + | |--SEMI -> ; [478:17] + | |--LITERAL_SWITCH -> switch [479:8] + | | |--LPAREN -> ( [479:15] + | | |--EXPR -> EXPR [479:16] + | | | `--IDENT -> i [479:16] + | | |--RPAREN -> ) [479:17] + | | |--LCURLY -> { [479:19] + | | |--CASE_GROUP -> CASE_GROUP [480:8] + | | | |--LITERAL_CASE -> case [480:8] + | | | | |--EXPR -> EXPR [480:13] + | | | | | `--NUM_INT -> 0 [480:13] + | | | | `--COLON -> : [480:14] + | | | |--LITERAL_CASE -> case [480:16] + | | | | |--EXPR -> EXPR [480:21] + | | | | | `--NUM_INT -> 1 [480:21] + | | | | `--COLON -> : [480:22] + | | | `--SLIST -> SLIST [480:26] + | | | |--EXPR -> EXPR [480:26] + | | | | `--STAR_ASSIGN -> *= [480:26] + | | | | |--IDENT -> i [480:24] + | | | | `--IDENT -> i [480:29] + | | | `--SEMI -> ; [480:30] + | | |--CASE_GROUP -> CASE_GROUP [481:8] + | | | |--LITERAL_CASE -> case [481:8] + | | | | |--EXPR -> EXPR [481:13] + | | | | | `--NUM_INT -> 2 [481:13] + | | | | `--COLON -> : [481:14] + | | | |--LITERAL_CASE -> case [481:16] + | | | | |--EXPR -> EXPR [481:21] + | | | | | `--NUM_INT -> 3 [481:21] + | | | | `--COLON -> : [481:22] + | | | `--SLIST -> SLIST [481:26] + | | | |--EXPR -> EXPR [481:26] + | | | | `--STAR_ASSIGN -> *= [481:26] + | | | | |--IDENT -> i [481:24] + | | | | `--IDENT -> i [481:29] + | | | `--SEMI -> ; [481:30] + | | |--CASE_GROUP -> CASE_GROUP [482:8] + | | | |--LITERAL_CASE -> case [482:8] + | | | | |--EXPR -> EXPR [482:13] + | | | | | `--NUM_INT -> 4 [482:13] + | | | | `--COLON -> : [482:14] + | | | |--LITERAL_CASE -> case [482:16] + | | | | |--EXPR -> EXPR [482:21] + | | | | | `--NUM_INT -> 5 [482:21] + | | | | `--COLON -> : [482:22] + | | | `--SLIST -> SLIST [482:26] + | | | |--EXPR -> EXPR [482:26] + | | | | `--STAR_ASSIGN -> *= [482:26] + | | | | |--IDENT -> i [482:24] + | | | | `--IDENT -> i [482:29] + | | | `--SEMI -> ; [482:30] + | | |--CASE_GROUP -> CASE_GROUP [483:8] + | | | |--LITERAL_CASE -> case [483:8] + | | | | |--EXPR -> EXPR [483:13] + | | | | | `--NUM_INT -> 6 [483:13] + | | | | `--COLON -> : [483:14] + | | | |--LITERAL_CASE -> case [483:16] + | | | | |--EXPR -> EXPR [483:21] + | | | | | `--NUM_INT -> 7 [483:21] + | | | | `--COLON -> : [483:22] + | | | `--SLIST -> SLIST [483:26] + | | | |--EXPR -> EXPR [483:26] + | | | | `--STAR_ASSIGN -> *= [483:26] + | | | | |--IDENT -> i [483:24] + | | | | `--IDENT -> i [483:29] + | | | |--SEMI -> ; [483:30] + | | | `--LITERAL_BREAK -> break [484:12] + | | | `--SEMI -> ; [484:17] + | | |--CASE_GROUP -> CASE_GROUP [485:8] + | | | |--LITERAL_DEFAULT -> default [485:8] + | | | | `--COLON -> : [485:15] + | | | `--SLIST -> SLIST [486:12] + | | | `--LITERAL_THROW -> throw [486:12] + | | | |--EXPR -> EXPR [486:18] + | | | | `--LITERAL_NEW -> new [486:18] + | | | | |--IDENT -> RuntimeException [486:22] + | | | | |--LPAREN -> ( [486:38] + | | | | |--ELIST -> ELIST [486:39] + | | | | `--RPAREN -> ) [486:39] + | | | `--SEMI -> ; [486:40] + | | `--RCURLY -> } [487:8] + | `--RCURLY -> } [488:4] + |--METHOD_DEF -> METHOD_DEF [491:3] + | |--MODIFIERS -> MODIFIERS [491:3] + | |--TYPE -> TYPE [491:3] + | | `--LITERAL_VOID -> void [491:3] + | |--IDENT -> methodFallThruWithDash [491:8] + | |--LPAREN -> ( [491:30] + | |--PARAMETERS -> PARAMETERS [491:31] + | | |--PARAMETER_DEF -> PARAMETER_DEF [491:31] + | | | |--MODIFIERS -> MODIFIERS [491:31] + | | | |--TYPE -> TYPE [491:31] + | | | | `--LITERAL_INT -> int [491:31] + | | | `--IDENT -> i [491:35] + | | |--COMMA -> , [491:36] + | | |--PARAMETER_DEF -> PARAMETER_DEF [491:38] + | | | |--MODIFIERS -> MODIFIERS [491:38] + | | | |--TYPE -> TYPE [491:38] + | | | | `--LITERAL_INT -> int [491:38] + | | | `--IDENT -> j [491:42] + | | |--COMMA -> , [491:43] + | | `--PARAMETER_DEF -> PARAMETER_DEF [491:45] + | | |--MODIFIERS -> MODIFIERS [491:45] + | | |--TYPE -> TYPE [491:45] + | | | `--LITERAL_BOOLEAN -> boolean [491:45] + | | `--IDENT -> cond [491:53] + | |--RPAREN -> ) [491:57] + | `--SLIST -> { [491:59] + | |--LITERAL_WHILE -> while [492:6] + | | |--LPAREN -> ( [492:12] + | | |--EXPR -> EXPR [492:13] + | | | `--LITERAL_TRUE -> true [492:13] + | | |--RPAREN -> ) [492:17] + | | `--SLIST -> { [492:19] + | | |--LITERAL_SWITCH -> switch [493:10] + | | | |--LPAREN -> ( [493:17] + | | | |--EXPR -> EXPR [493:18] + | | | | `--IDENT -> i [493:18] + | | | |--RPAREN -> ) [493:19] + | | | |--LCURLY -> { [493:20] + | | | |--CASE_GROUP -> CASE_GROUP [494:14] + | | | | |--LITERAL_CASE -> case [494:14] + | | | | | |--EXPR -> EXPR [494:19] + | | | | | | `--NUM_INT -> 0 [494:19] + | | | | | `--COLON -> : [494:20] + | | | | `--SLIST -> SLIST [495:19] + | | | | |--EXPR -> EXPR [495:19] + | | | | | `--POST_INC -> ++ [495:19] + | | | | | `--IDENT -> i [495:18] + | | | | `--SEMI -> ; [495:21] + | | | |--CASE_GROUP -> CASE_GROUP [496:14] + | | | | |--LITERAL_CASE -> case [496:14] + | | | | | |--EXPR -> EXPR [496:19] + | | | | | | `--NUM_INT -> 1 [496:19] + | | | | | `--COLON -> : [496:20] + | | | | `--SLIST -> SLIST [497:19] + | | | | |--EXPR -> EXPR [497:19] + | | | | | `--POST_INC -> ++ [497:19] + | | | | | `--IDENT -> i [497:18] + | | | | `--SEMI -> ; [497:21] + | | | |--CASE_GROUP -> CASE_GROUP [498:14] + | | | | |--LITERAL_CASE -> case [498:14] + | | | | | |--EXPR -> EXPR [498:19] + | | | | | | `--NUM_INT -> 2 [498:19] + | | | | | `--COLON -> : [498:20] + | | | | `--SLIST -> SLIST [499:19] + | | | | |--EXPR -> EXPR [499:19] + | | | | | `--POST_INC -> ++ [499:19] + | | | | | `--IDENT -> i [499:18] + | | | | `--SEMI -> ; [499:21] + | | | |--CASE_GROUP -> CASE_GROUP [500:14] + | | | | |--LITERAL_CASE -> case [500:14] + | | | | | |--EXPR -> EXPR [500:19] + | | | | | | `--NUM_INT -> 3 [500:19] + | | | | | `--COLON -> : [500:20] + | | | | `--SLIST -> SLIST [501:19] + | | | | |--EXPR -> EXPR [501:19] + | | | | | `--POST_INC -> ++ [501:19] + | | | | | `--IDENT -> i [501:18] + | | | | `--SEMI -> ; [501:21] + | | | |--CASE_GROUP -> CASE_GROUP [502:14] + | | | | |--LITERAL_CASE -> case [502:14] + | | | | | |--EXPR -> EXPR [502:19] + | | | | | | `--NUM_INT -> 4 [502:19] + | | | | | `--COLON -> : [502:20] + | | | | `--SLIST -> SLIST [503:19] + | | | | |--EXPR -> EXPR [503:19] + | | | | | `--POST_INC -> ++ [503:19] + | | | | | `--IDENT -> i [503:18] + | | | | `--SEMI -> ; [503:21] + | | | |--CASE_GROUP -> CASE_GROUP [504:14] + | | | | |--LITERAL_CASE -> case [504:14] + | | | | | |--EXPR -> EXPR [504:19] + | | | | | | `--NUM_INT -> 5 [504:19] + | | | | | `--COLON -> : [504:20] + | | | | `--SLIST -> SLIST [505:19] + | | | | |--EXPR -> EXPR [505:19] + | | | | | `--POST_INC -> ++ [505:19] + | | | | | `--IDENT -> i [505:18] + | | | | `--SEMI -> ; [505:21] + | | | |--CASE_GROUP -> CASE_GROUP [506:14] + | | | | |--LITERAL_CASE -> case [506:14] + | | | | | |--EXPR -> EXPR [506:19] + | | | | | | `--NUM_INT -> 6 [506:19] + | | | | | `--COLON -> : [506:20] + | | | | `--SLIST -> SLIST [507:19] + | | | | |--EXPR -> EXPR [507:19] + | | | | | `--POST_INC -> ++ [507:19] + | | | | | `--IDENT -> i [507:18] + | | | | `--SEMI -> ; [507:21] + | | | |--CASE_GROUP -> CASE_GROUP [508:14] + | | | | |--LITERAL_CASE -> case [508:14] + | | | | | |--EXPR -> EXPR [508:19] + | | | | | | `--NUM_INT -> 7 [508:19] + | | | | | `--COLON -> : [508:20] + | | | | `--SLIST -> SLIST [509:19] + | | | | |--EXPR -> EXPR [509:19] + | | | | | `--POST_INC -> ++ [509:19] + | | | | | `--IDENT -> i [509:18] + | | | | `--SEMI -> ; [509:21] + | | | |--CASE_GROUP -> CASE_GROUP [510:14] + | | | | |--LITERAL_CASE -> case [510:14] + | | | | | |--EXPR -> EXPR [510:19] + | | | | | | `--NUM_INT -> 8 [510:19] + | | | | | `--COLON -> : [510:20] + | | | | `--SLIST -> SLIST [511:19] + | | | | |--EXPR -> EXPR [511:19] + | | | | | `--POST_INC -> ++ [511:19] + | | | | | `--IDENT -> i [511:18] + | | | | `--SEMI -> ; [511:21] + | | | |--CASE_GROUP -> CASE_GROUP [512:14] + | | | | |--LITERAL_CASE -> case [512:14] + | | | | | |--EXPR -> EXPR [512:19] + | | | | | | `--NUM_INT -> 9 [512:19] + | | | | | `--COLON -> : [512:20] + | | | | `--SLIST -> SLIST [513:19] + | | | | |--EXPR -> EXPR [513:19] + | | | | | `--POST_INC -> ++ [513:19] + | | | | | `--IDENT -> i [513:18] + | | | | `--SEMI -> ; [513:21] + | | | |--CASE_GROUP -> CASE_GROUP [514:14] + | | | | |--LITERAL_CASE -> case [514:14] + | | | | | |--EXPR -> EXPR [514:19] + | | | | | | `--NUM_INT -> 10 [514:19] + | | | | | `--COLON -> : [514:21] + | | | | `--SLIST -> SLIST [515:19] + | | | | |--EXPR -> EXPR [515:19] + | | | | | `--POST_INC -> ++ [515:19] + | | | | | `--IDENT -> i [515:18] + | | | | `--SEMI -> ; [515:21] + | | | |--CASE_GROUP -> CASE_GROUP [516:14] + | | | | |--LITERAL_CASE -> case [516:14] + | | | | | |--EXPR -> EXPR [516:19] + | | | | | | `--NUM_INT -> 11 [516:19] + | | | | | `--COLON -> : [516:21] + | | | | `--SLIST -> SLIST [517:19] + | | | | |--EXPR -> EXPR [517:19] + | | | | | `--POST_INC -> ++ [517:19] + | | | | | `--IDENT -> i [517:18] + | | | | `--SEMI -> ; [517:21] + | | | |--CASE_GROUP -> CASE_GROUP [518:14] + | | | | |--LITERAL_CASE -> case [518:14] + | | | | | |--EXPR -> EXPR [518:19] + | | | | | | `--NUM_INT -> 12 [518:19] + | | | | | `--COLON -> : [518:21] + | | | | `--SLIST -> SLIST [519:19] + | | | | |--EXPR -> EXPR [519:19] + | | | | | `--POST_INC -> ++ [519:19] + | | | | | `--IDENT -> i [519:18] + | | | | `--SEMI -> ; [519:21] + | | | |--CASE_GROUP -> CASE_GROUP [520:14] + | | | | |--LITERAL_CASE -> case [520:14] + | | | | | |--EXPR -> EXPR [520:19] + | | | | | | `--NUM_INT -> 13 [520:19] + | | | | | `--COLON -> : [520:21] + | | | | `--SLIST -> SLIST [521:19] + | | | | |--EXPR -> EXPR [521:19] + | | | | | `--POST_INC -> ++ [521:19] + | | | | | `--IDENT -> i [521:18] + | | | | `--SEMI -> ; [521:21] + | | | |--CASE_GROUP -> CASE_GROUP [522:14] + | | | | |--LITERAL_CASE -> case [522:14] + | | | | | |--EXPR -> EXPR [522:19] + | | | | | | `--NUM_INT -> 14 [522:19] + | | | | | `--COLON -> : [522:21] + | | | | `--SLIST -> SLIST [523:19] + | | | | |--EXPR -> EXPR [523:19] + | | | | | `--POST_INC -> ++ [523:19] + | | | | | `--IDENT -> i [523:18] + | | | | `--SEMI -> ; [523:21] + | | | |--CASE_GROUP -> CASE_GROUP [524:14] + | | | | |--LITERAL_CASE -> case [524:14] + | | | | | |--EXPR -> EXPR [524:19] + | | | | | | `--NUM_INT -> 15 [524:19] + | | | | | `--COLON -> : [524:21] + | | | | `--SLIST -> SLIST [525:19] + | | | | |--EXPR -> EXPR [525:19] + | | | | | `--POST_INC -> ++ [525:19] + | | | | | `--IDENT -> i [525:18] + | | | | `--SEMI -> ; [525:21] + | | | |--CASE_GROUP -> CASE_GROUP [526:14] + | | | | |--LITERAL_CASE -> case [526:14] + | | | | | |--EXPR -> EXPR [526:19] + | | | | | | `--NUM_INT -> 16 [526:19] + | | | | | `--COLON -> : [526:21] + | | | | `--SLIST -> SLIST [527:19] + | | | | |--EXPR -> EXPR [527:19] + | | | | | `--POST_INC -> ++ [527:19] + | | | | | `--IDENT -> i [527:18] + | | | | `--SEMI -> ; [527:21] + | | | |--CASE_GROUP -> CASE_GROUP [528:14] + | | | | |--LITERAL_DEFAULT -> default [528:14] + | | | | | `--COLON -> : [528:21] + | | | | `--SLIST -> SLIST [529:18] + | | | | `--LITERAL_THROW -> throw [529:18] + | | | | |--EXPR -> EXPR [529:24] + | | | | | `--LITERAL_NEW -> new [529:24] + | | | | | |--IDENT -> RuntimeException [529:28] + | | | | | |--LPAREN -> ( [529:44] + | | | | | |--ELIST -> ELIST [529:45] + | | | | | `--RPAREN -> ) [529:45] + | | | | `--SEMI -> ; [529:46] + | | | `--RCURLY -> } [530:10] + | | `--RCURLY -> } [531:6] + | `--RCURLY -> } [532:3] + `--RCURLY -> } [533:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionForLoops.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionForLoops.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionForLoops.java @@ -0,0 +1,108 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +import java.io.Serializable; + +public class InputAntlr4AstRegressionForLoops { + int k; + void method1() + { + //Violations: + for (int i = 0; i < 1; i++) { + i++; + } + for (int i = 0; i < 1; i++) { + i = i + 1; + } + for (int i = 0; i < 1; i++) { + for (int j = 0; j < 1; i++) { + --i; + } + } + for (int i = 0, j = 0; i < 1; i++) { + j++; + } + + // Ok: + for (int i = 0; i < 1; i++) { + } + for (int i = 0; i < 1; i++) { + int x = i; + } + for (int i = 0; i < 1; i++) { + Serializable s = new Serializable() { + int i = 3; + void a() { + System.identityHashCode(i++); + } + }; + } + for (int k = 0; k < 1; k++) { + this.k++; + } + + String[] sa = {"a", "b"}; + for(String s:sa) {} + for(String s:sa) { + s = "new string"; + } + for(int i=0;i < 10;) { + i++; + } + for (int i = 0, l = 0,m=0; l < 10; i++,m=m+2) { + l++; + m++; + } + for (int i = 0; i < 10; ) { + i = 11; + } + int w=0; + for (int i=0;i<10; java.sql.Date.valueOf(""),this.i++,w++) { + i++; + w++; + } + for (int i=0,k=0; i<10 && k < 10; ++i,++k) { + i = i + 3; + k = k + 4; + } + for (int i = 0,j = 0 ; i <10; i++) { + j++; + } + + for (String v : sa) { + new NestedClass() { + public void method() {} + }; + v = "bad"; + } + for (int i = 0; i < 10; i += 1) { + for (i = 7; i < 10; i += 1) {} + } + for (String name: new String[] {}) { + } + + for (i = 0; i < 10; i++) { + String name; + name = ""; + } + for (int EXPR = 0; EXPR < 1; EXPR++) { + for (int j = 0; j < 1; i++) { + i++; + } + } + } + private int i; +} + +@SuppressWarnings(value = "this previously caused NullPointerException") +class VariableDeclaredBeforeTheFirstBlockBegins { + void foo(String[] requests) { + Class mUse4 = java.util.Enumeration[].class; + for (String eventDataType : requests) { + @SuppressWarnings(value = "this previously caused NullPointerException") + String eventData; + } + } +} +abstract class NestedClass { + public abstract void method(); +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionForLoops.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionForLoops.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionForLoops.txt @@ -0,0 +1,995 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +IMPORT -> import [3:0] +|--DOT -> . [3:14] +| |--DOT -> . [3:11] +| | |--IDENT -> java [3:7] +| | `--IDENT -> io [3:12] +| `--IDENT -> Serializable [3:15] +`--SEMI -> ; [3:27] +CLASS_DEF -> CLASS_DEF [5:0] +|--MODIFIERS -> MODIFIERS [5:0] +| `--LITERAL_PUBLIC -> public [5:0] +|--LITERAL_CLASS -> class [5:7] +|--IDENT -> InputAntlr4AstRegressionForLoops [5:13] +`--OBJBLOCK -> OBJBLOCK [5:46] + |--LCURLY -> { [5:46] + |--VARIABLE_DEF -> VARIABLE_DEF [6:3] + | |--MODIFIERS -> MODIFIERS [6:3] + | |--TYPE -> TYPE [6:3] + | | `--LITERAL_INT -> int [6:3] + | |--IDENT -> k [6:7] + | `--SEMI -> ; [6:8] + |--METHOD_DEF -> METHOD_DEF [7:4] + | |--MODIFIERS -> MODIFIERS [7:4] + | |--TYPE -> TYPE [7:4] + | | `--LITERAL_VOID -> void [7:4] + | |--IDENT -> method1 [7:9] + | |--LPAREN -> ( [7:16] + | |--PARAMETERS -> PARAMETERS [7:17] + | |--RPAREN -> ) [7:17] + | `--SLIST -> { [8:4] + | |--LITERAL_FOR -> for [10:8] + | | |--LPAREN -> ( [10:12] + | | |--FOR_INIT -> FOR_INIT [10:13] + | | | `--VARIABLE_DEF -> VARIABLE_DEF [10:13] + | | | |--MODIFIERS -> MODIFIERS [10:13] + | | | |--TYPE -> TYPE [10:13] + | | | | `--LITERAL_INT -> int [10:13] + | | | |--IDENT -> i [10:17] + | | | `--ASSIGN -> = [10:19] + | | | `--EXPR -> EXPR [10:21] + | | | `--NUM_INT -> 0 [10:21] + | | |--SEMI -> ; [10:22] + | | |--FOR_CONDITION -> FOR_CONDITION [10:26] + | | | `--EXPR -> EXPR [10:26] + | | | `--LT -> < [10:26] + | | | |--IDENT -> i [10:24] + | | | `--NUM_INT -> 1 [10:28] + | | |--SEMI -> ; [10:29] + | | |--FOR_ITERATOR -> FOR_ITERATOR [10:32] + | | | `--ELIST -> ELIST [10:32] + | | | `--EXPR -> EXPR [10:32] + | | | `--POST_INC -> ++ [10:32] + | | | `--IDENT -> i [10:31] + | | |--RPAREN -> ) [10:34] + | | `--SLIST -> { [10:36] + | | |--EXPR -> EXPR [11:13] + | | | `--POST_INC -> ++ [11:13] + | | | `--IDENT -> i [11:12] + | | |--SEMI -> ; [11:15] + | | `--RCURLY -> } [12:8] + | |--LITERAL_FOR -> for [13:8] + | | |--LPAREN -> ( [13:12] + | | |--FOR_INIT -> FOR_INIT [13:13] + | | | `--VARIABLE_DEF -> VARIABLE_DEF [13:13] + | | | |--MODIFIERS -> MODIFIERS [13:13] + | | | |--TYPE -> TYPE [13:13] + | | | | `--LITERAL_INT -> int [13:13] + | | | |--IDENT -> i [13:17] + | | | `--ASSIGN -> = [13:19] + | | | `--EXPR -> EXPR [13:21] + | | | `--NUM_INT -> 0 [13:21] + | | |--SEMI -> ; [13:22] + | | |--FOR_CONDITION -> FOR_CONDITION [13:26] + | | | `--EXPR -> EXPR [13:26] + | | | `--LT -> < [13:26] + | | | |--IDENT -> i [13:24] + | | | `--NUM_INT -> 1 [13:28] + | | |--SEMI -> ; [13:29] + | | |--FOR_ITERATOR -> FOR_ITERATOR [13:32] + | | | `--ELIST -> ELIST [13:32] + | | | `--EXPR -> EXPR [13:32] + | | | `--POST_INC -> ++ [13:32] + | | | `--IDENT -> i [13:31] + | | |--RPAREN -> ) [13:34] + | | `--SLIST -> { [13:36] + | | |--EXPR -> EXPR [14:14] + | | | `--ASSIGN -> = [14:14] + | | | |--IDENT -> i [14:12] + | | | `--PLUS -> + [14:18] + | | | |--IDENT -> i [14:16] + | | | `--NUM_INT -> 1 [14:20] + | | |--SEMI -> ; [14:21] + | | `--RCURLY -> } [15:8] + | |--LITERAL_FOR -> for [16:8] + | | |--LPAREN -> ( [16:12] + | | |--FOR_INIT -> FOR_INIT [16:13] + | | | `--VARIABLE_DEF -> VARIABLE_DEF [16:13] + | | | |--MODIFIERS -> MODIFIERS [16:13] + | | | |--TYPE -> TYPE [16:13] + | | | | `--LITERAL_INT -> int [16:13] + | | | |--IDENT -> i [16:17] + | | | `--ASSIGN -> = [16:19] + | | | `--EXPR -> EXPR [16:21] + | | | `--NUM_INT -> 0 [16:21] + | | |--SEMI -> ; [16:22] + | | |--FOR_CONDITION -> FOR_CONDITION [16:26] + | | | `--EXPR -> EXPR [16:26] + | | | `--LT -> < [16:26] + | | | |--IDENT -> i [16:24] + | | | `--NUM_INT -> 1 [16:28] + | | |--SEMI -> ; [16:29] + | | |--FOR_ITERATOR -> FOR_ITERATOR [16:32] + | | | `--ELIST -> ELIST [16:32] + | | | `--EXPR -> EXPR [16:32] + | | | `--POST_INC -> ++ [16:32] + | | | `--IDENT -> i [16:31] + | | |--RPAREN -> ) [16:34] + | | `--SLIST -> { [16:36] + | | |--LITERAL_FOR -> for [17:12] + | | | |--LPAREN -> ( [17:16] + | | | |--FOR_INIT -> FOR_INIT [17:17] + | | | | `--VARIABLE_DEF -> VARIABLE_DEF [17:17] + | | | | |--MODIFIERS -> MODIFIERS [17:17] + | | | | |--TYPE -> TYPE [17:17] + | | | | | `--LITERAL_INT -> int [17:17] + | | | | |--IDENT -> j [17:21] + | | | | `--ASSIGN -> = [17:23] + | | | | `--EXPR -> EXPR [17:25] + | | | | `--NUM_INT -> 0 [17:25] + | | | |--SEMI -> ; [17:26] + | | | |--FOR_CONDITION -> FOR_CONDITION [17:30] + | | | | `--EXPR -> EXPR [17:30] + | | | | `--LT -> < [17:30] + | | | | |--IDENT -> j [17:28] + | | | | `--NUM_INT -> 1 [17:32] + | | | |--SEMI -> ; [17:33] + | | | |--FOR_ITERATOR -> FOR_ITERATOR [17:36] + | | | | `--ELIST -> ELIST [17:36] + | | | | `--EXPR -> EXPR [17:36] + | | | | `--POST_INC -> ++ [17:36] + | | | | `--IDENT -> i [17:35] + | | | |--RPAREN -> ) [17:38] + | | | `--SLIST -> { [17:40] + | | | |--EXPR -> EXPR [18:16] + | | | | `--DEC -> -- [18:16] + | | | | `--IDENT -> i [18:18] + | | | |--SEMI -> ; [18:19] + | | | `--RCURLY -> } [19:12] + | | `--RCURLY -> } [20:8] + | |--LITERAL_FOR -> for [21:8] + | | |--LPAREN -> ( [21:12] + | | |--FOR_INIT -> FOR_INIT [21:13] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [21:13] + | | | | |--MODIFIERS -> MODIFIERS [21:13] + | | | | |--TYPE -> TYPE [21:13] + | | | | | `--LITERAL_INT -> int [21:13] + | | | | |--IDENT -> i [21:17] + | | | | `--ASSIGN -> = [21:19] + | | | | `--EXPR -> EXPR [21:21] + | | | | `--NUM_INT -> 0 [21:21] + | | | |--COMMA -> , [21:22] + | | | `--VARIABLE_DEF -> VARIABLE_DEF [21:13] + | | | |--MODIFIERS -> MODIFIERS [21:13] + | | | |--TYPE -> TYPE [21:13] + | | | | `--LITERAL_INT -> int [21:13] + | | | |--IDENT -> j [21:24] + | | | `--ASSIGN -> = [21:26] + | | | `--EXPR -> EXPR [21:28] + | | | `--NUM_INT -> 0 [21:28] + | | |--SEMI -> ; [21:29] + | | |--FOR_CONDITION -> FOR_CONDITION [21:33] + | | | `--EXPR -> EXPR [21:33] + | | | `--LT -> < [21:33] + | | | |--IDENT -> i [21:31] + | | | `--NUM_INT -> 1 [21:35] + | | |--SEMI -> ; [21:36] + | | |--FOR_ITERATOR -> FOR_ITERATOR [21:39] + | | | `--ELIST -> ELIST [21:39] + | | | `--EXPR -> EXPR [21:39] + | | | `--POST_INC -> ++ [21:39] + | | | `--IDENT -> i [21:38] + | | |--RPAREN -> ) [21:41] + | | `--SLIST -> { [21:43] + | | |--EXPR -> EXPR [22:13] + | | | `--POST_INC -> ++ [22:13] + | | | `--IDENT -> j [22:12] + | | |--SEMI -> ; [22:15] + | | `--RCURLY -> } [23:8] + | |--LITERAL_FOR -> for [26:8] + | | |--LPAREN -> ( [26:12] + | | |--FOR_INIT -> FOR_INIT [26:13] + | | | `--VARIABLE_DEF -> VARIABLE_DEF [26:13] + | | | |--MODIFIERS -> MODIFIERS [26:13] + | | | |--TYPE -> TYPE [26:13] + | | | | `--LITERAL_INT -> int [26:13] + | | | |--IDENT -> i [26:17] + | | | `--ASSIGN -> = [26:19] + | | | `--EXPR -> EXPR [26:21] + | | | `--NUM_INT -> 0 [26:21] + | | |--SEMI -> ; [26:22] + | | |--FOR_CONDITION -> FOR_CONDITION [26:26] + | | | `--EXPR -> EXPR [26:26] + | | | `--LT -> < [26:26] + | | | |--IDENT -> i [26:24] + | | | `--NUM_INT -> 1 [26:28] + | | |--SEMI -> ; [26:29] + | | |--FOR_ITERATOR -> FOR_ITERATOR [26:32] + | | | `--ELIST -> ELIST [26:32] + | | | `--EXPR -> EXPR [26:32] + | | | `--POST_INC -> ++ [26:32] + | | | `--IDENT -> i [26:31] + | | |--RPAREN -> ) [26:34] + | | `--SLIST -> { [26:36] + | | `--RCURLY -> } [27:8] + | |--LITERAL_FOR -> for [28:8] + | | |--LPAREN -> ( [28:12] + | | |--FOR_INIT -> FOR_INIT [28:13] + | | | `--VARIABLE_DEF -> VARIABLE_DEF [28:13] + | | | |--MODIFIERS -> MODIFIERS [28:13] + | | | |--TYPE -> TYPE [28:13] + | | | | `--LITERAL_INT -> int [28:13] + | | | |--IDENT -> i [28:17] + | | | `--ASSIGN -> = [28:19] + | | | `--EXPR -> EXPR [28:21] + | | | `--NUM_INT -> 0 [28:21] + | | |--SEMI -> ; [28:22] + | | |--FOR_CONDITION -> FOR_CONDITION [28:26] + | | | `--EXPR -> EXPR [28:26] + | | | `--LT -> < [28:26] + | | | |--IDENT -> i [28:24] + | | | `--NUM_INT -> 1 [28:28] + | | |--SEMI -> ; [28:29] + | | |--FOR_ITERATOR -> FOR_ITERATOR [28:32] + | | | `--ELIST -> ELIST [28:32] + | | | `--EXPR -> EXPR [28:32] + | | | `--POST_INC -> ++ [28:32] + | | | `--IDENT -> i [28:31] + | | |--RPAREN -> ) [28:34] + | | `--SLIST -> { [28:36] + | | |--VARIABLE_DEF -> VARIABLE_DEF [29:12] + | | | |--MODIFIERS -> MODIFIERS [29:12] + | | | |--TYPE -> TYPE [29:12] + | | | | `--LITERAL_INT -> int [29:12] + | | | |--IDENT -> x [29:16] + | | | `--ASSIGN -> = [29:18] + | | | `--EXPR -> EXPR [29:20] + | | | `--IDENT -> i [29:20] + | | |--SEMI -> ; [29:21] + | | `--RCURLY -> } [30:8] + | |--LITERAL_FOR -> for [31:8] + | | |--LPAREN -> ( [31:12] + | | |--FOR_INIT -> FOR_INIT [31:13] + | | | `--VARIABLE_DEF -> VARIABLE_DEF [31:13] + | | | |--MODIFIERS -> MODIFIERS [31:13] + | | | |--TYPE -> TYPE [31:13] + | | | | `--LITERAL_INT -> int [31:13] + | | | |--IDENT -> i [31:17] + | | | `--ASSIGN -> = [31:19] + | | | `--EXPR -> EXPR [31:21] + | | | `--NUM_INT -> 0 [31:21] + | | |--SEMI -> ; [31:22] + | | |--FOR_CONDITION -> FOR_CONDITION [31:26] + | | | `--EXPR -> EXPR [31:26] + | | | `--LT -> < [31:26] + | | | |--IDENT -> i [31:24] + | | | `--NUM_INT -> 1 [31:28] + | | |--SEMI -> ; [31:29] + | | |--FOR_ITERATOR -> FOR_ITERATOR [31:32] + | | | `--ELIST -> ELIST [31:32] + | | | `--EXPR -> EXPR [31:32] + | | | `--POST_INC -> ++ [31:32] + | | | `--IDENT -> i [31:31] + | | |--RPAREN -> ) [31:34] + | | `--SLIST -> { [31:36] + | | |--VARIABLE_DEF -> VARIABLE_DEF [32:12] + | | | |--MODIFIERS -> MODIFIERS [32:12] + | | | |--TYPE -> TYPE [32:12] + | | | | `--IDENT -> Serializable [32:12] + | | | |--IDENT -> s [32:25] + | | | `--ASSIGN -> = [32:27] + | | | `--EXPR -> EXPR [32:29] + | | | `--LITERAL_NEW -> new [32:29] + | | | |--IDENT -> Serializable [32:33] + | | | |--LPAREN -> ( [32:45] + | | | |--ELIST -> ELIST [32:46] + | | | |--RPAREN -> ) [32:46] + | | | `--OBJBLOCK -> OBJBLOCK [32:48] + | | | |--LCURLY -> { [32:48] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [33:16] + | | | | |--MODIFIERS -> MODIFIERS [33:16] + | | | | |--TYPE -> TYPE [33:16] + | | | | | `--LITERAL_INT -> int [33:16] + | | | | |--IDENT -> i [33:20] + | | | | |--ASSIGN -> = [33:22] + | | | | | `--EXPR -> EXPR [33:24] + | | | | | `--NUM_INT -> 3 [33:24] + | | | | `--SEMI -> ; [33:25] + | | | |--METHOD_DEF -> METHOD_DEF [34:16] + | | | | |--MODIFIERS -> MODIFIERS [34:16] + | | | | |--TYPE -> TYPE [34:16] + | | | | | `--LITERAL_VOID -> void [34:16] + | | | | |--IDENT -> a [34:21] + | | | | |--LPAREN -> ( [34:22] + | | | | |--PARAMETERS -> PARAMETERS [34:23] + | | | | |--RPAREN -> ) [34:23] + | | | | `--SLIST -> { [34:25] + | | | | |--EXPR -> EXPR [35:43] + | | | | | `--METHOD_CALL -> ( [35:43] + | | | | | |--DOT -> . [35:26] + | | | | | | |--IDENT -> System [35:20] + | | | | | | `--IDENT -> identityHashCode [35:27] + | | | | | |--ELIST -> ELIST [35:45] + | | | | | | `--EXPR -> EXPR [35:45] + | | | | | | `--POST_INC -> ++ [35:45] + | | | | | | `--IDENT -> i [35:44] + | | | | | `--RPAREN -> ) [35:47] + | | | | |--SEMI -> ; [35:48] + | | | | `--RCURLY -> } [36:16] + | | | `--RCURLY -> } [37:12] + | | |--SEMI -> ; [37:13] + | | `--RCURLY -> } [38:8] + | |--LITERAL_FOR -> for [39:8] + | | |--LPAREN -> ( [39:12] + | | |--FOR_INIT -> FOR_INIT [39:13] + | | | `--VARIABLE_DEF -> VARIABLE_DEF [39:13] + | | | |--MODIFIERS -> MODIFIERS [39:13] + | | | |--TYPE -> TYPE [39:13] + | | | | `--LITERAL_INT -> int [39:13] + | | | |--IDENT -> k [39:17] + | | | `--ASSIGN -> = [39:19] + | | | `--EXPR -> EXPR [39:21] + | | | `--NUM_INT -> 0 [39:21] + | | |--SEMI -> ; [39:22] + | | |--FOR_CONDITION -> FOR_CONDITION [39:26] + | | | `--EXPR -> EXPR [39:26] + | | | `--LT -> < [39:26] + | | | |--IDENT -> k [39:24] + | | | `--NUM_INT -> 1 [39:28] + | | |--SEMI -> ; [39:29] + | | |--FOR_ITERATOR -> FOR_ITERATOR [39:32] + | | | `--ELIST -> ELIST [39:32] + | | | `--EXPR -> EXPR [39:32] + | | | `--POST_INC -> ++ [39:32] + | | | `--IDENT -> k [39:31] + | | |--RPAREN -> ) [39:34] + | | `--SLIST -> { [39:36] + | | |--EXPR -> EXPR [40:18] + | | | `--POST_INC -> ++ [40:18] + | | | `--DOT -> . [40:16] + | | | |--LITERAL_THIS -> this [40:12] + | | | `--IDENT -> k [40:17] + | | |--SEMI -> ; [40:20] + | | `--RCURLY -> } [41:8] + | |--VARIABLE_DEF -> VARIABLE_DEF [43:8] + | | |--MODIFIERS -> MODIFIERS [43:8] + | | |--TYPE -> TYPE [43:8] + | | | |--IDENT -> String [43:8] + | | | `--ARRAY_DECLARATOR -> [ [43:14] + | | | `--RBRACK -> ] [43:15] + | | |--IDENT -> sa [43:17] + | | `--ASSIGN -> = [43:20] + | | `--ARRAY_INIT -> { [43:22] + | | |--EXPR -> EXPR [43:23] + | | | `--STRING_LITERAL -> "a" [43:23] + | | |--COMMA -> , [43:26] + | | |--EXPR -> EXPR [43:28] + | | | `--STRING_LITERAL -> "b" [43:28] + | | `--RCURLY -> } [43:31] + | |--SEMI -> ; [43:32] + | |--LITERAL_FOR -> for [44:8] + | | |--LPAREN -> ( [44:11] + | | |--FOR_EACH_CLAUSE -> FOR_EACH_CLAUSE [44:12] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [44:12] + | | | | |--MODIFIERS -> MODIFIERS [44:12] + | | | | |--TYPE -> TYPE [44:12] + | | | | | `--IDENT -> String [44:12] + | | | | `--IDENT -> s [44:19] + | | | |--COLON -> : [44:20] + | | | `--EXPR -> EXPR [44:21] + | | | `--IDENT -> sa [44:21] + | | |--RPAREN -> ) [44:23] + | | `--SLIST -> { [44:25] + | | `--RCURLY -> } [44:26] + | |--LITERAL_FOR -> for [45:8] + | | |--LPAREN -> ( [45:11] + | | |--FOR_EACH_CLAUSE -> FOR_EACH_CLAUSE [45:12] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [45:12] + | | | | |--MODIFIERS -> MODIFIERS [45:12] + | | | | |--TYPE -> TYPE [45:12] + | | | | | `--IDENT -> String [45:12] + | | | | `--IDENT -> s [45:19] + | | | |--COLON -> : [45:20] + | | | `--EXPR -> EXPR [45:21] + | | | `--IDENT -> sa [45:21] + | | |--RPAREN -> ) [45:23] + | | `--SLIST -> { [45:25] + | | |--EXPR -> EXPR [46:14] + | | | `--ASSIGN -> = [46:14] + | | | |--IDENT -> s [46:12] + | | | `--STRING_LITERAL -> "new string" [46:16] + | | |--SEMI -> ; [46:28] + | | `--RCURLY -> } [47:8] + | |--LITERAL_FOR -> for [48:8] + | | |--LPAREN -> ( [48:11] + | | |--FOR_INIT -> FOR_INIT [48:12] + | | | `--VARIABLE_DEF -> VARIABLE_DEF [48:12] + | | | |--MODIFIERS -> MODIFIERS [48:12] + | | | |--TYPE -> TYPE [48:12] + | | | | `--LITERAL_INT -> int [48:12] + | | | |--IDENT -> i [48:16] + | | | `--ASSIGN -> = [48:17] + | | | `--EXPR -> EXPR [48:18] + | | | `--NUM_INT -> 0 [48:18] + | | |--SEMI -> ; [48:19] + | | |--FOR_CONDITION -> FOR_CONDITION [48:22] + | | | `--EXPR -> EXPR [48:22] + | | | `--LT -> < [48:22] + | | | |--IDENT -> i [48:20] + | | | `--NUM_INT -> 10 [48:24] + | | |--SEMI -> ; [48:26] + | | |--FOR_ITERATOR -> FOR_ITERATOR [48:27] + | | |--RPAREN -> ) [48:27] + | | `--SLIST -> { [48:29] + | | |--EXPR -> EXPR [49:13] + | | | `--POST_INC -> ++ [49:13] + | | | `--IDENT -> i [49:12] + | | |--SEMI -> ; [49:15] + | | `--RCURLY -> } [50:8] + | |--LITERAL_FOR -> for [51:8] + | | |--LPAREN -> ( [51:12] + | | |--FOR_INIT -> FOR_INIT [51:13] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [51:13] + | | | | |--MODIFIERS -> MODIFIERS [51:13] + | | | | |--TYPE -> TYPE [51:13] + | | | | | `--LITERAL_INT -> int [51:13] + | | | | |--IDENT -> i [51:17] + | | | | `--ASSIGN -> = [51:19] + | | | | `--EXPR -> EXPR [51:21] + | | | | `--NUM_INT -> 0 [51:21] + | | | |--COMMA -> , [51:22] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [51:13] + | | | | |--MODIFIERS -> MODIFIERS [51:13] + | | | | |--TYPE -> TYPE [51:13] + | | | | | `--LITERAL_INT -> int [51:13] + | | | | |--IDENT -> l [51:24] + | | | | `--ASSIGN -> = [51:26] + | | | | `--EXPR -> EXPR [51:28] + | | | | `--NUM_INT -> 0 [51:28] + | | | |--COMMA -> , [51:29] + | | | `--VARIABLE_DEF -> VARIABLE_DEF [51:13] + | | | |--MODIFIERS -> MODIFIERS [51:13] + | | | |--TYPE -> TYPE [51:13] + | | | | `--LITERAL_INT -> int [51:13] + | | | |--IDENT -> m [51:30] + | | | `--ASSIGN -> = [51:31] + | | | `--EXPR -> EXPR [51:32] + | | | `--NUM_INT -> 0 [51:32] + | | |--SEMI -> ; [51:33] + | | |--FOR_CONDITION -> FOR_CONDITION [51:37] + | | | `--EXPR -> EXPR [51:37] + | | | `--LT -> < [51:37] + | | | |--IDENT -> l [51:35] + | | | `--NUM_INT -> 10 [51:39] + | | |--SEMI -> ; [51:41] + | | |--FOR_ITERATOR -> FOR_ITERATOR [51:44] + | | | `--ELIST -> ELIST [51:44] + | | | |--EXPR -> EXPR [51:44] + | | | | `--POST_INC -> ++ [51:44] + | | | | `--IDENT -> i [51:43] + | | | |--COMMA -> , [51:46] + | | | `--EXPR -> EXPR [51:48] + | | | `--ASSIGN -> = [51:48] + | | | |--IDENT -> m [51:47] + | | | `--PLUS -> + [51:50] + | | | |--IDENT -> m [51:49] + | | | `--NUM_INT -> 2 [51:51] + | | |--RPAREN -> ) [51:52] + | | `--SLIST -> { [51:54] + | | |--EXPR -> EXPR [52:13] + | | | `--POST_INC -> ++ [52:13] + | | | `--IDENT -> l [52:12] + | | |--SEMI -> ; [52:15] + | | |--EXPR -> EXPR [53:13] + | | | `--POST_INC -> ++ [53:13] + | | | `--IDENT -> m [53:12] + | | |--SEMI -> ; [53:15] + | | `--RCURLY -> } [54:8] + | |--LITERAL_FOR -> for [55:8] + | | |--LPAREN -> ( [55:12] + | | |--FOR_INIT -> FOR_INIT [55:13] + | | | `--VARIABLE_DEF -> VARIABLE_DEF [55:13] + | | | |--MODIFIERS -> MODIFIERS [55:13] + | | | |--TYPE -> TYPE [55:13] + | | | | `--LITERAL_INT -> int [55:13] + | | | |--IDENT -> i [55:17] + | | | `--ASSIGN -> = [55:19] + | | | `--EXPR -> EXPR [55:21] + | | | `--NUM_INT -> 0 [55:21] + | | |--SEMI -> ; [55:22] + | | |--FOR_CONDITION -> FOR_CONDITION [55:26] + | | | `--EXPR -> EXPR [55:26] + | | | `--LT -> < [55:26] + | | | |--IDENT -> i [55:24] + | | | `--NUM_INT -> 10 [55:28] + | | |--SEMI -> ; [55:30] + | | |--FOR_ITERATOR -> FOR_ITERATOR [55:32] + | | |--RPAREN -> ) [55:32] + | | `--SLIST -> { [55:34] + | | |--EXPR -> EXPR [56:14] + | | | `--ASSIGN -> = [56:14] + | | | |--IDENT -> i [56:12] + | | | `--NUM_INT -> 11 [56:16] + | | |--SEMI -> ; [56:18] + | | `--RCURLY -> } [57:8] + | |--VARIABLE_DEF -> VARIABLE_DEF [58:8] + | | |--MODIFIERS -> MODIFIERS [58:8] + | | |--TYPE -> TYPE [58:8] + | | | `--LITERAL_INT -> int [58:8] + | | |--IDENT -> w [58:12] + | | `--ASSIGN -> = [58:13] + | | `--EXPR -> EXPR [58:14] + | | `--NUM_INT -> 0 [58:14] + | |--SEMI -> ; [58:15] + | |--LITERAL_FOR -> for [59:8] + | | |--LPAREN -> ( [59:12] + | | |--FOR_INIT -> FOR_INIT [59:13] + | | | `--VARIABLE_DEF -> VARIABLE_DEF [59:13] + | | | |--MODIFIERS -> MODIFIERS [59:13] + | | | |--TYPE -> TYPE [59:13] + | | | | `--LITERAL_INT -> int [59:13] + | | | |--IDENT -> i [59:17] + | | | `--ASSIGN -> = [59:18] + | | | `--EXPR -> EXPR [59:19] + | | | `--NUM_INT -> 0 [59:19] + | | |--SEMI -> ; [59:20] + | | |--FOR_CONDITION -> FOR_CONDITION [59:22] + | | | `--EXPR -> EXPR [59:22] + | | | `--LT -> < [59:22] + | | | |--IDENT -> i [59:21] + | | | `--NUM_INT -> 10 [59:23] + | | |--SEMI -> ; [59:25] + | | |--FOR_ITERATOR -> FOR_ITERATOR [59:48] + | | | `--ELIST -> ELIST [59:48] + | | | |--EXPR -> EXPR [59:48] + | | | | `--METHOD_CALL -> ( [59:48] + | | | | |--DOT -> . [59:40] + | | | | | |--DOT -> . [59:35] + | | | | | | |--DOT -> . [59:31] + | | | | | | | |--IDENT -> java [59:27] + | | | | | | | `--IDENT -> sql [59:32] + | | | | | | `--IDENT -> Date [59:36] + | | | | | `--IDENT -> valueOf [59:41] + | | | | |--ELIST -> ELIST [59:49] + | | | | | `--EXPR -> EXPR [59:49] + | | | | | `--STRING_LITERAL -> "" [59:49] + | | | | `--RPAREN -> ) [59:51] + | | | |--COMMA -> , [59:52] + | | | |--EXPR -> EXPR [59:59] + | | | | `--POST_INC -> ++ [59:59] + | | | | `--DOT -> . [59:57] + | | | | |--LITERAL_THIS -> this [59:53] + | | | | `--IDENT -> i [59:58] + | | | |--COMMA -> , [59:61] + | | | `--EXPR -> EXPR [59:63] + | | | `--POST_INC -> ++ [59:63] + | | | `--IDENT -> w [59:62] + | | |--RPAREN -> ) [59:65] + | | `--SLIST -> { [59:67] + | | |--EXPR -> EXPR [60:13] + | | | `--POST_INC -> ++ [60:13] + | | | `--IDENT -> i [60:12] + | | |--SEMI -> ; [60:15] + | | |--EXPR -> EXPR [61:13] + | | | `--POST_INC -> ++ [61:13] + | | | `--IDENT -> w [61:12] + | | |--SEMI -> ; [61:15] + | | `--RCURLY -> } [62:8] + | |--LITERAL_FOR -> for [63:8] + | | |--LPAREN -> ( [63:12] + | | |--FOR_INIT -> FOR_INIT [63:13] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [63:13] + | | | | |--MODIFIERS -> MODIFIERS [63:13] + | | | | |--TYPE -> TYPE [63:13] + | | | | | `--LITERAL_INT -> int [63:13] + | | | | |--IDENT -> i [63:17] + | | | | `--ASSIGN -> = [63:18] + | | | | `--EXPR -> EXPR [63:19] + | | | | `--NUM_INT -> 0 [63:19] + | | | |--COMMA -> , [63:20] + | | | `--VARIABLE_DEF -> VARIABLE_DEF [63:13] + | | | |--MODIFIERS -> MODIFIERS [63:13] + | | | |--TYPE -> TYPE [63:13] + | | | | `--LITERAL_INT -> int [63:13] + | | | |--IDENT -> k [63:21] + | | | `--ASSIGN -> = [63:22] + | | | `--EXPR -> EXPR [63:23] + | | | `--NUM_INT -> 0 [63:23] + | | |--SEMI -> ; [63:24] + | | |--FOR_CONDITION -> FOR_CONDITION [63:31] + | | | `--EXPR -> EXPR [63:31] + | | | `--LAND -> && [63:31] + | | | |--LT -> < [63:27] + | | | | |--IDENT -> i [63:26] + | | | | `--NUM_INT -> 10 [63:28] + | | | `--LT -> < [63:36] + | | | |--IDENT -> k [63:34] + | | | `--NUM_INT -> 10 [63:38] + | | |--SEMI -> ; [63:40] + | | |--FOR_ITERATOR -> FOR_ITERATOR [63:42] + | | | `--ELIST -> ELIST [63:42] + | | | |--EXPR -> EXPR [63:42] + | | | | `--INC -> ++ [63:42] + | | | | `--IDENT -> i [63:44] + | | | |--COMMA -> , [63:45] + | | | `--EXPR -> EXPR [63:46] + | | | `--INC -> ++ [63:46] + | | | `--IDENT -> k [63:48] + | | |--RPAREN -> ) [63:49] + | | `--SLIST -> { [63:51] + | | |--EXPR -> EXPR [64:14] + | | | `--ASSIGN -> = [64:14] + | | | |--IDENT -> i [64:12] + | | | `--PLUS -> + [64:18] + | | | |--IDENT -> i [64:16] + | | | `--NUM_INT -> 3 [64:20] + | | |--SEMI -> ; [64:21] + | | |--EXPR -> EXPR [65:14] + | | | `--ASSIGN -> = [65:14] + | | | |--IDENT -> k [65:12] + | | | `--PLUS -> + [65:18] + | | | |--IDENT -> k [65:16] + | | | `--NUM_INT -> 4 [65:20] + | | |--SEMI -> ; [65:21] + | | `--RCURLY -> } [66:8] + | |--LITERAL_FOR -> for [67:8] + | | |--LPAREN -> ( [67:12] + | | |--FOR_INIT -> FOR_INIT [67:13] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [67:13] + | | | | |--MODIFIERS -> MODIFIERS [67:13] + | | | | |--TYPE -> TYPE [67:13] + | | | | | `--LITERAL_INT -> int [67:13] + | | | | |--IDENT -> i [67:17] + | | | | `--ASSIGN -> = [67:19] + | | | | `--EXPR -> EXPR [67:21] + | | | | `--NUM_INT -> 0 [67:21] + | | | |--COMMA -> , [67:22] + | | | `--VARIABLE_DEF -> VARIABLE_DEF [67:13] + | | | |--MODIFIERS -> MODIFIERS [67:13] + | | | |--TYPE -> TYPE [67:13] + | | | | `--LITERAL_INT -> int [67:13] + | | | |--IDENT -> j [67:23] + | | | `--ASSIGN -> = [67:25] + | | | `--EXPR -> EXPR [67:27] + | | | `--NUM_INT -> 0 [67:27] + | | |--SEMI -> ; [67:29] + | | |--FOR_CONDITION -> FOR_CONDITION [67:33] + | | | `--EXPR -> EXPR [67:33] + | | | `--LT -> < [67:33] + | | | |--IDENT -> i [67:31] + | | | `--NUM_INT -> 10 [67:34] + | | |--SEMI -> ; [67:36] + | | |--FOR_ITERATOR -> FOR_ITERATOR [67:39] + | | | `--ELIST -> ELIST [67:39] + | | | `--EXPR -> EXPR [67:39] + | | | `--POST_INC -> ++ [67:39] + | | | `--IDENT -> i [67:38] + | | |--RPAREN -> ) [67:41] + | | `--SLIST -> { [67:43] + | | |--EXPR -> EXPR [68:13] + | | | `--POST_INC -> ++ [68:13] + | | | `--IDENT -> j [68:12] + | | |--SEMI -> ; [68:15] + | | `--RCURLY -> } [69:8] + | |--LITERAL_FOR -> for [71:8] + | | |--LPAREN -> ( [71:12] + | | |--FOR_EACH_CLAUSE -> FOR_EACH_CLAUSE [71:13] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [71:13] + | | | | |--MODIFIERS -> MODIFIERS [71:13] + | | | | |--TYPE -> TYPE [71:13] + | | | | | `--IDENT -> String [71:13] + | | | | `--IDENT -> v [71:20] + | | | |--COLON -> : [71:22] + | | | `--EXPR -> EXPR [71:24] + | | | `--IDENT -> sa [71:24] + | | |--RPAREN -> ) [71:26] + | | `--SLIST -> { [71:28] + | | |--EXPR -> EXPR [72:12] + | | | `--LITERAL_NEW -> new [72:12] + | | | |--IDENT -> NestedClass [72:16] + | | | |--LPAREN -> ( [72:27] + | | | |--ELIST -> ELIST [72:28] + | | | |--RPAREN -> ) [72:28] + | | | `--OBJBLOCK -> OBJBLOCK [72:30] + | | | |--LCURLY -> { [72:30] + | | | |--METHOD_DEF -> METHOD_DEF [73:16] + | | | | |--MODIFIERS -> MODIFIERS [73:16] + | | | | | `--LITERAL_PUBLIC -> public [73:16] + | | | | |--TYPE -> TYPE [73:23] + | | | | | `--LITERAL_VOID -> void [73:23] + | | | | |--IDENT -> method [73:28] + | | | | |--LPAREN -> ( [73:34] + | | | | |--PARAMETERS -> PARAMETERS [73:35] + | | | | |--RPAREN -> ) [73:35] + | | | | `--SLIST -> { [73:37] + | | | | `--RCURLY -> } [73:38] + | | | `--RCURLY -> } [74:12] + | | |--SEMI -> ; [74:13] + | | |--EXPR -> EXPR [75:14] + | | | `--ASSIGN -> = [75:14] + | | | |--IDENT -> v [75:12] + | | | `--STRING_LITERAL -> "bad" [75:16] + | | |--SEMI -> ; [75:21] + | | `--RCURLY -> } [76:8] + | |--LITERAL_FOR -> for [77:8] + | | |--LPAREN -> ( [77:12] + | | |--FOR_INIT -> FOR_INIT [77:13] + | | | `--VARIABLE_DEF -> VARIABLE_DEF [77:13] + | | | |--MODIFIERS -> MODIFIERS [77:13] + | | | |--TYPE -> TYPE [77:13] + | | | | `--LITERAL_INT -> int [77:13] + | | | |--IDENT -> i [77:17] + | | | `--ASSIGN -> = [77:19] + | | | `--EXPR -> EXPR [77:21] + | | | `--NUM_INT -> 0 [77:21] + | | |--SEMI -> ; [77:22] + | | |--FOR_CONDITION -> FOR_CONDITION [77:26] + | | | `--EXPR -> EXPR [77:26] + | | | `--LT -> < [77:26] + | | | |--IDENT -> i [77:24] + | | | `--NUM_INT -> 10 [77:28] + | | |--SEMI -> ; [77:30] + | | |--FOR_ITERATOR -> FOR_ITERATOR [77:34] + | | | `--ELIST -> ELIST [77:34] + | | | `--EXPR -> EXPR [77:34] + | | | `--PLUS_ASSIGN -> += [77:34] + | | | |--IDENT -> i [77:32] + | | | `--NUM_INT -> 1 [77:37] + | | |--RPAREN -> ) [77:38] + | | `--SLIST -> { [77:40] + | | |--LITERAL_FOR -> for [78:12] + | | | |--LPAREN -> ( [78:16] + | | | |--FOR_INIT -> FOR_INIT [78:19] + | | | | `--ELIST -> ELIST [78:19] + | | | | `--EXPR -> EXPR [78:19] + | | | | `--ASSIGN -> = [78:19] + | | | | |--IDENT -> i [78:17] + | | | | `--NUM_INT -> 7 [78:21] + | | | |--SEMI -> ; [78:22] + | | | |--FOR_CONDITION -> FOR_CONDITION [78:26] + | | | | `--EXPR -> EXPR [78:26] + | | | | `--LT -> < [78:26] + | | | | |--IDENT -> i [78:24] + | | | | `--NUM_INT -> 10 [78:28] + | | | |--SEMI -> ; [78:30] + | | | |--FOR_ITERATOR -> FOR_ITERATOR [78:34] + | | | | `--ELIST -> ELIST [78:34] + | | | | `--EXPR -> EXPR [78:34] + | | | | `--PLUS_ASSIGN -> += [78:34] + | | | | |--IDENT -> i [78:32] + | | | | `--NUM_INT -> 1 [78:37] + | | | |--RPAREN -> ) [78:38] + | | | `--SLIST -> { [78:40] + | | | `--RCURLY -> } [78:41] + | | `--RCURLY -> } [79:8] + | |--LITERAL_FOR -> for [80:8] + | | |--LPAREN -> ( [80:12] + | | |--FOR_EACH_CLAUSE -> FOR_EACH_CLAUSE [80:13] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [80:13] + | | | | |--MODIFIERS -> MODIFIERS [80:13] + | | | | |--TYPE -> TYPE [80:13] + | | | | | `--IDENT -> String [80:13] + | | | | `--IDENT -> name [80:20] + | | | |--COLON -> : [80:24] + | | | `--EXPR -> EXPR [80:26] + | | | `--LITERAL_NEW -> new [80:26] + | | | |--IDENT -> String [80:30] + | | | |--ARRAY_DECLARATOR -> [ [80:36] + | | | | `--RBRACK -> ] [80:37] + | | | `--ARRAY_INIT -> { [80:39] + | | | `--RCURLY -> } [80:40] + | | |--RPAREN -> ) [80:41] + | | `--SLIST -> { [80:43] + | | `--RCURLY -> } [81:8] + | |--LITERAL_FOR -> for [83:8] + | | |--LPAREN -> ( [83:12] + | | |--FOR_INIT -> FOR_INIT [83:15] + | | | `--ELIST -> ELIST [83:15] + | | | `--EXPR -> EXPR [83:15] + | | | `--ASSIGN -> = [83:15] + | | | |--IDENT -> i [83:13] + | | | `--NUM_INT -> 0 [83:17] + | | |--SEMI -> ; [83:18] + | | |--FOR_CONDITION -> FOR_CONDITION [83:22] + | | | `--EXPR -> EXPR [83:22] + | | | `--LT -> < [83:22] + | | | |--IDENT -> i [83:20] + | | | `--NUM_INT -> 10 [83:24] + | | |--SEMI -> ; [83:26] + | | |--FOR_ITERATOR -> FOR_ITERATOR [83:29] + | | | `--ELIST -> ELIST [83:29] + | | | `--EXPR -> EXPR [83:29] + | | | `--POST_INC -> ++ [83:29] + | | | `--IDENT -> i [83:28] + | | |--RPAREN -> ) [83:31] + | | `--SLIST -> { [83:33] + | | |--VARIABLE_DEF -> VARIABLE_DEF [84:12] + | | | |--MODIFIERS -> MODIFIERS [84:12] + | | | |--TYPE -> TYPE [84:12] + | | | | `--IDENT -> String [84:12] + | | | `--IDENT -> name [84:19] + | | |--SEMI -> ; [84:23] + | | |--EXPR -> EXPR [85:17] + | | | `--ASSIGN -> = [85:17] + | | | |--IDENT -> name [85:12] + | | | `--STRING_LITERAL -> "" [85:19] + | | |--SEMI -> ; [85:21] + | | `--RCURLY -> } [86:8] + | |--LITERAL_FOR -> for [87:8] + | | |--LPAREN -> ( [87:12] + | | |--FOR_INIT -> FOR_INIT [87:13] + | | | `--VARIABLE_DEF -> VARIABLE_DEF [87:13] + | | | |--MODIFIERS -> MODIFIERS [87:13] + | | | |--TYPE -> TYPE [87:13] + | | | | `--LITERAL_INT -> int [87:13] + | | | |--IDENT -> EXPR [87:17] + | | | `--ASSIGN -> = [87:22] + | | | `--EXPR -> EXPR [87:24] + | | | `--NUM_INT -> 0 [87:24] + | | |--SEMI -> ; [87:25] + | | |--FOR_CONDITION -> FOR_CONDITION [87:32] + | | | `--EXPR -> EXPR [87:32] + | | | `--LT -> < [87:32] + | | | |--IDENT -> EXPR [87:27] + | | | `--NUM_INT -> 1 [87:34] + | | |--SEMI -> ; [87:35] + | | |--FOR_ITERATOR -> FOR_ITERATOR [87:41] + | | | `--ELIST -> ELIST [87:41] + | | | `--EXPR -> EXPR [87:41] + | | | `--POST_INC -> ++ [87:41] + | | | `--IDENT -> EXPR [87:37] + | | |--RPAREN -> ) [87:43] + | | `--SLIST -> { [87:45] + | | |--LITERAL_FOR -> for [88:12] + | | | |--LPAREN -> ( [88:16] + | | | |--FOR_INIT -> FOR_INIT [88:17] + | | | | `--VARIABLE_DEF -> VARIABLE_DEF [88:17] + | | | | |--MODIFIERS -> MODIFIERS [88:17] + | | | | |--TYPE -> TYPE [88:17] + | | | | | `--LITERAL_INT -> int [88:17] + | | | | |--IDENT -> j [88:21] + | | | | `--ASSIGN -> = [88:23] + | | | | `--EXPR -> EXPR [88:25] + | | | | `--NUM_INT -> 0 [88:25] + | | | |--SEMI -> ; [88:26] + | | | |--FOR_CONDITION -> FOR_CONDITION [88:30] + | | | | `--EXPR -> EXPR [88:30] + | | | | `--LT -> < [88:30] + | | | | |--IDENT -> j [88:28] + | | | | `--NUM_INT -> 1 [88:32] + | | | |--SEMI -> ; [88:33] + | | | |--FOR_ITERATOR -> FOR_ITERATOR [88:36] + | | | | `--ELIST -> ELIST [88:36] + | | | | `--EXPR -> EXPR [88:36] + | | | | `--POST_INC -> ++ [88:36] + | | | | `--IDENT -> i [88:35] + | | | |--RPAREN -> ) [88:38] + | | | `--SLIST -> { [88:40] + | | | |--EXPR -> EXPR [89:17] + | | | | `--POST_INC -> ++ [89:17] + | | | | `--IDENT -> i [89:16] + | | | |--SEMI -> ; [89:19] + | | | `--RCURLY -> } [90:12] + | | `--RCURLY -> } [91:8] + | `--RCURLY -> } [92:4] + |--VARIABLE_DEF -> VARIABLE_DEF [93:4] + | |--MODIFIERS -> MODIFIERS [93:4] + | | `--LITERAL_PRIVATE -> private [93:4] + | |--TYPE -> TYPE [93:12] + | | `--LITERAL_INT -> int [93:12] + | |--IDENT -> i [93:16] + | `--SEMI -> ; [93:17] + `--RCURLY -> } [94:0] +CLASS_DEF -> CLASS_DEF [96:0] +|--MODIFIERS -> MODIFIERS [96:0] +| `--ANNOTATION -> ANNOTATION [96:0] +| |--AT -> @ [96:0] +| |--IDENT -> SuppressWarnings [96:1] +| |--LPAREN -> ( [96:17] +| |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [96:18] +| | |--IDENT -> value [96:18] +| | |--ASSIGN -> = [96:24] +| | `--EXPR -> EXPR [96:26] +| | `--STRING_LITERAL -> "this previously caused NullPointerException" [96:26] +| `--RPAREN -> ) [96:71] +|--LITERAL_CLASS -> class [97:0] +|--IDENT -> VariableDeclaredBeforeTheFirstBlockBegins [97:6] +`--OBJBLOCK -> OBJBLOCK [97:48] + |--LCURLY -> { [97:48] + |--METHOD_DEF -> METHOD_DEF [98:4] + | |--MODIFIERS -> MODIFIERS [98:4] + | |--TYPE -> TYPE [98:4] + | | `--LITERAL_VOID -> void [98:4] + | |--IDENT -> foo [98:9] + | |--LPAREN -> ( [98:12] + | |--PARAMETERS -> PARAMETERS [98:13] + | | `--PARAMETER_DEF -> PARAMETER_DEF [98:13] + | | |--MODIFIERS -> MODIFIERS [98:13] + | | |--TYPE -> TYPE [98:13] + | | | |--IDENT -> String [98:13] + | | | `--ARRAY_DECLARATOR -> [ [98:19] + | | | `--RBRACK -> ] [98:20] + | | `--IDENT -> requests [98:22] + | |--RPAREN -> ) [98:30] + | `--SLIST -> { [98:32] + | |--VARIABLE_DEF -> VARIABLE_DEF [99:8] + | | |--MODIFIERS -> MODIFIERS [99:8] + | | |--TYPE -> TYPE [99:8] + | | | `--IDENT -> Class [99:8] + | | |--IDENT -> mUse4 [99:14] + | | `--ASSIGN -> = [99:20] + | | `--EXPR -> EXPR [99:45] + | | `--DOT -> . [99:45] + | | |--DOT -> . [99:31] + | | | |--DOT -> . [99:26] + | | | | |--IDENT -> java [99:22] + | | | | `--IDENT -> util [99:27] + | | | |--IDENT -> Enumeration [99:32] + | | | `--ARRAY_DECLARATOR -> [ [99:43] + | | | `--RBRACK -> ] [99:44] + | | `--LITERAL_CLASS -> class [99:46] + | |--SEMI -> ; [99:51] + | |--LITERAL_FOR -> for [100:8] + | | |--LPAREN -> ( [100:12] + | | |--FOR_EACH_CLAUSE -> FOR_EACH_CLAUSE [100:13] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [100:13] + | | | | |--MODIFIERS -> MODIFIERS [100:13] + | | | | |--TYPE -> TYPE [100:13] + | | | | | `--IDENT -> String [100:13] + | | | | `--IDENT -> eventDataType [100:20] + | | | |--COLON -> : [100:34] + | | | `--EXPR -> EXPR [100:36] + | | | `--IDENT -> requests [100:36] + | | |--RPAREN -> ) [100:44] + | | `--SLIST -> { [100:46] + | | |--VARIABLE_DEF -> VARIABLE_DEF [101:12] + | | | |--MODIFIERS -> MODIFIERS [101:12] + | | | | `--ANNOTATION -> ANNOTATION [101:12] + | | | | |--AT -> @ [101:12] + | | | | |--IDENT -> SuppressWarnings [101:13] + | | | | |--LPAREN -> ( [101:29] + | | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [101:30] + | | | | | |--IDENT -> value [101:30] + | | | | | |--ASSIGN -> = [101:36] + | | | | | `--EXPR -> EXPR [101:38] + | | | | | `--STRING_LITERAL -> "this previously caused NullPointerException" [101:38] + | | | | `--RPAREN -> ) [101:83] + | | | |--TYPE -> TYPE [102:12] + | | | | `--IDENT -> String [102:12] + | | | `--IDENT -> eventData [102:19] + | | |--SEMI -> ; [102:28] + | | `--RCURLY -> } [103:8] + | `--RCURLY -> } [104:4] + `--RCURLY -> } [105:0] +CLASS_DEF -> CLASS_DEF [106:0] +|--MODIFIERS -> MODIFIERS [106:0] +| `--ABSTRACT -> abstract [106:0] +|--LITERAL_CLASS -> class [106:9] +|--IDENT -> NestedClass [106:15] +`--OBJBLOCK -> OBJBLOCK [106:27] + |--LCURLY -> { [106:27] + |--METHOD_DEF -> METHOD_DEF [107:4] + | |--MODIFIERS -> MODIFIERS [107:4] + | | |--LITERAL_PUBLIC -> public [107:4] + | | `--ABSTRACT -> abstract [107:11] + | |--TYPE -> TYPE [107:20] + | | `--LITERAL_VOID -> void [107:20] + | |--IDENT -> method [107:25] + | |--LPAREN -> ( [107:31] + | |--PARAMETERS -> PARAMETERS [107:32] + | |--RPAREN -> ) [107:32] + | `--SEMI -> ; [107:33] + `--RCURLY -> } [108:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionIllegalCatch.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionIllegalCatch.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionIllegalCatch.java @@ -0,0 +1,19 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +public class InputAntlr4AstRegressionIllegalCatch { + public void foo() { + try { //class names + } catch (RuntimeException e) { + } catch (Exception e) { + } catch (Throwable e) { + } + } + + public void bar() { + try { /* fully qualified class names */ + } catch (java.lang.RuntimeException e) { + } catch (java.lang.Exception e) { + } catch (java.lang.Throwable e) { + } + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionIllegalCatch.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionIllegalCatch.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionIllegalCatch.txt @@ -0,0 +1,122 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +CLASS_DEF -> CLASS_DEF [3:0] +|--MODIFIERS -> MODIFIERS [3:0] +| `--LITERAL_PUBLIC -> public [3:0] +|--LITERAL_CLASS -> class [3:7] +|--IDENT -> InputAntlr4AstRegressionIllegalCatch [3:13] +`--OBJBLOCK -> OBJBLOCK [3:50] + |--LCURLY -> { [3:50] + |--METHOD_DEF -> METHOD_DEF [4:4] + | |--MODIFIERS -> MODIFIERS [4:4] + | | `--LITERAL_PUBLIC -> public [4:4] + | |--TYPE -> TYPE [4:11] + | | `--LITERAL_VOID -> void [4:11] + | |--IDENT -> foo [4:16] + | |--LPAREN -> ( [4:19] + | |--PARAMETERS -> PARAMETERS [4:20] + | |--RPAREN -> ) [4:20] + | `--SLIST -> { [4:22] + | |--LITERAL_TRY -> try [5:8] + | | |--SLIST -> { [5:12] + | | | `--RCURLY -> } [6:8] + | | |--LITERAL_CATCH -> catch [6:10] + | | | |--LPAREN -> ( [6:16] + | | | |--PARAMETER_DEF -> PARAMETER_DEF [6:17] + | | | | |--MODIFIERS -> MODIFIERS [6:17] + | | | | |--TYPE -> TYPE [6:17] + | | | | | `--IDENT -> RuntimeException [6:17] + | | | | `--IDENT -> e [6:34] + | | | |--RPAREN -> ) [6:35] + | | | `--SLIST -> { [6:37] + | | | `--RCURLY -> } [7:8] + | | |--LITERAL_CATCH -> catch [7:10] + | | | |--LPAREN -> ( [7:16] + | | | |--PARAMETER_DEF -> PARAMETER_DEF [7:17] + | | | | |--MODIFIERS -> MODIFIERS [7:17] + | | | | |--TYPE -> TYPE [7:17] + | | | | | `--IDENT -> Exception [7:17] + | | | | `--IDENT -> e [7:27] + | | | |--RPAREN -> ) [7:28] + | | | `--SLIST -> { [7:30] + | | | `--RCURLY -> } [8:8] + | | `--LITERAL_CATCH -> catch [8:10] + | | |--LPAREN -> ( [8:16] + | | |--PARAMETER_DEF -> PARAMETER_DEF [8:17] + | | | |--MODIFIERS -> MODIFIERS [8:17] + | | | |--TYPE -> TYPE [8:17] + | | | | `--IDENT -> Throwable [8:17] + | | | `--IDENT -> e [8:27] + | | |--RPAREN -> ) [8:28] + | | `--SLIST -> { [8:30] + | | `--RCURLY -> } [9:8] + | `--RCURLY -> } [10:4] + |--METHOD_DEF -> METHOD_DEF [12:4] + | |--MODIFIERS -> MODIFIERS [12:4] + | | `--LITERAL_PUBLIC -> public [12:4] + | |--TYPE -> TYPE [12:11] + | | `--LITERAL_VOID -> void [12:11] + | |--IDENT -> bar [12:16] + | |--LPAREN -> ( [12:19] + | |--PARAMETERS -> PARAMETERS [12:20] + | |--RPAREN -> ) [12:20] + | `--SLIST -> { [12:22] + | |--LITERAL_TRY -> try [13:8] + | | |--SLIST -> { [13:12] + | | | `--RCURLY -> } [14:8] + | | |--LITERAL_CATCH -> catch [14:10] + | | | |--LPAREN -> ( [14:16] + | | | |--PARAMETER_DEF -> PARAMETER_DEF [14:26] + | | | | |--MODIFIERS -> MODIFIERS [14:26] + | | | | |--TYPE -> TYPE [14:26] + | | | | | `--DOT -> . [14:26] + | | | | | |--DOT -> . [14:21] + | | | | | | |--IDENT -> java [14:17] + | | | | | | `--IDENT -> lang [14:22] + | | | | | `--IDENT -> RuntimeException [14:27] + | | | | `--IDENT -> e [14:44] + | | | |--RPAREN -> ) [14:45] + | | | `--SLIST -> { [14:47] + | | | `--RCURLY -> } [15:8] + | | |--LITERAL_CATCH -> catch [15:10] + | | | |--LPAREN -> ( [15:16] + | | | |--PARAMETER_DEF -> PARAMETER_DEF [15:26] + | | | | |--MODIFIERS -> MODIFIERS [15:26] + | | | | |--TYPE -> TYPE [15:26] + | | | | | `--DOT -> . [15:26] + | | | | | |--DOT -> . [15:21] + | | | | | | |--IDENT -> java [15:17] + | | | | | | `--IDENT -> lang [15:22] + | | | | | `--IDENT -> Exception [15:27] + | | | | `--IDENT -> e [15:37] + | | | |--RPAREN -> ) [15:38] + | | | `--SLIST -> { [15:40] + | | | `--RCURLY -> } [16:8] + | | `--LITERAL_CATCH -> catch [16:10] + | | |--LPAREN -> ( [16:16] + | | |--PARAMETER_DEF -> PARAMETER_DEF [16:26] + | | | |--MODIFIERS -> MODIFIERS [16:26] + | | | |--TYPE -> TYPE [16:26] + | | | | `--DOT -> . [16:26] + | | | | |--DOT -> . [16:21] + | | | | | |--IDENT -> java [16:17] + | | | | | `--IDENT -> lang [16:22] + | | | | `--IDENT -> Throwable [16:27] + | | | `--IDENT -> e [16:37] + | | |--RPAREN -> ) [16:38] + | | `--SLIST -> { [16:40] + | | `--RCURLY -> } [17:8] + | `--RCURLY -> } [18:4] + `--RCURLY -> } [19:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionImports.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionImports.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionImports.java @@ -0,0 +1,18 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +import static java.lang.String.valueOf; + +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import javax.xml.*; + +public class InputAntlr4AstRegressionImports { +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionImports.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionImports.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionImports.txt @@ -0,0 +1,102 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +STATIC_IMPORT -> import [3:0] +|--LITERAL_STATIC -> static [3:7] +|--DOT -> . [3:30] +| |--DOT -> . [3:23] +| | |--DOT -> . [3:18] +| | | |--IDENT -> java [3:14] +| | | `--IDENT -> lang [3:19] +| | `--IDENT -> String [3:24] +| `--IDENT -> valueOf [3:31] +`--SEMI -> ; [3:38] +IMPORT -> import [5:0] +|--DOT -> . [5:14] +| |--DOT -> . [5:11] +| | |--IDENT -> java [5:7] +| | `--IDENT -> io [5:12] +| `--IDENT -> BufferedReader [5:15] +`--SEMI -> ; [5:29] +IMPORT -> import [6:0] +|--DOT -> . [6:14] +| |--DOT -> . [6:11] +| | |--IDENT -> java [6:7] +| | `--IDENT -> io [6:12] +| `--IDENT -> FileNotFoundException [6:15] +`--SEMI -> ; [6:36] +IMPORT -> import [7:0] +|--DOT -> . [7:14] +| |--DOT -> . [7:11] +| | |--IDENT -> java [7:7] +| | `--IDENT -> io [7:12] +| `--IDENT -> IOException [7:15] +`--SEMI -> ; [7:26] +IMPORT -> import [8:0] +|--DOT -> . [8:14] +| |--DOT -> . [8:11] +| | |--IDENT -> java [8:7] +| | `--IDENT -> io [8:12] +| `--IDENT -> InputStreamReader [8:15] +`--SEMI -> ; [8:32] +IMPORT -> import [9:0] +|--DOT -> . [9:16] +| |--DOT -> . [9:11] +| | |--IDENT -> java [9:7] +| | `--IDENT -> util [9:12] +| `--IDENT -> ArrayList [9:17] +`--SEMI -> ; [9:26] +IMPORT -> import [10:0] +|--DOT -> . [10:16] +| |--DOT -> . [10:11] +| | |--IDENT -> java [10:7] +| | `--IDENT -> util [10:12] +| `--IDENT -> HashMap [10:17] +`--SEMI -> ; [10:24] +IMPORT -> import [11:0] +|--DOT -> . [11:16] +| |--DOT -> . [11:11] +| | |--IDENT -> java [11:7] +| | `--IDENT -> util [11:12] +| `--IDENT -> Iterator [11:17] +`--SEMI -> ; [11:25] +IMPORT -> import [12:0] +|--DOT -> . [12:16] +| |--DOT -> . [12:11] +| | |--IDENT -> java [12:7] +| | `--IDENT -> util [12:12] +| `--IDENT -> List [12:17] +`--SEMI -> ; [12:21] +IMPORT -> import [13:0] +|--DOT -> . [13:16] +| |--DOT -> . [13:11] +| | |--IDENT -> java [13:7] +| | `--IDENT -> util [13:12] +| `--IDENT -> Map [13:17] +`--SEMI -> ; [13:20] +IMPORT -> import [15:0] +|--DOT -> . [15:16] +| |--DOT -> . [15:12] +| | |--IDENT -> javax [15:7] +| | `--IDENT -> xml [15:13] +| `--STAR -> * [15:17] +`--SEMI -> ; [15:18] +CLASS_DEF -> CLASS_DEF [17:0] +|--MODIFIERS -> MODIFIERS [17:0] +| `--LITERAL_PUBLIC -> public [17:0] +|--LITERAL_CLASS -> class [17:7] +|--IDENT -> InputAntlr4AstRegressionImports [17:13] +`--OBJBLOCK -> OBJBLOCK [17:45] + |--LCURLY -> { [17:45] + `--RCURLY -> } [18:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionKeywordsAndOperators.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionKeywordsAndOperators.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionKeywordsAndOperators.java @@ -0,0 +1,282 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +public class InputAntlr4AstRegressionKeywordsAndOperators { + /** ignore assignment **/ + private int mVar1=1; + /** ignore assignment **/ + private int mVar2 =1; + /** Should be ok **/ + private int mVar3 = 1; + + /** method **/ + void method1() + { + final int a = 1; + int b= 1; // Ignore 1 + b=1; // Ignore 1 + b+=1; // Ignore 1 + b -=- 1 + (+ b); // Ignore 2 + b = b ++ + b --; // Ignore 1 + b = ++ b - -- b; // Ignore 1 + } + + /** method **/ + void method2() + { + synchronized(this) { + } + try{ + } + catch(RuntimeException e){ + } + } + + /** + skip blank lines between comment and code, + should be ok + **/ + + + private int mVar4 = 1; + + + /** test WS after void return */ + private void fastExit() + { + boolean complicatedStuffNeeded = true; + if( !complicatedStuffNeeded ) + { + return; // should not complain about missing WS after return + } + else + { + // do complicated stuff + } + } + + + /** test WS after non void return + @return 2 + */ + private int nonVoid() + { + if ( true ) + { + return(2); // should complain about missing WS after return + } + else + { + return 2; // this is ok + } + } + + /** test casts **/ + private void testCasts() + { + Object o = (Object) new Object(); // ok + o = (Object)o; // violation + o = ( Object ) o; // ok + o = (Object) + o; // ok + } + + /** test questions **/ + private void testQuestions() + { + boolean b = (1 == 2)?true:false; + b = (1==2) ? false : true; + } + + /** star test **/ + private void starTest() + { + int x = 2 *3* 4; + } + + /** boolean test **/ + private void boolTest() + { + boolean a = true; + boolean x = ! a; + int z = ~1 + ~ 2; + } + + /** division test **/ + private void divTest() + { + int a = 4 % 2; + int b = 4% 2; + int c = 4 %2; + int d = 4%2; + int e = 4 / 2; + int f = 4/ 2; + int g = 4 /2; + int h = 4/2; + } + + /** @return dot test **/ + private java .lang. String dotTest() + { + Object o = new java.lang.Object(); + o. + toString(); + o + .toString(); + o . toString(); + return o.toString(); + } + + /** assert statement test */ + public void assertTest() + { + // OK + assert true; + + // OK + assert true : "Whups"; + + // evil colons, should be OK + assert "OK".equals(null) ? false : true : "Whups"; + + // missing WS around assert + assert(true); + + // missing WS around colon + assert true:"Whups"; + } + + /** another check */ + void donBradman(Runnable aRun) + { + donBradman(new Runnable() { + public void run() { + } + }); + + final Runnable r = new Runnable() { + public void run() { + } + }; + } + + /** rfe 521323, detect whitespace before ';' */ + void rfe521323() + { + doStuff() ; + // ^ whitespace + for (int i = 0 ; i < 5; i++) { + // ^ whitespace + } + } + + + /** bug 806243 (NoWhitespaceBeforeCheck violation for anonymous inner class) */ + private int i ; + // ^ whitespace + private int i1, i2, i3 ; + // ^ whitespace + private int i4, i5, i6; + + /** bug 806243 (NoWhitespaceBeforeCheck violation for anonymous inner class) */ + void bug806243() + { + Object o = new InputAntlr4AstRegressionKeywordsAndOperators() { + private int j ; + // ^ whitespace + }; + } + + void doStuff() { + } +} + +/** + * Bug 806242 (NoWhitespaceBeforeCheck violation with an interface). + * @author o_sukhodolsky + * @version 1.0 + */ +interface IFoo +{ + void foo() ; + // ^ whitespace +} + +/** + * Avoid Whitespace violations in for loop. + * @author lkuehne + * @version 1.0 + */ +class SpecialCasesInForLoop +{ + void forIterator() + { + // avoid conflict between WhiteSpaceAfter ';' and ParenPad(nospace) + for (int i = 0; i++ < 5;) { + // ^ no whitespace + } + + // bug 895072 + // avoid conflict between ParenPad(space) and NoWhiteSpace before ';' + int i = 0; + for ( ; i < 5; i++ ) { + // ^ whitespace + } + for (int anInt : getSomeInts()) { + //Should be ignored + } + } + + int[] getSomeInts() { + int i = (int) ( 2 / 3 ); + return null; + } + + public void myMethod() { + new Thread() { + public void run() { + } + }.start(); + } + + public void foo(java.util.List<? extends String[]> bar, Comparable<? super Object[]> baz) { } + + public void mySuperMethod() { + Runnable[] runs = new Runnable[] {new Runnable() { + public void run() { + } + }, + new Runnable() { + public void run() { + } + }}; + runs[0] +. + run() +; + } + + public void testNullSemi() { + return ; + } + + public void register(Object obj) { } + + public void doSomething(String args[]) { + register(boolean[].class); + register( args ); + } + + public void parentheses() { + testNullSemi +( +) +; + } + + public static void testNoWhitespaceBeforeEllipses(String ... args) { + } + public String test() { + int pc = 0; + return ((100000+pc)+"").substring(1); + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionKeywordsAndOperators.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionKeywordsAndOperators.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionKeywordsAndOperators.txt @@ -0,0 +1,1242 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +CLASS_DEF -> CLASS_DEF [3:0] +|--MODIFIERS -> MODIFIERS [3:0] +| `--LITERAL_PUBLIC -> public [3:0] +|--LITERAL_CLASS -> class [3:7] +|--IDENT -> InputAntlr4AstRegressionKeywordsAndOperators [3:13] +`--OBJBLOCK -> OBJBLOCK [3:58] + |--LCURLY -> { [3:58] + |--VARIABLE_DEF -> VARIABLE_DEF [5:4] + | |--MODIFIERS -> MODIFIERS [5:4] + | | `--LITERAL_PRIVATE -> private [5:4] + | |--TYPE -> TYPE [5:12] + | | `--LITERAL_INT -> int [5:12] + | |--IDENT -> mVar1 [5:16] + | |--ASSIGN -> = [5:21] + | | `--EXPR -> EXPR [5:22] + | | `--NUM_INT -> 1 [5:22] + | `--SEMI -> ; [5:23] + |--VARIABLE_DEF -> VARIABLE_DEF [7:4] + | |--MODIFIERS -> MODIFIERS [7:4] + | | `--LITERAL_PRIVATE -> private [7:4] + | |--TYPE -> TYPE [7:12] + | | `--LITERAL_INT -> int [7:12] + | |--IDENT -> mVar2 [7:16] + | |--ASSIGN -> = [7:22] + | | `--EXPR -> EXPR [7:23] + | | `--NUM_INT -> 1 [7:23] + | `--SEMI -> ; [7:24] + |--VARIABLE_DEF -> VARIABLE_DEF [9:4] + | |--MODIFIERS -> MODIFIERS [9:4] + | | `--LITERAL_PRIVATE -> private [9:4] + | |--TYPE -> TYPE [9:12] + | | `--LITERAL_INT -> int [9:12] + | |--IDENT -> mVar3 [9:16] + | |--ASSIGN -> = [9:22] + | | `--EXPR -> EXPR [9:24] + | | `--NUM_INT -> 1 [9:24] + | `--SEMI -> ; [9:25] + |--METHOD_DEF -> METHOD_DEF [12:4] + | |--MODIFIERS -> MODIFIERS [12:4] + | |--TYPE -> TYPE [12:4] + | | `--LITERAL_VOID -> void [12:4] + | |--IDENT -> method1 [12:9] + | |--LPAREN -> ( [12:16] + | |--PARAMETERS -> PARAMETERS [12:17] + | |--RPAREN -> ) [12:17] + | `--SLIST -> { [13:4] + | |--VARIABLE_DEF -> VARIABLE_DEF [14:8] + | | |--MODIFIERS -> MODIFIERS [14:8] + | | | `--FINAL -> final [14:8] + | | |--TYPE -> TYPE [14:14] + | | | `--LITERAL_INT -> int [14:14] + | | |--IDENT -> a [14:18] + | | `--ASSIGN -> = [14:20] + | | `--EXPR -> EXPR [14:22] + | | `--NUM_INT -> 1 [14:22] + | |--SEMI -> ; [14:23] + | |--VARIABLE_DEF -> VARIABLE_DEF [15:8] + | | |--MODIFIERS -> MODIFIERS [15:8] + | | |--TYPE -> TYPE [15:8] + | | | `--LITERAL_INT -> int [15:8] + | | |--IDENT -> b [15:12] + | | `--ASSIGN -> = [15:13] + | | `--EXPR -> EXPR [15:15] + | | `--NUM_INT -> 1 [15:15] + | |--SEMI -> ; [15:16] + | |--EXPR -> EXPR [16:9] + | | `--ASSIGN -> = [16:9] + | | |--IDENT -> b [16:8] + | | `--NUM_INT -> 1 [16:10] + | |--SEMI -> ; [16:11] + | |--EXPR -> EXPR [17:9] + | | `--PLUS_ASSIGN -> += [17:9] + | | |--IDENT -> b [17:8] + | | `--NUM_INT -> 1 [17:11] + | |--SEMI -> ; [17:12] + | |--EXPR -> EXPR [18:10] + | | `--MINUS_ASSIGN -> -= [18:10] + | | |--IDENT -> b [18:8] + | | `--PLUS -> + [18:16] + | | |--UNARY_MINUS -> - [18:12] + | | | `--NUM_INT -> 1 [18:14] + | | |--LPAREN -> ( [18:18] + | | |--UNARY_PLUS -> + [18:19] + | | | `--IDENT -> b [18:21] + | | `--RPAREN -> ) [18:22] + | |--SEMI -> ; [18:23] + | |--EXPR -> EXPR [19:10] + | | `--ASSIGN -> = [19:10] + | | |--IDENT -> b [19:8] + | | `--PLUS -> + [19:17] + | | |--POST_INC -> ++ [19:14] + | | | `--IDENT -> b [19:12] + | | `--POST_DEC -> -- [19:21] + | | `--IDENT -> b [19:19] + | |--SEMI -> ; [19:23] + | |--EXPR -> EXPR [20:10] + | | `--ASSIGN -> = [20:10] + | | |--IDENT -> b [20:8] + | | `--MINUS -> - [20:17] + | | |--INC -> ++ [20:12] + | | | `--IDENT -> b [20:15] + | | `--DEC -> -- [20:19] + | | `--IDENT -> b [20:22] + | |--SEMI -> ; [20:23] + | `--RCURLY -> } [21:4] + |--METHOD_DEF -> METHOD_DEF [24:4] + | |--MODIFIERS -> MODIFIERS [24:4] + | |--TYPE -> TYPE [24:4] + | | `--LITERAL_VOID -> void [24:4] + | |--IDENT -> method2 [24:9] + | |--LPAREN -> ( [24:16] + | |--PARAMETERS -> PARAMETERS [24:17] + | |--RPAREN -> ) [24:17] + | `--SLIST -> { [25:4] + | |--LITERAL_SYNCHRONIZED -> synchronized [26:8] + | | |--LPAREN -> ( [26:20] + | | |--EXPR -> EXPR [26:21] + | | | `--LITERAL_THIS -> this [26:21] + | | |--RPAREN -> ) [26:25] + | | `--SLIST -> { [26:27] + | | `--RCURLY -> } [27:8] + | |--LITERAL_TRY -> try [28:8] + | | |--SLIST -> { [28:11] + | | | `--RCURLY -> } [29:8] + | | `--LITERAL_CATCH -> catch [30:8] + | | |--LPAREN -> ( [30:13] + | | |--PARAMETER_DEF -> PARAMETER_DEF [30:14] + | | | |--MODIFIERS -> MODIFIERS [30:14] + | | | |--TYPE -> TYPE [30:14] + | | | | `--IDENT -> RuntimeException [30:14] + | | | `--IDENT -> e [30:31] + | | |--RPAREN -> ) [30:32] + | | `--SLIST -> { [30:33] + | | `--RCURLY -> } [31:8] + | `--RCURLY -> } [32:4] + |--VARIABLE_DEF -> VARIABLE_DEF [40:4] + | |--MODIFIERS -> MODIFIERS [40:4] + | | `--LITERAL_PRIVATE -> private [40:4] + | |--TYPE -> TYPE [40:12] + | | `--LITERAL_INT -> int [40:12] + | |--IDENT -> mVar4 [40:16] + | |--ASSIGN -> = [40:22] + | | `--EXPR -> EXPR [40:24] + | | `--NUM_INT -> 1 [40:24] + | `--SEMI -> ; [40:25] + |--METHOD_DEF -> METHOD_DEF [44:4] + | |--MODIFIERS -> MODIFIERS [44:4] + | | `--LITERAL_PRIVATE -> private [44:4] + | |--TYPE -> TYPE [44:12] + | | `--LITERAL_VOID -> void [44:12] + | |--IDENT -> fastExit [44:17] + | |--LPAREN -> ( [44:25] + | |--PARAMETERS -> PARAMETERS [44:26] + | |--RPAREN -> ) [44:26] + | `--SLIST -> { [45:4] + | |--VARIABLE_DEF -> VARIABLE_DEF [46:8] + | | |--MODIFIERS -> MODIFIERS [46:8] + | | |--TYPE -> TYPE [46:8] + | | | `--LITERAL_BOOLEAN -> boolean [46:8] + | | |--IDENT -> complicatedStuffNeeded [46:16] + | | `--ASSIGN -> = [46:39] + | | `--EXPR -> EXPR [46:41] + | | `--LITERAL_TRUE -> true [46:41] + | |--SEMI -> ; [46:45] + | |--LITERAL_IF -> if [47:8] + | | |--LPAREN -> ( [47:10] + | | |--EXPR -> EXPR [47:12] + | | | `--LNOT -> ! [47:12] + | | | `--IDENT -> complicatedStuffNeeded [47:13] + | | |--RPAREN -> ) [47:36] + | | |--SLIST -> { [48:8] + | | | |--LITERAL_RETURN -> return [49:12] + | | | | `--SEMI -> ; [49:18] + | | | `--RCURLY -> } [50:8] + | | `--LITERAL_ELSE -> else [51:8] + | | `--SLIST -> { [52:8] + | | `--RCURLY -> } [54:8] + | `--RCURLY -> } [55:4] + |--METHOD_DEF -> METHOD_DEF [61:4] + | |--MODIFIERS -> MODIFIERS [61:4] + | | `--LITERAL_PRIVATE -> private [61:4] + | |--TYPE -> TYPE [61:12] + | | `--LITERAL_INT -> int [61:12] + | |--IDENT -> nonVoid [61:16] + | |--LPAREN -> ( [61:23] + | |--PARAMETERS -> PARAMETERS [61:24] + | |--RPAREN -> ) [61:24] + | `--SLIST -> { [62:4] + | |--LITERAL_IF -> if [63:8] + | | |--LPAREN -> ( [63:11] + | | |--EXPR -> EXPR [63:13] + | | | `--LITERAL_TRUE -> true [63:13] + | | |--RPAREN -> ) [63:18] + | | |--SLIST -> { [64:8] + | | | |--LITERAL_RETURN -> return [65:12] + | | | | |--EXPR -> EXPR [65:18] + | | | | | |--LPAREN -> ( [65:18] + | | | | | |--NUM_INT -> 2 [65:19] + | | | | | `--RPAREN -> ) [65:20] + | | | | `--SEMI -> ; [65:21] + | | | `--RCURLY -> } [66:8] + | | `--LITERAL_ELSE -> else [67:8] + | | `--SLIST -> { [68:8] + | | |--LITERAL_RETURN -> return [69:12] + | | | |--EXPR -> EXPR [69:19] + | | | | `--NUM_INT -> 2 [69:19] + | | | `--SEMI -> ; [69:20] + | | `--RCURLY -> } [70:8] + | `--RCURLY -> } [71:4] + |--METHOD_DEF -> METHOD_DEF [74:4] + | |--MODIFIERS -> MODIFIERS [74:4] + | | `--LITERAL_PRIVATE -> private [74:4] + | |--TYPE -> TYPE [74:12] + | | `--LITERAL_VOID -> void [74:12] + | |--IDENT -> testCasts [74:17] + | |--LPAREN -> ( [74:26] + | |--PARAMETERS -> PARAMETERS [74:27] + | |--RPAREN -> ) [74:27] + | `--SLIST -> { [75:4] + | |--VARIABLE_DEF -> VARIABLE_DEF [76:8] + | | |--MODIFIERS -> MODIFIERS [76:8] + | | |--TYPE -> TYPE [76:8] + | | | `--IDENT -> Object [76:8] + | | |--IDENT -> o [76:15] + | | `--ASSIGN -> = [76:17] + | | `--EXPR -> EXPR [76:19] + | | `--TYPECAST -> ( [76:19] + | | |--TYPE -> TYPE [76:20] + | | | `--IDENT -> Object [76:20] + | | |--RPAREN -> ) [76:26] + | | `--LITERAL_NEW -> new [76:28] + | | |--IDENT -> Object [76:32] + | | |--LPAREN -> ( [76:38] + | | |--ELIST -> ELIST [76:39] + | | `--RPAREN -> ) [76:39] + | |--SEMI -> ; [76:40] + | |--EXPR -> EXPR [77:10] + | | `--ASSIGN -> = [77:10] + | | |--IDENT -> o [77:8] + | | `--TYPECAST -> ( [77:12] + | | |--TYPE -> TYPE [77:13] + | | | `--IDENT -> Object [77:13] + | | |--RPAREN -> ) [77:19] + | | `--IDENT -> o [77:20] + | |--SEMI -> ; [77:21] + | |--EXPR -> EXPR [78:10] + | | `--ASSIGN -> = [78:10] + | | |--IDENT -> o [78:8] + | | `--TYPECAST -> ( [78:12] + | | |--TYPE -> TYPE [78:14] + | | | `--IDENT -> Object [78:14] + | | |--RPAREN -> ) [78:21] + | | `--IDENT -> o [78:23] + | |--SEMI -> ; [78:24] + | |--EXPR -> EXPR [79:10] + | | `--ASSIGN -> = [79:10] + | | |--IDENT -> o [79:8] + | | `--TYPECAST -> ( [79:12] + | | |--TYPE -> TYPE [79:13] + | | | `--IDENT -> Object [79:13] + | | |--RPAREN -> ) [79:19] + | | `--IDENT -> o [80:12] + | |--SEMI -> ; [80:13] + | `--RCURLY -> } [81:4] + |--METHOD_DEF -> METHOD_DEF [84:4] + | |--MODIFIERS -> MODIFIERS [84:4] + | | `--LITERAL_PRIVATE -> private [84:4] + | |--TYPE -> TYPE [84:12] + | | `--LITERAL_VOID -> void [84:12] + | |--IDENT -> testQuestions [84:17] + | |--LPAREN -> ( [84:30] + | |--PARAMETERS -> PARAMETERS [84:31] + | |--RPAREN -> ) [84:31] + | `--SLIST -> { [85:4] + | |--VARIABLE_DEF -> VARIABLE_DEF [86:8] + | | |--MODIFIERS -> MODIFIERS [86:8] + | | |--TYPE -> TYPE [86:8] + | | | `--LITERAL_BOOLEAN -> boolean [86:8] + | | |--IDENT -> b [86:16] + | | `--ASSIGN -> = [86:18] + | | `--EXPR -> EXPR [86:28] + | | `--QUESTION -> ? [86:28] + | | |--LPAREN -> ( [86:20] + | | |--EQUAL -> == [86:23] + | | | |--NUM_INT -> 1 [86:21] + | | | `--NUM_INT -> 2 [86:26] + | | |--RPAREN -> ) [86:27] + | | |--LITERAL_TRUE -> true [86:29] + | | |--COLON -> : [86:33] + | | `--LITERAL_FALSE -> false [86:34] + | |--SEMI -> ; [86:39] + | |--EXPR -> EXPR [87:10] + | | `--ASSIGN -> = [87:10] + | | |--IDENT -> b [87:8] + | | `--QUESTION -> ? [87:19] + | | |--LPAREN -> ( [87:12] + | | |--EQUAL -> == [87:14] + | | | |--NUM_INT -> 1 [87:13] + | | | `--NUM_INT -> 2 [87:16] + | | |--RPAREN -> ) [87:17] + | | |--LITERAL_FALSE -> false [87:21] + | | |--COLON -> : [87:27] + | | `--LITERAL_TRUE -> true [87:29] + | |--SEMI -> ; [87:33] + | `--RCURLY -> } [88:4] + |--METHOD_DEF -> METHOD_DEF [91:4] + | |--MODIFIERS -> MODIFIERS [91:4] + | | `--LITERAL_PRIVATE -> private [91:4] + | |--TYPE -> TYPE [91:12] + | | `--LITERAL_VOID -> void [91:12] + | |--IDENT -> starTest [91:17] + | |--LPAREN -> ( [91:25] + | |--PARAMETERS -> PARAMETERS [91:26] + | |--RPAREN -> ) [91:26] + | `--SLIST -> { [92:4] + | |--VARIABLE_DEF -> VARIABLE_DEF [93:8] + | | |--MODIFIERS -> MODIFIERS [93:8] + | | |--TYPE -> TYPE [93:8] + | | | `--LITERAL_INT -> int [93:8] + | | |--IDENT -> x [93:12] + | | `--ASSIGN -> = [93:14] + | | `--EXPR -> EXPR [93:20] + | | `--STAR -> * [93:20] + | | |--STAR -> * [93:18] + | | | |--NUM_INT -> 2 [93:16] + | | | `--NUM_INT -> 3 [93:19] + | | `--NUM_INT -> 4 [93:22] + | |--SEMI -> ; [93:23] + | `--RCURLY -> } [94:4] + |--METHOD_DEF -> METHOD_DEF [97:4] + | |--MODIFIERS -> MODIFIERS [97:4] + | | `--LITERAL_PRIVATE -> private [97:4] + | |--TYPE -> TYPE [97:12] + | | `--LITERAL_VOID -> void [97:12] + | |--IDENT -> boolTest [97:17] + | |--LPAREN -> ( [97:25] + | |--PARAMETERS -> PARAMETERS [97:26] + | |--RPAREN -> ) [97:26] + | `--SLIST -> { [98:4] + | |--VARIABLE_DEF -> VARIABLE_DEF [99:8] + | | |--MODIFIERS -> MODIFIERS [99:8] + | | |--TYPE -> TYPE [99:8] + | | | `--LITERAL_BOOLEAN -> boolean [99:8] + | | |--IDENT -> a [99:16] + | | `--ASSIGN -> = [99:18] + | | `--EXPR -> EXPR [99:20] + | | `--LITERAL_TRUE -> true [99:20] + | |--SEMI -> ; [99:24] + | |--VARIABLE_DEF -> VARIABLE_DEF [100:8] + | | |--MODIFIERS -> MODIFIERS [100:8] + | | |--TYPE -> TYPE [100:8] + | | | `--LITERAL_BOOLEAN -> boolean [100:8] + | | |--IDENT -> x [100:16] + | | `--ASSIGN -> = [100:18] + | | `--EXPR -> EXPR [100:20] + | | `--LNOT -> ! [100:20] + | | `--IDENT -> a [100:22] + | |--SEMI -> ; [100:23] + | |--VARIABLE_DEF -> VARIABLE_DEF [101:8] + | | |--MODIFIERS -> MODIFIERS [101:8] + | | |--TYPE -> TYPE [101:8] + | | | `--LITERAL_INT -> int [101:8] + | | |--IDENT -> z [101:12] + | | `--ASSIGN -> = [101:14] + | | `--EXPR -> EXPR [101:19] + | | `--PLUS -> + [101:19] + | | |--BNOT -> ~ [101:16] + | | | `--NUM_INT -> 1 [101:17] + | | `--BNOT -> ~ [101:21] + | | `--NUM_INT -> 2 [101:23] + | |--SEMI -> ; [101:24] + | `--RCURLY -> } [102:4] + |--METHOD_DEF -> METHOD_DEF [105:4] + | |--MODIFIERS -> MODIFIERS [105:4] + | | `--LITERAL_PRIVATE -> private [105:4] + | |--TYPE -> TYPE [105:12] + | | `--LITERAL_VOID -> void [105:12] + | |--IDENT -> divTest [105:17] + | |--LPAREN -> ( [105:24] + | |--PARAMETERS -> PARAMETERS [105:25] + | |--RPAREN -> ) [105:25] + | `--SLIST -> { [106:4] + | |--VARIABLE_DEF -> VARIABLE_DEF [107:8] + | | |--MODIFIERS -> MODIFIERS [107:8] + | | |--TYPE -> TYPE [107:8] + | | | `--LITERAL_INT -> int [107:8] + | | |--IDENT -> a [107:12] + | | `--ASSIGN -> = [107:14] + | | `--EXPR -> EXPR [107:18] + | | `--MOD -> % [107:18] + | | |--NUM_INT -> 4 [107:16] + | | `--NUM_INT -> 2 [107:20] + | |--SEMI -> ; [107:21] + | |--VARIABLE_DEF -> VARIABLE_DEF [108:8] + | | |--MODIFIERS -> MODIFIERS [108:8] + | | |--TYPE -> TYPE [108:8] + | | | `--LITERAL_INT -> int [108:8] + | | |--IDENT -> b [108:12] + | | `--ASSIGN -> = [108:14] + | | `--EXPR -> EXPR [108:17] + | | `--MOD -> % [108:17] + | | |--NUM_INT -> 4 [108:16] + | | `--NUM_INT -> 2 [108:19] + | |--SEMI -> ; [108:20] + | |--VARIABLE_DEF -> VARIABLE_DEF [109:8] + | | |--MODIFIERS -> MODIFIERS [109:8] + | | |--TYPE -> TYPE [109:8] + | | | `--LITERAL_INT -> int [109:8] + | | |--IDENT -> c [109:12] + | | `--ASSIGN -> = [109:14] + | | `--EXPR -> EXPR [109:18] + | | `--MOD -> % [109:18] + | | |--NUM_INT -> 4 [109:16] + | | `--NUM_INT -> 2 [109:19] + | |--SEMI -> ; [109:20] + | |--VARIABLE_DEF -> VARIABLE_DEF [110:8] + | | |--MODIFIERS -> MODIFIERS [110:8] + | | |--TYPE -> TYPE [110:8] + | | | `--LITERAL_INT -> int [110:8] + | | |--IDENT -> d [110:12] + | | `--ASSIGN -> = [110:14] + | | `--EXPR -> EXPR [110:17] + | | `--MOD -> % [110:17] + | | |--NUM_INT -> 4 [110:16] + | | `--NUM_INT -> 2 [110:18] + | |--SEMI -> ; [110:19] + | |--VARIABLE_DEF -> VARIABLE_DEF [111:8] + | | |--MODIFIERS -> MODIFIERS [111:8] + | | |--TYPE -> TYPE [111:8] + | | | `--LITERAL_INT -> int [111:8] + | | |--IDENT -> e [111:12] + | | `--ASSIGN -> = [111:14] + | | `--EXPR -> EXPR [111:18] + | | `--DIV -> / [111:18] + | | |--NUM_INT -> 4 [111:16] + | | `--NUM_INT -> 2 [111:20] + | |--SEMI -> ; [111:21] + | |--VARIABLE_DEF -> VARIABLE_DEF [112:8] + | | |--MODIFIERS -> MODIFIERS [112:8] + | | |--TYPE -> TYPE [112:8] + | | | `--LITERAL_INT -> int [112:8] + | | |--IDENT -> f [112:12] + | | `--ASSIGN -> = [112:14] + | | `--EXPR -> EXPR [112:17] + | | `--DIV -> / [112:17] + | | |--NUM_INT -> 4 [112:16] + | | `--NUM_INT -> 2 [112:19] + | |--SEMI -> ; [112:20] + | |--VARIABLE_DEF -> VARIABLE_DEF [113:8] + | | |--MODIFIERS -> MODIFIERS [113:8] + | | |--TYPE -> TYPE [113:8] + | | | `--LITERAL_INT -> int [113:8] + | | |--IDENT -> g [113:12] + | | `--ASSIGN -> = [113:14] + | | `--EXPR -> EXPR [113:18] + | | `--DIV -> / [113:18] + | | |--NUM_INT -> 4 [113:16] + | | `--NUM_INT -> 2 [113:19] + | |--SEMI -> ; [113:20] + | |--VARIABLE_DEF -> VARIABLE_DEF [114:8] + | | |--MODIFIERS -> MODIFIERS [114:8] + | | |--TYPE -> TYPE [114:8] + | | | `--LITERAL_INT -> int [114:8] + | | |--IDENT -> h [114:12] + | | `--ASSIGN -> = [114:14] + | | `--EXPR -> EXPR [114:17] + | | `--DIV -> / [114:17] + | | |--NUM_INT -> 4 [114:16] + | | `--NUM_INT -> 2 [114:18] + | |--SEMI -> ; [114:19] + | `--RCURLY -> } [115:4] + |--METHOD_DEF -> METHOD_DEF [118:4] + | |--MODIFIERS -> MODIFIERS [118:4] + | | `--LITERAL_PRIVATE -> private [118:4] + | |--TYPE -> TYPE [118:22] + | | `--DOT -> . [118:22] + | | |--DOT -> . [118:17] + | | | |--IDENT -> java [118:12] + | | | `--IDENT -> lang [118:18] + | | `--IDENT -> String [118:25] + | |--IDENT -> dotTest [118:32] + | |--LPAREN -> ( [118:39] + | |--PARAMETERS -> PARAMETERS [118:40] + | |--RPAREN -> ) [118:40] + | `--SLIST -> { [119:4] + | |--VARIABLE_DEF -> VARIABLE_DEF [120:8] + | | |--MODIFIERS -> MODIFIERS [120:8] + | | |--TYPE -> TYPE [120:8] + | | | `--IDENT -> Object [120:8] + | | |--IDENT -> o [120:15] + | | `--ASSIGN -> = [120:17] + | | `--EXPR -> EXPR [120:19] + | | `--LITERAL_NEW -> new [120:19] + | | |--DOT -> . [120:32] + | | | |--DOT -> . [120:27] + | | | | |--IDENT -> java [120:23] + | | | | `--IDENT -> lang [120:28] + | | | `--IDENT -> Object [120:33] + | | |--LPAREN -> ( [120:39] + | | |--ELIST -> ELIST [120:40] + | | `--RPAREN -> ) [120:40] + | |--SEMI -> ; [120:41] + | |--EXPR -> EXPR [122:20] + | | `--METHOD_CALL -> ( [122:20] + | | |--DOT -> . [121:9] + | | | |--IDENT -> o [121:8] + | | | `--IDENT -> toString [122:12] + | | |--ELIST -> ELIST [122:21] + | | `--RPAREN -> ) [122:21] + | |--SEMI -> ; [122:22] + | |--EXPR -> EXPR [124:21] + | | `--METHOD_CALL -> ( [124:21] + | | |--DOT -> . [124:12] + | | | |--IDENT -> o [123:8] + | | | `--IDENT -> toString [124:13] + | | |--ELIST -> ELIST [124:22] + | | `--RPAREN -> ) [124:22] + | |--SEMI -> ; [124:23] + | |--EXPR -> EXPR [125:20] + | | `--METHOD_CALL -> ( [125:20] + | | |--DOT -> . [125:10] + | | | |--IDENT -> o [125:8] + | | | `--IDENT -> toString [125:12] + | | |--ELIST -> ELIST [125:21] + | | `--RPAREN -> ) [125:21] + | |--SEMI -> ; [125:22] + | |--LITERAL_RETURN -> return [126:8] + | | |--EXPR -> EXPR [126:25] + | | | `--METHOD_CALL -> ( [126:25] + | | | |--DOT -> . [126:16] + | | | | |--IDENT -> o [126:15] + | | | | `--IDENT -> toString [126:17] + | | | |--ELIST -> ELIST [126:26] + | | | `--RPAREN -> ) [126:26] + | | `--SEMI -> ; [126:27] + | `--RCURLY -> } [127:4] + |--METHOD_DEF -> METHOD_DEF [130:4] + | |--MODIFIERS -> MODIFIERS [130:4] + | | `--LITERAL_PUBLIC -> public [130:4] + | |--TYPE -> TYPE [130:11] + | | `--LITERAL_VOID -> void [130:11] + | |--IDENT -> assertTest [130:16] + | |--LPAREN -> ( [130:26] + | |--PARAMETERS -> PARAMETERS [130:27] + | |--RPAREN -> ) [130:27] + | `--SLIST -> { [131:4] + | |--LITERAL_ASSERT -> assert [133:8] + | | |--EXPR -> EXPR [133:15] + | | | `--LITERAL_TRUE -> true [133:15] + | | `--SEMI -> ; [133:19] + | |--LITERAL_ASSERT -> assert [136:8] + | | |--EXPR -> EXPR [136:15] + | | | `--LITERAL_TRUE -> true [136:15] + | | |--COLON -> : [136:20] + | | |--EXPR -> EXPR [136:22] + | | | `--STRING_LITERAL -> "Whups" [136:22] + | | `--SEMI -> ; [136:29] + | |--LITERAL_ASSERT -> assert [139:8] + | | |--EXPR -> EXPR [139:33] + | | | `--QUESTION -> ? [139:33] + | | | |--METHOD_CALL -> ( [139:26] + | | | | |--DOT -> . [139:19] + | | | | | |--STRING_LITERAL -> "OK" [139:15] + | | | | | `--IDENT -> equals [139:20] + | | | | |--ELIST -> ELIST [139:27] + | | | | | `--EXPR -> EXPR [139:27] + | | | | | `--LITERAL_NULL -> null [139:27] + | | | | `--RPAREN -> ) [139:31] + | | | |--LITERAL_FALSE -> false [139:35] + | | | |--COLON -> : [139:41] + | | | `--LITERAL_TRUE -> true [139:43] + | | |--COLON -> : [139:48] + | | |--EXPR -> EXPR [139:50] + | | | `--STRING_LITERAL -> "Whups" [139:50] + | | `--SEMI -> ; [139:57] + | |--LITERAL_ASSERT -> assert [142:8] + | | |--EXPR -> EXPR [142:14] + | | | |--LPAREN -> ( [142:14] + | | | |--LITERAL_TRUE -> true [142:15] + | | | `--RPAREN -> ) [142:19] + | | `--SEMI -> ; [142:20] + | |--LITERAL_ASSERT -> assert [145:8] + | | |--EXPR -> EXPR [145:15] + | | | `--LITERAL_TRUE -> true [145:15] + | | |--COLON -> : [145:19] + | | |--EXPR -> EXPR [145:20] + | | | `--STRING_LITERAL -> "Whups" [145:20] + | | `--SEMI -> ; [145:27] + | `--RCURLY -> } [146:4] + |--METHOD_DEF -> METHOD_DEF [149:4] + | |--MODIFIERS -> MODIFIERS [149:4] + | |--TYPE -> TYPE [149:4] + | | `--LITERAL_VOID -> void [149:4] + | |--IDENT -> donBradman [149:9] + | |--LPAREN -> ( [149:19] + | |--PARAMETERS -> PARAMETERS [149:20] + | | `--PARAMETER_DEF -> PARAMETER_DEF [149:20] + | | |--MODIFIERS -> MODIFIERS [149:20] + | | |--TYPE -> TYPE [149:20] + | | | `--IDENT -> Runnable [149:20] + | | `--IDENT -> aRun [149:29] + | |--RPAREN -> ) [149:33] + | `--SLIST -> { [150:4] + | |--EXPR -> EXPR [151:18] + | | `--METHOD_CALL -> ( [151:18] + | | |--IDENT -> donBradman [151:8] + | | |--ELIST -> ELIST [151:19] + | | | `--EXPR -> EXPR [151:19] + | | | `--LITERAL_NEW -> new [151:19] + | | | |--IDENT -> Runnable [151:23] + | | | |--LPAREN -> ( [151:31] + | | | |--ELIST -> ELIST [151:32] + | | | |--RPAREN -> ) [151:32] + | | | `--OBJBLOCK -> OBJBLOCK [151:34] + | | | |--LCURLY -> { [151:34] + | | | |--METHOD_DEF -> METHOD_DEF [152:12] + | | | | |--MODIFIERS -> MODIFIERS [152:12] + | | | | | `--LITERAL_PUBLIC -> public [152:12] + | | | | |--TYPE -> TYPE [152:19] + | | | | | `--LITERAL_VOID -> void [152:19] + | | | | |--IDENT -> run [152:24] + | | | | |--LPAREN -> ( [152:27] + | | | | |--PARAMETERS -> PARAMETERS [152:28] + | | | | |--RPAREN -> ) [152:28] + | | | | `--SLIST -> { [152:30] + | | | | `--RCURLY -> } [153:12] + | | | `--RCURLY -> } [154:8] + | | `--RPAREN -> ) [154:9] + | |--SEMI -> ; [154:10] + | |--VARIABLE_DEF -> VARIABLE_DEF [156:8] + | | |--MODIFIERS -> MODIFIERS [156:8] + | | | `--FINAL -> final [156:8] + | | |--TYPE -> TYPE [156:14] + | | | `--IDENT -> Runnable [156:14] + | | |--IDENT -> r [156:23] + | | `--ASSIGN -> = [156:25] + | | `--EXPR -> EXPR [156:27] + | | `--LITERAL_NEW -> new [156:27] + | | |--IDENT -> Runnable [156:31] + | | |--LPAREN -> ( [156:39] + | | |--ELIST -> ELIST [156:40] + | | |--RPAREN -> ) [156:40] + | | `--OBJBLOCK -> OBJBLOCK [156:42] + | | |--LCURLY -> { [156:42] + | | |--METHOD_DEF -> METHOD_DEF [157:12] + | | | |--MODIFIERS -> MODIFIERS [157:12] + | | | | `--LITERAL_PUBLIC -> public [157:12] + | | | |--TYPE -> TYPE [157:19] + | | | | `--LITERAL_VOID -> void [157:19] + | | | |--IDENT -> run [157:24] + | | | |--LPAREN -> ( [157:27] + | | | |--PARAMETERS -> PARAMETERS [157:28] + | | | |--RPAREN -> ) [157:28] + | | | `--SLIST -> { [157:30] + | | | `--RCURLY -> } [158:12] + | | `--RCURLY -> } [159:8] + | |--SEMI -> ; [159:9] + | `--RCURLY -> } [160:4] + |--METHOD_DEF -> METHOD_DEF [163:4] + | |--MODIFIERS -> MODIFIERS [163:4] + | |--TYPE -> TYPE [163:4] + | | `--LITERAL_VOID -> void [163:4] + | |--IDENT -> rfe521323 [163:9] + | |--LPAREN -> ( [163:18] + | |--PARAMETERS -> PARAMETERS [163:19] + | |--RPAREN -> ) [163:19] + | `--SLIST -> { [164:4] + | |--EXPR -> EXPR [165:15] + | | `--METHOD_CALL -> ( [165:15] + | | |--IDENT -> doStuff [165:8] + | | |--ELIST -> ELIST [165:16] + | | `--RPAREN -> ) [165:16] + | |--SEMI -> ; [165:18] + | |--LITERAL_FOR -> for [167:8] + | | |--LPAREN -> ( [167:12] + | | |--FOR_INIT -> FOR_INIT [167:13] + | | | `--VARIABLE_DEF -> VARIABLE_DEF [167:13] + | | | |--MODIFIERS -> MODIFIERS [167:13] + | | | |--TYPE -> TYPE [167:13] + | | | | `--LITERAL_INT -> int [167:13] + | | | |--IDENT -> i [167:17] + | | | `--ASSIGN -> = [167:19] + | | | `--EXPR -> EXPR [167:21] + | | | `--NUM_INT -> 0 [167:21] + | | |--SEMI -> ; [167:23] + | | |--FOR_CONDITION -> FOR_CONDITION [167:27] + | | | `--EXPR -> EXPR [167:27] + | | | `--LT -> < [167:27] + | | | |--IDENT -> i [167:25] + | | | `--NUM_INT -> 5 [167:29] + | | |--SEMI -> ; [167:30] + | | |--FOR_ITERATOR -> FOR_ITERATOR [167:33] + | | | `--ELIST -> ELIST [167:33] + | | | `--EXPR -> EXPR [167:33] + | | | `--POST_INC -> ++ [167:33] + | | | `--IDENT -> i [167:32] + | | |--RPAREN -> ) [167:35] + | | `--SLIST -> { [167:37] + | | `--RCURLY -> } [169:8] + | `--RCURLY -> } [170:4] + |--VARIABLE_DEF -> VARIABLE_DEF [174:4] + | |--MODIFIERS -> MODIFIERS [174:4] + | | `--LITERAL_PRIVATE -> private [174:4] + | |--TYPE -> TYPE [174:12] + | | `--LITERAL_INT -> int [174:12] + | |--IDENT -> i [174:16] + | `--SEMI -> ; [174:18] + |--VARIABLE_DEF -> VARIABLE_DEF [176:4] + | |--MODIFIERS -> MODIFIERS [176:4] + | | `--LITERAL_PRIVATE -> private [176:4] + | |--TYPE -> TYPE [176:12] + | | `--LITERAL_INT -> int [176:12] + | |--IDENT -> i1 [176:16] + | `--SEMI -> ; [176:27] + |--COMMA -> , [176:18] + |--VARIABLE_DEF -> VARIABLE_DEF [176:4] + | |--MODIFIERS -> MODIFIERS [176:4] + | | `--LITERAL_PRIVATE -> private [176:4] + | |--TYPE -> TYPE [176:12] + | | `--LITERAL_INT -> int [176:12] + | `--IDENT -> i2 [176:20] + |--COMMA -> , [176:22] + |--VARIABLE_DEF -> VARIABLE_DEF [176:4] + | |--MODIFIERS -> MODIFIERS [176:4] + | | `--LITERAL_PRIVATE -> private [176:4] + | |--TYPE -> TYPE [176:12] + | | `--LITERAL_INT -> int [176:12] + | `--IDENT -> i3 [176:24] + |--VARIABLE_DEF -> VARIABLE_DEF [178:4] + | |--MODIFIERS -> MODIFIERS [178:4] + | | `--LITERAL_PRIVATE -> private [178:4] + | |--TYPE -> TYPE [178:12] + | | `--LITERAL_INT -> int [178:12] + | |--IDENT -> i4 [178:16] + | `--SEMI -> ; [178:26] + |--COMMA -> , [178:18] + |--VARIABLE_DEF -> VARIABLE_DEF [178:4] + | |--MODIFIERS -> MODIFIERS [178:4] + | | `--LITERAL_PRIVATE -> private [178:4] + | |--TYPE -> TYPE [178:12] + | | `--LITERAL_INT -> int [178:12] + | `--IDENT -> i5 [178:20] + |--COMMA -> , [178:22] + |--VARIABLE_DEF -> VARIABLE_DEF [178:4] + | |--MODIFIERS -> MODIFIERS [178:4] + | | `--LITERAL_PRIVATE -> private [178:4] + | |--TYPE -> TYPE [178:12] + | | `--LITERAL_INT -> int [178:12] + | `--IDENT -> i6 [178:24] + |--METHOD_DEF -> METHOD_DEF [181:4] + | |--MODIFIERS -> MODIFIERS [181:4] + | |--TYPE -> TYPE [181:4] + | | `--LITERAL_VOID -> void [181:4] + | |--IDENT -> bug806243 [181:9] + | |--LPAREN -> ( [181:18] + | |--PARAMETERS -> PARAMETERS [181:19] + | |--RPAREN -> ) [181:19] + | `--SLIST -> { [182:4] + | |--VARIABLE_DEF -> VARIABLE_DEF [183:8] + | | |--MODIFIERS -> MODIFIERS [183:8] + | | |--TYPE -> TYPE [183:8] + | | | `--IDENT -> Object [183:8] + | | |--IDENT -> o [183:15] + | | `--ASSIGN -> = [183:17] + | | `--EXPR -> EXPR [183:19] + | | `--LITERAL_NEW -> new [183:19] + | | |--IDENT -> InputAntlr4AstRegressionKeywordsAndOperators [183:23] + | | |--LPAREN -> ( [183:67] + | | |--ELIST -> ELIST [183:68] + | | |--RPAREN -> ) [183:68] + | | `--OBJBLOCK -> OBJBLOCK [183:70] + | | |--LCURLY -> { [183:70] + | | |--VARIABLE_DEF -> VARIABLE_DEF [184:12] + | | | |--MODIFIERS -> MODIFIERS [184:12] + | | | | `--LITERAL_PRIVATE -> private [184:12] + | | | |--TYPE -> TYPE [184:20] + | | | | `--LITERAL_INT -> int [184:20] + | | | |--IDENT -> j [184:24] + | | | `--SEMI -> ; [184:26] + | | `--RCURLY -> } [186:8] + | |--SEMI -> ; [186:9] + | `--RCURLY -> } [187:4] + |--METHOD_DEF -> METHOD_DEF [189:4] + | |--MODIFIERS -> MODIFIERS [189:4] + | |--TYPE -> TYPE [189:4] + | | `--LITERAL_VOID -> void [189:4] + | |--IDENT -> doStuff [189:9] + | |--LPAREN -> ( [189:16] + | |--PARAMETERS -> PARAMETERS [189:17] + | |--RPAREN -> ) [189:17] + | `--SLIST -> { [189:19] + | `--RCURLY -> } [190:4] + `--RCURLY -> } [191:0] +INTERFACE_DEF -> INTERFACE_DEF [198:0] +|--MODIFIERS -> MODIFIERS [198:0] +|--LITERAL_INTERFACE -> interface [198:0] +|--IDENT -> IFoo [198:10] +`--OBJBLOCK -> OBJBLOCK [199:0] + |--LCURLY -> { [199:0] + |--METHOD_DEF -> METHOD_DEF [200:4] + | |--MODIFIERS -> MODIFIERS [200:4] + | |--TYPE -> TYPE [200:4] + | | `--LITERAL_VOID -> void [200:4] + | |--IDENT -> foo [200:9] + | |--LPAREN -> ( [200:12] + | |--PARAMETERS -> PARAMETERS [200:13] + | |--RPAREN -> ) [200:13] + | `--SEMI -> ; [200:15] + `--RCURLY -> } [202:0] +CLASS_DEF -> CLASS_DEF [209:0] +|--MODIFIERS -> MODIFIERS [209:0] +|--LITERAL_CLASS -> class [209:0] +|--IDENT -> SpecialCasesInForLoop [209:6] +`--OBJBLOCK -> OBJBLOCK [210:0] + |--LCURLY -> { [210:0] + |--METHOD_DEF -> METHOD_DEF [211:4] + | |--MODIFIERS -> MODIFIERS [211:4] + | |--TYPE -> TYPE [211:4] + | | `--LITERAL_VOID -> void [211:4] + | |--IDENT -> forIterator [211:9] + | |--LPAREN -> ( [211:20] + | |--PARAMETERS -> PARAMETERS [211:21] + | |--RPAREN -> ) [211:21] + | `--SLIST -> { [212:4] + | |--LITERAL_FOR -> for [214:8] + | | |--LPAREN -> ( [214:12] + | | |--FOR_INIT -> FOR_INIT [214:13] + | | | `--VARIABLE_DEF -> VARIABLE_DEF [214:13] + | | | |--MODIFIERS -> MODIFIERS [214:13] + | | | |--TYPE -> TYPE [214:13] + | | | | `--LITERAL_INT -> int [214:13] + | | | |--IDENT -> i [214:17] + | | | `--ASSIGN -> = [214:19] + | | | `--EXPR -> EXPR [214:21] + | | | `--NUM_INT -> 0 [214:21] + | | |--SEMI -> ; [214:22] + | | |--FOR_CONDITION -> FOR_CONDITION [214:28] + | | | `--EXPR -> EXPR [214:28] + | | | `--LT -> < [214:28] + | | | |--POST_INC -> ++ [214:25] + | | | | `--IDENT -> i [214:24] + | | | `--NUM_INT -> 5 [214:30] + | | |--SEMI -> ; [214:31] + | | |--FOR_ITERATOR -> FOR_ITERATOR [214:32] + | | |--RPAREN -> ) [214:32] + | | `--SLIST -> { [214:34] + | | `--RCURLY -> } [216:4] + | |--VARIABLE_DEF -> VARIABLE_DEF [220:4] + | | |--MODIFIERS -> MODIFIERS [220:4] + | | |--TYPE -> TYPE [220:4] + | | | `--LITERAL_INT -> int [220:4] + | | |--IDENT -> i [220:8] + | | `--ASSIGN -> = [220:10] + | | `--EXPR -> EXPR [220:12] + | | `--NUM_INT -> 0 [220:12] + | |--SEMI -> ; [220:13] + | |--LITERAL_FOR -> for [221:4] + | | |--LPAREN -> ( [221:8] + | | |--FOR_INIT -> FOR_INIT [221:10] + | | |--SEMI -> ; [221:10] + | | |--FOR_CONDITION -> FOR_CONDITION [221:14] + | | | `--EXPR -> EXPR [221:14] + | | | `--LT -> < [221:14] + | | | |--IDENT -> i [221:12] + | | | `--NUM_INT -> 5 [221:16] + | | |--SEMI -> ; [221:17] + | | |--FOR_ITERATOR -> FOR_ITERATOR [221:20] + | | | `--ELIST -> ELIST [221:20] + | | | `--EXPR -> EXPR [221:20] + | | | `--POST_INC -> ++ [221:20] + | | | `--IDENT -> i [221:19] + | | |--RPAREN -> ) [221:23] + | | `--SLIST -> { [221:25] + | | `--RCURLY -> } [223:4] + | |--LITERAL_FOR -> for [224:8] + | | |--LPAREN -> ( [224:12] + | | |--FOR_EACH_CLAUSE -> FOR_EACH_CLAUSE [224:13] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [224:13] + | | | | |--MODIFIERS -> MODIFIERS [224:13] + | | | | |--TYPE -> TYPE [224:13] + | | | | | `--LITERAL_INT -> int [224:13] + | | | | `--IDENT -> anInt [224:17] + | | | |--COLON -> : [224:23] + | | | `--EXPR -> EXPR [224:36] + | | | `--METHOD_CALL -> ( [224:36] + | | | |--IDENT -> getSomeInts [224:25] + | | | |--ELIST -> ELIST [224:37] + | | | `--RPAREN -> ) [224:37] + | | |--RPAREN -> ) [224:38] + | | `--SLIST -> { [224:40] + | | `--RCURLY -> } [226:8] + | `--RCURLY -> } [227:4] + |--METHOD_DEF -> METHOD_DEF [229:4] + | |--MODIFIERS -> MODIFIERS [229:4] + | |--TYPE -> TYPE [229:4] + | | |--LITERAL_INT -> int [229:4] + | | `--ARRAY_DECLARATOR -> [ [229:7] + | | `--RBRACK -> ] [229:8] + | |--IDENT -> getSomeInts [229:10] + | |--LPAREN -> ( [229:21] + | |--PARAMETERS -> PARAMETERS [229:22] + | |--RPAREN -> ) [229:22] + | `--SLIST -> { [229:24] + | |--VARIABLE_DEF -> VARIABLE_DEF [230:8] + | | |--MODIFIERS -> MODIFIERS [230:8] + | | |--TYPE -> TYPE [230:8] + | | | `--LITERAL_INT -> int [230:8] + | | |--IDENT -> i [230:12] + | | `--ASSIGN -> = [230:14] + | | `--EXPR -> EXPR [230:16] + | | `--TYPECAST -> ( [230:16] + | | |--TYPE -> TYPE [230:17] + | | | `--LITERAL_INT -> int [230:17] + | | |--RPAREN -> ) [230:20] + | | |--LPAREN -> ( [230:22] + | | |--DIV -> / [230:26] + | | | |--NUM_INT -> 2 [230:24] + | | | `--NUM_INT -> 3 [230:28] + | | `--RPAREN -> ) [230:30] + | |--SEMI -> ; [230:31] + | |--LITERAL_RETURN -> return [231:8] + | | |--EXPR -> EXPR [231:15] + | | | `--LITERAL_NULL -> null [231:15] + | | `--SEMI -> ; [231:19] + | `--RCURLY -> } [232:4] + |--METHOD_DEF -> METHOD_DEF [234:4] + | |--MODIFIERS -> MODIFIERS [234:4] + | | `--LITERAL_PUBLIC -> public [234:4] + | |--TYPE -> TYPE [234:11] + | | `--LITERAL_VOID -> void [234:11] + | |--IDENT -> myMethod [234:16] + | |--LPAREN -> ( [234:24] + | |--PARAMETERS -> PARAMETERS [234:25] + | |--RPAREN -> ) [234:25] + | `--SLIST -> { [234:27] + | |--EXPR -> EXPR [238:15] + | | `--METHOD_CALL -> ( [238:15] + | | |--DOT -> . [238:9] + | | | |--LITERAL_NEW -> new [235:8] + | | | | |--IDENT -> Thread [235:12] + | | | | |--LPAREN -> ( [235:18] + | | | | |--ELIST -> ELIST [235:19] + | | | | |--RPAREN -> ) [235:19] + | | | | `--OBJBLOCK -> OBJBLOCK [235:21] + | | | | |--LCURLY -> { [235:21] + | | | | |--METHOD_DEF -> METHOD_DEF [236:12] + | | | | | |--MODIFIERS -> MODIFIERS [236:12] + | | | | | | `--LITERAL_PUBLIC -> public [236:12] + | | | | | |--TYPE -> TYPE [236:19] + | | | | | | `--LITERAL_VOID -> void [236:19] + | | | | | |--IDENT -> run [236:24] + | | | | | |--LPAREN -> ( [236:27] + | | | | | |--PARAMETERS -> PARAMETERS [236:28] + | | | | | |--RPAREN -> ) [236:28] + | | | | | `--SLIST -> { [236:30] + | | | | | `--RCURLY -> } [237:12] + | | | | `--RCURLY -> } [238:8] + | | | `--IDENT -> start [238:10] + | | |--ELIST -> ELIST [238:16] + | | `--RPAREN -> ) [238:16] + | |--SEMI -> ; [238:17] + | `--RCURLY -> } [239:4] + |--METHOD_DEF -> METHOD_DEF [241:4] + | |--MODIFIERS -> MODIFIERS [241:4] + | | `--LITERAL_PUBLIC -> public [241:4] + | |--TYPE -> TYPE [241:11] + | | `--LITERAL_VOID -> void [241:11] + | |--IDENT -> foo [241:16] + | |--LPAREN -> ( [241:19] + | |--PARAMETERS -> PARAMETERS [241:29] + | | |--PARAMETER_DEF -> PARAMETER_DEF [241:29] + | | | |--MODIFIERS -> MODIFIERS [241:29] + | | | |--TYPE -> TYPE [241:29] + | | | | `--DOT -> . [241:29] + | | | | |--DOT -> . [241:24] + | | | | | |--IDENT -> java [241:20] + | | | | | `--IDENT -> util [241:25] + | | | | |--IDENT -> List [241:30] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [241:34] + | | | | |--GENERIC_START -> < [241:34] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [241:35] + | | | | | |--WILDCARD_TYPE -> ? [241:35] + | | | | | `--TYPE_UPPER_BOUNDS -> extends [241:37] + | | | | | |--IDENT -> String [241:45] + | | | | | `--ARRAY_DECLARATOR -> [ [241:51] + | | | | | `--RBRACK -> ] [241:52] + | | | | `--GENERIC_END -> > [241:53] + | | | `--IDENT -> bar [241:55] + | | |--COMMA -> , [241:58] + | | `--PARAMETER_DEF -> PARAMETER_DEF [241:60] + | | |--MODIFIERS -> MODIFIERS [241:60] + | | |--TYPE -> TYPE [241:60] + | | | |--IDENT -> Comparable [241:60] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [241:70] + | | | |--GENERIC_START -> < [241:70] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [241:71] + | | | | |--WILDCARD_TYPE -> ? [241:71] + | | | | `--TYPE_LOWER_BOUNDS -> super [241:73] + | | | | |--IDENT -> Object [241:79] + | | | | `--ARRAY_DECLARATOR -> [ [241:85] + | | | | `--RBRACK -> ] [241:86] + | | | `--GENERIC_END -> > [241:87] + | | `--IDENT -> baz [241:89] + | |--RPAREN -> ) [241:92] + | `--SLIST -> { [241:94] + | `--RCURLY -> } [241:96] + |--METHOD_DEF -> METHOD_DEF [243:4] + | |--MODIFIERS -> MODIFIERS [243:4] + | | `--LITERAL_PUBLIC -> public [243:4] + | |--TYPE -> TYPE [243:11] + | | `--LITERAL_VOID -> void [243:11] + | |--IDENT -> mySuperMethod [243:16] + | |--LPAREN -> ( [243:29] + | |--PARAMETERS -> PARAMETERS [243:30] + | |--RPAREN -> ) [243:30] + | `--SLIST -> { [243:32] + | |--VARIABLE_DEF -> VARIABLE_DEF [244:8] + | | |--MODIFIERS -> MODIFIERS [244:8] + | | |--TYPE -> TYPE [244:8] + | | | |--IDENT -> Runnable [244:8] + | | | `--ARRAY_DECLARATOR -> [ [244:16] + | | | `--RBRACK -> ] [244:17] + | | |--IDENT -> runs [244:19] + | | `--ASSIGN -> = [244:24] + | | `--EXPR -> EXPR [244:26] + | | `--LITERAL_NEW -> new [244:26] + | | |--IDENT -> Runnable [244:30] + | | |--ARRAY_DECLARATOR -> [ [244:38] + | | | `--RBRACK -> ] [244:39] + | | `--ARRAY_INIT -> { [244:41] + | | |--EXPR -> EXPR [244:42] + | | | `--LITERAL_NEW -> new [244:42] + | | | |--IDENT -> Runnable [244:46] + | | | |--LPAREN -> ( [244:54] + | | | |--ELIST -> ELIST [244:55] + | | | |--RPAREN -> ) [244:55] + | | | `--OBJBLOCK -> OBJBLOCK [244:57] + | | | |--LCURLY -> { [244:57] + | | | |--METHOD_DEF -> METHOD_DEF [245:16] + | | | | |--MODIFIERS -> MODIFIERS [245:16] + | | | | | `--LITERAL_PUBLIC -> public [245:16] + | | | | |--TYPE -> TYPE [245:23] + | | | | | `--LITERAL_VOID -> void [245:23] + | | | | |--IDENT -> run [245:28] + | | | | |--LPAREN -> ( [245:31] + | | | | |--PARAMETERS -> PARAMETERS [245:32] + | | | | |--RPAREN -> ) [245:32] + | | | | `--SLIST -> { [245:34] + | | | | `--RCURLY -> } [246:16] + | | | `--RCURLY -> } [247:12] + | | |--COMMA -> , [247:13] + | | |--EXPR -> EXPR [248:12] + | | | `--LITERAL_NEW -> new [248:12] + | | | |--IDENT -> Runnable [248:16] + | | | |--LPAREN -> ( [248:24] + | | | |--ELIST -> ELIST [248:25] + | | | |--RPAREN -> ) [248:25] + | | | `--OBJBLOCK -> OBJBLOCK [248:27] + | | | |--LCURLY -> { [248:27] + | | | |--METHOD_DEF -> METHOD_DEF [249:16] + | | | | |--MODIFIERS -> MODIFIERS [249:16] + | | | | | `--LITERAL_PUBLIC -> public [249:16] + | | | | |--TYPE -> TYPE [249:23] + | | | | | `--LITERAL_VOID -> void [249:23] + | | | | |--IDENT -> run [249:28] + | | | | |--LPAREN -> ( [249:31] + | | | | |--PARAMETERS -> PARAMETERS [249:32] + | | | | |--RPAREN -> ) [249:32] + | | | | `--SLIST -> { [249:34] + | | | | `--RCURLY -> } [250:16] + | | | `--RCURLY -> } [251:12] + | | `--RCURLY -> } [251:13] + | |--SEMI -> ; [251:14] + | |--EXPR -> EXPR [254:4] + | | `--METHOD_CALL -> ( [254:4] + | | |--DOT -> . [253:0] + | | | |--INDEX_OP -> [ [252:12] + | | | | |--IDENT -> runs [252:8] + | | | | |--EXPR -> EXPR [252:13] + | | | | | `--NUM_INT -> 0 [252:13] + | | | | `--RBRACK -> ] [252:14] + | | | `--IDENT -> run [254:1] + | | |--ELIST -> ELIST [254:5] + | | `--RPAREN -> ) [254:5] + | |--SEMI -> ; [255:0] + | `--RCURLY -> } [256:4] + |--METHOD_DEF -> METHOD_DEF [258:4] + | |--MODIFIERS -> MODIFIERS [258:4] + | | `--LITERAL_PUBLIC -> public [258:4] + | |--TYPE -> TYPE [258:11] + | | `--LITERAL_VOID -> void [258:11] + | |--IDENT -> testNullSemi [258:16] + | |--LPAREN -> ( [258:28] + | |--PARAMETERS -> PARAMETERS [258:29] + | |--RPAREN -> ) [258:29] + | `--SLIST -> { [258:31] + | |--LITERAL_RETURN -> return [259:8] + | | `--SEMI -> ; [259:15] + | `--RCURLY -> } [260:4] + |--METHOD_DEF -> METHOD_DEF [262:4] + | |--MODIFIERS -> MODIFIERS [262:4] + | | `--LITERAL_PUBLIC -> public [262:4] + | |--TYPE -> TYPE [262:11] + | | `--LITERAL_VOID -> void [262:11] + | |--IDENT -> register [262:16] + | |--LPAREN -> ( [262:24] + | |--PARAMETERS -> PARAMETERS [262:25] + | | `--PARAMETER_DEF -> PARAMETER_DEF [262:25] + | | |--MODIFIERS -> MODIFIERS [262:25] + | | |--TYPE -> TYPE [262:25] + | | | `--IDENT -> Object [262:25] + | | `--IDENT -> obj [262:32] + | |--RPAREN -> ) [262:35] + | `--SLIST -> { [262:37] + | `--RCURLY -> } [262:39] + |--METHOD_DEF -> METHOD_DEF [264:4] + | |--MODIFIERS -> MODIFIERS [264:4] + | | `--LITERAL_PUBLIC -> public [264:4] + | |--TYPE -> TYPE [264:11] + | | `--LITERAL_VOID -> void [264:11] + | |--IDENT -> doSomething [264:16] + | |--LPAREN -> ( [264:27] + | |--PARAMETERS -> PARAMETERS [264:28] + | | `--PARAMETER_DEF -> PARAMETER_DEF [264:28] + | | |--MODIFIERS -> MODIFIERS [264:28] + | | |--TYPE -> TYPE [264:28] + | | | |--IDENT -> String [264:28] + | | | `--ARRAY_DECLARATOR -> [ [264:39] + | | | `--RBRACK -> ] [264:40] + | | `--IDENT -> args [264:35] + | |--RPAREN -> ) [264:41] + | `--SLIST -> { [264:43] + | |--EXPR -> EXPR [265:16] + | | `--METHOD_CALL -> ( [265:16] + | | |--IDENT -> register [265:8] + | | |--ELIST -> ELIST [265:26] + | | | `--EXPR -> EXPR [265:26] + | | | `--DOT -> . [265:26] + | | | |--LITERAL_BOOLEAN -> boolean [265:17] + | | | |--ARRAY_DECLARATOR -> [ [265:24] + | | | | `--RBRACK -> ] [265:25] + | | | `--LITERAL_CLASS -> class [265:27] + | | `--RPAREN -> ) [265:32] + | |--SEMI -> ; [265:33] + | |--EXPR -> EXPR [266:16] + | | `--METHOD_CALL -> ( [266:16] + | | |--IDENT -> register [266:8] + | | |--ELIST -> ELIST [266:18] + | | | `--EXPR -> EXPR [266:18] + | | | `--IDENT -> args [266:18] + | | `--RPAREN -> ) [266:23] + | |--SEMI -> ; [266:24] + | `--RCURLY -> } [267:4] + |--METHOD_DEF -> METHOD_DEF [269:4] + | |--MODIFIERS -> MODIFIERS [269:4] + | | `--LITERAL_PUBLIC -> public [269:4] + | |--TYPE -> TYPE [269:11] + | | `--LITERAL_VOID -> void [269:11] + | |--IDENT -> parentheses [269:16] + | |--LPAREN -> ( [269:27] + | |--PARAMETERS -> PARAMETERS [269:28] + | |--RPAREN -> ) [269:28] + | `--SLIST -> { [269:30] + | |--EXPR -> EXPR [271:0] + | | `--METHOD_CALL -> ( [271:0] + | | |--IDENT -> testNullSemi [270:8] + | | |--ELIST -> ELIST [272:0] + | | `--RPAREN -> ) [272:0] + | |--SEMI -> ; [273:0] + | `--RCURLY -> } [274:4] + |--METHOD_DEF -> METHOD_DEF [276:4] + | |--MODIFIERS -> MODIFIERS [276:4] + | | |--LITERAL_PUBLIC -> public [276:4] + | | `--LITERAL_STATIC -> static [276:11] + | |--TYPE -> TYPE [276:18] + | | `--LITERAL_VOID -> void [276:18] + | |--IDENT -> testNoWhitespaceBeforeEllipses [276:23] + | |--LPAREN -> ( [276:53] + | |--PARAMETERS -> PARAMETERS [276:54] + | | `--PARAMETER_DEF -> PARAMETER_DEF [276:54] + | | |--MODIFIERS -> MODIFIERS [276:54] + | | |--TYPE -> TYPE [276:54] + | | | `--IDENT -> String [276:54] + | | |--ELLIPSIS -> ... [276:61] + | | `--IDENT -> args [276:65] + | |--RPAREN -> ) [276:69] + | `--SLIST -> { [276:71] + | `--RCURLY -> } [277:4] + |--METHOD_DEF -> METHOD_DEF [278:4] + | |--MODIFIERS -> MODIFIERS [278:4] + | | `--LITERAL_PUBLIC -> public [278:4] + | |--TYPE -> TYPE [278:11] + | | `--IDENT -> String [278:11] + | |--IDENT -> test [278:18] + | |--LPAREN -> ( [278:22] + | |--PARAMETERS -> PARAMETERS [278:23] + | |--RPAREN -> ) [278:23] + | `--SLIST -> { [278:25] + | |--VARIABLE_DEF -> VARIABLE_DEF [279:8] + | | |--MODIFIERS -> MODIFIERS [279:8] + | | |--TYPE -> TYPE [279:8] + | | | `--LITERAL_INT -> int [279:8] + | | |--IDENT -> pc [279:12] + | | `--ASSIGN -> = [279:15] + | | `--EXPR -> EXPR [279:17] + | | `--NUM_INT -> 0 [279:17] + | |--SEMI -> ; [279:18] + | |--LITERAL_RETURN -> return [280:8] + | | |--EXPR -> EXPR [280:41] + | | | `--METHOD_CALL -> ( [280:41] + | | | |--DOT -> . [280:31] + | | | | |--LPAREN -> ( [280:15] + | | | | |--PLUS -> + [280:27] + | | | | | |--LPAREN -> ( [280:16] + | | | | | |--PLUS -> + [280:23] + | | | | | | |--NUM_INT -> 100000 [280:17] + | | | | | | `--IDENT -> pc [280:24] + | | | | | |--RPAREN -> ) [280:26] + | | | | | `--STRING_LITERAL -> "" [280:28] + | | | | |--RPAREN -> ) [280:30] + | | | | `--IDENT -> substring [280:32] + | | | |--ELIST -> ELIST [280:42] + | | | | `--EXPR -> EXPR [280:42] + | | | | `--NUM_INT -> 1 [280:42] + | | | `--RPAREN -> ) [280:43] + | | `--SEMI -> ; [280:44] + | `--RCURLY -> } [281:4] + `--RCURLY -> } [282:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionMethodCall.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionMethodCall.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionMethodCall.java @@ -0,0 +1,32 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +public class InputAntlr4AstRegressionMethodCall { + public static class IntData { + int[] xorData; + + IntData(Object srcPixel, Object xorPixel) { + this.xorData = (int[]) srcPixel; // violation + this.xorData = (int[]) xorPixel; // violation + } + + protected void xorPixel(Object pixData) { + int[] dstData = (int[]) pixData; // violation + for (int i = 0; i < dstData.length; i++) { + dstData[i] ^= xorData[i]; + } + } + + Object[] getXorData() { + return new Object[5]; + } + + void method6() { + if (getXorData().length == 5 + && this.getXorData()[1] != IntData.class // violation + || this.getXorData()[5] != IntData.class) { + System.out.println(getXorData().length); + } + } + + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionMethodCall.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionMethodCall.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionMethodCall.txt @@ -0,0 +1,250 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +CLASS_DEF -> CLASS_DEF [3:0] +|--MODIFIERS -> MODIFIERS [3:0] +| `--LITERAL_PUBLIC -> public [3:0] +|--LITERAL_CLASS -> class [3:7] +|--IDENT -> InputAntlr4AstRegressionMethodCall [3:13] +`--OBJBLOCK -> OBJBLOCK [3:48] + |--LCURLY -> { [3:48] + |--CLASS_DEF -> CLASS_DEF [4:4] + | |--MODIFIERS -> MODIFIERS [4:4] + | | |--LITERAL_PUBLIC -> public [4:4] + | | `--LITERAL_STATIC -> static [4:11] + | |--LITERAL_CLASS -> class [4:18] + | |--IDENT -> IntData [4:24] + | `--OBJBLOCK -> OBJBLOCK [4:32] + | |--LCURLY -> { [4:32] + | |--VARIABLE_DEF -> VARIABLE_DEF [5:8] + | | |--MODIFIERS -> MODIFIERS [5:8] + | | |--TYPE -> TYPE [5:8] + | | | |--LITERAL_INT -> int [5:8] + | | | `--ARRAY_DECLARATOR -> [ [5:11] + | | | `--RBRACK -> ] [5:12] + | | |--IDENT -> xorData [5:14] + | | `--SEMI -> ; [5:21] + | |--CTOR_DEF -> CTOR_DEF [7:8] + | | |--MODIFIERS -> MODIFIERS [7:8] + | | |--IDENT -> IntData [7:8] + | | |--LPAREN -> ( [7:15] + | | |--PARAMETERS -> PARAMETERS [7:16] + | | | |--PARAMETER_DEF -> PARAMETER_DEF [7:16] + | | | | |--MODIFIERS -> MODIFIERS [7:16] + | | | | |--TYPE -> TYPE [7:16] + | | | | | `--IDENT -> Object [7:16] + | | | | `--IDENT -> srcPixel [7:23] + | | | |--COMMA -> , [7:31] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [7:33] + | | | |--MODIFIERS -> MODIFIERS [7:33] + | | | |--TYPE -> TYPE [7:33] + | | | | `--IDENT -> Object [7:33] + | | | `--IDENT -> xorPixel [7:40] + | | |--RPAREN -> ) [7:48] + | | `--SLIST -> { [7:50] + | | |--EXPR -> EXPR [8:25] + | | | `--ASSIGN -> = [8:25] + | | | |--DOT -> . [8:16] + | | | | |--LITERAL_THIS -> this [8:12] + | | | | `--IDENT -> xorData [8:17] + | | | `--TYPECAST -> ( [8:27] + | | | |--TYPE -> TYPE [8:28] + | | | | |--LITERAL_INT -> int [8:28] + | | | | `--ARRAY_DECLARATOR -> [ [8:31] + | | | | `--RBRACK -> ] [8:32] + | | | |--RPAREN -> ) [8:33] + | | | `--IDENT -> srcPixel [8:35] + | | |--SEMI -> ; [8:43] + | | |--EXPR -> EXPR [9:25] + | | | `--ASSIGN -> = [9:25] + | | | |--DOT -> . [9:16] + | | | | |--LITERAL_THIS -> this [9:12] + | | | | `--IDENT -> xorData [9:17] + | | | `--TYPECAST -> ( [9:27] + | | | |--TYPE -> TYPE [9:28] + | | | | |--LITERAL_INT -> int [9:28] + | | | | `--ARRAY_DECLARATOR -> [ [9:31] + | | | | `--RBRACK -> ] [9:32] + | | | |--RPAREN -> ) [9:33] + | | | `--IDENT -> xorPixel [9:35] + | | |--SEMI -> ; [9:43] + | | `--RCURLY -> } [10:8] + | |--METHOD_DEF -> METHOD_DEF [12:8] + | | |--MODIFIERS -> MODIFIERS [12:8] + | | | `--LITERAL_PROTECTED -> protected [12:8] + | | |--TYPE -> TYPE [12:18] + | | | `--LITERAL_VOID -> void [12:18] + | | |--IDENT -> xorPixel [12:23] + | | |--LPAREN -> ( [12:31] + | | |--PARAMETERS -> PARAMETERS [12:32] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [12:32] + | | | |--MODIFIERS -> MODIFIERS [12:32] + | | | |--TYPE -> TYPE [12:32] + | | | | `--IDENT -> Object [12:32] + | | | `--IDENT -> pixData [12:39] + | | |--RPAREN -> ) [12:46] + | | `--SLIST -> { [12:48] + | | |--VARIABLE_DEF -> VARIABLE_DEF [13:12] + | | | |--MODIFIERS -> MODIFIERS [13:12] + | | | |--TYPE -> TYPE [13:12] + | | | | |--LITERAL_INT -> int [13:12] + | | | | `--ARRAY_DECLARATOR -> [ [13:15] + | | | | `--RBRACK -> ] [13:16] + | | | |--IDENT -> dstData [13:18] + | | | `--ASSIGN -> = [13:26] + | | | `--EXPR -> EXPR [13:28] + | | | `--TYPECAST -> ( [13:28] + | | | |--TYPE -> TYPE [13:29] + | | | | |--LITERAL_INT -> int [13:29] + | | | | `--ARRAY_DECLARATOR -> [ [13:32] + | | | | `--RBRACK -> ] [13:33] + | | | |--RPAREN -> ) [13:34] + | | | `--IDENT -> pixData [13:36] + | | |--SEMI -> ; [13:43] + | | |--LITERAL_FOR -> for [14:12] + | | | |--LPAREN -> ( [14:16] + | | | |--FOR_INIT -> FOR_INIT [14:17] + | | | | `--VARIABLE_DEF -> VARIABLE_DEF [14:17] + | | | | |--MODIFIERS -> MODIFIERS [14:17] + | | | | |--TYPE -> TYPE [14:17] + | | | | | `--LITERAL_INT -> int [14:17] + | | | | |--IDENT -> i [14:21] + | | | | `--ASSIGN -> = [14:23] + | | | | `--EXPR -> EXPR [14:25] + | | | | `--NUM_INT -> 0 [14:25] + | | | |--SEMI -> ; [14:26] + | | | |--FOR_CONDITION -> FOR_CONDITION [14:30] + | | | | `--EXPR -> EXPR [14:30] + | | | | `--LT -> < [14:30] + | | | | |--IDENT -> i [14:28] + | | | | `--DOT -> . [14:39] + | | | | |--IDENT -> dstData [14:32] + | | | | `--IDENT -> length [14:40] + | | | |--SEMI -> ; [14:46] + | | | |--FOR_ITERATOR -> FOR_ITERATOR [14:49] + | | | | `--ELIST -> ELIST [14:49] + | | | | `--EXPR -> EXPR [14:49] + | | | | `--POST_INC -> ++ [14:49] + | | | | `--IDENT -> i [14:48] + | | | |--RPAREN -> ) [14:51] + | | | `--SLIST -> { [14:53] + | | | |--EXPR -> EXPR [15:27] + | | | | `--BXOR_ASSIGN -> ^= [15:27] + | | | | |--INDEX_OP -> [ [15:23] + | | | | | |--IDENT -> dstData [15:16] + | | | | | |--EXPR -> EXPR [15:24] + | | | | | | `--IDENT -> i [15:24] + | | | | | `--RBRACK -> ] [15:25] + | | | | `--INDEX_OP -> [ [15:37] + | | | | |--IDENT -> xorData [15:30] + | | | | |--EXPR -> EXPR [15:38] + | | | | | `--IDENT -> i [15:38] + | | | | `--RBRACK -> ] [15:39] + | | | |--SEMI -> ; [15:40] + | | | `--RCURLY -> } [16:12] + | | `--RCURLY -> } [17:8] + | |--METHOD_DEF -> METHOD_DEF [19:8] + | | |--MODIFIERS -> MODIFIERS [19:8] + | | |--TYPE -> TYPE [19:8] + | | | |--IDENT -> Object [19:8] + | | | `--ARRAY_DECLARATOR -> [ [19:14] + | | | `--RBRACK -> ] [19:15] + | | |--IDENT -> getXorData [19:17] + | | |--LPAREN -> ( [19:27] + | | |--PARAMETERS -> PARAMETERS [19:28] + | | |--RPAREN -> ) [19:28] + | | `--SLIST -> { [19:30] + | | |--LITERAL_RETURN -> return [20:12] + | | | |--EXPR -> EXPR [20:19] + | | | | `--LITERAL_NEW -> new [20:19] + | | | | |--IDENT -> Object [20:23] + | | | | `--ARRAY_DECLARATOR -> [ [20:29] + | | | | |--EXPR -> EXPR [20:30] + | | | | | `--NUM_INT -> 5 [20:30] + | | | | `--RBRACK -> ] [20:31] + | | | `--SEMI -> ; [20:32] + | | `--RCURLY -> } [21:8] + | |--METHOD_DEF -> METHOD_DEF [23:8] + | | |--MODIFIERS -> MODIFIERS [23:8] + | | |--TYPE -> TYPE [23:8] + | | | `--LITERAL_VOID -> void [23:8] + | | |--IDENT -> method6 [23:13] + | | |--LPAREN -> ( [23:20] + | | |--PARAMETERS -> PARAMETERS [23:21] + | | |--RPAREN -> ) [23:21] + | | `--SLIST -> { [23:23] + | | |--LITERAL_IF -> if [24:12] + | | | |--LPAREN -> ( [24:15] + | | | |--EXPR -> EXPR [26:20] + | | | | `--LOR -> || [26:20] + | | | | |--LAND -> && [25:20] + | | | | | |--EQUAL -> == [24:36] + | | | | | | |--DOT -> . [24:28] + | | | | | | | |--METHOD_CALL -> ( [24:26] + | | | | | | | | |--IDENT -> getXorData [24:16] + | | | | | | | | |--ELIST -> ELIST [24:27] + | | | | | | | | `--RPAREN -> ) [24:27] + | | | | | | | `--IDENT -> length [24:29] + | | | | | | `--NUM_INT -> 5 [24:39] + | | | | | `--NOT_EQUAL -> != [25:44] + | | | | | |--INDEX_OP -> [ [25:40] + | | | | | | |--METHOD_CALL -> ( [25:38] + | | | | | | | |--DOT -> . [25:27] + | | | | | | | | |--LITERAL_THIS -> this [25:23] + | | | | | | | | `--IDENT -> getXorData [25:28] + | | | | | | | |--ELIST -> ELIST [25:39] + | | | | | | | `--RPAREN -> ) [25:39] + | | | | | | |--EXPR -> EXPR [25:41] + | | | | | | | `--NUM_INT -> 1 [25:41] + | | | | | | `--RBRACK -> ] [25:42] + | | | | | `--DOT -> . [25:54] + | | | | | |--IDENT -> IntData [25:47] + | | | | | `--LITERAL_CLASS -> class [25:55] + | | | | `--NOT_EQUAL -> != [26:44] + | | | | |--INDEX_OP -> [ [26:40] + | | | | | |--METHOD_CALL -> ( [26:38] + | | | | | | |--DOT -> . [26:27] + | | | | | | | |--LITERAL_THIS -> this [26:23] + | | | | | | | `--IDENT -> getXorData [26:28] + | | | | | | |--ELIST -> ELIST [26:39] + | | | | | | `--RPAREN -> ) [26:39] + | | | | | |--EXPR -> EXPR [26:41] + | | | | | | `--NUM_INT -> 5 [26:41] + | | | | | `--RBRACK -> ] [26:42] + | | | | `--DOT -> . [26:54] + | | | | |--IDENT -> IntData [26:47] + | | | | `--LITERAL_CLASS -> class [26:55] + | | | |--RPAREN -> ) [26:60] + | | | `--SLIST -> { [26:62] + | | | |--EXPR -> EXPR [27:34] + | | | | `--METHOD_CALL -> ( [27:34] + | | | | |--DOT -> . [27:26] + | | | | | |--DOT -> . [27:22] + | | | | | | |--IDENT -> System [27:16] + | | | | | | `--IDENT -> out [27:23] + | | | | | `--IDENT -> println [27:27] + | | | | |--ELIST -> ELIST [27:47] + | | | | | `--EXPR -> EXPR [27:47] + | | | | | `--DOT -> . [27:47] + | | | | | |--METHOD_CALL -> ( [27:45] + | | | | | | |--IDENT -> getXorData [27:35] + | | | | | | |--ELIST -> ELIST [27:46] + | | | | | | `--RPAREN -> ) [27:46] + | | | | | `--IDENT -> length [27:48] + | | | | `--RPAREN -> ) [27:54] + | | | |--SEMI -> ; [27:55] + | | | `--RCURLY -> } [28:12] + | | `--RCURLY -> } [29:8] + | `--RCURLY -> } [31:4] + `--RCURLY -> } [32:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionMethodRefs.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionMethodRefs.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionMethodRefs.java @@ -0,0 +1,52 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; +import java.util.function.Supplier; + +public class InputAntlr4AstRegressionMethodRefs { + interface LambdaInt { + <S, T> void m(S p1, T p2); + } + + interface MyFunctionalInterface { + void invokeMethodReference(); + } + + static class LambdaImpl implements LambdaInt { + <S, T> LambdaImpl(S p1, T p2) { + } + + public <S, T> void m(S p1, T p2) { + } + } + + public void m() { + } + + public void main(String[] args) { + MyFunctionalInterface fi = + new InputAntlr4AstRegressionMethodRefs()::<Integer, String, Long> m; + LambdaInt li = LambdaImpl::<@TA Object, @TB Object> new; + Supplier s = Bar1::<String> m; + li = li::<@TA Object, @TB Object> m; + s = Bar1::<List<String>> m; + s = Bar1::<List<List<?>>> m; + } +} + +class Bar1<T> { + static Object m() { + return null; + } +} + +@Target({ ElementType.TYPE_USE, ElementType.TYPE_PARAMETER }) +@interface TA { +} + +@Target({ ElementType.TYPE_USE, ElementType.TYPE_PARAMETER }) +@interface TB { +} + diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionMethodRefs.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionMethodRefs.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionMethodRefs.txt @@ -0,0 +1,409 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +IMPORT -> import [3:0] +|--DOT -> . [3:27] +| |--DOT -> . [3:16] +| | |--DOT -> . [3:11] +| | | |--IDENT -> java [3:7] +| | | `--IDENT -> lang [3:12] +| | `--IDENT -> annotation [3:17] +| `--IDENT -> ElementType [3:28] +`--SEMI -> ; [3:39] +IMPORT -> import [4:0] +|--DOT -> . [4:27] +| |--DOT -> . [4:16] +| | |--DOT -> . [4:11] +| | | |--IDENT -> java [4:7] +| | | `--IDENT -> lang [4:12] +| | `--IDENT -> annotation [4:17] +| `--IDENT -> Target [4:28] +`--SEMI -> ; [4:34] +IMPORT -> import [5:0] +|--DOT -> . [5:16] +| |--DOT -> . [5:11] +| | |--IDENT -> java [5:7] +| | `--IDENT -> util [5:12] +| `--IDENT -> List [5:17] +`--SEMI -> ; [5:21] +IMPORT -> import [6:0] +|--DOT -> . [6:25] +| |--DOT -> . [6:16] +| | |--DOT -> . [6:11] +| | | |--IDENT -> java [6:7] +| | | `--IDENT -> util [6:12] +| | `--IDENT -> function [6:17] +| `--IDENT -> Supplier [6:26] +`--SEMI -> ; [6:34] +CLASS_DEF -> CLASS_DEF [8:0] +|--MODIFIERS -> MODIFIERS [8:0] +| `--LITERAL_PUBLIC -> public [8:0] +|--LITERAL_CLASS -> class [8:7] +|--IDENT -> InputAntlr4AstRegressionMethodRefs [8:13] +`--OBJBLOCK -> OBJBLOCK [8:48] + |--LCURLY -> { [8:48] + |--INTERFACE_DEF -> INTERFACE_DEF [9:3] + | |--MODIFIERS -> MODIFIERS [9:3] + | |--LITERAL_INTERFACE -> interface [9:3] + | |--IDENT -> LambdaInt [9:13] + | `--OBJBLOCK -> OBJBLOCK [9:23] + | |--LCURLY -> { [9:23] + | |--METHOD_DEF -> METHOD_DEF [10:8] + | | |--MODIFIERS -> MODIFIERS [10:8] + | | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [10:8] + | | | |--GENERIC_START -> < [10:8] + | | | |--TYPE_PARAMETER -> TYPE_PARAMETER [10:9] + | | | | `--IDENT -> S [10:9] + | | | |--COMMA -> , [10:10] + | | | |--TYPE_PARAMETER -> TYPE_PARAMETER [10:12] + | | | | `--IDENT -> T [10:12] + | | | `--GENERIC_END -> > [10:13] + | | |--TYPE -> TYPE [10:15] + | | | `--LITERAL_VOID -> void [10:15] + | | |--IDENT -> m [10:20] + | | |--LPAREN -> ( [10:21] + | | |--PARAMETERS -> PARAMETERS [10:22] + | | | |--PARAMETER_DEF -> PARAMETER_DEF [10:22] + | | | | |--MODIFIERS -> MODIFIERS [10:22] + | | | | |--TYPE -> TYPE [10:22] + | | | | | `--IDENT -> S [10:22] + | | | | `--IDENT -> p1 [10:24] + | | | |--COMMA -> , [10:26] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [10:28] + | | | |--MODIFIERS -> MODIFIERS [10:28] + | | | |--TYPE -> TYPE [10:28] + | | | | `--IDENT -> T [10:28] + | | | `--IDENT -> p2 [10:30] + | | |--RPAREN -> ) [10:32] + | | `--SEMI -> ; [10:33] + | `--RCURLY -> } [11:4] + |--INTERFACE_DEF -> INTERFACE_DEF [13:4] + | |--MODIFIERS -> MODIFIERS [13:4] + | |--LITERAL_INTERFACE -> interface [13:4] + | |--IDENT -> MyFunctionalInterface [13:14] + | `--OBJBLOCK -> OBJBLOCK [13:36] + | |--LCURLY -> { [13:36] + | |--METHOD_DEF -> METHOD_DEF [14:8] + | | |--MODIFIERS -> MODIFIERS [14:8] + | | |--TYPE -> TYPE [14:8] + | | | `--LITERAL_VOID -> void [14:8] + | | |--IDENT -> invokeMethodReference [14:13] + | | |--LPAREN -> ( [14:34] + | | |--PARAMETERS -> PARAMETERS [14:35] + | | |--RPAREN -> ) [14:35] + | | `--SEMI -> ; [14:36] + | `--RCURLY -> } [15:4] + |--CLASS_DEF -> CLASS_DEF [17:4] + | |--MODIFIERS -> MODIFIERS [17:4] + | | `--LITERAL_STATIC -> static [17:4] + | |--LITERAL_CLASS -> class [17:11] + | |--IDENT -> LambdaImpl [17:17] + | |--IMPLEMENTS_CLAUSE -> implements [17:28] + | | `--IDENT -> LambdaInt [17:39] + | `--OBJBLOCK -> OBJBLOCK [17:49] + | |--LCURLY -> { [17:49] + | |--CTOR_DEF -> CTOR_DEF [18:8] + | | |--MODIFIERS -> MODIFIERS [18:8] + | | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [18:8] + | | | |--GENERIC_START -> < [18:8] + | | | |--TYPE_PARAMETER -> TYPE_PARAMETER [18:9] + | | | | `--IDENT -> S [18:9] + | | | |--COMMA -> , [18:10] + | | | |--TYPE_PARAMETER -> TYPE_PARAMETER [18:12] + | | | | `--IDENT -> T [18:12] + | | | `--GENERIC_END -> > [18:13] + | | |--IDENT -> LambdaImpl [18:15] + | | |--LPAREN -> ( [18:25] + | | |--PARAMETERS -> PARAMETERS [18:26] + | | | |--PARAMETER_DEF -> PARAMETER_DEF [18:26] + | | | | |--MODIFIERS -> MODIFIERS [18:26] + | | | | |--TYPE -> TYPE [18:26] + | | | | | `--IDENT -> S [18:26] + | | | | `--IDENT -> p1 [18:28] + | | | |--COMMA -> , [18:30] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [18:32] + | | | |--MODIFIERS -> MODIFIERS [18:32] + | | | |--TYPE -> TYPE [18:32] + | | | | `--IDENT -> T [18:32] + | | | `--IDENT -> p2 [18:34] + | | |--RPAREN -> ) [18:36] + | | `--SLIST -> { [18:38] + | | `--RCURLY -> } [19:8] + | |--METHOD_DEF -> METHOD_DEF [21:8] + | | |--MODIFIERS -> MODIFIERS [21:8] + | | | `--LITERAL_PUBLIC -> public [21:8] + | | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [21:15] + | | | |--GENERIC_START -> < [21:15] + | | | |--TYPE_PARAMETER -> TYPE_PARAMETER [21:16] + | | | | `--IDENT -> S [21:16] + | | | |--COMMA -> , [21:17] + | | | |--TYPE_PARAMETER -> TYPE_PARAMETER [21:19] + | | | | `--IDENT -> T [21:19] + | | | `--GENERIC_END -> > [21:20] + | | |--TYPE -> TYPE [21:22] + | | | `--LITERAL_VOID -> void [21:22] + | | |--IDENT -> m [21:27] + | | |--LPAREN -> ( [21:28] + | | |--PARAMETERS -> PARAMETERS [21:29] + | | | |--PARAMETER_DEF -> PARAMETER_DEF [21:29] + | | | | |--MODIFIERS -> MODIFIERS [21:29] + | | | | |--TYPE -> TYPE [21:29] + | | | | | `--IDENT -> S [21:29] + | | | | `--IDENT -> p1 [21:31] + | | | |--COMMA -> , [21:33] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [21:35] + | | | |--MODIFIERS -> MODIFIERS [21:35] + | | | |--TYPE -> TYPE [21:35] + | | | | `--IDENT -> T [21:35] + | | | `--IDENT -> p2 [21:37] + | | |--RPAREN -> ) [21:39] + | | `--SLIST -> { [21:41] + | | `--RCURLY -> } [22:8] + | `--RCURLY -> } [23:4] + |--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 -> m [25:16] + | |--LPAREN -> ( [25:17] + | |--PARAMETERS -> PARAMETERS [25:18] + | |--RPAREN -> ) [25:18] + | `--SLIST -> { [25:20] + | `--RCURLY -> } [26:4] + |--METHOD_DEF -> METHOD_DEF [28:4] + | |--MODIFIERS -> MODIFIERS [28:4] + | | `--LITERAL_PUBLIC -> public [28:4] + | |--TYPE -> TYPE [28:11] + | | `--LITERAL_VOID -> void [28:11] + | |--IDENT -> main [28:16] + | |--LPAREN -> ( [28:20] + | |--PARAMETERS -> PARAMETERS [28:21] + | | `--PARAMETER_DEF -> PARAMETER_DEF [28:21] + | | |--MODIFIERS -> MODIFIERS [28:21] + | | |--TYPE -> TYPE [28:21] + | | | |--IDENT -> String [28:21] + | | | `--ARRAY_DECLARATOR -> [ [28:27] + | | | `--RBRACK -> ] [28:28] + | | `--IDENT -> args [28:30] + | |--RPAREN -> ) [28:34] + | `--SLIST -> { [28:36] + | |--VARIABLE_DEF -> VARIABLE_DEF [29:8] + | | |--MODIFIERS -> MODIFIERS [29:8] + | | |--TYPE -> TYPE [29:8] + | | | `--IDENT -> MyFunctionalInterface [29:8] + | | |--IDENT -> fi [29:30] + | | `--ASSIGN -> = [29:33] + | | `--EXPR -> EXPR [30:56] + | | `--METHOD_REF -> :: [30:56] + | | |--LITERAL_NEW -> new [30:16] + | | | |--IDENT -> InputAntlr4AstRegressionMethodRefs [30:20] + | | | |--LPAREN -> ( [30:54] + | | | |--ELIST -> ELIST [30:55] + | | | `--RPAREN -> ) [30:55] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [30:58] + | | | |--GENERIC_START -> < [30:58] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [30:59] + | | | | `--IDENT -> Integer [30:59] + | | | |--COMMA -> , [30:66] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [30:68] + | | | | `--IDENT -> String [30:68] + | | | |--COMMA -> , [30:74] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [30:76] + | | | | `--IDENT -> Long [30:76] + | | | `--GENERIC_END -> > [30:80] + | | `--IDENT -> m [30:82] + | |--SEMI -> ; [30:83] + | |--VARIABLE_DEF -> VARIABLE_DEF [31:8] + | | |--MODIFIERS -> MODIFIERS [31:8] + | | |--TYPE -> TYPE [31:8] + | | | `--IDENT -> LambdaInt [31:8] + | | |--IDENT -> li [31:18] + | | `--ASSIGN -> = [31:21] + | | `--EXPR -> EXPR [31:33] + | | `--METHOD_REF -> :: [31:33] + | | |--IDENT -> LambdaImpl [31:23] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [31:35] + | | | |--GENERIC_START -> < [31:35] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [31:36] + | | | | |--ANNOTATIONS -> ANNOTATIONS [31:36] + | | | | | `--ANNOTATION -> ANNOTATION [31:36] + | | | | | |--AT -> @ [31:36] + | | | | | `--IDENT -> TA [31:37] + | | | | `--IDENT -> Object [31:40] + | | | |--COMMA -> , [31:46] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [31:48] + | | | | |--ANNOTATIONS -> ANNOTATIONS [31:48] + | | | | | `--ANNOTATION -> ANNOTATION [31:48] + | | | | | |--AT -> @ [31:48] + | | | | | `--IDENT -> TB [31:49] + | | | | `--IDENT -> Object [31:52] + | | | `--GENERIC_END -> > [31:58] + | | `--LITERAL_NEW -> new [31:60] + | |--SEMI -> ; [31:63] + | |--VARIABLE_DEF -> VARIABLE_DEF [32:8] + | | |--MODIFIERS -> MODIFIERS [32:8] + | | |--TYPE -> TYPE [32:8] + | | | `--IDENT -> Supplier [32:8] + | | |--IDENT -> s [32:17] + | | `--ASSIGN -> = [32:19] + | | `--EXPR -> EXPR [32:25] + | | `--METHOD_REF -> :: [32:25] + | | |--IDENT -> Bar1 [32:21] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [32:27] + | | | |--GENERIC_START -> < [32:27] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [32:28] + | | | | `--IDENT -> String [32:28] + | | | `--GENERIC_END -> > [32:34] + | | `--IDENT -> m [32:36] + | |--SEMI -> ; [32:37] + | |--EXPR -> EXPR [33:11] + | | `--ASSIGN -> = [33:11] + | | |--IDENT -> li [33:8] + | | `--METHOD_REF -> :: [33:15] + | | |--IDENT -> li [33:13] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [33:17] + | | | |--GENERIC_START -> < [33:17] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [33:18] + | | | | |--ANNOTATIONS -> ANNOTATIONS [33:18] + | | | | | `--ANNOTATION -> ANNOTATION [33:18] + | | | | | |--AT -> @ [33:18] + | | | | | `--IDENT -> TA [33:19] + | | | | `--IDENT -> Object [33:22] + | | | |--COMMA -> , [33:28] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [33:30] + | | | | |--ANNOTATIONS -> ANNOTATIONS [33:30] + | | | | | `--ANNOTATION -> ANNOTATION [33:30] + | | | | | |--AT -> @ [33:30] + | | | | | `--IDENT -> TB [33:31] + | | | | `--IDENT -> Object [33:34] + | | | `--GENERIC_END -> > [33:40] + | | `--IDENT -> m [33:42] + | |--SEMI -> ; [33:43] + | |--EXPR -> EXPR [34:10] + | | `--ASSIGN -> = [34:10] + | | |--IDENT -> s [34:8] + | | `--METHOD_REF -> :: [34:16] + | | |--IDENT -> Bar1 [34:12] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [34:18] + | | | |--GENERIC_START -> < [34:18] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [34:19] + | | | | |--IDENT -> List [34:19] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [34:23] + | | | | |--GENERIC_START -> < [34:23] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [34:24] + | | | | | `--IDENT -> String [34:24] + | | | | `--GENERIC_END -> > [34:30] + | | | `--GENERIC_END -> > [34:31] + | | `--IDENT -> m [34:33] + | |--SEMI -> ; [34:34] + | |--EXPR -> EXPR [35:10] + | | `--ASSIGN -> = [35:10] + | | |--IDENT -> s [35:8] + | | `--METHOD_REF -> :: [35:16] + | | |--IDENT -> Bar1 [35:12] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [35:18] + | | | |--GENERIC_START -> < [35:18] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [35:19] + | | | | |--IDENT -> List [35:19] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [35:23] + | | | | |--GENERIC_START -> < [35:23] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [35:24] + | | | | | |--IDENT -> List [35:24] + | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [35:28] + | | | | | |--GENERIC_START -> < [35:28] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [35:29] + | | | | | | `--WILDCARD_TYPE -> ? [35:29] + | | | | | `--GENERIC_END -> > [35:30] + | | | | `--GENERIC_END -> > [35:31] + | | | `--GENERIC_END -> > [35:32] + | | `--IDENT -> m [35:34] + | |--SEMI -> ; [35:35] + | `--RCURLY -> } [36:4] + `--RCURLY -> } [37:0] +CLASS_DEF -> CLASS_DEF [39:0] +|--MODIFIERS -> MODIFIERS [39:0] +|--LITERAL_CLASS -> class [39:0] +|--IDENT -> Bar1 [39:6] +|--TYPE_PARAMETERS -> TYPE_PARAMETERS [39:10] +| |--GENERIC_START -> < [39:10] +| |--TYPE_PARAMETER -> TYPE_PARAMETER [39:11] +| | `--IDENT -> T [39:11] +| `--GENERIC_END -> > [39:12] +`--OBJBLOCK -> OBJBLOCK [39:14] + |--LCURLY -> { [39:14] + |--METHOD_DEF -> METHOD_DEF [40:4] + | |--MODIFIERS -> MODIFIERS [40:4] + | | `--LITERAL_STATIC -> static [40:4] + | |--TYPE -> TYPE [40:11] + | | `--IDENT -> Object [40:11] + | |--IDENT -> m [40:18] + | |--LPAREN -> ( [40:19] + | |--PARAMETERS -> PARAMETERS [40:20] + | |--RPAREN -> ) [40:20] + | `--SLIST -> { [40:22] + | |--LITERAL_RETURN -> return [41:8] + | | |--EXPR -> EXPR [41:15] + | | | `--LITERAL_NULL -> null [41:15] + | | `--SEMI -> ; [41:19] + | `--RCURLY -> } [42:4] + `--RCURLY -> } [43:0] +ANNOTATION_DEF -> ANNOTATION_DEF [45:0] +|--MODIFIERS -> MODIFIERS [45:0] +| `--ANNOTATION -> ANNOTATION [45:0] +| |--AT -> @ [45:0] +| |--IDENT -> Target [45:1] +| |--LPAREN -> ( [45:7] +| |--ANNOTATION_ARRAY_INIT -> { [45:8] +| | |--EXPR -> EXPR [45:21] +| | | `--DOT -> . [45:21] +| | | |--IDENT -> ElementType [45:10] +| | | `--IDENT -> TYPE_USE [45:22] +| | |--COMMA -> , [45:30] +| | |--EXPR -> EXPR [45:43] +| | | `--DOT -> . [45:43] +| | | |--IDENT -> ElementType [45:32] +| | | `--IDENT -> TYPE_PARAMETER [45:44] +| | `--RCURLY -> } [45:59] +| `--RPAREN -> ) [45:60] +|--AT -> @ [46:0] +|--LITERAL_INTERFACE -> interface [46:1] +|--IDENT -> TA [46:11] +`--OBJBLOCK -> OBJBLOCK [46:14] + |--LCURLY -> { [46:14] + `--RCURLY -> } [47:0] +ANNOTATION_DEF -> ANNOTATION_DEF [49:0] +|--MODIFIERS -> MODIFIERS [49:0] +| `--ANNOTATION -> ANNOTATION [49:0] +| |--AT -> @ [49:0] +| |--IDENT -> Target [49:1] +| |--LPAREN -> ( [49:7] +| |--ANNOTATION_ARRAY_INIT -> { [49:8] +| | |--EXPR -> EXPR [49:21] +| | | `--DOT -> . [49:21] +| | | |--IDENT -> ElementType [49:10] +| | | `--IDENT -> TYPE_USE [49:22] +| | |--COMMA -> , [49:30] +| | |--EXPR -> EXPR [49:43] +| | | `--DOT -> . [49:43] +| | | |--IDENT -> ElementType [49:32] +| | | `--IDENT -> TYPE_PARAMETER [49:44] +| | `--RCURLY -> } [49:59] +| `--RPAREN -> ) [49:60] +|--AT -> @ [50:0] +|--LITERAL_INTERFACE -> interface [50:1] +|--IDENT -> TB [50:11] +`--OBJBLOCK -> OBJBLOCK [50:14] + |--LCURLY -> { [50:14] + `--RCURLY -> } [51:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionNewLineAtEndOfFileCr.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionNewLineAtEndOfFileCr.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionNewLineAtEndOfFileCr.java @@ -0,0 +1,16 @@ +//////////////////////////////////////////////////////////////////////////////// +// Test case file for checkstyle. +// Created: 2015 +//////////////////////////////////////////////////////////////////////////////// +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +/** + * Test case for detection of an existing CR newline at EOF, using the + * NewlineAtEndOfFileCheck. + * @author Martin Steiger + **/ +public interface InputAntlr4AstRegressionNewLineAtEndOfFileCr +{ +/** Test with ending with CR newline +*/ +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionNewLineAtEndOfFileCr.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionNewLineAtEndOfFileCr.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionNewLineAtEndOfFileCr.txt @@ -0,0 +1,22 @@ +PACKAGE_DEF -> package [5:0] +|--ANNOTATIONS -> ANNOTATIONS [5:47] +|--DOT -> . [5:47] +| |--DOT -> . [5:39] +| | |--DOT -> . [5:28] +| | | |--DOT -> . [5:22] +| | | | |--DOT -> . [5:11] +| | | | | |--IDENT -> com [5:8] +| | | | | `--IDENT -> puppycrawl [5:12] +| | | | `--IDENT -> tools [5:23] +| | | `--IDENT -> checkstyle [5:29] +| | `--IDENT -> grammar [5:40] +| `--IDENT -> antlr4 [5:48] +`--SEMI -> ; [5:54] +INTERFACE_DEF -> INTERFACE_DEF [12:0] +|--MODIFIERS -> MODIFIERS [12:0] +| `--LITERAL_PUBLIC -> public [12:0] +|--LITERAL_INTERFACE -> interface [12:7] +|--IDENT -> InputAntlr4AstRegressionNewLineAtEndOfFileCr [12:17] +`--OBJBLOCK -> OBJBLOCK [13:0] + |--LCURLY -> { [13:0] + `--RCURLY -> } [16:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionNewTypeTree.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionNewTypeTree.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionNewTypeTree.java @@ -0,0 +1,250 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +import java.awt.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.lang.reflect.AnnotatedElement; +import java.util.List; +import java.util.Map; +import java.util.TreeSet; + +import javax.net.ssl.KeyManager; + +public class InputAntlr4AstRegressionNewTypeTree { + private static class Slot { + double sin2Phi = 2 * StrictMath.sin(1.618033988749895); + public int[] ci; + } + + private static class Transformer { + + } + + private static class Ef { + Transformer[] transformers = new Transformer[10]; + static boolean forward = true; + } + + void goodMethod() { + Slot slot = new Slot(); + slot.ci[5] = 10; // ok + slot.ci = new int[6]; // ok + double[] cZ = {1.1, 1.2}; // ok + final double dnZ = slot.sin2Phi * cZ[1]; // ok + + final Ef ef = new Ef(); + final Transformer transformer = + ef.forward ? ef.transformers[ef.transformers.length - 1] // ok + : ef.transformers[0]; // ok + + } + + void badMethod() { + Slot slot = new Slot(); + slot.ci [5] = 10; // violation + slot.ci = new int [6]; // violation + double [] cZ = {1.1, 1.2}; // violation + final double dnZ = slot.sin2Phi * cZ [1]; // violation + + final Ef ef = new Ef(); + final Transformer transformer = + ef.forward ? ef.transformers [ef.transformers.length - 1] // violation + : ef.transformers [0]; // violation + + int[][ + ] + a + [] + [] ; // violation + int[][ + ] + b + [] // violation + [] ; // violation + } + + void varargLong(@I String @L [] @K [] @J ... vararg2) { } // ok + @SuppressWarnings("unused") + void withUpperBound(List<? extends int[][]> list) {} + + private static class SSLSecurity { + static KeyManager[] truncateArray(KeyManager[] kmaw, + KeyManager[] keyManagers) { + return null; + } + } + + + void method3(int x) { + KeyManager[] kmaw = null; + if (x == 1) { + kmaw = (javax.net.ssl.KeyManager[]) + SSLSecurity.truncateArray(kmaw, + new javax.net.ssl.KeyManager [3]); // violation + } + } + + enum FPMethodArgs { + + IGNN, + IIGNN, + GNNII, + GNNC; + + public Class<?>[] getMethodArguments(boolean isFPType) { + Class<?> N = (isFPType) ? Float.TYPE : Integer.TYPE; + Class<?> G = (isFPType) ? Graphics2D.class : Graphics.class; + switch (this) { + case IGNN: + return new Class<?>[]{Integer.TYPE, G, N, N}; + case IIGNN: + return new Class<?>[]{Integer.TYPE, Integer.TYPE, G, N, N}; + case GNNII: + return new Class<?>[]{G, N, N, Integer.TYPE, Integer.TYPE}; + case GNNC: + return new Class<?>[]{G, N, N, Character.TYPE}; + default: + throw new RuntimeException("Unknown method arguments!"); + } + } + } + + public static class IntData { + int[] xorData; + + IntData(Object srcPixel, Object xorPixel) { + this.xorData = (int[]) srcPixel; // violation + this.xorData = (int[]) xorPixel; // violation + } + + protected void xorPixel(Object pixData) { + int[] dstData = (int[]) pixData; // violation + for (int i = 0; i < dstData.length; i++) { + dstData[i] ^= xorData[i]; + } + } + + Object[] getXorData() { + return new Object[5]; + } + + void method6() { + if (getXorData().length == 5 + && this.getXorData()[1] != IntData.class // ok + || this.getXorData()[5] != IntData.class) { + System.out.println(getXorData().length); + } + } + + } + protected TreeSet<byte []> sortedPrefixes = createTreeSet(); // violation + + TreeSet<byte[]> createTreeSet() { // ok + return null; + } // ok + + public Object newInstance(Object[] objects){ + // Run constructor + InputAntlr4AstRegressionNewTypeTree tmpConstructor = null; + return tmpConstructor.newInstance((Object[])null); + } + + public TypeVariable<Class<String>>[] getTypeParameters() { + ClassRepository info = getGenericInfo(); + if (info != null) + return (TypeVariable<Class<String>>[])info.getTypeParameters(); + else + return (TypeVariable<Class<String>>[])new TypeVariable<?>[0]; + } + class ClassRepository { + + public Object getTypeParameters() { + return null; + } + } + class TypeVariable<E> { + + } + + private ClassRepository getGenericInfo() { + return null; + } + String[] c, d[]; // ok + String [] e, f []; // violation + + public enum Stooge { + MOE, CURLY, LARRY, + } + static void checkArrayTypes1(ArrayTypes at, AnnotatedElement e) { + if (!(at.cls()[0] == Map.class && + at.e()[0] == Stooge.MOE )) { + + } + } + + static class ArrayTypes { + Object[] cls; + + public Stooge[] e() { + return null; + } + + + + Object[] cls() { + return cls; + } + + public int[] a() { + return null; + } + } + int[][ + ] + w + [] // violation + [] ; // violation + int[][ + ] + z + [] // violation + [] ; // violation + + static class P { + private int x; + + public void set3(P p) { + synchronized (this) { // violation + p.x = get()[0]; + } + } + + public void set4(P p) { + synchronized(this) { // ok + p.x = get()[0]; + } + } + + private int[] get() { + return null; + } + } + + private @Nullable int array2 @Nullable [] @Nullable []; +} + + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface Nullable{} + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface I {} + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface J {} + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface K {} + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface L {} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionNewTypeTree.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionNewTypeTree.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionNewTypeTree.txt @@ -0,0 +1,1807 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +IMPORT -> import [3:0] +|--DOT -> . [3:15] +| |--DOT -> . [3:11] +| | |--IDENT -> java [3:7] +| | `--IDENT -> awt [3:12] +| `--STAR -> * [3:16] +`--SEMI -> ; [3:17] +IMPORT -> import [4:0] +|--DOT -> . [4:27] +| |--DOT -> . [4:16] +| | |--DOT -> . [4:11] +| | | |--IDENT -> java [4:7] +| | | `--IDENT -> lang [4:12] +| | `--IDENT -> annotation [4:17] +| `--IDENT -> ElementType [4:28] +`--SEMI -> ; [4:39] +IMPORT -> import [5:0] +|--DOT -> . [5:27] +| |--DOT -> . [5:16] +| | |--DOT -> . [5:11] +| | | |--IDENT -> java [5:7] +| | | `--IDENT -> lang [5:12] +| | `--IDENT -> annotation [5:17] +| `--IDENT -> Target [5:28] +`--SEMI -> ; [5:34] +IMPORT -> import [6:0] +|--DOT -> . [6:24] +| |--DOT -> . [6:16] +| | |--DOT -> . [6:11] +| | | |--IDENT -> java [6:7] +| | | `--IDENT -> lang [6:12] +| | `--IDENT -> reflect [6:17] +| `--IDENT -> AnnotatedElement [6:25] +`--SEMI -> ; [6:41] +IMPORT -> import [7:0] +|--DOT -> . [7:16] +| |--DOT -> . [7:11] +| | |--IDENT -> java [7:7] +| | `--IDENT -> util [7:12] +| `--IDENT -> List [7:17] +`--SEMI -> ; [7:21] +IMPORT -> import [8:0] +|--DOT -> . [8:16] +| |--DOT -> . [8:11] +| | |--IDENT -> java [8:7] +| | `--IDENT -> util [8:12] +| `--IDENT -> Map [8:17] +`--SEMI -> ; [8:20] +IMPORT -> import [9:0] +|--DOT -> . [9:16] +| |--DOT -> . [9:11] +| | |--IDENT -> java [9:7] +| | `--IDENT -> util [9:12] +| `--IDENT -> TreeSet [9:17] +`--SEMI -> ; [9:24] +IMPORT -> import [11:0] +|--DOT -> . [11:20] +| |--DOT -> . [11:16] +| | |--DOT -> . [11:12] +| | | |--IDENT -> javax [11:7] +| | | `--IDENT -> net [11:13] +| | `--IDENT -> ssl [11:17] +| `--IDENT -> KeyManager [11:21] +`--SEMI -> ; [11:31] +CLASS_DEF -> CLASS_DEF [13:0] +|--MODIFIERS -> MODIFIERS [13:0] +| `--LITERAL_PUBLIC -> public [13:0] +|--LITERAL_CLASS -> class [13:7] +|--IDENT -> InputAntlr4AstRegressionNewTypeTree [13:13] +`--OBJBLOCK -> OBJBLOCK [13:49] + |--LCURLY -> { [13:49] + |--CLASS_DEF -> CLASS_DEF [14:8] + | |--MODIFIERS -> MODIFIERS [14:8] + | | |--LITERAL_PRIVATE -> private [14:8] + | | `--LITERAL_STATIC -> static [14:16] + | |--LITERAL_CLASS -> class [14:23] + | |--IDENT -> Slot [14:29] + | `--OBJBLOCK -> OBJBLOCK [14:34] + | |--LCURLY -> { [14:34] + | |--VARIABLE_DEF -> VARIABLE_DEF [15:8] + | | |--MODIFIERS -> MODIFIERS [15:8] + | | |--TYPE -> TYPE [15:8] + | | | `--LITERAL_DOUBLE -> double [15:8] + | | |--IDENT -> sin2Phi [15:15] + | | |--ASSIGN -> = [15:23] + | | | `--EXPR -> EXPR [15:27] + | | | `--STAR -> * [15:27] + | | | |--NUM_INT -> 2 [15:25] + | | | `--METHOD_CALL -> ( [15:43] + | | | |--DOT -> . [15:39] + | | | | |--IDENT -> StrictMath [15:29] + | | | | `--IDENT -> sin [15:40] + | | | |--ELIST -> ELIST [15:44] + | | | | `--EXPR -> EXPR [15:44] + | | | | `--NUM_FLOAT -> 1.618033988749895 [15:44] + | | | `--RPAREN -> ) [15:61] + | | `--SEMI -> ; [15:62] + | |--VARIABLE_DEF -> VARIABLE_DEF [16:8] + | | |--MODIFIERS -> MODIFIERS [16:8] + | | | `--LITERAL_PUBLIC -> public [16:8] + | | |--TYPE -> TYPE [16:15] + | | | |--LITERAL_INT -> int [16:15] + | | | `--ARRAY_DECLARATOR -> [ [16:18] + | | | `--RBRACK -> ] [16:19] + | | |--IDENT -> ci [16:21] + | | `--SEMI -> ; [16:23] + | `--RCURLY -> } [17:4] + |--CLASS_DEF -> CLASS_DEF [19:4] + | |--MODIFIERS -> MODIFIERS [19:4] + | | |--LITERAL_PRIVATE -> private [19:4] + | | `--LITERAL_STATIC -> static [19:12] + | |--LITERAL_CLASS -> class [19:19] + | |--IDENT -> Transformer [19:25] + | `--OBJBLOCK -> OBJBLOCK [19:37] + | |--LCURLY -> { [19:37] + | `--RCURLY -> } [21:4] + |--CLASS_DEF -> CLASS_DEF [23:4] + | |--MODIFIERS -> MODIFIERS [23:4] + | | |--LITERAL_PRIVATE -> private [23:4] + | | `--LITERAL_STATIC -> static [23:12] + | |--LITERAL_CLASS -> class [23:19] + | |--IDENT -> Ef [23:25] + | `--OBJBLOCK -> OBJBLOCK [23:28] + | |--LCURLY -> { [23:28] + | |--VARIABLE_DEF -> VARIABLE_DEF [24:8] + | | |--MODIFIERS -> MODIFIERS [24:8] + | | |--TYPE -> TYPE [24:8] + | | | |--IDENT -> Transformer [24:8] + | | | `--ARRAY_DECLARATOR -> [ [24:19] + | | | `--RBRACK -> ] [24:20] + | | |--IDENT -> transformers [24:22] + | | |--ASSIGN -> = [24:35] + | | | `--EXPR -> EXPR [24:37] + | | | `--LITERAL_NEW -> new [24:37] + | | | |--IDENT -> Transformer [24:41] + | | | `--ARRAY_DECLARATOR -> [ [24:52] + | | | |--EXPR -> EXPR [24:53] + | | | | `--NUM_INT -> 10 [24:53] + | | | `--RBRACK -> ] [24:55] + | | `--SEMI -> ; [24:56] + | |--VARIABLE_DEF -> VARIABLE_DEF [25:8] + | | |--MODIFIERS -> MODIFIERS [25:8] + | | | `--LITERAL_STATIC -> static [25:8] + | | |--TYPE -> TYPE [25:15] + | | | `--LITERAL_BOOLEAN -> boolean [25:15] + | | |--IDENT -> forward [25:23] + | | |--ASSIGN -> = [25:31] + | | | `--EXPR -> EXPR [25:33] + | | | `--LITERAL_TRUE -> true [25:33] + | | `--SEMI -> ; [25:37] + | `--RCURLY -> } [26:4] + |--METHOD_DEF -> METHOD_DEF [28:4] + | |--MODIFIERS -> MODIFIERS [28:4] + | |--TYPE -> TYPE [28:4] + | | `--LITERAL_VOID -> void [28:4] + | |--IDENT -> goodMethod [28:9] + | |--LPAREN -> ( [28:19] + | |--PARAMETERS -> PARAMETERS [28:20] + | |--RPAREN -> ) [28:20] + | `--SLIST -> { [28:22] + | |--VARIABLE_DEF -> VARIABLE_DEF [29:8] + | | |--MODIFIERS -> MODIFIERS [29:8] + | | |--TYPE -> TYPE [29:8] + | | | `--IDENT -> Slot [29:8] + | | |--IDENT -> slot [29:13] + | | `--ASSIGN -> = [29:18] + | | `--EXPR -> EXPR [29:20] + | | `--LITERAL_NEW -> new [29:20] + | | |--IDENT -> Slot [29:24] + | | |--LPAREN -> ( [29:28] + | | |--ELIST -> ELIST [29:29] + | | `--RPAREN -> ) [29:29] + | |--SEMI -> ; [29:30] + | |--EXPR -> EXPR [30:19] + | | `--ASSIGN -> = [30:19] + | | |--INDEX_OP -> [ [30:15] + | | | |--DOT -> . [30:12] + | | | | |--IDENT -> slot [30:8] + | | | | `--IDENT -> ci [30:13] + | | | |--EXPR -> EXPR [30:16] + | | | | `--NUM_INT -> 5 [30:16] + | | | `--RBRACK -> ] [30:17] + | | `--NUM_INT -> 10 [30:21] + | |--SEMI -> ; [30:23] + | |--EXPR -> EXPR [31:16] + | | `--ASSIGN -> = [31:16] + | | |--DOT -> . [31:12] + | | | |--IDENT -> slot [31:8] + | | | `--IDENT -> ci [31:13] + | | `--LITERAL_NEW -> new [31:18] + | | |--LITERAL_INT -> int [31:22] + | | `--ARRAY_DECLARATOR -> [ [31:25] + | | |--EXPR -> EXPR [31:26] + | | | `--NUM_INT -> 6 [31:26] + | | `--RBRACK -> ] [31:27] + | |--SEMI -> ; [31:28] + | |--VARIABLE_DEF -> VARIABLE_DEF [32:8] + | | |--MODIFIERS -> MODIFIERS [32:8] + | | |--TYPE -> TYPE [32:8] + | | | |--LITERAL_DOUBLE -> double [32:8] + | | | `--ARRAY_DECLARATOR -> [ [32:14] + | | | `--RBRACK -> ] [32:15] + | | |--IDENT -> cZ [32:17] + | | `--ASSIGN -> = [32:20] + | | `--ARRAY_INIT -> { [32:22] + | | |--EXPR -> EXPR [32:23] + | | | `--NUM_FLOAT -> 1.1 [32:23] + | | |--COMMA -> , [32:26] + | | |--EXPR -> EXPR [32:28] + | | | `--NUM_FLOAT -> 1.2 [32:28] + | | `--RCURLY -> } [32:31] + | |--SEMI -> ; [32:32] + | |--VARIABLE_DEF -> VARIABLE_DEF [33:8] + | | |--MODIFIERS -> MODIFIERS [33:8] + | | | `--FINAL -> final [33:8] + | | |--TYPE -> TYPE [33:14] + | | | `--LITERAL_DOUBLE -> double [33:14] + | | |--IDENT -> dnZ [33:23] + | | `--ASSIGN -> = [33:27] + | | `--EXPR -> EXPR [33:56] + | | `--STAR -> * [33:56] + | | |--DOT -> . [33:33] + | | | |--IDENT -> slot [33:29] + | | | `--IDENT -> sin2Phi [33:34] + | | `--INDEX_OP -> [ [33:60] + | | |--IDENT -> cZ [33:58] + | | |--EXPR -> EXPR [33:61] + | | | `--NUM_INT -> 1 [33:61] + | | `--RBRACK -> ] [33:62] + | |--SEMI -> ; [33:63] + | |--VARIABLE_DEF -> VARIABLE_DEF [35:8] + | | |--MODIFIERS -> MODIFIERS [35:8] + | | | `--FINAL -> final [35:8] + | | |--TYPE -> TYPE [35:14] + | | | `--IDENT -> Ef [35:14] + | | |--IDENT -> ef [35:17] + | | `--ASSIGN -> = [35:20] + | | `--EXPR -> EXPR [35:22] + | | `--LITERAL_NEW -> new [35:22] + | | |--IDENT -> Ef [35:26] + | | |--LPAREN -> ( [35:28] + | | |--ELIST -> ELIST [35:29] + | | `--RPAREN -> ) [35:29] + | |--SEMI -> ; [35:30] + | |--VARIABLE_DEF -> VARIABLE_DEF [36:8] + | | |--MODIFIERS -> MODIFIERS [36:8] + | | | `--FINAL -> final [36:8] + | | |--TYPE -> TYPE [36:14] + | | | `--IDENT -> Transformer [36:14] + | | |--IDENT -> transformer [36:26] + | | `--ASSIGN -> = [36:38] + | | `--EXPR -> EXPR [37:23] + | | `--QUESTION -> ? [37:23] + | | |--DOT -> . [37:14] + | | | |--IDENT -> ef [37:12] + | | | `--IDENT -> forward [37:15] + | | |--INDEX_OP -> [ [37:40] + | | | |--DOT -> . [37:27] + | | | | |--IDENT -> ef [37:25] + | | | | `--IDENT -> transformers [37:28] + | | | |--EXPR -> EXPR [37:64] + | | | | `--MINUS -> - [37:64] + | | | | |--DOT -> . [37:56] + | | | | | |--DOT -> . [37:43] + | | | | | | |--IDENT -> ef [37:41] + | | | | | | `--IDENT -> transformers [37:44] + | | | | | `--IDENT -> length [37:57] + | | | | `--NUM_INT -> 1 [37:66] + | | | `--RBRACK -> ] [37:67] + | | |--COLON -> : [38:20] + | | `--INDEX_OP -> [ [38:37] + | | |--DOT -> . [38:24] + | | | |--IDENT -> ef [38:22] + | | | `--IDENT -> transformers [38:25] + | | |--EXPR -> EXPR [38:38] + | | | `--NUM_INT -> 0 [38:38] + | | `--RBRACK -> ] [38:39] + | |--SEMI -> ; [38:40] + | `--RCURLY -> } [40:4] + |--METHOD_DEF -> METHOD_DEF [42:4] + | |--MODIFIERS -> MODIFIERS [42:4] + | |--TYPE -> TYPE [42:4] + | | `--LITERAL_VOID -> void [42:4] + | |--IDENT -> badMethod [42:9] + | |--LPAREN -> ( [42:18] + | |--PARAMETERS -> PARAMETERS [42:19] + | |--RPAREN -> ) [42:19] + | `--SLIST -> { [42:21] + | |--VARIABLE_DEF -> VARIABLE_DEF [43:8] + | | |--MODIFIERS -> MODIFIERS [43:8] + | | |--TYPE -> TYPE [43:8] + | | | `--IDENT -> Slot [43:8] + | | |--IDENT -> slot [43:13] + | | `--ASSIGN -> = [43:18] + | | `--EXPR -> EXPR [43:20] + | | `--LITERAL_NEW -> new [43:20] + | | |--IDENT -> Slot [43:24] + | | |--LPAREN -> ( [43:28] + | | |--ELIST -> ELIST [43:29] + | | `--RPAREN -> ) [43:29] + | |--SEMI -> ; [43:30] + | |--EXPR -> EXPR [44:20] + | | `--ASSIGN -> = [44:20] + | | |--INDEX_OP -> [ [44:16] + | | | |--DOT -> . [44:12] + | | | | |--IDENT -> slot [44:8] + | | | | `--IDENT -> ci [44:13] + | | | |--EXPR -> EXPR [44:17] + | | | | `--NUM_INT -> 5 [44:17] + | | | `--RBRACK -> ] [44:18] + | | `--NUM_INT -> 10 [44:22] + | |--SEMI -> ; [44:24] + | |--EXPR -> EXPR [45:16] + | | `--ASSIGN -> = [45:16] + | | |--DOT -> . [45:12] + | | | |--IDENT -> slot [45:8] + | | | `--IDENT -> ci [45:13] + | | `--LITERAL_NEW -> new [45:18] + | | |--LITERAL_INT -> int [45:22] + | | `--ARRAY_DECLARATOR -> [ [45:26] + | | |--EXPR -> EXPR [45:27] + | | | `--NUM_INT -> 6 [45:27] + | | `--RBRACK -> ] [45:28] + | |--SEMI -> ; [45:29] + | |--VARIABLE_DEF -> VARIABLE_DEF [46:8] + | | |--MODIFIERS -> MODIFIERS [46:8] + | | |--TYPE -> TYPE [46:8] + | | | |--LITERAL_DOUBLE -> double [46:8] + | | | `--ARRAY_DECLARATOR -> [ [46:15] + | | | `--RBRACK -> ] [46:16] + | | |--IDENT -> cZ [46:18] + | | `--ASSIGN -> = [46:21] + | | `--ARRAY_INIT -> { [46:23] + | | |--EXPR -> EXPR [46:24] + | | | `--NUM_FLOAT -> 1.1 [46:24] + | | |--COMMA -> , [46:27] + | | |--EXPR -> EXPR [46:29] + | | | `--NUM_FLOAT -> 1.2 [46:29] + | | `--RCURLY -> } [46:32] + | |--SEMI -> ; [46:33] + | |--VARIABLE_DEF -> VARIABLE_DEF [47:8] + | | |--MODIFIERS -> MODIFIERS [47:8] + | | | `--FINAL -> final [47:8] + | | |--TYPE -> TYPE [47:14] + | | | `--LITERAL_DOUBLE -> double [47:14] + | | |--IDENT -> dnZ [47:23] + | | `--ASSIGN -> = [47:27] + | | `--EXPR -> EXPR [47:56] + | | `--STAR -> * [47:56] + | | |--DOT -> . [47:33] + | | | |--IDENT -> slot [47:29] + | | | `--IDENT -> sin2Phi [47:34] + | | `--INDEX_OP -> [ [47:61] + | | |--IDENT -> cZ [47:58] + | | |--EXPR -> EXPR [47:62] + | | | `--NUM_INT -> 1 [47:62] + | | `--RBRACK -> ] [47:63] + | |--SEMI -> ; [47:64] + | |--VARIABLE_DEF -> VARIABLE_DEF [49:8] + | | |--MODIFIERS -> MODIFIERS [49:8] + | | | `--FINAL -> final [49:8] + | | |--TYPE -> TYPE [49:14] + | | | `--IDENT -> Ef [49:14] + | | |--IDENT -> ef [49:17] + | | `--ASSIGN -> = [49:20] + | | `--EXPR -> EXPR [49:22] + | | `--LITERAL_NEW -> new [49:22] + | | |--IDENT -> Ef [49:26] + | | |--LPAREN -> ( [49:28] + | | |--ELIST -> ELIST [49:29] + | | `--RPAREN -> ) [49:29] + | |--SEMI -> ; [49:30] + | |--VARIABLE_DEF -> VARIABLE_DEF [50:8] + | | |--MODIFIERS -> MODIFIERS [50:8] + | | | `--FINAL -> final [50:8] + | | |--TYPE -> TYPE [50:14] + | | | `--IDENT -> Transformer [50:14] + | | |--IDENT -> transformer [50:26] + | | `--ASSIGN -> = [50:38] + | | `--EXPR -> EXPR [51:23] + | | `--QUESTION -> ? [51:23] + | | |--DOT -> . [51:14] + | | | |--IDENT -> ef [51:12] + | | | `--IDENT -> forward [51:15] + | | |--INDEX_OP -> [ [51:41] + | | | |--DOT -> . [51:27] + | | | | |--IDENT -> ef [51:25] + | | | | `--IDENT -> transformers [51:28] + | | | |--EXPR -> EXPR [51:65] + | | | | `--MINUS -> - [51:65] + | | | | |--DOT -> . [51:57] + | | | | | |--DOT -> . [51:44] + | | | | | | |--IDENT -> ef [51:42] + | | | | | | `--IDENT -> transformers [51:45] + | | | | | `--IDENT -> length [51:58] + | | | | `--NUM_INT -> 1 [51:67] + | | | `--RBRACK -> ] [51:68] + | | |--COLON -> : [52:20] + | | `--INDEX_OP -> [ [52:38] + | | |--DOT -> . [52:24] + | | | |--IDENT -> ef [52:22] + | | | `--IDENT -> transformers [52:25] + | | |--EXPR -> EXPR [52:39] + | | | `--NUM_INT -> 0 [52:39] + | | `--RBRACK -> ] [52:40] + | |--SEMI -> ; [52:41] + | |--VARIABLE_DEF -> VARIABLE_DEF [54:8] + | | |--MODIFIERS -> MODIFIERS [54:8] + | | |--TYPE -> TYPE [54:8] + | | | |--LITERAL_INT -> int [54:8] + | | | |--ARRAY_DECLARATOR -> [ [54:11] + | | | | `--RBRACK -> ] [54:12] + | | | |--ARRAY_DECLARATOR -> [ [54:13] + | | | | `--RBRACK -> ] [55:16] + | | | |--ARRAY_DECLARATOR -> [ [57:18] + | | | | `--RBRACK -> ] [57:19] + | | | `--ARRAY_DECLARATOR -> [ [58:24] + | | | `--RBRACK -> ] [58:25] + | | `--IDENT -> a [56:17] + | |--SEMI -> ; [58:27] + | |--VARIABLE_DEF -> VARIABLE_DEF [59:16] + | | |--MODIFIERS -> MODIFIERS [59:16] + | | |--TYPE -> TYPE [59:16] + | | | |--LITERAL_INT -> int [59:16] + | | | |--ARRAY_DECLARATOR -> [ [59:19] + | | | | `--RBRACK -> ] [59:20] + | | | |--ARRAY_DECLARATOR -> [ [59:21] + | | | | `--RBRACK -> ] [60:17] + | | | |--ARRAY_DECLARATOR -> [ [62:17] + | | | | `--RBRACK -> ] [62:18] + | | | `--ARRAY_DECLARATOR -> [ [63:24] + | | | `--RBRACK -> ] [63:25] + | | `--IDENT -> b [61:17] + | |--SEMI -> ; [63:27] + | `--RCURLY -> } [64:4] + |--METHOD_DEF -> METHOD_DEF [66:4] + | |--MODIFIERS -> MODIFIERS [66:4] + | |--TYPE -> TYPE [66:4] + | | `--LITERAL_VOID -> void [66:4] + | |--IDENT -> varargLong [66:9] + | |--LPAREN -> ( [66:19] + | |--PARAMETERS -> PARAMETERS [66:20] + | | `--PARAMETER_DEF -> PARAMETER_DEF [66:20] + | | |--MODIFIERS -> MODIFIERS [66:20] + | | | `--ANNOTATION -> ANNOTATION [66:20] + | | | |--AT -> @ [66:20] + | | | `--IDENT -> I [66:21] + | | |--TYPE -> TYPE [66:23] + | | | |--IDENT -> String [66:23] + | | | |--ANNOTATIONS -> ANNOTATIONS [66:30] + | | | | `--ANNOTATION -> ANNOTATION [66:30] + | | | | |--AT -> @ [66:30] + | | | | `--IDENT -> L [66:31] + | | | |--ARRAY_DECLARATOR -> [ [66:33] + | | | | `--RBRACK -> ] [66:34] + | | | |--ANNOTATIONS -> ANNOTATIONS [66:36] + | | | | `--ANNOTATION -> ANNOTATION [66:36] + | | | | |--AT -> @ [66:36] + | | | | `--IDENT -> K [66:37] + | | | |--ARRAY_DECLARATOR -> [ [66:39] + | | | | `--RBRACK -> ] [66:40] + | | | `--ANNOTATIONS -> ANNOTATIONS [66:42] + | | | `--ANNOTATION -> ANNOTATION [66:42] + | | | |--AT -> @ [66:42] + | | | `--IDENT -> J [66:43] + | | |--ELLIPSIS -> ... [66:45] + | | `--IDENT -> vararg2 [66:49] + | |--RPAREN -> ) [66:56] + | `--SLIST -> { [66:58] + | `--RCURLY -> } [66:60] + |--METHOD_DEF -> METHOD_DEF [67:4] + | |--MODIFIERS -> MODIFIERS [67:4] + | | `--ANNOTATION -> ANNOTATION [67:4] + | | |--AT -> @ [67:4] + | | |--IDENT -> SuppressWarnings [67:5] + | | |--LPAREN -> ( [67:21] + | | |--EXPR -> EXPR [67:22] + | | | `--STRING_LITERAL -> "unused" [67:22] + | | `--RPAREN -> ) [67:30] + | |--TYPE -> TYPE [68:4] + | | `--LITERAL_VOID -> void [68:4] + | |--IDENT -> withUpperBound [68:9] + | |--LPAREN -> ( [68:23] + | |--PARAMETERS -> PARAMETERS [68:24] + | | `--PARAMETER_DEF -> PARAMETER_DEF [68:24] + | | |--MODIFIERS -> MODIFIERS [68:24] + | | |--TYPE -> TYPE [68:24] + | | | |--IDENT -> List [68:24] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [68:28] + | | | |--GENERIC_START -> < [68:28] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [68:29] + | | | | |--WILDCARD_TYPE -> ? [68:29] + | | | | `--TYPE_UPPER_BOUNDS -> extends [68:31] + | | | | |--LITERAL_INT -> int [68:39] + | | | | |--ARRAY_DECLARATOR -> [ [68:42] + | | | | | `--RBRACK -> ] [68:43] + | | | | `--ARRAY_DECLARATOR -> [ [68:44] + | | | | `--RBRACK -> ] [68:45] + | | | `--GENERIC_END -> > [68:46] + | | `--IDENT -> list [68:48] + | |--RPAREN -> ) [68:52] + | `--SLIST -> { [68:54] + | `--RCURLY -> } [68:55] + |--CLASS_DEF -> CLASS_DEF [70:4] + | |--MODIFIERS -> MODIFIERS [70:4] + | | |--LITERAL_PRIVATE -> private [70:4] + | | `--LITERAL_STATIC -> static [70:12] + | |--LITERAL_CLASS -> class [70:19] + | |--IDENT -> SSLSecurity [70:25] + | `--OBJBLOCK -> OBJBLOCK [70:37] + | |--LCURLY -> { [70:37] + | |--METHOD_DEF -> METHOD_DEF [71:8] + | | |--MODIFIERS -> MODIFIERS [71:8] + | | | `--LITERAL_STATIC -> static [71:8] + | | |--TYPE -> TYPE [71:15] + | | | |--IDENT -> KeyManager [71:15] + | | | `--ARRAY_DECLARATOR -> [ [71:25] + | | | `--RBRACK -> ] [71:26] + | | |--IDENT -> truncateArray [71:28] + | | |--LPAREN -> ( [71:41] + | | |--PARAMETERS -> PARAMETERS [71:42] + | | | |--PARAMETER_DEF -> PARAMETER_DEF [71:42] + | | | | |--MODIFIERS -> MODIFIERS [71:42] + | | | | |--TYPE -> TYPE [71:42] + | | | | | |--IDENT -> KeyManager [71:42] + | | | | | `--ARRAY_DECLARATOR -> [ [71:52] + | | | | | `--RBRACK -> ] [71:53] + | | | | `--IDENT -> kmaw [71:55] + | | | |--COMMA -> , [71:59] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [72:42] + | | | |--MODIFIERS -> MODIFIERS [72:42] + | | | |--TYPE -> TYPE [72:42] + | | | | |--IDENT -> KeyManager [72:42] + | | | | `--ARRAY_DECLARATOR -> [ [72:52] + | | | | `--RBRACK -> ] [72:53] + | | | `--IDENT -> keyManagers [72:55] + | | |--RPAREN -> ) [72:66] + | | `--SLIST -> { [72:68] + | | |--LITERAL_RETURN -> return [73:12] + | | | |--EXPR -> EXPR [73:19] + | | | | `--LITERAL_NULL -> null [73:19] + | | | `--SEMI -> ; [73:23] + | | `--RCURLY -> } [74:8] + | `--RCURLY -> } [75:4] + |--METHOD_DEF -> METHOD_DEF [78:4] + | |--MODIFIERS -> MODIFIERS [78:4] + | |--TYPE -> TYPE [78:4] + | | `--LITERAL_VOID -> void [78:4] + | |--IDENT -> method3 [78:9] + | |--LPAREN -> ( [78:16] + | |--PARAMETERS -> PARAMETERS [78:17] + | | `--PARAMETER_DEF -> PARAMETER_DEF [78:17] + | | |--MODIFIERS -> MODIFIERS [78:17] + | | |--TYPE -> TYPE [78:17] + | | | `--LITERAL_INT -> int [78:17] + | | `--IDENT -> x [78:21] + | |--RPAREN -> ) [78:22] + | `--SLIST -> { [78:24] + | |--VARIABLE_DEF -> VARIABLE_DEF [79:8] + | | |--MODIFIERS -> MODIFIERS [79:8] + | | |--TYPE -> TYPE [79:8] + | | | |--IDENT -> KeyManager [79:8] + | | | `--ARRAY_DECLARATOR -> [ [79:18] + | | | `--RBRACK -> ] [79:19] + | | |--IDENT -> kmaw [79:21] + | | `--ASSIGN -> = [79:26] + | | `--EXPR -> EXPR [79:28] + | | `--LITERAL_NULL -> null [79:28] + | |--SEMI -> ; [79:32] + | |--LITERAL_IF -> if [80:9] + | | |--LPAREN -> ( [80:12] + | | |--EXPR -> EXPR [80:15] + | | | `--EQUAL -> == [80:15] + | | | |--IDENT -> x [80:13] + | | | `--NUM_INT -> 1 [80:18] + | | |--RPAREN -> ) [80:19] + | | `--SLIST -> { [80:21] + | | |--EXPR -> EXPR [81:18] + | | | `--ASSIGN -> = [81:18] + | | | |--IDENT -> kmaw [81:13] + | | | `--TYPECAST -> ( [81:20] + | | | |--TYPE -> TYPE [81:34] + | | | | |--DOT -> . [81:34] + | | | | | |--DOT -> . [81:30] + | | | | | | |--DOT -> . [81:26] + | | | | | | | |--IDENT -> javax [81:21] + | | | | | | | `--IDENT -> net [81:27] + | | | | | | `--IDENT -> ssl [81:31] + | | | | | `--IDENT -> KeyManager [81:35] + | | | | `--ARRAY_DECLARATOR -> [ [81:45] + | | | | `--RBRACK -> ] [81:46] + | | | |--RPAREN -> ) [81:47] + | | | `--METHOD_CALL -> ( [82:48] + | | | |--DOT -> . [82:34] + | | | | |--IDENT -> SSLSecurity [82:23] + | | | | `--IDENT -> truncateArray [82:35] + | | | |--ELIST -> ELIST [82:49] + | | | | |--EXPR -> EXPR [82:49] + | | | | | `--IDENT -> kmaw [82:49] + | | | | |--COMMA -> , [82:53] + | | | | `--EXPR -> EXPR [83:27] + | | | | `--LITERAL_NEW -> new [83:27] + | | | | |--DOT -> . [83:44] + | | | | | |--DOT -> . [83:40] + | | | | | | |--DOT -> . [83:36] + | | | | | | | |--IDENT -> javax [83:31] + | | | | | | | `--IDENT -> net [83:37] + | | | | | | `--IDENT -> ssl [83:41] + | | | | | `--IDENT -> KeyManager [83:45] + | | | | `--ARRAY_DECLARATOR -> [ [83:56] + | | | | |--EXPR -> EXPR [83:57] + | | | | | `--NUM_INT -> 3 [83:57] + | | | | `--RBRACK -> ] [83:58] + | | | `--RPAREN -> ) [83:59] + | | |--SEMI -> ; [83:60] + | | `--RCURLY -> } [84:9] + | `--RCURLY -> } [85:4] + |--ENUM_DEF -> ENUM_DEF [87:4] + | |--MODIFIERS -> MODIFIERS [87:4] + | |--ENUM -> enum [87:4] + | |--IDENT -> FPMethodArgs [87:9] + | `--OBJBLOCK -> OBJBLOCK [87:22] + | |--LCURLY -> { [87:22] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [89:8] + | | |--ANNOTATIONS -> ANNOTATIONS [89:8] + | | `--IDENT -> IGNN [89:8] + | |--COMMA -> , [89:12] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [90:8] + | | |--ANNOTATIONS -> ANNOTATIONS [90:8] + | | `--IDENT -> IIGNN [90:8] + | |--COMMA -> , [90:13] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [91:8] + | | |--ANNOTATIONS -> ANNOTATIONS [91:8] + | | `--IDENT -> GNNII [91:8] + | |--COMMA -> , [91:13] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [92:8] + | | |--ANNOTATIONS -> ANNOTATIONS [92:8] + | | `--IDENT -> GNNC [92:8] + | |--SEMI -> ; [92:12] + | |--METHOD_DEF -> METHOD_DEF [94:8] + | | |--MODIFIERS -> MODIFIERS [94:8] + | | | `--LITERAL_PUBLIC -> public [94:8] + | | |--TYPE -> TYPE [94:15] + | | | |--IDENT -> Class [94:15] + | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [94:20] + | | | | |--GENERIC_START -> < [94:20] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [94:21] + | | | | | `--WILDCARD_TYPE -> ? [94:21] + | | | | `--GENERIC_END -> > [94:22] + | | | `--ARRAY_DECLARATOR -> [ [94:23] + | | | `--RBRACK -> ] [94:24] + | | |--IDENT -> getMethodArguments [94:26] + | | |--LPAREN -> ( [94:44] + | | |--PARAMETERS -> PARAMETERS [94:45] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [94:45] + | | | |--MODIFIERS -> MODIFIERS [94:45] + | | | |--TYPE -> TYPE [94:45] + | | | | `--LITERAL_BOOLEAN -> boolean [94:45] + | | | `--IDENT -> isFPType [94:53] + | | |--RPAREN -> ) [94:61] + | | `--SLIST -> { [94:63] + | | |--VARIABLE_DEF -> VARIABLE_DEF [95:12] + | | | |--MODIFIERS -> MODIFIERS [95:12] + | | | |--TYPE -> TYPE [95:12] + | | | | |--IDENT -> Class [95:12] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [95:17] + | | | | |--GENERIC_START -> < [95:17] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [95:18] + | | | | | `--WILDCARD_TYPE -> ? [95:18] + | | | | `--GENERIC_END -> > [95:19] + | | | |--IDENT -> N [95:21] + | | | `--ASSIGN -> = [95:23] + | | | `--EXPR -> EXPR [95:36] + | | | `--QUESTION -> ? [95:36] + | | | |--LPAREN -> ( [95:25] + | | | |--IDENT -> isFPType [95:26] + | | | |--RPAREN -> ) [95:34] + | | | |--DOT -> . [95:43] + | | | | |--IDENT -> Float [95:38] + | | | | `--IDENT -> TYPE [95:44] + | | | |--COLON -> : [95:49] + | | | `--DOT -> . [95:58] + | | | |--IDENT -> Integer [95:51] + | | | `--IDENT -> TYPE [95:59] + | | |--SEMI -> ; [95:63] + | | |--VARIABLE_DEF -> VARIABLE_DEF [96:12] + | | | |--MODIFIERS -> MODIFIERS [96:12] + | | | |--TYPE -> TYPE [96:12] + | | | | |--IDENT -> Class [96:12] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [96:17] + | | | | |--GENERIC_START -> < [96:17] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [96:18] + | | | | | `--WILDCARD_TYPE -> ? [96:18] + | | | | `--GENERIC_END -> > [96:19] + | | | |--IDENT -> G [96:21] + | | | `--ASSIGN -> = [96:23] + | | | `--EXPR -> EXPR [96:36] + | | | `--QUESTION -> ? [96:36] + | | | |--LPAREN -> ( [96:25] + | | | |--IDENT -> isFPType [96:26] + | | | |--RPAREN -> ) [96:34] + | | | |--DOT -> . [96:48] + | | | | |--IDENT -> Graphics2D [96:38] + | | | | `--LITERAL_CLASS -> class [96:49] + | | | |--COLON -> : [96:55] + | | | `--DOT -> . [96:65] + | | | |--IDENT -> Graphics [96:57] + | | | `--LITERAL_CLASS -> class [96:66] + | | |--SEMI -> ; [96:71] + | | |--LITERAL_SWITCH -> switch [97:12] + | | | |--LPAREN -> ( [97:19] + | | | |--EXPR -> EXPR [97:20] + | | | | `--LITERAL_THIS -> this [97:20] + | | | |--RPAREN -> ) [97:24] + | | | |--LCURLY -> { [97:26] + | | | |--CASE_GROUP -> CASE_GROUP [98:16] + | | | | |--LITERAL_CASE -> case [98:16] + | | | | | |--EXPR -> EXPR [98:21] + | | | | | | `--IDENT -> IGNN [98:21] + | | | | | `--COLON -> : [98:25] + | | | | `--SLIST -> SLIST [99:20] + | | | | `--LITERAL_RETURN -> return [99:20] + | | | | |--EXPR -> EXPR [99:27] + | | | | | `--LITERAL_NEW -> new [99:27] + | | | | | |--IDENT -> Class [99:31] + | | | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [99:36] + | | | | | | |--GENERIC_START -> < [99:36] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [99:37] + | | | | | | | `--WILDCARD_TYPE -> ? [99:37] + | | | | | | `--GENERIC_END -> > [99:38] + | | | | | |--ARRAY_DECLARATOR -> [ [99:39] + | | | | | | `--RBRACK -> ] [99:40] + | | | | | `--ARRAY_INIT -> { [99:41] + | | | | | |--EXPR -> EXPR [99:49] + | | | | | | `--DOT -> . [99:49] + | | | | | | |--IDENT -> Integer [99:42] + | | | | | | `--IDENT -> TYPE [99:50] + | | | | | |--COMMA -> , [99:54] + | | | | | |--EXPR -> EXPR [99:56] + | | | | | | `--IDENT -> G [99:56] + | | | | | |--COMMA -> , [99:57] + | | | | | |--EXPR -> EXPR [99:59] + | | | | | | `--IDENT -> N [99:59] + | | | | | |--COMMA -> , [99:60] + | | | | | |--EXPR -> EXPR [99:62] + | | | | | | `--IDENT -> N [99:62] + | | | | | `--RCURLY -> } [99:63] + | | | | `--SEMI -> ; [99:64] + | | | |--CASE_GROUP -> CASE_GROUP [100:16] + | | | | |--LITERAL_CASE -> case [100:16] + | | | | | |--EXPR -> EXPR [100:21] + | | | | | | `--IDENT -> IIGNN [100:21] + | | | | | `--COLON -> : [100:26] + | | | | `--SLIST -> SLIST [101:20] + | | | | `--LITERAL_RETURN -> return [101:20] + | | | | |--EXPR -> EXPR [101:27] + | | | | | `--LITERAL_NEW -> new [101:27] + | | | | | |--IDENT -> Class [101:31] + | | | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [101:36] + | | | | | | |--GENERIC_START -> < [101:36] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [101:37] + | | | | | | | `--WILDCARD_TYPE -> ? [101:37] + | | | | | | `--GENERIC_END -> > [101:38] + | | | | | |--ARRAY_DECLARATOR -> [ [101:39] + | | | | | | `--RBRACK -> ] [101:40] + | | | | | `--ARRAY_INIT -> { [101:41] + | | | | | |--EXPR -> EXPR [101:49] + | | | | | | `--DOT -> . [101:49] + | | | | | | |--IDENT -> Integer [101:42] + | | | | | | `--IDENT -> TYPE [101:50] + | | | | | |--COMMA -> , [101:54] + | | | | | |--EXPR -> EXPR [101:63] + | | | | | | `--DOT -> . [101:63] + | | | | | | |--IDENT -> Integer [101:56] + | | | | | | `--IDENT -> TYPE [101:64] + | | | | | |--COMMA -> , [101:68] + | | | | | |--EXPR -> EXPR [101:70] + | | | | | | `--IDENT -> G [101:70] + | | | | | |--COMMA -> , [101:71] + | | | | | |--EXPR -> EXPR [101:73] + | | | | | | `--IDENT -> N [101:73] + | | | | | |--COMMA -> , [101:74] + | | | | | |--EXPR -> EXPR [101:76] + | | | | | | `--IDENT -> N [101:76] + | | | | | `--RCURLY -> } [101:77] + | | | | `--SEMI -> ; [101:78] + | | | |--CASE_GROUP -> CASE_GROUP [102:16] + | | | | |--LITERAL_CASE -> case [102:16] + | | | | | |--EXPR -> EXPR [102:21] + | | | | | | `--IDENT -> GNNII [102:21] + | | | | | `--COLON -> : [102:26] + | | | | `--SLIST -> SLIST [103:20] + | | | | `--LITERAL_RETURN -> return [103:20] + | | | | |--EXPR -> EXPR [103:27] + | | | | | `--LITERAL_NEW -> new [103:27] + | | | | | |--IDENT -> Class [103:31] + | | | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [103:36] + | | | | | | |--GENERIC_START -> < [103:36] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [103:37] + | | | | | | | `--WILDCARD_TYPE -> ? [103:37] + | | | | | | `--GENERIC_END -> > [103:38] + | | | | | |--ARRAY_DECLARATOR -> [ [103:39] + | | | | | | `--RBRACK -> ] [103:40] + | | | | | `--ARRAY_INIT -> { [103:41] + | | | | | |--EXPR -> EXPR [103:42] + | | | | | | `--IDENT -> G [103:42] + | | | | | |--COMMA -> , [103:43] + | | | | | |--EXPR -> EXPR [103:45] + | | | | | | `--IDENT -> N [103:45] + | | | | | |--COMMA -> , [103:46] + | | | | | |--EXPR -> EXPR [103:48] + | | | | | | `--IDENT -> N [103:48] + | | | | | |--COMMA -> , [103:49] + | | | | | |--EXPR -> EXPR [103:58] + | | | | | | `--DOT -> . [103:58] + | | | | | | |--IDENT -> Integer [103:51] + | | | | | | `--IDENT -> TYPE [103:59] + | | | | | |--COMMA -> , [103:63] + | | | | | |--EXPR -> EXPR [103:72] + | | | | | | `--DOT -> . [103:72] + | | | | | | |--IDENT -> Integer [103:65] + | | | | | | `--IDENT -> TYPE [103:73] + | | | | | `--RCURLY -> } [103:77] + | | | | `--SEMI -> ; [103:78] + | | | |--CASE_GROUP -> CASE_GROUP [104:16] + | | | | |--LITERAL_CASE -> case [104:16] + | | | | | |--EXPR -> EXPR [104:21] + | | | | | | `--IDENT -> GNNC [104:21] + | | | | | `--COLON -> : [104:25] + | | | | `--SLIST -> SLIST [105:20] + | | | | `--LITERAL_RETURN -> return [105:20] + | | | | |--EXPR -> EXPR [105:27] + | | | | | `--LITERAL_NEW -> new [105:27] + | | | | | |--IDENT -> Class [105:31] + | | | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [105:36] + | | | | | | |--GENERIC_START -> < [105:36] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [105:37] + | | | | | | | `--WILDCARD_TYPE -> ? [105:37] + | | | | | | `--GENERIC_END -> > [105:38] + | | | | | |--ARRAY_DECLARATOR -> [ [105:39] + | | | | | | `--RBRACK -> ] [105:40] + | | | | | `--ARRAY_INIT -> { [105:41] + | | | | | |--EXPR -> EXPR [105:42] + | | | | | | `--IDENT -> G [105:42] + | | | | | |--COMMA -> , [105:43] + | | | | | |--EXPR -> EXPR [105:45] + | | | | | | `--IDENT -> N [105:45] + | | | | | |--COMMA -> , [105:46] + | | | | | |--EXPR -> EXPR [105:48] + | | | | | | `--IDENT -> N [105:48] + | | | | | |--COMMA -> , [105:49] + | | | | | |--EXPR -> EXPR [105:60] + | | | | | | `--DOT -> . [105:60] + | | | | | | |--IDENT -> Character [105:51] + | | | | | | `--IDENT -> TYPE [105:61] + | | | | | `--RCURLY -> } [105:65] + | | | | `--SEMI -> ; [105:66] + | | | |--CASE_GROUP -> CASE_GROUP [106:16] + | | | | |--LITERAL_DEFAULT -> default [106:16] + | | | | | `--COLON -> : [106:23] + | | | | `--SLIST -> SLIST [107:20] + | | | | `--LITERAL_THROW -> throw [107:20] + | | | | |--EXPR -> EXPR [107:26] + | | | | | `--LITERAL_NEW -> new [107:26] + | | | | | |--IDENT -> RuntimeException [107:30] + | | | | | |--LPAREN -> ( [107:46] + | | | | | |--ELIST -> ELIST [107:47] + | | | | | | `--EXPR -> EXPR [107:47] + | | | | | | `--STRING_LITERAL -> "Unknown method arguments!" [107:47] + | | | | | `--RPAREN -> ) [107:74] + | | | | `--SEMI -> ; [107:75] + | | | `--RCURLY -> } [108:12] + | | `--RCURLY -> } [109:8] + | `--RCURLY -> } [110:4] + |--CLASS_DEF -> CLASS_DEF [112:4] + | |--MODIFIERS -> MODIFIERS [112:4] + | | |--LITERAL_PUBLIC -> public [112:4] + | | `--LITERAL_STATIC -> static [112:11] + | |--LITERAL_CLASS -> class [112:18] + | |--IDENT -> IntData [112:24] + | `--OBJBLOCK -> OBJBLOCK [112:32] + | |--LCURLY -> { [112:32] + | |--VARIABLE_DEF -> VARIABLE_DEF [113:8] + | | |--MODIFIERS -> MODIFIERS [113:8] + | | |--TYPE -> TYPE [113:8] + | | | |--LITERAL_INT -> int [113:8] + | | | `--ARRAY_DECLARATOR -> [ [113:11] + | | | `--RBRACK -> ] [113:12] + | | |--IDENT -> xorData [113:14] + | | `--SEMI -> ; [113:21] + | |--CTOR_DEF -> CTOR_DEF [115:8] + | | |--MODIFIERS -> MODIFIERS [115:8] + | | |--IDENT -> IntData [115:8] + | | |--LPAREN -> ( [115:15] + | | |--PARAMETERS -> PARAMETERS [115:16] + | | | |--PARAMETER_DEF -> PARAMETER_DEF [115:16] + | | | | |--MODIFIERS -> MODIFIERS [115:16] + | | | | |--TYPE -> TYPE [115:16] + | | | | | `--IDENT -> Object [115:16] + | | | | `--IDENT -> srcPixel [115:23] + | | | |--COMMA -> , [115:31] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [115:33] + | | | |--MODIFIERS -> MODIFIERS [115:33] + | | | |--TYPE -> TYPE [115:33] + | | | | `--IDENT -> Object [115:33] + | | | `--IDENT -> xorPixel [115:40] + | | |--RPAREN -> ) [115:48] + | | `--SLIST -> { [115:50] + | | |--EXPR -> EXPR [116:25] + | | | `--ASSIGN -> = [116:25] + | | | |--DOT -> . [116:16] + | | | | |--LITERAL_THIS -> this [116:12] + | | | | `--IDENT -> xorData [116:17] + | | | `--TYPECAST -> ( [116:27] + | | | |--TYPE -> TYPE [116:28] + | | | | |--LITERAL_INT -> int [116:28] + | | | | `--ARRAY_DECLARATOR -> [ [116:31] + | | | | `--RBRACK -> ] [116:32] + | | | |--RPAREN -> ) [116:33] + | | | `--IDENT -> srcPixel [116:35] + | | |--SEMI -> ; [116:43] + | | |--EXPR -> EXPR [117:25] + | | | `--ASSIGN -> = [117:25] + | | | |--DOT -> . [117:16] + | | | | |--LITERAL_THIS -> this [117:12] + | | | | `--IDENT -> xorData [117:17] + | | | `--TYPECAST -> ( [117:27] + | | | |--TYPE -> TYPE [117:28] + | | | | |--LITERAL_INT -> int [117:28] + | | | | `--ARRAY_DECLARATOR -> [ [117:31] + | | | | `--RBRACK -> ] [117:32] + | | | |--RPAREN -> ) [117:33] + | | | `--IDENT -> xorPixel [117:35] + | | |--SEMI -> ; [117:43] + | | `--RCURLY -> } [118:8] + | |--METHOD_DEF -> METHOD_DEF [120:8] + | | |--MODIFIERS -> MODIFIERS [120:8] + | | | `--LITERAL_PROTECTED -> protected [120:8] + | | |--TYPE -> TYPE [120:18] + | | | `--LITERAL_VOID -> void [120:18] + | | |--IDENT -> xorPixel [120:23] + | | |--LPAREN -> ( [120:31] + | | |--PARAMETERS -> PARAMETERS [120:32] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [120:32] + | | | |--MODIFIERS -> MODIFIERS [120:32] + | | | |--TYPE -> TYPE [120:32] + | | | | `--IDENT -> Object [120:32] + | | | `--IDENT -> pixData [120:39] + | | |--RPAREN -> ) [120:46] + | | `--SLIST -> { [120:48] + | | |--VARIABLE_DEF -> VARIABLE_DEF [121:12] + | | | |--MODIFIERS -> MODIFIERS [121:12] + | | | |--TYPE -> TYPE [121:12] + | | | | |--LITERAL_INT -> int [121:12] + | | | | `--ARRAY_DECLARATOR -> [ [121:15] + | | | | `--RBRACK -> ] [121:16] + | | | |--IDENT -> dstData [121:18] + | | | `--ASSIGN -> = [121:26] + | | | `--EXPR -> EXPR [121:28] + | | | `--TYPECAST -> ( [121:28] + | | | |--TYPE -> TYPE [121:29] + | | | | |--LITERAL_INT -> int [121:29] + | | | | `--ARRAY_DECLARATOR -> [ [121:32] + | | | | `--RBRACK -> ] [121:33] + | | | |--RPAREN -> ) [121:34] + | | | `--IDENT -> pixData [121:36] + | | |--SEMI -> ; [121:43] + | | |--LITERAL_FOR -> for [122:12] + | | | |--LPAREN -> ( [122:16] + | | | |--FOR_INIT -> FOR_INIT [122:17] + | | | | `--VARIABLE_DEF -> VARIABLE_DEF [122:17] + | | | | |--MODIFIERS -> MODIFIERS [122:17] + | | | | |--TYPE -> TYPE [122:17] + | | | | | `--LITERAL_INT -> int [122:17] + | | | | |--IDENT -> i [122:21] + | | | | `--ASSIGN -> = [122:23] + | | | | `--EXPR -> EXPR [122:25] + | | | | `--NUM_INT -> 0 [122:25] + | | | |--SEMI -> ; [122:26] + | | | |--FOR_CONDITION -> FOR_CONDITION [122:30] + | | | | `--EXPR -> EXPR [122:30] + | | | | `--LT -> < [122:30] + | | | | |--IDENT -> i [122:28] + | | | | `--DOT -> . [122:39] + | | | | |--IDENT -> dstData [122:32] + | | | | `--IDENT -> length [122:40] + | | | |--SEMI -> ; [122:46] + | | | |--FOR_ITERATOR -> FOR_ITERATOR [122:49] + | | | | `--ELIST -> ELIST [122:49] + | | | | `--EXPR -> EXPR [122:49] + | | | | `--POST_INC -> ++ [122:49] + | | | | `--IDENT -> i [122:48] + | | | |--RPAREN -> ) [122:51] + | | | `--SLIST -> { [122:53] + | | | |--EXPR -> EXPR [123:27] + | | | | `--BXOR_ASSIGN -> ^= [123:27] + | | | | |--INDEX_OP -> [ [123:23] + | | | | | |--IDENT -> dstData [123:16] + | | | | | |--EXPR -> EXPR [123:24] + | | | | | | `--IDENT -> i [123:24] + | | | | | `--RBRACK -> ] [123:25] + | | | | `--INDEX_OP -> [ [123:37] + | | | | |--IDENT -> xorData [123:30] + | | | | |--EXPR -> EXPR [123:38] + | | | | | `--IDENT -> i [123:38] + | | | | `--RBRACK -> ] [123:39] + | | | |--SEMI -> ; [123:40] + | | | `--RCURLY -> } [124:12] + | | `--RCURLY -> } [125:8] + | |--METHOD_DEF -> METHOD_DEF [127:8] + | | |--MODIFIERS -> MODIFIERS [127:8] + | | |--TYPE -> TYPE [127:8] + | | | |--IDENT -> Object [127:8] + | | | `--ARRAY_DECLARATOR -> [ [127:14] + | | | `--RBRACK -> ] [127:15] + | | |--IDENT -> getXorData [127:17] + | | |--LPAREN -> ( [127:27] + | | |--PARAMETERS -> PARAMETERS [127:28] + | | |--RPAREN -> ) [127:28] + | | `--SLIST -> { [127:30] + | | |--LITERAL_RETURN -> return [128:12] + | | | |--EXPR -> EXPR [128:19] + | | | | `--LITERAL_NEW -> new [128:19] + | | | | |--IDENT -> Object [128:23] + | | | | `--ARRAY_DECLARATOR -> [ [128:29] + | | | | |--EXPR -> EXPR [128:30] + | | | | | `--NUM_INT -> 5 [128:30] + | | | | `--RBRACK -> ] [128:31] + | | | `--SEMI -> ; [128:32] + | | `--RCURLY -> } [129:8] + | |--METHOD_DEF -> METHOD_DEF [131:8] + | | |--MODIFIERS -> MODIFIERS [131:8] + | | |--TYPE -> TYPE [131:8] + | | | `--LITERAL_VOID -> void [131:8] + | | |--IDENT -> method6 [131:13] + | | |--LPAREN -> ( [131:20] + | | |--PARAMETERS -> PARAMETERS [131:21] + | | |--RPAREN -> ) [131:21] + | | `--SLIST -> { [131:23] + | | |--LITERAL_IF -> if [132:12] + | | | |--LPAREN -> ( [132:15] + | | | |--EXPR -> EXPR [134:20] + | | | | `--LOR -> || [134:20] + | | | | |--LAND -> && [133:20] + | | | | | |--EQUAL -> == [132:36] + | | | | | | |--DOT -> . [132:28] + | | | | | | | |--METHOD_CALL -> ( [132:26] + | | | | | | | | |--IDENT -> getXorData [132:16] + | | | | | | | | |--ELIST -> ELIST [132:27] + | | | | | | | | `--RPAREN -> ) [132:27] + | | | | | | | `--IDENT -> length [132:29] + | | | | | | `--NUM_INT -> 5 [132:39] + | | | | | `--NOT_EQUAL -> != [133:44] + | | | | | |--INDEX_OP -> [ [133:40] + | | | | | | |--METHOD_CALL -> ( [133:38] + | | | | | | | |--DOT -> . [133:27] + | | | | | | | | |--LITERAL_THIS -> this [133:23] + | | | | | | | | `--IDENT -> getXorData [133:28] + | | | | | | | |--ELIST -> ELIST [133:39] + | | | | | | | `--RPAREN -> ) [133:39] + | | | | | | |--EXPR -> EXPR [133:41] + | | | | | | | `--NUM_INT -> 1 [133:41] + | | | | | | `--RBRACK -> ] [133:42] + | | | | | `--DOT -> . [133:54] + | | | | | |--IDENT -> IntData [133:47] + | | | | | `--LITERAL_CLASS -> class [133:55] + | | | | `--NOT_EQUAL -> != [134:44] + | | | | |--INDEX_OP -> [ [134:40] + | | | | | |--METHOD_CALL -> ( [134:38] + | | | | | | |--DOT -> . [134:27] + | | | | | | | |--LITERAL_THIS -> this [134:23] + | | | | | | | `--IDENT -> getXorData [134:28] + | | | | | | |--ELIST -> ELIST [134:39] + | | | | | | `--RPAREN -> ) [134:39] + | | | | | |--EXPR -> EXPR [134:41] + | | | | | | `--NUM_INT -> 5 [134:41] + | | | | | `--RBRACK -> ] [134:42] + | | | | `--DOT -> . [134:54] + | | | | |--IDENT -> IntData [134:47] + | | | | `--LITERAL_CLASS -> class [134:55] + | | | |--RPAREN -> ) [134:60] + | | | `--SLIST -> { [134:62] + | | | |--EXPR -> EXPR [135:34] + | | | | `--METHOD_CALL -> ( [135:34] + | | | | |--DOT -> . [135:26] + | | | | | |--DOT -> . [135:22] + | | | | | | |--IDENT -> System [135:16] + | | | | | | `--IDENT -> out [135:23] + | | | | | `--IDENT -> println [135:27] + | | | | |--ELIST -> ELIST [135:47] + | | | | | `--EXPR -> EXPR [135:47] + | | | | | `--DOT -> . [135:47] + | | | | | |--METHOD_CALL -> ( [135:45] + | | | | | | |--IDENT -> getXorData [135:35] + | | | | | | |--ELIST -> ELIST [135:46] + | | | | | | `--RPAREN -> ) [135:46] + | | | | | `--IDENT -> length [135:48] + | | | | `--RPAREN -> ) [135:54] + | | | |--SEMI -> ; [135:55] + | | | `--RCURLY -> } [136:12] + | | `--RCURLY -> } [137:8] + | `--RCURLY -> } [139:4] + |--VARIABLE_DEF -> VARIABLE_DEF [140:4] + | |--MODIFIERS -> MODIFIERS [140:4] + | | `--LITERAL_PROTECTED -> protected [140:4] + | |--TYPE -> TYPE [140:14] + | | |--IDENT -> TreeSet [140:14] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [140:21] + | | |--GENERIC_START -> < [140:21] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [140:22] + | | | |--LITERAL_BYTE -> byte [140:22] + | | | `--ARRAY_DECLARATOR -> [ [140:27] + | | | `--RBRACK -> ] [140:28] + | | `--GENERIC_END -> > [140:29] + | |--IDENT -> sortedPrefixes [140:31] + | |--ASSIGN -> = [140:46] + | | `--EXPR -> EXPR [140:61] + | | `--METHOD_CALL -> ( [140:61] + | | |--IDENT -> createTreeSet [140:48] + | | |--ELIST -> ELIST [140:62] + | | `--RPAREN -> ) [140:62] + | `--SEMI -> ; [140:63] + |--METHOD_DEF -> METHOD_DEF [142:4] + | |--MODIFIERS -> MODIFIERS [142:4] + | |--TYPE -> TYPE [142:4] + | | |--IDENT -> TreeSet [142:4] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [142:11] + | | |--GENERIC_START -> < [142:11] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [142:12] + | | | |--LITERAL_BYTE -> byte [142:12] + | | | `--ARRAY_DECLARATOR -> [ [142:16] + | | | `--RBRACK -> ] [142:17] + | | `--GENERIC_END -> > [142:18] + | |--IDENT -> createTreeSet [142:20] + | |--LPAREN -> ( [142:33] + | |--PARAMETERS -> PARAMETERS [142:34] + | |--RPAREN -> ) [142:34] + | `--SLIST -> { [142:36] + | |--LITERAL_RETURN -> return [143:8] + | | |--EXPR -> EXPR [143:15] + | | | `--LITERAL_NULL -> null [143:15] + | | `--SEMI -> ; [143:19] + | `--RCURLY -> } [144:4] + |--METHOD_DEF -> METHOD_DEF [146:4] + | |--MODIFIERS -> MODIFIERS [146:4] + | | `--LITERAL_PUBLIC -> public [146:4] + | |--TYPE -> TYPE [146:11] + | | `--IDENT -> Object [146:11] + | |--IDENT -> newInstance [146:18] + | |--LPAREN -> ( [146:29] + | |--PARAMETERS -> PARAMETERS [146:30] + | | `--PARAMETER_DEF -> PARAMETER_DEF [146:30] + | | |--MODIFIERS -> MODIFIERS [146:30] + | | |--TYPE -> TYPE [146:30] + | | | |--IDENT -> Object [146:30] + | | | `--ARRAY_DECLARATOR -> [ [146:36] + | | | `--RBRACK -> ] [146:37] + | | `--IDENT -> objects [146:39] + | |--RPAREN -> ) [146:46] + | `--SLIST -> { [146:47] + | |--VARIABLE_DEF -> VARIABLE_DEF [148:8] + | | |--MODIFIERS -> MODIFIERS [148:8] + | | |--TYPE -> TYPE [148:8] + | | | `--IDENT -> InputAntlr4AstRegressionNewTypeTree [148:8] + | | |--IDENT -> tmpConstructor [148:44] + | | `--ASSIGN -> = [148:59] + | | `--EXPR -> EXPR [148:61] + | | `--LITERAL_NULL -> null [148:61] + | |--SEMI -> ; [148:65] + | |--LITERAL_RETURN -> return [149:8] + | | |--EXPR -> EXPR [149:41] + | | | `--METHOD_CALL -> ( [149:41] + | | | |--DOT -> . [149:29] + | | | | |--IDENT -> tmpConstructor [149:15] + | | | | `--IDENT -> newInstance [149:30] + | | | |--ELIST -> ELIST [149:42] + | | | | `--EXPR -> EXPR [149:42] + | | | | `--TYPECAST -> ( [149:42] + | | | | |--TYPE -> TYPE [149:43] + | | | | | |--IDENT -> Object [149:43] + | | | | | `--ARRAY_DECLARATOR -> [ [149:49] + | | | | | `--RBRACK -> ] [149:50] + | | | | |--RPAREN -> ) [149:51] + | | | | `--LITERAL_NULL -> null [149:52] + | | | `--RPAREN -> ) [149:56] + | | `--SEMI -> ; [149:57] + | `--RCURLY -> } [150:4] + |--METHOD_DEF -> METHOD_DEF [152:4] + | |--MODIFIERS -> MODIFIERS [152:4] + | | `--LITERAL_PUBLIC -> public [152:4] + | |--TYPE -> TYPE [152:11] + | | |--IDENT -> TypeVariable [152:11] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [152:23] + | | | |--GENERIC_START -> < [152:23] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [152:24] + | | | | |--IDENT -> Class [152:24] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [152:29] + | | | | |--GENERIC_START -> < [152:29] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [152:30] + | | | | | `--IDENT -> String [152:30] + | | | | `--GENERIC_END -> > [152:36] + | | | `--GENERIC_END -> > [152:37] + | | `--ARRAY_DECLARATOR -> [ [152:38] + | | `--RBRACK -> ] [152:39] + | |--IDENT -> getTypeParameters [152:41] + | |--LPAREN -> ( [152:58] + | |--PARAMETERS -> PARAMETERS [152:59] + | |--RPAREN -> ) [152:59] + | `--SLIST -> { [152:61] + | |--VARIABLE_DEF -> VARIABLE_DEF [153:8] + | | |--MODIFIERS -> MODIFIERS [153:8] + | | |--TYPE -> TYPE [153:8] + | | | `--IDENT -> ClassRepository [153:8] + | | |--IDENT -> info [153:24] + | | `--ASSIGN -> = [153:29] + | | `--EXPR -> EXPR [153:45] + | | `--METHOD_CALL -> ( [153:45] + | | |--IDENT -> getGenericInfo [153:31] + | | |--ELIST -> ELIST [153:46] + | | `--RPAREN -> ) [153:46] + | |--SEMI -> ; [153:47] + | |--LITERAL_IF -> if [154:8] + | | |--LPAREN -> ( [154:11] + | | |--EXPR -> EXPR [154:17] + | | | `--NOT_EQUAL -> != [154:17] + | | | |--IDENT -> info [154:12] + | | | `--LITERAL_NULL -> null [154:20] + | | |--RPAREN -> ) [154:24] + | | |--LITERAL_RETURN -> return [155:12] + | | | |--EXPR -> EXPR [155:19] + | | | | `--TYPECAST -> ( [155:19] + | | | | |--TYPE -> TYPE [155:20] + | | | | | |--IDENT -> TypeVariable [155:20] + | | | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [155:32] + | | | | | | |--GENERIC_START -> < [155:32] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [155:33] + | | | | | | | |--IDENT -> Class [155:33] + | | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [155:38] + | | | | | | | |--GENERIC_START -> < [155:38] + | | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [155:39] + | | | | | | | | `--IDENT -> String [155:39] + | | | | | | | `--GENERIC_END -> > [155:45] + | | | | | | `--GENERIC_END -> > [155:46] + | | | | | `--ARRAY_DECLARATOR -> [ [155:47] + | | | | | `--RBRACK -> ] [155:48] + | | | | |--RPAREN -> ) [155:49] + | | | | `--METHOD_CALL -> ( [155:72] + | | | | |--DOT -> . [155:54] + | | | | | |--IDENT -> info [155:50] + | | | | | `--IDENT -> getTypeParameters [155:55] + | | | | |--ELIST -> ELIST [155:73] + | | | | `--RPAREN -> ) [155:73] + | | | `--SEMI -> ; [155:74] + | | `--LITERAL_ELSE -> else [156:8] + | | `--LITERAL_RETURN -> return [157:12] + | | |--EXPR -> EXPR [157:19] + | | | `--TYPECAST -> ( [157:19] + | | | |--TYPE -> TYPE [157:20] + | | | | |--IDENT -> TypeVariable [157:20] + | | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [157:32] + | | | | | |--GENERIC_START -> < [157:32] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [157:33] + | | | | | | |--IDENT -> Class [157:33] + | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [157:38] + | | | | | | |--GENERIC_START -> < [157:38] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [157:39] + | | | | | | | `--IDENT -> String [157:39] + | | | | | | `--GENERIC_END -> > [157:45] + | | | | | `--GENERIC_END -> > [157:46] + | | | | `--ARRAY_DECLARATOR -> [ [157:47] + | | | | `--RBRACK -> ] [157:48] + | | | |--RPAREN -> ) [157:49] + | | | `--LITERAL_NEW -> new [157:50] + | | | |--IDENT -> TypeVariable [157:54] + | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [157:66] + | | | | |--GENERIC_START -> < [157:66] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [157:67] + | | | | | `--WILDCARD_TYPE -> ? [157:67] + | | | | `--GENERIC_END -> > [157:68] + | | | `--ARRAY_DECLARATOR -> [ [157:69] + | | | |--EXPR -> EXPR [157:70] + | | | | `--NUM_INT -> 0 [157:70] + | | | `--RBRACK -> ] [157:71] + | | `--SEMI -> ; [157:72] + | `--RCURLY -> } [158:4] + |--CLASS_DEF -> CLASS_DEF [159:4] + | |--MODIFIERS -> MODIFIERS [159:4] + | |--LITERAL_CLASS -> class [159:4] + | |--IDENT -> ClassRepository [159:10] + | `--OBJBLOCK -> OBJBLOCK [159:26] + | |--LCURLY -> { [159:26] + | |--METHOD_DEF -> METHOD_DEF [161:8] + | | |--MODIFIERS -> MODIFIERS [161:8] + | | | `--LITERAL_PUBLIC -> public [161:8] + | | |--TYPE -> TYPE [161:15] + | | | `--IDENT -> Object [161:15] + | | |--IDENT -> getTypeParameters [161:22] + | | |--LPAREN -> ( [161:39] + | | |--PARAMETERS -> PARAMETERS [161:40] + | | |--RPAREN -> ) [161:40] + | | `--SLIST -> { [161:42] + | | |--LITERAL_RETURN -> return [162:12] + | | | |--EXPR -> EXPR [162:19] + | | | | `--LITERAL_NULL -> null [162:19] + | | | `--SEMI -> ; [162:23] + | | `--RCURLY -> } [163:8] + | `--RCURLY -> } [164:4] + |--CLASS_DEF -> CLASS_DEF [165:4] + | |--MODIFIERS -> MODIFIERS [165:4] + | |--LITERAL_CLASS -> class [165:4] + | |--IDENT -> TypeVariable [165:10] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [165:22] + | | |--GENERIC_START -> < [165:22] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [165:23] + | | | `--IDENT -> E [165:23] + | | `--GENERIC_END -> > [165:24] + | `--OBJBLOCK -> OBJBLOCK [165:26] + | |--LCURLY -> { [165:26] + | `--RCURLY -> } [167:4] + |--METHOD_DEF -> METHOD_DEF [169:4] + | |--MODIFIERS -> MODIFIERS [169:4] + | | `--LITERAL_PRIVATE -> private [169:4] + | |--TYPE -> TYPE [169:12] + | | `--IDENT -> ClassRepository [169:12] + | |--IDENT -> getGenericInfo [169:28] + | |--LPAREN -> ( [169:42] + | |--PARAMETERS -> PARAMETERS [169:43] + | |--RPAREN -> ) [169:43] + | `--SLIST -> { [169:45] + | |--LITERAL_RETURN -> return [170:8] + | | |--EXPR -> EXPR [170:15] + | | | `--LITERAL_NULL -> null [170:15] + | | `--SEMI -> ; [170:19] + | `--RCURLY -> } [171:4] + |--VARIABLE_DEF -> VARIABLE_DEF [172:4] + | |--MODIFIERS -> MODIFIERS [172:4] + | |--TYPE -> TYPE [172:4] + | | |--IDENT -> String [172:4] + | | `--ARRAY_DECLARATOR -> [ [172:10] + | | `--RBRACK -> ] [172:11] + | |--IDENT -> c [172:13] + | `--SEMI -> ; [172:19] + |--COMMA -> , [172:14] + |--VARIABLE_DEF -> VARIABLE_DEF [172:4] + | |--MODIFIERS -> MODIFIERS [172:4] + | |--TYPE -> TYPE [172:4] + | | |--IDENT -> String [172:4] + | | |--ARRAY_DECLARATOR -> [ [172:10] + | | | `--RBRACK -> ] [172:11] + | | `--ARRAY_DECLARATOR -> [ [172:17] + | | `--RBRACK -> ] [172:18] + | `--IDENT -> d [172:16] + |--VARIABLE_DEF -> VARIABLE_DEF [173:4] + | |--MODIFIERS -> MODIFIERS [173:4] + | |--TYPE -> TYPE [173:4] + | | |--IDENT -> String [173:4] + | | `--ARRAY_DECLARATOR -> [ [173:11] + | | `--RBRACK -> ] [173:12] + | |--IDENT -> e [173:14] + | `--SEMI -> ; [173:21] + |--COMMA -> , [173:15] + |--VARIABLE_DEF -> VARIABLE_DEF [173:4] + | |--MODIFIERS -> MODIFIERS [173:4] + | |--TYPE -> TYPE [173:4] + | | |--IDENT -> String [173:4] + | | |--ARRAY_DECLARATOR -> [ [173:11] + | | | `--RBRACK -> ] [173:12] + | | `--ARRAY_DECLARATOR -> [ [173:19] + | | `--RBRACK -> ] [173:20] + | `--IDENT -> f [173:17] + |--ENUM_DEF -> ENUM_DEF [175:4] + | |--MODIFIERS -> MODIFIERS [175:4] + | | `--LITERAL_PUBLIC -> public [175:4] + | |--ENUM -> enum [175:11] + | |--IDENT -> Stooge [175:16] + | `--OBJBLOCK -> OBJBLOCK [175:23] + | |--LCURLY -> { [175:23] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [176:8] + | | |--ANNOTATIONS -> ANNOTATIONS [176:8] + | | `--IDENT -> MOE [176:8] + | |--COMMA -> , [176:11] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [176:13] + | | |--ANNOTATIONS -> ANNOTATIONS [176:13] + | | `--IDENT -> CURLY [176:13] + | |--COMMA -> , [176:18] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [176:20] + | | |--ANNOTATIONS -> ANNOTATIONS [176:20] + | | `--IDENT -> LARRY [176:20] + | |--COMMA -> , [176:25] + | `--RCURLY -> } [177:4] + |--METHOD_DEF -> METHOD_DEF [178:4] + | |--MODIFIERS -> MODIFIERS [178:4] + | | `--LITERAL_STATIC -> static [178:4] + | |--TYPE -> TYPE [178:11] + | | `--LITERAL_VOID -> void [178:11] + | |--IDENT -> checkArrayTypes1 [178:16] + | |--LPAREN -> ( [178:32] + | |--PARAMETERS -> PARAMETERS [178:33] + | | |--PARAMETER_DEF -> PARAMETER_DEF [178:33] + | | | |--MODIFIERS -> MODIFIERS [178:33] + | | | |--TYPE -> TYPE [178:33] + | | | | `--IDENT -> ArrayTypes [178:33] + | | | `--IDENT -> at [178:44] + | | |--COMMA -> , [178:46] + | | `--PARAMETER_DEF -> PARAMETER_DEF [178:48] + | | |--MODIFIERS -> MODIFIERS [178:48] + | | |--TYPE -> TYPE [178:48] + | | | `--IDENT -> AnnotatedElement [178:48] + | | `--IDENT -> e [178:65] + | |--RPAREN -> ) [178:66] + | `--SLIST -> { [178:68] + | |--LITERAL_IF -> if [179:8] + | | |--LPAREN -> ( [179:11] + | | |--EXPR -> EXPR [179:12] + | | | `--LNOT -> ! [179:12] + | | | |--LPAREN -> ( [179:13] + | | | |--LAND -> && [179:43] + | | | | |--EQUAL -> == [179:27] + | | | | | |--INDEX_OP -> [ [179:22] + | | | | | | |--METHOD_CALL -> ( [179:20] + | | | | | | | |--DOT -> . [179:16] + | | | | | | | | |--IDENT -> at [179:14] + | | | | | | | | `--IDENT -> cls [179:17] + | | | | | | | |--ELIST -> ELIST [179:21] + | | | | | | | `--RPAREN -> ) [179:21] + | | | | | | |--EXPR -> EXPR [179:23] + | | | | | | | `--NUM_INT -> 0 [179:23] + | | | | | | `--RBRACK -> ] [179:24] + | | | | | `--DOT -> . [179:33] + | | | | | |--IDENT -> Map [179:30] + | | | | | `--LITERAL_CLASS -> class [179:34] + | | | | `--EQUAL -> == [180:27] + | | | | |--INDEX_OP -> [ [180:20] + | | | | | |--METHOD_CALL -> ( [180:18] + | | | | | | |--DOT -> . [180:16] + | | | | | | | |--IDENT -> at [180:14] + | | | | | | | `--IDENT -> e [180:17] + | | | | | | |--ELIST -> ELIST [180:19] + | | | | | | `--RPAREN -> ) [180:19] + | | | | | |--EXPR -> EXPR [180:21] + | | | | | | `--NUM_INT -> 0 [180:21] + | | | | | `--RBRACK -> ] [180:22] + | | | | `--DOT -> . [180:36] + | | | | |--IDENT -> Stooge [180:30] + | | | | `--IDENT -> MOE [180:37] + | | | `--RPAREN -> ) [180:42] + | | |--RPAREN -> ) [180:43] + | | `--SLIST -> { [180:45] + | | `--RCURLY -> } [182:8] + | `--RCURLY -> } [183:4] + |--CLASS_DEF -> CLASS_DEF [185:4] + | |--MODIFIERS -> MODIFIERS [185:4] + | | `--LITERAL_STATIC -> static [185:4] + | |--LITERAL_CLASS -> class [185:11] + | |--IDENT -> ArrayTypes [185:17] + | `--OBJBLOCK -> OBJBLOCK [185:28] + | |--LCURLY -> { [185:28] + | |--VARIABLE_DEF -> VARIABLE_DEF [186:8] + | | |--MODIFIERS -> MODIFIERS [186:8] + | | |--TYPE -> TYPE [186:8] + | | | |--IDENT -> Object [186:8] + | | | `--ARRAY_DECLARATOR -> [ [186:14] + | | | `--RBRACK -> ] [186:15] + | | |--IDENT -> cls [186:17] + | | `--SEMI -> ; [186:20] + | |--METHOD_DEF -> METHOD_DEF [188:8] + | | |--MODIFIERS -> MODIFIERS [188:8] + | | | `--LITERAL_PUBLIC -> public [188:8] + | | |--TYPE -> TYPE [188:15] + | | | |--IDENT -> Stooge [188:15] + | | | `--ARRAY_DECLARATOR -> [ [188:21] + | | | `--RBRACK -> ] [188:22] + | | |--IDENT -> e [188:24] + | | |--LPAREN -> ( [188:25] + | | |--PARAMETERS -> PARAMETERS [188:26] + | | |--RPAREN -> ) [188:26] + | | `--SLIST -> { [188:28] + | | |--LITERAL_RETURN -> return [189:12] + | | | |--EXPR -> EXPR [189:19] + | | | | `--LITERAL_NULL -> null [189:19] + | | | `--SEMI -> ; [189:23] + | | `--RCURLY -> } [190:8] + | |--METHOD_DEF -> METHOD_DEF [194:8] + | | |--MODIFIERS -> MODIFIERS [194:8] + | | |--TYPE -> TYPE [194:8] + | | | |--IDENT -> Object [194:8] + | | | `--ARRAY_DECLARATOR -> [ [194:14] + | | | `--RBRACK -> ] [194:15] + | | |--IDENT -> cls [194:17] + | | |--LPAREN -> ( [194:20] + | | |--PARAMETERS -> PARAMETERS [194:21] + | | |--RPAREN -> ) [194:21] + | | `--SLIST -> { [194:23] + | | |--LITERAL_RETURN -> return [195:12] + | | | |--EXPR -> EXPR [195:19] + | | | | `--IDENT -> cls [195:19] + | | | `--SEMI -> ; [195:22] + | | `--RCURLY -> } [196:8] + | |--METHOD_DEF -> METHOD_DEF [198:8] + | | |--MODIFIERS -> MODIFIERS [198:8] + | | | `--LITERAL_PUBLIC -> public [198:8] + | | |--TYPE -> TYPE [198:15] + | | | |--LITERAL_INT -> int [198:15] + | | | `--ARRAY_DECLARATOR -> [ [198:18] + | | | `--RBRACK -> ] [198:19] + | | |--IDENT -> a [198:21] + | | |--LPAREN -> ( [198:22] + | | |--PARAMETERS -> PARAMETERS [198:23] + | | |--RPAREN -> ) [198:23] + | | `--SLIST -> { [198:25] + | | |--LITERAL_RETURN -> return [199:12] + | | | |--EXPR -> EXPR [199:19] + | | | | `--LITERAL_NULL -> null [199:19] + | | | `--SEMI -> ; [199:23] + | | `--RCURLY -> } [200:8] + | `--RCURLY -> } [201:4] + |--VARIABLE_DEF -> VARIABLE_DEF [202:4] + | |--MODIFIERS -> MODIFIERS [202:4] + | |--TYPE -> TYPE [202:4] + | | |--LITERAL_INT -> int [202:4] + | | |--ARRAY_DECLARATOR -> [ [202:7] + | | | `--RBRACK -> ] [202:8] + | | |--ARRAY_DECLARATOR -> [ [202:9] + | | | `--RBRACK -> ] [203:4] + | | |--ARRAY_DECLARATOR -> [ [205:5] + | | | `--RBRACK -> ] [205:6] + | | `--ARRAY_DECLARATOR -> [ [206:12] + | | `--RBRACK -> ] [206:13] + | |--IDENT -> w [204:5] + | `--SEMI -> ; [206:15] + |--VARIABLE_DEF -> VARIABLE_DEF [207:4] + | |--MODIFIERS -> MODIFIERS [207:4] + | |--TYPE -> TYPE [207:4] + | | |--LITERAL_INT -> int [207:4] + | | |--ARRAY_DECLARATOR -> [ [207:7] + | | | `--RBRACK -> ] [207:8] + | | |--ARRAY_DECLARATOR -> [ [207:9] + | | | `--RBRACK -> ] [208:5] + | | |--ARRAY_DECLARATOR -> [ [210:4] + | | | `--RBRACK -> ] [210:5] + | | `--ARRAY_DECLARATOR -> [ [211:12] + | | `--RBRACK -> ] [211:13] + | |--IDENT -> z [209:5] + | `--SEMI -> ; [211:15] + |--CLASS_DEF -> CLASS_DEF [213:4] + | |--MODIFIERS -> MODIFIERS [213:4] + | | `--LITERAL_STATIC -> static [213:4] + | |--LITERAL_CLASS -> class [213:11] + | |--IDENT -> P [213:17] + | `--OBJBLOCK -> OBJBLOCK [213:19] + | |--LCURLY -> { [213:19] + | |--VARIABLE_DEF -> VARIABLE_DEF [214:8] + | | |--MODIFIERS -> MODIFIERS [214:8] + | | | `--LITERAL_PRIVATE -> private [214:8] + | | |--TYPE -> TYPE [214:16] + | | | `--LITERAL_INT -> int [214:16] + | | |--IDENT -> x [214:20] + | | `--SEMI -> ; [214:21] + | |--METHOD_DEF -> METHOD_DEF [216:8] + | | |--MODIFIERS -> MODIFIERS [216:8] + | | | `--LITERAL_PUBLIC -> public [216:8] + | | |--TYPE -> TYPE [216:15] + | | | `--LITERAL_VOID -> void [216:15] + | | |--IDENT -> set3 [216:20] + | | |--LPAREN -> ( [216:24] + | | |--PARAMETERS -> PARAMETERS [216:25] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [216:25] + | | | |--MODIFIERS -> MODIFIERS [216:25] + | | | |--TYPE -> TYPE [216:25] + | | | | `--IDENT -> P [216:25] + | | | `--IDENT -> p [216:27] + | | |--RPAREN -> ) [216:28] + | | `--SLIST -> { [216:30] + | | |--LITERAL_SYNCHRONIZED -> synchronized [217:14] + | | | |--LPAREN -> ( [217:27] + | | | |--EXPR -> EXPR [217:28] + | | | | `--LITERAL_THIS -> this [217:28] + | | | |--RPAREN -> ) [217:32] + | | | `--SLIST -> { [217:34] + | | | |--EXPR -> EXPR [218:22] + | | | | `--ASSIGN -> = [218:22] + | | | | |--DOT -> . [218:19] + | | | | | |--IDENT -> p [218:18] + | | | | | `--IDENT -> x [218:20] + | | | | `--INDEX_OP -> [ [218:29] + | | | | |--METHOD_CALL -> ( [218:27] + | | | | | |--IDENT -> get [218:24] + | | | | | |--ELIST -> ELIST [218:28] + | | | | | `--RPAREN -> ) [218:28] + | | | | |--EXPR -> EXPR [218:30] + | | | | | `--NUM_INT -> 0 [218:30] + | | | | `--RBRACK -> ] [218:31] + | | | |--SEMI -> ; [218:32] + | | | `--RCURLY -> } [219:14] + | | `--RCURLY -> } [220:10] + | |--METHOD_DEF -> METHOD_DEF [222:8] + | | |--MODIFIERS -> MODIFIERS [222:8] + | | | `--LITERAL_PUBLIC -> public [222:8] + | | |--TYPE -> TYPE [222:15] + | | | `--LITERAL_VOID -> void [222:15] + | | |--IDENT -> set4 [222:20] + | | |--LPAREN -> ( [222:24] + | | |--PARAMETERS -> PARAMETERS [222:25] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [222:25] + | | | |--MODIFIERS -> MODIFIERS [222:25] + | | | |--TYPE -> TYPE [222:25] + | | | | `--IDENT -> P [222:25] + | | | `--IDENT -> p [222:27] + | | |--RPAREN -> ) [222:28] + | | `--SLIST -> { [222:30] + | | |--LITERAL_SYNCHRONIZED -> synchronized [223:14] + | | | |--LPAREN -> ( [223:26] + | | | |--EXPR -> EXPR [223:27] + | | | | `--LITERAL_THIS -> this [223:27] + | | | |--RPAREN -> ) [223:31] + | | | `--SLIST -> { [223:33] + | | | |--EXPR -> EXPR [224:22] + | | | | `--ASSIGN -> = [224:22] + | | | | |--DOT -> . [224:19] + | | | | | |--IDENT -> p [224:18] + | | | | | `--IDENT -> x [224:20] + | | | | `--INDEX_OP -> [ [224:29] + | | | | |--METHOD_CALL -> ( [224:27] + | | | | | |--IDENT -> get [224:24] + | | | | | |--ELIST -> ELIST [224:28] + | | | | | `--RPAREN -> ) [224:28] + | | | | |--EXPR -> EXPR [224:30] + | | | | | `--NUM_INT -> 0 [224:30] + | | | | `--RBRACK -> ] [224:31] + | | | |--SEMI -> ; [224:32] + | | | `--RCURLY -> } [225:14] + | | `--RCURLY -> } [226:10] + | |--METHOD_DEF -> METHOD_DEF [228:8] + | | |--MODIFIERS -> MODIFIERS [228:8] + | | | `--LITERAL_PRIVATE -> private [228:8] + | | |--TYPE -> TYPE [228:16] + | | | |--LITERAL_INT -> int [228:16] + | | | `--ARRAY_DECLARATOR -> [ [228:19] + | | | `--RBRACK -> ] [228:20] + | | |--IDENT -> get [228:22] + | | |--LPAREN -> ( [228:25] + | | |--PARAMETERS -> PARAMETERS [228:26] + | | |--RPAREN -> ) [228:26] + | | `--SLIST -> { [228:28] + | | |--LITERAL_RETURN -> return [229:12] + | | | |--EXPR -> EXPR [229:19] + | | | | `--LITERAL_NULL -> null [229:19] + | | | `--SEMI -> ; [229:23] + | | `--RCURLY -> } [230:8] + | `--RCURLY -> } [231:4] + |--VARIABLE_DEF -> VARIABLE_DEF [233:4] + | |--MODIFIERS -> MODIFIERS [233:4] + | | |--LITERAL_PRIVATE -> private [233:4] + | | `--ANNOTATION -> ANNOTATION [233:12] + | | |--AT -> @ [233:12] + | | `--IDENT -> Nullable [233:13] + | |--TYPE -> TYPE [233:22] + | | |--LITERAL_INT -> int [233:22] + | | |--ANNOTATIONS -> ANNOTATIONS [233:33] + | | | `--ANNOTATION -> ANNOTATION [233:33] + | | | |--AT -> @ [233:33] + | | | `--IDENT -> Nullable [233:34] + | | |--ARRAY_DECLARATOR -> [ [233:43] + | | | `--RBRACK -> ] [233:44] + | | |--ANNOTATIONS -> ANNOTATIONS [233:46] + | | | `--ANNOTATION -> ANNOTATION [233:46] + | | | |--AT -> @ [233:46] + | | | `--IDENT -> Nullable [233:47] + | | `--ARRAY_DECLARATOR -> [ [233:56] + | | `--RBRACK -> ] [233:57] + | |--IDENT -> array2 [233:26] + | `--SEMI -> ; [233:58] + `--RCURLY -> } [234:0] +ANNOTATION_DEF -> ANNOTATION_DEF [237:0] +|--MODIFIERS -> MODIFIERS [237:0] +| `--ANNOTATION -> ANNOTATION [237:0] +| |--AT -> @ [237:0] +| |--IDENT -> Target [237:1] +| |--LPAREN -> ( [237:7] +| |--ANNOTATION_ARRAY_INIT -> { [237:8] +| | |--EXPR -> EXPR [237:20] +| | | `--DOT -> . [237:20] +| | | |--IDENT -> ElementType [237:9] +| | | `--IDENT -> TYPE_USE [237:21] +| | |--COMMA -> , [237:29] +| | |--EXPR -> EXPR [237:42] +| | | `--DOT -> . [237:42] +| | | |--IDENT -> ElementType [237:31] +| | | `--IDENT -> TYPE_PARAMETER [237:43] +| | `--RCURLY -> } [237:57] +| `--RPAREN -> ) [237:58] +|--AT -> @ [238:0] +|--LITERAL_INTERFACE -> interface [238:1] +|--IDENT -> Nullable [238:11] +`--OBJBLOCK -> OBJBLOCK [238:19] + |--LCURLY -> { [238:19] + `--RCURLY -> } [238:20] +ANNOTATION_DEF -> ANNOTATION_DEF [240:0] +|--MODIFIERS -> MODIFIERS [240:0] +| `--ANNOTATION -> ANNOTATION [240:0] +| |--AT -> @ [240:0] +| |--IDENT -> Target [240:1] +| |--LPAREN -> ( [240:7] +| |--ANNOTATION_ARRAY_INIT -> { [240:8] +| | |--EXPR -> EXPR [240:20] +| | | `--DOT -> . [240:20] +| | | |--IDENT -> ElementType [240:9] +| | | `--IDENT -> TYPE_USE [240:21] +| | |--COMMA -> , [240:29] +| | |--EXPR -> EXPR [240:42] +| | | `--DOT -> . [240:42] +| | | |--IDENT -> ElementType [240:31] +| | | `--IDENT -> TYPE_PARAMETER [240:43] +| | `--RCURLY -> } [240:57] +| `--RPAREN -> ) [240:58] +|--AT -> @ [241:0] +|--LITERAL_INTERFACE -> interface [241:1] +|--IDENT -> I [241:11] +`--OBJBLOCK -> OBJBLOCK [241:13] + |--LCURLY -> { [241:13] + `--RCURLY -> } [241:14] +ANNOTATION_DEF -> ANNOTATION_DEF [243:0] +|--MODIFIERS -> MODIFIERS [243:0] +| `--ANNOTATION -> ANNOTATION [243:0] +| |--AT -> @ [243:0] +| |--IDENT -> Target [243:1] +| |--LPAREN -> ( [243:7] +| |--ANNOTATION_ARRAY_INIT -> { [243:8] +| | |--EXPR -> EXPR [243:20] +| | | `--DOT -> . [243:20] +| | | |--IDENT -> ElementType [243:9] +| | | `--IDENT -> TYPE_USE [243:21] +| | |--COMMA -> , [243:29] +| | |--EXPR -> EXPR [243:42] +| | | `--DOT -> . [243:42] +| | | |--IDENT -> ElementType [243:31] +| | | `--IDENT -> TYPE_PARAMETER [243:43] +| | `--RCURLY -> } [243:57] +| `--RPAREN -> ) [243:58] +|--AT -> @ [244:0] +|--LITERAL_INTERFACE -> interface [244:1] +|--IDENT -> J [244:11] +`--OBJBLOCK -> OBJBLOCK [244:13] + |--LCURLY -> { [244:13] + `--RCURLY -> } [244:14] +ANNOTATION_DEF -> ANNOTATION_DEF [246:0] +|--MODIFIERS -> MODIFIERS [246:0] +| `--ANNOTATION -> ANNOTATION [246:0] +| |--AT -> @ [246:0] +| |--IDENT -> Target [246:1] +| |--LPAREN -> ( [246:7] +| |--ANNOTATION_ARRAY_INIT -> { [246:8] +| | |--EXPR -> EXPR [246:20] +| | | `--DOT -> . [246:20] +| | | |--IDENT -> ElementType [246:9] +| | | `--IDENT -> TYPE_USE [246:21] +| | |--COMMA -> , [246:29] +| | |--EXPR -> EXPR [246:42] +| | | `--DOT -> . [246:42] +| | | |--IDENT -> ElementType [246:31] +| | | `--IDENT -> TYPE_PARAMETER [246:43] +| | `--RCURLY -> } [246:57] +| `--RPAREN -> ) [246:58] +|--AT -> @ [247:0] +|--LITERAL_INTERFACE -> interface [247:1] +|--IDENT -> K [247:11] +`--OBJBLOCK -> OBJBLOCK [247:13] + |--LCURLY -> { [247:13] + `--RCURLY -> } [247:14] +ANNOTATION_DEF -> ANNOTATION_DEF [249:0] +|--MODIFIERS -> MODIFIERS [249:0] +| `--ANNOTATION -> ANNOTATION [249:0] +| |--AT -> @ [249:0] +| |--IDENT -> Target [249:1] +| |--LPAREN -> ( [249:7] +| |--ANNOTATION_ARRAY_INIT -> { [249:8] +| | |--EXPR -> EXPR [249:20] +| | | `--DOT -> . [249:20] +| | | |--IDENT -> ElementType [249:9] +| | | `--IDENT -> TYPE_USE [249:21] +| | |--COMMA -> , [249:29] +| | |--EXPR -> EXPR [249:42] +| | | `--DOT -> . [249:42] +| | | |--IDENT -> ElementType [249:31] +| | | `--IDENT -> TYPE_PARAMETER [249:43] +| | `--RCURLY -> } [249:57] +| `--RPAREN -> ) [249:58] +|--AT -> @ [250:0] +|--LITERAL_INTERFACE -> interface [250:1] +|--IDENT -> L [250:11] +`--OBJBLOCK -> OBJBLOCK [250:13] + |--LCURLY -> { [250:13] + `--RCURLY -> } [250:14] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionPackage.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionPackage.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionPackage.java @@ -0,0 +1 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionPackage.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionPackage.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionPackage.txt @@ -0,0 +1,14 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionPackageAnnotation.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionPackageAnnotation.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionPackageAnnotation.txt @@ -0,0 +1,38 @@ +PACKAGE_DEF -> package [6:0] +|--ANNOTATIONS -> ANNOTATIONS [1:0] +| |--ANNOTATION -> ANNOTATION [1:0] +| | |--AT -> @ [1:0] +| | |--IDENT -> PackageAnnotation [1:1] +| | |--LPAREN -> ( [1:18] +| | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [1:19] +| | | |--IDENT -> value [1:19] +| | | |--ASSIGN -> = [1:25] +| | | `--EXPR -> EXPR [1:27] +| | | `--STRING_LITERAL -> "foo" [1:27] +| | `--RPAREN -> ) [1:32] +| |--ANNOTATION -> ANNOTATION [2:2] +| | |--AT -> @ [2:2] +| | |--IDENT -> PackageAnnotation [2:3] +| | |--LPAREN -> ( [2:20] +| | |--EXPR -> EXPR [2:21] +| | | `--STRING_LITERAL -> "" [2:21] +| | `--RPAREN -> ) [2:23] +| `--ANNOTATION -> ANNOTATION [3:0] +| |--AT -> @ [3:0] +| |--IDENT -> PackageAnnotation [3:1] +| |--LPAREN -> ( [3:18] +| |--EXPR -> EXPR [4:8] +| | `--STRING_LITERAL -> "bar" [4:8] +| `--RPAREN -> ) [5:0] +|--DOT -> . [11:16] +| |--DOT -> . [10:27] +| | |--DOT -> . [10:16] +| | | |--DOT -> . [8:26] +| | | | |--DOT -> . [7:11] +| | | | | |--IDENT -> com [7:8] +| | | | | `--IDENT -> puppycrawl [8:16] +| | | | `--IDENT -> tools [9:16] +| | | `--IDENT -> checkstyle [10:17] +| | `--IDENT -> grammar [10:28] +| `--IDENT -> antlr4 [11:17] +`--SEMI -> ; [11:23] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSimple.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSimple.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSimple.java @@ -0,0 +1,17 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +public class InputAntlr4AstRegressionSimple { + + int w, a; + + public static void main(String... args) { + int[][] z = {{1}}; + String s = "Hello world!"; + } + + private void method(String x, Integer y, String... arr) { + for (int i = 0; i < arr.length; i++) { + System.out.println(arr[i]); + } + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSimple.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSimple.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSimple.txt @@ -0,0 +1,151 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +CLASS_DEF -> CLASS_DEF [3:0] +|--MODIFIERS -> MODIFIERS [3:0] +| `--LITERAL_PUBLIC -> public [3:0] +|--LITERAL_CLASS -> class [3:7] +|--IDENT -> InputAntlr4AstRegressionSimple [3:13] +`--OBJBLOCK -> OBJBLOCK [3:44] + |--LCURLY -> { [3:44] + |--VARIABLE_DEF -> VARIABLE_DEF [5:4] + | |--MODIFIERS -> MODIFIERS [5:4] + | |--TYPE -> TYPE [5:4] + | | `--LITERAL_INT -> int [5:4] + | |--IDENT -> w [5:8] + | `--SEMI -> ; [5:12] + |--COMMA -> , [5:9] + |--VARIABLE_DEF -> VARIABLE_DEF [5:4] + | |--MODIFIERS -> MODIFIERS [5:4] + | |--TYPE -> TYPE [5:4] + | | `--LITERAL_INT -> int [5:4] + | `--IDENT -> a [5:11] + |--METHOD_DEF -> METHOD_DEF [7:4] + | |--MODIFIERS -> MODIFIERS [7:4] + | | |--LITERAL_PUBLIC -> public [7:4] + | | `--LITERAL_STATIC -> static [7:11] + | |--TYPE -> TYPE [7:18] + | | `--LITERAL_VOID -> void [7:18] + | |--IDENT -> main [7:23] + | |--LPAREN -> ( [7:27] + | |--PARAMETERS -> PARAMETERS [7:28] + | | `--PARAMETER_DEF -> PARAMETER_DEF [7:28] + | | |--MODIFIERS -> MODIFIERS [7:28] + | | |--TYPE -> TYPE [7:28] + | | | `--IDENT -> String [7:28] + | | |--ELLIPSIS -> ... [7:34] + | | `--IDENT -> args [7:38] + | |--RPAREN -> ) [7:42] + | `--SLIST -> { [7:44] + | |--VARIABLE_DEF -> VARIABLE_DEF [8:8] + | | |--MODIFIERS -> MODIFIERS [8:8] + | | |--TYPE -> TYPE [8:8] + | | | |--LITERAL_INT -> int [8:8] + | | | |--ARRAY_DECLARATOR -> [ [8:11] + | | | | `--RBRACK -> ] [8:12] + | | | `--ARRAY_DECLARATOR -> [ [8:13] + | | | `--RBRACK -> ] [8:14] + | | |--IDENT -> z [8:16] + | | `--ASSIGN -> = [8:18] + | | `--ARRAY_INIT -> { [8:20] + | | |--ARRAY_INIT -> { [8:21] + | | | |--EXPR -> EXPR [8:22] + | | | | `--NUM_INT -> 1 [8:22] + | | | `--RCURLY -> } [8:23] + | | `--RCURLY -> } [8:24] + | |--SEMI -> ; [8:25] + | |--VARIABLE_DEF -> VARIABLE_DEF [9:8] + | | |--MODIFIERS -> MODIFIERS [9:8] + | | |--TYPE -> TYPE [9:8] + | | | `--IDENT -> String [9:8] + | | |--IDENT -> s [9:15] + | | `--ASSIGN -> = [9:17] + | | `--EXPR -> EXPR [9:19] + | | `--STRING_LITERAL -> "Hello world!" [9:19] + | |--SEMI -> ; [9:33] + | `--RCURLY -> } [10:4] + |--METHOD_DEF -> METHOD_DEF [12:4] + | |--MODIFIERS -> MODIFIERS [12:4] + | | `--LITERAL_PRIVATE -> private [12:4] + | |--TYPE -> TYPE [12:12] + | | `--LITERAL_VOID -> void [12:12] + | |--IDENT -> method [12:17] + | |--LPAREN -> ( [12:23] + | |--PARAMETERS -> PARAMETERS [12:24] + | | |--PARAMETER_DEF -> PARAMETER_DEF [12:24] + | | | |--MODIFIERS -> MODIFIERS [12:24] + | | | |--TYPE -> TYPE [12:24] + | | | | `--IDENT -> String [12:24] + | | | `--IDENT -> x [12:31] + | | |--COMMA -> , [12:32] + | | |--PARAMETER_DEF -> PARAMETER_DEF [12:34] + | | | |--MODIFIERS -> MODIFIERS [12:34] + | | | |--TYPE -> TYPE [12:34] + | | | | `--IDENT -> Integer [12:34] + | | | `--IDENT -> y [12:42] + | | |--COMMA -> , [12:43] + | | `--PARAMETER_DEF -> PARAMETER_DEF [12:45] + | | |--MODIFIERS -> MODIFIERS [12:45] + | | |--TYPE -> TYPE [12:45] + | | | `--IDENT -> String [12:45] + | | |--ELLIPSIS -> ... [12:51] + | | `--IDENT -> arr [12:55] + | |--RPAREN -> ) [12:58] + | `--SLIST -> { [12:60] + | |--LITERAL_FOR -> for [13:8] + | | |--LPAREN -> ( [13:12] + | | |--FOR_INIT -> FOR_INIT [13:13] + | | | `--VARIABLE_DEF -> VARIABLE_DEF [13:13] + | | | |--MODIFIERS -> MODIFIERS [13:13] + | | | |--TYPE -> TYPE [13:13] + | | | | `--LITERAL_INT -> int [13:13] + | | | |--IDENT -> i [13:17] + | | | `--ASSIGN -> = [13:19] + | | | `--EXPR -> EXPR [13:21] + | | | `--NUM_INT -> 0 [13:21] + | | |--SEMI -> ; [13:22] + | | |--FOR_CONDITION -> FOR_CONDITION [13:26] + | | | `--EXPR -> EXPR [13:26] + | | | `--LT -> < [13:26] + | | | |--IDENT -> i [13:24] + | | | `--DOT -> . [13:31] + | | | |--IDENT -> arr [13:28] + | | | `--IDENT -> length [13:32] + | | |--SEMI -> ; [13:38] + | | |--FOR_ITERATOR -> FOR_ITERATOR [13:41] + | | | `--ELIST -> ELIST [13:41] + | | | `--EXPR -> EXPR [13:41] + | | | `--POST_INC -> ++ [13:41] + | | | `--IDENT -> i [13:40] + | | |--RPAREN -> ) [13:43] + | | `--SLIST -> { [13:45] + | | |--EXPR -> EXPR [14:30] + | | | `--METHOD_CALL -> ( [14:30] + | | | |--DOT -> . [14:22] + | | | | |--DOT -> . [14:18] + | | | | | |--IDENT -> System [14:12] + | | | | | `--IDENT -> out [14:19] + | | | | `--IDENT -> println [14:23] + | | | |--ELIST -> ELIST [14:34] + | | | | `--EXPR -> EXPR [14:34] + | | | | `--INDEX_OP -> [ [14:34] + | | | | |--IDENT -> arr [14:31] + | | | | |--EXPR -> EXPR [14:35] + | | | | | `--IDENT -> i [14:35] + | | | | `--RBRACK -> ] [14:36] + | | | `--RPAREN -> ) [14:37] + | | |--SEMI -> ; [14:38] + | | `--RCURLY -> } [15:8] + | `--RCURLY -> } [16:4] + `--RCURLY -> } [17:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSimpleWithAnno.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSimpleWithAnno.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSimpleWithAnno.java @@ -0,0 +1,5 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +@Deprecated +public class InputAntlr4AstRegressionSimpleWithAnno { +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSimpleWithAnno.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSimpleWithAnno.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSimpleWithAnno.txt @@ -0,0 +1,25 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +CLASS_DEF -> CLASS_DEF [3:0] +|--MODIFIERS -> MODIFIERS [3:0] +| |--ANNOTATION -> ANNOTATION [3:0] +| | |--AT -> @ [3:0] +| | `--IDENT -> Deprecated [3:1] +| `--LITERAL_PUBLIC -> public [4:0] +|--LITERAL_CLASS -> class [4:7] +|--IDENT -> InputAntlr4AstRegressionSimpleWithAnno [4:13] +`--OBJBLOCK -> OBJBLOCK [4:52] + |--LCURLY -> { [4:52] + `--RCURLY -> } [5:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSingleLineBlocks.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSingleLineBlocks.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSingleLineBlocks.java @@ -0,0 +1,71 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +public class InputAntlr4AstRegressionSingleLineBlocks { + + public void testMethod() {}; // ok + + public void testMethod1() { + }; // violation + + public class TestClass {}; // ok + + public class TestClass1 { + }; // violation + + public class TestClass2 { + public TestClass2() {}; // ok + + public TestClass2(String someValue) { + }; // violation + } + + public void testMethod11() { + } + ; + + public @interface TestAnnnotation5 { + String someValue(); }; // violation + + public @interface TestAnnotation6 {}; // ok + + public @interface TestAnnotation7 { + String someValue(); + }; // violation + + public @interface TestAnnotation8 { String someValue(); + }; // violation + + public @interface TestAnnotation9 { String someValue(); }; // ok + + enum TestEnum{}; // ok + + enum TestEnum1{ + SOME_VALUE;}; // violation + + enum TestEnum2 { SOME_VALUE; }; // ok + + enum TestEnum3{ + SOME_VALUE; + }; // violation + + enum TestEnum4{ SOME_VALUE; + }; // violation + + interface Interface1 + { + int i = 1; + public void meth1(); }; // violation + + interface Interface2 + { int i = 1; public void meth1(); }; + + interface Interface3 { + void display(); + interface Interface4 { + void myMethod(); + };}; // 2 violations + + interface InterfaceEndingWithSemiColon2 { + public void fooEmpty(); + }; // violation +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSingleLineBlocks.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSingleLineBlocks.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSingleLineBlocks.txt @@ -0,0 +1,353 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +CLASS_DEF -> CLASS_DEF [3:0] +|--MODIFIERS -> MODIFIERS [3:0] +| `--LITERAL_PUBLIC -> public [3:0] +|--LITERAL_CLASS -> class [3:7] +|--IDENT -> InputAntlr4AstRegressionSingleLineBlocks [3:13] +`--OBJBLOCK -> OBJBLOCK [3:54] + |--LCURLY -> { [3:54] + |--METHOD_DEF -> METHOD_DEF [5:4] + | |--MODIFIERS -> MODIFIERS [5:4] + | | `--LITERAL_PUBLIC -> public [5:4] + | |--TYPE -> TYPE [5:11] + | | `--LITERAL_VOID -> void [5:11] + | |--IDENT -> testMethod [5:16] + | |--LPAREN -> ( [5:26] + | |--PARAMETERS -> PARAMETERS [5:27] + | |--RPAREN -> ) [5:27] + | `--SLIST -> { [5:29] + | `--RCURLY -> } [5:30] + |--SEMI -> ; [5:31] + |--METHOD_DEF -> METHOD_DEF [7:4] + | |--MODIFIERS -> MODIFIERS [7:4] + | | `--LITERAL_PUBLIC -> public [7:4] + | |--TYPE -> TYPE [7:11] + | | `--LITERAL_VOID -> void [7:11] + | |--IDENT -> testMethod1 [7:16] + | |--LPAREN -> ( [7:27] + | |--PARAMETERS -> PARAMETERS [7:28] + | |--RPAREN -> ) [7:28] + | `--SLIST -> { [7:30] + | `--RCURLY -> } [8:4] + |--SEMI -> ; [8:5] + |--CLASS_DEF -> CLASS_DEF [10:4] + | |--MODIFIERS -> MODIFIERS [10:4] + | | `--LITERAL_PUBLIC -> public [10:4] + | |--LITERAL_CLASS -> class [10:11] + | |--IDENT -> TestClass [10:17] + | `--OBJBLOCK -> OBJBLOCK [10:27] + | |--LCURLY -> { [10:27] + | `--RCURLY -> } [10:28] + |--SEMI -> ; [10:29] + |--CLASS_DEF -> CLASS_DEF [12:4] + | |--MODIFIERS -> MODIFIERS [12:4] + | | `--LITERAL_PUBLIC -> public [12:4] + | |--LITERAL_CLASS -> class [12:11] + | |--IDENT -> TestClass1 [12:17] + | `--OBJBLOCK -> OBJBLOCK [12:28] + | |--LCURLY -> { [12:28] + | `--RCURLY -> } [13:4] + |--SEMI -> ; [13:5] + |--CLASS_DEF -> CLASS_DEF [15:4] + | |--MODIFIERS -> MODIFIERS [15:4] + | | `--LITERAL_PUBLIC -> public [15:4] + | |--LITERAL_CLASS -> class [15:11] + | |--IDENT -> TestClass2 [15:17] + | `--OBJBLOCK -> OBJBLOCK [15:28] + | |--LCURLY -> { [15:28] + | |--CTOR_DEF -> CTOR_DEF [16:8] + | | |--MODIFIERS -> MODIFIERS [16:8] + | | | `--LITERAL_PUBLIC -> public [16:8] + | | |--IDENT -> TestClass2 [16:15] + | | |--LPAREN -> ( [16:25] + | | |--PARAMETERS -> PARAMETERS [16:26] + | | |--RPAREN -> ) [16:26] + | | `--SLIST -> { [16:28] + | | `--RCURLY -> } [16:29] + | |--SEMI -> ; [16:30] + | |--CTOR_DEF -> CTOR_DEF [18:8] + | | |--MODIFIERS -> MODIFIERS [18:8] + | | | `--LITERAL_PUBLIC -> public [18:8] + | | |--IDENT -> TestClass2 [18:15] + | | |--LPAREN -> ( [18:25] + | | |--PARAMETERS -> PARAMETERS [18:26] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [18:26] + | | | |--MODIFIERS -> MODIFIERS [18:26] + | | | |--TYPE -> TYPE [18:26] + | | | | `--IDENT -> String [18:26] + | | | `--IDENT -> someValue [18:33] + | | |--RPAREN -> ) [18:42] + | | `--SLIST -> { [18:44] + | | `--RCURLY -> } [19:8] + | |--SEMI -> ; [19:9] + | `--RCURLY -> } [20:4] + |--METHOD_DEF -> METHOD_DEF [22:4] + | |--MODIFIERS -> MODIFIERS [22:4] + | | `--LITERAL_PUBLIC -> public [22:4] + | |--TYPE -> TYPE [22:11] + | | `--LITERAL_VOID -> void [22:11] + | |--IDENT -> testMethod11 [22:16] + | |--LPAREN -> ( [22:28] + | |--PARAMETERS -> PARAMETERS [22:29] + | |--RPAREN -> ) [22:29] + | `--SLIST -> { [22:31] + | `--RCURLY -> } [23:4] + |--SEMI -> ; [24:4] + |--ANNOTATION_DEF -> ANNOTATION_DEF [26:4] + | |--MODIFIERS -> MODIFIERS [26:4] + | | `--LITERAL_PUBLIC -> public [26:4] + | |--AT -> @ [26:11] + | |--LITERAL_INTERFACE -> interface [26:12] + | |--IDENT -> TestAnnnotation5 [26:22] + | `--OBJBLOCK -> OBJBLOCK [26:39] + | |--LCURLY -> { [26:39] + | |--ANNOTATION_FIELD_DEF -> ANNOTATION_FIELD_DEF [27:8] + | | |--MODIFIERS -> MODIFIERS [27:8] + | | |--TYPE -> TYPE [27:8] + | | | `--IDENT -> String [27:8] + | | |--IDENT -> someValue [27:15] + | | |--LPAREN -> ( [27:24] + | | |--RPAREN -> ) [27:25] + | | `--SEMI -> ; [27:26] + | `--RCURLY -> } [27:28] + |--SEMI -> ; [27:29] + |--ANNOTATION_DEF -> ANNOTATION_DEF [29:4] + | |--MODIFIERS -> MODIFIERS [29:4] + | | `--LITERAL_PUBLIC -> public [29:4] + | |--AT -> @ [29:11] + | |--LITERAL_INTERFACE -> interface [29:12] + | |--IDENT -> TestAnnotation6 [29:22] + | `--OBJBLOCK -> OBJBLOCK [29:38] + | |--LCURLY -> { [29:38] + | `--RCURLY -> } [29:39] + |--SEMI -> ; [29:40] + |--ANNOTATION_DEF -> ANNOTATION_DEF [31:4] + | |--MODIFIERS -> MODIFIERS [31:4] + | | `--LITERAL_PUBLIC -> public [31:4] + | |--AT -> @ [31:11] + | |--LITERAL_INTERFACE -> interface [31:12] + | |--IDENT -> TestAnnotation7 [31:22] + | `--OBJBLOCK -> OBJBLOCK [31:38] + | |--LCURLY -> { [31:38] + | |--ANNOTATION_FIELD_DEF -> ANNOTATION_FIELD_DEF [32:8] + | | |--MODIFIERS -> MODIFIERS [32:8] + | | |--TYPE -> TYPE [32:8] + | | | `--IDENT -> String [32:8] + | | |--IDENT -> someValue [32:15] + | | |--LPAREN -> ( [32:24] + | | |--RPAREN -> ) [32:25] + | | `--SEMI -> ; [32:26] + | `--RCURLY -> } [33:4] + |--SEMI -> ; [33:5] + |--ANNOTATION_DEF -> ANNOTATION_DEF [35:4] + | |--MODIFIERS -> MODIFIERS [35:4] + | | `--LITERAL_PUBLIC -> public [35:4] + | |--AT -> @ [35:11] + | |--LITERAL_INTERFACE -> interface [35:12] + | |--IDENT -> TestAnnotation8 [35:22] + | `--OBJBLOCK -> OBJBLOCK [35:38] + | |--LCURLY -> { [35:38] + | |--ANNOTATION_FIELD_DEF -> ANNOTATION_FIELD_DEF [35:40] + | | |--MODIFIERS -> MODIFIERS [35:40] + | | |--TYPE -> TYPE [35:40] + | | | `--IDENT -> String [35:40] + | | |--IDENT -> someValue [35:47] + | | |--LPAREN -> ( [35:56] + | | |--RPAREN -> ) [35:57] + | | `--SEMI -> ; [35:58] + | `--RCURLY -> } [36:4] + |--SEMI -> ; [36:5] + |--ANNOTATION_DEF -> ANNOTATION_DEF [38:4] + | |--MODIFIERS -> MODIFIERS [38:4] + | | `--LITERAL_PUBLIC -> public [38:4] + | |--AT -> @ [38:11] + | |--LITERAL_INTERFACE -> interface [38:12] + | |--IDENT -> TestAnnotation9 [38:22] + | `--OBJBLOCK -> OBJBLOCK [38:38] + | |--LCURLY -> { [38:38] + | |--ANNOTATION_FIELD_DEF -> ANNOTATION_FIELD_DEF [38:40] + | | |--MODIFIERS -> MODIFIERS [38:40] + | | |--TYPE -> TYPE [38:40] + | | | `--IDENT -> String [38:40] + | | |--IDENT -> someValue [38:47] + | | |--LPAREN -> ( [38:56] + | | |--RPAREN -> ) [38:57] + | | `--SEMI -> ; [38:58] + | `--RCURLY -> } [38:60] + |--SEMI -> ; [38:61] + |--ENUM_DEF -> ENUM_DEF [40:4] + | |--MODIFIERS -> MODIFIERS [40:4] + | |--ENUM -> enum [40:4] + | |--IDENT -> TestEnum [40:9] + | `--OBJBLOCK -> OBJBLOCK [40:17] + | |--LCURLY -> { [40:17] + | `--RCURLY -> } [40:18] + |--SEMI -> ; [40:19] + |--ENUM_DEF -> ENUM_DEF [42:4] + | |--MODIFIERS -> MODIFIERS [42:4] + | |--ENUM -> enum [42:4] + | |--IDENT -> TestEnum1 [42:9] + | `--OBJBLOCK -> OBJBLOCK [42:18] + | |--LCURLY -> { [42:18] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [43:8] + | | |--ANNOTATIONS -> ANNOTATIONS [43:8] + | | `--IDENT -> SOME_VALUE [43:8] + | |--SEMI -> ; [43:18] + | `--RCURLY -> } [43:19] + |--SEMI -> ; [43:20] + |--ENUM_DEF -> ENUM_DEF [45:4] + | |--MODIFIERS -> MODIFIERS [45:4] + | |--ENUM -> enum [45:4] + | |--IDENT -> TestEnum2 [45:9] + | `--OBJBLOCK -> OBJBLOCK [45:19] + | |--LCURLY -> { [45:19] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [45:21] + | | |--ANNOTATIONS -> ANNOTATIONS [45:21] + | | `--IDENT -> SOME_VALUE [45:21] + | |--SEMI -> ; [45:31] + | `--RCURLY -> } [45:33] + |--SEMI -> ; [45:34] + |--ENUM_DEF -> ENUM_DEF [47:4] + | |--MODIFIERS -> MODIFIERS [47:4] + | |--ENUM -> enum [47:4] + | |--IDENT -> TestEnum3 [47:9] + | `--OBJBLOCK -> OBJBLOCK [47:18] + | |--LCURLY -> { [47:18] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [48:8] + | | |--ANNOTATIONS -> ANNOTATIONS [48:8] + | | `--IDENT -> SOME_VALUE [48:8] + | |--SEMI -> ; [48:18] + | `--RCURLY -> } [49:4] + |--SEMI -> ; [49:5] + |--ENUM_DEF -> ENUM_DEF [51:4] + | |--MODIFIERS -> MODIFIERS [51:4] + | |--ENUM -> enum [51:4] + | |--IDENT -> TestEnum4 [51:9] + | `--OBJBLOCK -> OBJBLOCK [51:18] + | |--LCURLY -> { [51:18] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [51:20] + | | |--ANNOTATIONS -> ANNOTATIONS [51:20] + | | `--IDENT -> SOME_VALUE [51:20] + | |--SEMI -> ; [51:30] + | `--RCURLY -> } [52:4] + |--SEMI -> ; [52:5] + |--INTERFACE_DEF -> INTERFACE_DEF [54:4] + | |--MODIFIERS -> MODIFIERS [54:4] + | |--LITERAL_INTERFACE -> interface [54:4] + | |--IDENT -> Interface1 [54:14] + | `--OBJBLOCK -> OBJBLOCK [55:4] + | |--LCURLY -> { [55:4] + | |--VARIABLE_DEF -> VARIABLE_DEF [56:8] + | | |--MODIFIERS -> MODIFIERS [56:8] + | | |--TYPE -> TYPE [56:8] + | | | `--LITERAL_INT -> int [56:8] + | | |--IDENT -> i [56:12] + | | |--ASSIGN -> = [56:14] + | | | `--EXPR -> EXPR [56:16] + | | | `--NUM_INT -> 1 [56:16] + | | `--SEMI -> ; [56:17] + | |--METHOD_DEF -> METHOD_DEF [57:8] + | | |--MODIFIERS -> MODIFIERS [57:8] + | | | `--LITERAL_PUBLIC -> public [57:8] + | | |--TYPE -> TYPE [57:15] + | | | `--LITERAL_VOID -> void [57:15] + | | |--IDENT -> meth1 [57:20] + | | |--LPAREN -> ( [57:25] + | | |--PARAMETERS -> PARAMETERS [57:26] + | | |--RPAREN -> ) [57:26] + | | `--SEMI -> ; [57:27] + | `--RCURLY -> } [57:29] + |--SEMI -> ; [57:30] + |--INTERFACE_DEF -> INTERFACE_DEF [59:4] + | |--MODIFIERS -> MODIFIERS [59:4] + | |--LITERAL_INTERFACE -> interface [59:4] + | |--IDENT -> Interface2 [59:14] + | `--OBJBLOCK -> OBJBLOCK [60:4] + | |--LCURLY -> { [60:4] + | |--VARIABLE_DEF -> VARIABLE_DEF [60:6] + | | |--MODIFIERS -> MODIFIERS [60:6] + | | |--TYPE -> TYPE [60:6] + | | | `--LITERAL_INT -> int [60:6] + | | |--IDENT -> i [60:10] + | | |--ASSIGN -> = [60:12] + | | | `--EXPR -> EXPR [60:14] + | | | `--NUM_INT -> 1 [60:14] + | | `--SEMI -> ; [60:15] + | |--METHOD_DEF -> METHOD_DEF [60:17] + | | |--MODIFIERS -> MODIFIERS [60:17] + | | | `--LITERAL_PUBLIC -> public [60:17] + | | |--TYPE -> TYPE [60:24] + | | | `--LITERAL_VOID -> void [60:24] + | | |--IDENT -> meth1 [60:29] + | | |--LPAREN -> ( [60:34] + | | |--PARAMETERS -> PARAMETERS [60:35] + | | |--RPAREN -> ) [60:35] + | | `--SEMI -> ; [60:36] + | `--RCURLY -> } [60:38] + |--SEMI -> ; [60:39] + |--INTERFACE_DEF -> INTERFACE_DEF [62:4] + | |--MODIFIERS -> MODIFIERS [62:4] + | |--LITERAL_INTERFACE -> interface [62:4] + | |--IDENT -> Interface3 [62:14] + | `--OBJBLOCK -> OBJBLOCK [62:25] + | |--LCURLY -> { [62:25] + | |--METHOD_DEF -> METHOD_DEF [63:8] + | | |--MODIFIERS -> MODIFIERS [63:8] + | | |--TYPE -> TYPE [63:8] + | | | `--LITERAL_VOID -> void [63:8] + | | |--IDENT -> display [63:13] + | | |--LPAREN -> ( [63:20] + | | |--PARAMETERS -> PARAMETERS [63:21] + | | |--RPAREN -> ) [63:21] + | | `--SEMI -> ; [63:22] + | |--INTERFACE_DEF -> INTERFACE_DEF [64:8] + | | |--MODIFIERS -> MODIFIERS [64:8] + | | |--LITERAL_INTERFACE -> interface [64:8] + | | |--IDENT -> Interface4 [64:18] + | | `--OBJBLOCK -> OBJBLOCK [64:29] + | | |--LCURLY -> { [64:29] + | | |--METHOD_DEF -> METHOD_DEF [65:12] + | | | |--MODIFIERS -> MODIFIERS [65:12] + | | | |--TYPE -> TYPE [65:12] + | | | | `--LITERAL_VOID -> void [65:12] + | | | |--IDENT -> myMethod [65:17] + | | | |--LPAREN -> ( [65:25] + | | | |--PARAMETERS -> PARAMETERS [65:26] + | | | |--RPAREN -> ) [65:26] + | | | `--SEMI -> ; [65:27] + | | `--RCURLY -> } [66:8] + | |--SEMI -> ; [66:9] + | `--RCURLY -> } [66:10] + |--SEMI -> ; [66:11] + |--INTERFACE_DEF -> INTERFACE_DEF [68:4] + | |--MODIFIERS -> MODIFIERS [68:4] + | |--LITERAL_INTERFACE -> interface [68:4] + | |--IDENT -> InterfaceEndingWithSemiColon2 [68:14] + | `--OBJBLOCK -> OBJBLOCK [68:44] + | |--LCURLY -> { [68:44] + | |--METHOD_DEF -> METHOD_DEF [69:8] + | | |--MODIFIERS -> MODIFIERS [69:8] + | | | `--LITERAL_PUBLIC -> public [69:8] + | | |--TYPE -> TYPE [69:15] + | | | `--LITERAL_VOID -> void [69:15] + | | |--IDENT -> fooEmpty [69:20] + | | |--LPAREN -> ( [69:28] + | | |--PARAMETERS -> PARAMETERS [69:29] + | | |--RPAREN -> ) [69:29] + | | `--SEMI -> ; [69:30] + | `--RCURLY -> } [70:4] + |--SEMI -> ; [70:5] + `--RCURLY -> } [71:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSuppressWarnings.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSuppressWarnings.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSuppressWarnings.java @@ -0,0 +1,49 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; +import java.util.Map; + +public class InputAntlr4AstRegressionSuppressWarnings { + + public static Object foo1(@SuppressWarnings("unused") Object str) { + String myString = (@SuppressWarnings("unused") String) str; + Object object = new @SuppressWarnings("unused") Object(); + try { + return null; + + } catch (@SuppressWarnings("unused") Exception ex) { + return ""; + } + } + + void foo2() throws @SuppressWarnings("unused") Exception { } + + public void foo3() { + Map.@SuppressWarnings("unused") Entry entry; + MyObject myObject = new MyObject(); + myObject.<@SuppressWarnings("unused") String>myMethod(); + myObject.new @SuppressWarnings("unused") MyObject2(); + } + + public static <T> void foo4(Object str) { + List<@SuppressWarnings("unused") ? extends Comparable<T>> unchangeable; + } + + abstract class UnmodifiableList<T> + implements @SuppressWarnings("unused")List<@SuppressWarnings("unused") T> { + } + + class MyObject{ + + public void myMethod(){}; + + class MyObject2{} + } + + @Target(ElementType.TYPE_USE) + @interface SuppressWarnings { + String value(); + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSuppressWarnings.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSuppressWarnings.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionSuppressWarnings.txt @@ -0,0 +1,381 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +IMPORT -> import [3:0] +|--DOT -> . [3:27] +| |--DOT -> . [3:16] +| | |--DOT -> . [3:11] +| | | |--IDENT -> java [3:7] +| | | `--IDENT -> lang [3:12] +| | `--IDENT -> annotation [3:17] +| `--IDENT -> ElementType [3:28] +`--SEMI -> ; [3:39] +IMPORT -> import [4:0] +|--DOT -> . [4:27] +| |--DOT -> . [4:16] +| | |--DOT -> . [4:11] +| | | |--IDENT -> java [4:7] +| | | `--IDENT -> lang [4:12] +| | `--IDENT -> annotation [4:17] +| `--IDENT -> Target [4:28] +`--SEMI -> ; [4:34] +IMPORT -> import [5:0] +|--DOT -> . [5:16] +| |--DOT -> . [5:11] +| | |--IDENT -> java [5:7] +| | `--IDENT -> util [5:12] +| `--IDENT -> List [5:17] +`--SEMI -> ; [5:21] +IMPORT -> import [6:0] +|--DOT -> . [6:16] +| |--DOT -> . [6:11] +| | |--IDENT -> java [6:7] +| | `--IDENT -> util [6:12] +| `--IDENT -> Map [6:17] +`--SEMI -> ; [6:20] +CLASS_DEF -> CLASS_DEF [8:0] +|--MODIFIERS -> MODIFIERS [8:0] +| `--LITERAL_PUBLIC -> public [8:0] +|--LITERAL_CLASS -> class [8:7] +|--IDENT -> InputAntlr4AstRegressionSuppressWarnings [8:13] +`--OBJBLOCK -> OBJBLOCK [8:54] + |--LCURLY -> { [8:54] + |--METHOD_DEF -> METHOD_DEF [10:4] + | |--MODIFIERS -> MODIFIERS [10:4] + | | |--LITERAL_PUBLIC -> public [10:4] + | | `--LITERAL_STATIC -> static [10:11] + | |--TYPE -> TYPE [10:18] + | | `--IDENT -> Object [10:18] + | |--IDENT -> foo1 [10:25] + | |--LPAREN -> ( [10:29] + | |--PARAMETERS -> PARAMETERS [10:30] + | | `--PARAMETER_DEF -> PARAMETER_DEF [10:30] + | | |--MODIFIERS -> MODIFIERS [10:30] + | | | `--ANNOTATION -> ANNOTATION [10:30] + | | | |--AT -> @ [10:30] + | | | |--IDENT -> SuppressWarnings [10:31] + | | | |--LPAREN -> ( [10:47] + | | | |--EXPR -> EXPR [10:48] + | | | | `--STRING_LITERAL -> "unused" [10:48] + | | | `--RPAREN -> ) [10:56] + | | |--TYPE -> TYPE [10:58] + | | | `--IDENT -> Object [10:58] + | | `--IDENT -> str [10:65] + | |--RPAREN -> ) [10:68] + | `--SLIST -> { [10:70] + | |--VARIABLE_DEF -> VARIABLE_DEF [11:8] + | | |--MODIFIERS -> MODIFIERS [11:8] + | | |--TYPE -> TYPE [11:8] + | | | `--IDENT -> String [11:8] + | | |--IDENT -> myString [11:15] + | | `--ASSIGN -> = [11:24] + | | `--EXPR -> EXPR [11:26] + | | `--TYPECAST -> ( [11:26] + | | |--TYPE -> TYPE [11:27] + | | | |--ANNOTATIONS -> ANNOTATIONS [11:27] + | | | | `--ANNOTATION -> ANNOTATION [11:27] + | | | | |--AT -> @ [11:27] + | | | | |--IDENT -> SuppressWarnings [11:28] + | | | | |--LPAREN -> ( [11:44] + | | | | |--EXPR -> EXPR [11:45] + | | | | | `--STRING_LITERAL -> "unused" [11:45] + | | | | `--RPAREN -> ) [11:53] + | | | `--IDENT -> String [11:55] + | | |--RPAREN -> ) [11:61] + | | `--IDENT -> str [11:63] + | |--SEMI -> ; [11:66] + | |--VARIABLE_DEF -> VARIABLE_DEF [12:8] + | | |--MODIFIERS -> MODIFIERS [12:8] + | | |--TYPE -> TYPE [12:8] + | | | `--IDENT -> Object [12:8] + | | |--IDENT -> object [12:15] + | | `--ASSIGN -> = [12:22] + | | `--EXPR -> EXPR [12:24] + | | `--LITERAL_NEW -> new [12:24] + | | |--ANNOTATIONS -> ANNOTATIONS [12:28] + | | | `--ANNOTATION -> ANNOTATION [12:28] + | | | |--AT -> @ [12:28] + | | | |--IDENT -> SuppressWarnings [12:29] + | | | |--LPAREN -> ( [12:45] + | | | |--EXPR -> EXPR [12:46] + | | | | `--STRING_LITERAL -> "unused" [12:46] + | | | `--RPAREN -> ) [12:54] + | | |--IDENT -> Object [12:56] + | | |--LPAREN -> ( [12:62] + | | |--ELIST -> ELIST [12:63] + | | `--RPAREN -> ) [12:63] + | |--SEMI -> ; [12:64] + | |--LITERAL_TRY -> try [13:8] + | | |--SLIST -> { [13:12] + | | | |--LITERAL_RETURN -> return [14:12] + | | | | |--EXPR -> EXPR [14:19] + | | | | | `--LITERAL_NULL -> null [14:19] + | | | | `--SEMI -> ; [14:23] + | | | `--RCURLY -> } [16:8] + | | `--LITERAL_CATCH -> catch [16:10] + | | |--LPAREN -> ( [16:16] + | | |--PARAMETER_DEF -> PARAMETER_DEF [16:17] + | | | |--MODIFIERS -> MODIFIERS [16:17] + | | | | `--ANNOTATION -> ANNOTATION [16:17] + | | | | |--AT -> @ [16:17] + | | | | |--IDENT -> SuppressWarnings [16:18] + | | | | |--LPAREN -> ( [16:34] + | | | | |--EXPR -> EXPR [16:35] + | | | | | `--STRING_LITERAL -> "unused" [16:35] + | | | | `--RPAREN -> ) [16:43] + | | | |--TYPE -> TYPE [16:45] + | | | | `--IDENT -> Exception [16:45] + | | | `--IDENT -> ex [16:55] + | | |--RPAREN -> ) [16:57] + | | `--SLIST -> { [16:59] + | | |--LITERAL_RETURN -> return [17:12] + | | | |--EXPR -> EXPR [17:19] + | | | | `--STRING_LITERAL -> "" [17:19] + | | | `--SEMI -> ; [17:21] + | | `--RCURLY -> } [18:8] + | `--RCURLY -> } [19:4] + |--METHOD_DEF -> METHOD_DEF [21:4] + | |--MODIFIERS -> MODIFIERS [21:4] + | |--TYPE -> TYPE [21:4] + | | `--LITERAL_VOID -> void [21:4] + | |--IDENT -> foo2 [21:9] + | |--LPAREN -> ( [21:13] + | |--PARAMETERS -> PARAMETERS [21:14] + | |--RPAREN -> ) [21:14] + | |--LITERAL_THROWS -> throws [21:16] + | | |--ANNOTATIONS -> ANNOTATIONS [21:23] + | | | `--ANNOTATION -> ANNOTATION [21:23] + | | | |--AT -> @ [21:23] + | | | |--IDENT -> SuppressWarnings [21:24] + | | | |--LPAREN -> ( [21:40] + | | | |--EXPR -> EXPR [21:41] + | | | | `--STRING_LITERAL -> "unused" [21:41] + | | | `--RPAREN -> ) [21:49] + | | `--IDENT -> Exception [21:51] + | `--SLIST -> { [21:61] + | `--RCURLY -> } [21:64] + |--METHOD_DEF -> METHOD_DEF [23:4] + | |--MODIFIERS -> MODIFIERS [23:4] + | | `--LITERAL_PUBLIC -> public [23:4] + | |--TYPE -> TYPE [23:11] + | | `--LITERAL_VOID -> void [23:11] + | |--IDENT -> foo3 [23:16] + | |--LPAREN -> ( [23:20] + | |--PARAMETERS -> PARAMETERS [23:21] + | |--RPAREN -> ) [23:21] + | `--SLIST -> { [23:23] + | |--VARIABLE_DEF -> VARIABLE_DEF [24:11] + | | |--MODIFIERS -> MODIFIERS [24:11] + | | |--TYPE -> TYPE [24:11] + | | | `--DOT -> . [24:11] + | | | |--IDENT -> Map [24:8] + | | | |--ANNOTATIONS -> ANNOTATIONS [24:12] + | | | | `--ANNOTATION -> ANNOTATION [24:12] + | | | | |--AT -> @ [24:12] + | | | | |--IDENT -> SuppressWarnings [24:13] + | | | | |--LPAREN -> ( [24:29] + | | | | |--EXPR -> EXPR [24:30] + | | | | | `--STRING_LITERAL -> "unused" [24:30] + | | | | `--RPAREN -> ) [24:38] + | | | `--IDENT -> Entry [24:40] + | | `--IDENT -> entry [24:46] + | |--SEMI -> ; [24:51] + | |--VARIABLE_DEF -> VARIABLE_DEF [25:8] + | | |--MODIFIERS -> MODIFIERS [25:8] + | | |--TYPE -> TYPE [25:8] + | | | `--IDENT -> MyObject [25:8] + | | |--IDENT -> myObject [25:17] + | | `--ASSIGN -> = [25:26] + | | `--EXPR -> EXPR [25:28] + | | `--LITERAL_NEW -> new [25:28] + | | |--IDENT -> MyObject [25:32] + | | |--LPAREN -> ( [25:40] + | | |--ELIST -> ELIST [25:41] + | | `--RPAREN -> ) [25:41] + | |--SEMI -> ; [25:42] + | |--EXPR -> EXPR [26:61] + | | `--METHOD_CALL -> ( [26:61] + | | |--DOT -> . [26:16] + | | | |--IDENT -> myObject [26:8] + | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [26:17] + | | | | |--GENERIC_START -> < [26:17] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [26:18] + | | | | | |--ANNOTATIONS -> ANNOTATIONS [26:18] + | | | | | | `--ANNOTATION -> ANNOTATION [26:18] + | | | | | | |--AT -> @ [26:18] + | | | | | | |--IDENT -> SuppressWarnings [26:19] + | | | | | | |--LPAREN -> ( [26:35] + | | | | | | |--EXPR -> EXPR [26:36] + | | | | | | | `--STRING_LITERAL -> "unused" [26:36] + | | | | | | `--RPAREN -> ) [26:44] + | | | | | `--IDENT -> String [26:46] + | | | | `--GENERIC_END -> > [26:52] + | | | `--IDENT -> myMethod [26:53] + | | |--ELIST -> ELIST [26:62] + | | `--RPAREN -> ) [26:62] + | |--SEMI -> ; [26:63] + | |--EXPR -> EXPR [27:16] + | | `--DOT -> . [27:16] + | | |--IDENT -> myObject [27:8] + | | `--LITERAL_NEW -> new [27:17] + | | |--ANNOTATIONS -> ANNOTATIONS [27:21] + | | | `--ANNOTATION -> ANNOTATION [27:21] + | | | |--AT -> @ [27:21] + | | | |--IDENT -> SuppressWarnings [27:22] + | | | |--LPAREN -> ( [27:38] + | | | |--EXPR -> EXPR [27:39] + | | | | `--STRING_LITERAL -> "unused" [27:39] + | | | `--RPAREN -> ) [27:47] + | | |--IDENT -> MyObject2 [27:49] + | | |--LPAREN -> ( [27:58] + | | |--ELIST -> ELIST [27:59] + | | `--RPAREN -> ) [27:59] + | |--SEMI -> ; [27:60] + | `--RCURLY -> } [28:4] + |--METHOD_DEF -> METHOD_DEF [30:4] + | |--MODIFIERS -> MODIFIERS [30:4] + | | |--LITERAL_PUBLIC -> public [30:4] + | | `--LITERAL_STATIC -> static [30:11] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [30:18] + | | |--GENERIC_START -> < [30:18] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [30:19] + | | | `--IDENT -> T [30:19] + | | `--GENERIC_END -> > [30:20] + | |--TYPE -> TYPE [30:22] + | | `--LITERAL_VOID -> void [30:22] + | |--IDENT -> foo4 [30:27] + | |--LPAREN -> ( [30:31] + | |--PARAMETERS -> PARAMETERS [30:32] + | | `--PARAMETER_DEF -> PARAMETER_DEF [30:32] + | | |--MODIFIERS -> MODIFIERS [30:32] + | | |--TYPE -> TYPE [30:32] + | | | `--IDENT -> Object [30:32] + | | `--IDENT -> str [30:39] + | |--RPAREN -> ) [30:42] + | `--SLIST -> { [30:44] + | |--VARIABLE_DEF -> VARIABLE_DEF [31:8] + | | |--MODIFIERS -> MODIFIERS [31:8] + | | |--TYPE -> TYPE [31:8] + | | | |--IDENT -> List [31:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [31:12] + | | | |--GENERIC_START -> < [31:12] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [31:13] + | | | | |--ANNOTATIONS -> ANNOTATIONS [31:13] + | | | | | `--ANNOTATION -> ANNOTATION [31:13] + | | | | | |--AT -> @ [31:13] + | | | | | |--IDENT -> SuppressWarnings [31:14] + | | | | | |--LPAREN -> ( [31:30] + | | | | | |--EXPR -> EXPR [31:31] + | | | | | | `--STRING_LITERAL -> "unused" [31:31] + | | | | | `--RPAREN -> ) [31:39] + | | | | |--WILDCARD_TYPE -> ? [31:41] + | | | | `--TYPE_UPPER_BOUNDS -> extends [31:43] + | | | | |--IDENT -> Comparable [31:51] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [31:61] + | | | | |--GENERIC_START -> < [31:61] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [31:62] + | | | | | `--IDENT -> T [31:62] + | | | | `--GENERIC_END -> > [31:63] + | | | `--GENERIC_END -> > [31:64] + | | `--IDENT -> unchangeable [31:66] + | |--SEMI -> ; [31:78] + | `--RCURLY -> } [32:4] + |--CLASS_DEF -> CLASS_DEF [34:4] + | |--MODIFIERS -> MODIFIERS [34:4] + | | `--ABSTRACT -> abstract [34:4] + | |--LITERAL_CLASS -> class [34:13] + | |--IDENT -> UnmodifiableList [34:19] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [34:35] + | | |--GENERIC_START -> < [34:35] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [34:36] + | | | `--IDENT -> T [34:36] + | | `--GENERIC_END -> > [34:37] + | |--IMPLEMENTS_CLAUSE -> implements [35:4] + | | |--ANNOTATIONS -> ANNOTATIONS [35:15] + | | | `--ANNOTATION -> ANNOTATION [35:15] + | | | |--AT -> @ [35:15] + | | | |--IDENT -> SuppressWarnings [35:16] + | | | |--LPAREN -> ( [35:32] + | | | |--EXPR -> EXPR [35:33] + | | | | `--STRING_LITERAL -> "unused" [35:33] + | | | `--RPAREN -> ) [35:41] + | | |--IDENT -> List [35:42] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [35:46] + | | |--GENERIC_START -> < [35:46] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [35:47] + | | | |--ANNOTATIONS -> ANNOTATIONS [35:47] + | | | | `--ANNOTATION -> ANNOTATION [35:47] + | | | | |--AT -> @ [35:47] + | | | | |--IDENT -> SuppressWarnings [35:48] + | | | | |--LPAREN -> ( [35:64] + | | | | |--EXPR -> EXPR [35:65] + | | | | | `--STRING_LITERAL -> "unused" [35:65] + | | | | `--RPAREN -> ) [35:73] + | | | `--IDENT -> T [35:75] + | | `--GENERIC_END -> > [35:76] + | `--OBJBLOCK -> OBJBLOCK [35:78] + | |--LCURLY -> { [35:78] + | `--RCURLY -> } [36:4] + |--CLASS_DEF -> CLASS_DEF [38:4] + | |--MODIFIERS -> MODIFIERS [38:4] + | |--LITERAL_CLASS -> class [38:4] + | |--IDENT -> MyObject [38:10] + | `--OBJBLOCK -> OBJBLOCK [38:18] + | |--LCURLY -> { [38:18] + | |--METHOD_DEF -> METHOD_DEF [40:8] + | | |--MODIFIERS -> MODIFIERS [40:8] + | | | `--LITERAL_PUBLIC -> public [40:8] + | | |--TYPE -> TYPE [40:15] + | | | `--LITERAL_VOID -> void [40:15] + | | |--IDENT -> myMethod [40:20] + | | |--LPAREN -> ( [40:28] + | | |--PARAMETERS -> PARAMETERS [40:29] + | | |--RPAREN -> ) [40:29] + | | `--SLIST -> { [40:30] + | | `--RCURLY -> } [40:31] + | |--SEMI -> ; [40:32] + | |--CLASS_DEF -> CLASS_DEF [42:8] + | | |--MODIFIERS -> MODIFIERS [42:8] + | | |--LITERAL_CLASS -> class [42:8] + | | |--IDENT -> MyObject2 [42:14] + | | `--OBJBLOCK -> OBJBLOCK [42:23] + | | |--LCURLY -> { [42:23] + | | `--RCURLY -> } [42:24] + | `--RCURLY -> } [43:4] + |--ANNOTATION_DEF -> ANNOTATION_DEF [45:4] + | |--MODIFIERS -> MODIFIERS [45:4] + | | `--ANNOTATION -> ANNOTATION [45:4] + | | |--AT -> @ [45:4] + | | |--IDENT -> Target [45:5] + | | |--LPAREN -> ( [45:11] + | | |--EXPR -> EXPR [45:23] + | | | `--DOT -> . [45:23] + | | | |--IDENT -> ElementType [45:12] + | | | `--IDENT -> TYPE_USE [45:24] + | | `--RPAREN -> ) [45:32] + | |--AT -> @ [46:4] + | |--LITERAL_INTERFACE -> interface [46:5] + | |--IDENT -> SuppressWarnings [46:15] + | `--OBJBLOCK -> OBJBLOCK [46:32] + | |--LCURLY -> { [46:32] + | |--ANNOTATION_FIELD_DEF -> ANNOTATION_FIELD_DEF [47:8] + | | |--MODIFIERS -> MODIFIERS [47:8] + | | |--TYPE -> TYPE [47:8] + | | | `--IDENT -> String [47:8] + | | |--IDENT -> value [47:15] + | | |--LPAREN -> ( [47:20] + | | |--RPAREN -> ) [47:21] + | | `--SEMI -> ; [47:22] + | `--RCURLY -> } [48:4] + `--RCURLY -> } [49:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTrickySwitch.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTrickySwitch.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTrickySwitch.java @@ -0,0 +1,268 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +public class InputAntlr4AstRegressionTrickySwitch { + + private static void fooSwitch() { + switch("") { + case "0": //some comment + case "1": + // my comment + foo1(); + break; + case "2": + // my comment + //comment + foo1(); + // comment + break; + case "3": + /* // warn */ + foo1(); + /* com */ + break; + case "5": + foo1(); + // warn + case "6": + int k = 7; + // fall through + case "7": + if (true) {} + // warn + case "8": + break; + case "9": + foo1(); + // fall through + case "10": { + if (true) {} + // fall through + } + case "11": { + // fall through + } + case "28": { + // fall through + } + case "12": { + // warn + int i; + } + case "13": { + // some comment in empty case block + } + case "14": { + // warn + } + case "15": { + foo1(); + // warn + } + case "16": { + int a; + } + // fall through + case "17": { + int a; + } + // warn + case "18": { System.lineSeparator(); + } // trailing comment + case "19": + // comment + case "20": + // comment + case "21": + default: + // comment + break; + } + } + + private static void foo1() { + if (true) { + switch(1) { + case 0: + + case 1: + // warn + int b = 10; + default: + // comment + } + + } + } + + public void fooDotInCaseBlock() { + int i = 0; + String s = ""; + + switch (i) { + case -2: + // what + i++; + // no break here + case 0: + // what + s.indexOf("ignore"); + // no break here + case -1: + // what + s.indexOf("no way"); + // warn + case 1: + case 2: + i--; + // no break here + case 3: { } + // fall through + + + } + + String breaks = "" + // warn + + "</table>" + // middle + + "" + // end + ; + } + + public void foo2() { + int a = 1; + switch (a) { + case 1: + default: + // warn + } + } + + public void foo3() { + int a = 1; + switch (a) { + case 1: + default: + + // comment + } + } + + public void foo4() { + int a = 1; + switch (a) { + case 1: + int b; + // warn + default: + } + } + + public void foo5() { + int a = 1; + switch (a) { + case 1: + int b; + // comment + default: + } + } + + public void foo6() { + int a = 1; + switch (a) { + case 1: + int b; + // comment + default: + } + } + + public void foo7() { + int a = 2; + String s = ""; + switch (a) { + // comment + // comment + // comment + case 1: + case 2: + // comment + // comment + foo1(); + // comment + case 3: + // comment + // comment + // comment + case 4: + // warn + case 5: + s.toString().toString().toString(); + // warn + // warn + // warn + default: + } + } + + public void foo8() { + int a = 2; + String s = ""; + switch (a) { + // comment + // comment + // comment + case 1: + case 2: + // comment + // comment + foo1(); + // comment + case 3: + // comment + // comment + s.toString().toString().toString(); + // comment + case 4: + // warn + default: + } + } + + public void foo9() { + int a = 5; + switch (a) { + case 1: + case 2: + // comment + } + } + + public void foo10() { + int a = 5; + switch (a) { + case 1: + default: + // comment + } + } + + public void foo11() { + int a = 5; + switch (a) { + case 1: + case 2: + // comment + } + } + + public void foo12() { + int a = 5; + switch (a) { + // comment + case 1: + } + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTrickySwitch.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTrickySwitch.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTrickySwitch.txt @@ -0,0 +1,949 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +CLASS_DEF -> CLASS_DEF [3:0] +|--MODIFIERS -> MODIFIERS [3:0] +| `--LITERAL_PUBLIC -> public [3:0] +|--LITERAL_CLASS -> class [3:7] +|--IDENT -> InputAntlr4AstRegressionTrickySwitch [3:13] +`--OBJBLOCK -> OBJBLOCK [3:50] + |--LCURLY -> { [3:50] + |--METHOD_DEF -> METHOD_DEF [5:4] + | |--MODIFIERS -> MODIFIERS [5:4] + | | |--LITERAL_PRIVATE -> private [5:4] + | | `--LITERAL_STATIC -> static [5:12] + | |--TYPE -> TYPE [5:19] + | | `--LITERAL_VOID -> void [5:19] + | |--IDENT -> fooSwitch [5:24] + | |--LPAREN -> ( [5:33] + | |--PARAMETERS -> PARAMETERS [5:34] + | |--RPAREN -> ) [5:34] + | `--SLIST -> { [5:36] + | |--LITERAL_SWITCH -> switch [6:8] + | | |--LPAREN -> ( [6:14] + | | |--EXPR -> EXPR [6:15] + | | | `--STRING_LITERAL -> "" [6:15] + | | |--RPAREN -> ) [6:17] + | | |--LCURLY -> { [6:19] + | | |--CASE_GROUP -> CASE_GROUP [7:12] + | | | |--LITERAL_CASE -> case [7:12] + | | | | |--EXPR -> EXPR [7:17] + | | | | | `--STRING_LITERAL -> "0" [7:17] + | | | | `--COLON -> : [7:20] + | | | |--LITERAL_CASE -> case [8:12] + | | | | |--EXPR -> EXPR [8:17] + | | | | | `--STRING_LITERAL -> "1" [8:17] + | | | | `--COLON -> : [8:20] + | | | `--SLIST -> SLIST [10:20] + | | | |--EXPR -> EXPR [10:20] + | | | | `--METHOD_CALL -> ( [10:20] + | | | | |--IDENT -> foo1 [10:16] + | | | | |--ELIST -> ELIST [10:21] + | | | | `--RPAREN -> ) [10:21] + | | | |--SEMI -> ; [10:22] + | | | `--LITERAL_BREAK -> break [11:16] + | | | `--SEMI -> ; [11:21] + | | |--CASE_GROUP -> CASE_GROUP [12:12] + | | | |--LITERAL_CASE -> case [12:12] + | | | | |--EXPR -> EXPR [12:17] + | | | | | `--STRING_LITERAL -> "2" [12:17] + | | | | `--COLON -> : [12:20] + | | | `--SLIST -> SLIST [15:20] + | | | |--EXPR -> EXPR [15:20] + | | | | `--METHOD_CALL -> ( [15:20] + | | | | |--IDENT -> foo1 [15:16] + | | | | |--ELIST -> ELIST [15:21] + | | | | `--RPAREN -> ) [15:21] + | | | |--SEMI -> ; [15:22] + | | | `--LITERAL_BREAK -> break [17:16] + | | | `--SEMI -> ; [17:21] + | | |--CASE_GROUP -> CASE_GROUP [18:12] + | | | |--LITERAL_CASE -> case [18:12] + | | | | |--EXPR -> EXPR [18:17] + | | | | | `--STRING_LITERAL -> "3" [18:17] + | | | | `--COLON -> : [18:20] + | | | `--SLIST -> SLIST [20:20] + | | | |--EXPR -> EXPR [20:20] + | | | | `--METHOD_CALL -> ( [20:20] + | | | | |--IDENT -> foo1 [20:16] + | | | | |--ELIST -> ELIST [20:21] + | | | | `--RPAREN -> ) [20:21] + | | | |--SEMI -> ; [20:22] + | | | `--LITERAL_BREAK -> break [22:16] + | | | `--SEMI -> ; [22:21] + | | |--CASE_GROUP -> CASE_GROUP [23:12] + | | | |--LITERAL_CASE -> case [23:12] + | | | | |--EXPR -> EXPR [23:17] + | | | | | `--STRING_LITERAL -> "5" [23:17] + | | | | `--COLON -> : [23:20] + | | | `--SLIST -> SLIST [24:20] + | | | |--EXPR -> EXPR [24:20] + | | | | `--METHOD_CALL -> ( [24:20] + | | | | |--IDENT -> foo1 [24:16] + | | | | |--ELIST -> ELIST [24:21] + | | | | `--RPAREN -> ) [24:21] + | | | `--SEMI -> ; [24:22] + | | |--CASE_GROUP -> CASE_GROUP [26:12] + | | | |--LITERAL_CASE -> case [26:12] + | | | | |--EXPR -> EXPR [26:17] + | | | | | `--STRING_LITERAL -> "6" [26:17] + | | | | `--COLON -> : [26:20] + | | | `--SLIST -> SLIST [27:16] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [27:16] + | | | | |--MODIFIERS -> MODIFIERS [27:16] + | | | | |--TYPE -> TYPE [27:16] + | | | | | `--LITERAL_INT -> int [27:16] + | | | | |--IDENT -> k [27:20] + | | | | `--ASSIGN -> = [27:22] + | | | | `--EXPR -> EXPR [27:24] + | | | | `--NUM_INT -> 7 [27:24] + | | | `--SEMI -> ; [27:25] + | | |--CASE_GROUP -> CASE_GROUP [29:12] + | | | |--LITERAL_CASE -> case [29:12] + | | | | |--EXPR -> EXPR [29:17] + | | | | | `--STRING_LITERAL -> "7" [29:17] + | | | | `--COLON -> : [29:20] + | | | `--SLIST -> SLIST [30:16] + | | | `--LITERAL_IF -> if [30:16] + | | | |--LPAREN -> ( [30:19] + | | | |--EXPR -> EXPR [30:20] + | | | | `--LITERAL_TRUE -> true [30:20] + | | | |--RPAREN -> ) [30:24] + | | | `--SLIST -> { [30:26] + | | | `--RCURLY -> } [30:27] + | | |--CASE_GROUP -> CASE_GROUP [32:12] + | | | |--LITERAL_CASE -> case [32:12] + | | | | |--EXPR -> EXPR [32:17] + | | | | | `--STRING_LITERAL -> "8" [32:17] + | | | | `--COLON -> : [32:20] + | | | `--SLIST -> SLIST [33:16] + | | | `--LITERAL_BREAK -> break [33:16] + | | | `--SEMI -> ; [33:21] + | | |--CASE_GROUP -> CASE_GROUP [34:12] + | | | |--LITERAL_CASE -> case [34:12] + | | | | |--EXPR -> EXPR [34:17] + | | | | | `--STRING_LITERAL -> "9" [34:17] + | | | | `--COLON -> : [34:20] + | | | `--SLIST -> SLIST [35:20] + | | | |--EXPR -> EXPR [35:20] + | | | | `--METHOD_CALL -> ( [35:20] + | | | | |--IDENT -> foo1 [35:16] + | | | | |--ELIST -> ELIST [35:21] + | | | | `--RPAREN -> ) [35:21] + | | | `--SEMI -> ; [35:22] + | | |--CASE_GROUP -> CASE_GROUP [37:12] + | | | |--LITERAL_CASE -> case [37:12] + | | | | |--EXPR -> EXPR [37:17] + | | | | | `--STRING_LITERAL -> "10" [37:17] + | | | | `--COLON -> : [37:21] + | | | `--SLIST -> SLIST [37:23] + | | | `--SLIST -> { [37:23] + | | | |--LITERAL_IF -> if [38:16] + | | | | |--LPAREN -> ( [38:19] + | | | | |--EXPR -> EXPR [38:20] + | | | | | `--LITERAL_TRUE -> true [38:20] + | | | | |--RPAREN -> ) [38:24] + | | | | `--SLIST -> { [38:26] + | | | | `--RCURLY -> } [38:27] + | | | `--RCURLY -> } [40:12] + | | |--CASE_GROUP -> CASE_GROUP [41:12] + | | | |--LITERAL_CASE -> case [41:12] + | | | | |--EXPR -> EXPR [41:17] + | | | | | `--STRING_LITERAL -> "11" [41:17] + | | | | `--COLON -> : [41:21] + | | | `--SLIST -> SLIST [41:23] + | | | `--SLIST -> { [41:23] + | | | `--RCURLY -> } [43:12] + | | |--CASE_GROUP -> CASE_GROUP [44:12] + | | | |--LITERAL_CASE -> case [44:12] + | | | | |--EXPR -> EXPR [44:17] + | | | | | `--STRING_LITERAL -> "28" [44:17] + | | | | `--COLON -> : [44:21] + | | | `--SLIST -> SLIST [44:23] + | | | `--SLIST -> { [44:23] + | | | `--RCURLY -> } [46:12] + | | |--CASE_GROUP -> CASE_GROUP [47:12] + | | | |--LITERAL_CASE -> case [47:12] + | | | | |--EXPR -> EXPR [47:17] + | | | | | `--STRING_LITERAL -> "12" [47:17] + | | | | `--COLON -> : [47:21] + | | | `--SLIST -> SLIST [47:23] + | | | `--SLIST -> { [47:23] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [49:16] + | | | | |--MODIFIERS -> MODIFIERS [49:16] + | | | | |--TYPE -> TYPE [49:16] + | | | | | `--LITERAL_INT -> int [49:16] + | | | | `--IDENT -> i [49:20] + | | | |--SEMI -> ; [49:21] + | | | `--RCURLY -> } [50:12] + | | |--CASE_GROUP -> CASE_GROUP [51:12] + | | | |--LITERAL_CASE -> case [51:12] + | | | | |--EXPR -> EXPR [51:17] + | | | | | `--STRING_LITERAL -> "13" [51:17] + | | | | `--COLON -> : [51:21] + | | | `--SLIST -> SLIST [51:23] + | | | `--SLIST -> { [51:23] + | | | `--RCURLY -> } [53:12] + | | |--CASE_GROUP -> CASE_GROUP [54:12] + | | | |--LITERAL_CASE -> case [54:12] + | | | | |--EXPR -> EXPR [54:17] + | | | | | `--STRING_LITERAL -> "14" [54:17] + | | | | `--COLON -> : [54:21] + | | | `--SLIST -> SLIST [54:23] + | | | `--SLIST -> { [54:23] + | | | `--RCURLY -> } [56:12] + | | |--CASE_GROUP -> CASE_GROUP [57:12] + | | | |--LITERAL_CASE -> case [57:12] + | | | | |--EXPR -> EXPR [57:17] + | | | | | `--STRING_LITERAL -> "15" [57:17] + | | | | `--COLON -> : [57:21] + | | | `--SLIST -> SLIST [57:23] + | | | `--SLIST -> { [57:23] + | | | |--EXPR -> EXPR [58:20] + | | | | `--METHOD_CALL -> ( [58:20] + | | | | |--IDENT -> foo1 [58:16] + | | | | |--ELIST -> ELIST [58:21] + | | | | `--RPAREN -> ) [58:21] + | | | |--SEMI -> ; [58:22] + | | | `--RCURLY -> } [60:12] + | | |--CASE_GROUP -> CASE_GROUP [61:12] + | | | |--LITERAL_CASE -> case [61:12] + | | | | |--EXPR -> EXPR [61:17] + | | | | | `--STRING_LITERAL -> "16" [61:17] + | | | | `--COLON -> : [61:21] + | | | `--SLIST -> SLIST [61:23] + | | | `--SLIST -> { [61:23] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [62:16] + | | | | |--MODIFIERS -> MODIFIERS [62:16] + | | | | |--TYPE -> TYPE [62:16] + | | | | | `--LITERAL_INT -> int [62:16] + | | | | `--IDENT -> a [62:20] + | | | |--SEMI -> ; [62:21] + | | | `--RCURLY -> } [63:12] + | | |--CASE_GROUP -> CASE_GROUP [65:12] + | | | |--LITERAL_CASE -> case [65:12] + | | | | |--EXPR -> EXPR [65:17] + | | | | | `--STRING_LITERAL -> "17" [65:17] + | | | | `--COLON -> : [65:21] + | | | `--SLIST -> SLIST [65:23] + | | | `--SLIST -> { [65:23] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [66:16] + | | | | |--MODIFIERS -> MODIFIERS [66:16] + | | | | |--TYPE -> TYPE [66:16] + | | | | | `--LITERAL_INT -> int [66:16] + | | | | `--IDENT -> a [66:20] + | | | |--SEMI -> ; [66:21] + | | | `--RCURLY -> } [67:12] + | | |--CASE_GROUP -> CASE_GROUP [69:16] + | | | |--LITERAL_CASE -> case [69:16] + | | | | |--EXPR -> EXPR [69:21] + | | | | | `--STRING_LITERAL -> "18" [69:21] + | | | | `--COLON -> : [69:25] + | | | `--SLIST -> SLIST [69:27] + | | | `--SLIST -> { [69:27] + | | | |--EXPR -> EXPR [69:49] + | | | | `--METHOD_CALL -> ( [69:49] + | | | | |--DOT -> . [69:35] + | | | | | |--IDENT -> System [69:29] + | | | | | `--IDENT -> lineSeparator [69:36] + | | | | |--ELIST -> ELIST [69:50] + | | | | `--RPAREN -> ) [69:50] + | | | |--SEMI -> ; [69:51] + | | | `--RCURLY -> } [70:16] + | | |--CASE_GROUP -> CASE_GROUP [71:12] + | | | |--LITERAL_CASE -> case [71:12] + | | | | |--EXPR -> EXPR [71:17] + | | | | | `--STRING_LITERAL -> "19" [71:17] + | | | | `--COLON -> : [71:21] + | | | |--LITERAL_CASE -> case [73:12] + | | | | |--EXPR -> EXPR [73:17] + | | | | | `--STRING_LITERAL -> "20" [73:17] + | | | | `--COLON -> : [73:21] + | | | |--LITERAL_CASE -> case [75:12] + | | | | |--EXPR -> EXPR [75:17] + | | | | | `--STRING_LITERAL -> "21" [75:17] + | | | | `--COLON -> : [75:21] + | | | |--LITERAL_DEFAULT -> default [76:12] + | | | | `--COLON -> : [76:19] + | | | `--SLIST -> SLIST [78:16] + | | | `--LITERAL_BREAK -> break [78:16] + | | | `--SEMI -> ; [78:21] + | | `--RCURLY -> } [79:8] + | `--RCURLY -> } [80:4] + |--METHOD_DEF -> METHOD_DEF [82:4] + | |--MODIFIERS -> MODIFIERS [82:4] + | | |--LITERAL_PRIVATE -> private [82:4] + | | `--LITERAL_STATIC -> static [82:12] + | |--TYPE -> TYPE [82:19] + | | `--LITERAL_VOID -> void [82:19] + | |--IDENT -> foo1 [82:24] + | |--LPAREN -> ( [82:28] + | |--PARAMETERS -> PARAMETERS [82:29] + | |--RPAREN -> ) [82:29] + | `--SLIST -> { [82:31] + | |--LITERAL_IF -> if [83:8] + | | |--LPAREN -> ( [83:11] + | | |--EXPR -> EXPR [83:12] + | | | `--LITERAL_TRUE -> true [83:12] + | | |--RPAREN -> ) [83:16] + | | `--SLIST -> { [83:18] + | | |--LITERAL_SWITCH -> switch [84:12] + | | | |--LPAREN -> ( [84:18] + | | | |--EXPR -> EXPR [84:19] + | | | | `--NUM_INT -> 1 [84:19] + | | | |--RPAREN -> ) [84:20] + | | | |--LCURLY -> { [84:22] + | | | |--CASE_GROUP -> CASE_GROUP [85:16] + | | | | |--LITERAL_CASE -> case [85:16] + | | | | | |--EXPR -> EXPR [85:21] + | | | | | | `--NUM_INT -> 0 [85:21] + | | | | | `--COLON -> : [85:22] + | | | | |--LITERAL_CASE -> case [87:16] + | | | | | |--EXPR -> EXPR [87:21] + | | | | | | `--NUM_INT -> 1 [87:21] + | | | | | `--COLON -> : [87:22] + | | | | `--SLIST -> SLIST [89:20] + | | | | |--VARIABLE_DEF -> VARIABLE_DEF [89:20] + | | | | | |--MODIFIERS -> MODIFIERS [89:20] + | | | | | |--TYPE -> TYPE [89:20] + | | | | | | `--LITERAL_INT -> int [89:20] + | | | | | |--IDENT -> b [89:24] + | | | | | `--ASSIGN -> = [89:26] + | | | | | `--EXPR -> EXPR [89:28] + | | | | | `--NUM_INT -> 10 [89:28] + | | | | `--SEMI -> ; [89:30] + | | | |--CASE_GROUP -> CASE_GROUP [90:16] + | | | | `--LITERAL_DEFAULT -> default [90:16] + | | | | `--COLON -> : [90:23] + | | | `--RCURLY -> } [92:12] + | | `--RCURLY -> } [94:8] + | `--RCURLY -> } [95:4] + |--METHOD_DEF -> METHOD_DEF [97:4] + | |--MODIFIERS -> MODIFIERS [97:4] + | | `--LITERAL_PUBLIC -> public [97:4] + | |--TYPE -> TYPE [97:11] + | | `--LITERAL_VOID -> void [97:11] + | |--IDENT -> fooDotInCaseBlock [97:16] + | |--LPAREN -> ( [97:33] + | |--PARAMETERS -> PARAMETERS [97:34] + | |--RPAREN -> ) [97:34] + | `--SLIST -> { [97:36] + | |--VARIABLE_DEF -> VARIABLE_DEF [98:8] + | | |--MODIFIERS -> MODIFIERS [98:8] + | | |--TYPE -> TYPE [98:8] + | | | `--LITERAL_INT -> int [98:8] + | | |--IDENT -> i [98:12] + | | `--ASSIGN -> = [98:14] + | | `--EXPR -> EXPR [98:16] + | | `--NUM_INT -> 0 [98:16] + | |--SEMI -> ; [98:17] + | |--VARIABLE_DEF -> VARIABLE_DEF [99:8] + | | |--MODIFIERS -> MODIFIERS [99:8] + | | |--TYPE -> TYPE [99:8] + | | | `--IDENT -> String [99:8] + | | |--IDENT -> s [99:15] + | | `--ASSIGN -> = [99:17] + | | `--EXPR -> EXPR [99:19] + | | `--STRING_LITERAL -> "" [99:19] + | |--SEMI -> ; [99:21] + | |--LITERAL_SWITCH -> switch [101:8] + | | |--LPAREN -> ( [101:15] + | | |--EXPR -> EXPR [101:16] + | | | `--IDENT -> i [101:16] + | | |--RPAREN -> ) [101:17] + | | |--LCURLY -> { [101:19] + | | |--CASE_GROUP -> CASE_GROUP [102:12] + | | | |--LITERAL_CASE -> case [102:12] + | | | | |--EXPR -> EXPR [102:17] + | | | | | `--UNARY_MINUS -> - [102:17] + | | | | | `--NUM_INT -> 2 [102:18] + | | | | `--COLON -> : [102:19] + | | | `--SLIST -> SLIST [104:17] + | | | |--EXPR -> EXPR [104:17] + | | | | `--POST_INC -> ++ [104:17] + | | | | `--IDENT -> i [104:16] + | | | `--SEMI -> ; [104:19] + | | |--CASE_GROUP -> CASE_GROUP [106:12] + | | | |--LITERAL_CASE -> case [106:12] + | | | | |--EXPR -> EXPR [106:17] + | | | | | `--NUM_INT -> 0 [106:17] + | | | | `--COLON -> : [106:18] + | | | `--SLIST -> SLIST [108:25] + | | | |--EXPR -> EXPR [108:25] + | | | | `--METHOD_CALL -> ( [108:25] + | | | | |--DOT -> . [108:17] + | | | | | |--IDENT -> s [108:16] + | | | | | `--IDENT -> indexOf [108:18] + | | | | |--ELIST -> ELIST [108:26] + | | | | | `--EXPR -> EXPR [108:26] + | | | | | `--STRING_LITERAL -> "ignore" [108:26] + | | | | `--RPAREN -> ) [108:34] + | | | `--SEMI -> ; [108:35] + | | |--CASE_GROUP -> CASE_GROUP [110:12] + | | | |--LITERAL_CASE -> case [110:12] + | | | | |--EXPR -> EXPR [110:17] + | | | | | `--UNARY_MINUS -> - [110:17] + | | | | | `--NUM_INT -> 1 [110:18] + | | | | `--COLON -> : [110:19] + | | | `--SLIST -> SLIST [112:26] + | | | |--EXPR -> EXPR [112:26] + | | | | `--METHOD_CALL -> ( [112:26] + | | | | |--DOT -> . [112:18] + | | | | | |--IDENT -> s [112:17] + | | | | | `--IDENT -> indexOf [112:19] + | | | | |--ELIST -> ELIST [112:27] + | | | | | `--EXPR -> EXPR [112:27] + | | | | | `--STRING_LITERAL -> "no way" [112:27] + | | | | `--RPAREN -> ) [112:35] + | | | `--SEMI -> ; [112:36] + | | |--CASE_GROUP -> CASE_GROUP [114:12] + | | | |--LITERAL_CASE -> case [114:12] + | | | | |--EXPR -> EXPR [114:17] + | | | | | `--NUM_INT -> 1 [114:17] + | | | | `--COLON -> : [114:18] + | | | |--LITERAL_CASE -> case [115:12] + | | | | |--EXPR -> EXPR [115:17] + | | | | | `--NUM_INT -> 2 [115:17] + | | | | `--COLON -> : [115:18] + | | | `--SLIST -> SLIST [116:17] + | | | |--EXPR -> EXPR [116:17] + | | | | `--POST_DEC -> -- [116:17] + | | | | `--IDENT -> i [116:16] + | | | `--SEMI -> ; [116:19] + | | |--CASE_GROUP -> CASE_GROUP [118:12] + | | | |--LITERAL_CASE -> case [118:12] + | | | | |--EXPR -> EXPR [118:17] + | | | | | `--NUM_INT -> 3 [118:17] + | | | | `--COLON -> : [118:18] + | | | `--SLIST -> SLIST [118:20] + | | | `--SLIST -> { [118:20] + | | | `--RCURLY -> } [118:22] + | | `--RCURLY -> } [122:8] + | |--VARIABLE_DEF -> VARIABLE_DEF [124:8] + | | |--MODIFIERS -> MODIFIERS [124:8] + | | |--TYPE -> TYPE [124:8] + | | | `--IDENT -> String [124:8] + | | |--IDENT -> breaks [124:15] + | | `--ASSIGN -> = [124:22] + | | `--EXPR -> EXPR [128:12] + | | `--PLUS -> + [128:12] + | | |--PLUS -> + [126:12] + | | | |--STRING_LITERAL -> "" [124:24] + | | | `--STRING_LITERAL -> "</table>" [126:14] + | | `--STRING_LITERAL -> "" [128:14] + | |--SEMI -> ; [130:8] + | `--RCURLY -> } [131:4] + |--METHOD_DEF -> METHOD_DEF [133:4] + | |--MODIFIERS -> MODIFIERS [133:4] + | | `--LITERAL_PUBLIC -> public [133:4] + | |--TYPE -> TYPE [133:11] + | | `--LITERAL_VOID -> void [133:11] + | |--IDENT -> foo2 [133:16] + | |--LPAREN -> ( [133:20] + | |--PARAMETERS -> PARAMETERS [133:21] + | |--RPAREN -> ) [133:21] + | `--SLIST -> { [133:23] + | |--VARIABLE_DEF -> VARIABLE_DEF [134:8] + | | |--MODIFIERS -> MODIFIERS [134:8] + | | |--TYPE -> TYPE [134:8] + | | | `--LITERAL_INT -> int [134:8] + | | |--IDENT -> a [134:12] + | | `--ASSIGN -> = [134:14] + | | `--EXPR -> EXPR [134:16] + | | `--NUM_INT -> 1 [134:16] + | |--SEMI -> ; [134:17] + | |--LITERAL_SWITCH -> switch [135:8] + | | |--LPAREN -> ( [135:15] + | | |--EXPR -> EXPR [135:16] + | | | `--IDENT -> a [135:16] + | | |--RPAREN -> ) [135:17] + | | |--LCURLY -> { [135:19] + | | |--CASE_GROUP -> CASE_GROUP [136:12] + | | | |--LITERAL_CASE -> case [136:12] + | | | | |--EXPR -> EXPR [136:17] + | | | | | `--NUM_INT -> 1 [136:17] + | | | | `--COLON -> : [136:18] + | | | `--LITERAL_DEFAULT -> default [137:12] + | | | `--COLON -> : [137:19] + | | `--RCURLY -> } [139:8] + | `--RCURLY -> } [140:4] + |--METHOD_DEF -> METHOD_DEF [142:4] + | |--MODIFIERS -> MODIFIERS [142:4] + | | `--LITERAL_PUBLIC -> public [142:4] + | |--TYPE -> TYPE [142:11] + | | `--LITERAL_VOID -> void [142:11] + | |--IDENT -> foo3 [142:16] + | |--LPAREN -> ( [142:20] + | |--PARAMETERS -> PARAMETERS [142:21] + | |--RPAREN -> ) [142:21] + | `--SLIST -> { [142:23] + | |--VARIABLE_DEF -> VARIABLE_DEF [143:8] + | | |--MODIFIERS -> MODIFIERS [143:8] + | | |--TYPE -> TYPE [143:8] + | | | `--LITERAL_INT -> int [143:8] + | | |--IDENT -> a [143:12] + | | `--ASSIGN -> = [143:14] + | | `--EXPR -> EXPR [143:16] + | | `--NUM_INT -> 1 [143:16] + | |--SEMI -> ; [143:17] + | |--LITERAL_SWITCH -> switch [144:8] + | | |--LPAREN -> ( [144:15] + | | |--EXPR -> EXPR [144:16] + | | | `--IDENT -> a [144:16] + | | |--RPAREN -> ) [144:17] + | | |--LCURLY -> { [144:19] + | | |--CASE_GROUP -> CASE_GROUP [145:12] + | | | |--LITERAL_CASE -> case [145:12] + | | | | |--EXPR -> EXPR [145:17] + | | | | | `--NUM_INT -> 1 [145:17] + | | | | `--COLON -> : [145:18] + | | | `--LITERAL_DEFAULT -> default [146:12] + | | | `--COLON -> : [146:19] + | | `--RCURLY -> } [149:8] + | `--RCURLY -> } [150:4] + |--METHOD_DEF -> METHOD_DEF [152:4] + | |--MODIFIERS -> MODIFIERS [152:4] + | | `--LITERAL_PUBLIC -> public [152:4] + | |--TYPE -> TYPE [152:11] + | | `--LITERAL_VOID -> void [152:11] + | |--IDENT -> foo4 [152:16] + | |--LPAREN -> ( [152:20] + | |--PARAMETERS -> PARAMETERS [152:21] + | |--RPAREN -> ) [152:21] + | `--SLIST -> { [152:23] + | |--VARIABLE_DEF -> VARIABLE_DEF [153:8] + | | |--MODIFIERS -> MODIFIERS [153:8] + | | |--TYPE -> TYPE [153:8] + | | | `--LITERAL_INT -> int [153:8] + | | |--IDENT -> a [153:12] + | | `--ASSIGN -> = [153:14] + | | `--EXPR -> EXPR [153:16] + | | `--NUM_INT -> 1 [153:16] + | |--SEMI -> ; [153:17] + | |--LITERAL_SWITCH -> switch [154:8] + | | |--LPAREN -> ( [154:15] + | | |--EXPR -> EXPR [154:16] + | | | `--IDENT -> a [154:16] + | | |--RPAREN -> ) [154:17] + | | |--LCURLY -> { [154:19] + | | |--CASE_GROUP -> CASE_GROUP [155:12] + | | | |--LITERAL_CASE -> case [155:12] + | | | | |--EXPR -> EXPR [155:17] + | | | | | `--NUM_INT -> 1 [155:17] + | | | | `--COLON -> : [155:18] + | | | `--SLIST -> SLIST [156:16] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [156:16] + | | | | |--MODIFIERS -> MODIFIERS [156:16] + | | | | |--TYPE -> TYPE [156:16] + | | | | | `--LITERAL_INT -> int [156:16] + | | | | `--IDENT -> b [156:20] + | | | `--SEMI -> ; [156:21] + | | |--CASE_GROUP -> CASE_GROUP [158:12] + | | | `--LITERAL_DEFAULT -> default [158:12] + | | | `--COLON -> : [158:19] + | | `--RCURLY -> } [159:8] + | `--RCURLY -> } [160:4] + |--METHOD_DEF -> METHOD_DEF [162:4] + | |--MODIFIERS -> MODIFIERS [162:4] + | | `--LITERAL_PUBLIC -> public [162:4] + | |--TYPE -> TYPE [162:11] + | | `--LITERAL_VOID -> void [162:11] + | |--IDENT -> foo5 [162:16] + | |--LPAREN -> ( [162:20] + | |--PARAMETERS -> PARAMETERS [162:21] + | |--RPAREN -> ) [162:21] + | `--SLIST -> { [162:23] + | |--VARIABLE_DEF -> VARIABLE_DEF [163:8] + | | |--MODIFIERS -> MODIFIERS [163:8] + | | |--TYPE -> TYPE [163:8] + | | | `--LITERAL_INT -> int [163:8] + | | |--IDENT -> a [163:12] + | | `--ASSIGN -> = [163:14] + | | `--EXPR -> EXPR [163:16] + | | `--NUM_INT -> 1 [163:16] + | |--SEMI -> ; [163:17] + | |--LITERAL_SWITCH -> switch [164:8] + | | |--LPAREN -> ( [164:15] + | | |--EXPR -> EXPR [164:16] + | | | `--IDENT -> a [164:16] + | | |--RPAREN -> ) [164:17] + | | |--LCURLY -> { [164:19] + | | |--CASE_GROUP -> CASE_GROUP [165:12] + | | | |--LITERAL_CASE -> case [165:12] + | | | | |--EXPR -> EXPR [165:17] + | | | | | `--NUM_INT -> 1 [165:17] + | | | | `--COLON -> : [165:18] + | | | `--SLIST -> SLIST [166:16] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [166:16] + | | | | |--MODIFIERS -> MODIFIERS [166:16] + | | | | |--TYPE -> TYPE [166:16] + | | | | | `--LITERAL_INT -> int [166:16] + | | | | `--IDENT -> b [166:20] + | | | `--SEMI -> ; [166:21] + | | |--CASE_GROUP -> CASE_GROUP [168:12] + | | | `--LITERAL_DEFAULT -> default [168:12] + | | | `--COLON -> : [168:19] + | | `--RCURLY -> } [169:8] + | `--RCURLY -> } [170:4] + |--METHOD_DEF -> METHOD_DEF [172:4] + | |--MODIFIERS -> MODIFIERS [172:4] + | | `--LITERAL_PUBLIC -> public [172:4] + | |--TYPE -> TYPE [172:11] + | | `--LITERAL_VOID -> void [172:11] + | |--IDENT -> foo6 [172:16] + | |--LPAREN -> ( [172:20] + | |--PARAMETERS -> PARAMETERS [172:21] + | |--RPAREN -> ) [172:21] + | `--SLIST -> { [172:23] + | |--VARIABLE_DEF -> VARIABLE_DEF [173:8] + | | |--MODIFIERS -> MODIFIERS [173:8] + | | |--TYPE -> TYPE [173:8] + | | | `--LITERAL_INT -> int [173:8] + | | |--IDENT -> a [173:12] + | | `--ASSIGN -> = [173:14] + | | `--EXPR -> EXPR [173:16] + | | `--NUM_INT -> 1 [173:16] + | |--SEMI -> ; [173:17] + | |--LITERAL_SWITCH -> switch [174:8] + | | |--LPAREN -> ( [174:15] + | | |--EXPR -> EXPR [174:16] + | | | `--IDENT -> a [174:16] + | | |--RPAREN -> ) [174:17] + | | |--LCURLY -> { [174:19] + | | |--CASE_GROUP -> CASE_GROUP [175:12] + | | | |--LITERAL_CASE -> case [175:12] + | | | | |--EXPR -> EXPR [175:17] + | | | | | `--NUM_INT -> 1 [175:17] + | | | | `--COLON -> : [175:18] + | | | `--SLIST -> SLIST [176:16] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [176:16] + | | | | |--MODIFIERS -> MODIFIERS [176:16] + | | | | |--TYPE -> TYPE [176:16] + | | | | | `--LITERAL_INT -> int [176:16] + | | | | `--IDENT -> b [176:20] + | | | `--SEMI -> ; [176:21] + | | |--CASE_GROUP -> CASE_GROUP [178:12] + | | | `--LITERAL_DEFAULT -> default [178:12] + | | | `--COLON -> : [178:19] + | | `--RCURLY -> } [179:8] + | `--RCURLY -> } [180:4] + |--METHOD_DEF -> METHOD_DEF [182:4] + | |--MODIFIERS -> MODIFIERS [182:4] + | | `--LITERAL_PUBLIC -> public [182:4] + | |--TYPE -> TYPE [182:11] + | | `--LITERAL_VOID -> void [182:11] + | |--IDENT -> foo7 [182:16] + | |--LPAREN -> ( [182:20] + | |--PARAMETERS -> PARAMETERS [182:21] + | |--RPAREN -> ) [182:21] + | `--SLIST -> { [182:23] + | |--VARIABLE_DEF -> VARIABLE_DEF [183:8] + | | |--MODIFIERS -> MODIFIERS [183:8] + | | |--TYPE -> TYPE [183:8] + | | | `--LITERAL_INT -> int [183:8] + | | |--IDENT -> a [183:12] + | | `--ASSIGN -> = [183:14] + | | `--EXPR -> EXPR [183:16] + | | `--NUM_INT -> 2 [183:16] + | |--SEMI -> ; [183:17] + | |--VARIABLE_DEF -> VARIABLE_DEF [184:8] + | | |--MODIFIERS -> MODIFIERS [184:8] + | | |--TYPE -> TYPE [184:8] + | | | `--IDENT -> String [184:8] + | | |--IDENT -> s [184:15] + | | `--ASSIGN -> = [184:17] + | | `--EXPR -> EXPR [184:19] + | | `--STRING_LITERAL -> "" [184:19] + | |--SEMI -> ; [184:21] + | |--LITERAL_SWITCH -> switch [185:8] + | | |--LPAREN -> ( [185:15] + | | |--EXPR -> EXPR [185:16] + | | | `--IDENT -> a [185:16] + | | |--RPAREN -> ) [185:17] + | | |--LCURLY -> { [185:19] + | | |--CASE_GROUP -> CASE_GROUP [189:12] + | | | |--LITERAL_CASE -> case [189:12] + | | | | |--EXPR -> EXPR [189:17] + | | | | | `--NUM_INT -> 1 [189:17] + | | | | `--COLON -> : [189:18] + | | | |--LITERAL_CASE -> case [190:12] + | | | | |--EXPR -> EXPR [190:17] + | | | | | `--NUM_INT -> 2 [190:17] + | | | | `--COLON -> : [190:18] + | | | `--SLIST -> SLIST [193:20] + | | | |--EXPR -> EXPR [193:20] + | | | | `--METHOD_CALL -> ( [193:20] + | | | | |--IDENT -> foo1 [193:16] + | | | | |--ELIST -> ELIST [193:21] + | | | | `--RPAREN -> ) [193:21] + | | | `--SEMI -> ; [193:22] + | | |--CASE_GROUP -> CASE_GROUP [195:12] + | | | |--LITERAL_CASE -> case [195:12] + | | | | |--EXPR -> EXPR [195:17] + | | | | | `--NUM_INT -> 3 [195:17] + | | | | `--COLON -> : [195:18] + | | | |--LITERAL_CASE -> case [199:12] + | | | | |--EXPR -> EXPR [199:17] + | | | | | `--NUM_INT -> 4 [199:17] + | | | | `--COLON -> : [199:18] + | | | |--LITERAL_CASE -> case [201:12] + | | | | |--EXPR -> EXPR [201:17] + | | | | | `--NUM_INT -> 5 [201:17] + | | | | `--COLON -> : [201:18] + | | | `--SLIST -> SLIST [202:48] + | | | |--EXPR -> EXPR [202:48] + | | | | `--METHOD_CALL -> ( [202:48] + | | | | |--DOT -> . [202:39] + | | | | | |--METHOD_CALL -> ( [202:37] + | | | | | | |--DOT -> . [202:28] + | | | | | | | |--METHOD_CALL -> ( [202:26] + | | | | | | | | |--DOT -> . [202:17] + | | | | | | | | | |--IDENT -> s [202:16] + | | | | | | | | | `--IDENT -> toString [202:18] + | | | | | | | | |--ELIST -> ELIST [202:27] + | | | | | | | | `--RPAREN -> ) [202:27] + | | | | | | | `--IDENT -> toString [202:29] + | | | | | | |--ELIST -> ELIST [202:38] + | | | | | | `--RPAREN -> ) [202:38] + | | | | | `--IDENT -> toString [202:40] + | | | | |--ELIST -> ELIST [202:49] + | | | | `--RPAREN -> ) [202:49] + | | | `--SEMI -> ; [202:50] + | | |--CASE_GROUP -> CASE_GROUP [206:12] + | | | `--LITERAL_DEFAULT -> default [206:12] + | | | `--COLON -> : [206:19] + | | `--RCURLY -> } [207:8] + | `--RCURLY -> } [208:4] + |--METHOD_DEF -> METHOD_DEF [210:4] + | |--MODIFIERS -> MODIFIERS [210:4] + | | `--LITERAL_PUBLIC -> public [210:4] + | |--TYPE -> TYPE [210:11] + | | `--LITERAL_VOID -> void [210:11] + | |--IDENT -> foo8 [210:16] + | |--LPAREN -> ( [210:20] + | |--PARAMETERS -> PARAMETERS [210:21] + | |--RPAREN -> ) [210:21] + | `--SLIST -> { [210:23] + | |--VARIABLE_DEF -> VARIABLE_DEF [211:8] + | | |--MODIFIERS -> MODIFIERS [211:8] + | | |--TYPE -> TYPE [211:8] + | | | `--LITERAL_INT -> int [211:8] + | | |--IDENT -> a [211:12] + | | `--ASSIGN -> = [211:14] + | | `--EXPR -> EXPR [211:16] + | | `--NUM_INT -> 2 [211:16] + | |--SEMI -> ; [211:17] + | |--VARIABLE_DEF -> VARIABLE_DEF [212:8] + | | |--MODIFIERS -> MODIFIERS [212:8] + | | |--TYPE -> TYPE [212:8] + | | | `--IDENT -> String [212:8] + | | |--IDENT -> s [212:15] + | | `--ASSIGN -> = [212:17] + | | `--EXPR -> EXPR [212:19] + | | `--STRING_LITERAL -> "" [212:19] + | |--SEMI -> ; [212:21] + | |--LITERAL_SWITCH -> switch [213:8] + | | |--LPAREN -> ( [213:15] + | | |--EXPR -> EXPR [213:16] + | | | `--IDENT -> a [213:16] + | | |--RPAREN -> ) [213:17] + | | |--LCURLY -> { [213:19] + | | |--CASE_GROUP -> CASE_GROUP [217:12] + | | | |--LITERAL_CASE -> case [217:12] + | | | | |--EXPR -> EXPR [217:17] + | | | | | `--NUM_INT -> 1 [217:17] + | | | | `--COLON -> : [217:18] + | | | |--LITERAL_CASE -> case [218:12] + | | | | |--EXPR -> EXPR [218:17] + | | | | | `--NUM_INT -> 2 [218:17] + | | | | `--COLON -> : [218:18] + | | | `--SLIST -> SLIST [221:20] + | | | |--EXPR -> EXPR [221:20] + | | | | `--METHOD_CALL -> ( [221:20] + | | | | |--IDENT -> foo1 [221:16] + | | | | |--ELIST -> ELIST [221:21] + | | | | `--RPAREN -> ) [221:21] + | | | `--SEMI -> ; [221:22] + | | |--CASE_GROUP -> CASE_GROUP [223:12] + | | | |--LITERAL_CASE -> case [223:12] + | | | | |--EXPR -> EXPR [223:17] + | | | | | `--NUM_INT -> 3 [223:17] + | | | | `--COLON -> : [223:18] + | | | `--SLIST -> SLIST [226:48] + | | | |--EXPR -> EXPR [226:48] + | | | | `--METHOD_CALL -> ( [226:48] + | | | | |--DOT -> . [226:39] + | | | | | |--METHOD_CALL -> ( [226:37] + | | | | | | |--DOT -> . [226:28] + | | | | | | | |--METHOD_CALL -> ( [226:26] + | | | | | | | | |--DOT -> . [226:17] + | | | | | | | | | |--IDENT -> s [226:16] + | | | | | | | | | `--IDENT -> toString [226:18] + | | | | | | | | |--ELIST -> ELIST [226:27] + | | | | | | | | `--RPAREN -> ) [226:27] + | | | | | | | `--IDENT -> toString [226:29] + | | | | | | |--ELIST -> ELIST [226:38] + | | | | | | `--RPAREN -> ) [226:38] + | | | | | `--IDENT -> toString [226:40] + | | | | |--ELIST -> ELIST [226:49] + | | | | `--RPAREN -> ) [226:49] + | | | `--SEMI -> ; [226:50] + | | |--CASE_GROUP -> CASE_GROUP [228:12] + | | | |--LITERAL_CASE -> case [228:12] + | | | | |--EXPR -> EXPR [228:17] + | | | | | `--NUM_INT -> 4 [228:17] + | | | | `--COLON -> : [228:18] + | | | `--LITERAL_DEFAULT -> default [230:12] + | | | `--COLON -> : [230:19] + | | `--RCURLY -> } [231:8] + | `--RCURLY -> } [232:4] + |--METHOD_DEF -> METHOD_DEF [234:4] + | |--MODIFIERS -> MODIFIERS [234:4] + | | `--LITERAL_PUBLIC -> public [234:4] + | |--TYPE -> TYPE [234:11] + | | `--LITERAL_VOID -> void [234:11] + | |--IDENT -> foo9 [234:16] + | |--LPAREN -> ( [234:20] + | |--PARAMETERS -> PARAMETERS [234:21] + | |--RPAREN -> ) [234:21] + | `--SLIST -> { [234:23] + | |--VARIABLE_DEF -> VARIABLE_DEF [235:8] + | | |--MODIFIERS -> MODIFIERS [235:8] + | | |--TYPE -> TYPE [235:8] + | | | `--LITERAL_INT -> int [235:8] + | | |--IDENT -> a [235:12] + | | `--ASSIGN -> = [235:14] + | | `--EXPR -> EXPR [235:16] + | | `--NUM_INT -> 5 [235:16] + | |--SEMI -> ; [235:17] + | |--LITERAL_SWITCH -> switch [236:8] + | | |--LPAREN -> ( [236:15] + | | |--EXPR -> EXPR [236:16] + | | | `--IDENT -> a [236:16] + | | |--RPAREN -> ) [236:17] + | | |--LCURLY -> { [236:19] + | | |--CASE_GROUP -> CASE_GROUP [237:12] + | | | |--LITERAL_CASE -> case [237:12] + | | | | |--EXPR -> EXPR [237:17] + | | | | | `--NUM_INT -> 1 [237:17] + | | | | `--COLON -> : [237:18] + | | | `--LITERAL_CASE -> case [238:12] + | | | |--EXPR -> EXPR [238:17] + | | | | `--NUM_INT -> 2 [238:17] + | | | `--COLON -> : [238:18] + | | `--RCURLY -> } [240:8] + | `--RCURLY -> } [241:4] + |--METHOD_DEF -> METHOD_DEF [243:4] + | |--MODIFIERS -> MODIFIERS [243:4] + | | `--LITERAL_PUBLIC -> public [243:4] + | |--TYPE -> TYPE [243:11] + | | `--LITERAL_VOID -> void [243:11] + | |--IDENT -> foo10 [243:16] + | |--LPAREN -> ( [243:21] + | |--PARAMETERS -> PARAMETERS [243:22] + | |--RPAREN -> ) [243:22] + | `--SLIST -> { [243:24] + | |--VARIABLE_DEF -> VARIABLE_DEF [244:8] + | | |--MODIFIERS -> MODIFIERS [244:8] + | | |--TYPE -> TYPE [244:8] + | | | `--LITERAL_INT -> int [244:8] + | | |--IDENT -> a [244:12] + | | `--ASSIGN -> = [244:14] + | | `--EXPR -> EXPR [244:16] + | | `--NUM_INT -> 5 [244:16] + | |--SEMI -> ; [244:17] + | |--LITERAL_SWITCH -> switch [245:8] + | | |--LPAREN -> ( [245:15] + | | |--EXPR -> EXPR [245:16] + | | | `--IDENT -> a [245:16] + | | |--RPAREN -> ) [245:17] + | | |--LCURLY -> { [245:19] + | | |--CASE_GROUP -> CASE_GROUP [246:12] + | | | |--LITERAL_CASE -> case [246:12] + | | | | |--EXPR -> EXPR [246:17] + | | | | | `--NUM_INT -> 1 [246:17] + | | | | `--COLON -> : [246:18] + | | | `--LITERAL_DEFAULT -> default [247:12] + | | | `--COLON -> : [247:19] + | | `--RCURLY -> } [249:8] + | `--RCURLY -> } [250:4] + |--METHOD_DEF -> METHOD_DEF [252:4] + | |--MODIFIERS -> MODIFIERS [252:4] + | | `--LITERAL_PUBLIC -> public [252:4] + | |--TYPE -> TYPE [252:11] + | | `--LITERAL_VOID -> void [252:11] + | |--IDENT -> foo11 [252:16] + | |--LPAREN -> ( [252:21] + | |--PARAMETERS -> PARAMETERS [252:22] + | |--RPAREN -> ) [252:22] + | `--SLIST -> { [252:24] + | |--VARIABLE_DEF -> VARIABLE_DEF [253:8] + | | |--MODIFIERS -> MODIFIERS [253:8] + | | |--TYPE -> TYPE [253:8] + | | | `--LITERAL_INT -> int [253:8] + | | |--IDENT -> a [253:12] + | | `--ASSIGN -> = [253:14] + | | `--EXPR -> EXPR [253:16] + | | `--NUM_INT -> 5 [253:16] + | |--SEMI -> ; [253:17] + | |--LITERAL_SWITCH -> switch [254:8] + | | |--LPAREN -> ( [254:15] + | | |--EXPR -> EXPR [254:16] + | | | `--IDENT -> a [254:16] + | | |--RPAREN -> ) [254:17] + | | |--LCURLY -> { [254:19] + | | |--CASE_GROUP -> CASE_GROUP [255:12] + | | | |--LITERAL_CASE -> case [255:12] + | | | | |--EXPR -> EXPR [255:17] + | | | | | `--NUM_INT -> 1 [255:17] + | | | | `--COLON -> : [255:18] + | | | `--LITERAL_CASE -> case [256:12] + | | | |--EXPR -> EXPR [256:17] + | | | | `--NUM_INT -> 2 [256:17] + | | | `--COLON -> : [256:18] + | | `--RCURLY -> } [258:8] + | `--RCURLY -> } [259:4] + |--METHOD_DEF -> METHOD_DEF [261:4] + | |--MODIFIERS -> MODIFIERS [261:4] + | | `--LITERAL_PUBLIC -> public [261:4] + | |--TYPE -> TYPE [261:11] + | | `--LITERAL_VOID -> void [261:11] + | |--IDENT -> foo12 [261:16] + | |--LPAREN -> ( [261:21] + | |--PARAMETERS -> PARAMETERS [261:22] + | |--RPAREN -> ) [261:22] + | `--SLIST -> { [261:24] + | |--VARIABLE_DEF -> VARIABLE_DEF [262:8] + | | |--MODIFIERS -> MODIFIERS [262:8] + | | |--TYPE -> TYPE [262:8] + | | | `--LITERAL_INT -> int [262:8] + | | |--IDENT -> a [262:12] + | | `--ASSIGN -> = [262:14] + | | `--EXPR -> EXPR [262:16] + | | `--NUM_INT -> 5 [262:16] + | |--SEMI -> ; [262:17] + | |--LITERAL_SWITCH -> switch [263:8] + | | |--LPAREN -> ( [263:15] + | | |--EXPR -> EXPR [263:16] + | | | `--IDENT -> a [263:16] + | | |--RPAREN -> ) [263:17] + | | |--LCURLY -> { [263:19] + | | |--CASE_GROUP -> CASE_GROUP [265:12] + | | | `--LITERAL_CASE -> case [265:12] + | | | |--EXPR -> EXPR [265:17] + | | | | `--NUM_INT -> 1 [265:17] + | | | `--COLON -> : [265:18] + | | `--RCURLY -> } [266:8] + | `--RCURLY -> } [267:4] + `--RCURLY -> } [268:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTrickySwitchWithComments.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTrickySwitchWithComments.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTrickySwitchWithComments.java @@ -0,0 +1,276 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +public class InputAntlr4AstRegressionTrickySwitchWithComments { + + /** + * Javadoc here. + */ + private static void fooSwitch() { + switch("") { + case "0": //some comment + case "1": + // my comment + foo1(); + break; + case "2": + // my comment + //comment + foo1(); + // comment + break; + case "3": + /* // warn */ + foo1(); + /* com */ + break; + case "5": + foo1(); + // warn + case "6": + int k = 7; + // fall through + case "7": + if (true) {} + // warn + case "8": + break; + case "9": + foo1(); + // fall through + case "10": { + if (true) {} + // fall through + } + case "11": { + // fall through + } + case "28": { + // fall through + } + case "12": { + // warn + int i; + } + case "13": { + // some comment in empty case block + } + case "14": { + // warn + } + case "15": { + foo1(); + // warn + } + case "16": { + int a; + } + // fall through + case "17": { + int a; + } + // warn + case "18": { System.lineSeparator(); + } // trailing comment + case "19": + // comment + case "20": + // comment + case "21": + default: + // comment + break; + } + } + + private static void foo1() { + if (true) { + switch(1) { + case 0: + + case 1: + // warn + int b = 10; + default: + // comment + } + + } + } + /** Single line javadoc here */ + public void fooDotInCaseBlock() { + int i = 0; + String s = ""; + + switch (i) { + case -2: + // what + i++; + // no break here + case 0: + // what + s.indexOf("ignore"); + // no break here + case -1: + // what + s.indexOf("no way"); + // warn + case 1: + case 2: + i--; + // no break here + case 3: { } + // fall through + + + } + + String breaks = "" + // warn + + "</table>" + // middle + + "" + // end + ; + } + + /** + * Javadoc here. + * + */ + public void foo2() { + int a = 1; + switch (a) { + case 1/*block comment + */: + default: + // warn + } + } + + public void foo3() { + int a =/*Block comment here */ 1; + switch (a) { + case 1: + default: + + // comment + } + } + + public void foo4() { + int a = 1; + switch (a) { + case 1: + int b; + // warn + default: + } + } + + public void foo5() { + int a = 1; + switch (a) { + case 1: + int b; + // comment + default: + } + } + + public void foo6() { + int a = 1; + switch (a) { + case 1: + int b; + // comment + default: + } + } + + public void foo7() { + int a = 2; + String s = ""; + switch (a) { + // comment + // comment + // comment + case 1: + case 2: + // comment + // comment + foo1(); + // comment + case 3: + // comment + // comment + // comment + case 4: + // warn + case 5: + s.toString().toString().toString(); + // warn + // warn + // warn + default: + } + } + + public void foo8() { + int a = 2; + String s = ""; + switch (a) { + // comment + // comment + // comment + case 1: + case 2: + // comment + // comment + foo1(); + // comment + case 3: + // comment + // comment + s.toString().toString().toString(); + // comment + case 4: + // warn + default: + } + } + + public void foo9() { + int a = 5; + switch (a) { + case 1: + case 2: + // comment + } + } + + public void foo10() { + int a = 5; + switch (a) { + case 1: + default: + // comment + } + } + + public void foo11() { + int a = 5; + switch (a) { + case 1: + case 2: + // comment + } + } + + public void foo12() { + int a = 5; + switch (a) { + // comment + case 1: + } + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTrickySwitchWithComments.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTrickySwitchWithComments.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTrickySwitchWithComments.txt @@ -0,0 +1,1104 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +CLASS_DEF -> CLASS_DEF [3:0] +|--MODIFIERS -> MODIFIERS [3:0] +| `--LITERAL_PUBLIC -> public [3:0] +|--LITERAL_CLASS -> class [3:7] +|--IDENT -> InputAntlr4AstRegressionTrickySwitchWithComments [3:13] +`--OBJBLOCK -> OBJBLOCK [3:62] + |--LCURLY -> { [3:62] + |--METHOD_DEF -> METHOD_DEF [8:4] + | |--MODIFIERS -> MODIFIERS [8:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [5:4] + | | | |--COMMENT_CONTENT -> *\n * Javadoc here.\n [5:6] + | | | `--BLOCK_COMMENT_END -> */ [7:5] + | | |--LITERAL_PRIVATE -> private [8:4] + | | `--LITERAL_STATIC -> static [8:12] + | |--TYPE -> TYPE [8:19] + | | `--LITERAL_VOID -> void [8:19] + | |--IDENT -> fooSwitch [8:24] + | |--LPAREN -> ( [8:33] + | |--PARAMETERS -> PARAMETERS [8:34] + | |--RPAREN -> ) [8:34] + | `--SLIST -> { [8:36] + | |--LITERAL_SWITCH -> switch [9:8] + | | |--LPAREN -> ( [9:14] + | | |--EXPR -> EXPR [9:15] + | | | `--STRING_LITERAL -> "" [9:15] + | | |--RPAREN -> ) [9:17] + | | |--LCURLY -> { [9:19] + | | |--CASE_GROUP -> CASE_GROUP [10:12] + | | | |--LITERAL_CASE -> case [10:12] + | | | | |--EXPR -> EXPR [10:17] + | | | | | `--STRING_LITERAL -> "0" [10:17] + | | | | `--COLON -> : [10:20] + | | | |--SINGLE_LINE_COMMENT -> // [10:22] + | | | | `--COMMENT_CONTENT -> some comment\n [10:24] + | | | |--LITERAL_CASE -> case [11:12] + | | | | |--EXPR -> EXPR [11:17] + | | | | | `--STRING_LITERAL -> "1" [11:17] + | | | | `--COLON -> : [11:20] + | | | `--SLIST -> SLIST [13:20] + | | | |--EXPR -> EXPR [13:20] + | | | | `--METHOD_CALL -> ( [13:20] + | | | | |--SINGLE_LINE_COMMENT -> // [12:16] + | | | | | `--COMMENT_CONTENT -> my comment\n [12:18] + | | | | |--IDENT -> foo1 [13:16] + | | | | |--ELIST -> ELIST [13:21] + | | | | `--RPAREN -> ) [13:21] + | | | |--SEMI -> ; [13:22] + | | | `--LITERAL_BREAK -> break [14:16] + | | | `--SEMI -> ; [14:21] + | | |--CASE_GROUP -> CASE_GROUP [15:12] + | | | |--LITERAL_CASE -> case [15:12] + | | | | |--EXPR -> EXPR [15:17] + | | | | | `--STRING_LITERAL -> "2" [15:17] + | | | | `--COLON -> : [15:20] + | | | `--SLIST -> SLIST [18:20] + | | | |--EXPR -> EXPR [18:20] + | | | | `--METHOD_CALL -> ( [18:20] + | | | | |--SINGLE_LINE_COMMENT -> // [16:16] + | | | | | `--COMMENT_CONTENT -> my comment\n [16:18] + | | | | |--SINGLE_LINE_COMMENT -> // [17:16] + | | | | | `--COMMENT_CONTENT -> comment\n [17:18] + | | | | |--IDENT -> foo1 [18:16] + | | | | |--ELIST -> ELIST [18:21] + | | | | `--RPAREN -> ) [18:21] + | | | |--SEMI -> ; [18:22] + | | | |--SINGLE_LINE_COMMENT -> // [19:16] + | | | | `--COMMENT_CONTENT -> comment\n [19:18] + | | | `--LITERAL_BREAK -> break [20:16] + | | | `--SEMI -> ; [20:21] + | | |--CASE_GROUP -> CASE_GROUP [21:12] + | | | |--LITERAL_CASE -> case [21:12] + | | | | |--EXPR -> EXPR [21:17] + | | | | | `--STRING_LITERAL -> "3" [21:17] + | | | | `--COLON -> : [21:20] + | | | `--SLIST -> SLIST [23:20] + | | | |--EXPR -> EXPR [23:20] + | | | | `--METHOD_CALL -> ( [23:20] + | | | | |--BLOCK_COMMENT_BEGIN -> /* [22:12] + | | | | | |--COMMENT_CONTENT -> // warn [22:14] + | | | | | `--BLOCK_COMMENT_END -> */ [22:22] + | | | | |--IDENT -> foo1 [23:16] + | | | | |--ELIST -> ELIST [23:21] + | | | | `--RPAREN -> ) [23:21] + | | | |--SEMI -> ; [23:22] + | | | |--BLOCK_COMMENT_BEGIN -> /* [24:16] + | | | | |--COMMENT_CONTENT -> com [24:18] + | | | | `--BLOCK_COMMENT_END -> */ [24:22] + | | | `--LITERAL_BREAK -> break [25:16] + | | | `--SEMI -> ; [25:21] + | | |--CASE_GROUP -> CASE_GROUP [26:12] + | | | |--LITERAL_CASE -> case [26:12] + | | | | |--EXPR -> EXPR [26:17] + | | | | | `--STRING_LITERAL -> "5" [26:17] + | | | | `--COLON -> : [26:20] + | | | `--SLIST -> SLIST [27:20] + | | | |--EXPR -> EXPR [27:20] + | | | | `--METHOD_CALL -> ( [27:20] + | | | | |--IDENT -> foo1 [27:16] + | | | | |--ELIST -> ELIST [27:21] + | | | | `--RPAREN -> ) [27:21] + | | | `--SEMI -> ; [27:22] + | | |--CASE_GROUP -> CASE_GROUP [29:12] + | | | |--SINGLE_LINE_COMMENT -> // [28:19] + | | | | `--COMMENT_CONTENT -> warn\n [28:21] + | | | |--LITERAL_CASE -> case [29:12] + | | | | |--EXPR -> EXPR [29:17] + | | | | | `--STRING_LITERAL -> "6" [29:17] + | | | | `--COLON -> : [29:20] + | | | `--SLIST -> SLIST [30:16] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [30:16] + | | | | |--MODIFIERS -> MODIFIERS [30:16] + | | | | |--TYPE -> TYPE [30:16] + | | | | | `--LITERAL_INT -> int [30:16] + | | | | |--IDENT -> k [30:20] + | | | | `--ASSIGN -> = [30:22] + | | | | `--EXPR -> EXPR [30:24] + | | | | `--NUM_INT -> 7 [30:24] + | | | `--SEMI -> ; [30:25] + | | |--CASE_GROUP -> CASE_GROUP [32:12] + | | | |--SINGLE_LINE_COMMENT -> // [31:16] + | | | | `--COMMENT_CONTENT -> fall through\n [31:18] + | | | |--LITERAL_CASE -> case [32:12] + | | | | |--EXPR -> EXPR [32:17] + | | | | | `--STRING_LITERAL -> "7" [32:17] + | | | | `--COLON -> : [32:20] + | | | `--SLIST -> SLIST [33:16] + | | | `--LITERAL_IF -> if [33:16] + | | | |--LPAREN -> ( [33:19] + | | | |--EXPR -> EXPR [33:20] + | | | | `--LITERAL_TRUE -> true [33:20] + | | | |--RPAREN -> ) [33:24] + | | | `--SLIST -> { [33:26] + | | | `--RCURLY -> } [33:27] + | | |--CASE_GROUP -> CASE_GROUP [35:12] + | | | |--SINGLE_LINE_COMMENT -> // [34:19] + | | | | `--COMMENT_CONTENT -> warn\n [34:21] + | | | |--LITERAL_CASE -> case [35:12] + | | | | |--EXPR -> EXPR [35:17] + | | | | | `--STRING_LITERAL -> "8" [35:17] + | | | | `--COLON -> : [35:20] + | | | `--SLIST -> SLIST [36:16] + | | | `--LITERAL_BREAK -> break [36:16] + | | | `--SEMI -> ; [36:21] + | | |--CASE_GROUP -> CASE_GROUP [37:12] + | | | |--LITERAL_CASE -> case [37:12] + | | | | |--EXPR -> EXPR [37:17] + | | | | | `--STRING_LITERAL -> "9" [37:17] + | | | | `--COLON -> : [37:20] + | | | `--SLIST -> SLIST [38:20] + | | | |--EXPR -> EXPR [38:20] + | | | | `--METHOD_CALL -> ( [38:20] + | | | | |--IDENT -> foo1 [38:16] + | | | | |--ELIST -> ELIST [38:21] + | | | | `--RPAREN -> ) [38:21] + | | | `--SEMI -> ; [38:22] + | | |--CASE_GROUP -> CASE_GROUP [40:12] + | | | |--SINGLE_LINE_COMMENT -> // [39:16] + | | | | `--COMMENT_CONTENT -> fall through\n [39:18] + | | | |--LITERAL_CASE -> case [40:12] + | | | | |--EXPR -> EXPR [40:17] + | | | | | `--STRING_LITERAL -> "10" [40:17] + | | | | `--COLON -> : [40:21] + | | | `--SLIST -> SLIST [40:23] + | | | `--SLIST -> { [40:23] + | | | |--LITERAL_IF -> if [41:16] + | | | | |--LPAREN -> ( [41:19] + | | | | |--EXPR -> EXPR [41:20] + | | | | | `--LITERAL_TRUE -> true [41:20] + | | | | |--RPAREN -> ) [41:24] + | | | | `--SLIST -> { [41:26] + | | | | `--RCURLY -> } [41:27] + | | | |--SINGLE_LINE_COMMENT -> // [42:16] + | | | | `--COMMENT_CONTENT -> fall through\n [42:18] + | | | `--RCURLY -> } [43:12] + | | |--CASE_GROUP -> CASE_GROUP [44:12] + | | | |--LITERAL_CASE -> case [44:12] + | | | | |--EXPR -> EXPR [44:17] + | | | | | `--STRING_LITERAL -> "11" [44:17] + | | | | `--COLON -> : [44:21] + | | | `--SLIST -> SLIST [44:23] + | | | `--SLIST -> { [44:23] + | | | |--SINGLE_LINE_COMMENT -> // [45:12] + | | | | `--COMMENT_CONTENT -> fall through\n [45:14] + | | | `--RCURLY -> } [46:12] + | | |--CASE_GROUP -> CASE_GROUP [47:12] + | | | |--LITERAL_CASE -> case [47:12] + | | | | |--EXPR -> EXPR [47:17] + | | | | | `--STRING_LITERAL -> "28" [47:17] + | | | | `--COLON -> : [47:21] + | | | `--SLIST -> SLIST [47:23] + | | | `--SLIST -> { [47:23] + | | | |--SINGLE_LINE_COMMENT -> // [48:16] + | | | | `--COMMENT_CONTENT -> fall through\n [48:18] + | | | `--RCURLY -> } [49:12] + | | |--CASE_GROUP -> CASE_GROUP [50:12] + | | | |--LITERAL_CASE -> case [50:12] + | | | | |--EXPR -> EXPR [50:17] + | | | | | `--STRING_LITERAL -> "12" [50:17] + | | | | `--COLON -> : [50:21] + | | | `--SLIST -> SLIST [50:23] + | | | `--SLIST -> { [50:23] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [52:16] + | | | | |--MODIFIERS -> MODIFIERS [52:16] + | | | | |--TYPE -> TYPE [52:16] + | | | | | |--SINGLE_LINE_COMMENT -> // [51:6] + | | | | | | `--COMMENT_CONTENT -> warn\n [51:8] + | | | | | `--LITERAL_INT -> int [52:16] + | | | | `--IDENT -> i [52:20] + | | | |--SEMI -> ; [52:21] + | | | `--RCURLY -> } [53:12] + | | |--CASE_GROUP -> CASE_GROUP [54:12] + | | | |--LITERAL_CASE -> case [54:12] + | | | | |--EXPR -> EXPR [54:17] + | | | | | `--STRING_LITERAL -> "13" [54:17] + | | | | `--COLON -> : [54:21] + | | | `--SLIST -> SLIST [54:23] + | | | `--SLIST -> { [54:23] + | | | |--SINGLE_LINE_COMMENT -> // [55:23] + | | | | `--COMMENT_CONTENT -> some comment in empty case block\n [55:25] + | | | `--RCURLY -> } [56:12] + | | |--CASE_GROUP -> CASE_GROUP [57:12] + | | | |--LITERAL_CASE -> case [57:12] + | | | | |--EXPR -> EXPR [57:17] + | | | | | `--STRING_LITERAL -> "14" [57:17] + | | | | `--COLON -> : [57:21] + | | | `--SLIST -> SLIST [57:23] + | | | `--SLIST -> { [57:23] + | | | |--SINGLE_LINE_COMMENT -> // [58:8] + | | | | `--COMMENT_CONTENT -> warn\n [58:10] + | | | `--RCURLY -> } [59:12] + | | |--CASE_GROUP -> CASE_GROUP [60:12] + | | | |--LITERAL_CASE -> case [60:12] + | | | | |--EXPR -> EXPR [60:17] + | | | | | `--STRING_LITERAL -> "15" [60:17] + | | | | `--COLON -> : [60:21] + | | | `--SLIST -> SLIST [60:23] + | | | `--SLIST -> { [60:23] + | | | |--EXPR -> EXPR [61:20] + | | | | `--METHOD_CALL -> ( [61:20] + | | | | |--IDENT -> foo1 [61:16] + | | | | |--ELIST -> ELIST [61:21] + | | | | `--RPAREN -> ) [61:21] + | | | |--SEMI -> ; [61:22] + | | | |--SINGLE_LINE_COMMENT -> // [62:22] + | | | | `--COMMENT_CONTENT -> warn\n [62:24] + | | | `--RCURLY -> } [63:12] + | | |--CASE_GROUP -> CASE_GROUP [64:12] + | | | |--LITERAL_CASE -> case [64:12] + | | | | |--EXPR -> EXPR [64:17] + | | | | | `--STRING_LITERAL -> "16" [64:17] + | | | | `--COLON -> : [64:21] + | | | `--SLIST -> SLIST [64:23] + | | | `--SLIST -> { [64:23] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [65:16] + | | | | |--MODIFIERS -> MODIFIERS [65:16] + | | | | |--TYPE -> TYPE [65:16] + | | | | | `--LITERAL_INT -> int [65:16] + | | | | `--IDENT -> a [65:20] + | | | |--SEMI -> ; [65:21] + | | | `--RCURLY -> } [66:12] + | | |--CASE_GROUP -> CASE_GROUP [68:12] + | | | |--SINGLE_LINE_COMMENT -> // [67:12] + | | | | `--COMMENT_CONTENT -> fall through\n [67:14] + | | | |--LITERAL_CASE -> case [68:12] + | | | | |--EXPR -> EXPR [68:17] + | | | | | `--STRING_LITERAL -> "17" [68:17] + | | | | `--COLON -> : [68:21] + | | | `--SLIST -> SLIST [68:23] + | | | `--SLIST -> { [68:23] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [69:16] + | | | | |--MODIFIERS -> MODIFIERS [69:16] + | | | | |--TYPE -> TYPE [69:16] + | | | | | `--LITERAL_INT -> int [69:16] + | | | | `--IDENT -> a [69:20] + | | | |--SEMI -> ; [69:21] + | | | `--RCURLY -> } [70:12] + | | |--CASE_GROUP -> CASE_GROUP [72:16] + | | | |--SINGLE_LINE_COMMENT -> // [71:14] + | | | | `--COMMENT_CONTENT -> warn\n [71:16] + | | | |--LITERAL_CASE -> case [72:16] + | | | | |--EXPR -> EXPR [72:21] + | | | | | `--STRING_LITERAL -> "18" [72:21] + | | | | `--COLON -> : [72:25] + | | | `--SLIST -> SLIST [72:27] + | | | `--SLIST -> { [72:27] + | | | |--EXPR -> EXPR [72:49] + | | | | `--METHOD_CALL -> ( [72:49] + | | | | |--DOT -> . [72:35] + | | | | | |--IDENT -> System [72:29] + | | | | | `--IDENT -> lineSeparator [72:36] + | | | | |--ELIST -> ELIST [72:50] + | | | | `--RPAREN -> ) [72:50] + | | | |--SEMI -> ; [72:51] + | | | `--RCURLY -> } [73:16] + | | |--CASE_GROUP -> CASE_GROUP [74:12] + | | | |--SINGLE_LINE_COMMENT -> // [73:20] + | | | | `--COMMENT_CONTENT -> trailing comment\n [73:22] + | | | |--LITERAL_CASE -> case [74:12] + | | | | |--EXPR -> EXPR [74:17] + | | | | | `--STRING_LITERAL -> "19" [74:17] + | | | | `--COLON -> : [74:21] + | | | |--SINGLE_LINE_COMMENT -> // [75:16] + | | | | `--COMMENT_CONTENT -> comment\n [75:18] + | | | |--LITERAL_CASE -> case [76:12] + | | | | |--EXPR -> EXPR [76:17] + | | | | | `--STRING_LITERAL -> "20" [76:17] + | | | | `--COLON -> : [76:21] + | | | |--SINGLE_LINE_COMMENT -> // [77:12] + | | | | `--COMMENT_CONTENT -> comment\n [77:14] + | | | |--LITERAL_CASE -> case [78:12] + | | | | |--EXPR -> EXPR [78:17] + | | | | | `--STRING_LITERAL -> "21" [78:17] + | | | | `--COLON -> : [78:21] + | | | |--LITERAL_DEFAULT -> default [79:12] + | | | | `--COLON -> : [79:19] + | | | `--SLIST -> SLIST [81:16] + | | | |--SINGLE_LINE_COMMENT -> // [80:16] + | | | | `--COMMENT_CONTENT -> comment\n [80:18] + | | | `--LITERAL_BREAK -> break [81:16] + | | | `--SEMI -> ; [81:21] + | | `--RCURLY -> } [82:8] + | `--RCURLY -> } [83:4] + |--METHOD_DEF -> METHOD_DEF [85:4] + | |--MODIFIERS -> MODIFIERS [85:4] + | | |--LITERAL_PRIVATE -> private [85:4] + | | `--LITERAL_STATIC -> static [85:12] + | |--TYPE -> TYPE [85:19] + | | `--LITERAL_VOID -> void [85:19] + | |--IDENT -> foo1 [85:24] + | |--LPAREN -> ( [85:28] + | |--PARAMETERS -> PARAMETERS [85:29] + | |--RPAREN -> ) [85:29] + | `--SLIST -> { [85:31] + | |--LITERAL_IF -> if [86:8] + | | |--LPAREN -> ( [86:11] + | | |--EXPR -> EXPR [86:12] + | | | `--LITERAL_TRUE -> true [86:12] + | | |--RPAREN -> ) [86:16] + | | `--SLIST -> { [86:18] + | | |--LITERAL_SWITCH -> switch [87:12] + | | | |--LPAREN -> ( [87:18] + | | | |--EXPR -> EXPR [87:19] + | | | | `--NUM_INT -> 1 [87:19] + | | | |--RPAREN -> ) [87:20] + | | | |--LCURLY -> { [87:22] + | | | |--CASE_GROUP -> CASE_GROUP [88:16] + | | | | |--LITERAL_CASE -> case [88:16] + | | | | | |--EXPR -> EXPR [88:21] + | | | | | | `--NUM_INT -> 0 [88:21] + | | | | | `--COLON -> : [88:22] + | | | | |--LITERAL_CASE -> case [90:16] + | | | | | |--EXPR -> EXPR [90:21] + | | | | | | `--NUM_INT -> 1 [90:21] + | | | | | `--COLON -> : [90:22] + | | | | `--SLIST -> SLIST [92:20] + | | | | |--VARIABLE_DEF -> VARIABLE_DEF [92:20] + | | | | | |--MODIFIERS -> MODIFIERS [92:20] + | | | | | |--TYPE -> TYPE [92:20] + | | | | | | |--SINGLE_LINE_COMMENT -> // [91:24] + | | | | | | | `--COMMENT_CONTENT -> warn\n [91:26] + | | | | | | `--LITERAL_INT -> int [92:20] + | | | | | |--IDENT -> b [92:24] + | | | | | `--ASSIGN -> = [92:26] + | | | | | `--EXPR -> EXPR [92:28] + | | | | | `--NUM_INT -> 10 [92:28] + | | | | `--SEMI -> ; [92:30] + | | | |--CASE_GROUP -> CASE_GROUP [93:16] + | | | | `--LITERAL_DEFAULT -> default [93:16] + | | | | `--COLON -> : [93:23] + | | | |--SINGLE_LINE_COMMENT -> // [94:17] + | | | | `--COMMENT_CONTENT -> comment\n [94:19] + | | | `--RCURLY -> } [95:12] + | | `--RCURLY -> } [97:8] + | `--RCURLY -> } [98:4] + |--METHOD_DEF -> METHOD_DEF [100:4] + | |--MODIFIERS -> MODIFIERS [100:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [99:4] + | | | |--COMMENT_CONTENT -> * Single line javadoc here [99:6] + | | | `--BLOCK_COMMENT_END -> */ [99:32] + | | `--LITERAL_PUBLIC -> public [100:4] + | |--TYPE -> TYPE [100:11] + | | `--LITERAL_VOID -> void [100:11] + | |--IDENT -> fooDotInCaseBlock [100:16] + | |--LPAREN -> ( [100:33] + | |--PARAMETERS -> PARAMETERS [100:34] + | |--RPAREN -> ) [100:34] + | `--SLIST -> { [100:36] + | |--VARIABLE_DEF -> VARIABLE_DEF [101:8] + | | |--MODIFIERS -> MODIFIERS [101:8] + | | |--TYPE -> TYPE [101:8] + | | | `--LITERAL_INT -> int [101:8] + | | |--IDENT -> i [101:12] + | | `--ASSIGN -> = [101:14] + | | `--EXPR -> EXPR [101:16] + | | `--NUM_INT -> 0 [101:16] + | |--SEMI -> ; [101:17] + | |--VARIABLE_DEF -> VARIABLE_DEF [102:8] + | | |--MODIFIERS -> MODIFIERS [102:8] + | | |--TYPE -> TYPE [102:8] + | | | `--IDENT -> String [102:8] + | | |--IDENT -> s [102:15] + | | `--ASSIGN -> = [102:17] + | | `--EXPR -> EXPR [102:19] + | | `--STRING_LITERAL -> "" [102:19] + | |--SEMI -> ; [102:21] + | |--LITERAL_SWITCH -> switch [104:8] + | | |--LPAREN -> ( [104:15] + | | |--EXPR -> EXPR [104:16] + | | | `--IDENT -> i [104:16] + | | |--RPAREN -> ) [104:17] + | | |--LCURLY -> { [104:19] + | | |--CASE_GROUP -> CASE_GROUP [105:12] + | | | |--LITERAL_CASE -> case [105:12] + | | | | |--EXPR -> EXPR [105:17] + | | | | | `--UNARY_MINUS -> - [105:17] + | | | | | `--NUM_INT -> 2 [105:18] + | | | | `--COLON -> : [105:19] + | | | `--SLIST -> SLIST [107:17] + | | | |--EXPR -> EXPR [107:17] + | | | | `--POST_INC -> ++ [107:17] + | | | | |--SINGLE_LINE_COMMENT -> // [106:16] + | | | | | `--COMMENT_CONTENT -> what\n [106:18] + | | | | `--IDENT -> i [107:16] + | | | `--SEMI -> ; [107:19] + | | |--CASE_GROUP -> CASE_GROUP [109:12] + | | | |--SINGLE_LINE_COMMENT -> // [108:16] + | | | | `--COMMENT_CONTENT -> no break here\n [108:18] + | | | |--LITERAL_CASE -> case [109:12] + | | | | |--EXPR -> EXPR [109:17] + | | | | | `--NUM_INT -> 0 [109:17] + | | | | `--COLON -> : [109:18] + | | | `--SLIST -> SLIST [111:25] + | | | |--EXPR -> EXPR [111:25] + | | | | `--METHOD_CALL -> ( [111:25] + | | | | |--DOT -> . [111:17] + | | | | | |--SINGLE_LINE_COMMENT -> // [110:16] + | | | | | | `--COMMENT_CONTENT -> what\n [110:18] + | | | | | |--IDENT -> s [111:16] + | | | | | `--IDENT -> indexOf [111:18] + | | | | |--ELIST -> ELIST [111:26] + | | | | | `--EXPR -> EXPR [111:26] + | | | | | `--STRING_LITERAL -> "ignore" [111:26] + | | | | `--RPAREN -> ) [111:34] + | | | `--SEMI -> ; [111:35] + | | |--CASE_GROUP -> CASE_GROUP [113:12] + | | | |--SINGLE_LINE_COMMENT -> // [112:16] + | | | | `--COMMENT_CONTENT -> no break here\n [112:18] + | | | |--LITERAL_CASE -> case [113:12] + | | | | |--EXPR -> EXPR [113:17] + | | | | | `--UNARY_MINUS -> - [113:17] + | | | | | `--NUM_INT -> 1 [113:18] + | | | | `--COLON -> : [113:19] + | | | `--SLIST -> SLIST [115:26] + | | | |--EXPR -> EXPR [115:26] + | | | | `--METHOD_CALL -> ( [115:26] + | | | | |--DOT -> . [115:18] + | | | | | |--SINGLE_LINE_COMMENT -> // [114:17] + | | | | | | `--COMMENT_CONTENT -> what\n [114:19] + | | | | | |--IDENT -> s [115:17] + | | | | | `--IDENT -> indexOf [115:19] + | | | | |--ELIST -> ELIST [115:27] + | | | | | `--EXPR -> EXPR [115:27] + | | | | | `--STRING_LITERAL -> "no way" [115:27] + | | | | `--RPAREN -> ) [115:35] + | | | `--SEMI -> ; [115:36] + | | |--CASE_GROUP -> CASE_GROUP [117:12] + | | | |--SINGLE_LINE_COMMENT -> // [116:15] + | | | | `--COMMENT_CONTENT -> warn\n [116:17] + | | | |--LITERAL_CASE -> case [117:12] + | | | | |--EXPR -> EXPR [117:17] + | | | | | `--NUM_INT -> 1 [117:17] + | | | | `--COLON -> : [117:18] + | | | |--LITERAL_CASE -> case [118:12] + | | | | |--EXPR -> EXPR [118:17] + | | | | | `--NUM_INT -> 2 [118:17] + | | | | `--COLON -> : [118:18] + | | | `--SLIST -> SLIST [119:17] + | | | |--EXPR -> EXPR [119:17] + | | | | `--POST_DEC -> -- [119:17] + | | | | `--IDENT -> i [119:16] + | | | `--SEMI -> ; [119:19] + | | |--CASE_GROUP -> CASE_GROUP [121:12] + | | | |--SINGLE_LINE_COMMENT -> // [120:16] + | | | | `--COMMENT_CONTENT -> no break here\n [120:18] + | | | |--LITERAL_CASE -> case [121:12] + | | | | |--EXPR -> EXPR [121:17] + | | | | | `--NUM_INT -> 3 [121:17] + | | | | `--COLON -> : [121:18] + | | | `--SLIST -> SLIST [121:20] + | | | `--SLIST -> { [121:20] + | | | `--RCURLY -> } [121:22] + | | |--SINGLE_LINE_COMMENT -> // [122:12] + | | | `--COMMENT_CONTENT -> fall through\n [122:14] + | | `--RCURLY -> } [125:8] + | |--VARIABLE_DEF -> VARIABLE_DEF [127:8] + | | |--MODIFIERS -> MODIFIERS [127:8] + | | |--TYPE -> TYPE [127:8] + | | | `--IDENT -> String [127:8] + | | |--IDENT -> breaks [127:15] + | | `--ASSIGN -> = [127:22] + | | `--EXPR -> EXPR [131:12] + | | |--SINGLE_LINE_COMMENT -> // [130:12] + | | | `--COMMENT_CONTENT -> middle\n [130:14] + | | `--PLUS -> + [131:12] + | | |--SINGLE_LINE_COMMENT -> // [128:8] + | | | `--COMMENT_CONTENT -> warn\n [128:10] + | | |--PLUS -> + [129:12] + | | | |--STRING_LITERAL -> "" [127:24] + | | | `--STRING_LITERAL -> "</table>" [129:14] + | | `--STRING_LITERAL -> "" [131:14] + | |--SINGLE_LINE_COMMENT -> // [132:8] + | | `--COMMENT_CONTENT -> end\n [132:10] + | |--SEMI -> ; [133:8] + | `--RCURLY -> } [134:4] + |--METHOD_DEF -> METHOD_DEF [140:4] + | |--MODIFIERS -> MODIFIERS [140:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [136:4] + | | | |--COMMENT_CONTENT -> *\n * Javadoc here.\n *\n [136:6] + | | | `--BLOCK_COMMENT_END -> */ [139:5] + | | `--LITERAL_PUBLIC -> public [140:4] + | |--TYPE -> TYPE [140:11] + | | `--LITERAL_VOID -> void [140:11] + | |--IDENT -> foo2 [140:16] + | |--LPAREN -> ( [140:20] + | |--PARAMETERS -> PARAMETERS [140:21] + | |--RPAREN -> ) [140:21] + | `--SLIST -> { [140:23] + | |--VARIABLE_DEF -> VARIABLE_DEF [141:8] + | | |--MODIFIERS -> MODIFIERS [141:8] + | | |--TYPE -> TYPE [141:8] + | | | `--LITERAL_INT -> int [141:8] + | | |--IDENT -> a [141:12] + | | `--ASSIGN -> = [141:14] + | | `--EXPR -> EXPR [141:16] + | | `--NUM_INT -> 1 [141:16] + | |--SEMI -> ; [141:17] + | |--LITERAL_SWITCH -> switch [142:8] + | | |--LPAREN -> ( [142:15] + | | |--EXPR -> EXPR [142:16] + | | | `--IDENT -> a [142:16] + | | |--RPAREN -> ) [142:17] + | | |--LCURLY -> { [142:19] + | | |--CASE_GROUP -> CASE_GROUP [143:12] + | | | |--LITERAL_CASE -> case [143:12] + | | | | |--EXPR -> EXPR [143:17] + | | | | | `--NUM_INT -> 1 [143:17] + | | | | |--BLOCK_COMMENT_BEGIN -> /* [143:18] + | | | | | |--COMMENT_CONTENT -> block comment\n [143:20] + | | | | | `--BLOCK_COMMENT_END -> */ [144:12] + | | | | `--COLON -> : [144:14] + | | | `--LITERAL_DEFAULT -> default [145:12] + | | | `--COLON -> : [145:19] + | | |--SINGLE_LINE_COMMENT -> // [146:4] + | | | `--COMMENT_CONTENT -> warn\n [146:6] + | | `--RCURLY -> } [147:8] + | `--RCURLY -> } [148:4] + |--METHOD_DEF -> METHOD_DEF [150:4] + | |--MODIFIERS -> MODIFIERS [150:4] + | | `--LITERAL_PUBLIC -> public [150:4] + | |--TYPE -> TYPE [150:11] + | | `--LITERAL_VOID -> void [150:11] + | |--IDENT -> foo3 [150:16] + | |--LPAREN -> ( [150:20] + | |--PARAMETERS -> PARAMETERS [150:21] + | |--RPAREN -> ) [150:21] + | `--SLIST -> { [150:23] + | |--VARIABLE_DEF -> VARIABLE_DEF [151:8] + | | |--MODIFIERS -> MODIFIERS [151:8] + | | |--TYPE -> TYPE [151:8] + | | | `--LITERAL_INT -> int [151:8] + | | |--IDENT -> a [151:12] + | | `--ASSIGN -> = [151:14] + | | `--EXPR -> EXPR [151:39] + | | |--BLOCK_COMMENT_BEGIN -> /* [151:15] + | | | |--COMMENT_CONTENT -> Block comment here [151:17] + | | | `--BLOCK_COMMENT_END -> */ [151:35] + | | `--NUM_INT -> 1 [151:39] + | |--SEMI -> ; [151:40] + | |--LITERAL_SWITCH -> switch [152:8] + | | |--LPAREN -> ( [152:15] + | | |--EXPR -> EXPR [152:16] + | | | `--IDENT -> a [152:16] + | | |--RPAREN -> ) [152:17] + | | |--LCURLY -> { [152:19] + | | |--CASE_GROUP -> CASE_GROUP [153:12] + | | | |--LITERAL_CASE -> case [153:12] + | | | | |--EXPR -> EXPR [153:17] + | | | | | `--NUM_INT -> 1 [153:17] + | | | | `--COLON -> : [153:18] + | | | `--LITERAL_DEFAULT -> default [154:12] + | | | `--COLON -> : [154:19] + | | |--SINGLE_LINE_COMMENT -> // [156:16] + | | | `--COMMENT_CONTENT -> comment\n [156:18] + | | `--RCURLY -> } [157:8] + | `--RCURLY -> } [158:4] + |--METHOD_DEF -> METHOD_DEF [160:4] + | |--MODIFIERS -> MODIFIERS [160:4] + | | `--LITERAL_PUBLIC -> public [160:4] + | |--TYPE -> TYPE [160:11] + | | `--LITERAL_VOID -> void [160:11] + | |--IDENT -> foo4 [160:16] + | |--LPAREN -> ( [160:20] + | |--PARAMETERS -> PARAMETERS [160:21] + | |--RPAREN -> ) [160:21] + | `--SLIST -> { [160:23] + | |--VARIABLE_DEF -> VARIABLE_DEF [161:8] + | | |--MODIFIERS -> MODIFIERS [161:8] + | | |--TYPE -> TYPE [161:8] + | | | `--LITERAL_INT -> int [161:8] + | | |--IDENT -> a [161:12] + | | `--ASSIGN -> = [161:14] + | | `--EXPR -> EXPR [161:16] + | | `--NUM_INT -> 1 [161:16] + | |--SEMI -> ; [161:17] + | |--LITERAL_SWITCH -> switch [162:8] + | | |--LPAREN -> ( [162:15] + | | |--EXPR -> EXPR [162:16] + | | | `--IDENT -> a [162:16] + | | |--RPAREN -> ) [162:17] + | | |--LCURLY -> { [162:19] + | | |--CASE_GROUP -> CASE_GROUP [163:12] + | | | |--LITERAL_CASE -> case [163:12] + | | | | |--EXPR -> EXPR [163:17] + | | | | | `--NUM_INT -> 1 [163:17] + | | | | `--COLON -> : [163:18] + | | | `--SLIST -> SLIST [164:16] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [164:16] + | | | | |--MODIFIERS -> MODIFIERS [164:16] + | | | | |--TYPE -> TYPE [164:16] + | | | | | `--LITERAL_INT -> int [164:16] + | | | | `--IDENT -> b [164:20] + | | | `--SEMI -> ; [164:21] + | | |--CASE_GROUP -> CASE_GROUP [166:12] + | | | |--SINGLE_LINE_COMMENT -> // [165:18] + | | | | `--COMMENT_CONTENT -> warn\n [165:20] + | | | `--LITERAL_DEFAULT -> default [166:12] + | | | `--COLON -> : [166:19] + | | `--RCURLY -> } [167:8] + | `--RCURLY -> } [168:4] + |--METHOD_DEF -> METHOD_DEF [170:4] + | |--MODIFIERS -> MODIFIERS [170:4] + | | `--LITERAL_PUBLIC -> public [170:4] + | |--TYPE -> TYPE [170:11] + | | `--LITERAL_VOID -> void [170:11] + | |--IDENT -> foo5 [170:16] + | |--LPAREN -> ( [170:20] + | |--PARAMETERS -> PARAMETERS [170:21] + | |--RPAREN -> ) [170:21] + | `--SLIST -> { [170:23] + | |--VARIABLE_DEF -> VARIABLE_DEF [171:8] + | | |--MODIFIERS -> MODIFIERS [171:8] + | | |--TYPE -> TYPE [171:8] + | | | `--LITERAL_INT -> int [171:8] + | | |--IDENT -> a [171:12] + | | `--ASSIGN -> = [171:14] + | | `--EXPR -> EXPR [171:16] + | | `--NUM_INT -> 1 [171:16] + | |--SEMI -> ; [171:17] + | |--LITERAL_SWITCH -> switch [172:8] + | | |--LPAREN -> ( [172:15] + | | |--EXPR -> EXPR [172:16] + | | | `--IDENT -> a [172:16] + | | |--RPAREN -> ) [172:17] + | | |--LCURLY -> { [172:19] + | | |--CASE_GROUP -> CASE_GROUP [173:12] + | | | |--LITERAL_CASE -> case [173:12] + | | | | |--EXPR -> EXPR [173:17] + | | | | | `--NUM_INT -> 1 [173:17] + | | | | `--COLON -> : [173:18] + | | | `--SLIST -> SLIST [174:16] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [174:16] + | | | | |--MODIFIERS -> MODIFIERS [174:16] + | | | | |--TYPE -> TYPE [174:16] + | | | | | `--LITERAL_INT -> int [174:16] + | | | | `--IDENT -> b [174:20] + | | | `--SEMI -> ; [174:21] + | | |--CASE_GROUP -> CASE_GROUP [176:12] + | | | |--SINGLE_LINE_COMMENT -> // [175:12] + | | | | `--COMMENT_CONTENT -> comment\n [175:14] + | | | `--LITERAL_DEFAULT -> default [176:12] + | | | `--COLON -> : [176:19] + | | `--RCURLY -> } [177:8] + | `--RCURLY -> } [178:4] + |--METHOD_DEF -> METHOD_DEF [180:4] + | |--MODIFIERS -> MODIFIERS [180:4] + | | `--LITERAL_PUBLIC -> public [180:4] + | |--TYPE -> TYPE [180:11] + | | `--LITERAL_VOID -> void [180:11] + | |--IDENT -> foo6 [180:16] + | |--LPAREN -> ( [180:20] + | |--PARAMETERS -> PARAMETERS [180:21] + | |--RPAREN -> ) [180:21] + | `--SLIST -> { [180:23] + | |--VARIABLE_DEF -> VARIABLE_DEF [181:8] + | | |--MODIFIERS -> MODIFIERS [181:8] + | | |--TYPE -> TYPE [181:8] + | | | `--LITERAL_INT -> int [181:8] + | | |--IDENT -> a [181:12] + | | `--ASSIGN -> = [181:14] + | | `--EXPR -> EXPR [181:16] + | | `--NUM_INT -> 1 [181:16] + | |--SEMI -> ; [181:17] + | |--LITERAL_SWITCH -> switch [182:8] + | | |--LPAREN -> ( [182:15] + | | |--EXPR -> EXPR [182:16] + | | | `--IDENT -> a [182:16] + | | |--RPAREN -> ) [182:17] + | | |--LCURLY -> { [182:19] + | | |--CASE_GROUP -> CASE_GROUP [183:12] + | | | |--LITERAL_CASE -> case [183:12] + | | | | |--EXPR -> EXPR [183:17] + | | | | | `--NUM_INT -> 1 [183:17] + | | | | `--COLON -> : [183:18] + | | | `--SLIST -> SLIST [184:16] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [184:16] + | | | | |--MODIFIERS -> MODIFIERS [184:16] + | | | | |--TYPE -> TYPE [184:16] + | | | | | `--LITERAL_INT -> int [184:16] + | | | | `--IDENT -> b [184:20] + | | | `--SEMI -> ; [184:21] + | | |--CASE_GROUP -> CASE_GROUP [186:12] + | | | |--SINGLE_LINE_COMMENT -> // [185:16] + | | | | `--COMMENT_CONTENT -> comment\n [185:18] + | | | `--LITERAL_DEFAULT -> default [186:12] + | | | `--COLON -> : [186:19] + | | `--RCURLY -> } [187:8] + | `--RCURLY -> } [188:4] + |--METHOD_DEF -> METHOD_DEF [190:4] + | |--MODIFIERS -> MODIFIERS [190:4] + | | `--LITERAL_PUBLIC -> public [190:4] + | |--TYPE -> TYPE [190:11] + | | `--LITERAL_VOID -> void [190:11] + | |--IDENT -> foo7 [190:16] + | |--LPAREN -> ( [190:20] + | |--PARAMETERS -> PARAMETERS [190:21] + | |--RPAREN -> ) [190:21] + | `--SLIST -> { [190:23] + | |--VARIABLE_DEF -> VARIABLE_DEF [191:8] + | | |--MODIFIERS -> MODIFIERS [191:8] + | | |--TYPE -> TYPE [191:8] + | | | `--LITERAL_INT -> int [191:8] + | | |--IDENT -> a [191:12] + | | `--ASSIGN -> = [191:14] + | | `--EXPR -> EXPR [191:16] + | | `--NUM_INT -> 2 [191:16] + | |--SEMI -> ; [191:17] + | |--VARIABLE_DEF -> VARIABLE_DEF [192:8] + | | |--MODIFIERS -> MODIFIERS [192:8] + | | |--TYPE -> TYPE [192:8] + | | | `--IDENT -> String [192:8] + | | |--IDENT -> s [192:15] + | | `--ASSIGN -> = [192:17] + | | `--EXPR -> EXPR [192:19] + | | `--STRING_LITERAL -> "" [192:19] + | |--SEMI -> ; [192:21] + | |--LITERAL_SWITCH -> switch [193:8] + | | |--LPAREN -> ( [193:15] + | | |--EXPR -> EXPR [193:16] + | | | `--IDENT -> a [193:16] + | | |--RPAREN -> ) [193:17] + | | |--LCURLY -> { [193:19] + | | |--CASE_GROUP -> CASE_GROUP [197:12] + | | | |--SINGLE_LINE_COMMENT -> // [194:12] + | | | | `--COMMENT_CONTENT -> comment\n [194:14] + | | | |--SINGLE_LINE_COMMENT -> // [195:12] + | | | | `--COMMENT_CONTENT -> comment\n [195:14] + | | | |--SINGLE_LINE_COMMENT -> // [196:12] + | | | | `--COMMENT_CONTENT -> comment\n [196:14] + | | | |--LITERAL_CASE -> case [197:12] + | | | | |--EXPR -> EXPR [197:17] + | | | | | `--NUM_INT -> 1 [197:17] + | | | | `--COLON -> : [197:18] + | | | |--LITERAL_CASE -> case [198:12] + | | | | |--EXPR -> EXPR [198:17] + | | | | | `--NUM_INT -> 2 [198:17] + | | | | `--COLON -> : [198:18] + | | | `--SLIST -> SLIST [201:20] + | | | |--EXPR -> EXPR [201:20] + | | | | `--METHOD_CALL -> ( [201:20] + | | | | |--SINGLE_LINE_COMMENT -> // [199:16] + | | | | | `--COMMENT_CONTENT -> comment\n [199:18] + | | | | |--SINGLE_LINE_COMMENT -> // [200:16] + | | | | | `--COMMENT_CONTENT -> comment\n [200:18] + | | | | |--IDENT -> foo1 [201:16] + | | | | |--ELIST -> ELIST [201:21] + | | | | `--RPAREN -> ) [201:21] + | | | `--SEMI -> ; [201:22] + | | |--CASE_GROUP -> CASE_GROUP [203:12] + | | | |--SINGLE_LINE_COMMENT -> // [202:16] + | | | | `--COMMENT_CONTENT -> comment\n [202:18] + | | | |--LITERAL_CASE -> case [203:12] + | | | | |--EXPR -> EXPR [203:17] + | | | | | `--NUM_INT -> 3 [203:17] + | | | | `--COLON -> : [203:18] + | | | |--SINGLE_LINE_COMMENT -> // [204:16] + | | | | `--COMMENT_CONTENT -> comment\n [204:18] + | | | |--SINGLE_LINE_COMMENT -> // [205:16] + | | | | `--COMMENT_CONTENT -> comment\n [205:18] + | | | |--SINGLE_LINE_COMMENT -> // [206:16] + | | | | `--COMMENT_CONTENT -> comment\n [206:18] + | | | |--LITERAL_CASE -> case [207:12] + | | | | |--EXPR -> EXPR [207:17] + | | | | | `--NUM_INT -> 4 [207:17] + | | | | `--COLON -> : [207:18] + | | | |--SINGLE_LINE_COMMENT -> // [208:4] + | | | | `--COMMENT_CONTENT -> warn\n [208:6] + | | | |--LITERAL_CASE -> case [209:12] + | | | | |--EXPR -> EXPR [209:17] + | | | | | `--NUM_INT -> 5 [209:17] + | | | | `--COLON -> : [209:18] + | | | `--SLIST -> SLIST [210:48] + | | | |--EXPR -> EXPR [210:48] + | | | | `--METHOD_CALL -> ( [210:48] + | | | | |--DOT -> . [210:39] + | | | | | |--METHOD_CALL -> ( [210:37] + | | | | | | |--DOT -> . [210:28] + | | | | | | | |--METHOD_CALL -> ( [210:26] + | | | | | | | | |--DOT -> . [210:17] + | | | | | | | | | |--IDENT -> s [210:16] + | | | | | | | | | `--IDENT -> toString [210:18] + | | | | | | | | |--ELIST -> ELIST [210:27] + | | | | | | | | `--RPAREN -> ) [210:27] + | | | | | | | `--IDENT -> toString [210:29] + | | | | | | |--ELIST -> ELIST [210:38] + | | | | | | `--RPAREN -> ) [210:38] + | | | | | `--IDENT -> toString [210:40] + | | | | |--ELIST -> ELIST [210:49] + | | | | `--RPAREN -> ) [210:49] + | | | `--SEMI -> ; [210:50] + | | |--CASE_GROUP -> CASE_GROUP [214:12] + | | | |--SINGLE_LINE_COMMENT -> // [211:22] + | | | | `--COMMENT_CONTENT -> warn\n [211:24] + | | | |--SINGLE_LINE_COMMENT -> // [212:20] + | | | | `--COMMENT_CONTENT -> warn\n [212:22] + | | | |--SINGLE_LINE_COMMENT -> // [213:17] + | | | | `--COMMENT_CONTENT -> warn\n [213:19] + | | | `--LITERAL_DEFAULT -> default [214:12] + | | | `--COLON -> : [214:19] + | | `--RCURLY -> } [215:8] + | `--RCURLY -> } [216:4] + |--METHOD_DEF -> METHOD_DEF [218:4] + | |--MODIFIERS -> MODIFIERS [218:4] + | | `--LITERAL_PUBLIC -> public [218:4] + | |--TYPE -> TYPE [218:11] + | | `--LITERAL_VOID -> void [218:11] + | |--IDENT -> foo8 [218:16] + | |--LPAREN -> ( [218:20] + | |--PARAMETERS -> PARAMETERS [218:21] + | |--RPAREN -> ) [218:21] + | `--SLIST -> { [218:23] + | |--VARIABLE_DEF -> VARIABLE_DEF [219:8] + | | |--MODIFIERS -> MODIFIERS [219:8] + | | |--TYPE -> TYPE [219:8] + | | | `--LITERAL_INT -> int [219:8] + | | |--IDENT -> a [219:12] + | | `--ASSIGN -> = [219:14] + | | `--EXPR -> EXPR [219:16] + | | `--NUM_INT -> 2 [219:16] + | |--SEMI -> ; [219:17] + | |--VARIABLE_DEF -> VARIABLE_DEF [220:8] + | | |--MODIFIERS -> MODIFIERS [220:8] + | | |--TYPE -> TYPE [220:8] + | | | `--IDENT -> String [220:8] + | | |--IDENT -> s [220:15] + | | `--ASSIGN -> = [220:17] + | | `--EXPR -> EXPR [220:19] + | | `--STRING_LITERAL -> "" [220:19] + | |--SEMI -> ; [220:21] + | |--LITERAL_SWITCH -> switch [221:8] + | | |--LPAREN -> ( [221:15] + | | |--EXPR -> EXPR [221:16] + | | | `--IDENT -> a [221:16] + | | |--RPAREN -> ) [221:17] + | | |--LCURLY -> { [221:19] + | | |--CASE_GROUP -> CASE_GROUP [225:12] + | | | |--SINGLE_LINE_COMMENT -> // [222:12] + | | | | `--COMMENT_CONTENT -> comment\n [222:14] + | | | |--SINGLE_LINE_COMMENT -> // [223:12] + | | | | `--COMMENT_CONTENT -> comment\n [223:14] + | | | |--SINGLE_LINE_COMMENT -> // [224:12] + | | | | `--COMMENT_CONTENT -> comment\n [224:14] + | | | |--LITERAL_CASE -> case [225:12] + | | | | |--EXPR -> EXPR [225:17] + | | | | | `--NUM_INT -> 1 [225:17] + | | | | `--COLON -> : [225:18] + | | | |--LITERAL_CASE -> case [226:12] + | | | | |--EXPR -> EXPR [226:17] + | | | | | `--NUM_INT -> 2 [226:17] + | | | | `--COLON -> : [226:18] + | | | `--SLIST -> SLIST [229:20] + | | | |--EXPR -> EXPR [229:20] + | | | | `--METHOD_CALL -> ( [229:20] + | | | | |--SINGLE_LINE_COMMENT -> // [227:16] + | | | | | `--COMMENT_CONTENT -> comment\n [227:18] + | | | | |--SINGLE_LINE_COMMENT -> // [228:16] + | | | | | `--COMMENT_CONTENT -> comment\n [228:18] + | | | | |--IDENT -> foo1 [229:16] + | | | | |--ELIST -> ELIST [229:21] + | | | | `--RPAREN -> ) [229:21] + | | | `--SEMI -> ; [229:22] + | | |--CASE_GROUP -> CASE_GROUP [231:12] + | | | |--SINGLE_LINE_COMMENT -> // [230:16] + | | | | `--COMMENT_CONTENT -> comment\n [230:18] + | | | |--LITERAL_CASE -> case [231:12] + | | | | |--EXPR -> EXPR [231:17] + | | | | | `--NUM_INT -> 3 [231:17] + | | | | `--COLON -> : [231:18] + | | | `--SLIST -> SLIST [234:48] + | | | |--EXPR -> EXPR [234:48] + | | | | `--METHOD_CALL -> ( [234:48] + | | | | |--DOT -> . [234:39] + | | | | | |--METHOD_CALL -> ( [234:37] + | | | | | | |--DOT -> . [234:28] + | | | | | | | |--METHOD_CALL -> ( [234:26] + | | | | | | | | |--DOT -> . [234:17] + | | | | | | | | | |--SINGLE_LINE_COMMENT -> // [232:16] + | | | | | | | | | | `--COMMENT_CONTENT -> comment\n [232:18] + | | | | | | | | | |--SINGLE_LINE_COMMENT -> // [233:16] + | | | | | | | | | | `--COMMENT_CONTENT -> comment\n [233:18] + | | | | | | | | | |--IDENT -> s [234:16] + | | | | | | | | | `--IDENT -> toString [234:18] + | | | | | | | | |--ELIST -> ELIST [234:27] + | | | | | | | | `--RPAREN -> ) [234:27] + | | | | | | | `--IDENT -> toString [234:29] + | | | | | | |--ELIST -> ELIST [234:38] + | | | | | | `--RPAREN -> ) [234:38] + | | | | | `--IDENT -> toString [234:40] + | | | | |--ELIST -> ELIST [234:49] + | | | | `--RPAREN -> ) [234:49] + | | | `--SEMI -> ; [234:50] + | | |--CASE_GROUP -> CASE_GROUP [236:12] + | | | |--SINGLE_LINE_COMMENT -> // [235:16] + | | | | `--COMMENT_CONTENT -> comment\n [235:18] + | | | |--LITERAL_CASE -> case [236:12] + | | | | |--EXPR -> EXPR [236:17] + | | | | | `--NUM_INT -> 4 [236:17] + | | | | `--COLON -> : [236:18] + | | | |--SINGLE_LINE_COMMENT -> // [237:6] + | | | | `--COMMENT_CONTENT -> warn\n [237:8] + | | | `--LITERAL_DEFAULT -> default [238:12] + | | | `--COLON -> : [238:19] + | | `--RCURLY -> } [239:8] + | `--RCURLY -> } [240:4] + |--METHOD_DEF -> METHOD_DEF [242:4] + | |--MODIFIERS -> MODIFIERS [242:4] + | | `--LITERAL_PUBLIC -> public [242:4] + | |--TYPE -> TYPE [242:11] + | | `--LITERAL_VOID -> void [242:11] + | |--IDENT -> foo9 [242:16] + | |--LPAREN -> ( [242:20] + | |--PARAMETERS -> PARAMETERS [242:21] + | |--RPAREN -> ) [242:21] + | `--SLIST -> { [242:23] + | |--VARIABLE_DEF -> VARIABLE_DEF [243:8] + | | |--MODIFIERS -> MODIFIERS [243:8] + | | |--TYPE -> TYPE [243:8] + | | | `--LITERAL_INT -> int [243:8] + | | |--IDENT -> a [243:12] + | | `--ASSIGN -> = [243:14] + | | `--EXPR -> EXPR [243:16] + | | `--NUM_INT -> 5 [243:16] + | |--SEMI -> ; [243:17] + | |--LITERAL_SWITCH -> switch [244:8] + | | |--LPAREN -> ( [244:15] + | | |--EXPR -> EXPR [244:16] + | | | `--IDENT -> a [244:16] + | | |--RPAREN -> ) [244:17] + | | |--LCURLY -> { [244:19] + | | |--CASE_GROUP -> CASE_GROUP [245:12] + | | | |--LITERAL_CASE -> case [245:12] + | | | | |--EXPR -> EXPR [245:17] + | | | | | `--NUM_INT -> 1 [245:17] + | | | | `--COLON -> : [245:18] + | | | `--LITERAL_CASE -> case [246:12] + | | | |--EXPR -> EXPR [246:17] + | | | | `--NUM_INT -> 2 [246:17] + | | | `--COLON -> : [246:18] + | | |--SINGLE_LINE_COMMENT -> // [247:16] + | | | `--COMMENT_CONTENT -> comment\n [247:18] + | | `--RCURLY -> } [248:8] + | `--RCURLY -> } [249:4] + |--METHOD_DEF -> METHOD_DEF [251:4] + | |--MODIFIERS -> MODIFIERS [251:4] + | | `--LITERAL_PUBLIC -> public [251:4] + | |--TYPE -> TYPE [251:11] + | | `--LITERAL_VOID -> void [251:11] + | |--IDENT -> foo10 [251:16] + | |--LPAREN -> ( [251:21] + | |--PARAMETERS -> PARAMETERS [251:22] + | |--RPAREN -> ) [251:22] + | `--SLIST -> { [251:24] + | |--VARIABLE_DEF -> VARIABLE_DEF [252:8] + | | |--MODIFIERS -> MODIFIERS [252:8] + | | |--TYPE -> TYPE [252:8] + | | | `--LITERAL_INT -> int [252:8] + | | |--IDENT -> a [252:12] + | | `--ASSIGN -> = [252:14] + | | `--EXPR -> EXPR [252:16] + | | `--NUM_INT -> 5 [252:16] + | |--SEMI -> ; [252:17] + | |--LITERAL_SWITCH -> switch [253:8] + | | |--LPAREN -> ( [253:15] + | | |--EXPR -> EXPR [253:16] + | | | `--IDENT -> a [253:16] + | | |--RPAREN -> ) [253:17] + | | |--LCURLY -> { [253:19] + | | |--CASE_GROUP -> CASE_GROUP [254:12] + | | | |--LITERAL_CASE -> case [254:12] + | | | | |--EXPR -> EXPR [254:17] + | | | | | `--NUM_INT -> 1 [254:17] + | | | | `--COLON -> : [254:18] + | | | `--LITERAL_DEFAULT -> default [255:12] + | | | `--COLON -> : [255:19] + | | |--SINGLE_LINE_COMMENT -> // [256:16] + | | | `--COMMENT_CONTENT -> comment\n [256:18] + | | `--RCURLY -> } [257:8] + | `--RCURLY -> } [258:4] + |--METHOD_DEF -> METHOD_DEF [260:4] + | |--MODIFIERS -> MODIFIERS [260:4] + | | `--LITERAL_PUBLIC -> public [260:4] + | |--TYPE -> TYPE [260:11] + | | `--LITERAL_VOID -> void [260:11] + | |--IDENT -> foo11 [260:16] + | |--LPAREN -> ( [260:21] + | |--PARAMETERS -> PARAMETERS [260:22] + | |--RPAREN -> ) [260:22] + | `--SLIST -> { [260:24] + | |--VARIABLE_DEF -> VARIABLE_DEF [261:8] + | | |--MODIFIERS -> MODIFIERS [261:8] + | | |--TYPE -> TYPE [261:8] + | | | `--LITERAL_INT -> int [261:8] + | | |--IDENT -> a [261:12] + | | `--ASSIGN -> = [261:14] + | | `--EXPR -> EXPR [261:16] + | | `--NUM_INT -> 5 [261:16] + | |--SEMI -> ; [261:17] + | |--LITERAL_SWITCH -> switch [262:8] + | | |--LPAREN -> ( [262:15] + | | |--EXPR -> EXPR [262:16] + | | | `--IDENT -> a [262:16] + | | |--RPAREN -> ) [262:17] + | | |--LCURLY -> { [262:19] + | | |--CASE_GROUP -> CASE_GROUP [263:12] + | | | |--LITERAL_CASE -> case [263:12] + | | | | |--EXPR -> EXPR [263:17] + | | | | | `--NUM_INT -> 1 [263:17] + | | | | `--COLON -> : [263:18] + | | | `--LITERAL_CASE -> case [264:12] + | | | |--EXPR -> EXPR [264:17] + | | | | `--NUM_INT -> 2 [264:17] + | | | `--COLON -> : [264:18] + | | |--SINGLE_LINE_COMMENT -> // [265:16] + | | | `--COMMENT_CONTENT -> comment\n [265:18] + | | `--RCURLY -> } [266:8] + | `--RCURLY -> } [267:4] + |--METHOD_DEF -> METHOD_DEF [269:4] + | |--MODIFIERS -> MODIFIERS [269:4] + | | `--LITERAL_PUBLIC -> public [269:4] + | |--TYPE -> TYPE [269:11] + | | `--LITERAL_VOID -> void [269:11] + | |--IDENT -> foo12 [269:16] + | |--LPAREN -> ( [269:21] + | |--PARAMETERS -> PARAMETERS [269:22] + | |--RPAREN -> ) [269:22] + | `--SLIST -> { [269:24] + | |--VARIABLE_DEF -> VARIABLE_DEF [270:8] + | | |--MODIFIERS -> MODIFIERS [270:8] + | | |--TYPE -> TYPE [270:8] + | | | `--LITERAL_INT -> int [270:8] + | | |--IDENT -> a [270:12] + | | `--ASSIGN -> = [270:14] + | | `--EXPR -> EXPR [270:16] + | | `--NUM_INT -> 5 [270:16] + | |--SEMI -> ; [270:17] + | |--LITERAL_SWITCH -> switch [271:8] + | | |--LPAREN -> ( [271:15] + | | |--EXPR -> EXPR [271:16] + | | | `--IDENT -> a [271:16] + | | |--RPAREN -> ) [271:17] + | | |--LCURLY -> { [271:19] + | | |--CASE_GROUP -> CASE_GROUP [273:12] + | | | |--SINGLE_LINE_COMMENT -> // [272:12] + | | | | `--COMMENT_CONTENT -> comment\n [272:14] + | | | `--LITERAL_CASE -> case [273:12] + | | | |--EXPR -> EXPR [273:17] + | | | | `--NUM_INT -> 1 [273:17] + | | | `--COLON -> : [273:18] + | | `--RCURLY -> } [274:8] + | `--RCURLY -> } [275:4] + `--RCURLY -> } [276:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTrickyYield.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTrickyYield.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTrickyYield.java @@ -0,0 +1,14 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +import java.util.Iterator; +import java.util.function.Function; + +public class InputAntlr4AstRegressionTrickyYield<T1> { + public Iterator<T1> yield() { + return yield(Function.identity()); + } + + private static <T, T1> Iterator<T1> yield(Function<T,T> identity) { + return null; + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTrickyYield.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTrickyYield.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTrickyYield.txt @@ -0,0 +1,115 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +IMPORT -> import [3:0] +|--DOT -> . [3:16] +| |--DOT -> . [3:11] +| | |--IDENT -> java [3:7] +| | `--IDENT -> util [3:12] +| `--IDENT -> Iterator [3:17] +`--SEMI -> ; [3:25] +IMPORT -> import [4:0] +|--DOT -> . [4:25] +| |--DOT -> . [4:16] +| | |--DOT -> . [4:11] +| | | |--IDENT -> java [4:7] +| | | `--IDENT -> util [4:12] +| | `--IDENT -> function [4:17] +| `--IDENT -> Function [4:26] +`--SEMI -> ; [4:34] +CLASS_DEF -> CLASS_DEF [6:0] +|--MODIFIERS -> MODIFIERS [6:0] +| `--LITERAL_PUBLIC -> public [6:0] +|--LITERAL_CLASS -> class [6:7] +|--IDENT -> InputAntlr4AstRegressionTrickyYield [6:13] +|--TYPE_PARAMETERS -> TYPE_PARAMETERS [6:48] +| |--GENERIC_START -> < [6:48] +| |--TYPE_PARAMETER -> TYPE_PARAMETER [6:49] +| | `--IDENT -> T1 [6:49] +| `--GENERIC_END -> > [6:51] +`--OBJBLOCK -> OBJBLOCK [6:53] + |--LCURLY -> { [6:53] + |--METHOD_DEF -> METHOD_DEF [7:4] + | |--MODIFIERS -> MODIFIERS [7:4] + | | `--LITERAL_PUBLIC -> public [7:4] + | |--TYPE -> TYPE [7:11] + | | |--IDENT -> Iterator [7:11] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [7:19] + | | |--GENERIC_START -> < [7:19] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [7:20] + | | | `--IDENT -> T1 [7:20] + | | `--GENERIC_END -> > [7:22] + | |--IDENT -> yield [7:24] + | |--LPAREN -> ( [7:29] + | |--PARAMETERS -> PARAMETERS [7:30] + | |--RPAREN -> ) [7:30] + | `--SLIST -> { [7:32] + | |--LITERAL_RETURN -> return [8:8] + | | |--EXPR -> EXPR [8:20] + | | | `--METHOD_CALL -> ( [8:20] + | | | |--IDENT -> yield [8:15] + | | | |--ELIST -> ELIST [8:38] + | | | | `--EXPR -> EXPR [8:38] + | | | | `--METHOD_CALL -> ( [8:38] + | | | | |--DOT -> . [8:29] + | | | | | |--IDENT -> Function [8:21] + | | | | | `--IDENT -> identity [8:30] + | | | | |--ELIST -> ELIST [8:39] + | | | | `--RPAREN -> ) [8:39] + | | | `--RPAREN -> ) [8:40] + | | `--SEMI -> ; [8:41] + | `--RCURLY -> } [9:4] + |--METHOD_DEF -> METHOD_DEF [11:4] + | |--MODIFIERS -> MODIFIERS [11:4] + | | |--LITERAL_PRIVATE -> private [11:4] + | | `--LITERAL_STATIC -> static [11:12] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [11:19] + | | |--GENERIC_START -> < [11:19] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [11:20] + | | | `--IDENT -> T [11:20] + | | |--COMMA -> , [11:21] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [11:23] + | | | `--IDENT -> T1 [11:23] + | | `--GENERIC_END -> > [11:25] + | |--TYPE -> TYPE [11:27] + | | |--IDENT -> Iterator [11:27] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [11:35] + | | |--GENERIC_START -> < [11:35] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [11:36] + | | | `--IDENT -> T1 [11:36] + | | `--GENERIC_END -> > [11:38] + | |--IDENT -> yield [11:40] + | |--LPAREN -> ( [11:45] + | |--PARAMETERS -> PARAMETERS [11:46] + | | `--PARAMETER_DEF -> PARAMETER_DEF [11:46] + | | |--MODIFIERS -> MODIFIERS [11:46] + | | |--TYPE -> TYPE [11:46] + | | | |--IDENT -> Function [11:46] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [11:54] + | | | |--GENERIC_START -> < [11:54] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [11:55] + | | | | `--IDENT -> T [11:55] + | | | |--COMMA -> , [11:56] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [11:57] + | | | | `--IDENT -> T [11:57] + | | | `--GENERIC_END -> > [11:58] + | | `--IDENT -> identity [11:60] + | |--RPAREN -> ) [11:68] + | `--SLIST -> { [11:70] + | |--LITERAL_RETURN -> return [12:8] + | | |--EXPR -> EXPR [12:15] + | | | `--LITERAL_NULL -> null [12:15] + | | `--SEMI -> ; [12:19] + | `--RCURLY -> } [13:4] + `--RCURLY -> } [14:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTypeParams.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTypeParams.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTypeParams.java @@ -0,0 +1,24 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +import java.lang.reflect.TypeVariable; +import java.util.List; + +public class InputAntlr4AstRegressionTypeParams { + public TypeVariable<Class<List<String>[]>>[] getTypeParameters3() { + return null; + } + + TypeVariable<Class<List<String>[]>>[] tester3; + + public TypeVariable<Class<String>>[] getTypeParameters2() { + return null; + } + + TypeVariable<Class<String>>[] tester2; + + public TypeVariable<Class>[] getTypeParameters1() { + return null; + } + + TypeVariable<Class>[] tester1; +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTypeParams.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTypeParams.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionTypeParams.txt @@ -0,0 +1,177 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +IMPORT -> import [3:0] +|--DOT -> . [3:24] +| |--DOT -> . [3:16] +| | |--DOT -> . [3:11] +| | | |--IDENT -> java [3:7] +| | | `--IDENT -> lang [3:12] +| | `--IDENT -> reflect [3:17] +| `--IDENT -> TypeVariable [3:25] +`--SEMI -> ; [3:37] +IMPORT -> import [4:0] +|--DOT -> . [4:16] +| |--DOT -> . [4:11] +| | |--IDENT -> java [4:7] +| | `--IDENT -> util [4:12] +| `--IDENT -> List [4:17] +`--SEMI -> ; [4:21] +CLASS_DEF -> CLASS_DEF [6:0] +|--MODIFIERS -> MODIFIERS [6:0] +| `--LITERAL_PUBLIC -> public [6:0] +|--LITERAL_CLASS -> class [6:7] +|--IDENT -> InputAntlr4AstRegressionTypeParams [6:13] +`--OBJBLOCK -> OBJBLOCK [6:48] + |--LCURLY -> { [6:48] + |--METHOD_DEF -> METHOD_DEF [7:4] + | |--MODIFIERS -> MODIFIERS [7:4] + | | `--LITERAL_PUBLIC -> public [7:4] + | |--TYPE -> TYPE [7:11] + | | |--IDENT -> TypeVariable [7:11] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [7:23] + | | | |--GENERIC_START -> < [7:23] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [7:24] + | | | | |--IDENT -> Class [7:24] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [7:29] + | | | | |--GENERIC_START -> < [7:29] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [7:30] + | | | | | |--IDENT -> List [7:30] + | | | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [7:34] + | | | | | | |--GENERIC_START -> < [7:34] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [7:35] + | | | | | | | `--IDENT -> String [7:35] + | | | | | | `--GENERIC_END -> > [7:41] + | | | | | `--ARRAY_DECLARATOR -> [ [7:42] + | | | | | `--RBRACK -> ] [7:43] + | | | | `--GENERIC_END -> > [7:44] + | | | `--GENERIC_END -> > [7:45] + | | `--ARRAY_DECLARATOR -> [ [7:46] + | | `--RBRACK -> ] [7:47] + | |--IDENT -> getTypeParameters3 [7:49] + | |--LPAREN -> ( [7:67] + | |--PARAMETERS -> PARAMETERS [7:68] + | |--RPAREN -> ) [7:68] + | `--SLIST -> { [7:70] + | |--LITERAL_RETURN -> return [8:8] + | | |--EXPR -> EXPR [8:15] + | | | `--LITERAL_NULL -> null [8:15] + | | `--SEMI -> ; [8:19] + | `--RCURLY -> } [9:4] + |--VARIABLE_DEF -> VARIABLE_DEF [11:4] + | |--MODIFIERS -> MODIFIERS [11:4] + | |--TYPE -> TYPE [11:4] + | | |--IDENT -> TypeVariable [11:4] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [11:16] + | | | |--GENERIC_START -> < [11:16] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [11:17] + | | | | |--IDENT -> Class [11:17] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [11:22] + | | | | |--GENERIC_START -> < [11:22] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [11:23] + | | | | | |--IDENT -> List [11:23] + | | | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [11:27] + | | | | | | |--GENERIC_START -> < [11:27] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [11:28] + | | | | | | | `--IDENT -> String [11:28] + | | | | | | `--GENERIC_END -> > [11:34] + | | | | | `--ARRAY_DECLARATOR -> [ [11:35] + | | | | | `--RBRACK -> ] [11:36] + | | | | `--GENERIC_END -> > [11:37] + | | | `--GENERIC_END -> > [11:38] + | | `--ARRAY_DECLARATOR -> [ [11:39] + | | `--RBRACK -> ] [11:40] + | |--IDENT -> tester3 [11:42] + | `--SEMI -> ; [11:49] + |--METHOD_DEF -> METHOD_DEF [13:4] + | |--MODIFIERS -> MODIFIERS [13:4] + | | `--LITERAL_PUBLIC -> public [13:4] + | |--TYPE -> TYPE [13:11] + | | |--IDENT -> TypeVariable [13:11] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [13:23] + | | | |--GENERIC_START -> < [13:23] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [13:24] + | | | | |--IDENT -> Class [13:24] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [13:29] + | | | | |--GENERIC_START -> < [13:29] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [13:30] + | | | | | `--IDENT -> String [13:30] + | | | | `--GENERIC_END -> > [13:36] + | | | `--GENERIC_END -> > [13:37] + | | `--ARRAY_DECLARATOR -> [ [13:38] + | | `--RBRACK -> ] [13:39] + | |--IDENT -> getTypeParameters2 [13:41] + | |--LPAREN -> ( [13:59] + | |--PARAMETERS -> PARAMETERS [13:60] + | |--RPAREN -> ) [13:60] + | `--SLIST -> { [13:62] + | |--LITERAL_RETURN -> return [14:8] + | | |--EXPR -> EXPR [14:15] + | | | `--LITERAL_NULL -> null [14:15] + | | `--SEMI -> ; [14:19] + | `--RCURLY -> } [15:4] + |--VARIABLE_DEF -> VARIABLE_DEF [17:4] + | |--MODIFIERS -> MODIFIERS [17:4] + | |--TYPE -> TYPE [17:4] + | | |--IDENT -> TypeVariable [17:4] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [17:16] + | | | |--GENERIC_START -> < [17:16] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [17:17] + | | | | |--IDENT -> Class [17:17] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [17:22] + | | | | |--GENERIC_START -> < [17:22] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [17:23] + | | | | | `--IDENT -> String [17:23] + | | | | `--GENERIC_END -> > [17:29] + | | | `--GENERIC_END -> > [17:30] + | | `--ARRAY_DECLARATOR -> [ [17:31] + | | `--RBRACK -> ] [17:32] + | |--IDENT -> tester2 [17:34] + | `--SEMI -> ; [17:41] + |--METHOD_DEF -> METHOD_DEF [19:4] + | |--MODIFIERS -> MODIFIERS [19:4] + | | `--LITERAL_PUBLIC -> public [19:4] + | |--TYPE -> TYPE [19:11] + | | |--IDENT -> TypeVariable [19:11] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [19:23] + | | | |--GENERIC_START -> < [19:23] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [19:24] + | | | | `--IDENT -> Class [19:24] + | | | `--GENERIC_END -> > [19:29] + | | `--ARRAY_DECLARATOR -> [ [19:30] + | | `--RBRACK -> ] [19:31] + | |--IDENT -> getTypeParameters1 [19:33] + | |--LPAREN -> ( [19:51] + | |--PARAMETERS -> PARAMETERS [19:52] + | |--RPAREN -> ) [19:52] + | `--SLIST -> { [19:54] + | |--LITERAL_RETURN -> return [20:8] + | | |--EXPR -> EXPR [20:15] + | | | `--LITERAL_NULL -> null [20:15] + | | `--SEMI -> ; [20:19] + | `--RCURLY -> } [21:4] + |--VARIABLE_DEF -> VARIABLE_DEF [23:4] + | |--MODIFIERS -> MODIFIERS [23:4] + | |--TYPE -> TYPE [23:4] + | | |--IDENT -> TypeVariable [23:4] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [23:16] + | | | |--GENERIC_START -> < [23:16] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [23:17] + | | | | `--IDENT -> Class [23:17] + | | | `--GENERIC_END -> > [23:22] + | | `--ARRAY_DECLARATOR -> [ [23:23] + | | `--RBRACK -> ] [23:24] + | |--IDENT -> tester1 [23:26] + | `--SEMI -> ; [23:33] + `--RCURLY -> } [24:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon.txt @@ -0,0 +1,1469 @@ +SINGLE_LINE_COMMENT -> // [1:0] +`--COMMENT_CONTENT -> non-compiled with javac: Compilable with Java16\n [1:2] +PACKAGE_DEF -> package [2:0] +|--ANNOTATIONS -> ANNOTATIONS [2:47] +|--DOT -> . [2:47] +| |--DOT -> . [2:39] +| | |--DOT -> . [2:28] +| | | |--DOT -> . [2:22] +| | | | |--DOT -> . [2:11] +| | | | | |--IDENT -> com [2:8] +| | | | | `--IDENT -> puppycrawl [2:12] +| | | | `--IDENT -> tools [2:23] +| | | `--IDENT -> checkstyle [2:29] +| | `--IDENT -> grammar [2:40] +| `--IDENT -> antlr4 [2:48] +`--SEMI -> ; [2:54] +IMPORT -> import [4:0] +|--DOT -> . [4:14] +| |--DOT -> . [4:11] +| | |--IDENT -> java [4:7] +| | `--IDENT -> io [4:12] +| `--IDENT -> Serializable [4:15] +`--SEMI -> ; [4:27] +IMPORT -> import [5:0] +|--DOT -> . [5:16] +| |--DOT -> . [5:11] +| | |--IDENT -> java [5:7] +| | `--IDENT -> util [5:12] +| `--IDENT -> Collection [5:17] +`--SEMI -> ; [5:27] +IMPORT -> import [6:0] +|--DOT -> . [6:16] +| |--DOT -> . [6:11] +| | |--IDENT -> java [6:7] +| | `--IDENT -> util [6:12] +| `--IDENT -> Collections [6:17] +`--SEMI -> ; [6:28] +IMPORT -> import [7:0] +|--DOT -> . [7:16] +| |--DOT -> . [7:11] +| | |--IDENT -> java [7:7] +| | `--IDENT -> util [7:12] +| `--IDENT -> Iterator [7:17] +`--SEMI -> ; [7:25] +IMPORT -> import [8:0] +|--DOT -> . [8:16] +| |--DOT -> . [8:11] +| | |--IDENT -> java [8:7] +| | `--IDENT -> util [8:12] +| `--IDENT -> List [8:17] +`--SEMI -> ; [8:21] +IMPORT -> import [9:0] +|--DOT -> . [9:16] +| |--DOT -> . [9:11] +| | |--IDENT -> java [9:7] +| | `--IDENT -> util [9:12] +| `--IDENT -> ListIterator [9:17] +`--SEMI -> ; [9:29] +IMPORT -> import [10:0] +|--DOT -> . [10:25] +| |--DOT -> . [10:16] +| | |--DOT -> . [10:11] +| | | |--IDENT -> java [10:7] +| | | `--IDENT -> util [10:12] +| | `--IDENT -> function [10:17] +| `--IDENT -> IntFunction [10:26] +`--SEMI -> ; [10:37] +IMPORT -> import [12:0] +|--DOT -> . [12:26] +| |--DOT -> . [12:20] +| | |--DOT -> . [12:14] +| | | |--DOT -> . [12:10] +| | | | |--IDENT -> com [12:7] +| | | | `--IDENT -> sun [12:11] +| | | `--IDENT -> tools [12:15] +| | `--IDENT -> javac [12:21] +| `--IDENT -> Main [12:27] +`--SEMI -> ; [12:31] +CLASS_DEF -> CLASS_DEF [14:0] +|--MODIFIERS -> MODIFIERS [14:0] +| `--LITERAL_PUBLIC -> public [14:0] +|--LITERAL_CLASS -> class [14:7] +|--IDENT -> InputAntlr4AstRegressionUncommon [14:13] +|--IMPLEMENTS_CLAUSE -> implements [15:8] +| `--IDENT -> MyInterface [15:19] +`--OBJBLOCK -> OBJBLOCK [15:31] + |--LCURLY -> { [15:31] + |--VARIABLE_DEF -> VARIABLE_DEF [16:4] + | |--MODIFIERS -> MODIFIERS [16:4] + | |--TYPE -> TYPE [16:4] + | | |--LITERAL_INT -> int [16:4] + | | `--ARRAY_DECLARATOR -> [ [16:9] + | | `--RBRACK -> ] [16:10] + | |--IDENT -> x [16:8] + | `--SEMI -> ; [16:23] + |--COMMA -> , [16:11] + |--VARIABLE_DEF -> VARIABLE_DEF [16:4] + | |--MODIFIERS -> MODIFIERS [16:4] + | |--TYPE -> TYPE [16:4] + | | |--LITERAL_INT -> int [16:4] + | | `--ARRAY_DECLARATOR -> [ [16:14] + | | `--RBRACK -> ] [16:15] + | `--IDENT -> y [16:13] + |--COMMA -> , [16:16] + |--VARIABLE_DEF -> VARIABLE_DEF [16:4] + | |--MODIFIERS -> MODIFIERS [16:4] + | |--TYPE -> TYPE [16:4] + | | |--LITERAL_INT -> int [16:4] + | | |--ARRAY_DECLARATOR -> [ [16:19] + | | | `--RBRACK -> ] [16:20] + | | `--ARRAY_DECLARATOR -> [ [16:21] + | | `--RBRACK -> ] [16:22] + | `--IDENT -> z [16:18] + |--METHOD_DEF -> METHOD_DEF [18:4] + | |--MODIFIERS -> MODIFIERS [18:4] + | | `--LITERAL_PUBLIC -> public [18:4] + | |--TYPE -> TYPE [18:11] + | | |--IDENT -> Double [18:11] + | | `--ARRAY_DECLARATOR -> [ [18:27] + | | `--RBRACK -> ] [18:28] + | |--IDENT -> method1 [18:18] + | |--LPAREN -> ( [18:25] + | |--PARAMETERS -> PARAMETERS [18:26] + | |--RPAREN -> ) [18:26] + | `--SLIST -> { [18:30] + | |--LITERAL_RETURN -> return [19:8] + | | |--EXPR -> EXPR [19:15] + | | | `--LITERAL_NULL -> null [19:15] + | | `--SEMI -> ; [19:19] + | `--RCURLY -> } [20:4] + |--METHOD_DEF -> METHOD_DEF [22:4] + | |--MODIFIERS -> MODIFIERS [22:4] + | | `--LITERAL_PROTECTED -> protected [22:4] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [22:14] + | | |--GENERIC_START -> < [22:14] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [22:15] + | | | `--IDENT -> B [22:15] + | | |--COMMA -> , [22:16] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [22:18] + | | | `--IDENT -> Z [22:18] + | | |--COMMA -> , [22:19] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [22:21] + | | | `--IDENT -> A [22:21] + | | `--GENERIC_END -> > [22:22] + | |--TYPE -> TYPE [22:34] + | | `--DOT -> . [22:34] + | | |--IDENT -> OtherClass [22:24] + | | |--IDENT -> Q [22:35] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [22:36] + | | |--GENERIC_START -> < [22:36] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [22:37] + | | | `--IDENT -> A [22:37] + | | |--COMMA -> , [22:38] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [22:39] + | | | `--IDENT -> B [22:39] + | | |--COMMA -> , [22:40] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [22:41] + | | | `--IDENT -> Z [22:41] + | | `--GENERIC_END -> > [22:42] + | |--IDENT -> m [22:44] + | |--LPAREN -> ( [22:45] + | |--PARAMETERS -> PARAMETERS [22:46] + | |--RPAREN -> ) [22:46] + | `--SLIST -> { [22:48] + | |--LITERAL_RETURN -> return [23:8] + | | |--EXPR -> EXPR [23:15] + | | | `--LITERAL_NULL -> null [23:15] + | | `--SEMI -> ; [23:19] + | `--RCURLY -> } [24:4] + `--RCURLY -> } [25:0] +INTERFACE_DEF -> INTERFACE_DEF [27:0] +|--MODIFIERS -> MODIFIERS [27:0] +|--LITERAL_INTERFACE -> interface [27:0] +|--IDENT -> MyInterface [27:10] +`--OBJBLOCK -> OBJBLOCK [27:22] + |--LCURLY -> { [27:22] + |--METHOD_DEF -> METHOD_DEF [28:4] + | |--MODIFIERS -> MODIFIERS [28:4] + | |--TYPE -> TYPE [28:4] + | | |--IDENT -> Double [28:4] + | | `--ARRAY_DECLARATOR -> [ [28:20] + | | `--RBRACK -> ] [28:21] + | |--IDENT -> method1 [28:11] + | |--LPAREN -> ( [28:18] + | |--PARAMETERS -> PARAMETERS [28:19] + | |--RPAREN -> ) [28:19] + | `--SEMI -> ; [28:22] + `--RCURLY -> } [29:0] +CLASS_DEF -> CLASS_DEF [31:0] +|--MODIFIERS -> MODIFIERS [31:0] +|--LITERAL_CLASS -> class [31:0] +|--IDENT -> OtherClass [31:6] +|--EXTENDS_CLAUSE -> extends [31:17] +| `--IDENT -> InputAntlr4AstRegressionUncommon [31:25] +`--OBJBLOCK -> OBJBLOCK [31:58] + |--LCURLY -> { [31:58] + |--CTOR_DEF -> CTOR_DEF [32:4] + | |--MODIFIERS -> MODIFIERS [32:4] + | |--IDENT -> OtherClass [32:4] + | |--LPAREN -> ( [32:15] + | |--PARAMETERS -> PARAMETERS [32:16] + | | `--PARAMETER_DEF -> PARAMETER_DEF [32:16] + | | |--MODIFIERS -> MODIFIERS [32:16] + | | |--TYPE -> TYPE [32:16] + | | | `--LITERAL_INT -> int [32:16] + | | `--IDENT -> z [32:20] + | |--RPAREN -> ) [32:21] + | `--SLIST -> { [32:22] + | |--SUPER_CTOR_CALL -> super [33:8] + | | |--LPAREN -> ( [33:13] + | | |--ELIST -> ELIST [33:14] + | | |--RPAREN -> ) [33:14] + | | `--SEMI -> ; [33:15] + | `--RCURLY -> } [34:4] + |--CLASS_DEF -> CLASS_DEF [35:4] + | |--MODIFIERS -> MODIFIERS [35:4] + | |--LITERAL_CLASS -> class [35:4] + | |--IDENT -> Q [35:10] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [35:11] + | | |--GENERIC_START -> < [35:11] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [35:12] + | | | `--IDENT -> A [35:12] + | | |--COMMA -> , [35:13] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [35:15] + | | | `--IDENT -> B [35:15] + | | |--COMMA -> , [35:16] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [35:18] + | | | `--IDENT -> Z [35:18] + | | `--GENERIC_END -> > [35:19] + | `--OBJBLOCK -> OBJBLOCK [35:20] + | |--LCURLY -> { [35:20] + | `--RCURLY -> } [35:21] + |--SEMI -> ; [37:4] + |--METHOD_DEF -> METHOD_DEF [38:4] + | |--MODIFIERS -> MODIFIERS [38:4] + | | `--LITERAL_PUBLIC -> public [38:4] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [38:11] + | | |--GENERIC_START -> < [38:11] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [38:12] + | | | `--IDENT -> Z [38:12] + | | |--COMMA -> , [38:13] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [38:15] + | | | `--IDENT -> B [38:15] + | | |--COMMA -> , [38:16] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [38:18] + | | | `--IDENT -> A [38:18] + | | `--GENERIC_END -> > [38:19] + | |--TYPE -> TYPE [38:21] + | | |--IDENT -> Q [38:21] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [38:22] + | | |--GENERIC_START -> < [38:22] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [38:23] + | | | `--IDENT -> A [38:23] + | | |--COMMA -> , [38:24] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [38:26] + | | | `--IDENT -> Z [38:26] + | | |--COMMA -> , [38:27] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [38:29] + | | | `--IDENT -> B [38:29] + | | `--GENERIC_END -> > [38:30] + | |--IDENT -> m [38:32] + | |--LPAREN -> ( [38:33] + | |--PARAMETERS -> PARAMETERS [38:34] + | |--RPAREN -> ) [38:34] + | `--SLIST -> { [38:36] + | |--LITERAL_RETURN -> return [38:38] + | | |--EXPR -> EXPR [38:45] + | | | `--LITERAL_NULL -> null [38:45] + | | `--SEMI -> ; [38:49] + | `--RCURLY -> } [38:50] + |--CTOR_DEF -> CTOR_DEF [40:4] + | |--MODIFIERS -> MODIFIERS [40:4] + | |--IDENT -> OtherClass [40:4] + | |--LPAREN -> ( [40:15] + | |--PARAMETERS -> PARAMETERS [40:16] + | | |--PARAMETER_DEF -> PARAMETER_DEF [40:16] + | | | |--MODIFIERS -> MODIFIERS [40:16] + | | | |--TYPE -> TYPE [40:16] + | | | | `--LITERAL_INT -> int [40:16] + | | | `--IDENT -> z [40:20] + | | |--COMMA -> , [40:21] + | | `--PARAMETER_DEF -> PARAMETER_DEF [40:23] + | | |--MODIFIERS -> MODIFIERS [40:23] + | | |--TYPE -> TYPE [40:23] + | | | `--IDENT -> String [40:23] + | | `--IDENT -> s [40:30] + | |--RPAREN -> ) [40:31] + | `--SLIST -> { [40:32] + | |--EXPR -> EXPR [41:8] + | | `--LITERAL_NEW -> new [41:8] + | | |--IDENT -> OtherClass [41:12] + | | |--LPAREN -> ( [41:22] + | | |--ELIST -> ELIST [41:23] + | | | `--EXPR -> EXPR [41:23] + | | | `--NUM_INT -> 2 [41:23] + | | `--RPAREN -> ) [41:24] + | |--SEMI -> ; [41:25] + | `--RCURLY -> } [42:4] + |--CLASS_DEF -> CLASS_DEF [44:4] + | |--MODIFIERS -> MODIFIERS [44:4] + | |--LITERAL_CLASS -> class [44:4] + | |--IDENT -> Inner [44:10] + | `--OBJBLOCK -> OBJBLOCK [44:16] + | |--LCURLY -> { [44:16] + | |--CTOR_DEF -> CTOR_DEF [45:8] + | | |--MODIFIERS -> MODIFIERS [45:8] + | | |--IDENT -> Inner [45:8] + | | |--LPAREN -> ( [45:13] + | | |--PARAMETERS -> PARAMETERS [45:14] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [45:14] + | | | |--MODIFIERS -> MODIFIERS [45:14] + | | | |--TYPE -> TYPE [45:14] + | | | | `--LITERAL_INT -> int [45:14] + | | | `--IDENT -> x [45:18] + | | |--RPAREN -> ) [45:19] + | | `--SLIST -> { [45:21] + | | `--RCURLY -> } [45:22] + | |--CTOR_DEF -> CTOR_DEF [46:8] + | | |--MODIFIERS -> MODIFIERS [46:8] + | | |--IDENT -> Inner [46:8] + | | |--LPAREN -> ( [46:13] + | | |--PARAMETERS -> PARAMETERS [46:14] + | | |--RPAREN -> ) [46:14] + | | `--SLIST -> { [46:16] + | | |--CTOR_CALL -> this [47:12] + | | | |--LPAREN -> ( [47:16] + | | | |--ELIST -> ELIST [47:17] + | | | | `--EXPR -> EXPR [47:17] + | | | | `--NUM_INT -> 2 [47:17] + | | | |--RPAREN -> ) [47:18] + | | | `--SEMI -> ; [47:19] + | | |--VARIABLE_DEF -> VARIABLE_DEF [48:12] + | | | |--MODIFIERS -> MODIFIERS [48:12] + | | | |--TYPE -> TYPE [48:12] + | | | | |--IDENT -> List [48:12] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [48:16] + | | | | |--GENERIC_START -> < [48:16] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [48:17] + | | | | | `--IDENT -> String [48:17] + | | | | `--GENERIC_END -> > [48:23] + | | | |--IDENT -> list [48:25] + | | | `--ASSIGN -> = [48:30] + | | | `--EXPR -> EXPR [48:32] + | | | `--LITERAL_NEW -> new [48:32] + | | | |--IDENT -> List [48:36] + | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [48:40] + | | | | |--GENERIC_START -> < [48:40] + | | | | `--GENERIC_END -> > [48:41] + | | | |--LPAREN -> ( [48:42] + | | | |--ELIST -> ELIST [48:43] + | | | |--RPAREN -> ) [48:43] + | | | `--OBJBLOCK -> OBJBLOCK [48:45] + | | | |--LCURLY -> { [48:45] + | | | |--METHOD_DEF -> METHOD_DEF [49:16] + | | | | |--MODIFIERS -> MODIFIERS [49:16] + | | | | | |--ANNOTATION -> ANNOTATION [49:16] + | | | | | | |--AT -> @ [49:16] + | | | | | | `--IDENT -> Override [49:17] + | | | | | `--LITERAL_PUBLIC -> public [50:16] + | | | | |--TYPE -> TYPE [50:23] + | | | | | `--LITERAL_INT -> int [50:23] + | | | | |--IDENT -> size [50:27] + | | | | |--LPAREN -> ( [50:31] + | | | | |--PARAMETERS -> PARAMETERS [50:32] + | | | | |--RPAREN -> ) [50:32] + | | | | `--SLIST -> { [50:34] + | | | | |--LITERAL_RETURN -> return [51:20] + | | | | | |--EXPR -> EXPR [51:27] + | | | | | | `--NUM_INT -> 0 [51:27] + | | | | | `--SEMI -> ; [51:28] + | | | | `--RCURLY -> } [52:16] + | | | |--METHOD_DEF -> METHOD_DEF [54:16] + | | | | |--MODIFIERS -> MODIFIERS [54:16] + | | | | | |--ANNOTATION -> ANNOTATION [54:16] + | | | | | | |--AT -> @ [54:16] + | | | | | | `--IDENT -> Override [54:17] + | | | | | `--LITERAL_PUBLIC -> public [55:16] + | | | | |--TYPE -> TYPE [55:23] + | | | | | `--LITERAL_BOOLEAN -> boolean [55:23] + | | | | |--IDENT -> isEmpty [55:31] + | | | | |--LPAREN -> ( [55:38] + | | | | |--PARAMETERS -> PARAMETERS [55:39] + | | | | |--RPAREN -> ) [55:39] + | | | | `--SLIST -> { [55:41] + | | | | |--LITERAL_RETURN -> return [56:20] + | | | | | |--EXPR -> EXPR [56:27] + | | | | | | `--LITERAL_FALSE -> false [56:27] + | | | | | `--SEMI -> ; [56:32] + | | | | `--RCURLY -> } [57:16] + | | | |--METHOD_DEF -> METHOD_DEF [59:16] + | | | | |--MODIFIERS -> MODIFIERS [59:16] + | | | | | |--ANNOTATION -> ANNOTATION [59:16] + | | | | | | |--AT -> @ [59:16] + | | | | | | `--IDENT -> Override [59:17] + | | | | | `--LITERAL_PUBLIC -> public [60:16] + | | | | |--TYPE -> TYPE [60:23] + | | | | | `--LITERAL_BOOLEAN -> boolean [60:23] + | | | | |--IDENT -> contains [60:31] + | | | | |--LPAREN -> ( [60:39] + | | | | |--PARAMETERS -> PARAMETERS [60:40] + | | | | | `--PARAMETER_DEF -> PARAMETER_DEF [60:40] + | | | | | |--MODIFIERS -> MODIFIERS [60:40] + | | | | | |--TYPE -> TYPE [60:40] + | | | | | | `--IDENT -> Object [60:40] + | | | | | `--IDENT -> o [60:47] + | | | | |--RPAREN -> ) [60:48] + | | | | `--SLIST -> { [60:50] + | | | | |--LITERAL_RETURN -> return [61:20] + | | | | | |--EXPR -> EXPR [61:27] + | | | | | | `--LITERAL_FALSE -> false [61:27] + | | | | | `--SEMI -> ; [61:32] + | | | | `--RCURLY -> } [62:16] + | | | |--METHOD_DEF -> METHOD_DEF [64:16] + | | | | |--MODIFIERS -> MODIFIERS [64:16] + | | | | | |--ANNOTATION -> ANNOTATION [64:16] + | | | | | | |--AT -> @ [64:16] + | | | | | | `--IDENT -> Override [64:17] + | | | | | `--LITERAL_PUBLIC -> public [65:16] + | | | | |--TYPE -> TYPE [65:23] + | | | | | |--IDENT -> Iterator [65:23] + | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [65:31] + | | | | | |--GENERIC_START -> < [65:31] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [65:32] + | | | | | | `--IDENT -> String [65:32] + | | | | | `--GENERIC_END -> > [65:38] + | | | | |--IDENT -> iterator [65:40] + | | | | |--LPAREN -> ( [65:48] + | | | | |--PARAMETERS -> PARAMETERS [65:49] + | | | | |--RPAREN -> ) [65:49] + | | | | `--SLIST -> { [65:51] + | | | | |--LITERAL_RETURN -> return [66:20] + | | | | | |--EXPR -> EXPR [66:27] + | | | | | | `--LITERAL_NULL -> null [66:27] + | | | | | `--SEMI -> ; [66:31] + | | | | `--RCURLY -> } [67:16] + | | | |--METHOD_DEF -> METHOD_DEF [69:16] + | | | | |--MODIFIERS -> MODIFIERS [69:16] + | | | | | |--ANNOTATION -> ANNOTATION [69:16] + | | | | | | |--AT -> @ [69:16] + | | | | | | `--IDENT -> Override [69:17] + | | | | | `--LITERAL_PUBLIC -> public [70:16] + | | | | |--TYPE -> TYPE [70:23] + | | | | | |--IDENT -> Object [70:23] + | | | | | `--ARRAY_DECLARATOR -> [ [70:29] + | | | | | `--RBRACK -> ] [70:30] + | | | | |--IDENT -> toArray [70:32] + | | | | |--LPAREN -> ( [70:39] + | | | | |--PARAMETERS -> PARAMETERS [70:40] + | | | | |--RPAREN -> ) [70:40] + | | | | `--SLIST -> { [70:42] + | | | | |--LITERAL_RETURN -> return [71:20] + | | | | | |--EXPR -> EXPR [71:27] + | | | | | | `--LITERAL_NEW -> new [71:27] + | | | | | | |--IDENT -> Object [71:31] + | | | | | | `--ARRAY_DECLARATOR -> [ [71:37] + | | | | | | |--EXPR -> EXPR [71:38] + | | | | | | | `--NUM_INT -> 0 [71:38] + | | | | | | `--RBRACK -> ] [71:39] + | | | | | `--SEMI -> ; [71:40] + | | | | `--RCURLY -> } [72:16] + | | | |--METHOD_DEF -> METHOD_DEF [74:16] + | | | | |--MODIFIERS -> MODIFIERS [74:16] + | | | | | |--ANNOTATION -> ANNOTATION [74:16] + | | | | | | |--AT -> @ [74:16] + | | | | | | `--IDENT -> Override [74:17] + | | | | | `--LITERAL_PUBLIC -> public [75:16] + | | | | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [75:23] + | | | | | |--GENERIC_START -> < [75:23] + | | | | | |--TYPE_PARAMETER -> TYPE_PARAMETER [75:24] + | | | | | | `--IDENT -> T [75:24] + | | | | | `--GENERIC_END -> > [75:25] + | | | | |--TYPE -> TYPE [75:27] + | | | | | |--IDENT -> T [75:27] + | | | | | `--ARRAY_DECLARATOR -> [ [75:28] + | | | | | `--RBRACK -> ] [75:29] + | | | | |--IDENT -> toArray [75:31] + | | | | |--LPAREN -> ( [75:38] + | | | | |--PARAMETERS -> PARAMETERS [75:39] + | | | | | `--PARAMETER_DEF -> PARAMETER_DEF [75:39] + | | | | | |--MODIFIERS -> MODIFIERS [75:39] + | | | | | |--TYPE -> TYPE [75:39] + | | | | | | |--IDENT -> T [75:39] + | | | | | | `--ARRAY_DECLARATOR -> [ [75:40] + | | | | | | `--RBRACK -> ] [75:41] + | | | | | `--IDENT -> a [75:43] + | | | | |--RPAREN -> ) [75:44] + | | | | `--SLIST -> { [75:46] + | | | | |--LITERAL_RETURN -> return [76:20] + | | | | | |--EXPR -> EXPR [76:27] + | | | | | | `--LITERAL_NULL -> null [76:27] + | | | | | `--SEMI -> ; [76:31] + | | | | `--RCURLY -> } [77:16] + | | | |--METHOD_DEF -> METHOD_DEF [79:16] + | | | | |--MODIFIERS -> MODIFIERS [79:16] + | | | | | |--ANNOTATION -> ANNOTATION [79:16] + | | | | | | |--AT -> @ [79:16] + | | | | | | `--IDENT -> Override [79:17] + | | | | | `--LITERAL_PUBLIC -> public [80:16] + | | | | |--TYPE -> TYPE [80:23] + | | | | | `--LITERAL_BOOLEAN -> boolean [80:23] + | | | | |--IDENT -> add [80:31] + | | | | |--LPAREN -> ( [80:34] + | | | | |--PARAMETERS -> PARAMETERS [80:35] + | | | | | `--PARAMETER_DEF -> PARAMETER_DEF [80:35] + | | | | | |--MODIFIERS -> MODIFIERS [80:35] + | | | | | |--TYPE -> TYPE [80:35] + | | | | | | `--IDENT -> String [80:35] + | | | | | `--IDENT -> s [80:42] + | | | | |--RPAREN -> ) [80:43] + | | | | `--SLIST -> { [80:45] + | | | | |--LITERAL_RETURN -> return [81:20] + | | | | | |--EXPR -> EXPR [81:27] + | | | | | | `--LITERAL_FALSE -> false [81:27] + | | | | | `--SEMI -> ; [81:32] + | | | | `--RCURLY -> } [82:16] + | | | |--METHOD_DEF -> METHOD_DEF [84:16] + | | | | |--MODIFIERS -> MODIFIERS [84:16] + | | | | | |--ANNOTATION -> ANNOTATION [84:16] + | | | | | | |--AT -> @ [84:16] + | | | | | | `--IDENT -> Override [84:17] + | | | | | `--LITERAL_PUBLIC -> public [85:16] + | | | | |--TYPE -> TYPE [85:23] + | | | | | `--LITERAL_BOOLEAN -> boolean [85:23] + | | | | |--IDENT -> remove [85:31] + | | | | |--LPAREN -> ( [85:37] + | | | | |--PARAMETERS -> PARAMETERS [85:38] + | | | | | `--PARAMETER_DEF -> PARAMETER_DEF [85:38] + | | | | | |--MODIFIERS -> MODIFIERS [85:38] + | | | | | |--TYPE -> TYPE [85:38] + | | | | | | `--IDENT -> Object [85:38] + | | | | | `--IDENT -> o [85:45] + | | | | |--RPAREN -> ) [85:46] + | | | | `--SLIST -> { [85:48] + | | | | |--LITERAL_RETURN -> return [86:20] + | | | | | |--EXPR -> EXPR [86:27] + | | | | | | `--LITERAL_FALSE -> false [86:27] + | | | | | `--SEMI -> ; [86:32] + | | | | `--RCURLY -> } [87:16] + | | | |--METHOD_DEF -> METHOD_DEF [89:16] + | | | | |--MODIFIERS -> MODIFIERS [89:16] + | | | | | |--ANNOTATION -> ANNOTATION [89:16] + | | | | | | |--AT -> @ [89:16] + | | | | | | `--IDENT -> Override [89:17] + | | | | | `--LITERAL_PUBLIC -> public [90:16] + | | | | |--TYPE -> TYPE [90:23] + | | | | | `--LITERAL_BOOLEAN -> boolean [90:23] + | | | | |--IDENT -> containsAll [90:31] + | | | | |--LPAREN -> ( [90:42] + | | | | |--PARAMETERS -> PARAMETERS [90:43] + | | | | | `--PARAMETER_DEF -> PARAMETER_DEF [90:43] + | | | | | |--MODIFIERS -> MODIFIERS [90:43] + | | | | | |--TYPE -> TYPE [90:43] + | | | | | | |--IDENT -> Collection [90:43] + | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [90:53] + | | | | | | |--GENERIC_START -> < [90:53] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [90:54] + | | | | | | | `--WILDCARD_TYPE -> ? [90:54] + | | | | | | `--GENERIC_END -> > [90:55] + | | | | | `--IDENT -> c [90:57] + | | | | |--RPAREN -> ) [90:58] + | | | | `--SLIST -> { [90:60] + | | | | |--LITERAL_RETURN -> return [91:20] + | | | | | |--EXPR -> EXPR [91:27] + | | | | | | `--LITERAL_FALSE -> false [91:27] + | | | | | `--SEMI -> ; [91:32] + | | | | `--RCURLY -> } [92:16] + | | | |--METHOD_DEF -> METHOD_DEF [94:16] + | | | | |--MODIFIERS -> MODIFIERS [94:16] + | | | | | |--ANNOTATION -> ANNOTATION [94:16] + | | | | | | |--AT -> @ [94:16] + | | | | | | `--IDENT -> Override [94:17] + | | | | | `--LITERAL_PUBLIC -> public [95:16] + | | | | |--TYPE -> TYPE [95:23] + | | | | | `--LITERAL_BOOLEAN -> boolean [95:23] + | | | | |--IDENT -> addAll [95:31] + | | | | |--LPAREN -> ( [95:37] + | | | | |--PARAMETERS -> PARAMETERS [95:38] + | | | | | `--PARAMETER_DEF -> PARAMETER_DEF [95:38] + | | | | | |--MODIFIERS -> MODIFIERS [95:38] + | | | | | |--TYPE -> TYPE [95:38] + | | | | | | |--IDENT -> Collection [95:38] + | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [95:48] + | | | | | | |--GENERIC_START -> < [95:48] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [95:49] + | | | | | | | |--WILDCARD_TYPE -> ? [95:49] + | | | | | | | `--TYPE_UPPER_BOUNDS -> extends [95:51] + | | | | | | | `--IDENT -> String [95:59] + | | | | | | `--GENERIC_END -> > [95:65] + | | | | | `--IDENT -> c [95:67] + | | | | |--RPAREN -> ) [95:68] + | | | | `--SLIST -> { [95:70] + | | | | |--LITERAL_RETURN -> return [96:20] + | | | | | |--EXPR -> EXPR [96:27] + | | | | | | `--LITERAL_FALSE -> false [96:27] + | | | | | `--SEMI -> ; [96:32] + | | | | `--RCURLY -> } [97:16] + | | | |--METHOD_DEF -> METHOD_DEF [99:16] + | | | | |--MODIFIERS -> MODIFIERS [99:16] + | | | | | |--ANNOTATION -> ANNOTATION [99:16] + | | | | | | |--AT -> @ [99:16] + | | | | | | `--IDENT -> Override [99:17] + | | | | | `--LITERAL_PUBLIC -> public [100:16] + | | | | |--TYPE -> TYPE [100:23] + | | | | | `--LITERAL_BOOLEAN -> boolean [100:23] + | | | | |--IDENT -> addAll [100:31] + | | | | |--LPAREN -> ( [100:37] + | | | | |--PARAMETERS -> PARAMETERS [100:38] + | | | | | |--PARAMETER_DEF -> PARAMETER_DEF [100:38] + | | | | | | |--MODIFIERS -> MODIFIERS [100:38] + | | | | | | |--TYPE -> TYPE [100:38] + | | | | | | | `--LITERAL_INT -> int [100:38] + | | | | | | `--IDENT -> index [100:42] + | | | | | |--COMMA -> , [100:47] + | | | | | `--PARAMETER_DEF -> PARAMETER_DEF [100:49] + | | | | | |--MODIFIERS -> MODIFIERS [100:49] + | | | | | |--TYPE -> TYPE [100:49] + | | | | | | |--IDENT -> Collection [100:49] + | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [100:59] + | | | | | | |--GENERIC_START -> < [100:59] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [100:60] + | | | | | | | |--WILDCARD_TYPE -> ? [100:60] + | | | | | | | `--TYPE_UPPER_BOUNDS -> extends [100:62] + | | | | | | | `--IDENT -> String [100:70] + | | | | | | `--GENERIC_END -> > [100:76] + | | | | | `--IDENT -> c [100:78] + | | | | |--RPAREN -> ) [100:79] + | | | | `--SLIST -> { [100:81] + | | | | |--LITERAL_RETURN -> return [101:20] + | | | | | |--EXPR -> EXPR [101:27] + | | | | | | `--LITERAL_FALSE -> false [101:27] + | | | | | `--SEMI -> ; [101:32] + | | | | `--RCURLY -> } [102:16] + | | | |--METHOD_DEF -> METHOD_DEF [104:16] + | | | | |--MODIFIERS -> MODIFIERS [104:16] + | | | | | |--ANNOTATION -> ANNOTATION [104:16] + | | | | | | |--AT -> @ [104:16] + | | | | | | `--IDENT -> Override [104:17] + | | | | | `--LITERAL_PUBLIC -> public [105:16] + | | | | |--TYPE -> TYPE [105:23] + | | | | | `--LITERAL_BOOLEAN -> boolean [105:23] + | | | | |--IDENT -> removeAll [105:31] + | | | | |--LPAREN -> ( [105:40] + | | | | |--PARAMETERS -> PARAMETERS [105:41] + | | | | | `--PARAMETER_DEF -> PARAMETER_DEF [105:41] + | | | | | |--MODIFIERS -> MODIFIERS [105:41] + | | | | | |--TYPE -> TYPE [105:41] + | | | | | | |--IDENT -> Collection [105:41] + | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [105:51] + | | | | | | |--GENERIC_START -> < [105:51] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [105:52] + | | | | | | | `--WILDCARD_TYPE -> ? [105:52] + | | | | | | `--GENERIC_END -> > [105:53] + | | | | | `--IDENT -> c [105:55] + | | | | |--RPAREN -> ) [105:56] + | | | | `--SLIST -> { [105:58] + | | | | |--LITERAL_RETURN -> return [106:20] + | | | | | |--EXPR -> EXPR [106:27] + | | | | | | `--LITERAL_FALSE -> false [106:27] + | | | | | `--SEMI -> ; [106:32] + | | | | `--RCURLY -> } [107:16] + | | | |--METHOD_DEF -> METHOD_DEF [109:16] + | | | | |--MODIFIERS -> MODIFIERS [109:16] + | | | | | |--ANNOTATION -> ANNOTATION [109:16] + | | | | | | |--AT -> @ [109:16] + | | | | | | `--IDENT -> Override [109:17] + | | | | | `--LITERAL_PUBLIC -> public [110:16] + | | | | |--TYPE -> TYPE [110:23] + | | | | | `--LITERAL_BOOLEAN -> boolean [110:23] + | | | | |--IDENT -> retainAll [110:31] + | | | | |--LPAREN -> ( [110:40] + | | | | |--PARAMETERS -> PARAMETERS [110:41] + | | | | | `--PARAMETER_DEF -> PARAMETER_DEF [110:41] + | | | | | |--MODIFIERS -> MODIFIERS [110:41] + | | | | | |--TYPE -> TYPE [110:41] + | | | | | | |--IDENT -> Collection [110:41] + | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [110:51] + | | | | | | |--GENERIC_START -> < [110:51] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [110:52] + | | | | | | | `--WILDCARD_TYPE -> ? [110:52] + | | | | | | `--GENERIC_END -> > [110:53] + | | | | | `--IDENT -> c [110:55] + | | | | |--RPAREN -> ) [110:56] + | | | | `--SLIST -> { [110:58] + | | | | |--LITERAL_RETURN -> return [111:20] + | | | | | |--EXPR -> EXPR [111:27] + | | | | | | `--LITERAL_FALSE -> false [111:27] + | | | | | `--SEMI -> ; [111:32] + | | | | `--RCURLY -> } [112:16] + | | | |--METHOD_DEF -> METHOD_DEF [114:16] + | | | | |--MODIFIERS -> MODIFIERS [114:16] + | | | | | |--ANNOTATION -> ANNOTATION [114:16] + | | | | | | |--AT -> @ [114:16] + | | | | | | `--IDENT -> Override [114:17] + | | | | | `--LITERAL_PUBLIC -> public [115:16] + | | | | |--TYPE -> TYPE [115:23] + | | | | | `--LITERAL_VOID -> void [115:23] + | | | | |--IDENT -> clear [115:28] + | | | | |--LPAREN -> ( [115:33] + | | | | |--PARAMETERS -> PARAMETERS [115:34] + | | | | |--RPAREN -> ) [115:34] + | | | | `--SLIST -> { [115:36] + | | | | `--RCURLY -> } [117:16] + | | | |--METHOD_DEF -> METHOD_DEF [119:16] + | | | | |--MODIFIERS -> MODIFIERS [119:16] + | | | | | |--ANNOTATION -> ANNOTATION [119:16] + | | | | | | |--AT -> @ [119:16] + | | | | | | `--IDENT -> Override [119:17] + | | | | | `--LITERAL_PUBLIC -> public [120:16] + | | | | |--TYPE -> TYPE [120:23] + | | | | | `--IDENT -> String [120:23] + | | | | |--IDENT -> get [120:30] + | | | | |--LPAREN -> ( [120:33] + | | | | |--PARAMETERS -> PARAMETERS [120:34] + | | | | | `--PARAMETER_DEF -> PARAMETER_DEF [120:34] + | | | | | |--MODIFIERS -> MODIFIERS [120:34] + | | | | | |--TYPE -> TYPE [120:34] + | | | | | | `--LITERAL_INT -> int [120:34] + | | | | | `--IDENT -> index [120:38] + | | | | |--RPAREN -> ) [120:43] + | | | | `--SLIST -> { [120:45] + | | | | |--LITERAL_RETURN -> return [121:20] + | | | | | |--EXPR -> EXPR [121:27] + | | | | | | `--LITERAL_NULL -> null [121:27] + | | | | | `--SEMI -> ; [121:31] + | | | | `--RCURLY -> } [122:16] + | | | |--METHOD_DEF -> METHOD_DEF [124:16] + | | | | |--MODIFIERS -> MODIFIERS [124:16] + | | | | | |--ANNOTATION -> ANNOTATION [124:16] + | | | | | | |--AT -> @ [124:16] + | | | | | | `--IDENT -> Override [124:17] + | | | | | `--LITERAL_PUBLIC -> public [125:16] + | | | | |--TYPE -> TYPE [125:23] + | | | | | `--IDENT -> String [125:23] + | | | | |--IDENT -> set [125:30] + | | | | |--LPAREN -> ( [125:33] + | | | | |--PARAMETERS -> PARAMETERS [125:34] + | | | | | |--PARAMETER_DEF -> PARAMETER_DEF [125:34] + | | | | | | |--MODIFIERS -> MODIFIERS [125:34] + | | | | | | |--TYPE -> TYPE [125:34] + | | | | | | | `--LITERAL_INT -> int [125:34] + | | | | | | `--IDENT -> index [125:38] + | | | | | |--COMMA -> , [125:43] + | | | | | `--PARAMETER_DEF -> PARAMETER_DEF [125:45] + | | | | | |--MODIFIERS -> MODIFIERS [125:45] + | | | | | |--TYPE -> TYPE [125:45] + | | | | | | `--IDENT -> String [125:45] + | | | | | `--IDENT -> element [125:52] + | | | | |--RPAREN -> ) [125:59] + | | | | `--SLIST -> { [125:61] + | | | | |--LITERAL_RETURN -> return [126:20] + | | | | | |--EXPR -> EXPR [126:27] + | | | | | | `--LITERAL_NULL -> null [126:27] + | | | | | `--SEMI -> ; [126:31] + | | | | `--RCURLY -> } [127:16] + | | | |--METHOD_DEF -> METHOD_DEF [129:16] + | | | | |--MODIFIERS -> MODIFIERS [129:16] + | | | | | |--ANNOTATION -> ANNOTATION [129:16] + | | | | | | |--AT -> @ [129:16] + | | | | | | `--IDENT -> Override [129:17] + | | | | | `--LITERAL_PUBLIC -> public [130:16] + | | | | |--TYPE -> TYPE [130:23] + | | | | | `--LITERAL_VOID -> void [130:23] + | | | | |--IDENT -> add [130:28] + | | | | |--LPAREN -> ( [130:31] + | | | | |--PARAMETERS -> PARAMETERS [130:32] + | | | | | |--PARAMETER_DEF -> PARAMETER_DEF [130:32] + | | | | | | |--MODIFIERS -> MODIFIERS [130:32] + | | | | | | |--TYPE -> TYPE [130:32] + | | | | | | | `--LITERAL_INT -> int [130:32] + | | | | | | `--IDENT -> index [130:36] + | | | | | |--COMMA -> , [130:41] + | | | | | `--PARAMETER_DEF -> PARAMETER_DEF [130:43] + | | | | | |--MODIFIERS -> MODIFIERS [130:43] + | | | | | |--TYPE -> TYPE [130:43] + | | | | | | `--IDENT -> String [130:43] + | | | | | `--IDENT -> element [130:50] + | | | | |--RPAREN -> ) [130:57] + | | | | `--SLIST -> { [130:59] + | | | | `--RCURLY -> } [132:16] + | | | |--METHOD_DEF -> METHOD_DEF [134:16] + | | | | |--MODIFIERS -> MODIFIERS [134:16] + | | | | | |--ANNOTATION -> ANNOTATION [134:16] + | | | | | | |--AT -> @ [134:16] + | | | | | | `--IDENT -> Override [134:17] + | | | | | `--LITERAL_PUBLIC -> public [135:16] + | | | | |--TYPE -> TYPE [135:23] + | | | | | `--IDENT -> String [135:23] + | | | | |--IDENT -> remove [135:30] + | | | | |--LPAREN -> ( [135:36] + | | | | |--PARAMETERS -> PARAMETERS [135:37] + | | | | | `--PARAMETER_DEF -> PARAMETER_DEF [135:37] + | | | | | |--MODIFIERS -> MODIFIERS [135:37] + | | | | | |--TYPE -> TYPE [135:37] + | | | | | | `--LITERAL_INT -> int [135:37] + | | | | | `--IDENT -> index [135:41] + | | | | |--RPAREN -> ) [135:46] + | | | | `--SLIST -> { [135:48] + | | | | |--LITERAL_RETURN -> return [136:20] + | | | | | |--EXPR -> EXPR [136:27] + | | | | | | `--LITERAL_NULL -> null [136:27] + | | | | | `--SEMI -> ; [136:31] + | | | | `--RCURLY -> } [137:16] + | | | |--METHOD_DEF -> METHOD_DEF [139:16] + | | | | |--MODIFIERS -> MODIFIERS [139:16] + | | | | | |--ANNOTATION -> ANNOTATION [139:16] + | | | | | | |--AT -> @ [139:16] + | | | | | | `--IDENT -> Override [139:17] + | | | | | `--LITERAL_PUBLIC -> public [140:16] + | | | | |--TYPE -> TYPE [140:23] + | | | | | `--LITERAL_INT -> int [140:23] + | | | | |--IDENT -> indexOf [140:27] + | | | | |--LPAREN -> ( [140:34] + | | | | |--PARAMETERS -> PARAMETERS [140:35] + | | | | | `--PARAMETER_DEF -> PARAMETER_DEF [140:35] + | | | | | |--MODIFIERS -> MODIFIERS [140:35] + | | | | | |--TYPE -> TYPE [140:35] + | | | | | | `--IDENT -> Object [140:35] + | | | | | `--IDENT -> o [140:42] + | | | | |--RPAREN -> ) [140:43] + | | | | `--SLIST -> { [140:45] + | | | | |--LITERAL_RETURN -> return [141:20] + | | | | | |--EXPR -> EXPR [141:27] + | | | | | | `--NUM_INT -> 0 [141:27] + | | | | | `--SEMI -> ; [141:28] + | | | | `--RCURLY -> } [142:16] + | | | |--METHOD_DEF -> METHOD_DEF [144:16] + | | | | |--MODIFIERS -> MODIFIERS [144:16] + | | | | | |--ANNOTATION -> ANNOTATION [144:16] + | | | | | | |--AT -> @ [144:16] + | | | | | | `--IDENT -> Override [144:17] + | | | | | `--LITERAL_PUBLIC -> public [145:16] + | | | | |--TYPE -> TYPE [145:23] + | | | | | `--LITERAL_INT -> int [145:23] + | | | | |--IDENT -> lastIndexOf [145:27] + | | | | |--LPAREN -> ( [145:38] + | | | | |--PARAMETERS -> PARAMETERS [145:39] + | | | | | `--PARAMETER_DEF -> PARAMETER_DEF [145:39] + | | | | | |--MODIFIERS -> MODIFIERS [145:39] + | | | | | |--TYPE -> TYPE [145:39] + | | | | | | `--IDENT -> Object [145:39] + | | | | | `--IDENT -> o [145:46] + | | | | |--RPAREN -> ) [145:47] + | | | | `--SLIST -> { [145:49] + | | | | |--LITERAL_RETURN -> return [146:20] + | | | | | |--EXPR -> EXPR [146:27] + | | | | | | `--NUM_INT -> 0 [146:27] + | | | | | `--SEMI -> ; [146:28] + | | | | `--RCURLY -> } [147:16] + | | | |--METHOD_DEF -> METHOD_DEF [149:16] + | | | | |--MODIFIERS -> MODIFIERS [149:16] + | | | | | |--ANNOTATION -> ANNOTATION [149:16] + | | | | | | |--AT -> @ [149:16] + | | | | | | `--IDENT -> Override [149:17] + | | | | | `--LITERAL_PUBLIC -> public [150:16] + | | | | |--TYPE -> TYPE [150:23] + | | | | | |--IDENT -> ListIterator [150:23] + | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [150:35] + | | | | | |--GENERIC_START -> < [150:35] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [150:36] + | | | | | | `--IDENT -> String [150:36] + | | | | | `--GENERIC_END -> > [150:42] + | | | | |--IDENT -> listIterator [150:44] + | | | | |--LPAREN -> ( [150:56] + | | | | |--PARAMETERS -> PARAMETERS [150:57] + | | | | |--RPAREN -> ) [150:57] + | | | | `--SLIST -> { [150:59] + | | | | |--LITERAL_RETURN -> return [151:20] + | | | | | |--EXPR -> EXPR [151:27] + | | | | | | `--LITERAL_NULL -> null [151:27] + | | | | | `--SEMI -> ; [151:31] + | | | | `--RCURLY -> } [152:16] + | | | |--METHOD_DEF -> METHOD_DEF [154:16] + | | | | |--MODIFIERS -> MODIFIERS [154:16] + | | | | | |--ANNOTATION -> ANNOTATION [154:16] + | | | | | | |--AT -> @ [154:16] + | | | | | | `--IDENT -> Override [154:17] + | | | | | `--LITERAL_PUBLIC -> public [155:16] + | | | | |--TYPE -> TYPE [155:23] + | | | | | |--IDENT -> ListIterator [155:23] + | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [155:35] + | | | | | |--GENERIC_START -> < [155:35] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [155:36] + | | | | | | `--IDENT -> String [155:36] + | | | | | `--GENERIC_END -> > [155:42] + | | | | |--IDENT -> listIterator [155:44] + | | | | |--LPAREN -> ( [155:56] + | | | | |--PARAMETERS -> PARAMETERS [155:57] + | | | | | `--PARAMETER_DEF -> PARAMETER_DEF [155:57] + | | | | | |--MODIFIERS -> MODIFIERS [155:57] + | | | | | |--TYPE -> TYPE [155:57] + | | | | | | `--LITERAL_INT -> int [155:57] + | | | | | `--IDENT -> index [155:61] + | | | | |--RPAREN -> ) [155:66] + | | | | `--SLIST -> { [155:68] + | | | | |--LITERAL_RETURN -> return [156:20] + | | | | | |--EXPR -> EXPR [156:27] + | | | | | | `--LITERAL_NULL -> null [156:27] + | | | | | `--SEMI -> ; [156:31] + | | | | `--RCURLY -> } [157:16] + | | | |--METHOD_DEF -> METHOD_DEF [159:16] + | | | | |--MODIFIERS -> MODIFIERS [159:16] + | | | | | |--ANNOTATION -> ANNOTATION [159:16] + | | | | | | |--AT -> @ [159:16] + | | | | | | `--IDENT -> Override [159:17] + | | | | | `--LITERAL_PUBLIC -> public [160:16] + | | | | |--TYPE -> TYPE [160:23] + | | | | | |--IDENT -> List [160:23] + | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [160:27] + | | | | | |--GENERIC_START -> < [160:27] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [160:28] + | | | | | | `--IDENT -> String [160:28] + | | | | | `--GENERIC_END -> > [160:34] + | | | | |--IDENT -> subList [160:36] + | | | | |--LPAREN -> ( [160:43] + | | | | |--PARAMETERS -> PARAMETERS [160:44] + | | | | | |--PARAMETER_DEF -> PARAMETER_DEF [160:44] + | | | | | | |--MODIFIERS -> MODIFIERS [160:44] + | | | | | | |--TYPE -> TYPE [160:44] + | | | | | | | `--LITERAL_INT -> int [160:44] + | | | | | | `--IDENT -> fromIndex [160:48] + | | | | | |--COMMA -> , [160:57] + | | | | | `--PARAMETER_DEF -> PARAMETER_DEF [160:59] + | | | | | |--MODIFIERS -> MODIFIERS [160:59] + | | | | | |--TYPE -> TYPE [160:59] + | | | | | | `--LITERAL_INT -> int [160:59] + | | | | | `--IDENT -> toIndex [160:63] + | | | | |--RPAREN -> ) [160:70] + | | | | `--SLIST -> { [160:72] + | | | | |--LITERAL_RETURN -> return [161:20] + | | | | | |--EXPR -> EXPR [161:27] + | | | | | | `--LITERAL_NULL -> null [161:27] + | | | | | `--SEMI -> ; [161:31] + | | | | `--RCURLY -> } [162:16] + | | | `--RCURLY -> } [163:12] + | | |--SEMI -> ; [163:13] + | | `--RCURLY -> } [164:8] + | `--RCURLY -> } [165:4] + |--CLASS_DEF -> CLASS_DEF [167:4] + | |--MODIFIERS -> MODIFIERS [167:4] + | |--LITERAL_CLASS -> class [167:4] + | |--IDENT -> OtherInner [167:10] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [167:20] + | | |--GENERIC_START -> < [167:20] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [167:21] + | | | `--IDENT -> E [167:21] + | | `--GENERIC_END -> > [167:22] + | `--OBJBLOCK -> OBJBLOCK [167:24] + | |--LCURLY -> { [167:24] + | |--CTOR_DEF -> CTOR_DEF [168:8] + | | |--MODIFIERS -> MODIFIERS [168:8] + | | |--IDENT -> OtherInner [168:8] + | | |--LPAREN -> ( [168:18] + | | |--PARAMETERS -> PARAMETERS [168:19] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [168:19] + | | | |--MODIFIERS -> MODIFIERS [168:19] + | | | |--TYPE -> TYPE [168:19] + | | | | `--LITERAL_INT -> int [168:19] + | | | `--IDENT -> w [168:23] + | | |--RPAREN -> ) [168:24] + | | `--SLIST -> { [168:25] + | | `--RCURLY -> } [168:26] + | |--CTOR_DEF -> CTOR_DEF [169:8] + | | |--MODIFIERS -> MODIFIERS [169:8] + | | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [169:8] + | | | |--GENERIC_START -> < [169:8] + | | | |--TYPE_PARAMETER -> TYPE_PARAMETER [169:9] + | | | | |--IDENT -> T [169:9] + | | | | `--TYPE_UPPER_BOUNDS -> extends [169:11] + | | | | `--IDENT -> Serializable [169:19] + | | | `--GENERIC_END -> > [169:31] + | | |--IDENT -> OtherInner [169:33] + | | |--LPAREN -> ( [169:43] + | | |--PARAMETERS -> PARAMETERS [169:44] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [169:44] + | | | |--MODIFIERS -> MODIFIERS [169:44] + | | | |--TYPE -> TYPE [169:44] + | | | | `--IDENT -> T [169:44] + | | | `--IDENT -> element [169:46] + | | |--RPAREN -> ) [169:53] + | | `--SLIST -> { [169:55] + | | `--RCURLY -> } [171:8] + | |--CTOR_DEF -> CTOR_DEF [172:8] + | | |--MODIFIERS -> MODIFIERS [172:8] + | | |--IDENT -> OtherInner [172:8] + | | |--LPAREN -> ( [172:18] + | | |--PARAMETERS -> PARAMETERS [172:19] + | | |--RPAREN -> ) [172:19] + | | `--SLIST -> { [172:21] + | | |--CTOR_CALL -> this [173:15] + | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [173:12] + | | | | |--GENERIC_START -> < [173:12] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [173:13] + | | | | | `--IDENT -> E [173:13] + | | | | `--GENERIC_END -> > [173:14] + | | | |--LPAREN -> ( [173:19] + | | | |--ELIST -> ELIST [173:20] + | | | | `--EXPR -> EXPR [173:20] + | | | | `--NUM_INT -> 2 [173:20] + | | | |--RPAREN -> ) [173:21] + | | | `--SEMI -> ; [173:22] + | | `--RCURLY -> } [174:8] + | `--RCURLY -> } [175:4] + |--METHOD_DEF -> METHOD_DEF [177:4] + | |--MODIFIERS -> MODIFIERS [177:4] + | | `--LITERAL_PRIVATE -> private [177:4] + | |--TYPE -> TYPE [177:12] + | | `--LITERAL_VOID -> void [177:12] + | |--IDENT -> killAll [177:17] + | |--LPAREN -> ( [177:24] + | |--PARAMETERS -> PARAMETERS [177:25] + | |--RPAREN -> ) [177:25] + | `--SLIST -> { [177:27] + | |--VARIABLE_DEF -> VARIABLE_DEF [178:10] + | | |--MODIFIERS -> MODIFIERS [178:10] + | | |--TYPE -> TYPE [178:10] + | | | `--LITERAL_BOOLEAN -> boolean [178:10] + | | |--IDENT -> oneAlive [178:18] + | | `--ASSIGN -> = [178:27] + | | `--EXPR -> EXPR [178:29] + | | `--LITERAL_FALSE -> false [178:29] + | |--SEMI -> ; [178:34] + | |--LITERAL_IF -> if [179:14] + | | |--LPAREN -> ( [179:17] + | | |--EXPR -> EXPR [179:18] + | | | `--IDENT -> oneAlive [179:18] + | | |--RPAREN -> ) [179:26] + | | `--SLIST -> { [179:28] + | | |--EXPR -> EXPR [180:30] + | | | `--METHOD_CALL -> ( [180:30] + | | | |--DOT -> . [180:24] + | | | | |--IDENT -> Thread [180:18] + | | | | `--IDENT -> yield [180:25] + | | | |--ELIST -> ELIST [180:31] + | | | `--RPAREN -> ) [180:31] + | | |--SEMI -> ; [180:32] + | | `--RCURLY -> } [181:14] + | `--RCURLY -> } [183:6] + |--CLASS_DEF -> CLASS_DEF [184:4] + | |--MODIFIERS -> MODIFIERS [184:4] + | |--LITERAL_CLASS -> class [184:4] + | |--IDENT -> SuperClassA [184:10] + | `--OBJBLOCK -> OBJBLOCK [184:21] + | |--LCURLY -> { [184:21] + | |--VARIABLE_DEF -> VARIABLE_DEF [185:8] + | | |--MODIFIERS -> MODIFIERS [185:8] + | | | `--LITERAL_PROTECTED -> protected [185:8] + | | |--TYPE -> TYPE [185:18] + | | | `--IDENT -> SuperClassA [185:18] + | | |--IDENT -> bs [185:30] + | | `--SEMI -> ; [185:32] + | |--VARIABLE_DEF -> VARIABLE_DEF [186:8] + | | |--MODIFIERS -> MODIFIERS [186:8] + | | | `--LITERAL_PROTECTED -> protected [186:8] + | | |--TYPE -> TYPE [186:18] + | | | `--IDENT -> SuperClassA [186:18] + | | |--IDENT -> s [186:30] + | | `--SEMI -> ; [186:31] + | |--VARIABLE_DEF -> VARIABLE_DEF [187:8] + | | |--MODIFIERS -> MODIFIERS [187:8] + | | |--TYPE -> TYPE [187:8] + | | | `--IDENT -> Object [187:8] + | | |--IDENT -> s2 [187:15] + | | `--SEMI -> ; [187:17] + | `--RCURLY -> } [188:4] + |--CLASS_DEF -> CLASS_DEF [189:4] + | |--MODIFIERS -> MODIFIERS [189:4] + | |--LITERAL_CLASS -> class [189:4] + | |--IDENT -> SuperClassA2 [189:10] + | `--OBJBLOCK -> OBJBLOCK [189:22] + | |--LCURLY -> { [189:22] + | `--RCURLY -> } [189:23] + |--CLASS_DEF -> CLASS_DEF [196:4] + | |--MODIFIERS -> MODIFIERS [196:4] + | | |--BLOCK_COMMENT_BEGIN -> /* [192:4] + | | | |--COMMENT_CONTENT -> \n * Note: inherited fields of a nested class shadow outer scope variables\n * Note: only if they are accessible!\n [192:6] + | | | `--BLOCK_COMMENT_END -> */ [195:5] + | | `--LITERAL_PUBLIC -> public [196:4] + | |--LITERAL_CLASS -> class [196:11] + | |--IDENT -> FieldAccessSuper [196:17] + | |--EXTENDS_CLAUSE -> extends [196:34] + | | `--IDENT -> SuperClassA [196:42] + | `--OBJBLOCK -> OBJBLOCK [196:54] + | |--LCURLY -> { [196:54] + | |--VARIABLE_DEF -> VARIABLE_DEF [197:8] + | | |--MODIFIERS -> MODIFIERS [197:8] + | | | `--LITERAL_PRIVATE -> private [197:8] + | | |--TYPE -> TYPE [197:16] + | | | `--IDENT -> SuperClassA [197:16] + | | |--IDENT -> s [197:28] + | | `--SEMI -> ; [197:29] + | |--METHOD_DEF -> METHOD_DEF [199:8] + | | |--MODIFIERS -> MODIFIERS [199:8] + | | | `--LITERAL_PUBLIC -> public [199:8] + | | |--TYPE -> TYPE [199:15] + | | | `--LITERAL_VOID -> void [199:15] + | | |--IDENT -> foo [199:20] + | | |--LPAREN -> ( [199:23] + | | |--PARAMETERS -> PARAMETERS [199:24] + | | |--RPAREN -> ) [199:24] + | | `--SLIST -> { [199:26] + | | |--EXPR -> EXPR [202:14] + | | | `--ASSIGN -> = [202:14] + | | | |--SINGLE_LINE_COMMENT -> // [200:12] + | | | | `--COMMENT_CONTENT -> simple super field access\n [200:14] + | | | |--SINGLE_LINE_COMMENT -> // [201:12] + | | | | `--COMMENT_CONTENT -> Primary[Prefix[Name[s]]]\n [201:14] + | | | |--IDENT -> s [202:12] + | | | `--LITERAL_NEW -> new [202:16] + | | | |--IDENT -> SuperClassA [202:20] + | | | |--LPAREN -> ( [202:31] + | | | |--ELIST -> ELIST [202:32] + | | | `--RPAREN -> ) [202:32] + | | |--SEMI -> ; [202:33] + | | |--EXPR -> EXPR [206:24] + | | | `--ASSIGN -> = [206:24] + | | | |--DOT -> . [206:20] + | | | | |--DOT -> . [206:18] + | | | | | |--SINGLE_LINE_COMMENT -> // [204:12] + | | | | | | `--COMMENT_CONTENT -> access inherited field through primary\n [204:14] + | | | | | |--SINGLE_LINE_COMMENT -> // [205:12] + | | | | | | `--COMMENT_CONTENT -> Primary[ Prefix[Primary[(this)]], Suffix[s], Suffix[s2] ]\n [205:14] + | | | | | |--LPAREN -> ( [206:12] + | | | | | |--LITERAL_THIS -> this [206:13] + | | | | | |--RPAREN -> ) [206:17] + | | | | | `--IDENT -> s [206:19] + | | | | `--IDENT -> s2 [206:21] + | | | `--LITERAL_NEW -> new [206:26] + | | | |--IDENT -> SuperClassA2 [206:30] + | | | |--LPAREN -> ( [206:42] + | | | |--ELIST -> ELIST [206:43] + | | | `--RPAREN -> ) [206:43] + | | |--SEMI -> ; [206:44] + | | |--EXPR -> EXPR [210:19] + | | | `--ASSIGN -> = [210:19] + | | | |--DOT -> . [210:15] + | | | | |--DOT -> . [210:13] + | | | | | |--SINGLE_LINE_COMMENT -> // [208:12] + | | | | | | `--COMMENT_CONTENT -> access inherited field, second 's' has inherited field 's2'\n [208:14] + | | | | | |--SINGLE_LINE_COMMENT -> // [209:12] + | | | | | | `--COMMENT_CONTENT -> Primary[Prefix[Name[s.s.s2]]]\n [209:14] + | | | | | |--IDENT -> s [210:12] + | | | | | `--IDENT -> s [210:14] + | | | | `--IDENT -> s2 [210:16] + | | | `--LITERAL_NEW -> new [210:21] + | | | |--IDENT -> SuperClassA2 [210:25] + | | | |--LPAREN -> ( [210:37] + | | | |--ELIST -> ELIST [210:38] + | | | `--RPAREN -> ) [210:38] + | | |--SEMI -> ; [210:39] + | | |--EXPR -> EXPR [214:20] + | | | `--ASSIGN -> = [214:20] + | | | |--DOT -> . [214:17] + | | | | |--SINGLE_LINE_COMMENT -> // [212:12] + | | | | | `--COMMENT_CONTENT -> field access through super\n [212:14] + | | | | |--SINGLE_LINE_COMMENT -> // [213:12] + | | | | | `--COMMENT_CONTENT -> Primary[Prefix["super"], Suffix["field"]]\n [213:14] + | | | | |--LITERAL_SUPER -> super [214:12] + | | | | `--IDENT -> s [214:18] + | | | `--LITERAL_NEW -> new [214:22] + | | | |--IDENT -> SuperClassA [214:26] + | | | |--LPAREN -> ( [214:37] + | | | |--ELIST -> ELIST [214:38] + | | | `--RPAREN -> ) [214:38] + | | |--SEMI -> ; [214:39] + | | |--EXPR -> EXPR [219:20] + | | | `--ASSIGN -> = [219:20] + | | | |--DOT -> . [218:33] + | | | | |--DOT -> . [218:28] + | | | | | |--SINGLE_LINE_COMMENT -> // [216:12] + | | | | | | `--COMMENT_CONTENT -> fully qualified case\n [216:14] + | | | | | |--SINGLE_LINE_COMMENT -> // [217:12] + | | | | | | `--COMMENT_CONTENT -> Primary[Prefix[Name[net...FieldAccessSuper]], Suffix[this], Suffix[s]]\n [217:14] + | | | | | |--IDENT -> FieldAccessSuper [218:12] + | | | | | `--LITERAL_THIS -> this [218:29] + | | | | `--IDENT -> s [218:34] + | | | `--LITERAL_NEW -> new [219:22] + | | | |--IDENT -> SuperClassA [219:26] + | | | |--LPAREN -> ( [219:37] + | | | |--ELIST -> ELIST [219:38] + | | | `--RPAREN -> ) [219:38] + | | |--SEMI -> ; [219:39] + | | `--RCURLY -> } [220:8] + | |--CLASS_DEF -> CLASS_DEF [222:8] + | | |--MODIFIERS -> MODIFIERS [222:8] + | | | `--LITERAL_PUBLIC -> public [222:8] + | | |--LITERAL_CLASS -> class [222:15] + | | |--IDENT -> Nested [222:21] + | | |--EXTENDS_CLAUSE -> extends [222:28] + | | | `--IDENT -> SuperClassA [222:36] + | | `--OBJBLOCK -> OBJBLOCK [222:48] + | | |--LCURLY -> { [222:48] + | | |--VARIABLE_DEF -> VARIABLE_DEF [223:12] + | | | |--MODIFIERS -> MODIFIERS [223:12] + | | | |--TYPE -> TYPE [223:12] + | | | | `--IDENT -> SuperClassA [223:12] + | | | |--IDENT -> a [223:24] + | | | `--SEMI -> ; [223:25] + | | |--CLASS_DEF -> CLASS_DEF [224:12] + | | | |--MODIFIERS -> MODIFIERS [224:12] + | | | |--LITERAL_CLASS -> class [224:12] + | | | |--IDENT -> SubscriptionAdapter [224:18] + | | | `--OBJBLOCK -> OBJBLOCK [224:37] + | | | |--LCURLY -> { [224:37] + | | | `--RCURLY -> } [224:38] + | | |--VARIABLE_DEF -> VARIABLE_DEF [225:12] + | | | |--MODIFIERS -> MODIFIERS [225:12] + | | | | `--FINAL -> final [225:12] + | | | |--TYPE -> TYPE [225:34] + | | | | |--BLOCK_COMMENT_BEGIN -> /* [225:18] + | | | | | |--COMMENT_CONTENT -> synthetic [225:20] + | | | | | `--BLOCK_COMMENT_END -> */ [225:30] + | | | | `--IDENT -> SubscriptionAdapter [225:34] + | | | |--IDENT -> this$0 [225:54] + | | | |--ASSIGN -> = [225:61] + | | | | `--EXPR -> EXPR [225:63] + | | | | `--LITERAL_NULL -> null [225:63] + | | | `--SEMI -> ; [225:67] + | | |--VARIABLE_DEF -> VARIABLE_DEF [226:12] + | | | |--MODIFIERS -> MODIFIERS [226:12] + | | | | `--FINAL -> final [226:12] + | | | |--TYPE -> TYPE [226:34] + | | | | |--BLOCK_COMMENT_BEGIN -> /* [226:18] + | | | | | |--COMMENT_CONTENT -> synthetic [226:20] + | | | | | `--BLOCK_COMMENT_END -> */ [226:30] + | | | | `--IDENT -> Object [226:34] + | | | |--IDENT -> val$argHolder [226:41] + | | | |--ASSIGN -> = [226:55] + | | | | `--EXPR -> EXPR [226:57] + | | | | `--LITERAL_NULL -> null [226:57] + | | | `--SEMI -> ; [226:61] + | | |--METHOD_DEF -> METHOD_DEF [228:12] + | | | |--MODIFIERS -> MODIFIERS [228:12] + | | | | `--LITERAL_PUBLIC -> public [228:12] + | | | |--TYPE -> TYPE [228:19] + | | | | `--LITERAL_VOID -> void [228:19] + | | | |--IDENT -> foo [228:24] + | | | |--LPAREN -> ( [228:27] + | | | |--PARAMETERS -> PARAMETERS [228:28] + | | | |--RPAREN -> ) [228:28] + | | | `--SLIST -> { [228:30] + | | | |--EXPR -> EXPR [231:18] + | | | | `--ASSIGN -> = [231:18] + | | | | |--SINGLE_LINE_COMMENT -> // [229:16] + | | | | | `--COMMENT_CONTENT -> access enclosing super field\n [229:18] + | | | | |--SINGLE_LINE_COMMENT -> // [230:16] + | | | | | `--COMMENT_CONTENT -> Primary[Prefix[Name[s]]]\n [230:18] + | | | | |--IDENT -> s [231:16] + | | | | `--LITERAL_NEW -> new [231:20] + | | | | |--IDENT -> SuperClassA [231:24] + | | | | |--LPAREN -> ( [231:35] + | | | | |--ELIST -> ELIST [231:36] + | | | | `--RPAREN -> ) [231:36] + | | | |--SEMI -> ; [231:37] + | | | |--EXPR -> EXPR [235:19] + | | | | `--ASSIGN -> = [235:19] + | | | | |--SINGLE_LINE_COMMENT -> // [233:16] + | | | | | `--COMMENT_CONTENT -> access Nested inherited field\n [233:18] + | | | | |--SINGLE_LINE_COMMENT -> // [234:16] + | | | | | `--COMMENT_CONTENT -> Primary[Prefix[Name[bs]]]\n [234:18] + | | | | |--IDENT -> bs [235:16] + | | | | `--LITERAL_NEW -> new [235:21] + | | | | |--IDENT -> SuperClassA [235:25] + | | | | |--LPAREN -> ( [235:36] + | | | | |--ELIST -> ELIST [235:37] + | | | | `--RPAREN -> ) [235:37] + | | | |--SEMI -> ; [235:38] + | | | |--EXPR -> EXPR [240:49] + | | | | `--ASSIGN -> = [240:49] + | | | | |--DOT -> . [240:45] + | | | | | |--DOT -> . [240:39] + | | | | | | |--DOT -> . [240:32] + | | | | | | | |--SINGLE_LINE_COMMENT -> // [237:16] + | | | | | | | | `--COMMENT_CONTENT -> access super field with fully qualified stuff\n [237:18] + | | | | | | | |--SINGLE_LINE_COMMENT -> // [238:16] + | | | | | | | | `--COMMENT_CONTENT -> Primary[Prefix["FieldAccessSuper"], Suffix[Nested],\n [238:18] + | | | | | | | |--SINGLE_LINE_COMMENT -> // [239:16] + | | | | | | | | `--COMMENT_CONTENT -> Suffix["super"], Suffix["bs"]]\n [239:18] + | | | | | | | |--IDENT -> FieldAccessSuper [240:16] + | | | | | | | `--IDENT -> Nested [240:33] + | | | | | | `--LITERAL_SUPER -> super [240:40] + | | | | | `--IDENT -> bs [240:46] + | | | | `--LITERAL_NEW -> new [240:51] + | | | | |--IDENT -> SuperClassA [240:55] + | | | | |--LPAREN -> ( [240:66] + | | | | |--ELIST -> ELIST [240:67] + | | | | `--RPAREN -> ) [240:67] + | | | |--SEMI -> ; [240:68] + | | | |--EXPR -> EXPR [244:41] + | | | | `--ASSIGN -> = [244:41] + | | | | |--DOT -> . [244:38] + | | | | | |--DOT -> . [244:32] + | | | | | | |--SINGLE_LINE_COMMENT -> // [242:16] + | | | | | | | `--COMMENT_CONTENT -> refers to the enclosing class's immediate super class's field\n [242:18] + | | | | | | |--SINGLE_LINE_COMMENT -> // [243:16] + | | | | | | | `--COMMENT_CONTENT -> Primary[Prefix["FieldAccessSuper"], Suffix["super"], Suffix["s"]]\n [243:18] + | | | | | | |--IDENT -> FieldAccessSuper [244:16] + | | | | | | `--LITERAL_SUPER -> super [244:33] + | | | | | `--IDENT -> s [244:39] + | | | | `--LITERAL_NEW -> new [244:43] + | | | | |--IDENT -> SuperClassA [244:47] + | | | | |--LPAREN -> ( [244:58] + | | | | |--ELIST -> ELIST [244:59] + | | | | `--RPAREN -> ) [244:59] + | | | |--SEMI -> ; [244:60] + | | | `--RCURLY -> } [245:12] + | | |--VARIABLE_DEF -> VARIABLE_DEF [246:12] + | | | |--MODIFIERS -> MODIFIERS [246:12] + | | | |--TYPE -> TYPE [246:12] + | | | | `--IDENT -> Object [246:12] + | | | |--IDENT -> x [246:19] + | | | |--ASSIGN -> = [246:21] + | | | | `--EXPR -> EXPR [246:61] + | | | | `--METHOD_CALL -> ( [246:61] + | | | | |--DOT -> . [246:35] + | | | | | |--IDENT -> Collections [246:23] + | | | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [246:36] + | | | | | | |--GENERIC_START -> < [246:36] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [246:37] + | | | | | | | `--IDENT -> String [246:37] + | | | | | | |--COMMA -> , [246:43] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [246:45] + | | | | | | | `--IDENT -> Integer [246:45] + | | | | | | `--GENERIC_END -> > [246:52] + | | | | | `--IDENT -> emptyMap [246:53] + | | | | |--ELIST -> ELIST [246:62] + | | | | `--RPAREN -> ) [246:62] + | | | `--SEMI -> ; [246:63] + | | |--CTOR_DEF -> CTOR_DEF [248:12] + | | | |--MODIFIERS -> MODIFIERS [248:12] + | | | |--IDENT -> Nested [248:12] + | | | |--LPAREN -> ( [248:18] + | | | |--PARAMETERS -> PARAMETERS [248:19] + | | | |--RPAREN -> ) [248:19] + | | | `--SLIST -> { [248:21] + | | | |--SUPER_CTOR_CALL -> super [249:16] + | | | | |--LPAREN -> ( [249:21] + | | | | |--ELIST -> ELIST [249:22] + | | | | |--RPAREN -> ) [249:22] + | | | | `--SEMI -> ; [249:23] + | | | `--RCURLY -> } [250:12] + | | |--METHOD_DEF -> METHOD_DEF [252:12] + | | | |--MODIFIERS -> MODIFIERS [252:12] + | | | |--TYPE -> TYPE [252:12] + | | | | `--LITERAL_INT -> int [252:12] + | | | |--IDENT -> bar [252:16] + | | | |--LPAREN -> ( [252:19] + | | | |--PARAMETERS -> PARAMETERS [252:20] + | | | |--RPAREN -> ) [252:20] + | | | `--SLIST -> { [252:22] + | | | |--LITERAL_RETURN -> return [253:16] + | | | | |--EXPR -> EXPR [253:37] + | | | | | `--METHOD_CALL -> ( [253:37] + | | | | | |--DOT -> . [253:28] + | | | | | | |--LITERAL_SUPER -> super [253:23] + | | | | | | `--IDENT -> hashCode [253:29] + | | | | | |--ELIST -> ELIST [253:38] + | | | | | `--RPAREN -> ) [253:38] + | | | | `--SEMI -> ; [253:39] + | | | `--RCURLY -> } [254:12] + | | |--METHOD_DEF -> METHOD_DEF [256:12] + | | | |--MODIFIERS -> MODIFIERS [256:12] + | | | |--TYPE -> TYPE [256:12] + | | | | `--LITERAL_BOOLEAN -> boolean [256:12] + | | | |--IDENT -> method [256:20] + | | | |--LPAREN -> ( [256:26] + | | | |--PARAMETERS -> PARAMETERS [256:27] + | | | |--RPAREN -> ) [256:27] + | | | `--SLIST -> { [256:29] + | | | |--LITERAL_RETURN -> return [257:16] + | | | | |--EXPR -> EXPR [257:35] + | | | | | `--METHOD_CALL -> ( [257:35] + | | | | | |--DOT -> . [257:28] + | | | | | | |--LITERAL_SUPER -> super [257:23] + | | | | | | `--IDENT -> equals [257:29] + | | | | | |--ELIST -> ELIST [257:36] + | | | | | | `--EXPR -> EXPR [257:36] + | | | | | | `--LITERAL_NEW -> new [257:36] + | | | | | | |--IDENT -> Object [257:40] + | | | | | | |--LPAREN -> ( [257:46] + | | | | | | |--ELIST -> ELIST [257:47] + | | | | | | `--RPAREN -> ) [257:47] + | | | | | `--RPAREN -> ) [257:48] + | | | | `--SEMI -> ; [257:49] + | | | `--RCURLY -> } [258:12] + | | `--RCURLY -> } [259:8] + | `--RCURLY -> } [260:4] + `--RCURLY -> } [263:0] +RECORD_DEF -> RECORD_DEF [265:0] +|--MODIFIERS -> MODIFIERS [265:0] +|--LITERAL_RECORD -> record [265:0] +|--IDENT -> TestRecord [265:7] +|--LPAREN -> ( [265:17] +|--RECORD_COMPONENTS -> RECORD_COMPONENTS [265:18] +| |--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [265:18] +| | |--ANNOTATIONS -> ANNOTATIONS [265:18] +| | |--TYPE -> TYPE [265:18] +| | | |--LITERAL_INT -> int [265:18] +| | | `--ARRAY_DECLARATOR -> [ [265:21] +| | | `--RBRACK -> ] [265:22] +| | `--IDENT -> x [265:24] +| |--COMMA -> , [265:25] +| `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [265:27] +| |--ANNOTATIONS -> ANNOTATIONS [265:27] +| |--TYPE -> TYPE [265:27] +| | |--LITERAL_INT -> int [265:27] +| | `--ARRAY_DECLARATOR -> [ [265:30] +| | `--RBRACK -> ] [265:31] +| |--ELLIPSIS -> ... [265:32] +| `--IDENT -> y [265:36] +|--RPAREN -> ) [265:37] +`--OBJBLOCK -> OBJBLOCK [265:39] + |--LCURLY -> { [265:39] + |--METHOD_DEF -> METHOD_DEF [266:4] + | |--MODIFIERS -> MODIFIERS [266:4] + | |--TYPE -> TYPE [266:4] + | | `--LITERAL_VOID -> void [266:4] + | |--IDENT -> foo [266:9] + | |--LPAREN -> ( [266:12] + | |--PARAMETERS -> PARAMETERS [266:13] + | |--RPAREN -> ) [266:13] + | `--SLIST -> { [266:15] + | |--VARIABLE_DEF -> VARIABLE_DEF [267:8] + | | |--MODIFIERS -> MODIFIERS [267:8] + | | |--TYPE -> TYPE [267:8] + | | | `--IDENT -> Runnable [267:8] + | | |--IDENT -> r11 [267:17] + | | `--ASSIGN -> = [267:21] + | | `--EXPR -> EXPR [267:27] + | | `--METHOD_REF -> :: [267:27] + | | |--IDENT -> Main [267:23] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [267:29] + | | | |--GENERIC_START -> < [267:29] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [267:30] + | | | | `--IDENT -> String [267:30] + | | | `--GENERIC_END -> > [267:36] + | | `--LITERAL_NEW -> new [267:37] + | |--SEMI -> ; [267:40] + | |--VARIABLE_DEF -> VARIABLE_DEF [268:8] + | | |--MODIFIERS -> MODIFIERS [268:8] + | | |--TYPE -> TYPE [268:8] + | | | |--IDENT -> IntFunction [268:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [268:19] + | | | |--GENERIC_START -> < [268:19] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [268:20] + | | | | |--LITERAL_INT -> int [268:20] + | | | | `--ARRAY_DECLARATOR -> [ [268:23] + | | | | `--RBRACK -> ] [268:24] + | | | `--GENERIC_END -> > [268:25] + | | |--IDENT -> r13 [268:27] + | | `--ASSIGN -> = [268:31] + | | `--EXPR -> EXPR [268:38] + | | `--METHOD_REF -> :: [268:38] + | | |--LITERAL_INT -> int [268:33] + | | |--ARRAY_DECLARATOR -> [ [268:36] + | | | `--RBRACK -> ] [268:37] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [268:40] + | | | |--GENERIC_START -> < [268:40] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [268:41] + | | | | `--IDENT -> String [268:41] + | | | `--GENERIC_END -> > [268:47] + | | `--LITERAL_NEW -> new [268:48] + | |--SEMI -> ; [268:51] + | |--SINGLE_LINE_COMMENT -> // [268:53] + | | `--COMMENT_CONTENT -> produces the same results\n [268:55] + | `--RCURLY -> } [269:4] + `--RCURLY -> } [270:0] +SEMI -> ; [272:0] +SEMI -> ; [272:1] +SEMI -> ; [272:2] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon2.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon2.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon2.txt @@ -0,0 +1,262 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [5:24] +|--DOT -> . [5:24] +| |--DOT -> . [5:16] +| | |--DOT -> . [3:21] +| | | |--DOT -> . [2:39] +| | | | |--DOT -> . [2:28] +| | | | | |--IDENT -> com [2:9] +| | | | | `--IDENT -> puppycrawl [2:29] +| | | | `--IDENT -> tools [3:16] +| | | `--IDENT -> checkstyle [4:16] +| | `--IDENT -> grammar [5:17] +| `--IDENT -> antlr4 [6:16] +`--SEMI -> ; [7:8] +IMPORT -> import [9:0] +|--DOT -> . [9:16] +| |--DOT -> . [9:11] +| | |--IDENT -> java [9:7] +| | `--IDENT -> util [9:12] +| `--IDENT -> ArrayList [9:17] +`--SEMI -> ; [9:26] +IMPORT -> import [10:0] +|--DOT -> . [10:16] +| |--DOT -> . [10:11] +| | |--IDENT -> java [10:7] +| | `--IDENT -> util [10:12] +| `--IDENT -> List [10:17] +`--SEMI -> ; [10:21] +CLASS_DEF -> CLASS_DEF [12:0] +|--MODIFIERS -> MODIFIERS [12:0] +| `--LITERAL_PUBLIC -> public [12:0] +|--LITERAL_CLASS -> class [12:7] +|--IDENT -> InputAntlr4AstRegressionUncommon2 [12:13] +`--OBJBLOCK -> OBJBLOCK [12:47] + |--LCURLY -> { [12:47] + |--ANNOTATION_DEF -> ANNOTATION_DEF [13:4] + | |--MODIFIERS -> MODIFIERS [13:4] + | | `--LITERAL_PUBLIC -> public [13:4] + | |--AT -> @ [13:11] + | |--LITERAL_INTERFACE -> interface [13:12] + | |--IDENT -> PackgeAnno [13:22] + | `--OBJBLOCK -> OBJBLOCK [13:33] + | |--LCURLY -> { [13:33] + | `--RCURLY -> } [14:4] + |--VARIABLE_DEF -> VARIABLE_DEF [15:4] + | |--MODIFIERS -> MODIFIERS [15:4] + | | `--ANNOTATION -> ANNOTATION [15:4] + | | |--AT -> @ [15:4] + | | `--IDENT -> Nullable [15:5] + | |--TYPE -> TYPE [15:14] + | | |--IDENT -> List [15:14] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [15:18] + | | |--GENERIC_START -> < [15:18] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [15:19] + | | | `--IDENT -> Integer [15:19] + | | `--GENERIC_END -> > [15:26] + | |--IDENT -> x [15:28] + | |--ASSIGN -> = [15:30] + | | `--EXPR -> EXPR [15:32] + | | `--LITERAL_NEW -> new [15:32] + | | |--IDENT -> ArrayList [15:36] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [15:45] + | | | |--GENERIC_START -> < [15:45] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [15:46] + | | | | `--IDENT -> Integer [15:46] + | | | `--GENERIC_END -> > [15:53] + | | |--LPAREN -> ( [15:54] + | | |--ELIST -> ELIST [15:55] + | | `--RPAREN -> ) [15:55] + | `--SEMI -> ; [15:56] + |--ENUM_DEF -> ENUM_DEF [16:4] + | |--MODIFIERS -> MODIFIERS [16:4] + | |--ENUM -> enum [16:4] + | |--IDENT -> FPMethodArgs [17:4] + | `--OBJBLOCK -> OBJBLOCK [18:4] + | |--LCURLY -> { [18:4] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [20:8] + | | |--ANNOTATIONS -> ANNOTATIONS [20:8] + | | `--IDENT -> IGNN [20:8] + | |--COMMA -> , [20:12] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [21:8] + | | |--ANNOTATIONS -> ANNOTATIONS [21:8] + | | `--IDENT -> IIGNN [21:8] + | |--COMMA -> , [21:13] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [22:8] + | | |--ANNOTATIONS -> ANNOTATIONS [22:8] + | | `--IDENT -> GNNII [22:8] + | |--COMMA -> , [22:13] + | |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [23:8] + | | |--ANNOTATIONS -> ANNOTATIONS [23:8] + | | `--IDENT -> GNNC [23:8] + | |--SEMI -> ; [23:12] + | |--SEMI -> ; [23:13] + | |--SEMI -> ; [23:14] + | |--SEMI -> ; [23:15] + | |--SEMI -> ; [23:16] + | `--RCURLY -> } [24:4] + |--INTERFACE_DEF -> INTERFACE_DEF [25:4] + | |--MODIFIERS -> MODIFIERS [25:4] + | | `--LITERAL_PUBLIC -> public [25:4] + | |--LITERAL_INTERFACE -> interface [26:4] + | |--IDENT -> IntEnum [27:4] + | `--OBJBLOCK -> OBJBLOCK [28:4] + | |--LCURLY -> { [28:4] + | `--RCURLY -> } [29:4] + |--ANNOTATION_DEF -> ANNOTATION_DEF [31:4] + | |--MODIFIERS -> MODIFIERS [31:4] + | | `--LITERAL_PRIVATE -> private [31:4] + | |--AT -> @ [32:4] + | |--LITERAL_INTERFACE -> interface [32:5] + | |--IDENT -> MyOtherAnno [33:4] + | `--OBJBLOCK -> OBJBLOCK [34:4] + | |--LCURLY -> { [34:4] + | |--CLASS_DEF -> CLASS_DEF [35:8] + | | |--MODIFIERS -> MODIFIERS [35:8] + | | | `--LITERAL_PUBLIC -> public [35:8] + | | |--LITERAL_CLASS -> class [35:15] + | | |--IDENT -> Test [36:8] + | | `--OBJBLOCK -> OBJBLOCK [36:13] + | | |--LCURLY -> { [36:13] + | | `--RCURLY -> } [36:14] + | |--ENUM_DEF -> ENUM_DEF [37:8] + | | |--MODIFIERS -> MODIFIERS [37:8] + | | |--ENUM -> enum [37:8] + | | |--IDENT -> TestEnum [38:8] + | | `--OBJBLOCK -> OBJBLOCK [38:16] + | | |--LCURLY -> { [38:16] + | | `--RCURLY -> } [38:17] + | |--ANNOTATION_DEF -> ANNOTATION_DEF [39:8] + | | |--MODIFIERS -> MODIFIERS [39:8] + | | | `--LITERAL_PUBLIC -> public [39:8] + | | |--AT -> @ [39:15] + | | |--LITERAL_INTERFACE -> interface [39:16] + | | |--IDENT -> InnerAnnoDeclaration [40:8] + | | `--OBJBLOCK -> OBJBLOCK [40:28] + | | |--LCURLY -> { [40:28] + | | `--RCURLY -> } [40:29] + | |--VARIABLE_DEF -> VARIABLE_DEF [41:8] + | | |--MODIFIERS -> MODIFIERS [41:8] + | | |--TYPE -> TYPE [41:8] + | | | `--LITERAL_INT -> int [41:8] + | | |--IDENT -> x [41:12] + | | |--ASSIGN -> = [41:14] + | | | `--EXPR -> EXPR [41:16] + | | | `--NUM_INT -> 0 [41:16] + | | `--SEMI -> ; [41:17] + | |--ANNOTATION_FIELD_DEF -> ANNOTATION_FIELD_DEF [42:8] + | | |--MODIFIERS -> MODIFIERS [42:8] + | | |--TYPE -> TYPE [42:8] + | | | `--LITERAL_INT -> int [42:8] + | | |--IDENT -> method [42:12] + | | |--LPAREN -> ( [42:18] + | | |--RPAREN -> ) [42:19] + | | `--SEMI -> ; [42:20] + | |--SEMI -> ; [43:8] + | |--SEMI -> ; [43:9] + | |--SEMI -> ; [43:10] + | |--SEMI -> ; [43:11] + | |--SEMI -> ; [43:12] + | `--RCURLY -> } [44:4] + |--VARIABLE_DEF -> VARIABLE_DEF [45:4] + | |--MODIFIERS -> MODIFIERS [45:4] + | | `--LITERAL_PRIVATE -> private [45:4] + | |--TYPE -> TYPE [45:12] + | | `--IDENT -> String [45:12] + | |--IDENT -> str [45:19] + | |--ASSIGN -> = [45:23] + | | `--EXPR -> EXPR [46:88] + | | `--PLUS -> + [46:88] + | | |--PLUS -> + [46:85] + | | | |--PLUS -> + [46:82] + | | | | |--PLUS -> + [46:79] + | | | | | |--PLUS -> + [46:76] + | | | | | | |--PLUS -> + [46:73] + | | | | | | | |--PLUS -> + [46:70] + | | | | | | | | |--PLUS -> + [46:67] + | | | | | | | | | |--PLUS -> + [46:64] + | | | | | | | | | | |--PLUS -> + [46:61] + | | | | | | | | | | | |--PLUS -> + [46:58] + | | | | | | | | | | | | |--PLUS -> + [46:55] + | | | | | | | | | | | | | |--PLUS -> + [46:52] + | | | | | | | | | | | | | | |--PLUS -> + [46:49] + | | | | | | | | | | | | | | | |--PLUS -> + [46:46] + | | | | | | | | | | | | | | | | |--PLUS -> + [46:43] + | | | | | | | | | | | | | | | | | |--PLUS -> + [46:40] + | | | | | | | | | | | | | | | | | | |--PLUS -> + [46:37] + | | | | | | | | | | | | | | | | | | | |--PLUS -> + [46:34] + | | | | | | | | | | | | | | | | | | | | |--PLUS -> + [46:31] + | | | | | | | | | | | | | | | | | | | | | |--PLUS -> + [46:28] + | | | | | | | | | | | | | | | | | | | | | | |--PLUS -> + [46:25] + | | | | | | | | | | | | | | | | | | | | | | | |--PLUS -> + [46:22] + | | | | | | | | | | | | | | | | | | | | | | | | |--PLUS -> + [46:19] + | | | | | | | | | | | | | | | | | | | | | | | | | |--PLUS -> + [46:16] + | | | | | | | | | | | | | | | | | | | | | | | | | | |--PLUS -> + [46:13] + | | | | | | | | | | | | | | | | | | | | | | | | | | | |--PLUS -> + [46:10] + | | | | | | | | | | | | | | | | | | | | | | | | | | | | |--STRING_LITERAL -> "" [45:25] + | | | | | | | | | | | | | | | | | | | | | | | | | | | | `--STRING_LITERAL -> "" [46:11] + | | | | | | | | | | | | | | | | | | | | | | | | | | | `--STRING_LITERAL -> "" [46:14] + | | | | | | | | | | | | | | | | | | | | | | | | | | `--STRING_LITERAL -> "" [46:17] + | | | | | | | | | | | | | | | | | | | | | | | | | `--STRING_LITERAL -> "" [46:20] + | | | | | | | | | | | | | | | | | | | | | | | | `--STRING_LITERAL -> "" [46:23] + | | | | | | | | | | | | | | | | | | | | | | | `--STRING_LITERAL -> "" [46:26] + | | | | | | | | | | | | | | | | | | | | | | `--STRING_LITERAL -> "" [46:29] + | | | | | | | | | | | | | | | | | | | | | `--STRING_LITERAL -> "" [46:32] + | | | | | | | | | | | | | | | | | | | | `--STRING_LITERAL -> "" [46:35] + | | | | | | | | | | | | | | | | | | | `--STRING_LITERAL -> "" [46:38] + | | | | | | | | | | | | | | | | | | `--STRING_LITERAL -> "" [46:41] + | | | | | | | | | | | | | | | | | `--STRING_LITERAL -> "" [46:44] + | | | | | | | | | | | | | | | | `--STRING_LITERAL -> "" [46:47] + | | | | | | | | | | | | | | | `--STRING_LITERAL -> "" [46:50] + | | | | | | | | | | | | | | `--STRING_LITERAL -> "" [46:53] + | | | | | | | | | | | | | `--STRING_LITERAL -> "" [46:56] + | | | | | | | | | | | | `--STRING_LITERAL -> "" [46:59] + | | | | | | | | | | | `--STRING_LITERAL -> "" [46:62] + | | | | | | | | | | `--STRING_LITERAL -> "" [46:65] + | | | | | | | | | `--STRING_LITERAL -> "" [46:68] + | | | | | | | | `--STRING_LITERAL -> "" [46:71] + | | | | | | | `--STRING_LITERAL -> "" [46:74] + | | | | | | `--STRING_LITERAL -> "" [46:77] + | | | | | `--STRING_LITERAL -> "" [46:80] + | | | | `--STRING_LITERAL -> "" [46:83] + | | | `--STRING_LITERAL -> "" [46:86] + | | `--STRING_LITERAL -> "" [46:89] + | `--SEMI -> ; [46:91] + |--VARIABLE_DEF -> VARIABLE_DEF [47:4] + | |--MODIFIERS -> MODIFIERS [47:4] + | |--TYPE -> TYPE [47:4] + | | `--LITERAL_INT -> int [47:4] + | |--IDENT -> z [47:8] + | |--ASSIGN -> = [47:10] + | | `--EXPR -> EXPR [47:15] + | | `--PLUS -> + [47:15] + | | |--NUM_INT -> 42 [47:12] + | | `--NUM_INT -> 42 [47:17] + | `--SEMI -> ; [47:19] + |--ANNOTATION_DEF -> ANNOTATION_DEF [48:4] + | |--MODIFIERS -> MODIFIERS [48:4] + | |--AT -> @ [48:4] + | |--LITERAL_INTERFACE -> interface [48:6] + | |--IDENT -> Foo [48:16] + | `--OBJBLOCK -> OBJBLOCK [48:20] + | |--LCURLY -> { [48:20] + | |--ANNOTATION_FIELD_DEF -> ANNOTATION_FIELD_DEF [49:8] + | | |--MODIFIERS -> MODIFIERS [49:8] + | | |--TYPE -> TYPE [49:8] + | | | |--IDENT -> String [49:8] + | | | `--ARRAY_DECLARATOR -> [ [49:19] + | | | `--RBRACK -> ] [49:20] + | | |--IDENT -> v1 [49:15] + | | |--LPAREN -> ( [49:17] + | | |--RPAREN -> ) [49:18] + | | `--SEMI -> ; [49:21] + | `--RCURLY -> } [50:4] + |--ANNOTATION_DEF -> ANNOTATION_DEF [51:4] + | |--MODIFIERS -> MODIFIERS [51:4] + | |--AT -> @ [51:4] + | |--LITERAL_INTERFACE -> interface [51:5] + | |--IDENT -> Nullable [51:15] + | `--OBJBLOCK -> OBJBLOCK [51:23] + | |--LCURLY -> { [51:23] + | `--RCURLY -> } [51:24] + `--RCURLY -> } [52:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon3.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon3.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon3.txt @@ -0,0 +1,333 @@ +SINGLE_LINE_COMMENT -> // [1:0] +`--COMMENT_CONTENT -> non-compiled with javac: Compilable with Java16\n [1:2] +PACKAGE_DEF -> package [2:0] +|--ANNOTATIONS -> ANNOTATIONS [2:47] +|--DOT -> . [2:47] +| |--DOT -> . [2:39] +| | |--DOT -> . [2:28] +| | | |--DOT -> . [2:22] +| | | | |--DOT -> . [2:11] +| | | | | |--IDENT -> com [2:8] +| | | | | `--IDENT -> puppycrawl [2:12] +| | | | `--IDENT -> tools [2:23] +| | | `--IDENT -> checkstyle [2:29] +| | `--IDENT -> grammar [2:40] +| `--IDENT -> antlr4 [2:48] +`--SEMI -> ; [2:54] +CLASS_DEF -> CLASS_DEF [4:0] +|--MODIFIERS -> MODIFIERS [4:0] +| `--LITERAL_PUBLIC -> public [4:0] +|--LITERAL_CLASS -> class [4:7] +|--IDENT -> InputAntlr4AstRegressionUncommon3 [4:13] +|--IMPLEMENTS_CLAUSE -> implements [4:47] +| `--IDENT -> AutoCloseable [4:58] +`--OBJBLOCK -> OBJBLOCK [4:72] + |--LCURLY -> { [4:72] + |--METHOD_DEF -> METHOD_DEF [5:4] + | |--MODIFIERS -> MODIFIERS [5:4] + | | |--ANNOTATION -> ANNOTATION [5:4] + | | | |--AT -> @ [5:4] + | | | `--IDENT -> Override [5:5] + | | `--LITERAL_PUBLIC -> public [6:4] + | |--TYPE -> TYPE [6:11] + | | `--LITERAL_VOID -> void [6:11] + | |--IDENT -> close [6:16] + | |--LPAREN -> ( [6:21] + | |--PARAMETERS -> PARAMETERS [6:22] + | |--RPAREN -> ) [6:22] + | |--LITERAL_THROWS -> throws [6:24] + | | `--IDENT -> Exception [6:31] + | `--SLIST -> { [6:41] + | `--RCURLY -> } [8:4] + |--INTERFACE_DEF -> INTERFACE_DEF [10:4] + | |--MODIFIERS -> MODIFIERS [10:4] + | |--LITERAL_INTERFACE -> interface [10:4] + | |--IDENT -> SAM [10:14] + | `--OBJBLOCK -> OBJBLOCK [10:18] + | |--LCURLY -> { [10:18] + | |--METHOD_DEF -> METHOD_DEF [11:8] + | | |--MODIFIERS -> MODIFIERS [11:8] + | | |--TYPE -> TYPE [11:8] + | | | `--LITERAL_INT -> int [11:8] + | | |--IDENT -> m [11:12] + | | |--LPAREN -> ( [11:13] + | | |--PARAMETERS -> PARAMETERS [11:14] + | | |--RPAREN -> ) [11:14] + | | `--SEMI -> ; [11:15] + | `--RCURLY -> } [12:4] + |--INTERFACE_DEF -> INTERFACE_DEF [14:4] + | |--MODIFIERS -> MODIFIERS [14:4] + | |--LITERAL_INTERFACE -> interface [14:4] + | |--IDENT -> SuperI [14:14] + | `--OBJBLOCK -> OBJBLOCK [14:21] + | |--LCURLY -> { [14:21] + | |--METHOD_DEF -> METHOD_DEF [15:8] + | | |--MODIFIERS -> MODIFIERS [15:8] + | | | |--LITERAL_PUBLIC -> public [15:8] + | | | `--LITERAL_DEFAULT -> default [15:15] + | | |--TYPE -> TYPE [15:23] + | | | `--LITERAL_INT -> int [15:23] + | | |--IDENT -> foo [15:27] + | | |--LPAREN -> ( [15:30] + | | |--PARAMETERS -> PARAMETERS [15:31] + | | |--RPAREN -> ) [15:31] + | | `--SLIST -> { [15:33] + | | |--LITERAL_RETURN -> return [15:35] + | | | |--EXPR -> EXPR [15:42] + | | | | `--NUM_INT -> 1234 [15:42] + | | | `--SEMI -> ; [15:46] + | | `--RCURLY -> } [15:48] + | `--RCURLY -> } [16:4] + |--INTERFACE_DEF -> INTERFACE_DEF [18:4] + | |--MODIFIERS -> MODIFIERS [18:4] + | |--LITERAL_INTERFACE -> interface [18:4] + | |--IDENT -> I [18:14] + | |--EXTENDS_CLAUSE -> extends [18:16] + | | `--IDENT -> SuperI [18:24] + | `--OBJBLOCK -> OBJBLOCK [18:31] + | |--LCURLY -> { [18:31] + | `--RCURLY -> } [19:4] + |--INTERFACE_DEF -> INTERFACE_DEF [21:4] + | |--MODIFIERS -> MODIFIERS [21:4] + | |--LITERAL_INTERFACE -> interface [21:4] + | |--IDENT -> T [21:14] + | |--EXTENDS_CLAUSE -> extends [21:16] + | | `--IDENT -> I [21:24] + | `--OBJBLOCK -> OBJBLOCK [21:26] + | |--LCURLY -> { [21:26] + | |--METHOD_DEF -> METHOD_DEF [22:8] + | | |--MODIFIERS -> MODIFIERS [22:8] + | | | |--LITERAL_PUBLIC -> public [22:8] + | | | `--LITERAL_DEFAULT -> default [22:15] + | | |--TYPE -> TYPE [22:23] + | | | `--IDENT -> SAM [22:23] + | | |--IDENT -> boo [22:27] + | | |--LPAREN -> ( [22:30] + | | |--PARAMETERS -> PARAMETERS [22:31] + | | |--RPAREN -> ) [22:31] + | | `--SLIST -> { [22:33] + | | |--LITERAL_RETURN -> return [22:35] + | | | |--EXPR -> EXPR [22:49] + | | | | `--METHOD_REF -> :: [22:49] + | | | | |--DOT -> . [22:43] + | | | | | |--IDENT -> I [22:42] + | | | | | `--LITERAL_SUPER -> super [22:44] + | | | | `--IDENT -> foo [22:51] + | | | `--SEMI -> ; [22:54] + | | `--RCURLY -> } [22:56] + | `--RCURLY -> } [23:4] + |--INTERFACE_DEF -> INTERFACE_DEF [25:4] + | |--MODIFIERS -> MODIFIERS [25:4] + | |--LITERAL_INTERFACE -> interface [25:4] + | |--IDENT -> DSPRI [25:14] + | `--OBJBLOCK -> OBJBLOCK [25:20] + | |--LCURLY -> { [25:20] + | |--METHOD_DEF -> METHOD_DEF [25:22] + | | |--MODIFIERS -> MODIFIERS [25:22] + | | |--TYPE -> TYPE [25:22] + | | | `--IDENT -> String [25:22] + | | |--IDENT -> m [25:29] + | | |--LPAREN -> ( [25:30] + | | |--PARAMETERS -> PARAMETERS [25:31] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [25:31] + | | | |--MODIFIERS -> MODIFIERS [25:31] + | | | |--TYPE -> TYPE [25:31] + | | | | `--IDENT -> String [25:31] + | | | `--IDENT -> a [25:38] + | | |--RPAREN -> ) [25:39] + | | `--SEMI -> ; [25:40] + | `--RCURLY -> } [25:42] + |--INTERFACE_DEF -> INTERFACE_DEF [27:4] + | |--MODIFIERS -> MODIFIERS [27:4] + | |--LITERAL_INTERFACE -> interface [27:4] + | |--IDENT -> DSPRA [27:14] + | `--OBJBLOCK -> OBJBLOCK [27:20] + | |--LCURLY -> { [27:20] + | |--METHOD_DEF -> METHOD_DEF [28:8] + | | |--MODIFIERS -> MODIFIERS [28:8] + | | | `--LITERAL_DEFAULT -> default [28:8] + | | |--TYPE -> TYPE [28:16] + | | | `--IDENT -> String [28:16] + | | |--IDENT -> xsA__ [28:23] + | | |--LPAREN -> ( [28:28] + | | |--PARAMETERS -> PARAMETERS [28:29] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [28:29] + | | | |--MODIFIERS -> MODIFIERS [28:29] + | | | |--TYPE -> TYPE [28:29] + | | | | `--IDENT -> String [28:29] + | | | `--IDENT -> s [28:36] + | | |--RPAREN -> ) [28:37] + | | `--SLIST -> { [28:39] + | | |--LITERAL_RETURN -> return [29:12] + | | | |--EXPR -> EXPR [29:29] + | | | | `--PLUS -> + [29:29] + | | | | |--STRING_LITERAL -> "A__xsA:" [29:19] + | | | | `--IDENT -> s [29:31] + | | | `--SEMI -> ; [29:32] + | | `--RCURLY -> } [30:8] + | |--METHOD_DEF -> METHOD_DEF [32:8] + | | |--MODIFIERS -> MODIFIERS [32:8] + | | | `--LITERAL_DEFAULT -> default [32:8] + | | |--TYPE -> TYPE [32:16] + | | | `--IDENT -> String [32:16] + | | |--IDENT -> xsAB_ [32:23] + | | |--LPAREN -> ( [32:28] + | | |--PARAMETERS -> PARAMETERS [32:29] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [32:29] + | | | |--MODIFIERS -> MODIFIERS [32:29] + | | | |--TYPE -> TYPE [32:29] + | | | | `--IDENT -> String [32:29] + | | | `--IDENT -> s [32:36] + | | |--RPAREN -> ) [32:37] + | | `--SLIST -> { [32:39] + | | |--LITERAL_RETURN -> return [33:12] + | | | |--EXPR -> EXPR [33:29] + | | | | `--PLUS -> + [33:29] + | | | | |--STRING_LITERAL -> "AB_xsA:" [33:19] + | | | | `--IDENT -> s [33:31] + | | | `--SEMI -> ; [33:32] + | | `--RCURLY -> } [34:8] + | `--RCURLY -> } [36:4] + |--INTERFACE_DEF -> INTERFACE_DEF [38:4] + | |--MODIFIERS -> MODIFIERS [38:4] + | |--LITERAL_INTERFACE -> interface [38:4] + | |--IDENT -> DSPRB [38:14] + | |--EXTENDS_CLAUSE -> extends [38:20] + | | `--IDENT -> DSPRA [38:28] + | `--OBJBLOCK -> OBJBLOCK [38:34] + | |--LCURLY -> { [38:34] + | |--METHOD_DEF -> METHOD_DEF [40:8] + | | |--MODIFIERS -> MODIFIERS [40:8] + | | | `--LITERAL_DEFAULT -> default [40:8] + | | |--TYPE -> TYPE [40:16] + | | | `--IDENT -> String [40:16] + | | |--IDENT -> xsAB_ [40:23] + | | |--LPAREN -> ( [40:28] + | | |--PARAMETERS -> PARAMETERS [40:29] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [40:29] + | | | |--MODIFIERS -> MODIFIERS [40:29] + | | | |--TYPE -> TYPE [40:29] + | | | | `--IDENT -> String [40:29] + | | | `--IDENT -> s [40:36] + | | |--RPAREN -> ) [40:37] + | | `--SLIST -> { [40:39] + | | |--LITERAL_RETURN -> return [41:12] + | | | |--EXPR -> EXPR [41:29] + | | | | `--PLUS -> + [41:29] + | | | | |--STRING_LITERAL -> "AB_xsB:" [41:19] + | | | | `--IDENT -> s [41:31] + | | | `--SEMI -> ; [41:32] + | | `--RCURLY -> } [42:8] + | |--METHOD_DEF -> METHOD_DEF [44:8] + | | |--MODIFIERS -> MODIFIERS [44:8] + | | | `--LITERAL_DEFAULT -> default [44:8] + | | |--TYPE -> TYPE [44:16] + | | | `--IDENT -> String [44:16] + | | |--IDENT -> xs_B_ [44:23] + | | |--LPAREN -> ( [44:28] + | | |--PARAMETERS -> PARAMETERS [44:29] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [44:29] + | | | |--MODIFIERS -> MODIFIERS [44:29] + | | | |--TYPE -> TYPE [44:29] + | | | | `--IDENT -> String [44:29] + | | | `--IDENT -> s [44:36] + | | |--RPAREN -> ) [44:37] + | | `--SLIST -> { [44:39] + | | |--LITERAL_RETURN -> return [45:12] + | | | |--EXPR -> EXPR [45:29] + | | | | `--PLUS -> + [45:29] + | | | | |--STRING_LITERAL -> "_B_xsB:" [45:19] + | | | | `--IDENT -> s [45:31] + | | | `--SEMI -> ; [45:32] + | | `--RCURLY -> } [46:8] + | `--RCURLY -> } [48:4] + |--CLASS_DEF -> CLASS_DEF [50:4] + | |--MODIFIERS -> MODIFIERS [50:4] + | | `--LITERAL_PUBLIC -> public [50:4] + | |--LITERAL_CLASS -> class [50:11] + | |--IDENT -> MethodReferenceTestSuperDefault [50:17] + | |--IMPLEMENTS_CLAUSE -> implements [50:49] + | | `--IDENT -> DSPRB [50:60] + | `--OBJBLOCK -> OBJBLOCK [50:66] + | |--LCURLY -> { [50:66] + | |--METHOD_DEF -> METHOD_DEF [52:8] + | | |--MODIFIERS -> MODIFIERS [52:8] + | | | `--LITERAL_PUBLIC -> public [52:8] + | | |--TYPE -> TYPE [52:15] + | | | `--LITERAL_VOID -> void [52:15] + | | |--IDENT -> testMethodReferenceSuper [52:20] + | | |--LPAREN -> ( [52:44] + | | |--PARAMETERS -> PARAMETERS [52:45] + | | |--RPAREN -> ) [52:45] + | | `--SLIST -> { [52:47] + | | |--VARIABLE_DEF -> VARIABLE_DEF [53:12] + | | | |--MODIFIERS -> MODIFIERS [53:12] + | | | |--TYPE -> TYPE [53:12] + | | | | `--IDENT -> DSPRI [53:12] + | | | `--IDENT -> q [53:18] + | | |--SEMI -> ; [53:19] + | | |--EXPR -> EXPR [55:14] + | | | `--ASSIGN -> = [55:14] + | | | |--IDENT -> q [55:12] + | | | `--METHOD_REF -> :: [55:27] + | | | |--DOT -> . [55:21] + | | | | |--IDENT -> DSPRB [55:16] + | | | | `--LITERAL_SUPER -> super [55:22] + | | | `--IDENT -> xsA__ [55:29] + | | |--SEMI -> ; [55:34] + | | |--EXPR -> EXPR [57:14] + | | | `--ASSIGN -> = [57:14] + | | | |--IDENT -> q [57:12] + | | | `--METHOD_REF -> :: [57:27] + | | | |--DOT -> . [57:21] + | | | | |--IDENT -> DSPRB [57:16] + | | | | `--LITERAL_SUPER -> super [57:22] + | | | `--IDENT -> xsAB_ [57:29] + | | |--SEMI -> ; [57:34] + | | |--EXPR -> EXPR [59:14] + | | | `--ASSIGN -> = [59:14] + | | | |--IDENT -> q [59:12] + | | | `--METHOD_REF -> :: [59:27] + | | | |--DOT -> . [59:21] + | | | | |--IDENT -> DSPRB [59:16] + | | | | `--LITERAL_SUPER -> super [59:22] + | | | `--IDENT -> xs_B_ [59:29] + | | |--SEMI -> ; [59:34] + | | `--RCURLY -> } [60:8] + | `--RCURLY -> } [62:4] + |--METHOD_DEF -> METHOD_DEF [64:4] + | |--MODIFIERS -> MODIFIERS [64:4] + | |--TYPE -> TYPE [64:4] + | | `--LITERAL_VOID -> void [64:4] + | |--IDENT -> test [64:9] + | |--LPAREN -> ( [64:13] + | |--PARAMETERS -> PARAMETERS [64:14] + | |--RPAREN -> ) [64:14] + | |--LITERAL_THROWS -> throws [64:16] + | | `--IDENT -> Exception [64:23] + | `--SLIST -> { [64:33] + | |--LITERAL_TRY -> try [65:8] + | | |--RESOURCE_SPECIFICATION -> RESOURCE_SPECIFICATION [65:12] + | | | |--LPAREN -> ( [65:12] + | | | |--RESOURCES -> RESOURCES [65:46] + | | | | `--RESOURCE -> RESOURCE [65:46] + | | | | `--DOT -> . [65:46] + | | | | |--IDENT -> InputAntlr4AstRegressionUncommon3 [65:13] + | | | | `--LITERAL_THIS -> this [65:47] + | | | `--RPAREN -> ) [65:51] + | | `--SLIST -> { [65:53] + | | |--EXPR -> EXPR [66:30] + | | | `--METHOD_CALL -> ( [66:30] + | | | |--DOT -> . [66:22] + | | | | |--DOT -> . [66:18] + | | | | | |--IDENT -> System [66:12] + | | | | | `--IDENT -> out [66:19] + | | | | `--IDENT -> println [66:23] + | | | |--ELIST -> ELIST [66:31] + | | | | `--EXPR -> EXPR [66:31] + | | | | `--STRING_LITERAL -> "Unable to process" [66:31] + | | | `--RPAREN -> ) [66:50] + | | |--SEMI -> ; [66:51] + | | `--RCURLY -> } [67:8] + | `--RCURLY -> } [68:4] + `--RCURLY -> } [70:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon4.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon4.java @@ -0,0 +1,87 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOError; +import java.io.IOException; +import java.util.function.BiFunction; + +public class InputAntlr4AstRegressionUncommon4 { + void m3() throws FileNotFoundException { + int x = 2 /* comment */ + 2; + int y = (/*comment */ x /*comment */ + 2); + m4(/* param1 */ x, /* param2 */ x); + BiFunction<Integer, Integer, Integer> lambda9 + = (/* param1 */ a, /* param2 */ b) -> a + b; + + BiFunction<Integer, Integer, Integer> lambda13 + = (/* param1 */ a /* param1 */, /* param2 */ b /* param2 */) -> a + b; + } + + int m4 (int z, int q) throws FileNotFoundException { + try ( + java + . + io + . + BufferedReader bufferedReader + = new BufferedReader(new FileReader("path"))) { + } catch (IOException e) { + e.printStackTrace(); + } + return 8; + } + + class CelebrationLunch<I extends Number, L extends Number, D extends Number> { + class Section<A extends Number, B extends Number, C extends Number> { + + } + } + + private CelebrationLunch<Integer,Long,Double> inner; + CelebrationLunch<Integer, Long, Double> + .Section<Number, Number, Number> section = inner.new Section<>(); + + @NonNull String p1 = "hello"; + void method() { + try { + System.out.println(); + } + catch (@NonNull IOError | ArithmeticException e) { + + } + } + + void m23(Class<Object> clazz) { + if (InputAntlr4AstRegressionUncommon4.this != null) { + } + } + +} + +class H006_ComplexConstructors<T> { + public <V> H006_ComplexConstructors(T t, V v) { + } + + static { + H006_ComplexConstructors<? extends Number> x = + new <String>H006_ComplexConstructors<Integer>(0, ""); + } + + + class Inner3 { + Inner3(int x) { + H006_ComplexConstructors<Integer> instance = + new <String>H006_ComplexConstructors<Integer>(0, ""); + Object o = instance.new Inner3(5).new <String>InnerInner3("hey"); + } + + class InnerInner3 { + <D> InnerInner3(D in) { + } + } + } +} + +@interface NonNull{} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon4.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon4.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon4.txt @@ -0,0 +1,672 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +IMPORT -> import [3:0] +|--DOT -> . [3:14] +| |--DOT -> . [3:11] +| | |--IDENT -> java [3:7] +| | `--IDENT -> io [3:12] +| `--IDENT -> BufferedReader [3:15] +`--SEMI -> ; [3:29] +IMPORT -> import [4:0] +|--DOT -> . [4:14] +| |--DOT -> . [4:11] +| | |--IDENT -> java [4:7] +| | `--IDENT -> io [4:12] +| `--IDENT -> FileNotFoundException [4:15] +`--SEMI -> ; [4:36] +IMPORT -> import [5:0] +|--DOT -> . [5:14] +| |--DOT -> . [5:11] +| | |--IDENT -> java [5:7] +| | `--IDENT -> io [5:12] +| `--IDENT -> FileReader [5:15] +`--SEMI -> ; [5:25] +IMPORT -> import [6:0] +|--DOT -> . [6:14] +| |--DOT -> . [6:11] +| | |--IDENT -> java [6:7] +| | `--IDENT -> io [6:12] +| `--IDENT -> IOError [6:15] +`--SEMI -> ; [6:22] +IMPORT -> import [7:0] +|--DOT -> . [7:14] +| |--DOT -> . [7:11] +| | |--IDENT -> java [7:7] +| | `--IDENT -> io [7:12] +| `--IDENT -> IOException [7:15] +`--SEMI -> ; [7:26] +IMPORT -> import [8:0] +|--DOT -> . [8:25] +| |--DOT -> . [8:16] +| | |--DOT -> . [8:11] +| | | |--IDENT -> java [8:7] +| | | `--IDENT -> util [8:12] +| | `--IDENT -> function [8:17] +| `--IDENT -> BiFunction [8:26] +`--SEMI -> ; [8:36] +CLASS_DEF -> CLASS_DEF [10:0] +|--MODIFIERS -> MODIFIERS [10:0] +| `--LITERAL_PUBLIC -> public [10:0] +|--LITERAL_CLASS -> class [10:7] +|--IDENT -> InputAntlr4AstRegressionUncommon4 [10:13] +`--OBJBLOCK -> OBJBLOCK [10:47] + |--LCURLY -> { [10:47] + |--METHOD_DEF -> METHOD_DEF [11:4] + | |--MODIFIERS -> MODIFIERS [11:4] + | |--TYPE -> TYPE [11:4] + | | `--LITERAL_VOID -> void [11:4] + | |--IDENT -> m3 [11:9] + | |--LPAREN -> ( [11:11] + | |--PARAMETERS -> PARAMETERS [11:12] + | |--RPAREN -> ) [11:12] + | |--LITERAL_THROWS -> throws [11:14] + | | `--IDENT -> FileNotFoundException [11:21] + | `--SLIST -> { [11:43] + | |--VARIABLE_DEF -> VARIABLE_DEF [12:8] + | | |--MODIFIERS -> MODIFIERS [12:8] + | | |--TYPE -> TYPE [12:8] + | | | `--LITERAL_INT -> int [12:8] + | | |--IDENT -> x [12:12] + | | `--ASSIGN -> = [12:14] + | | `--EXPR -> EXPR [12:32] + | | |--BLOCK_COMMENT_BEGIN -> /* [12:18] + | | | |--COMMENT_CONTENT -> comment [12:20] + | | | `--BLOCK_COMMENT_END -> */ [12:28] + | | `--PLUS -> + [12:32] + | | |--NUM_INT -> 2 [12:16] + | | `--NUM_INT -> 2 [12:34] + | |--SEMI -> ; [12:35] + | |--VARIABLE_DEF -> VARIABLE_DEF [13:8] + | | |--MODIFIERS -> MODIFIERS [13:8] + | | |--TYPE -> TYPE [13:8] + | | | `--LITERAL_INT -> int [13:8] + | | |--IDENT -> y [13:12] + | | `--ASSIGN -> = [13:14] + | | `--EXPR -> EXPR [13:16] + | | |--LPAREN -> ( [13:16] + | | |--BLOCK_COMMENT_BEGIN -> /* [13:32] + | | | |--COMMENT_CONTENT -> comment [13:34] + | | | `--BLOCK_COMMENT_END -> */ [13:41] + | | |--PLUS -> + [13:45] + | | | |--BLOCK_COMMENT_BEGIN -> /* [13:17] + | | | | |--COMMENT_CONTENT -> comment [13:19] + | | | | `--BLOCK_COMMENT_END -> */ [13:26] + | | | |--IDENT -> x [13:30] + | | | `--NUM_INT -> 2 [13:47] + | | `--RPAREN -> ) [13:48] + | |--SEMI -> ; [13:49] + | |--EXPR -> EXPR [14:10] + | | `--METHOD_CALL -> ( [14:10] + | | |--IDENT -> m4 [14:8] + | | |--ELIST -> ELIST [14:24] + | | | |--EXPR -> EXPR [14:24] + | | | | |--BLOCK_COMMENT_BEGIN -> /* [14:11] + | | | | | |--COMMENT_CONTENT -> param1 [14:13] + | | | | | `--BLOCK_COMMENT_END -> */ [14:20] + | | | | `--IDENT -> x [14:24] + | | | |--COMMA -> , [14:25] + | | | `--EXPR -> EXPR [14:40] + | | | |--BLOCK_COMMENT_BEGIN -> /* [14:27] + | | | | |--COMMENT_CONTENT -> param2 [14:29] + | | | | `--BLOCK_COMMENT_END -> */ [14:36] + | | | `--IDENT -> x [14:40] + | | `--RPAREN -> ) [14:41] + | |--SEMI -> ; [14:42] + | |--VARIABLE_DEF -> VARIABLE_DEF [15:8] + | | |--MODIFIERS -> MODIFIERS [15:8] + | | |--TYPE -> TYPE [15:8] + | | | |--IDENT -> BiFunction [15:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [15:18] + | | | |--GENERIC_START -> < [15:18] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [15:19] + | | | | `--IDENT -> Integer [15:19] + | | | |--COMMA -> , [15:26] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [15:28] + | | | | `--IDENT -> Integer [15:28] + | | | |--COMMA -> , [15:35] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [15:37] + | | | | `--IDENT -> Integer [15:37] + | | | `--GENERIC_END -> > [15:44] + | | |--IDENT -> lambda9 [15:46] + | | `--ASSIGN -> = [16:16] + | | `--LAMBDA -> -> [16:51] + | | |--LPAREN -> ( [16:18] + | | |--PARAMETERS -> PARAMETERS [16:32] + | | | |--PARAMETER_DEF -> PARAMETER_DEF [16:32] + | | | | |--MODIFIERS -> MODIFIERS [16:32] + | | | | |--TYPE -> TYPE [16:32] + | | | | |--BLOCK_COMMENT_BEGIN -> /* [16:19] + | | | | | |--COMMENT_CONTENT -> param1 [16:21] + | | | | | `--BLOCK_COMMENT_END -> */ [16:28] + | | | | `--IDENT -> a [16:32] + | | | |--COMMA -> , [16:33] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [16:48] + | | | |--MODIFIERS -> MODIFIERS [16:48] + | | | |--TYPE -> TYPE [16:48] + | | | |--BLOCK_COMMENT_BEGIN -> /* [16:35] + | | | | |--COMMENT_CONTENT -> param2 [16:37] + | | | | `--BLOCK_COMMENT_END -> */ [16:44] + | | | `--IDENT -> b [16:48] + | | |--RPAREN -> ) [16:49] + | | `--EXPR -> EXPR [16:56] + | | `--PLUS -> + [16:56] + | | |--IDENT -> a [16:54] + | | `--IDENT -> b [16:58] + | |--SEMI -> ; [16:59] + | |--VARIABLE_DEF -> VARIABLE_DEF [18:8] + | | |--MODIFIERS -> MODIFIERS [18:8] + | | |--TYPE -> TYPE [18:8] + | | | |--IDENT -> BiFunction [18:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [18:18] + | | | |--GENERIC_START -> < [18:18] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [18:19] + | | | | `--IDENT -> Integer [18:19] + | | | |--COMMA -> , [18:26] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [18:28] + | | | | `--IDENT -> Integer [18:28] + | | | |--COMMA -> , [18:35] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [18:37] + | | | | `--IDENT -> Integer [18:37] + | | | `--GENERIC_END -> > [18:44] + | | |--IDENT -> lambda13 [18:46] + | | `--ASSIGN -> = [19:16] + | | `--LAMBDA -> -> [19:77] + | | |--LPAREN -> ( [19:18] + | | |--PARAMETERS -> PARAMETERS [19:32] + | | | |--PARAMETER_DEF -> PARAMETER_DEF [19:32] + | | | | |--MODIFIERS -> MODIFIERS [19:32] + | | | | |--TYPE -> TYPE [19:32] + | | | | |--BLOCK_COMMENT_BEGIN -> /* [19:19] + | | | | | |--COMMENT_CONTENT -> param1 [19:21] + | | | | | `--BLOCK_COMMENT_END -> */ [19:28] + | | | | `--IDENT -> a [19:32] + | | | |--BLOCK_COMMENT_BEGIN -> /* [19:34] + | | | | |--COMMENT_CONTENT -> param1 [19:36] + | | | | `--BLOCK_COMMENT_END -> */ [19:43] + | | | |--COMMA -> , [19:46] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [19:61] + | | | |--MODIFIERS -> MODIFIERS [19:61] + | | | |--TYPE -> TYPE [19:61] + | | | |--BLOCK_COMMENT_BEGIN -> /* [19:48] + | | | | |--COMMENT_CONTENT -> param2 [19:50] + | | | | `--BLOCK_COMMENT_END -> */ [19:57] + | | | `--IDENT -> b [19:61] + | | |--BLOCK_COMMENT_BEGIN -> /* [19:63] + | | | |--COMMENT_CONTENT -> param2 [19:65] + | | | `--BLOCK_COMMENT_END -> */ [19:72] + | | |--RPAREN -> ) [19:75] + | | `--EXPR -> EXPR [19:82] + | | `--PLUS -> + [19:82] + | | |--IDENT -> a [19:80] + | | `--IDENT -> b [19:84] + | |--SEMI -> ; [19:85] + | `--RCURLY -> } [20:4] + |--METHOD_DEF -> METHOD_DEF [22:4] + | |--MODIFIERS -> MODIFIERS [22:4] + | |--TYPE -> TYPE [22:4] + | | `--LITERAL_INT -> int [22:4] + | |--IDENT -> m4 [22:8] + | |--LPAREN -> ( [22:11] + | |--PARAMETERS -> PARAMETERS [22:12] + | | |--PARAMETER_DEF -> PARAMETER_DEF [22:12] + | | | |--MODIFIERS -> MODIFIERS [22:12] + | | | |--TYPE -> TYPE [22:12] + | | | | `--LITERAL_INT -> int [22:12] + | | | `--IDENT -> z [22:16] + | | |--COMMA -> , [22:17] + | | `--PARAMETER_DEF -> PARAMETER_DEF [22:19] + | | |--MODIFIERS -> MODIFIERS [22:19] + | | |--TYPE -> TYPE [22:19] + | | | `--LITERAL_INT -> int [22:19] + | | `--IDENT -> q [22:23] + | |--RPAREN -> ) [22:24] + | |--LITERAL_THROWS -> throws [22:26] + | | `--IDENT -> FileNotFoundException [22:33] + | `--SLIST -> { [22:55] + | |--LITERAL_TRY -> try [23:8] + | | |--RESOURCE_SPECIFICATION -> RESOURCE_SPECIFICATION [23:12] + | | | |--LPAREN -> ( [23:12] + | | | |--RESOURCES -> RESOURCES [27:24] + | | | | `--RESOURCE -> RESOURCE [27:24] + | | | | |--MODIFIERS -> MODIFIERS [27:24] + | | | | |--TYPE -> TYPE [27:24] + | | | | | `--DOT -> . [27:24] + | | | | | |--DOT -> . [25:24] + | | | | | | |--IDENT -> java [24:16] + | | | | | | `--IDENT -> io [26:24] + | | | | | `--IDENT -> BufferedReader [28:24] + | | | | |--IDENT -> bufferedReader [28:39] + | | | | `--ASSIGN -> = [29:24] + | | | | `--EXPR -> EXPR [29:26] + | | | | `--LITERAL_NEW -> new [29:26] + | | | | |--IDENT -> BufferedReader [29:30] + | | | | |--LPAREN -> ( [29:44] + | | | | |--ELIST -> ELIST [29:45] + | | | | | `--EXPR -> EXPR [29:45] + | | | | | `--LITERAL_NEW -> new [29:45] + | | | | | |--IDENT -> FileReader [29:49] + | | | | | |--LPAREN -> ( [29:59] + | | | | | |--ELIST -> ELIST [29:60] + | | | | | | `--EXPR -> EXPR [29:60] + | | | | | | `--STRING_LITERAL -> "path" [29:60] + | | | | | `--RPAREN -> ) [29:66] + | | | | `--RPAREN -> ) [29:67] + | | | `--RPAREN -> ) [29:68] + | | |--SLIST -> { [29:70] + | | | `--RCURLY -> } [30:8] + | | `--LITERAL_CATCH -> catch [30:10] + | | |--LPAREN -> ( [30:16] + | | |--PARAMETER_DEF -> PARAMETER_DEF [30:17] + | | | |--MODIFIERS -> MODIFIERS [30:17] + | | | |--TYPE -> TYPE [30:17] + | | | | `--IDENT -> IOException [30:17] + | | | `--IDENT -> e [30:29] + | | |--RPAREN -> ) [30:30] + | | `--SLIST -> { [30:32] + | | |--EXPR -> EXPR [31:29] + | | | `--METHOD_CALL -> ( [31:29] + | | | |--DOT -> . [31:13] + | | | | |--IDENT -> e [31:12] + | | | | `--IDENT -> printStackTrace [31:14] + | | | |--ELIST -> ELIST [31:30] + | | | `--RPAREN -> ) [31:30] + | | |--SEMI -> ; [31:31] + | | `--RCURLY -> } [32:8] + | |--LITERAL_RETURN -> return [33:8] + | | |--EXPR -> EXPR [33:15] + | | | `--NUM_INT -> 8 [33:15] + | | `--SEMI -> ; [33:16] + | `--RCURLY -> } [34:4] + |--CLASS_DEF -> CLASS_DEF [36:4] + | |--MODIFIERS -> MODIFIERS [36:4] + | |--LITERAL_CLASS -> class [36:4] + | |--IDENT -> CelebrationLunch [36:10] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [36:26] + | | |--GENERIC_START -> < [36:26] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [36:27] + | | | |--IDENT -> I [36:27] + | | | `--TYPE_UPPER_BOUNDS -> extends [36:29] + | | | `--IDENT -> Number [36:37] + | | |--COMMA -> , [36:43] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [36:45] + | | | |--IDENT -> L [36:45] + | | | `--TYPE_UPPER_BOUNDS -> extends [36:47] + | | | `--IDENT -> Number [36:55] + | | |--COMMA -> , [36:61] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [36:63] + | | | |--IDENT -> D [36:63] + | | | `--TYPE_UPPER_BOUNDS -> extends [36:65] + | | | `--IDENT -> Number [36:73] + | | `--GENERIC_END -> > [36:79] + | `--OBJBLOCK -> OBJBLOCK [36:81] + | |--LCURLY -> { [36:81] + | |--CLASS_DEF -> CLASS_DEF [37:8] + | | |--MODIFIERS -> MODIFIERS [37:8] + | | |--LITERAL_CLASS -> class [37:8] + | | |--IDENT -> Section [37:14] + | | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [37:21] + | | | |--GENERIC_START -> < [37:21] + | | | |--TYPE_PARAMETER -> TYPE_PARAMETER [37:22] + | | | | |--IDENT -> A [37:22] + | | | | `--TYPE_UPPER_BOUNDS -> extends [37:24] + | | | | `--IDENT -> Number [37:32] + | | | |--COMMA -> , [37:38] + | | | |--TYPE_PARAMETER -> TYPE_PARAMETER [37:40] + | | | | |--IDENT -> B [37:40] + | | | | `--TYPE_UPPER_BOUNDS -> extends [37:42] + | | | | `--IDENT -> Number [37:50] + | | | |--COMMA -> , [37:56] + | | | |--TYPE_PARAMETER -> TYPE_PARAMETER [37:58] + | | | | |--IDENT -> C [37:58] + | | | | `--TYPE_UPPER_BOUNDS -> extends [37:60] + | | | | `--IDENT -> Number [37:68] + | | | `--GENERIC_END -> > [37:74] + | | `--OBJBLOCK -> OBJBLOCK [37:76] + | | |--LCURLY -> { [37:76] + | | `--RCURLY -> } [39:8] + | `--RCURLY -> } [40:4] + |--VARIABLE_DEF -> VARIABLE_DEF [42:4] + | |--MODIFIERS -> MODIFIERS [42:4] + | | `--LITERAL_PRIVATE -> private [42:4] + | |--TYPE -> TYPE [42:12] + | | |--IDENT -> CelebrationLunch [42:12] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [42:28] + | | |--GENERIC_START -> < [42:28] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [42:29] + | | | `--IDENT -> Integer [42:29] + | | |--COMMA -> , [42:36] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [42:37] + | | | `--IDENT -> Long [42:37] + | | |--COMMA -> , [42:41] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [42:42] + | | | `--IDENT -> Double [42:42] + | | `--GENERIC_END -> > [42:48] + | |--IDENT -> inner [42:50] + | `--SEMI -> ; [42:55] + |--VARIABLE_DEF -> VARIABLE_DEF [44:12] + | |--MODIFIERS -> MODIFIERS [44:12] + | |--TYPE -> TYPE [44:12] + | | `--DOT -> . [44:12] + | | |--IDENT -> CelebrationLunch [43:4] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [43:20] + | | | |--GENERIC_START -> < [43:20] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [43:21] + | | | | `--IDENT -> Integer [43:21] + | | | |--COMMA -> , [43:28] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [43:30] + | | | | `--IDENT -> Long [43:30] + | | | |--COMMA -> , [43:34] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [43:36] + | | | | `--IDENT -> Double [43:36] + | | | `--GENERIC_END -> > [43:42] + | | |--IDENT -> Section [44:13] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [44:20] + | | |--GENERIC_START -> < [44:20] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [44:21] + | | | `--IDENT -> Number [44:21] + | | |--COMMA -> , [44:27] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [44:29] + | | | `--IDENT -> Number [44:29] + | | |--COMMA -> , [44:35] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [44:37] + | | | `--IDENT -> Number [44:37] + | | `--GENERIC_END -> > [44:43] + | |--IDENT -> section [44:45] + | |--ASSIGN -> = [44:53] + | | `--EXPR -> EXPR [44:60] + | | `--DOT -> . [44:60] + | | |--IDENT -> inner [44:55] + | | `--LITERAL_NEW -> new [44:61] + | | |--IDENT -> Section [44:65] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [44:72] + | | | |--GENERIC_START -> < [44:72] + | | | `--GENERIC_END -> > [44:73] + | | |--LPAREN -> ( [44:74] + | | |--ELIST -> ELIST [44:75] + | | `--RPAREN -> ) [44:75] + | `--SEMI -> ; [44:76] + |--VARIABLE_DEF -> VARIABLE_DEF [46:4] + | |--MODIFIERS -> MODIFIERS [46:4] + | | `--ANNOTATION -> ANNOTATION [46:4] + | | |--AT -> @ [46:4] + | | `--IDENT -> NonNull [46:5] + | |--TYPE -> TYPE [46:13] + | | `--IDENT -> String [46:13] + | |--IDENT -> p1 [46:20] + | |--ASSIGN -> = [46:23] + | | `--EXPR -> EXPR [46:25] + | | `--STRING_LITERAL -> "hello" [46:25] + | `--SEMI -> ; [46:32] + |--METHOD_DEF -> METHOD_DEF [47:4] + | |--MODIFIERS -> MODIFIERS [47:4] + | |--TYPE -> TYPE [47:4] + | | `--LITERAL_VOID -> void [47:4] + | |--IDENT -> method [47:9] + | |--LPAREN -> ( [47:15] + | |--PARAMETERS -> PARAMETERS [47:16] + | |--RPAREN -> ) [47:16] + | `--SLIST -> { [47:18] + | |--LITERAL_TRY -> try [48:8] + | | |--SLIST -> { [48:12] + | | | |--EXPR -> EXPR [49:30] + | | | | `--METHOD_CALL -> ( [49:30] + | | | | |--DOT -> . [49:22] + | | | | | |--DOT -> . [49:18] + | | | | | | |--IDENT -> System [49:12] + | | | | | | `--IDENT -> out [49:19] + | | | | | `--IDENT -> println [49:23] + | | | | |--ELIST -> ELIST [49:31] + | | | | `--RPAREN -> ) [49:31] + | | | |--SEMI -> ; [49:32] + | | | `--RCURLY -> } [50:8] + | | `--LITERAL_CATCH -> catch [51:8] + | | |--LPAREN -> ( [51:14] + | | |--PARAMETER_DEF -> PARAMETER_DEF [51:15] + | | | |--MODIFIERS -> MODIFIERS [51:15] + | | | | `--ANNOTATION -> ANNOTATION [51:15] + | | | | |--AT -> @ [51:15] + | | | | `--IDENT -> NonNull [51:16] + | | | |--TYPE -> TYPE [51:24] + | | | | |--IDENT -> IOError [51:24] + | | | | |--BOR -> | [51:32] + | | | | `--IDENT -> ArithmeticException [51:34] + | | | `--IDENT -> e [51:54] + | | |--RPAREN -> ) [51:55] + | | `--SLIST -> { [51:57] + | | `--RCURLY -> } [53:8] + | `--RCURLY -> } [54:4] + |--METHOD_DEF -> METHOD_DEF [56:4] + | |--MODIFIERS -> MODIFIERS [56:4] + | |--TYPE -> TYPE [56:4] + | | `--LITERAL_VOID -> void [56:4] + | |--IDENT -> m23 [56:9] + | |--LPAREN -> ( [56:12] + | |--PARAMETERS -> PARAMETERS [56:13] + | | `--PARAMETER_DEF -> PARAMETER_DEF [56:13] + | | |--MODIFIERS -> MODIFIERS [56:13] + | | |--TYPE -> TYPE [56:13] + | | | |--IDENT -> Class [56:13] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [56:18] + | | | |--GENERIC_START -> < [56:18] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [56:19] + | | | | `--IDENT -> Object [56:19] + | | | `--GENERIC_END -> > [56:25] + | | `--IDENT -> clazz [56:27] + | |--RPAREN -> ) [56:32] + | `--SLIST -> { [56:34] + | |--LITERAL_IF -> if [57:8] + | | |--LPAREN -> ( [57:11] + | | |--EXPR -> EXPR [57:51] + | | | `--NOT_EQUAL -> != [57:51] + | | | |--DOT -> . [57:45] + | | | | |--IDENT -> InputAntlr4AstRegressionUncommon4 [57:12] + | | | | `--LITERAL_THIS -> this [57:46] + | | | `--LITERAL_NULL -> null [57:54] + | | |--RPAREN -> ) [57:58] + | | `--SLIST -> { [57:60] + | | `--RCURLY -> } [58:8] + | `--RCURLY -> } [59:4] + `--RCURLY -> } [61:0] +CLASS_DEF -> CLASS_DEF [63:0] +|--MODIFIERS -> MODIFIERS [63:0] +|--LITERAL_CLASS -> class [63:0] +|--IDENT -> H006_ComplexConstructors [63:6] +|--TYPE_PARAMETERS -> TYPE_PARAMETERS [63:30] +| |--GENERIC_START -> < [63:30] +| |--TYPE_PARAMETER -> TYPE_PARAMETER [63:31] +| | `--IDENT -> T [63:31] +| `--GENERIC_END -> > [63:32] +`--OBJBLOCK -> OBJBLOCK [63:34] + |--LCURLY -> { [63:34] + |--CTOR_DEF -> CTOR_DEF [64:4] + | |--MODIFIERS -> MODIFIERS [64:4] + | | `--LITERAL_PUBLIC -> public [64:4] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [64:11] + | | |--GENERIC_START -> < [64:11] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [64:12] + | | | `--IDENT -> V [64:12] + | | `--GENERIC_END -> > [64:13] + | |--IDENT -> H006_ComplexConstructors [64:15] + | |--LPAREN -> ( [64:39] + | |--PARAMETERS -> PARAMETERS [64:40] + | | |--PARAMETER_DEF -> PARAMETER_DEF [64:40] + | | | |--MODIFIERS -> MODIFIERS [64:40] + | | | |--TYPE -> TYPE [64:40] + | | | | `--IDENT -> T [64:40] + | | | `--IDENT -> t [64:42] + | | |--COMMA -> , [64:43] + | | `--PARAMETER_DEF -> PARAMETER_DEF [64:45] + | | |--MODIFIERS -> MODIFIERS [64:45] + | | |--TYPE -> TYPE [64:45] + | | | `--IDENT -> V [64:45] + | | `--IDENT -> v [64:47] + | |--RPAREN -> ) [64:48] + | `--SLIST -> { [64:50] + | `--RCURLY -> } [65:4] + |--STATIC_INIT -> STATIC_INIT [67:4] + | `--SLIST -> { [67:11] + | |--VARIABLE_DEF -> VARIABLE_DEF [68:8] + | | |--MODIFIERS -> MODIFIERS [68:8] + | | |--TYPE -> TYPE [68:8] + | | | |--IDENT -> H006_ComplexConstructors [68:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [68:32] + | | | |--GENERIC_START -> < [68:32] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [68:33] + | | | | |--WILDCARD_TYPE -> ? [68:33] + | | | | `--TYPE_UPPER_BOUNDS -> extends [68:35] + | | | | `--IDENT -> Number [68:43] + | | | `--GENERIC_END -> > [68:49] + | | |--IDENT -> x [68:51] + | | `--ASSIGN -> = [68:53] + | | `--EXPR -> EXPR [69:16] + | | `--LITERAL_NEW -> new [69:16] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [69:20] + | | | |--GENERIC_START -> < [69:20] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [69:21] + | | | | `--IDENT -> String [69:21] + | | | `--GENERIC_END -> > [69:27] + | | |--IDENT -> H006_ComplexConstructors [69:28] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [69:52] + | | | |--GENERIC_START -> < [69:52] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [69:53] + | | | | `--IDENT -> Integer [69:53] + | | | `--GENERIC_END -> > [69:60] + | | |--LPAREN -> ( [69:61] + | | |--ELIST -> ELIST [69:62] + | | | |--EXPR -> EXPR [69:62] + | | | | `--NUM_INT -> 0 [69:62] + | | | |--COMMA -> , [69:63] + | | | `--EXPR -> EXPR [69:65] + | | | `--STRING_LITERAL -> "" [69:65] + | | `--RPAREN -> ) [69:67] + | |--SEMI -> ; [69:68] + | `--RCURLY -> } [70:4] + |--CLASS_DEF -> CLASS_DEF [73:4] + | |--MODIFIERS -> MODIFIERS [73:4] + | |--LITERAL_CLASS -> class [73:4] + | |--IDENT -> Inner3 [73:10] + | `--OBJBLOCK -> OBJBLOCK [73:17] + | |--LCURLY -> { [73:17] + | |--CTOR_DEF -> CTOR_DEF [74:8] + | | |--MODIFIERS -> MODIFIERS [74:8] + | | |--IDENT -> Inner3 [74:8] + | | |--LPAREN -> ( [74:14] + | | |--PARAMETERS -> PARAMETERS [74:15] + | | | `--PARAMETER_DEF -> PARAMETER_DEF [74:15] + | | | |--MODIFIERS -> MODIFIERS [74:15] + | | | |--TYPE -> TYPE [74:15] + | | | | `--LITERAL_INT -> int [74:15] + | | | `--IDENT -> x [74:19] + | | |--RPAREN -> ) [74:20] + | | `--SLIST -> { [74:22] + | | |--VARIABLE_DEF -> VARIABLE_DEF [75:12] + | | | |--MODIFIERS -> MODIFIERS [75:12] + | | | |--TYPE -> TYPE [75:12] + | | | | |--IDENT -> H006_ComplexConstructors [75:12] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [75:36] + | | | | |--GENERIC_START -> < [75:36] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [75:37] + | | | | | `--IDENT -> Integer [75:37] + | | | | `--GENERIC_END -> > [75:44] + | | | |--IDENT -> instance [75:46] + | | | `--ASSIGN -> = [75:55] + | | | `--EXPR -> EXPR [76:20] + | | | `--LITERAL_NEW -> new [76:20] + | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [76:24] + | | | | |--GENERIC_START -> < [76:24] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [76:25] + | | | | | `--IDENT -> String [76:25] + | | | | `--GENERIC_END -> > [76:31] + | | | |--IDENT -> H006_ComplexConstructors [76:32] + | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [76:56] + | | | | |--GENERIC_START -> < [76:56] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [76:57] + | | | | | `--IDENT -> Integer [76:57] + | | | | `--GENERIC_END -> > [76:64] + | | | |--LPAREN -> ( [76:65] + | | | |--ELIST -> ELIST [76:66] + | | | | |--EXPR -> EXPR [76:66] + | | | | | `--NUM_INT -> 0 [76:66] + | | | | |--COMMA -> , [76:67] + | | | | `--EXPR -> EXPR [76:69] + | | | | `--STRING_LITERAL -> "" [76:69] + | | | `--RPAREN -> ) [76:71] + | | |--SEMI -> ; [76:72] + | | |--VARIABLE_DEF -> VARIABLE_DEF [77:12] + | | | |--MODIFIERS -> MODIFIERS [77:12] + | | | |--TYPE -> TYPE [77:12] + | | | | `--IDENT -> Object [77:12] + | | | |--IDENT -> o [77:19] + | | | `--ASSIGN -> = [77:21] + | | | `--EXPR -> EXPR [77:45] + | | | `--DOT -> . [77:45] + | | | |--DOT -> . [77:31] + | | | | |--IDENT -> instance [77:23] + | | | | `--LITERAL_NEW -> new [77:32] + | | | | |--IDENT -> Inner3 [77:36] + | | | | |--LPAREN -> ( [77:42] + | | | | |--ELIST -> ELIST [77:43] + | | | | | `--EXPR -> EXPR [77:43] + | | | | | `--NUM_INT -> 5 [77:43] + | | | | `--RPAREN -> ) [77:44] + | | | `--LITERAL_NEW -> new [77:46] + | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [77:50] + | | | | |--GENERIC_START -> < [77:50] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [77:51] + | | | | | `--IDENT -> String [77:51] + | | | | `--GENERIC_END -> > [77:57] + | | | |--IDENT -> InnerInner3 [77:58] + | | | |--LPAREN -> ( [77:69] + | | | |--ELIST -> ELIST [77:70] + | | | | `--EXPR -> EXPR [77:70] + | | | | `--STRING_LITERAL -> "hey" [77:70] + | | | `--RPAREN -> ) [77:75] + | | |--SEMI -> ; [77:76] + | | `--RCURLY -> } [78:8] + | |--CLASS_DEF -> CLASS_DEF [80:8] + | | |--MODIFIERS -> MODIFIERS [80:8] + | | |--LITERAL_CLASS -> class [80:8] + | | |--IDENT -> InnerInner3 [80:14] + | | `--OBJBLOCK -> OBJBLOCK [80:26] + | | |--LCURLY -> { [80:26] + | | |--CTOR_DEF -> CTOR_DEF [81:12] + | | | |--MODIFIERS -> MODIFIERS [81:12] + | | | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [81:12] + | | | | |--GENERIC_START -> < [81:12] + | | | | |--TYPE_PARAMETER -> TYPE_PARAMETER [81:13] + | | | | | `--IDENT -> D [81:13] + | | | | `--GENERIC_END -> > [81:14] + | | | |--IDENT -> InnerInner3 [81:16] + | | | |--LPAREN -> ( [81:27] + | | | |--PARAMETERS -> PARAMETERS [81:28] + | | | | `--PARAMETER_DEF -> PARAMETER_DEF [81:28] + | | | | |--MODIFIERS -> MODIFIERS [81:28] + | | | | |--TYPE -> TYPE [81:28] + | | | | | `--IDENT -> D [81:28] + | | | | `--IDENT -> in [81:30] + | | | |--RPAREN -> ) [81:32] + | | | `--SLIST -> { [81:34] + | | | `--RCURLY -> } [82:12] + | | `--RCURLY -> } [83:8] + | `--RCURLY -> } [84:4] + `--RCURLY -> } [85:0] +ANNOTATION_DEF -> ANNOTATION_DEF [87:0] +|--MODIFIERS -> MODIFIERS [87:0] +|--AT -> @ [87:0] +|--LITERAL_INTERFACE -> interface [87:1] +|--IDENT -> NonNull [87:11] +`--OBJBLOCK -> OBJBLOCK [87:18] + |--LCURLY -> { [87:18] + `--RCURLY -> } [87:19] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionWeirdCtor.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionWeirdCtor.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionWeirdCtor.java @@ -0,0 +1,93 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Callable; + +public class InputAntlr4AstRegressionWeirdCtor { + void meth() + { + List<Integer> x = new ArrayList<Integer>(); + List<List<Integer>> y = new ArrayList<List<Integer>>(); + List < Integer > a = new ArrayList < Integer > (); + List < List < Integer > > b = new ArrayList < List < Integer > > (); + } + //always 0 + public int compareTo(Object aObject) + { + return 0; + } + + public static <T> Callable<T> callable(Runnable task, T result) + { + return null; + } + + public static<T>Callable<T> callable2(Runnable task, T result) + { + Map<Class<?>, Integer> x = new HashMap<Class<?>, Integer>(); + for (final Map.Entry<Class<?>, Integer> entry : x.entrySet()) { + entry.getValue(); + } + Class<?>[] parameterClasses = new Class<?>[0]; + return null; + } + public int getConstructor(Class<?>... parameterTypes) + { + Collections.<Object>emptySet(); + Collections. <Object> emptySet(); + return 666; + } + + <T> InputAntlr4AstRegressionWeirdCtor(List<T> things, int i) + { + } + + public <T> InputAntlr4AstRegressionWeirdCtor(List<T> things) + { + } + + public interface IntEnum { /*inner enum*/ + } + + public static class IntEnumValueType<E extends Enum<E> & IntEnum> { + } + + public static class IntEnumValueType2<E extends Enum<E>& IntEnum> { + } + + public static class IntEnumValueType3<E extends Enum<E> & IntEnum> { + } + + public static class IntEnumValueType4<T extends Comparable<List<T>> & IntEnum> { + } + + public void beforeAndAfter() { + List +< +Integer> x = new ArrayList<Integer +>(); + List + <Integer> y = new ArrayList<Integer + >(); + Map<Class<?>, Integer> a = new HashMap<Class<?>, Integer>(); + Map<Class<?>, Integer> b = (Map<Class<?>, Integer>) a; + } + Object ok = new <String>Object(); + Object notOkStart = new<String>Object(); // violation + Object notOkEnd = new <String> Object(); // violation + Object notOkStartAndEnd = new<String> Object(); // violation + Object okWithPackage = new <String>java.lang.Object(); + Object ok2 = new <String>Outer.Inner(); + Object notOkStart2 = new<String>Outer.Inner(); // violation + Object notOkEnd2 = new <String> Outer.Inner(); // violation + Object notOkStartAndEnd2 = new<String> Outer.Inner(); // violation +} +interface SupplierFunction<T> extends Map<List<T>, T> {} + +class Outer { + static class Inner {} +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionWeirdCtor.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionWeirdCtor.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionWeirdCtor.txt @@ -0,0 +1,951 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +IMPORT -> import [3:0] +|--DOT -> . [3:16] +| |--DOT -> . [3:11] +| | |--IDENT -> java [3:7] +| | `--IDENT -> util [3:12] +| `--IDENT -> ArrayList [3:17] +`--SEMI -> ; [3:26] +IMPORT -> import [4:0] +|--DOT -> . [4:16] +| |--DOT -> . [4:11] +| | |--IDENT -> java [4:7] +| | `--IDENT -> util [4:12] +| `--IDENT -> Collections [4:17] +`--SEMI -> ; [4:28] +IMPORT -> import [5:0] +|--DOT -> . [5:16] +| |--DOT -> . [5:11] +| | |--IDENT -> java [5:7] +| | `--IDENT -> util [5:12] +| `--IDENT -> HashMap [5:17] +`--SEMI -> ; [5:24] +IMPORT -> import [6:0] +|--DOT -> . [6:16] +| |--DOT -> . [6:11] +| | |--IDENT -> java [6:7] +| | `--IDENT -> util [6:12] +| `--IDENT -> List [6:17] +`--SEMI -> ; [6:21] +IMPORT -> import [7:0] +|--DOT -> . [7:16] +| |--DOT -> . [7:11] +| | |--IDENT -> java [7:7] +| | `--IDENT -> util [7:12] +| `--IDENT -> Map [7:17] +`--SEMI -> ; [7:20] +IMPORT -> import [8:0] +|--DOT -> . [8:27] +| |--DOT -> . [8:16] +| | |--DOT -> . [8:11] +| | | |--IDENT -> java [8:7] +| | | `--IDENT -> util [8:12] +| | `--IDENT -> concurrent [8:17] +| `--IDENT -> Callable [8:28] +`--SEMI -> ; [8:36] +CLASS_DEF -> CLASS_DEF [10:0] +|--MODIFIERS -> MODIFIERS [10:0] +| `--LITERAL_PUBLIC -> public [10:0] +|--LITERAL_CLASS -> class [10:7] +|--IDENT -> InputAntlr4AstRegressionWeirdCtor [10:13] +`--OBJBLOCK -> OBJBLOCK [10:47] + |--LCURLY -> { [10:47] + |--METHOD_DEF -> METHOD_DEF [11:4] + | |--MODIFIERS -> MODIFIERS [11:4] + | |--TYPE -> TYPE [11:4] + | | `--LITERAL_VOID -> void [11:4] + | |--IDENT -> meth [11:9] + | |--LPAREN -> ( [11:13] + | |--PARAMETERS -> PARAMETERS [11:14] + | |--RPAREN -> ) [11:14] + | `--SLIST -> { [12:4] + | |--VARIABLE_DEF -> VARIABLE_DEF [13:8] + | | |--MODIFIERS -> MODIFIERS [13:8] + | | |--TYPE -> TYPE [13:8] + | | | |--IDENT -> List [13:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [13:12] + | | | |--GENERIC_START -> < [13:12] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [13:13] + | | | | `--IDENT -> Integer [13:13] + | | | `--GENERIC_END -> > [13:20] + | | |--IDENT -> x [13:22] + | | `--ASSIGN -> = [13:24] + | | `--EXPR -> EXPR [13:26] + | | `--LITERAL_NEW -> new [13:26] + | | |--IDENT -> ArrayList [13:30] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [13:39] + | | | |--GENERIC_START -> < [13:39] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [13:40] + | | | | `--IDENT -> Integer [13:40] + | | | `--GENERIC_END -> > [13:47] + | | |--LPAREN -> ( [13:48] + | | |--ELIST -> ELIST [13:49] + | | `--RPAREN -> ) [13:49] + | |--SEMI -> ; [13:50] + | |--VARIABLE_DEF -> VARIABLE_DEF [14:8] + | | |--MODIFIERS -> MODIFIERS [14:8] + | | |--TYPE -> TYPE [14:8] + | | | |--IDENT -> List [14:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [14:12] + | | | |--GENERIC_START -> < [14:12] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [14:13] + | | | | |--IDENT -> List [14:13] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [14:17] + | | | | |--GENERIC_START -> < [14:17] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [14:18] + | | | | | `--IDENT -> Integer [14:18] + | | | | `--GENERIC_END -> > [14:25] + | | | `--GENERIC_END -> > [14:26] + | | |--IDENT -> y [14:28] + | | `--ASSIGN -> = [14:30] + | | `--EXPR -> EXPR [14:32] + | | `--LITERAL_NEW -> new [14:32] + | | |--IDENT -> ArrayList [14:36] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [14:45] + | | | |--GENERIC_START -> < [14:45] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [14:46] + | | | | |--IDENT -> List [14:46] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [14:50] + | | | | |--GENERIC_START -> < [14:50] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [14:51] + | | | | | `--IDENT -> Integer [14:51] + | | | | `--GENERIC_END -> > [14:58] + | | | `--GENERIC_END -> > [14:59] + | | |--LPAREN -> ( [14:60] + | | |--ELIST -> ELIST [14:61] + | | `--RPAREN -> ) [14:61] + | |--SEMI -> ; [14:62] + | |--VARIABLE_DEF -> VARIABLE_DEF [15:8] + | | |--MODIFIERS -> MODIFIERS [15:8] + | | |--TYPE -> TYPE [15:8] + | | | |--IDENT -> List [15:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [15:13] + | | | |--GENERIC_START -> < [15:13] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [15:15] + | | | | `--IDENT -> Integer [15:15] + | | | `--GENERIC_END -> > [15:23] + | | |--IDENT -> a [15:25] + | | `--ASSIGN -> = [15:27] + | | `--EXPR -> EXPR [15:29] + | | `--LITERAL_NEW -> new [15:29] + | | |--IDENT -> ArrayList [15:33] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [15:43] + | | | |--GENERIC_START -> < [15:43] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [15:45] + | | | | `--IDENT -> Integer [15:45] + | | | `--GENERIC_END -> > [15:53] + | | |--LPAREN -> ( [15:55] + | | |--ELIST -> ELIST [15:56] + | | `--RPAREN -> ) [15:56] + | |--SEMI -> ; [15:57] + | |--VARIABLE_DEF -> VARIABLE_DEF [16:8] + | | |--MODIFIERS -> MODIFIERS [16:8] + | | |--TYPE -> TYPE [16:8] + | | | |--IDENT -> List [16:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [16:13] + | | | |--GENERIC_START -> < [16:13] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [16:15] + | | | | |--IDENT -> List [16:15] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [16:20] + | | | | |--GENERIC_START -> < [16:20] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [16:22] + | | | | | `--IDENT -> Integer [16:22] + | | | | `--GENERIC_END -> > [16:30] + | | | `--GENERIC_END -> > [16:32] + | | |--IDENT -> b [16:34] + | | `--ASSIGN -> = [16:36] + | | `--EXPR -> EXPR [16:38] + | | `--LITERAL_NEW -> new [16:38] + | | |--IDENT -> ArrayList [16:42] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [16:52] + | | | |--GENERIC_START -> < [16:52] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [16:54] + | | | | |--IDENT -> List [16:54] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [16:59] + | | | | |--GENERIC_START -> < [16:59] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [16:61] + | | | | | `--IDENT -> Integer [16:61] + | | | | `--GENERIC_END -> > [16:69] + | | | `--GENERIC_END -> > [16:71] + | | |--LPAREN -> ( [16:73] + | | |--ELIST -> ELIST [16:74] + | | `--RPAREN -> ) [16:74] + | |--SEMI -> ; [16:75] + | `--RCURLY -> } [17:4] + |--METHOD_DEF -> METHOD_DEF [19:4] + | |--MODIFIERS -> MODIFIERS [19:4] + | | `--LITERAL_PUBLIC -> public [19:4] + | |--TYPE -> TYPE [19:11] + | | `--LITERAL_INT -> int [19:11] + | |--IDENT -> compareTo [19:15] + | |--LPAREN -> ( [19:24] + | |--PARAMETERS -> PARAMETERS [19:25] + | | `--PARAMETER_DEF -> PARAMETER_DEF [19:25] + | | |--MODIFIERS -> MODIFIERS [19:25] + | | |--TYPE -> TYPE [19:25] + | | | `--IDENT -> Object [19:25] + | | `--IDENT -> aObject [19:32] + | |--RPAREN -> ) [19:39] + | `--SLIST -> { [20:4] + | |--LITERAL_RETURN -> return [21:8] + | | |--EXPR -> EXPR [21:15] + | | | `--NUM_INT -> 0 [21:15] + | | `--SEMI -> ; [21:16] + | `--RCURLY -> } [22:4] + |--METHOD_DEF -> METHOD_DEF [24:4] + | |--MODIFIERS -> MODIFIERS [24:4] + | | |--LITERAL_PUBLIC -> public [24:4] + | | `--LITERAL_STATIC -> static [24:11] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [24:18] + | | |--GENERIC_START -> < [24:18] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [24:19] + | | | `--IDENT -> T [24:19] + | | `--GENERIC_END -> > [24:20] + | |--TYPE -> TYPE [24:22] + | | |--IDENT -> Callable [24:22] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [24:30] + | | |--GENERIC_START -> < [24:30] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [24:31] + | | | `--IDENT -> T [24:31] + | | `--GENERIC_END -> > [24:32] + | |--IDENT -> callable [24:34] + | |--LPAREN -> ( [24:42] + | |--PARAMETERS -> PARAMETERS [24:43] + | | |--PARAMETER_DEF -> PARAMETER_DEF [24:43] + | | | |--MODIFIERS -> MODIFIERS [24:43] + | | | |--TYPE -> TYPE [24:43] + | | | | `--IDENT -> Runnable [24:43] + | | | `--IDENT -> task [24:52] + | | |--COMMA -> , [24:56] + | | `--PARAMETER_DEF -> PARAMETER_DEF [24:58] + | | |--MODIFIERS -> MODIFIERS [24:58] + | | |--TYPE -> TYPE [24:58] + | | | `--IDENT -> T [24:58] + | | `--IDENT -> result [24:60] + | |--RPAREN -> ) [24:66] + | `--SLIST -> { [25:4] + | |--LITERAL_RETURN -> return [26:8] + | | |--EXPR -> EXPR [26:15] + | | | `--LITERAL_NULL -> null [26:15] + | | `--SEMI -> ; [26:19] + | `--RCURLY -> } [27:4] + |--METHOD_DEF -> METHOD_DEF [29:4] + | |--MODIFIERS -> MODIFIERS [29:4] + | | |--LITERAL_PUBLIC -> public [29:4] + | | `--LITERAL_STATIC -> static [29:11] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [29:17] + | | |--GENERIC_START -> < [29:17] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [29:18] + | | | `--IDENT -> T [29:18] + | | `--GENERIC_END -> > [29:19] + | |--TYPE -> TYPE [29:20] + | | |--IDENT -> Callable [29:20] + | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [29:28] + | | |--GENERIC_START -> < [29:28] + | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [29:29] + | | | `--IDENT -> T [29:29] + | | `--GENERIC_END -> > [29:30] + | |--IDENT -> callable2 [29:32] + | |--LPAREN -> ( [29:41] + | |--PARAMETERS -> PARAMETERS [29:42] + | | |--PARAMETER_DEF -> PARAMETER_DEF [29:42] + | | | |--MODIFIERS -> MODIFIERS [29:42] + | | | |--TYPE -> TYPE [29:42] + | | | | `--IDENT -> Runnable [29:42] + | | | `--IDENT -> task [29:51] + | | |--COMMA -> , [29:55] + | | `--PARAMETER_DEF -> PARAMETER_DEF [29:57] + | | |--MODIFIERS -> MODIFIERS [29:57] + | | |--TYPE -> TYPE [29:57] + | | | `--IDENT -> T [29:57] + | | `--IDENT -> result [29:59] + | |--RPAREN -> ) [29:65] + | `--SLIST -> { [30:4] + | |--VARIABLE_DEF -> VARIABLE_DEF [31:8] + | | |--MODIFIERS -> MODIFIERS [31:8] + | | |--TYPE -> TYPE [31:8] + | | | |--IDENT -> Map [31:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [31:11] + | | | |--GENERIC_START -> < [31:11] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [31:12] + | | | | |--IDENT -> Class [31:12] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [31:17] + | | | | |--GENERIC_START -> < [31:17] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [31:18] + | | | | | `--WILDCARD_TYPE -> ? [31:18] + | | | | `--GENERIC_END -> > [31:19] + | | | |--COMMA -> , [31:20] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [31:22] + | | | | `--IDENT -> Integer [31:22] + | | | `--GENERIC_END -> > [31:29] + | | |--IDENT -> x [31:31] + | | `--ASSIGN -> = [31:33] + | | `--EXPR -> EXPR [31:35] + | | `--LITERAL_NEW -> new [31:35] + | | |--IDENT -> HashMap [31:39] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [31:46] + | | | |--GENERIC_START -> < [31:46] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [31:47] + | | | | |--IDENT -> Class [31:47] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [31:52] + | | | | |--GENERIC_START -> < [31:52] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [31:53] + | | | | | `--WILDCARD_TYPE -> ? [31:53] + | | | | `--GENERIC_END -> > [31:54] + | | | |--COMMA -> , [31:55] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [31:57] + | | | | `--IDENT -> Integer [31:57] + | | | `--GENERIC_END -> > [31:64] + | | |--LPAREN -> ( [31:65] + | | |--ELIST -> ELIST [31:66] + | | `--RPAREN -> ) [31:66] + | |--SEMI -> ; [31:67] + | |--LITERAL_FOR -> for [32:8] + | | |--LPAREN -> ( [32:12] + | | |--FOR_EACH_CLAUSE -> FOR_EACH_CLAUSE [32:13] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [32:13] + | | | | |--MODIFIERS -> MODIFIERS [32:13] + | | | | | `--FINAL -> final [32:13] + | | | | |--TYPE -> TYPE [32:22] + | | | | | `--DOT -> . [32:22] + | | | | | |--IDENT -> Map [32:19] + | | | | | |--IDENT -> Entry [32:23] + | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [32:28] + | | | | | |--GENERIC_START -> < [32:28] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [32:29] + | | | | | | |--IDENT -> Class [32:29] + | | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [32:34] + | | | | | | |--GENERIC_START -> < [32:34] + | | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [32:35] + | | | | | | | `--WILDCARD_TYPE -> ? [32:35] + | | | | | | `--GENERIC_END -> > [32:36] + | | | | | |--COMMA -> , [32:37] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [32:39] + | | | | | | `--IDENT -> Integer [32:39] + | | | | | `--GENERIC_END -> > [32:46] + | | | | `--IDENT -> entry [32:48] + | | | |--COLON -> : [32:54] + | | | `--EXPR -> EXPR [32:66] + | | | `--METHOD_CALL -> ( [32:66] + | | | |--DOT -> . [32:57] + | | | | |--IDENT -> x [32:56] + | | | | `--IDENT -> entrySet [32:58] + | | | |--ELIST -> ELIST [32:67] + | | | `--RPAREN -> ) [32:67] + | | |--RPAREN -> ) [32:68] + | | `--SLIST -> { [32:70] + | | |--EXPR -> EXPR [33:26] + | | | `--METHOD_CALL -> ( [33:26] + | | | |--DOT -> . [33:17] + | | | | |--IDENT -> entry [33:12] + | | | | `--IDENT -> getValue [33:18] + | | | |--ELIST -> ELIST [33:27] + | | | `--RPAREN -> ) [33:27] + | | |--SEMI -> ; [33:28] + | | `--RCURLY -> } [34:8] + | |--VARIABLE_DEF -> VARIABLE_DEF [35:8] + | | |--MODIFIERS -> MODIFIERS [35:8] + | | |--TYPE -> TYPE [35:8] + | | | |--IDENT -> Class [35:8] + | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [35:13] + | | | | |--GENERIC_START -> < [35:13] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [35:14] + | | | | | `--WILDCARD_TYPE -> ? [35:14] + | | | | `--GENERIC_END -> > [35:15] + | | | `--ARRAY_DECLARATOR -> [ [35:16] + | | | `--RBRACK -> ] [35:17] + | | |--IDENT -> parameterClasses [35:19] + | | `--ASSIGN -> = [35:36] + | | `--EXPR -> EXPR [35:38] + | | `--LITERAL_NEW -> new [35:38] + | | |--IDENT -> Class [35:42] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [35:47] + | | | |--GENERIC_START -> < [35:47] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [35:48] + | | | | `--WILDCARD_TYPE -> ? [35:48] + | | | `--GENERIC_END -> > [35:49] + | | `--ARRAY_DECLARATOR -> [ [35:50] + | | |--EXPR -> EXPR [35:51] + | | | `--NUM_INT -> 0 [35:51] + | | `--RBRACK -> ] [35:52] + | |--SEMI -> ; [35:53] + | |--LITERAL_RETURN -> return [36:8] + | | |--EXPR -> EXPR [36:15] + | | | `--LITERAL_NULL -> null [36:15] + | | `--SEMI -> ; [36:19] + | `--RCURLY -> } [37:4] + |--METHOD_DEF -> METHOD_DEF [38:4] + | |--MODIFIERS -> MODIFIERS [38:4] + | | `--LITERAL_PUBLIC -> public [38:4] + | |--TYPE -> TYPE [38:11] + | | `--LITERAL_INT -> int [38:11] + | |--IDENT -> getConstructor [38:15] + | |--LPAREN -> ( [38:29] + | |--PARAMETERS -> PARAMETERS [38:30] + | | `--PARAMETER_DEF -> PARAMETER_DEF [38:30] + | | |--MODIFIERS -> MODIFIERS [38:30] + | | |--TYPE -> TYPE [38:30] + | | | |--IDENT -> Class [38:30] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [38:35] + | | | |--GENERIC_START -> < [38:35] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [38:36] + | | | | `--WILDCARD_TYPE -> ? [38:36] + | | | `--GENERIC_END -> > [38:37] + | | |--ELLIPSIS -> ... [38:38] + | | `--IDENT -> parameterTypes [38:42] + | |--RPAREN -> ) [38:56] + | `--SLIST -> { [39:4] + | |--EXPR -> EXPR [40:36] + | | `--METHOD_CALL -> ( [40:36] + | | |--DOT -> . [40:19] + | | | |--IDENT -> Collections [40:8] + | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [40:20] + | | | | |--GENERIC_START -> < [40:20] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [40:21] + | | | | | `--IDENT -> Object [40:21] + | | | | `--GENERIC_END -> > [40:27] + | | | `--IDENT -> emptySet [40:28] + | | |--ELIST -> ELIST [40:37] + | | `--RPAREN -> ) [40:37] + | |--SEMI -> ; [40:38] + | |--EXPR -> EXPR [41:38] + | | `--METHOD_CALL -> ( [41:38] + | | |--DOT -> . [41:19] + | | | |--IDENT -> Collections [41:8] + | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [41:21] + | | | | |--GENERIC_START -> < [41:21] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [41:22] + | | | | | `--IDENT -> Object [41:22] + | | | | `--GENERIC_END -> > [41:28] + | | | `--IDENT -> emptySet [41:30] + | | |--ELIST -> ELIST [41:39] + | | `--RPAREN -> ) [41:39] + | |--SEMI -> ; [41:40] + | |--LITERAL_RETURN -> return [42:8] + | | |--EXPR -> EXPR [42:15] + | | | `--NUM_INT -> 666 [42:15] + | | `--SEMI -> ; [42:18] + | `--RCURLY -> } [43:4] + |--CTOR_DEF -> CTOR_DEF [45:4] + | |--MODIFIERS -> MODIFIERS [45:4] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [45:4] + | | |--GENERIC_START -> < [45:4] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [45:5] + | | | `--IDENT -> T [45:5] + | | `--GENERIC_END -> > [45:6] + | |--IDENT -> InputAntlr4AstRegressionWeirdCtor [45:8] + | |--LPAREN -> ( [45:41] + | |--PARAMETERS -> PARAMETERS [45:42] + | | |--PARAMETER_DEF -> PARAMETER_DEF [45:42] + | | | |--MODIFIERS -> MODIFIERS [45:42] + | | | |--TYPE -> TYPE [45:42] + | | | | |--IDENT -> List [45:42] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [45:46] + | | | | |--GENERIC_START -> < [45:46] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [45:47] + | | | | | `--IDENT -> T [45:47] + | | | | `--GENERIC_END -> > [45:48] + | | | `--IDENT -> things [45:50] + | | |--COMMA -> , [45:56] + | | `--PARAMETER_DEF -> PARAMETER_DEF [45:58] + | | |--MODIFIERS -> MODIFIERS [45:58] + | | |--TYPE -> TYPE [45:58] + | | | `--LITERAL_INT -> int [45:58] + | | `--IDENT -> i [45:62] + | |--RPAREN -> ) [45:63] + | `--SLIST -> { [46:4] + | `--RCURLY -> } [47:4] + |--CTOR_DEF -> CTOR_DEF [49:4] + | |--MODIFIERS -> MODIFIERS [49:4] + | | `--LITERAL_PUBLIC -> public [49:4] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [49:11] + | | |--GENERIC_START -> < [49:11] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [49:12] + | | | `--IDENT -> T [49:12] + | | `--GENERIC_END -> > [49:13] + | |--IDENT -> InputAntlr4AstRegressionWeirdCtor [49:15] + | |--LPAREN -> ( [49:48] + | |--PARAMETERS -> PARAMETERS [49:49] + | | `--PARAMETER_DEF -> PARAMETER_DEF [49:49] + | | |--MODIFIERS -> MODIFIERS [49:49] + | | |--TYPE -> TYPE [49:49] + | | | |--IDENT -> List [49:49] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [49:53] + | | | |--GENERIC_START -> < [49:53] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [49:54] + | | | | `--IDENT -> T [49:54] + | | | `--GENERIC_END -> > [49:55] + | | `--IDENT -> things [49:57] + | |--RPAREN -> ) [49:63] + | `--SLIST -> { [50:4] + | `--RCURLY -> } [51:4] + |--INTERFACE_DEF -> INTERFACE_DEF [53:4] + | |--MODIFIERS -> MODIFIERS [53:4] + | | `--LITERAL_PUBLIC -> public [53:4] + | |--LITERAL_INTERFACE -> interface [53:11] + | |--IDENT -> IntEnum [53:21] + | `--OBJBLOCK -> OBJBLOCK [53:29] + | |--LCURLY -> { [53:29] + | `--RCURLY -> } [54:4] + |--CLASS_DEF -> CLASS_DEF [56:4] + | |--MODIFIERS -> MODIFIERS [56:4] + | | |--LITERAL_PUBLIC -> public [56:4] + | | `--LITERAL_STATIC -> static [56:11] + | |--LITERAL_CLASS -> class [56:18] + | |--IDENT -> IntEnumValueType [56:24] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [56:40] + | | |--GENERIC_START -> < [56:40] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [56:41] + | | | |--IDENT -> E [56:41] + | | | `--TYPE_UPPER_BOUNDS -> extends [56:43] + | | | |--IDENT -> Enum [56:51] + | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [56:55] + | | | | |--GENERIC_START -> < [56:55] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [56:56] + | | | | | `--IDENT -> E [56:56] + | | | | `--GENERIC_END -> > [56:57] + | | | |--TYPE_EXTENSION_AND -> & [56:59] + | | | `--IDENT -> IntEnum [56:61] + | | `--GENERIC_END -> > [56:68] + | `--OBJBLOCK -> OBJBLOCK [56:70] + | |--LCURLY -> { [56:70] + | `--RCURLY -> } [57:4] + |--CLASS_DEF -> CLASS_DEF [59:4] + | |--MODIFIERS -> MODIFIERS [59:4] + | | |--LITERAL_PUBLIC -> public [59:4] + | | `--LITERAL_STATIC -> static [59:11] + | |--LITERAL_CLASS -> class [59:18] + | |--IDENT -> IntEnumValueType2 [59:24] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [59:41] + | | |--GENERIC_START -> < [59:41] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [59:42] + | | | |--IDENT -> E [59:42] + | | | `--TYPE_UPPER_BOUNDS -> extends [59:44] + | | | |--IDENT -> Enum [59:52] + | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [59:56] + | | | | |--GENERIC_START -> < [59:56] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [59:57] + | | | | | `--IDENT -> E [59:57] + | | | | `--GENERIC_END -> > [59:58] + | | | |--TYPE_EXTENSION_AND -> & [59:59] + | | | `--IDENT -> IntEnum [59:61] + | | `--GENERIC_END -> > [59:68] + | `--OBJBLOCK -> OBJBLOCK [59:70] + | |--LCURLY -> { [59:70] + | `--RCURLY -> } [60:4] + |--CLASS_DEF -> CLASS_DEF [62:4] + | |--MODIFIERS -> MODIFIERS [62:4] + | | |--LITERAL_PUBLIC -> public [62:4] + | | `--LITERAL_STATIC -> static [62:11] + | |--LITERAL_CLASS -> class [62:18] + | |--IDENT -> IntEnumValueType3 [62:24] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [62:41] + | | |--GENERIC_START -> < [62:41] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [62:42] + | | | |--IDENT -> E [62:42] + | | | `--TYPE_UPPER_BOUNDS -> extends [62:44] + | | | |--IDENT -> Enum [62:52] + | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [62:56] + | | | | |--GENERIC_START -> < [62:56] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [62:57] + | | | | | `--IDENT -> E [62:57] + | | | | `--GENERIC_END -> > [62:58] + | | | |--TYPE_EXTENSION_AND -> & [62:61] + | | | `--IDENT -> IntEnum [62:63] + | | `--GENERIC_END -> > [62:70] + | `--OBJBLOCK -> OBJBLOCK [62:72] + | |--LCURLY -> { [62:72] + | `--RCURLY -> } [63:4] + |--CLASS_DEF -> CLASS_DEF [65:4] + | |--MODIFIERS -> MODIFIERS [65:4] + | | |--LITERAL_PUBLIC -> public [65:4] + | | `--LITERAL_STATIC -> static [65:11] + | |--LITERAL_CLASS -> class [65:18] + | |--IDENT -> IntEnumValueType4 [65:24] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [65:41] + | | |--GENERIC_START -> < [65:41] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [65:42] + | | | |--IDENT -> T [65:42] + | | | `--TYPE_UPPER_BOUNDS -> extends [65:44] + | | | |--IDENT -> Comparable [65:52] + | | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [65:62] + | | | | |--GENERIC_START -> < [65:62] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [65:63] + | | | | | |--IDENT -> List [65:63] + | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [65:67] + | | | | | |--GENERIC_START -> < [65:67] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [65:68] + | | | | | | `--IDENT -> T [65:68] + | | | | | `--GENERIC_END -> > [65:69] + | | | | `--GENERIC_END -> > [65:70] + | | | |--TYPE_EXTENSION_AND -> & [65:72] + | | | `--IDENT -> IntEnum [65:74] + | | `--GENERIC_END -> > [65:81] + | `--OBJBLOCK -> OBJBLOCK [65:83] + | |--LCURLY -> { [65:83] + | `--RCURLY -> } [66:4] + |--METHOD_DEF -> METHOD_DEF [68:4] + | |--MODIFIERS -> MODIFIERS [68:4] + | | `--LITERAL_PUBLIC -> public [68:4] + | |--TYPE -> TYPE [68:11] + | | `--LITERAL_VOID -> void [68:11] + | |--IDENT -> beforeAndAfter [68:16] + | |--LPAREN -> ( [68:30] + | |--PARAMETERS -> PARAMETERS [68:31] + | |--RPAREN -> ) [68:31] + | `--SLIST -> { [68:33] + | |--VARIABLE_DEF -> VARIABLE_DEF [69:8] + | | |--MODIFIERS -> MODIFIERS [69:8] + | | |--TYPE -> TYPE [69:8] + | | | |--IDENT -> List [69:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [70:0] + | | | |--GENERIC_START -> < [70:0] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [71:0] + | | | | `--IDENT -> Integer [71:0] + | | | `--GENERIC_END -> > [71:7] + | | |--IDENT -> x [71:9] + | | `--ASSIGN -> = [71:11] + | | `--EXPR -> EXPR [71:13] + | | `--LITERAL_NEW -> new [71:13] + | | |--IDENT -> ArrayList [71:17] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [71:26] + | | | |--GENERIC_START -> < [71:26] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [71:27] + | | | | `--IDENT -> Integer [71:27] + | | | `--GENERIC_END -> > [72:0] + | | |--LPAREN -> ( [72:1] + | | |--ELIST -> ELIST [72:2] + | | `--RPAREN -> ) [72:2] + | |--SEMI -> ; [72:3] + | |--VARIABLE_DEF -> VARIABLE_DEF [73:8] + | | |--MODIFIERS -> MODIFIERS [73:8] + | | |--TYPE -> TYPE [73:8] + | | | |--IDENT -> List [73:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [74:16] + | | | |--GENERIC_START -> < [74:16] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [74:17] + | | | | `--IDENT -> Integer [74:17] + | | | `--GENERIC_END -> > [74:24] + | | |--IDENT -> y [74:26] + | | `--ASSIGN -> = [74:28] + | | `--EXPR -> EXPR [74:30] + | | `--LITERAL_NEW -> new [74:30] + | | |--IDENT -> ArrayList [74:34] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [74:43] + | | | |--GENERIC_START -> < [74:43] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [74:44] + | | | | `--IDENT -> Integer [74:44] + | | | `--GENERIC_END -> > [75:8] + | | |--LPAREN -> ( [75:9] + | | |--ELIST -> ELIST [75:10] + | | `--RPAREN -> ) [75:10] + | |--SEMI -> ; [75:11] + | |--VARIABLE_DEF -> VARIABLE_DEF [76:8] + | | |--MODIFIERS -> MODIFIERS [76:8] + | | |--TYPE -> TYPE [76:8] + | | | |--IDENT -> Map [76:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [76:11] + | | | |--GENERIC_START -> < [76:11] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [76:12] + | | | | |--IDENT -> Class [76:12] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [76:17] + | | | | |--GENERIC_START -> < [76:17] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [76:18] + | | | | | `--WILDCARD_TYPE -> ? [76:18] + | | | | `--GENERIC_END -> > [76:19] + | | | |--COMMA -> , [76:20] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [76:22] + | | | | `--IDENT -> Integer [76:22] + | | | `--GENERIC_END -> > [76:29] + | | |--IDENT -> a [76:31] + | | `--ASSIGN -> = [76:33] + | | `--EXPR -> EXPR [76:35] + | | `--LITERAL_NEW -> new [76:35] + | | |--IDENT -> HashMap [76:39] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [76:46] + | | | |--GENERIC_START -> < [76:46] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [76:47] + | | | | |--IDENT -> Class [76:47] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [76:52] + | | | | |--GENERIC_START -> < [76:52] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [76:53] + | | | | | `--WILDCARD_TYPE -> ? [76:53] + | | | | `--GENERIC_END -> > [76:54] + | | | |--COMMA -> , [76:55] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [76:57] + | | | | `--IDENT -> Integer [76:57] + | | | `--GENERIC_END -> > [76:64] + | | |--LPAREN -> ( [76:65] + | | |--ELIST -> ELIST [76:66] + | | `--RPAREN -> ) [76:66] + | |--SEMI -> ; [76:67] + | |--VARIABLE_DEF -> VARIABLE_DEF [77:8] + | | |--MODIFIERS -> MODIFIERS [77:8] + | | |--TYPE -> TYPE [77:8] + | | | |--IDENT -> Map [77:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [77:11] + | | | |--GENERIC_START -> < [77:11] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [77:12] + | | | | |--IDENT -> Class [77:12] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [77:17] + | | | | |--GENERIC_START -> < [77:17] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [77:18] + | | | | | `--WILDCARD_TYPE -> ? [77:18] + | | | | `--GENERIC_END -> > [77:19] + | | | |--COMMA -> , [77:20] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [77:22] + | | | | `--IDENT -> Integer [77:22] + | | | `--GENERIC_END -> > [77:29] + | | |--IDENT -> b [77:31] + | | `--ASSIGN -> = [77:33] + | | `--EXPR -> EXPR [77:35] + | | `--TYPECAST -> ( [77:35] + | | |--TYPE -> TYPE [77:36] + | | | |--IDENT -> Map [77:36] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [77:39] + | | | |--GENERIC_START -> < [77:39] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [77:40] + | | | | |--IDENT -> Class [77:40] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [77:45] + | | | | |--GENERIC_START -> < [77:45] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [77:46] + | | | | | `--WILDCARD_TYPE -> ? [77:46] + | | | | `--GENERIC_END -> > [77:47] + | | | |--COMMA -> , [77:48] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [77:50] + | | | | `--IDENT -> Integer [77:50] + | | | `--GENERIC_END -> > [77:57] + | | |--RPAREN -> ) [77:58] + | | `--IDENT -> a [77:60] + | |--SEMI -> ; [77:61] + | `--RCURLY -> } [78:4] + |--VARIABLE_DEF -> VARIABLE_DEF [79:4] + | |--MODIFIERS -> MODIFIERS [79:4] + | |--TYPE -> TYPE [79:4] + | | `--IDENT -> Object [79:4] + | |--IDENT -> ok [79:11] + | |--ASSIGN -> = [79:14] + | | `--EXPR -> EXPR [79:16] + | | `--LITERAL_NEW -> new [79:16] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [79:20] + | | | |--GENERIC_START -> < [79:20] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [79:21] + | | | | `--IDENT -> String [79:21] + | | | `--GENERIC_END -> > [79:27] + | | |--IDENT -> Object [79:28] + | | |--LPAREN -> ( [79:34] + | | |--ELIST -> ELIST [79:35] + | | `--RPAREN -> ) [79:35] + | `--SEMI -> ; [79:36] + |--VARIABLE_DEF -> VARIABLE_DEF [80:4] + | |--MODIFIERS -> MODIFIERS [80:4] + | |--TYPE -> TYPE [80:4] + | | `--IDENT -> Object [80:4] + | |--IDENT -> notOkStart [80:11] + | |--ASSIGN -> = [80:22] + | | `--EXPR -> EXPR [80:24] + | | `--LITERAL_NEW -> new [80:24] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [80:27] + | | | |--GENERIC_START -> < [80:27] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [80:28] + | | | | `--IDENT -> String [80:28] + | | | `--GENERIC_END -> > [80:34] + | | |--IDENT -> Object [80:35] + | | |--LPAREN -> ( [80:41] + | | |--ELIST -> ELIST [80:42] + | | `--RPAREN -> ) [80:42] + | `--SEMI -> ; [80:43] + |--VARIABLE_DEF -> VARIABLE_DEF [81:4] + | |--MODIFIERS -> MODIFIERS [81:4] + | |--TYPE -> TYPE [81:4] + | | `--IDENT -> Object [81:4] + | |--IDENT -> notOkEnd [81:11] + | |--ASSIGN -> = [81:20] + | | `--EXPR -> EXPR [81:22] + | | `--LITERAL_NEW -> new [81:22] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [81:26] + | | | |--GENERIC_START -> < [81:26] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [81:27] + | | | | `--IDENT -> String [81:27] + | | | `--GENERIC_END -> > [81:33] + | | |--IDENT -> Object [81:35] + | | |--LPAREN -> ( [81:41] + | | |--ELIST -> ELIST [81:42] + | | `--RPAREN -> ) [81:42] + | `--SEMI -> ; [81:43] + |--VARIABLE_DEF -> VARIABLE_DEF [82:4] + | |--MODIFIERS -> MODIFIERS [82:4] + | |--TYPE -> TYPE [82:4] + | | `--IDENT -> Object [82:4] + | |--IDENT -> notOkStartAndEnd [82:11] + | |--ASSIGN -> = [82:28] + | | `--EXPR -> EXPR [82:30] + | | `--LITERAL_NEW -> new [82:30] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [82:33] + | | | |--GENERIC_START -> < [82:33] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [82:34] + | | | | `--IDENT -> String [82:34] + | | | `--GENERIC_END -> > [82:40] + | | |--IDENT -> Object [82:42] + | | |--LPAREN -> ( [82:48] + | | |--ELIST -> ELIST [82:49] + | | `--RPAREN -> ) [82:49] + | `--SEMI -> ; [82:50] + |--VARIABLE_DEF -> VARIABLE_DEF [83:4] + | |--MODIFIERS -> MODIFIERS [83:4] + | |--TYPE -> TYPE [83:4] + | | `--IDENT -> Object [83:4] + | |--IDENT -> okWithPackage [83:11] + | |--ASSIGN -> = [83:25] + | | `--EXPR -> EXPR [83:27] + | | `--LITERAL_NEW -> new [83:27] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [83:31] + | | | |--GENERIC_START -> < [83:31] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [83:32] + | | | | `--IDENT -> String [83:32] + | | | `--GENERIC_END -> > [83:38] + | | |--DOT -> . [83:48] + | | | |--DOT -> . [83:43] + | | | | |--IDENT -> java [83:39] + | | | | `--IDENT -> lang [83:44] + | | | `--IDENT -> Object [83:49] + | | |--LPAREN -> ( [83:55] + | | |--ELIST -> ELIST [83:56] + | | `--RPAREN -> ) [83:56] + | `--SEMI -> ; [83:57] + |--VARIABLE_DEF -> VARIABLE_DEF [84:4] + | |--MODIFIERS -> MODIFIERS [84:4] + | |--TYPE -> TYPE [84:4] + | | `--IDENT -> Object [84:4] + | |--IDENT -> ok2 [84:11] + | |--ASSIGN -> = [84:15] + | | `--EXPR -> EXPR [84:17] + | | `--LITERAL_NEW -> new [84:17] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [84:21] + | | | |--GENERIC_START -> < [84:21] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [84:22] + | | | | `--IDENT -> String [84:22] + | | | `--GENERIC_END -> > [84:28] + | | |--DOT -> . [84:34] + | | | |--IDENT -> Outer [84:29] + | | | `--IDENT -> Inner [84:35] + | | |--LPAREN -> ( [84:40] + | | |--ELIST -> ELIST [84:41] + | | `--RPAREN -> ) [84:41] + | `--SEMI -> ; [84:42] + |--VARIABLE_DEF -> VARIABLE_DEF [85:4] + | |--MODIFIERS -> MODIFIERS [85:4] + | |--TYPE -> TYPE [85:4] + | | `--IDENT -> Object [85:4] + | |--IDENT -> notOkStart2 [85:11] + | |--ASSIGN -> = [85:23] + | | `--EXPR -> EXPR [85:25] + | | `--LITERAL_NEW -> new [85:25] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [85:28] + | | | |--GENERIC_START -> < [85:28] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [85:29] + | | | | `--IDENT -> String [85:29] + | | | `--GENERIC_END -> > [85:35] + | | |--DOT -> . [85:41] + | | | |--IDENT -> Outer [85:36] + | | | `--IDENT -> Inner [85:42] + | | |--LPAREN -> ( [85:47] + | | |--ELIST -> ELIST [85:48] + | | `--RPAREN -> ) [85:48] + | `--SEMI -> ; [85:49] + |--VARIABLE_DEF -> VARIABLE_DEF [86:4] + | |--MODIFIERS -> MODIFIERS [86:4] + | |--TYPE -> TYPE [86:4] + | | `--IDENT -> Object [86:4] + | |--IDENT -> notOkEnd2 [86:11] + | |--ASSIGN -> = [86:21] + | | `--EXPR -> EXPR [86:23] + | | `--LITERAL_NEW -> new [86:23] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [86:27] + | | | |--GENERIC_START -> < [86:27] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [86:28] + | | | | `--IDENT -> String [86:28] + | | | `--GENERIC_END -> > [86:34] + | | |--DOT -> . [86:41] + | | | |--IDENT -> Outer [86:36] + | | | `--IDENT -> Inner [86:42] + | | |--LPAREN -> ( [86:47] + | | |--ELIST -> ELIST [86:48] + | | `--RPAREN -> ) [86:48] + | `--SEMI -> ; [86:49] + |--VARIABLE_DEF -> VARIABLE_DEF [87:4] + | |--MODIFIERS -> MODIFIERS [87:4] + | |--TYPE -> TYPE [87:4] + | | `--IDENT -> Object [87:4] + | |--IDENT -> notOkStartAndEnd2 [87:11] + | |--ASSIGN -> = [87:29] + | | `--EXPR -> EXPR [87:31] + | | `--LITERAL_NEW -> new [87:31] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [87:34] + | | | |--GENERIC_START -> < [87:34] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [87:35] + | | | | `--IDENT -> String [87:35] + | | | `--GENERIC_END -> > [87:41] + | | |--DOT -> . [87:48] + | | | |--IDENT -> Outer [87:43] + | | | `--IDENT -> Inner [87:49] + | | |--LPAREN -> ( [87:54] + | | |--ELIST -> ELIST [87:55] + | | `--RPAREN -> ) [87:55] + | `--SEMI -> ; [87:56] + `--RCURLY -> } [88:0] +INTERFACE_DEF -> INTERFACE_DEF [89:0] +|--MODIFIERS -> MODIFIERS [89:0] +|--LITERAL_INTERFACE -> interface [89:0] +|--IDENT -> SupplierFunction [89:10] +|--TYPE_PARAMETERS -> TYPE_PARAMETERS [89:26] +| |--GENERIC_START -> < [89:26] +| |--TYPE_PARAMETER -> TYPE_PARAMETER [89:27] +| | `--IDENT -> T [89:27] +| `--GENERIC_END -> > [89:28] +|--EXTENDS_CLAUSE -> extends [89:30] +| |--IDENT -> Map [89:38] +| `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [89:41] +| |--GENERIC_START -> < [89:41] +| |--TYPE_ARGUMENT -> TYPE_ARGUMENT [89:42] +| | |--IDENT -> List [89:42] +| | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [89:46] +| | |--GENERIC_START -> < [89:46] +| | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [89:47] +| | | `--IDENT -> T [89:47] +| | `--GENERIC_END -> > [89:48] +| |--COMMA -> , [89:49] +| |--TYPE_ARGUMENT -> TYPE_ARGUMENT [89:51] +| | `--IDENT -> T [89:51] +| `--GENERIC_END -> > [89:52] +`--OBJBLOCK -> OBJBLOCK [89:54] + |--LCURLY -> { [89:54] + `--RCURLY -> } [89:55] +CLASS_DEF -> CLASS_DEF [91:0] +|--MODIFIERS -> MODIFIERS [91:0] +|--LITERAL_CLASS -> class [91:0] +|--IDENT -> Outer [91:6] +`--OBJBLOCK -> OBJBLOCK [91:12] + |--LCURLY -> { [91:12] + |--CLASS_DEF -> CLASS_DEF [92:4] + | |--MODIFIERS -> MODIFIERS [92:4] + | | `--LITERAL_STATIC -> static [92:4] + | |--LITERAL_CLASS -> class [92:11] + | |--IDENT -> Inner [92:17] + | `--OBJBLOCK -> OBJBLOCK [92:23] + | |--LCURLY -> { [92:23] + | `--RCURLY -> } [92:24] + `--RCURLY -> } [93:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputRegressionJavaAnnotation1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputRegressionJavaAnnotation1.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputRegressionJavaAnnotation1.java @@ -0,0 +1,16 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +@interface InputRegressionJavaAnnotation1 { + int f1 = 0; + + String[] m1(); + String[] m2() default {}; + + class SomeClass { + private SomeClass() {} + } +} + +@interface ComplexAnnotation { + InputRegressionJavaAnnotation1[] value(); +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputRegressionJavaClass1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputRegressionJavaClass1.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputRegressionJavaClass1.java @@ -0,0 +1,343 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class InputRegressionJavaClass1 { + //comments + + // single line + /* multi on single line */ + /* multi + line */ + /** javadoc */ + // tab -> <- + + // fields + // modifiers + public int f1; + private int f2; + protected int f3; + int f4; + static int f5; + final int f6; + volatile int f7; + transient int f8; + Object f9; + + // constructors + static {} + public InputRegressionJavaClass1() {f6 = 0;} + public InputRegressionJavaClass1(int i) {this.f6 = i;} + public InputRegressionJavaClass1(float f) {this((int)f);} + InputRegressionJavaClass1(double a) throws Exception {f6 = 0;} + + // methods + // modifiers + native void m1(); + void m2() {} + synchronized void m4() {} + strictfp void m5() {} + + // returns + public int[] m6() {return null;} + public int m7() [] {return null;} + + // parameters + public void m10(String p1) {} + public void m11(final String p1) {} + public void m12(String[] p1) {} + public void m13(String[][] p1) {} + public void m14(String p1, String p2) {} + public void m15(String... p1) {} + public void m16(String[]... p1) {} + public void m17(int p1, String[]... p2) {} + + // throws + public void m18() throws Exception {} + public void m19() throws IOException, Exception {} + + // types + public <T_$> T_$ m20() {return null;} + public <$_T> $_T m21() {return null;} + public <T extends Enum<T>> void m22() {} + public <T> void m23() {}; + public <T extends RuntimeException & java.io.Serializable> void m24() {} + + // annotations + @SuppressWarnings({}) + public void m50() {} + @SuppressWarnings({"1"}) + public void m51() {} + @SuppressWarnings({"1","2"}) + public void m52() {} + @SuppressWarnings(value={"1"}) + public void m53() {} + @SuppressWarnings(value={"1",}) + public void m54() {} + @SuppressWarnings(value={"1","2"}) + public void m55() {} + @InputRegressionJavaAnnotation1(m1="1", m2="2") + public void m56() {} + @ComplexAnnotation({ + @InputRegressionJavaAnnotation1(m1 = "1", m2 = ""), + @InputRegressionJavaAnnotation1(m1 = "1", m2 = "") + }) + public void m57() {} + public void m58(@Deprecated String s) {} + public void m59(final @Deprecated List l) {} + + // extra + {} + ; + + // instructions + public void instructions() throws Exception { + // used to let inputs compile + boolean b = Math.random() > 0; + + // variables and types + byte vbyte; + boolean vboolean; + char vchar; + short vshort; + int vint; + long vlong; + float vfloat; + double vdouble; + int[] varray; + int varray2[]; + boolean test1 = true; + + // types + String vstring; + List<String> vlist; + Map<String, String[]> vmap; + int[] test2 = {}; + List<char[]> test3; + Class<?> test4; + List<? extends InputRegressionJavaClass1> test5; + List<? extends List<Object>> test6; + List<? extends List<List<Object>>> test7; + List<? extends int[]> test8; + List<? super InputRegressionJavaClass1> test9; + + // literals + vboolean = true; + vboolean = false; + vchar = ' '; + vchar = '"'; + vchar = '\0'; + vchar = '\''; + vchar = '\n'; + vchar = '\r'; + vchar = '\t'; + vchar = '\b'; + vchar = '\f'; + vchar = '\"'; + vchar = '\''; + vchar = '\\'; + vchar = '\00'; + vchar = '\013'; + vchar = '\4'; + vchar = '\40'; + vchar = '\u0000'; + vchar = '\u1234'; + vchar = '\u005C\u005C'; + vchar = '\u005c\u005c'; + vchar = '\uu005C\uuuuu005C'; + vchar = '\u005cn'; + vchar = '\u005cr'; + vchar = '\u005ct'; + vchar = '\u005cb'; + vchar = '\u005cf'; + vchar = '\u005c"'; + vchar = '\u005c''; + vchar = '\u005c\'; + vint = 0; + vint = -1; + vint = +1; + vint = 100_000; + vint = 0x00; + vint = 0x12345678; + vint = 0X9; + vint = 0x1234_5678; + vint = 0b101; + vint = 0B101; + vint = 0b1; + vint = 0b1_0; + vint = 012345670; + vint = 01234_5670; + vlong = 0L; + vlong = 1L; + vlong = 0b1L; + vlong = 1234567890l; + vlong = 1234567890L; + vlong = 0x0l; + vlong = 0xABCDEFl; + vlong = 0XABCDEFL; + vfloat = 0f; + vfloat = 0F; + vfloat = 1.1f; + vfloat = 1.10_1F; + vfloat = 0_1.1_1F; + vfloat = 1e0f; + vfloat = 1e0F; + vfloat = 1.0e0F; + vfloat = 0x2__3_34.4___AFP00_00f; + vdouble = 10.; + vdouble = .1; + vdouble = .1__1_1; + vdouble = 0.0; + vdouble = 1000.0; + vdouble = .1d; + vdouble = 1.D; + vdouble = 0_1.0d; + vdouble = 0_1.0D; + vdouble = 4e23; + vdouble = 4E23; + vdouble = 4E2_3; + vdouble = 0x0.0000000000001p-1022; + vdouble = 0x0.0000000000001P-1022; + vdouble = 0X0.0000000000001p+1022; + vdouble = 0X0.0000000000001P+1022; + vdouble = 0x.0P0; + vdouble = 0X0p+2; + vdouble = 0X0p+20F; + vdouble = 0X0p+2D; + vdouble = 0X0p+2d; + vdouble = 0x1.P-1; + vdouble = 0x.1___AFp1; + vstring = null; + vstring = ""; + vstring = "\\"; + + // assignments and operators + vint = 1 + 1; + vint = 1 - 1; + vint = 1 * 1; + vint = 1 / 1; + vint = 1 % 1; + vint = 1 & 1; + vint = 1 | 1; + vint = 1 ^ 1; + vint = ~1; + vboolean = 1 != 0; + vboolean = 1 == 0; + vboolean = 1 > 0; + vboolean = 1 >= 0; + vboolean = 1 < 0; + vboolean = 1 <= 0; + vboolean = true && true; + vboolean = true || true; + vboolean = true ? true : false; + vboolean = !true; + vboolean = f9 instanceof Object; + vint = 1 << 1; + vint = 1 >> 1; + vint = 1 >>> 1; + vint += 1; + vint -= 1; + vint *= 1; + vint /= 1; + vint %= 1; + vint &= 1; + vint |= 1; + vint ^= 1; + vint <<= 1; + vint >>= 1; + vint >>>= 1; + vint++; + vint--; + ++vint; + --vint; + String[] arrayinit = {}; + String[] arrayinit2 = {""}; + String[] arrayinit3 = {"", "",}; + + // new + varray = new int[]{}; + varray = new int[]{0}; + varray = new int[]{0, 1}; + varray = new int[5]; + vlist = new ArrayList<String>(); + vmap = new HashMap<String, String[]>(); + Object anonymous = new InputRegressionJavaClass1() {}; + + // statements + ; + this.f1 = 0; + + // labels + test_label1: + + // blocks + {} + if (true) ; + if (true) {} + if (true) {} else ; + if (true) {} else {} + if (b) { for (;;) ; } + if (b) { for (;;) {} } + for (int i = 0; i < 1; i++) {} + for (int i = 0, j = 0; i < 1; i++, j += 2) {} + for (int value: new int[]{}) ; + for (String s : new String[]{}) ; + for (final String s : new String[]{}) ; + if (b) { while (true) ; } + if (b) { while (true) {} } + do {} while (false); + synchronized (f9) {} + + switch (0) { + case 1: + case 0: break; + default: break; + } + + try { + if (b) { throw new IOException(); } + if (b) { throw new ArrayIndexOutOfBoundsException(); } + throw new Exception(); + } catch (IOException | ArrayIndexOutOfBoundsException e) { + } catch (Exception e) { + } finally {} + try (BufferedReader br = new BufferedReader(new InputStreamReader(null, "utf-8"))) {} + try (BufferedReader br1 = new BufferedReader(new InputStreamReader(null, "utf-8")); + BufferedReader br2 = new BufferedReader(new InputStreamReader(null, "utf-8"));) {} + + // access + test4 = InputRegressionJavaClass1.class; + test4 = List[].class; + test4 = boolean[].class; + varray[0] = 0; + for (String[] s : new String[][]{{}}) ; + for (Map.Entry<String, String[]> e : vmap.entrySet()) { } + + // others + for (;;) {break;} + test_label2: + for (;;) {break test_label2;} + if (b) { for (;;) {continue;} } + if (b) { test_label3: for (;;) {continue test_label3;} } + if (false) return; + if (false) throw new Exception(); + assert(false); + assert true : "false"; + f9 = (Object) f9; + f9.equals(((vstring = ""))); + for (int i = 0; ((i) < (6+6)); i++) ; + if ((b & b)) {} + + // ast error handling + vint = vboolean ? (vint = 1) : (vint = 0); + varray[vint] = Integer.parseInt("0"); + } + + public @interface innerAnnotation {} +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputRegressionJavaClass1Ast.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputRegressionJavaClass1Ast.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputRegressionJavaClass1Ast.txt @@ -0,0 +1,2614 @@ +PACKAGE_DEF -> package [1:0] +|--ANNOTATIONS -> ANNOTATIONS [1:47] +|--DOT -> . [1:47] +| |--DOT -> . [1:39] +| | |--DOT -> . [1:28] +| | | |--DOT -> . [1:22] +| | | | |--DOT -> . [1:11] +| | | | | |--IDENT -> com [1:8] +| | | | | `--IDENT -> puppycrawl [1:12] +| | | | `--IDENT -> tools [1:23] +| | | `--IDENT -> checkstyle [1:29] +| | `--IDENT -> grammar [1:40] +| `--IDENT -> antlr4 [1:48] +`--SEMI -> ; [1:54] +IMPORT -> import [3:0] +|--DOT -> . [3:14] +| |--DOT -> . [3:11] +| | |--IDENT -> java [3:7] +| | `--IDENT -> io [3:12] +| `--IDENT -> BufferedReader [3:15] +`--SEMI -> ; [3:29] +IMPORT -> import [4:0] +|--DOT -> . [4:14] +| |--DOT -> . [4:11] +| | |--IDENT -> java [4:7] +| | `--IDENT -> io [4:12] +| `--IDENT -> IOException [4:15] +`--SEMI -> ; [4:26] +IMPORT -> import [5:0] +|--DOT -> . [5:14] +| |--DOT -> . [5:11] +| | |--IDENT -> java [5:7] +| | `--IDENT -> io [5:12] +| `--IDENT -> InputStreamReader [5:15] +`--SEMI -> ; [5:32] +IMPORT -> import [6:0] +|--DOT -> . [6:16] +| |--DOT -> . [6:11] +| | |--IDENT -> java [6:7] +| | `--IDENT -> util [6:12] +| `--IDENT -> ArrayList [6:17] +`--SEMI -> ; [6:26] +IMPORT -> import [7:0] +|--DOT -> . [7:16] +| |--DOT -> . [7:11] +| | |--IDENT -> java [7:7] +| | `--IDENT -> util [7:12] +| `--IDENT -> HashMap [7:17] +`--SEMI -> ; [7:24] +IMPORT -> import [8:0] +|--DOT -> . [8:16] +| |--DOT -> . [8:11] +| | |--IDENT -> java [8:7] +| | `--IDENT -> util [8:12] +| `--IDENT -> List [8:17] +`--SEMI -> ; [8:21] +IMPORT -> import [9:0] +|--DOT -> . [9:16] +| |--DOT -> . [9:11] +| | |--IDENT -> java [9:7] +| | `--IDENT -> util [9:12] +| `--IDENT -> Map [9:17] +`--SEMI -> ; [9:20] +CLASS_DEF -> CLASS_DEF [11:0] +|--MODIFIERS -> MODIFIERS [11:0] +| `--LITERAL_PUBLIC -> public [11:0] +|--LITERAL_CLASS -> class [11:7] +|--IDENT -> InputRegressionJavaClass1 [11:13] +`--OBJBLOCK -> OBJBLOCK [11:39] + |--LCURLY -> { [11:39] + |--VARIABLE_DEF -> VARIABLE_DEF [23:4] + | |--MODIFIERS -> MODIFIERS [23:4] + | | `--LITERAL_PUBLIC -> public [23:4] + | |--TYPE -> TYPE [23:11] + | | `--LITERAL_INT -> int [23:11] + | |--IDENT -> f1 [23:15] + | `--SEMI -> ; [23:17] + |--VARIABLE_DEF -> VARIABLE_DEF [24:4] + | |--MODIFIERS -> MODIFIERS [24:4] + | | `--LITERAL_PRIVATE -> private [24:4] + | |--TYPE -> TYPE [24:12] + | | `--LITERAL_INT -> int [24:12] + | |--IDENT -> f2 [24:16] + | `--SEMI -> ; [24:18] + |--VARIABLE_DEF -> VARIABLE_DEF [25:4] + | |--MODIFIERS -> MODIFIERS [25:4] + | | `--LITERAL_PROTECTED -> protected [25:4] + | |--TYPE -> TYPE [25:14] + | | `--LITERAL_INT -> int [25:14] + | |--IDENT -> f3 [25:18] + | `--SEMI -> ; [25:20] + |--VARIABLE_DEF -> VARIABLE_DEF [26:4] + | |--MODIFIERS -> MODIFIERS [26:4] + | |--TYPE -> TYPE [26:4] + | | `--LITERAL_INT -> int [26:4] + | |--IDENT -> f4 [26:8] + | `--SEMI -> ; [26:10] + |--VARIABLE_DEF -> VARIABLE_DEF [27:4] + | |--MODIFIERS -> MODIFIERS [27:4] + | | `--LITERAL_STATIC -> static [27:4] + | |--TYPE -> TYPE [27:11] + | | `--LITERAL_INT -> int [27:11] + | |--IDENT -> f5 [27:15] + | `--SEMI -> ; [27:17] + |--VARIABLE_DEF -> VARIABLE_DEF [28:4] + | |--MODIFIERS -> MODIFIERS [28:4] + | | `--FINAL -> final [28:4] + | |--TYPE -> TYPE [28:10] + | | `--LITERAL_INT -> int [28:10] + | |--IDENT -> f6 [28:14] + | `--SEMI -> ; [28:16] + |--VARIABLE_DEF -> VARIABLE_DEF [29:4] + | |--MODIFIERS -> MODIFIERS [29:4] + | | `--LITERAL_VOLATILE -> volatile [29:4] + | |--TYPE -> TYPE [29:13] + | | `--LITERAL_INT -> int [29:13] + | |--IDENT -> f7 [29:17] + | `--SEMI -> ; [29:19] + |--VARIABLE_DEF -> VARIABLE_DEF [30:4] + | |--MODIFIERS -> MODIFIERS [30:4] + | | `--LITERAL_TRANSIENT -> transient [30:4] + | |--TYPE -> TYPE [30:14] + | | `--LITERAL_INT -> int [30:14] + | |--IDENT -> f8 [30:18] + | `--SEMI -> ; [30:20] + |--VARIABLE_DEF -> VARIABLE_DEF [31:4] + | |--MODIFIERS -> MODIFIERS [31:4] + | |--TYPE -> TYPE [31:4] + | | `--IDENT -> Object [31:4] + | |--IDENT -> f9 [31:11] + | `--SEMI -> ; [31:13] + |--STATIC_INIT -> STATIC_INIT [34:4] + | `--SLIST -> { [34:11] + | `--RCURLY -> } [34:12] + |--CTOR_DEF -> CTOR_DEF [35:4] + | |--MODIFIERS -> MODIFIERS [35:4] + | | `--LITERAL_PUBLIC -> public [35:4] + | |--IDENT -> InputRegressionJavaClass1 [35:11] + | |--LPAREN -> ( [35:36] + | |--PARAMETERS -> PARAMETERS [35:37] + | |--RPAREN -> ) [35:37] + | `--SLIST -> { [35:39] + | |--EXPR -> EXPR [35:43] + | | `--ASSIGN -> = [35:43] + | | |--IDENT -> f6 [35:40] + | | `--NUM_INT -> 0 [35:45] + | |--SEMI -> ; [35:46] + | `--RCURLY -> } [35:47] + |--CTOR_DEF -> CTOR_DEF [36:4] + | |--MODIFIERS -> MODIFIERS [36:4] + | | `--LITERAL_PUBLIC -> public [36:4] + | |--IDENT -> InputRegressionJavaClass1 [36:11] + | |--LPAREN -> ( [36:36] + | |--PARAMETERS -> PARAMETERS [36:37] + | | `--PARAMETER_DEF -> PARAMETER_DEF [36:37] + | | |--MODIFIERS -> MODIFIERS [36:37] + | | |--TYPE -> TYPE [36:37] + | | | `--LITERAL_INT -> int [36:37] + | | `--IDENT -> i [36:41] + | |--RPAREN -> ) [36:42] + | `--SLIST -> { [36:44] + | |--EXPR -> EXPR [36:53] + | | `--ASSIGN -> = [36:53] + | | |--DOT -> . [36:49] + | | | |--LITERAL_THIS -> this [36:45] + | | | `--IDENT -> f6 [36:50] + | | `--IDENT -> i [36:55] + | |--SEMI -> ; [36:56] + | `--RCURLY -> } [36:57] + |--CTOR_DEF -> CTOR_DEF [37:4] + | |--MODIFIERS -> MODIFIERS [37:4] + | | `--LITERAL_PUBLIC -> public [37:4] + | |--IDENT -> InputRegressionJavaClass1 [37:11] + | |--LPAREN -> ( [37:36] + | |--PARAMETERS -> PARAMETERS [37:37] + | | `--PARAMETER_DEF -> PARAMETER_DEF [37:37] + | | |--MODIFIERS -> MODIFIERS [37:37] + | | |--TYPE -> TYPE [37:37] + | | | `--LITERAL_FLOAT -> float [37:37] + | | `--IDENT -> f [37:43] + | |--RPAREN -> ) [37:44] + | `--SLIST -> { [37:46] + | |--CTOR_CALL -> this [37:47] + | | |--LPAREN -> ( [37:51] + | | |--ELIST -> ELIST [37:52] + | | | `--EXPR -> EXPR [37:52] + | | | `--TYPECAST -> ( [37:52] + | | | |--TYPE -> TYPE [37:53] + | | | | `--LITERAL_INT -> int [37:53] + | | | |--RPAREN -> ) [37:56] + | | | `--IDENT -> f [37:57] + | | |--RPAREN -> ) [37:58] + | | `--SEMI -> ; [37:59] + | `--RCURLY -> } [37:60] + |--CTOR_DEF -> CTOR_DEF [38:4] + | |--MODIFIERS -> MODIFIERS [38:4] + | |--IDENT -> InputRegressionJavaClass1 [38:4] + | |--LPAREN -> ( [38:29] + | |--PARAMETERS -> PARAMETERS [38:30] + | | `--PARAMETER_DEF -> PARAMETER_DEF [38:30] + | | |--MODIFIERS -> MODIFIERS [38:30] + | | |--TYPE -> TYPE [38:30] + | | | `--LITERAL_DOUBLE -> double [38:30] + | | `--IDENT -> a [38:37] + | |--RPAREN -> ) [38:38] + | |--LITERAL_THROWS -> throws [38:40] + | | `--IDENT -> Exception [38:47] + | `--SLIST -> { [38:57] + | |--EXPR -> EXPR [38:61] + | | `--ASSIGN -> = [38:61] + | | |--IDENT -> f6 [38:58] + | | `--NUM_INT -> 0 [38:63] + | |--SEMI -> ; [38:64] + | `--RCURLY -> } [38:65] + |--METHOD_DEF -> METHOD_DEF [42:4] + | |--MODIFIERS -> MODIFIERS [42:4] + | | `--LITERAL_NATIVE -> native [42:4] + | |--TYPE -> TYPE [42:11] + | | `--LITERAL_VOID -> void [42:11] + | |--IDENT -> m1 [42:16] + | |--LPAREN -> ( [42:18] + | |--PARAMETERS -> PARAMETERS [42:19] + | |--RPAREN -> ) [42:19] + | `--SEMI -> ; [42:20] + |--METHOD_DEF -> METHOD_DEF [43:4] + | |--MODIFIERS -> MODIFIERS [43:4] + | |--TYPE -> TYPE [43:4] + | | `--LITERAL_VOID -> void [43:4] + | |--IDENT -> m2 [43:9] + | |--LPAREN -> ( [43:11] + | |--PARAMETERS -> PARAMETERS [43:12] + | |--RPAREN -> ) [43:12] + | `--SLIST -> { [43:14] + | `--RCURLY -> } [43:15] + |--METHOD_DEF -> METHOD_DEF [44:4] + | |--MODIFIERS -> MODIFIERS [44:4] + | | `--LITERAL_SYNCHRONIZED -> synchronized [44:4] + | |--TYPE -> TYPE [44:17] + | | `--LITERAL_VOID -> void [44:17] + | |--IDENT -> m4 [44:22] + | |--LPAREN -> ( [44:24] + | |--PARAMETERS -> PARAMETERS [44:25] + | |--RPAREN -> ) [44:25] + | `--SLIST -> { [44:27] + | `--RCURLY -> } [44:28] + |--METHOD_DEF -> METHOD_DEF [45:4] + | |--MODIFIERS -> MODIFIERS [45:4] + | | `--STRICTFP -> strictfp [45:4] + | |--TYPE -> TYPE [45:13] + | | `--LITERAL_VOID -> void [45:13] + | |--IDENT -> m5 [45:18] + | |--LPAREN -> ( [45:20] + | |--PARAMETERS -> PARAMETERS [45:21] + | |--RPAREN -> ) [45:21] + | `--SLIST -> { [45:23] + | `--RCURLY -> } [45:24] + |--METHOD_DEF -> METHOD_DEF [48:4] + | |--MODIFIERS -> MODIFIERS [48:4] + | | `--LITERAL_PUBLIC -> public [48:4] + | |--TYPE -> TYPE [48:11] + | | |--LITERAL_INT -> int [48:11] + | | `--ARRAY_DECLARATOR -> [ [48:14] + | | `--RBRACK -> ] [48:15] + | |--IDENT -> m6 [48:17] + | |--LPAREN -> ( [48:19] + | |--PARAMETERS -> PARAMETERS [48:20] + | |--RPAREN -> ) [48:20] + | `--SLIST -> { [48:22] + | |--LITERAL_RETURN -> return [48:23] + | | |--EXPR -> EXPR [48:30] + | | | `--LITERAL_NULL -> null [48:30] + | | `--SEMI -> ; [48:34] + | `--RCURLY -> } [48:35] + |--METHOD_DEF -> METHOD_DEF [49:4] + | |--MODIFIERS -> MODIFIERS [49:4] + | | `--LITERAL_PUBLIC -> public [49:4] + | |--TYPE -> TYPE [49:11] + | | |--LITERAL_INT -> int [49:11] + | | `--ARRAY_DECLARATOR -> [ [49:20] + | | `--RBRACK -> ] [49:21] + | |--IDENT -> m7 [49:15] + | |--LPAREN -> ( [49:17] + | |--PARAMETERS -> PARAMETERS [49:18] + | |--RPAREN -> ) [49:18] + | `--SLIST -> { [49:23] + | |--LITERAL_RETURN -> return [49:24] + | | |--EXPR -> EXPR [49:31] + | | | `--LITERAL_NULL -> null [49:31] + | | `--SEMI -> ; [49:35] + | `--RCURLY -> } [49:36] + |--METHOD_DEF -> METHOD_DEF [52:4] + | |--MODIFIERS -> MODIFIERS [52:4] + | | `--LITERAL_PUBLIC -> public [52:4] + | |--TYPE -> TYPE [52:11] + | | `--LITERAL_VOID -> void [52:11] + | |--IDENT -> m10 [52:16] + | |--LPAREN -> ( [52:19] + | |--PARAMETERS -> PARAMETERS [52:20] + | | `--PARAMETER_DEF -> PARAMETER_DEF [52:20] + | | |--MODIFIERS -> MODIFIERS [52:20] + | | |--TYPE -> TYPE [52:20] + | | | `--IDENT -> String [52:20] + | | `--IDENT -> p1 [52:27] + | |--RPAREN -> ) [52:29] + | `--SLIST -> { [52:31] + | `--RCURLY -> } [52:32] + |--METHOD_DEF -> METHOD_DEF [53:4] + | |--MODIFIERS -> MODIFIERS [53:4] + | | `--LITERAL_PUBLIC -> public [53:4] + | |--TYPE -> TYPE [53:11] + | | `--LITERAL_VOID -> void [53:11] + | |--IDENT -> m11 [53:16] + | |--LPAREN -> ( [53:19] + | |--PARAMETERS -> PARAMETERS [53:20] + | | `--PARAMETER_DEF -> PARAMETER_DEF [53:20] + | | |--MODIFIERS -> MODIFIERS [53:20] + | | | `--FINAL -> final [53:20] + | | |--TYPE -> TYPE [53:26] + | | | `--IDENT -> String [53:26] + | | `--IDENT -> p1 [53:33] + | |--RPAREN -> ) [53:35] + | `--SLIST -> { [53:37] + | `--RCURLY -> } [53:38] + |--METHOD_DEF -> METHOD_DEF [54:4] + | |--MODIFIERS -> MODIFIERS [54:4] + | | `--LITERAL_PUBLIC -> public [54:4] + | |--TYPE -> TYPE [54:11] + | | `--LITERAL_VOID -> void [54:11] + | |--IDENT -> m12 [54:16] + | |--LPAREN -> ( [54:19] + | |--PARAMETERS -> PARAMETERS [54:20] + | | `--PARAMETER_DEF -> PARAMETER_DEF [54:20] + | | |--MODIFIERS -> MODIFIERS [54:20] + | | |--TYPE -> TYPE [54:20] + | | | |--IDENT -> String [54:20] + | | | `--ARRAY_DECLARATOR -> [ [54:26] + | | | `--RBRACK -> ] [54:27] + | | `--IDENT -> p1 [54:29] + | |--RPAREN -> ) [54:31] + | `--SLIST -> { [54:33] + | `--RCURLY -> } [54:34] + |--METHOD_DEF -> METHOD_DEF [55:4] + | |--MODIFIERS -> MODIFIERS [55:4] + | | `--LITERAL_PUBLIC -> public [55:4] + | |--TYPE -> TYPE [55:11] + | | `--LITERAL_VOID -> void [55:11] + | |--IDENT -> m13 [55:16] + | |--LPAREN -> ( [55:19] + | |--PARAMETERS -> PARAMETERS [55:20] + | | `--PARAMETER_DEF -> PARAMETER_DEF [55:20] + | | |--MODIFIERS -> MODIFIERS [55:20] + | | |--TYPE -> TYPE [55:20] + | | | |--IDENT -> String [55:20] + | | | |--ARRAY_DECLARATOR -> [ [55:26] + | | | | `--RBRACK -> ] [55:27] + | | | `--ARRAY_DECLARATOR -> [ [55:28] + | | | `--RBRACK -> ] [55:29] + | | `--IDENT -> p1 [55:31] + | |--RPAREN -> ) [55:33] + | `--SLIST -> { [55:35] + | `--RCURLY -> } [55:36] + |--METHOD_DEF -> METHOD_DEF [56:4] + | |--MODIFIERS -> MODIFIERS [56:4] + | | `--LITERAL_PUBLIC -> public [56:4] + | |--TYPE -> TYPE [56:11] + | | `--LITERAL_VOID -> void [56:11] + | |--IDENT -> m14 [56:16] + | |--LPAREN -> ( [56:19] + | |--PARAMETERS -> PARAMETERS [56:20] + | | |--PARAMETER_DEF -> PARAMETER_DEF [56:20] + | | | |--MODIFIERS -> MODIFIERS [56:20] + | | | |--TYPE -> TYPE [56:20] + | | | | `--IDENT -> String [56:20] + | | | `--IDENT -> p1 [56:27] + | | |--COMMA -> , [56:29] + | | `--PARAMETER_DEF -> PARAMETER_DEF [56:31] + | | |--MODIFIERS -> MODIFIERS [56:31] + | | |--TYPE -> TYPE [56:31] + | | | `--IDENT -> String [56:31] + | | `--IDENT -> p2 [56:38] + | |--RPAREN -> ) [56:40] + | `--SLIST -> { [56:42] + | `--RCURLY -> } [56:43] + |--METHOD_DEF -> METHOD_DEF [57:4] + | |--MODIFIERS -> MODIFIERS [57:4] + | | `--LITERAL_PUBLIC -> public [57:4] + | |--TYPE -> TYPE [57:11] + | | `--LITERAL_VOID -> void [57:11] + | |--IDENT -> m15 [57:16] + | |--LPAREN -> ( [57:19] + | |--PARAMETERS -> PARAMETERS [57:20] + | | `--PARAMETER_DEF -> PARAMETER_DEF [57:20] + | | |--MODIFIERS -> MODIFIERS [57:20] + | | |--TYPE -> TYPE [57:20] + | | | `--IDENT -> String [57:20] + | | |--ELLIPSIS -> ... [57:26] + | | `--IDENT -> p1 [57:30] + | |--RPAREN -> ) [57:32] + | `--SLIST -> { [57:34] + | `--RCURLY -> } [57:35] + |--METHOD_DEF -> METHOD_DEF [58:4] + | |--MODIFIERS -> MODIFIERS [58:4] + | | `--LITERAL_PUBLIC -> public [58:4] + | |--TYPE -> TYPE [58:11] + | | `--LITERAL_VOID -> void [58:11] + | |--IDENT -> m16 [58:16] + | |--LPAREN -> ( [58:19] + | |--PARAMETERS -> PARAMETERS [58:20] + | | `--PARAMETER_DEF -> PARAMETER_DEF [58:20] + | | |--MODIFIERS -> MODIFIERS [58:20] + | | |--TYPE -> TYPE [58:20] + | | | |--IDENT -> String [58:20] + | | | `--ARRAY_DECLARATOR -> [ [58:26] + | | | `--RBRACK -> ] [58:27] + | | |--ELLIPSIS -> ... [58:28] + | | `--IDENT -> p1 [58:32] + | |--RPAREN -> ) [58:34] + | `--SLIST -> { [58:36] + | `--RCURLY -> } [58:37] + |--METHOD_DEF -> METHOD_DEF [59:4] + | |--MODIFIERS -> MODIFIERS [59:4] + | | `--LITERAL_PUBLIC -> public [59:4] + | |--TYPE -> TYPE [59:11] + | | `--LITERAL_VOID -> void [59:11] + | |--IDENT -> m17 [59:16] + | |--LPAREN -> ( [59:19] + | |--PARAMETERS -> PARAMETERS [59:20] + | | |--PARAMETER_DEF -> PARAMETER_DEF [59:20] + | | | |--MODIFIERS -> MODIFIERS [59:20] + | | | |--TYPE -> TYPE [59:20] + | | | | `--LITERAL_INT -> int [59:20] + | | | `--IDENT -> p1 [59:24] + | | |--COMMA -> , [59:26] + | | `--PARAMETER_DEF -> PARAMETER_DEF [59:28] + | | |--MODIFIERS -> MODIFIERS [59:28] + | | |--TYPE -> TYPE [59:28] + | | | |--IDENT -> String [59:28] + | | | `--ARRAY_DECLARATOR -> [ [59:34] + | | | `--RBRACK -> ] [59:35] + | | |--ELLIPSIS -> ... [59:36] + | | `--IDENT -> p2 [59:40] + | |--RPAREN -> ) [59:42] + | `--SLIST -> { [59:44] + | `--RCURLY -> } [59:45] + |--METHOD_DEF -> METHOD_DEF [62:4] + | |--MODIFIERS -> MODIFIERS [62:4] + | | `--LITERAL_PUBLIC -> public [62:4] + | |--TYPE -> TYPE [62:11] + | | `--LITERAL_VOID -> void [62:11] + | |--IDENT -> m18 [62:16] + | |--LPAREN -> ( [62:19] + | |--PARAMETERS -> PARAMETERS [62:20] + | |--RPAREN -> ) [62:20] + | |--LITERAL_THROWS -> throws [62:22] + | | `--IDENT -> Exception [62:29] + | `--SLIST -> { [62:39] + | `--RCURLY -> } [62:40] + |--METHOD_DEF -> METHOD_DEF [63:4] + | |--MODIFIERS -> MODIFIERS [63:4] + | | `--LITERAL_PUBLIC -> public [63:4] + | |--TYPE -> TYPE [63:11] + | | `--LITERAL_VOID -> void [63:11] + | |--IDENT -> m19 [63:16] + | |--LPAREN -> ( [63:19] + | |--PARAMETERS -> PARAMETERS [63:20] + | |--RPAREN -> ) [63:20] + | |--LITERAL_THROWS -> throws [63:22] + | | |--IDENT -> IOException [63:29] + | | |--COMMA -> , [63:40] + | | `--IDENT -> Exception [63:42] + | `--SLIST -> { [63:52] + | `--RCURLY -> } [63:53] + |--METHOD_DEF -> METHOD_DEF [66:4] + | |--MODIFIERS -> MODIFIERS [66:4] + | | `--LITERAL_PUBLIC -> public [66:4] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [66:11] + | | |--GENERIC_START -> < [66:11] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [66:12] + | | | `--IDENT -> T_$ [66:12] + | | `--GENERIC_END -> > [66:15] + | |--TYPE -> TYPE [66:17] + | | `--IDENT -> T_$ [66:17] + | |--IDENT -> m20 [66:21] + | |--LPAREN -> ( [66:24] + | |--PARAMETERS -> PARAMETERS [66:25] + | |--RPAREN -> ) [66:25] + | `--SLIST -> { [66:27] + | |--LITERAL_RETURN -> return [66:28] + | | |--EXPR -> EXPR [66:35] + | | | `--LITERAL_NULL -> null [66:35] + | | `--SEMI -> ; [66:39] + | `--RCURLY -> } [66:40] + |--METHOD_DEF -> METHOD_DEF [67:4] + | |--MODIFIERS -> MODIFIERS [67:4] + | | `--LITERAL_PUBLIC -> public [67:4] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [67:11] + | | |--GENERIC_START -> < [67:11] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [67:12] + | | | `--IDENT -> $_T [67:12] + | | `--GENERIC_END -> > [67:15] + | |--TYPE -> TYPE [67:17] + | | `--IDENT -> $_T [67:17] + | |--IDENT -> m21 [67:21] + | |--LPAREN -> ( [67:24] + | |--PARAMETERS -> PARAMETERS [67:25] + | |--RPAREN -> ) [67:25] + | `--SLIST -> { [67:27] + | |--LITERAL_RETURN -> return [67:28] + | | |--EXPR -> EXPR [67:35] + | | | `--LITERAL_NULL -> null [67:35] + | | `--SEMI -> ; [67:39] + | `--RCURLY -> } [67:40] + |--METHOD_DEF -> METHOD_DEF [68:4] + | |--MODIFIERS -> MODIFIERS [68:4] + | | `--LITERAL_PUBLIC -> public [68:4] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [68:11] + | | |--GENERIC_START -> < [68:11] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [68:12] + | | | |--IDENT -> T [68:12] + | | | `--TYPE_UPPER_BOUNDS -> extends [68:14] + | | | |--IDENT -> Enum [68:22] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [68:26] + | | | |--GENERIC_START -> < [68:26] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [68:27] + | | | | `--IDENT -> T [68:27] + | | | `--GENERIC_END -> > [68:28] + | | `--GENERIC_END -> > [68:29] + | |--TYPE -> TYPE [68:31] + | | `--LITERAL_VOID -> void [68:31] + | |--IDENT -> m22 [68:36] + | |--LPAREN -> ( [68:39] + | |--PARAMETERS -> PARAMETERS [68:40] + | |--RPAREN -> ) [68:40] + | `--SLIST -> { [68:42] + | `--RCURLY -> } [68:43] + |--METHOD_DEF -> METHOD_DEF [69:4] + | |--MODIFIERS -> MODIFIERS [69:4] + | | `--LITERAL_PUBLIC -> public [69:4] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [69:11] + | | |--GENERIC_START -> < [69:11] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [69:12] + | | | `--IDENT -> T [69:12] + | | `--GENERIC_END -> > [69:13] + | |--TYPE -> TYPE [69:15] + | | `--LITERAL_VOID -> void [69:15] + | |--IDENT -> m23 [69:20] + | |--LPAREN -> ( [69:23] + | |--PARAMETERS -> PARAMETERS [69:24] + | |--RPAREN -> ) [69:24] + | `--SLIST -> { [69:26] + | `--RCURLY -> } [69:27] + |--SEMI -> ; [69:28] + |--METHOD_DEF -> METHOD_DEF [70:4] + | |--MODIFIERS -> MODIFIERS [70:4] + | | `--LITERAL_PUBLIC -> public [70:4] + | |--TYPE_PARAMETERS -> TYPE_PARAMETERS [70:11] + | | |--GENERIC_START -> < [70:11] + | | |--TYPE_PARAMETER -> TYPE_PARAMETER [70:12] + | | | |--IDENT -> T [70:12] + | | | `--TYPE_UPPER_BOUNDS -> extends [70:14] + | | | |--IDENT -> RuntimeException [70:22] + | | | |--TYPE_EXTENSION_AND -> & [70:39] + | | | `--DOT -> . [70:48] + | | | |--DOT -> . [70:45] + | | | | |--IDENT -> java [70:41] + | | | | `--IDENT -> io [70:46] + | | | `--IDENT -> Serializable [70:49] + | | `--GENERIC_END -> > [70:61] + | |--TYPE -> TYPE [70:63] + | | `--LITERAL_VOID -> void [70:63] + | |--IDENT -> m24 [70:68] + | |--LPAREN -> ( [70:71] + | |--PARAMETERS -> PARAMETERS [70:72] + | |--RPAREN -> ) [70:72] + | `--SLIST -> { [70:74] + | `--RCURLY -> } [70:75] + |--METHOD_DEF -> METHOD_DEF [73:4] + | |--MODIFIERS -> MODIFIERS [73:4] + | | |--ANNOTATION -> ANNOTATION [73:4] + | | | |--AT -> @ [73:4] + | | | |--IDENT -> SuppressWarnings [73:5] + | | | |--LPAREN -> ( [73:21] + | | | |--ANNOTATION_ARRAY_INIT -> { [73:22] + | | | | `--RCURLY -> } [73:23] + | | | `--RPAREN -> ) [73:24] + | | `--LITERAL_PUBLIC -> public [74:4] + | |--TYPE -> TYPE [74:11] + | | `--LITERAL_VOID -> void [74:11] + | |--IDENT -> m50 [74:16] + | |--LPAREN -> ( [74:19] + | |--PARAMETERS -> PARAMETERS [74:20] + | |--RPAREN -> ) [74:20] + | `--SLIST -> { [74:22] + | `--RCURLY -> } [74:23] + |--METHOD_DEF -> METHOD_DEF [75:4] + | |--MODIFIERS -> MODIFIERS [75:4] + | | |--ANNOTATION -> ANNOTATION [75:4] + | | | |--AT -> @ [75:4] + | | | |--IDENT -> SuppressWarnings [75:5] + | | | |--LPAREN -> ( [75:21] + | | | |--ANNOTATION_ARRAY_INIT -> { [75:22] + | | | | |--EXPR -> EXPR [75:23] + | | | | | `--STRING_LITERAL -> "1" [75:23] + | | | | `--RCURLY -> } [75:26] + | | | `--RPAREN -> ) [75:27] + | | `--LITERAL_PUBLIC -> public [76:4] + | |--TYPE -> TYPE [76:11] + | | `--LITERAL_VOID -> void [76:11] + | |--IDENT -> m51 [76:16] + | |--LPAREN -> ( [76:19] + | |--PARAMETERS -> PARAMETERS [76:20] + | |--RPAREN -> ) [76:20] + | `--SLIST -> { [76:22] + | `--RCURLY -> } [76:23] + |--METHOD_DEF -> METHOD_DEF [77:4] + | |--MODIFIERS -> MODIFIERS [77:4] + | | |--ANNOTATION -> ANNOTATION [77:4] + | | | |--AT -> @ [77:4] + | | | |--IDENT -> SuppressWarnings [77:5] + | | | |--LPAREN -> ( [77:21] + | | | |--ANNOTATION_ARRAY_INIT -> { [77:22] + | | | | |--EXPR -> EXPR [77:23] + | | | | | `--STRING_LITERAL -> "1" [77:23] + | | | | |--COMMA -> , [77:26] + | | | | |--EXPR -> EXPR [77:27] + | | | | | `--STRING_LITERAL -> "2" [77:27] + | | | | `--RCURLY -> } [77:30] + | | | `--RPAREN -> ) [77:31] + | | `--LITERAL_PUBLIC -> public [78:4] + | |--TYPE -> TYPE [78:11] + | | `--LITERAL_VOID -> void [78:11] + | |--IDENT -> m52 [78:16] + | |--LPAREN -> ( [78:19] + | |--PARAMETERS -> PARAMETERS [78:20] + | |--RPAREN -> ) [78:20] + | `--SLIST -> { [78:22] + | `--RCURLY -> } [78:23] + |--METHOD_DEF -> METHOD_DEF [79:4] + | |--MODIFIERS -> MODIFIERS [79:4] + | | |--ANNOTATION -> ANNOTATION [79:4] + | | | |--AT -> @ [79:4] + | | | |--IDENT -> SuppressWarnings [79:5] + | | | |--LPAREN -> ( [79:21] + | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [79:22] + | | | | |--IDENT -> value [79:22] + | | | | |--ASSIGN -> = [79:27] + | | | | `--ANNOTATION_ARRAY_INIT -> { [79:28] + | | | | |--EXPR -> EXPR [79:29] + | | | | | `--STRING_LITERAL -> "1" [79:29] + | | | | `--RCURLY -> } [79:32] + | | | `--RPAREN -> ) [79:33] + | | `--LITERAL_PUBLIC -> public [80:4] + | |--TYPE -> TYPE [80:11] + | | `--LITERAL_VOID -> void [80:11] + | |--IDENT -> m53 [80:16] + | |--LPAREN -> ( [80:19] + | |--PARAMETERS -> PARAMETERS [80:20] + | |--RPAREN -> ) [80:20] + | `--SLIST -> { [80:22] + | `--RCURLY -> } [80:23] + |--METHOD_DEF -> METHOD_DEF [81:4] + | |--MODIFIERS -> MODIFIERS [81:4] + | | |--ANNOTATION -> ANNOTATION [81:4] + | | | |--AT -> @ [81:4] + | | | |--IDENT -> SuppressWarnings [81:5] + | | | |--LPAREN -> ( [81:21] + | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [81:22] + | | | | |--IDENT -> value [81:22] + | | | | |--ASSIGN -> = [81:27] + | | | | `--ANNOTATION_ARRAY_INIT -> { [81:28] + | | | | |--EXPR -> EXPR [81:29] + | | | | | `--STRING_LITERAL -> "1" [81:29] + | | | | |--COMMA -> , [81:32] + | | | | `--RCURLY -> } [81:33] + | | | `--RPAREN -> ) [81:34] + | | `--LITERAL_PUBLIC -> public [82:4] + | |--TYPE -> TYPE [82:11] + | | `--LITERAL_VOID -> void [82:11] + | |--IDENT -> m54 [82:16] + | |--LPAREN -> ( [82:19] + | |--PARAMETERS -> PARAMETERS [82:20] + | |--RPAREN -> ) [82:20] + | `--SLIST -> { [82:22] + | `--RCURLY -> } [82:23] + |--METHOD_DEF -> METHOD_DEF [83:4] + | |--MODIFIERS -> MODIFIERS [83:4] + | | |--ANNOTATION -> ANNOTATION [83:4] + | | | |--AT -> @ [83:4] + | | | |--IDENT -> SuppressWarnings [83:5] + | | | |--LPAREN -> ( [83:21] + | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [83:22] + | | | | |--IDENT -> value [83:22] + | | | | |--ASSIGN -> = [83:27] + | | | | `--ANNOTATION_ARRAY_INIT -> { [83:28] + | | | | |--EXPR -> EXPR [83:29] + | | | | | `--STRING_LITERAL -> "1" [83:29] + | | | | |--COMMA -> , [83:32] + | | | | |--EXPR -> EXPR [83:33] + | | | | | `--STRING_LITERAL -> "2" [83:33] + | | | | `--RCURLY -> } [83:36] + | | | `--RPAREN -> ) [83:37] + | | `--LITERAL_PUBLIC -> public [84:4] + | |--TYPE -> TYPE [84:11] + | | `--LITERAL_VOID -> void [84:11] + | |--IDENT -> m55 [84:16] + | |--LPAREN -> ( [84:19] + | |--PARAMETERS -> PARAMETERS [84:20] + | |--RPAREN -> ) [84:20] + | `--SLIST -> { [84:22] + | `--RCURLY -> } [84:23] + |--METHOD_DEF -> METHOD_DEF [85:4] + | |--MODIFIERS -> MODIFIERS [85:4] + | | |--ANNOTATION -> ANNOTATION [85:4] + | | | |--AT -> @ [85:4] + | | | |--IDENT -> InputRegressionJavaAnnotation1 [85:5] + | | | |--LPAREN -> ( [85:35] + | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [85:36] + | | | | |--IDENT -> m1 [85:36] + | | | | |--ASSIGN -> = [85:38] + | | | | `--EXPR -> EXPR [85:39] + | | | | `--STRING_LITERAL -> "1" [85:39] + | | | |--COMMA -> , [85:42] + | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [85:44] + | | | | |--IDENT -> m2 [85:44] + | | | | |--ASSIGN -> = [85:46] + | | | | `--EXPR -> EXPR [85:47] + | | | | `--STRING_LITERAL -> "2" [85:47] + | | | `--RPAREN -> ) [85:50] + | | `--LITERAL_PUBLIC -> public [86:4] + | |--TYPE -> TYPE [86:11] + | | `--LITERAL_VOID -> void [86:11] + | |--IDENT -> m56 [86:16] + | |--LPAREN -> ( [86:19] + | |--PARAMETERS -> PARAMETERS [86:20] + | |--RPAREN -> ) [86:20] + | `--SLIST -> { [86:22] + | `--RCURLY -> } [86:23] + |--METHOD_DEF -> METHOD_DEF [87:4] + | |--MODIFIERS -> MODIFIERS [87:4] + | | |--ANNOTATION -> ANNOTATION [87:4] + | | | |--AT -> @ [87:4] + | | | |--IDENT -> ComplexAnnotation [87:5] + | | | |--LPAREN -> ( [87:22] + | | | |--ANNOTATION_ARRAY_INIT -> { [87:23] + | | | | |--ANNOTATION -> ANNOTATION [88:12] + | | | | | |--AT -> @ [88:12] + | | | | | |--IDENT -> InputRegressionJavaAnnotation1 [88:13] + | | | | | |--LPAREN -> ( [88:43] + | | | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [88:44] + | | | | | | |--IDENT -> m1 [88:44] + | | | | | | |--ASSIGN -> = [88:47] + | | | | | | `--EXPR -> EXPR [88:49] + | | | | | | `--STRING_LITERAL -> "1" [88:49] + | | | | | |--COMMA -> , [88:52] + | | | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [88:54] + | | | | | | |--IDENT -> m2 [88:54] + | | | | | | |--ASSIGN -> = [88:57] + | | | | | | `--EXPR -> EXPR [88:59] + | | | | | | `--STRING_LITERAL -> "" [88:59] + | | | | | `--RPAREN -> ) [88:61] + | | | | |--COMMA -> , [88:62] + | | | | |--ANNOTATION -> ANNOTATION [89:12] + | | | | | |--AT -> @ [89:12] + | | | | | |--IDENT -> InputRegressionJavaAnnotation1 [89:13] + | | | | | |--LPAREN -> ( [89:43] + | | | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [89:44] + | | | | | | |--IDENT -> m1 [89:44] + | | | | | | |--ASSIGN -> = [89:47] + | | | | | | `--EXPR -> EXPR [89:49] + | | | | | | `--STRING_LITERAL -> "1" [89:49] + | | | | | |--COMMA -> , [89:52] + | | | | | |--ANNOTATION_MEMBER_VALUE_PAIR -> ANNOTATION_MEMBER_VALUE_PAIR [89:54] + | | | | | | |--IDENT -> m2 [89:54] + | | | | | | |--ASSIGN -> = [89:57] + | | | | | | `--EXPR -> EXPR [89:59] + | | | | | | `--STRING_LITERAL -> "" [89:59] + | | | | | `--RPAREN -> ) [89:61] + | | | | `--RCURLY -> } [90:4] + | | | `--RPAREN -> ) [90:5] + | | `--LITERAL_PUBLIC -> public [91:4] + | |--TYPE -> TYPE [91:11] + | | `--LITERAL_VOID -> void [91:11] + | |--IDENT -> m57 [91:16] + | |--LPAREN -> ( [91:19] + | |--PARAMETERS -> PARAMETERS [91:20] + | |--RPAREN -> ) [91:20] + | `--SLIST -> { [91:22] + | `--RCURLY -> } [91:23] + |--METHOD_DEF -> METHOD_DEF [92:4] + | |--MODIFIERS -> MODIFIERS [92:4] + | | `--LITERAL_PUBLIC -> public [92:4] + | |--TYPE -> TYPE [92:11] + | | `--LITERAL_VOID -> void [92:11] + | |--IDENT -> m58 [92:16] + | |--LPAREN -> ( [92:19] + | |--PARAMETERS -> PARAMETERS [92:20] + | | `--PARAMETER_DEF -> PARAMETER_DEF [92:20] + | | |--MODIFIERS -> MODIFIERS [92:20] + | | | `--ANNOTATION -> ANNOTATION [92:20] + | | | |--AT -> @ [92:20] + | | | `--IDENT -> Deprecated [92:21] + | | |--TYPE -> TYPE [92:32] + | | | `--IDENT -> String [92:32] + | | `--IDENT -> s [92:39] + | |--RPAREN -> ) [92:40] + | `--SLIST -> { [92:42] + | `--RCURLY -> } [92:43] + |--METHOD_DEF -> METHOD_DEF [93:4] + | |--MODIFIERS -> MODIFIERS [93:4] + | | `--LITERAL_PUBLIC -> public [93:4] + | |--TYPE -> TYPE [93:11] + | | `--LITERAL_VOID -> void [93:11] + | |--IDENT -> m59 [93:16] + | |--LPAREN -> ( [93:19] + | |--PARAMETERS -> PARAMETERS [93:20] + | | `--PARAMETER_DEF -> PARAMETER_DEF [93:20] + | | |--MODIFIERS -> MODIFIERS [93:20] + | | | |--FINAL -> final [93:20] + | | | `--ANNOTATION -> ANNOTATION [93:26] + | | | |--AT -> @ [93:26] + | | | `--IDENT -> Deprecated [93:27] + | | |--TYPE -> TYPE [93:38] + | | | `--IDENT -> List [93:38] + | | `--IDENT -> l [93:43] + | |--RPAREN -> ) [93:44] + | `--SLIST -> { [93:46] + | `--RCURLY -> } [93:47] + |--INSTANCE_INIT -> INSTANCE_INIT [96:4] + | `--SLIST -> { [96:4] + | `--RCURLY -> } [96:5] + |--SEMI -> ; [97:4] + |--METHOD_DEF -> METHOD_DEF [100:4] + | |--MODIFIERS -> MODIFIERS [100:4] + | | `--LITERAL_PUBLIC -> public [100:4] + | |--TYPE -> TYPE [100:11] + | | `--LITERAL_VOID -> void [100:11] + | |--IDENT -> instructions [100:16] + | |--LPAREN -> ( [100:28] + | |--PARAMETERS -> PARAMETERS [100:29] + | |--RPAREN -> ) [100:29] + | |--LITERAL_THROWS -> throws [100:31] + | | `--IDENT -> Exception [100:38] + | `--SLIST -> { [100:48] + | |--VARIABLE_DEF -> VARIABLE_DEF [102:8] + | | |--MODIFIERS -> MODIFIERS [102:8] + | | |--TYPE -> TYPE [102:8] + | | | `--LITERAL_BOOLEAN -> boolean [102:8] + | | |--IDENT -> b [102:16] + | | `--ASSIGN -> = [102:18] + | | `--EXPR -> EXPR [102:34] + | | `--GT -> > [102:34] + | | |--METHOD_CALL -> ( [102:31] + | | | |--DOT -> . [102:24] + | | | | |--IDENT -> Math [102:20] + | | | | `--IDENT -> random [102:25] + | | | |--ELIST -> ELIST [102:32] + | | | `--RPAREN -> ) [102:32] + | | `--NUM_INT -> 0 [102:36] + | |--SEMI -> ; [102:37] + | |--VARIABLE_DEF -> VARIABLE_DEF [105:8] + | | |--MODIFIERS -> MODIFIERS [105:8] + | | |--TYPE -> TYPE [105:8] + | | | `--LITERAL_BYTE -> byte [105:8] + | | `--IDENT -> vbyte [105:13] + | |--SEMI -> ; [105:18] + | |--VARIABLE_DEF -> VARIABLE_DEF [106:8] + | | |--MODIFIERS -> MODIFIERS [106:8] + | | |--TYPE -> TYPE [106:8] + | | | `--LITERAL_BOOLEAN -> boolean [106:8] + | | `--IDENT -> vboolean [106:16] + | |--SEMI -> ; [106:24] + | |--VARIABLE_DEF -> VARIABLE_DEF [107:8] + | | |--MODIFIERS -> MODIFIERS [107:8] + | | |--TYPE -> TYPE [107:8] + | | | `--LITERAL_CHAR -> char [107:8] + | | `--IDENT -> vchar [107:13] + | |--SEMI -> ; [107:18] + | |--VARIABLE_DEF -> VARIABLE_DEF [108:8] + | | |--MODIFIERS -> MODIFIERS [108:8] + | | |--TYPE -> TYPE [108:8] + | | | `--LITERAL_SHORT -> short [108:8] + | | `--IDENT -> vshort [108:14] + | |--SEMI -> ; [108:20] + | |--VARIABLE_DEF -> VARIABLE_DEF [109:8] + | | |--MODIFIERS -> MODIFIERS [109:8] + | | |--TYPE -> TYPE [109:8] + | | | `--LITERAL_INT -> int [109:8] + | | `--IDENT -> vint [109:12] + | |--SEMI -> ; [109:16] + | |--VARIABLE_DEF -> VARIABLE_DEF [110:8] + | | |--MODIFIERS -> MODIFIERS [110:8] + | | |--TYPE -> TYPE [110:8] + | | | `--LITERAL_LONG -> long [110:8] + | | `--IDENT -> vlong [110:13] + | |--SEMI -> ; [110:18] + | |--VARIABLE_DEF -> VARIABLE_DEF [111:8] + | | |--MODIFIERS -> MODIFIERS [111:8] + | | |--TYPE -> TYPE [111:8] + | | | `--LITERAL_FLOAT -> float [111:8] + | | `--IDENT -> vfloat [111:14] + | |--SEMI -> ; [111:20] + | |--VARIABLE_DEF -> VARIABLE_DEF [112:8] + | | |--MODIFIERS -> MODIFIERS [112:8] + | | |--TYPE -> TYPE [112:8] + | | | `--LITERAL_DOUBLE -> double [112:8] + | | `--IDENT -> vdouble [112:15] + | |--SEMI -> ; [112:22] + | |--VARIABLE_DEF -> VARIABLE_DEF [113:8] + | | |--MODIFIERS -> MODIFIERS [113:8] + | | |--TYPE -> TYPE [113:8] + | | | |--LITERAL_INT -> int [113:8] + | | | `--ARRAY_DECLARATOR -> [ [113:11] + | | | `--RBRACK -> ] [113:12] + | | `--IDENT -> varray [113:14] + | |--SEMI -> ; [113:20] + | |--VARIABLE_DEF -> VARIABLE_DEF [114:8] + | | |--MODIFIERS -> MODIFIERS [114:8] + | | |--TYPE -> TYPE [114:8] + | | | |--LITERAL_INT -> int [114:8] + | | | `--ARRAY_DECLARATOR -> [ [114:19] + | | | `--RBRACK -> ] [114:20] + | | `--IDENT -> varray2 [114:12] + | |--SEMI -> ; [114:21] + | |--VARIABLE_DEF -> VARIABLE_DEF [115:8] + | | |--MODIFIERS -> MODIFIERS [115:8] + | | |--TYPE -> TYPE [115:8] + | | | `--LITERAL_BOOLEAN -> boolean [115:8] + | | |--IDENT -> test1 [115:16] + | | `--ASSIGN -> = [115:22] + | | `--EXPR -> EXPR [115:24] + | | `--LITERAL_TRUE -> true [115:24] + | |--SEMI -> ; [115:28] + | |--VARIABLE_DEF -> VARIABLE_DEF [118:8] + | | |--MODIFIERS -> MODIFIERS [118:8] + | | |--TYPE -> TYPE [118:8] + | | | `--IDENT -> String [118:8] + | | `--IDENT -> vstring [118:15] + | |--SEMI -> ; [118:22] + | |--VARIABLE_DEF -> VARIABLE_DEF [119:8] + | | |--MODIFIERS -> MODIFIERS [119:8] + | | |--TYPE -> TYPE [119:8] + | | | |--IDENT -> List [119:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [119:12] + | | | |--GENERIC_START -> < [119:12] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [119:13] + | | | | `--IDENT -> String [119:13] + | | | `--GENERIC_END -> > [119:19] + | | `--IDENT -> vlist [119:21] + | |--SEMI -> ; [119:26] + | |--VARIABLE_DEF -> VARIABLE_DEF [120:8] + | | |--MODIFIERS -> MODIFIERS [120:8] + | | |--TYPE -> TYPE [120:8] + | | | |--IDENT -> Map [120:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [120:11] + | | | |--GENERIC_START -> < [120:11] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [120:12] + | | | | `--IDENT -> String [120:12] + | | | |--COMMA -> , [120:18] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [120:20] + | | | | |--IDENT -> String [120:20] + | | | | `--ARRAY_DECLARATOR -> [ [120:26] + | | | | `--RBRACK -> ] [120:27] + | | | `--GENERIC_END -> > [120:28] + | | `--IDENT -> vmap [120:30] + | |--SEMI -> ; [120:34] + | |--VARIABLE_DEF -> VARIABLE_DEF [121:8] + | | |--MODIFIERS -> MODIFIERS [121:8] + | | |--TYPE -> TYPE [121:8] + | | | |--LITERAL_INT -> int [121:8] + | | | `--ARRAY_DECLARATOR -> [ [121:11] + | | | `--RBRACK -> ] [121:12] + | | |--IDENT -> test2 [121:14] + | | `--ASSIGN -> = [121:20] + | | `--ARRAY_INIT -> { [121:22] + | | `--RCURLY -> } [121:23] + | |--SEMI -> ; [121:24] + | |--VARIABLE_DEF -> VARIABLE_DEF [122:8] + | | |--MODIFIERS -> MODIFIERS [122:8] + | | |--TYPE -> TYPE [122:8] + | | | |--IDENT -> List [122:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [122:12] + | | | |--GENERIC_START -> < [122:12] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [122:13] + | | | | |--LITERAL_CHAR -> char [122:13] + | | | | `--ARRAY_DECLARATOR -> [ [122:17] + | | | | `--RBRACK -> ] [122:18] + | | | `--GENERIC_END -> > [122:19] + | | `--IDENT -> test3 [122:21] + | |--SEMI -> ; [122:26] + | |--VARIABLE_DEF -> VARIABLE_DEF [123:8] + | | |--MODIFIERS -> MODIFIERS [123:8] + | | |--TYPE -> TYPE [123:8] + | | | |--IDENT -> Class [123:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [123:13] + | | | |--GENERIC_START -> < [123:13] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [123:14] + | | | | `--WILDCARD_TYPE -> ? [123:14] + | | | `--GENERIC_END -> > [123:15] + | | `--IDENT -> test4 [123:17] + | |--SEMI -> ; [123:22] + | |--VARIABLE_DEF -> VARIABLE_DEF [124:8] + | | |--MODIFIERS -> MODIFIERS [124:8] + | | |--TYPE -> TYPE [124:8] + | | | |--IDENT -> List [124:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [124:12] + | | | |--GENERIC_START -> < [124:12] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [124:13] + | | | | |--WILDCARD_TYPE -> ? [124:13] + | | | | `--TYPE_UPPER_BOUNDS -> extends [124:15] + | | | | `--IDENT -> InputRegressionJavaClass1 [124:23] + | | | `--GENERIC_END -> > [124:48] + | | `--IDENT -> test5 [124:50] + | |--SEMI -> ; [124:55] + | |--VARIABLE_DEF -> VARIABLE_DEF [125:8] + | | |--MODIFIERS -> MODIFIERS [125:8] + | | |--TYPE -> TYPE [125:8] + | | | |--IDENT -> List [125:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [125:12] + | | | |--GENERIC_START -> < [125:12] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [125:13] + | | | | |--WILDCARD_TYPE -> ? [125:13] + | | | | `--TYPE_UPPER_BOUNDS -> extends [125:15] + | | | | |--IDENT -> List [125:23] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [125:27] + | | | | |--GENERIC_START -> < [125:27] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [125:28] + | | | | | `--IDENT -> Object [125:28] + | | | | `--GENERIC_END -> > [125:34] + | | | `--GENERIC_END -> > [125:35] + | | `--IDENT -> test6 [125:37] + | |--SEMI -> ; [125:42] + | |--VARIABLE_DEF -> VARIABLE_DEF [126:8] + | | |--MODIFIERS -> MODIFIERS [126:8] + | | |--TYPE -> TYPE [126:8] + | | | |--IDENT -> List [126:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [126:12] + | | | |--GENERIC_START -> < [126:12] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [126:13] + | | | | |--WILDCARD_TYPE -> ? [126:13] + | | | | `--TYPE_UPPER_BOUNDS -> extends [126:15] + | | | | |--IDENT -> List [126:23] + | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [126:27] + | | | | |--GENERIC_START -> < [126:27] + | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [126:28] + | | | | | |--IDENT -> List [126:28] + | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [126:32] + | | | | | |--GENERIC_START -> < [126:32] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [126:33] + | | | | | | `--IDENT -> Object [126:33] + | | | | | `--GENERIC_END -> > [126:39] + | | | | `--GENERIC_END -> > [126:40] + | | | `--GENERIC_END -> > [126:41] + | | `--IDENT -> test7 [126:43] + | |--SEMI -> ; [126:48] + | |--VARIABLE_DEF -> VARIABLE_DEF [127:8] + | | |--MODIFIERS -> MODIFIERS [127:8] + | | |--TYPE -> TYPE [127:8] + | | | |--IDENT -> List [127:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [127:12] + | | | |--GENERIC_START -> < [127:12] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [127:13] + | | | | |--WILDCARD_TYPE -> ? [127:13] + | | | | `--TYPE_UPPER_BOUNDS -> extends [127:15] + | | | | |--LITERAL_INT -> int [127:23] + | | | | `--ARRAY_DECLARATOR -> [ [127:26] + | | | | `--RBRACK -> ] [127:27] + | | | `--GENERIC_END -> > [127:28] + | | `--IDENT -> test8 [127:30] + | |--SEMI -> ; [127:35] + | |--VARIABLE_DEF -> VARIABLE_DEF [128:8] + | | |--MODIFIERS -> MODIFIERS [128:8] + | | |--TYPE -> TYPE [128:8] + | | | |--IDENT -> List [128:8] + | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [128:12] + | | | |--GENERIC_START -> < [128:12] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [128:13] + | | | | |--WILDCARD_TYPE -> ? [128:13] + | | | | `--TYPE_LOWER_BOUNDS -> super [128:15] + | | | | `--IDENT -> InputRegressionJavaClass1 [128:21] + | | | `--GENERIC_END -> > [128:46] + | | `--IDENT -> test9 [128:48] + | |--SEMI -> ; [128:53] + | |--EXPR -> EXPR [131:17] + | | `--ASSIGN -> = [131:17] + | | |--IDENT -> vboolean [131:8] + | | `--LITERAL_TRUE -> true [131:19] + | |--SEMI -> ; [131:23] + | |--EXPR -> EXPR [132:17] + | | `--ASSIGN -> = [132:17] + | | |--IDENT -> vboolean [132:8] + | | `--LITERAL_FALSE -> false [132:19] + | |--SEMI -> ; [132:24] + | |--EXPR -> EXPR [133:14] + | | `--ASSIGN -> = [133:14] + | | |--IDENT -> vchar [133:8] + | | `--CHAR_LITERAL -> ' ' [133:16] + | |--SEMI -> ; [133:19] + | |--EXPR -> EXPR [134:14] + | | `--ASSIGN -> = [134:14] + | | |--IDENT -> vchar [134:8] + | | `--CHAR_LITERAL -> '"' [134:16] + | |--SEMI -> ; [134:19] + | |--EXPR -> EXPR [135:14] + | | `--ASSIGN -> = [135:14] + | | |--IDENT -> vchar [135:8] + | | `--CHAR_LITERAL -> '\0' [135:16] + | |--SEMI -> ; [135:20] + | |--EXPR -> EXPR [136:14] + | | `--ASSIGN -> = [136:14] + | | |--IDENT -> vchar [136:8] + | | `--CHAR_LITERAL -> '\'' [136:16] + | |--SEMI -> ; [136:20] + | |--EXPR -> EXPR [137:14] + | | `--ASSIGN -> = [137:14] + | | |--IDENT -> vchar [137:8] + | | `--CHAR_LITERAL -> '\n' [137:16] + | |--SEMI -> ; [137:20] + | |--EXPR -> EXPR [138:14] + | | `--ASSIGN -> = [138:14] + | | |--IDENT -> vchar [138:8] + | | `--CHAR_LITERAL -> '\r' [138:16] + | |--SEMI -> ; [138:20] + | |--EXPR -> EXPR [139:14] + | | `--ASSIGN -> = [139:14] + | | |--IDENT -> vchar [139:8] + | | `--CHAR_LITERAL -> '\t' [139:16] + | |--SEMI -> ; [139:20] + | |--EXPR -> EXPR [140:14] + | | `--ASSIGN -> = [140:14] + | | |--IDENT -> vchar [140:8] + | | `--CHAR_LITERAL -> '\b' [140:16] + | |--SEMI -> ; [140:20] + | |--EXPR -> EXPR [141:14] + | | `--ASSIGN -> = [141:14] + | | |--IDENT -> vchar [141:8] + | | `--CHAR_LITERAL -> '\f' [141:16] + | |--SEMI -> ; [141:20] + | |--EXPR -> EXPR [142:14] + | | `--ASSIGN -> = [142:14] + | | |--IDENT -> vchar [142:8] + | | `--CHAR_LITERAL -> '\"' [142:16] + | |--SEMI -> ; [142:20] + | |--EXPR -> EXPR [143:14] + | | `--ASSIGN -> = [143:14] + | | |--IDENT -> vchar [143:8] + | | `--CHAR_LITERAL -> '\'' [143:16] + | |--SEMI -> ; [143:20] + | |--EXPR -> EXPR [144:14] + | | `--ASSIGN -> = [144:14] + | | |--IDENT -> vchar [144:8] + | | `--CHAR_LITERAL -> '\\' [144:16] + | |--SEMI -> ; [144:20] + | |--EXPR -> EXPR [145:14] + | | `--ASSIGN -> = [145:14] + | | |--IDENT -> vchar [145:8] + | | `--CHAR_LITERAL -> '\00' [145:16] + | |--SEMI -> ; [145:21] + | |--EXPR -> EXPR [146:14] + | | `--ASSIGN -> = [146:14] + | | |--IDENT -> vchar [146:8] + | | `--CHAR_LITERAL -> '\013' [146:16] + | |--SEMI -> ; [146:22] + | |--EXPR -> EXPR [147:14] + | | `--ASSIGN -> = [147:14] + | | |--IDENT -> vchar [147:8] + | | `--CHAR_LITERAL -> '\4' [147:16] + | |--SEMI -> ; [147:20] + | |--EXPR -> EXPR [148:14] + | | `--ASSIGN -> = [148:14] + | | |--IDENT -> vchar [148:8] + | | `--CHAR_LITERAL -> '\40' [148:16] + | |--SEMI -> ; [148:21] + | |--EXPR -> EXPR [149:14] + | | `--ASSIGN -> = [149:14] + | | |--IDENT -> vchar [149:8] + | | `--CHAR_LITERAL -> '\u0000' [149:16] + | |--SEMI -> ; [149:24] + | |--EXPR -> EXPR [150:14] + | | `--ASSIGN -> = [150:14] + | | |--IDENT -> vchar [150:8] + | | `--CHAR_LITERAL -> '\u1234' [150:16] + | |--SEMI -> ; [150:24] + | |--EXPR -> EXPR [151:14] + | | `--ASSIGN -> = [151:14] + | | |--IDENT -> vchar [151:8] + | | `--CHAR_LITERAL -> '\u005C\u005C' [151:16] + | |--SEMI -> ; [151:30] + | |--EXPR -> EXPR [152:14] + | | `--ASSIGN -> = [152:14] + | | |--IDENT -> vchar [152:8] + | | `--CHAR_LITERAL -> '\u005c\u005c' [152:16] + | |--SEMI -> ; [152:30] + | |--EXPR -> EXPR [153:14] + | | `--ASSIGN -> = [153:14] + | | |--IDENT -> vchar [153:8] + | | `--CHAR_LITERAL -> '\uu005C\uuuuu005C' [153:16] + | |--SEMI -> ; [153:35] + | |--EXPR -> EXPR [154:14] + | | `--ASSIGN -> = [154:14] + | | |--IDENT -> vchar [154:8] + | | `--CHAR_LITERAL -> '\u005cn' [154:16] + | |--SEMI -> ; [154:25] + | |--EXPR -> EXPR [155:14] + | | `--ASSIGN -> = [155:14] + | | |--IDENT -> vchar [155:8] + | | `--CHAR_LITERAL -> '\u005cr' [155:16] + | |--SEMI -> ; [155:25] + | |--EXPR -> EXPR [156:14] + | | `--ASSIGN -> = [156:14] + | | |--IDENT -> vchar [156:8] + | | `--CHAR_LITERAL -> '\u005ct' [156:16] + | |--SEMI -> ; [156:25] + | |--EXPR -> EXPR [157:14] + | | `--ASSIGN -> = [157:14] + | | |--IDENT -> vchar [157:8] + | | `--CHAR_LITERAL -> '\u005cb' [157:16] + | |--SEMI -> ; [157:25] + | |--EXPR -> EXPR [158:14] + | | `--ASSIGN -> = [158:14] + | | |--IDENT -> vchar [158:8] + | | `--CHAR_LITERAL -> '\u005cf' [158:16] + | |--SEMI -> ; [158:25] + | |--EXPR -> EXPR [159:14] + | | `--ASSIGN -> = [159:14] + | | |--IDENT -> vchar [159:8] + | | `--CHAR_LITERAL -> '\u005c"' [159:16] + | |--SEMI -> ; [159:25] + | |--EXPR -> EXPR [160:14] + | | `--ASSIGN -> = [160:14] + | | |--IDENT -> vchar [160:8] + | | `--CHAR_LITERAL -> '\u005c'' [160:16] + | |--SEMI -> ; [160:25] + | |--EXPR -> EXPR [161:14] + | | `--ASSIGN -> = [161:14] + | | |--IDENT -> vchar [161:8] + | | `--CHAR_LITERAL -> '\u005c\' [161:16] + | |--SEMI -> ; [161:25] + | |--EXPR -> EXPR [162:13] + | | `--ASSIGN -> = [162:13] + | | |--IDENT -> vint [162:8] + | | `--NUM_INT -> 0 [162:15] + | |--SEMI -> ; [162:16] + | |--EXPR -> EXPR [163:13] + | | `--ASSIGN -> = [163:13] + | | |--IDENT -> vint [163:8] + | | `--UNARY_MINUS -> - [163:15] + | | `--NUM_INT -> 1 [163:16] + | |--SEMI -> ; [163:17] + | |--EXPR -> EXPR [164:13] + | | `--ASSIGN -> = [164:13] + | | |--IDENT -> vint [164:8] + | | `--UNARY_PLUS -> + [164:15] + | | `--NUM_INT -> 1 [164:16] + | |--SEMI -> ; [164:17] + | |--EXPR -> EXPR [165:13] + | | `--ASSIGN -> = [165:13] + | | |--IDENT -> vint [165:8] + | | `--NUM_INT -> 100_000 [165:15] + | |--SEMI -> ; [165:22] + | |--EXPR -> EXPR [166:13] + | | `--ASSIGN -> = [166:13] + | | |--IDENT -> vint [166:8] + | | `--NUM_INT -> 0x00 [166:15] + | |--SEMI -> ; [166:19] + | |--EXPR -> EXPR [167:13] + | | `--ASSIGN -> = [167:13] + | | |--IDENT -> vint [167:8] + | | `--NUM_INT -> 0x12345678 [167:15] + | |--SEMI -> ; [167:25] + | |--EXPR -> EXPR [168:13] + | | `--ASSIGN -> = [168:13] + | | |--IDENT -> vint [168:8] + | | `--NUM_INT -> 0X9 [168:15] + | |--SEMI -> ; [168:18] + | |--EXPR -> EXPR [169:13] + | | `--ASSIGN -> = [169:13] + | | |--IDENT -> vint [169:8] + | | `--NUM_INT -> 0x1234_5678 [169:15] + | |--SEMI -> ; [169:26] + | |--EXPR -> EXPR [170:13] + | | `--ASSIGN -> = [170:13] + | | |--IDENT -> vint [170:8] + | | `--NUM_INT -> 0b101 [170:15] + | |--SEMI -> ; [170:20] + | |--EXPR -> EXPR [171:13] + | | `--ASSIGN -> = [171:13] + | | |--IDENT -> vint [171:8] + | | `--NUM_INT -> 0B101 [171:15] + | |--SEMI -> ; [171:20] + | |--EXPR -> EXPR [172:13] + | | `--ASSIGN -> = [172:13] + | | |--IDENT -> vint [172:8] + | | `--NUM_INT -> 0b1 [172:15] + | |--SEMI -> ; [172:18] + | |--EXPR -> EXPR [173:13] + | | `--ASSIGN -> = [173:13] + | | |--IDENT -> vint [173:8] + | | `--NUM_INT -> 0b1_0 [173:15] + | |--SEMI -> ; [173:20] + | |--EXPR -> EXPR [174:13] + | | `--ASSIGN -> = [174:13] + | | |--IDENT -> vint [174:8] + | | `--NUM_INT -> 012345670 [174:15] + | |--SEMI -> ; [174:24] + | |--EXPR -> EXPR [175:13] + | | `--ASSIGN -> = [175:13] + | | |--IDENT -> vint [175:8] + | | `--NUM_INT -> 01234_5670 [175:15] + | |--SEMI -> ; [175:25] + | |--EXPR -> EXPR [176:14] + | | `--ASSIGN -> = [176:14] + | | |--IDENT -> vlong [176:8] + | | `--NUM_LONG -> 0L [176:16] + | |--SEMI -> ; [176:18] + | |--EXPR -> EXPR [177:14] + | | `--ASSIGN -> = [177:14] + | | |--IDENT -> vlong [177:8] + | | `--NUM_LONG -> 1L [177:16] + | |--SEMI -> ; [177:18] + | |--EXPR -> EXPR [178:14] + | | `--ASSIGN -> = [178:14] + | | |--IDENT -> vlong [178:8] + | | `--NUM_LONG -> 0b1L [178:16] + | |--SEMI -> ; [178:20] + | |--EXPR -> EXPR [179:14] + | | `--ASSIGN -> = [179:14] + | | |--IDENT -> vlong [179:8] + | | `--NUM_LONG -> 1234567890l [179:16] + | |--SEMI -> ; [179:27] + | |--EXPR -> EXPR [180:14] + | | `--ASSIGN -> = [180:14] + | | |--IDENT -> vlong [180:8] + | | `--NUM_LONG -> 1234567890L [180:16] + | |--SEMI -> ; [180:27] + | |--EXPR -> EXPR [181:14] + | | `--ASSIGN -> = [181:14] + | | |--IDENT -> vlong [181:8] + | | `--NUM_LONG -> 0x0l [181:16] + | |--SEMI -> ; [181:20] + | |--EXPR -> EXPR [182:14] + | | `--ASSIGN -> = [182:14] + | | |--IDENT -> vlong [182:8] + | | `--NUM_LONG -> 0xABCDEFl [182:16] + | |--SEMI -> ; [182:25] + | |--EXPR -> EXPR [183:14] + | | `--ASSIGN -> = [183:14] + | | |--IDENT -> vlong [183:8] + | | `--NUM_LONG -> 0XABCDEFL [183:16] + | |--SEMI -> ; [183:25] + | |--EXPR -> EXPR [184:15] + | | `--ASSIGN -> = [184:15] + | | |--IDENT -> vfloat [184:8] + | | `--NUM_FLOAT -> 0f [184:17] + | |--SEMI -> ; [184:19] + | |--EXPR -> EXPR [185:15] + | | `--ASSIGN -> = [185:15] + | | |--IDENT -> vfloat [185:8] + | | `--NUM_FLOAT -> 0F [185:17] + | |--SEMI -> ; [185:19] + | |--EXPR -> EXPR [186:15] + | | `--ASSIGN -> = [186:15] + | | |--IDENT -> vfloat [186:8] + | | `--NUM_FLOAT -> 1.1f [186:17] + | |--SEMI -> ; [186:21] + | |--EXPR -> EXPR [187:15] + | | `--ASSIGN -> = [187:15] + | | |--IDENT -> vfloat [187:8] + | | `--NUM_FLOAT -> 1.10_1F [187:17] + | |--SEMI -> ; [187:24] + | |--EXPR -> EXPR [188:15] + | | `--ASSIGN -> = [188:15] + | | |--IDENT -> vfloat [188:8] + | | `--NUM_FLOAT -> 0_1.1_1F [188:17] + | |--SEMI -> ; [188:25] + | |--EXPR -> EXPR [189:15] + | | `--ASSIGN -> = [189:15] + | | |--IDENT -> vfloat [189:8] + | | `--NUM_FLOAT -> 1e0f [189:17] + | |--SEMI -> ; [189:21] + | |--EXPR -> EXPR [190:15] + | | `--ASSIGN -> = [190:15] + | | |--IDENT -> vfloat [190:8] + | | `--NUM_FLOAT -> 1e0F [190:17] + | |--SEMI -> ; [190:21] + | |--EXPR -> EXPR [191:15] + | | `--ASSIGN -> = [191:15] + | | |--IDENT -> vfloat [191:8] + | | `--NUM_FLOAT -> 1.0e0F [191:17] + | |--SEMI -> ; [191:23] + | |--EXPR -> EXPR [192:15] + | | `--ASSIGN -> = [192:15] + | | |--IDENT -> vfloat [192:8] + | | `--NUM_FLOAT -> 0x2__3_34.4___AFP00_00f [192:17] + | |--SEMI -> ; [192:40] + | |--EXPR -> EXPR [193:16] + | | `--ASSIGN -> = [193:16] + | | |--IDENT -> vdouble [193:8] + | | `--NUM_FLOAT -> 10. [193:18] + | |--SEMI -> ; [193:21] + | |--EXPR -> EXPR [194:16] + | | `--ASSIGN -> = [194:16] + | | |--IDENT -> vdouble [194:8] + | | `--NUM_FLOAT -> .1 [194:18] + | |--SEMI -> ; [194:20] + | |--EXPR -> EXPR [195:16] + | | `--ASSIGN -> = [195:16] + | | |--IDENT -> vdouble [195:8] + | | `--NUM_FLOAT -> .1__1_1 [195:18] + | |--SEMI -> ; [195:25] + | |--EXPR -> EXPR [196:16] + | | `--ASSIGN -> = [196:16] + | | |--IDENT -> vdouble [196:8] + | | `--NUM_FLOAT -> 0.0 [196:18] + | |--SEMI -> ; [196:21] + | |--EXPR -> EXPR [197:16] + | | `--ASSIGN -> = [197:16] + | | |--IDENT -> vdouble [197:8] + | | `--NUM_FLOAT -> 1000.0 [197:18] + | |--SEMI -> ; [197:24] + | |--EXPR -> EXPR [198:16] + | | `--ASSIGN -> = [198:16] + | | |--IDENT -> vdouble [198:8] + | | `--NUM_DOUBLE -> .1d [198:18] + | |--SEMI -> ; [198:21] + | |--EXPR -> EXPR [199:16] + | | `--ASSIGN -> = [199:16] + | | |--IDENT -> vdouble [199:8] + | | `--NUM_DOUBLE -> 1.D [199:18] + | |--SEMI -> ; [199:21] + | |--EXPR -> EXPR [200:16] + | | `--ASSIGN -> = [200:16] + | | |--IDENT -> vdouble [200:8] + | | `--NUM_DOUBLE -> 0_1.0d [200:18] + | |--SEMI -> ; [200:24] + | |--EXPR -> EXPR [201:16] + | | `--ASSIGN -> = [201:16] + | | |--IDENT -> vdouble [201:8] + | | `--NUM_DOUBLE -> 0_1.0D [201:18] + | |--SEMI -> ; [201:24] + | |--EXPR -> EXPR [202:16] + | | `--ASSIGN -> = [202:16] + | | |--IDENT -> vdouble [202:8] + | | `--NUM_FLOAT -> 4e23 [202:18] + | |--SEMI -> ; [202:22] + | |--EXPR -> EXPR [203:16] + | | `--ASSIGN -> = [203:16] + | | |--IDENT -> vdouble [203:8] + | | `--NUM_FLOAT -> 4E23 [203:18] + | |--SEMI -> ; [203:22] + | |--EXPR -> EXPR [204:16] + | | `--ASSIGN -> = [204:16] + | | |--IDENT -> vdouble [204:8] + | | `--NUM_FLOAT -> 4E2_3 [204:18] + | |--SEMI -> ; [204:23] + | |--EXPR -> EXPR [205:16] + | | `--ASSIGN -> = [205:16] + | | |--IDENT -> vdouble [205:8] + | | `--NUM_FLOAT -> 0x0.0000000000001p-1022 [205:18] + | |--SEMI -> ; [205:41] + | |--EXPR -> EXPR [206:16] + | | `--ASSIGN -> = [206:16] + | | |--IDENT -> vdouble [206:8] + | | `--NUM_FLOAT -> 0x0.0000000000001P-1022 [206:18] + | |--SEMI -> ; [206:41] + | |--EXPR -> EXPR [207:16] + | | `--ASSIGN -> = [207:16] + | | |--IDENT -> vdouble [207:8] + | | `--NUM_FLOAT -> 0X0.0000000000001p+1022 [207:18] + | |--SEMI -> ; [207:41] + | |--EXPR -> EXPR [208:16] + | | `--ASSIGN -> = [208:16] + | | |--IDENT -> vdouble [208:8] + | | `--NUM_FLOAT -> 0X0.0000000000001P+1022 [208:18] + | |--SEMI -> ; [208:41] + | |--EXPR -> EXPR [209:16] + | | `--ASSIGN -> = [209:16] + | | |--IDENT -> vdouble [209:8] + | | `--NUM_FLOAT -> 0x.0P0 [209:18] + | |--SEMI -> ; [209:24] + | |--EXPR -> EXPR [210:16] + | | `--ASSIGN -> = [210:16] + | | |--IDENT -> vdouble [210:8] + | | `--NUM_FLOAT -> 0X0p+2 [210:18] + | |--SEMI -> ; [210:24] + | |--EXPR -> EXPR [211:16] + | | `--ASSIGN -> = [211:16] + | | |--IDENT -> vdouble [211:8] + | | `--NUM_FLOAT -> 0X0p+20F [211:18] + | |--SEMI -> ; [211:26] + | |--EXPR -> EXPR [212:16] + | | `--ASSIGN -> = [212:16] + | | |--IDENT -> vdouble [212:8] + | | `--NUM_DOUBLE -> 0X0p+2D [212:18] + | |--SEMI -> ; [212:25] + | |--EXPR -> EXPR [213:16] + | | `--ASSIGN -> = [213:16] + | | |--IDENT -> vdouble [213:8] + | | `--NUM_DOUBLE -> 0X0p+2d [213:18] + | |--SEMI -> ; [213:25] + | |--EXPR -> EXPR [214:16] + | | `--ASSIGN -> = [214:16] + | | |--IDENT -> vdouble [214:8] + | | `--NUM_FLOAT -> 0x1.P-1 [214:18] + | |--SEMI -> ; [214:25] + | |--EXPR -> EXPR [215:16] + | | `--ASSIGN -> = [215:16] + | | |--IDENT -> vdouble [215:8] + | | `--NUM_FLOAT -> 0x.1___AFp1 [215:18] + | |--SEMI -> ; [215:29] + | |--EXPR -> EXPR [216:16] + | | `--ASSIGN -> = [216:16] + | | |--IDENT -> vstring [216:8] + | | `--LITERAL_NULL -> null [216:18] + | |--SEMI -> ; [216:22] + | |--EXPR -> EXPR [217:16] + | | `--ASSIGN -> = [217:16] + | | |--IDENT -> vstring [217:8] + | | `--STRING_LITERAL -> "" [217:18] + | |--SEMI -> ; [217:20] + | |--EXPR -> EXPR [218:16] + | | `--ASSIGN -> = [218:16] + | | |--IDENT -> vstring [218:8] + | | `--STRING_LITERAL -> "\\" [218:18] + | |--SEMI -> ; [218:22] + | |--EXPR -> EXPR [221:13] + | | `--ASSIGN -> = [221:13] + | | |--IDENT -> vint [221:8] + | | `--PLUS -> + [221:17] + | | |--NUM_INT -> 1 [221:15] + | | `--NUM_INT -> 1 [221:19] + | |--SEMI -> ; [221:20] + | |--EXPR -> EXPR [222:13] + | | `--ASSIGN -> = [222:13] + | | |--IDENT -> vint [222:8] + | | `--MINUS -> - [222:17] + | | |--NUM_INT -> 1 [222:15] + | | `--NUM_INT -> 1 [222:19] + | |--SEMI -> ; [222:20] + | |--EXPR -> EXPR [223:13] + | | `--ASSIGN -> = [223:13] + | | |--IDENT -> vint [223:8] + | | `--STAR -> * [223:17] + | | |--NUM_INT -> 1 [223:15] + | | `--NUM_INT -> 1 [223:19] + | |--SEMI -> ; [223:20] + | |--EXPR -> EXPR [224:13] + | | `--ASSIGN -> = [224:13] + | | |--IDENT -> vint [224:8] + | | `--DIV -> / [224:17] + | | |--NUM_INT -> 1 [224:15] + | | `--NUM_INT -> 1 [224:19] + | |--SEMI -> ; [224:20] + | |--EXPR -> EXPR [225:13] + | | `--ASSIGN -> = [225:13] + | | |--IDENT -> vint [225:8] + | | `--MOD -> % [225:17] + | | |--NUM_INT -> 1 [225:15] + | | `--NUM_INT -> 1 [225:19] + | |--SEMI -> ; [225:20] + | |--EXPR -> EXPR [226:13] + | | `--ASSIGN -> = [226:13] + | | |--IDENT -> vint [226:8] + | | `--BAND -> & [226:17] + | | |--NUM_INT -> 1 [226:15] + | | `--NUM_INT -> 1 [226:19] + | |--SEMI -> ; [226:20] + | |--EXPR -> EXPR [227:13] + | | `--ASSIGN -> = [227:13] + | | |--IDENT -> vint [227:8] + | | `--BOR -> | [227:17] + | | |--NUM_INT -> 1 [227:15] + | | `--NUM_INT -> 1 [227:19] + | |--SEMI -> ; [227:20] + | |--EXPR -> EXPR [228:13] + | | `--ASSIGN -> = [228:13] + | | |--IDENT -> vint [228:8] + | | `--BXOR -> ^ [228:17] + | | |--NUM_INT -> 1 [228:15] + | | `--NUM_INT -> 1 [228:19] + | |--SEMI -> ; [228:20] + | |--EXPR -> EXPR [229:13] + | | `--ASSIGN -> = [229:13] + | | |--IDENT -> vint [229:8] + | | `--BNOT -> ~ [229:15] + | | `--NUM_INT -> 1 [229:16] + | |--SEMI -> ; [229:17] + | |--EXPR -> EXPR [230:17] + | | `--ASSIGN -> = [230:17] + | | |--IDENT -> vboolean [230:8] + | | `--NOT_EQUAL -> != [230:21] + | | |--NUM_INT -> 1 [230:19] + | | `--NUM_INT -> 0 [230:24] + | |--SEMI -> ; [230:25] + | |--EXPR -> EXPR [231:17] + | | `--ASSIGN -> = [231:17] + | | |--IDENT -> vboolean [231:8] + | | `--EQUAL -> == [231:21] + | | |--NUM_INT -> 1 [231:19] + | | `--NUM_INT -> 0 [231:24] + | |--SEMI -> ; [231:25] + | |--EXPR -> EXPR [232:17] + | | `--ASSIGN -> = [232:17] + | | |--IDENT -> vboolean [232:8] + | | `--GT -> > [232:21] + | | |--NUM_INT -> 1 [232:19] + | | `--NUM_INT -> 0 [232:23] + | |--SEMI -> ; [232:24] + | |--EXPR -> EXPR [233:17] + | | `--ASSIGN -> = [233:17] + | | |--IDENT -> vboolean [233:8] + | | `--GE -> >= [233:21] + | | |--NUM_INT -> 1 [233:19] + | | `--NUM_INT -> 0 [233:24] + | |--SEMI -> ; [233:25] + | |--EXPR -> EXPR [234:17] + | | `--ASSIGN -> = [234:17] + | | |--IDENT -> vboolean [234:8] + | | `--LT -> < [234:21] + | | |--NUM_INT -> 1 [234:19] + | | `--NUM_INT -> 0 [234:23] + | |--SEMI -> ; [234:24] + | |--EXPR -> EXPR [235:17] + | | `--ASSIGN -> = [235:17] + | | |--IDENT -> vboolean [235:8] + | | `--LE -> <= [235:21] + | | |--NUM_INT -> 1 [235:19] + | | `--NUM_INT -> 0 [235:24] + | |--SEMI -> ; [235:25] + | |--EXPR -> EXPR [236:17] + | | `--ASSIGN -> = [236:17] + | | |--IDENT -> vboolean [236:8] + | | `--LAND -> && [236:24] + | | |--LITERAL_TRUE -> true [236:19] + | | `--LITERAL_TRUE -> true [236:27] + | |--SEMI -> ; [236:31] + | |--EXPR -> EXPR [237:17] + | | `--ASSIGN -> = [237:17] + | | |--IDENT -> vboolean [237:8] + | | `--LOR -> || [237:24] + | | |--LITERAL_TRUE -> true [237:19] + | | `--LITERAL_TRUE -> true [237:27] + | |--SEMI -> ; [237:31] + | |--EXPR -> EXPR [238:17] + | | `--ASSIGN -> = [238:17] + | | |--IDENT -> vboolean [238:8] + | | `--QUESTION -> ? [238:24] + | | |--LITERAL_TRUE -> true [238:19] + | | |--LITERAL_TRUE -> true [238:26] + | | |--COLON -> : [238:31] + | | `--LITERAL_FALSE -> false [238:33] + | |--SEMI -> ; [238:38] + | |--EXPR -> EXPR [239:17] + | | `--ASSIGN -> = [239:17] + | | |--IDENT -> vboolean [239:8] + | | `--LNOT -> ! [239:19] + | | `--LITERAL_TRUE -> true [239:20] + | |--SEMI -> ; [239:24] + | |--EXPR -> EXPR [240:17] + | | `--ASSIGN -> = [240:17] + | | |--IDENT -> vboolean [240:8] + | | `--LITERAL_INSTANCEOF -> instanceof [240:22] + | | |--IDENT -> f9 [240:19] + | | `--TYPE -> TYPE [240:33] + | | `--IDENT -> Object [240:33] + | |--SEMI -> ; [240:39] + | |--EXPR -> EXPR [241:13] + | | `--ASSIGN -> = [241:13] + | | |--IDENT -> vint [241:8] + | | `--SL -> << [241:17] + | | |--NUM_INT -> 1 [241:15] + | | `--NUM_INT -> 1 [241:20] + | |--SEMI -> ; [241:21] + | |--EXPR -> EXPR [242:13] + | | `--ASSIGN -> = [242:13] + | | |--IDENT -> vint [242:8] + | | `--SR -> >> [242:17] + | | |--NUM_INT -> 1 [242:15] + | | `--NUM_INT -> 1 [242:20] + | |--SEMI -> ; [242:21] + | |--EXPR -> EXPR [243:13] + | | `--ASSIGN -> = [243:13] + | | |--IDENT -> vint [243:8] + | | `--BSR -> >>> [243:17] + | | |--NUM_INT -> 1 [243:15] + | | `--NUM_INT -> 1 [243:21] + | |--SEMI -> ; [243:22] + | |--EXPR -> EXPR [244:13] + | | `--PLUS_ASSIGN -> += [244:13] + | | |--IDENT -> vint [244:8] + | | `--NUM_INT -> 1 [244:16] + | |--SEMI -> ; [244:17] + | |--EXPR -> EXPR [245:13] + | | `--MINUS_ASSIGN -> -= [245:13] + | | |--IDENT -> vint [245:8] + | | `--NUM_INT -> 1 [245:16] + | |--SEMI -> ; [245:17] + | |--EXPR -> EXPR [246:13] + | | `--STAR_ASSIGN -> *= [246:13] + | | |--IDENT -> vint [246:8] + | | `--NUM_INT -> 1 [246:16] + | |--SEMI -> ; [246:17] + | |--EXPR -> EXPR [247:13] + | | `--DIV_ASSIGN -> /= [247:13] + | | |--IDENT -> vint [247:8] + | | `--NUM_INT -> 1 [247:16] + | |--SEMI -> ; [247:17] + | |--EXPR -> EXPR [248:13] + | | `--MOD_ASSIGN -> %= [248:13] + | | |--IDENT -> vint [248:8] + | | `--NUM_INT -> 1 [248:16] + | |--SEMI -> ; [248:17] + | |--EXPR -> EXPR [249:13] + | | `--BAND_ASSIGN -> &= [249:13] + | | |--IDENT -> vint [249:8] + | | `--NUM_INT -> 1 [249:16] + | |--SEMI -> ; [249:17] + | |--EXPR -> EXPR [250:13] + | | `--BOR_ASSIGN -> |= [250:13] + | | |--IDENT -> vint [250:8] + | | `--NUM_INT -> 1 [250:16] + | |--SEMI -> ; [250:17] + | |--EXPR -> EXPR [251:13] + | | `--BXOR_ASSIGN -> ^= [251:13] + | | |--IDENT -> vint [251:8] + | | `--NUM_INT -> 1 [251:16] + | |--SEMI -> ; [251:17] + | |--EXPR -> EXPR [252:13] + | | `--SL_ASSIGN -> <<= [252:13] + | | |--IDENT -> vint [252:8] + | | `--NUM_INT -> 1 [252:17] + | |--SEMI -> ; [252:18] + | |--EXPR -> EXPR [253:13] + | | `--SR_ASSIGN -> >>= [253:13] + | | |--IDENT -> vint [253:8] + | | `--NUM_INT -> 1 [253:17] + | |--SEMI -> ; [253:18] + | |--EXPR -> EXPR [254:13] + | | `--BSR_ASSIGN -> >>>= [254:13] + | | |--IDENT -> vint [254:8] + | | `--NUM_INT -> 1 [254:18] + | |--SEMI -> ; [254:19] + | |--EXPR -> EXPR [255:12] + | | `--POST_INC -> ++ [255:12] + | | `--IDENT -> vint [255:8] + | |--SEMI -> ; [255:14] + | |--EXPR -> EXPR [256:12] + | | `--POST_DEC -> -- [256:12] + | | `--IDENT -> vint [256:8] + | |--SEMI -> ; [256:14] + | |--EXPR -> EXPR [257:8] + | | `--INC -> ++ [257:8] + | | `--IDENT -> vint [257:10] + | |--SEMI -> ; [257:14] + | |--EXPR -> EXPR [258:8] + | | `--DEC -> -- [258:8] + | | `--IDENT -> vint [258:10] + | |--SEMI -> ; [258:14] + | |--VARIABLE_DEF -> VARIABLE_DEF [259:8] + | | |--MODIFIERS -> MODIFIERS [259:8] + | | |--TYPE -> TYPE [259:8] + | | | |--IDENT -> String [259:8] + | | | `--ARRAY_DECLARATOR -> [ [259:14] + | | | `--RBRACK -> ] [259:15] + | | |--IDENT -> arrayinit [259:17] + | | `--ASSIGN -> = [259:27] + | | `--ARRAY_INIT -> { [259:29] + | | `--RCURLY -> } [259:30] + | |--SEMI -> ; [259:31] + | |--VARIABLE_DEF -> VARIABLE_DEF [260:8] + | | |--MODIFIERS -> MODIFIERS [260:8] + | | |--TYPE -> TYPE [260:8] + | | | |--IDENT -> String [260:8] + | | | `--ARRAY_DECLARATOR -> [ [260:14] + | | | `--RBRACK -> ] [260:15] + | | |--IDENT -> arrayinit2 [260:17] + | | `--ASSIGN -> = [260:28] + | | `--ARRAY_INIT -> { [260:30] + | | |--EXPR -> EXPR [260:31] + | | | `--STRING_LITERAL -> "" [260:31] + | | `--RCURLY -> } [260:33] + | |--SEMI -> ; [260:34] + | |--VARIABLE_DEF -> VARIABLE_DEF [261:8] + | | |--MODIFIERS -> MODIFIERS [261:8] + | | |--TYPE -> TYPE [261:8] + | | | |--IDENT -> String [261:8] + | | | `--ARRAY_DECLARATOR -> [ [261:14] + | | | `--RBRACK -> ] [261:15] + | | |--IDENT -> arrayinit3 [261:17] + | | `--ASSIGN -> = [261:28] + | | `--ARRAY_INIT -> { [261:30] + | | |--EXPR -> EXPR [261:31] + | | | `--STRING_LITERAL -> "" [261:31] + | | |--COMMA -> , [261:33] + | | |--EXPR -> EXPR [261:35] + | | | `--STRING_LITERAL -> "" [261:35] + | | |--COMMA -> , [261:37] + | | `--RCURLY -> } [261:38] + | |--SEMI -> ; [261:39] + | |--EXPR -> EXPR [264:15] + | | `--ASSIGN -> = [264:15] + | | |--IDENT -> varray [264:8] + | | `--LITERAL_NEW -> new [264:17] + | | |--LITERAL_INT -> int [264:21] + | | |--ARRAY_DECLARATOR -> [ [264:24] + | | | `--RBRACK -> ] [264:25] + | | `--ARRAY_INIT -> { [264:26] + | | `--RCURLY -> } [264:27] + | |--SEMI -> ; [264:28] + | |--EXPR -> EXPR [265:15] + | | `--ASSIGN -> = [265:15] + | | |--IDENT -> varray [265:8] + | | `--LITERAL_NEW -> new [265:17] + | | |--LITERAL_INT -> int [265:21] + | | |--ARRAY_DECLARATOR -> [ [265:24] + | | | `--RBRACK -> ] [265:25] + | | `--ARRAY_INIT -> { [265:26] + | | |--EXPR -> EXPR [265:27] + | | | `--NUM_INT -> 0 [265:27] + | | `--RCURLY -> } [265:28] + | |--SEMI -> ; [265:29] + | |--EXPR -> EXPR [266:15] + | | `--ASSIGN -> = [266:15] + | | |--IDENT -> varray [266:8] + | | `--LITERAL_NEW -> new [266:17] + | | |--LITERAL_INT -> int [266:21] + | | |--ARRAY_DECLARATOR -> [ [266:24] + | | | `--RBRACK -> ] [266:25] + | | `--ARRAY_INIT -> { [266:26] + | | |--EXPR -> EXPR [266:27] + | | | `--NUM_INT -> 0 [266:27] + | | |--COMMA -> , [266:28] + | | |--EXPR -> EXPR [266:30] + | | | `--NUM_INT -> 1 [266:30] + | | `--RCURLY -> } [266:31] + | |--SEMI -> ; [266:32] + | |--EXPR -> EXPR [267:15] + | | `--ASSIGN -> = [267:15] + | | |--IDENT -> varray [267:8] + | | `--LITERAL_NEW -> new [267:17] + | | |--LITERAL_INT -> int [267:21] + | | `--ARRAY_DECLARATOR -> [ [267:24] + | | |--EXPR -> EXPR [267:25] + | | | `--NUM_INT -> 5 [267:25] + | | `--RBRACK -> ] [267:26] + | |--SEMI -> ; [267:27] + | |--EXPR -> EXPR [268:14] + | | `--ASSIGN -> = [268:14] + | | |--IDENT -> vlist [268:8] + | | `--LITERAL_NEW -> new [268:16] + | | |--IDENT -> ArrayList [268:20] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [268:29] + | | | |--GENERIC_START -> < [268:29] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [268:30] + | | | | `--IDENT -> String [268:30] + | | | `--GENERIC_END -> > [268:36] + | | |--LPAREN -> ( [268:37] + | | |--ELIST -> ELIST [268:38] + | | `--RPAREN -> ) [268:38] + | |--SEMI -> ; [268:39] + | |--EXPR -> EXPR [269:13] + | | `--ASSIGN -> = [269:13] + | | |--IDENT -> vmap [269:8] + | | `--LITERAL_NEW -> new [269:15] + | | |--IDENT -> HashMap [269:19] + | | |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [269:26] + | | | |--GENERIC_START -> < [269:26] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [269:27] + | | | | `--IDENT -> String [269:27] + | | | |--COMMA -> , [269:33] + | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [269:35] + | | | | |--IDENT -> String [269:35] + | | | | `--ARRAY_DECLARATOR -> [ [269:41] + | | | | `--RBRACK -> ] [269:42] + | | | `--GENERIC_END -> > [269:43] + | | |--LPAREN -> ( [269:44] + | | |--ELIST -> ELIST [269:45] + | | `--RPAREN -> ) [269:45] + | |--SEMI -> ; [269:46] + | |--VARIABLE_DEF -> VARIABLE_DEF [270:8] + | | |--MODIFIERS -> MODIFIERS [270:8] + | | |--TYPE -> TYPE [270:8] + | | | `--IDENT -> Object [270:8] + | | |--IDENT -> anonymous [270:15] + | | `--ASSIGN -> = [270:25] + | | `--EXPR -> EXPR [270:27] + | | `--LITERAL_NEW -> new [270:27] + | | |--IDENT -> InputRegressionJavaClass1 [270:31] + | | |--LPAREN -> ( [270:56] + | | |--ELIST -> ELIST [270:57] + | | |--RPAREN -> ) [270:57] + | | `--OBJBLOCK -> OBJBLOCK [270:59] + | | |--LCURLY -> { [270:59] + | | `--RCURLY -> } [270:60] + | |--SEMI -> ; [270:61] + | |--EMPTY_STAT -> ; [273:8] + | |--EXPR -> EXPR [274:16] + | | `--ASSIGN -> = [274:16] + | | |--DOT -> . [274:12] + | | | |--LITERAL_THIS -> this [274:8] + | | | `--IDENT -> f1 [274:13] + | | `--NUM_INT -> 0 [274:18] + | |--SEMI -> ; [274:19] + | |--LABELED_STAT -> : [277:19] + | | |--IDENT -> test_label1 [277:8] + | | `--SLIST -> { [280:8] + | | `--RCURLY -> } [280:9] + | |--LITERAL_IF -> if [281:8] + | | |--LPAREN -> ( [281:11] + | | |--EXPR -> EXPR [281:12] + | | | `--LITERAL_TRUE -> true [281:12] + | | |--RPAREN -> ) [281:16] + | | `--EMPTY_STAT -> ; [281:18] + | |--LITERAL_IF -> if [282:8] + | | |--LPAREN -> ( [282:11] + | | |--EXPR -> EXPR [282:12] + | | | `--LITERAL_TRUE -> true [282:12] + | | |--RPAREN -> ) [282:16] + | | `--SLIST -> { [282:18] + | | `--RCURLY -> } [282:19] + | |--LITERAL_IF -> if [283:8] + | | |--LPAREN -> ( [283:11] + | | |--EXPR -> EXPR [283:12] + | | | `--LITERAL_TRUE -> true [283:12] + | | |--RPAREN -> ) [283:16] + | | |--SLIST -> { [283:18] + | | | `--RCURLY -> } [283:19] + | | `--LITERAL_ELSE -> else [283:21] + | | `--EMPTY_STAT -> ; [283:26] + | |--LITERAL_IF -> if [284:8] + | | |--LPAREN -> ( [284:11] + | | |--EXPR -> EXPR [284:12] + | | | `--LITERAL_TRUE -> true [284:12] + | | |--RPAREN -> ) [284:16] + | | |--SLIST -> { [284:18] + | | | `--RCURLY -> } [284:19] + | | `--LITERAL_ELSE -> else [284:21] + | | `--SLIST -> { [284:26] + | | `--RCURLY -> } [284:27] + | |--LITERAL_IF -> if [285:8] + | | |--LPAREN -> ( [285:11] + | | |--EXPR -> EXPR [285:12] + | | | `--IDENT -> b [285:12] + | | |--RPAREN -> ) [285:13] + | | `--SLIST -> { [285:15] + | | |--LITERAL_FOR -> for [285:17] + | | | |--LPAREN -> ( [285:21] + | | | |--FOR_INIT -> FOR_INIT [285:22] + | | | |--SEMI -> ; [285:22] + | | | |--FOR_CONDITION -> FOR_CONDITION [285:23] + | | | |--SEMI -> ; [285:23] + | | | |--FOR_ITERATOR -> FOR_ITERATOR [285:24] + | | | |--RPAREN -> ) [285:24] + | | | `--EMPTY_STAT -> ; [285:26] + | | `--RCURLY -> } [285:28] + | |--LITERAL_IF -> if [286:8] + | | |--LPAREN -> ( [286:11] + | | |--EXPR -> EXPR [286:12] + | | | `--IDENT -> b [286:12] + | | |--RPAREN -> ) [286:13] + | | `--SLIST -> { [286:15] + | | |--LITERAL_FOR -> for [286:17] + | | | |--LPAREN -> ( [286:21] + | | | |--FOR_INIT -> FOR_INIT [286:22] + | | | |--SEMI -> ; [286:22] + | | | |--FOR_CONDITION -> FOR_CONDITION [286:23] + | | | |--SEMI -> ; [286:23] + | | | |--FOR_ITERATOR -> FOR_ITERATOR [286:24] + | | | |--RPAREN -> ) [286:24] + | | | `--SLIST -> { [286:26] + | | | `--RCURLY -> } [286:27] + | | `--RCURLY -> } [286:29] + | |--LITERAL_FOR -> for [287:8] + | | |--LPAREN -> ( [287:12] + | | |--FOR_INIT -> FOR_INIT [287:13] + | | | `--VARIABLE_DEF -> VARIABLE_DEF [287:13] + | | | |--MODIFIERS -> MODIFIERS [287:13] + | | | |--TYPE -> TYPE [287:13] + | | | | `--LITERAL_INT -> int [287:13] + | | | |--IDENT -> i [287:17] + | | | `--ASSIGN -> = [287:19] + | | | `--EXPR -> EXPR [287:21] + | | | `--NUM_INT -> 0 [287:21] + | | |--SEMI -> ; [287:22] + | | |--FOR_CONDITION -> FOR_CONDITION [287:26] + | | | `--EXPR -> EXPR [287:26] + | | | `--LT -> < [287:26] + | | | |--IDENT -> i [287:24] + | | | `--NUM_INT -> 1 [287:28] + | | |--SEMI -> ; [287:29] + | | |--FOR_ITERATOR -> FOR_ITERATOR [287:32] + | | | `--ELIST -> ELIST [287:32] + | | | `--EXPR -> EXPR [287:32] + | | | `--POST_INC -> ++ [287:32] + | | | `--IDENT -> i [287:31] + | | |--RPAREN -> ) [287:34] + | | `--SLIST -> { [287:36] + | | `--RCURLY -> } [287:37] + | |--LITERAL_FOR -> for [288:8] + | | |--LPAREN -> ( [288:12] + | | |--FOR_INIT -> FOR_INIT [288:13] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [288:13] + | | | | |--MODIFIERS -> MODIFIERS [288:13] + | | | | |--TYPE -> TYPE [288:13] + | | | | | `--LITERAL_INT -> int [288:13] + | | | | |--IDENT -> i [288:17] + | | | | `--ASSIGN -> = [288:19] + | | | | `--EXPR -> EXPR [288:21] + | | | | `--NUM_INT -> 0 [288:21] + | | | |--COMMA -> , [288:22] + | | | `--VARIABLE_DEF -> VARIABLE_DEF [288:13] + | | | |--MODIFIERS -> MODIFIERS [288:13] + | | | |--TYPE -> TYPE [288:13] + | | | | `--LITERAL_INT -> int [288:13] + | | | |--IDENT -> j [288:24] + | | | `--ASSIGN -> = [288:26] + | | | `--EXPR -> EXPR [288:28] + | | | `--NUM_INT -> 0 [288:28] + | | |--SEMI -> ; [288:29] + | | |--FOR_CONDITION -> FOR_CONDITION [288:33] + | | | `--EXPR -> EXPR [288:33] + | | | `--LT -> < [288:33] + | | | |--IDENT -> i [288:31] + | | | `--NUM_INT -> 1 [288:35] + | | |--SEMI -> ; [288:36] + | | |--FOR_ITERATOR -> FOR_ITERATOR [288:39] + | | | `--ELIST -> ELIST [288:39] + | | | |--EXPR -> EXPR [288:39] + | | | | `--POST_INC -> ++ [288:39] + | | | | `--IDENT -> i [288:38] + | | | |--COMMA -> , [288:41] + | | | `--EXPR -> EXPR [288:45] + | | | `--PLUS_ASSIGN -> += [288:45] + | | | |--IDENT -> j [288:43] + | | | `--NUM_INT -> 2 [288:48] + | | |--RPAREN -> ) [288:49] + | | `--SLIST -> { [288:51] + | | `--RCURLY -> } [288:52] + | |--LITERAL_FOR -> for [289:8] + | | |--LPAREN -> ( [289:12] + | | |--FOR_EACH_CLAUSE -> FOR_EACH_CLAUSE [289:13] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [289:13] + | | | | |--MODIFIERS -> MODIFIERS [289:13] + | | | | |--TYPE -> TYPE [289:13] + | | | | | `--LITERAL_INT -> int [289:13] + | | | | `--IDENT -> value [289:17] + | | | |--COLON -> : [289:22] + | | | `--EXPR -> EXPR [289:24] + | | | `--LITERAL_NEW -> new [289:24] + | | | |--LITERAL_INT -> int [289:28] + | | | |--ARRAY_DECLARATOR -> [ [289:31] + | | | | `--RBRACK -> ] [289:32] + | | | `--ARRAY_INIT -> { [289:33] + | | | `--RCURLY -> } [289:34] + | | |--RPAREN -> ) [289:35] + | | `--EMPTY_STAT -> ; [289:37] + | |--LITERAL_FOR -> for [290:8] + | | |--LPAREN -> ( [290:12] + | | |--FOR_EACH_CLAUSE -> FOR_EACH_CLAUSE [290:13] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [290:13] + | | | | |--MODIFIERS -> MODIFIERS [290:13] + | | | | |--TYPE -> TYPE [290:13] + | | | | | `--IDENT -> String [290:13] + | | | | `--IDENT -> s [290:20] + | | | |--COLON -> : [290:22] + | | | `--EXPR -> EXPR [290:24] + | | | `--LITERAL_NEW -> new [290:24] + | | | |--IDENT -> String [290:28] + | | | |--ARRAY_DECLARATOR -> [ [290:34] + | | | | `--RBRACK -> ] [290:35] + | | | `--ARRAY_INIT -> { [290:36] + | | | `--RCURLY -> } [290:37] + | | |--RPAREN -> ) [290:38] + | | `--EMPTY_STAT -> ; [290:40] + | |--LITERAL_FOR -> for [291:8] + | | |--LPAREN -> ( [291:12] + | | |--FOR_EACH_CLAUSE -> FOR_EACH_CLAUSE [291:13] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [291:13] + | | | | |--MODIFIERS -> MODIFIERS [291:13] + | | | | | `--FINAL -> final [291:13] + | | | | |--TYPE -> TYPE [291:19] + | | | | | `--IDENT -> String [291:19] + | | | | `--IDENT -> s [291:26] + | | | |--COLON -> : [291:28] + | | | `--EXPR -> EXPR [291:30] + | | | `--LITERAL_NEW -> new [291:30] + | | | |--IDENT -> String [291:34] + | | | |--ARRAY_DECLARATOR -> [ [291:40] + | | | | `--RBRACK -> ] [291:41] + | | | `--ARRAY_INIT -> { [291:42] + | | | `--RCURLY -> } [291:43] + | | |--RPAREN -> ) [291:44] + | | `--EMPTY_STAT -> ; [291:46] + | |--LITERAL_IF -> if [292:8] + | | |--LPAREN -> ( [292:11] + | | |--EXPR -> EXPR [292:12] + | | | `--IDENT -> b [292:12] + | | |--RPAREN -> ) [292:13] + | | `--SLIST -> { [292:15] + | | |--LITERAL_WHILE -> while [292:17] + | | | |--LPAREN -> ( [292:23] + | | | |--EXPR -> EXPR [292:24] + | | | | `--LITERAL_TRUE -> true [292:24] + | | | |--RPAREN -> ) [292:28] + | | | `--EMPTY_STAT -> ; [292:30] + | | `--RCURLY -> } [292:32] + | |--LITERAL_IF -> if [293:8] + | | |--LPAREN -> ( [293:11] + | | |--EXPR -> EXPR [293:12] + | | | `--IDENT -> b [293:12] + | | |--RPAREN -> ) [293:13] + | | `--SLIST -> { [293:15] + | | |--LITERAL_WHILE -> while [293:17] + | | | |--LPAREN -> ( [293:23] + | | | |--EXPR -> EXPR [293:24] + | | | | `--LITERAL_TRUE -> true [293:24] + | | | |--RPAREN -> ) [293:28] + | | | `--SLIST -> { [293:30] + | | | `--RCURLY -> } [293:31] + | | `--RCURLY -> } [293:33] + | |--LITERAL_DO -> do [294:8] + | | |--SLIST -> { [294:11] + | | | `--RCURLY -> } [294:12] + | | |--DO_WHILE -> while [294:14] + | | |--LPAREN -> ( [294:20] + | | |--EXPR -> EXPR [294:21] + | | | `--LITERAL_FALSE -> false [294:21] + | | |--RPAREN -> ) [294:26] + | | `--SEMI -> ; [294:27] + | |--LITERAL_SYNCHRONIZED -> synchronized [295:8] + | | |--LPAREN -> ( [295:21] + | | |--EXPR -> EXPR [295:22] + | | | `--IDENT -> f9 [295:22] + | | |--RPAREN -> ) [295:24] + | | `--SLIST -> { [295:26] + | | `--RCURLY -> } [295:27] + | |--LITERAL_SWITCH -> switch [297:8] + | | |--LPAREN -> ( [297:15] + | | |--EXPR -> EXPR [297:16] + | | | `--NUM_INT -> 0 [297:16] + | | |--RPAREN -> ) [297:17] + | | |--LCURLY -> { [297:19] + | | |--CASE_GROUP -> CASE_GROUP [298:12] + | | | |--LITERAL_CASE -> case [298:12] + | | | | |--EXPR -> EXPR [298:17] + | | | | | `--NUM_INT -> 1 [298:17] + | | | | `--COLON -> : [298:18] + | | | |--LITERAL_CASE -> case [299:12] + | | | | |--EXPR -> EXPR [299:17] + | | | | | `--NUM_INT -> 0 [299:17] + | | | | `--COLON -> : [299:18] + | | | `--SLIST -> SLIST [299:20] + | | | `--LITERAL_BREAK -> break [299:20] + | | | `--SEMI -> ; [299:25] + | | |--CASE_GROUP -> CASE_GROUP [300:12] + | | | |--LITERAL_DEFAULT -> default [300:12] + | | | | `--COLON -> : [300:19] + | | | `--SLIST -> SLIST [300:21] + | | | `--LITERAL_BREAK -> break [300:21] + | | | `--SEMI -> ; [300:26] + | | `--RCURLY -> } [301:8] + | |--LITERAL_TRY -> try [303:8] + | | |--SLIST -> { [303:12] + | | | |--LITERAL_IF -> if [304:12] + | | | | |--LPAREN -> ( [304:15] + | | | | |--EXPR -> EXPR [304:16] + | | | | | `--IDENT -> b [304:16] + | | | | |--RPAREN -> ) [304:17] + | | | | `--SLIST -> { [304:19] + | | | | |--LITERAL_THROW -> throw [304:21] + | | | | | |--EXPR -> EXPR [304:27] + | | | | | | `--LITERAL_NEW -> new [304:27] + | | | | | | |--IDENT -> IOException [304:31] + | | | | | | |--LPAREN -> ( [304:42] + | | | | | | |--ELIST -> ELIST [304:43] + | | | | | | `--RPAREN -> ) [304:43] + | | | | | `--SEMI -> ; [304:44] + | | | | `--RCURLY -> } [304:46] + | | | |--LITERAL_IF -> if [305:12] + | | | | |--LPAREN -> ( [305:15] + | | | | |--EXPR -> EXPR [305:16] + | | | | | `--IDENT -> b [305:16] + | | | | |--RPAREN -> ) [305:17] + | | | | `--SLIST -> { [305:19] + | | | | |--LITERAL_THROW -> throw [305:21] + | | | | | |--EXPR -> EXPR [305:27] + | | | | | | `--LITERAL_NEW -> new [305:27] + | | | | | | |--IDENT -> ArrayIndexOutOfBoundsException [305:31] + | | | | | | |--LPAREN -> ( [305:61] + | | | | | | |--ELIST -> ELIST [305:62] + | | | | | | `--RPAREN -> ) [305:62] + | | | | | `--SEMI -> ; [305:63] + | | | | `--RCURLY -> } [305:65] + | | | |--LITERAL_THROW -> throw [306:12] + | | | | |--EXPR -> EXPR [306:18] + | | | | | `--LITERAL_NEW -> new [306:18] + | | | | | |--IDENT -> Exception [306:22] + | | | | | |--LPAREN -> ( [306:31] + | | | | | |--ELIST -> ELIST [306:32] + | | | | | `--RPAREN -> ) [306:32] + | | | | `--SEMI -> ; [306:33] + | | | `--RCURLY -> } [307:8] + | | |--LITERAL_CATCH -> catch [307:10] + | | | |--LPAREN -> ( [307:16] + | | | |--PARAMETER_DEF -> PARAMETER_DEF [307:17] + | | | | |--MODIFIERS -> MODIFIERS [307:17] + | | | | |--TYPE -> TYPE [307:17] + | | | | | |--IDENT -> IOException [307:17] + | | | | | |--BOR -> | [307:29] + | | | | | `--IDENT -> ArrayIndexOutOfBoundsException [307:31] + | | | | `--IDENT -> e [307:62] + | | | |--RPAREN -> ) [307:63] + | | | `--SLIST -> { [307:65] + | | | `--RCURLY -> } [308:8] + | | |--LITERAL_CATCH -> catch [308:10] + | | | |--LPAREN -> ( [308:16] + | | | |--PARAMETER_DEF -> PARAMETER_DEF [308:17] + | | | | |--MODIFIERS -> MODIFIERS [308:17] + | | | | |--TYPE -> TYPE [308:17] + | | | | | `--IDENT -> Exception [308:17] + | | | | `--IDENT -> e [308:27] + | | | |--RPAREN -> ) [308:28] + | | | `--SLIST -> { [308:30] + | | | `--RCURLY -> } [309:8] + | | `--LITERAL_FINALLY -> finally [309:10] + | | `--SLIST -> { [309:18] + | | `--RCURLY -> } [309:19] + | |--LITERAL_TRY -> try [310:8] + | | |--RESOURCE_SPECIFICATION -> RESOURCE_SPECIFICATION [310:12] + | | | |--LPAREN -> ( [310:12] + | | | |--RESOURCES -> RESOURCES [310:13] + | | | | `--RESOURCE -> RESOURCE [310:13] + | | | | |--MODIFIERS -> MODIFIERS [310:13] + | | | | |--TYPE -> TYPE [310:13] + | | | | | `--IDENT -> BufferedReader [310:13] + | | | | |--IDENT -> br [310:28] + | | | | `--ASSIGN -> = [310:31] + | | | | `--EXPR -> EXPR [310:33] + | | | | `--LITERAL_NEW -> new [310:33] + | | | | |--IDENT -> BufferedReader [310:37] + | | | | |--LPAREN -> ( [310:51] + | | | | |--ELIST -> ELIST [310:52] + | | | | | `--EXPR -> EXPR [310:52] + | | | | | `--LITERAL_NEW -> new [310:52] + | | | | | |--IDENT -> InputStreamReader [310:56] + | | | | | |--LPAREN -> ( [310:73] + | | | | | |--ELIST -> ELIST [310:74] + | | | | | | |--EXPR -> EXPR [310:74] + | | | | | | | `--LITERAL_NULL -> null [310:74] + | | | | | | |--COMMA -> , [310:78] + | | | | | | `--EXPR -> EXPR [310:80] + | | | | | | `--STRING_LITERAL -> "utf-8" [310:80] + | | | | | `--RPAREN -> ) [310:87] + | | | | `--RPAREN -> ) [310:88] + | | | `--RPAREN -> ) [310:89] + | | `--SLIST -> { [310:91] + | | `--RCURLY -> } [310:92] + | |--LITERAL_TRY -> try [311:8] + | | |--RESOURCE_SPECIFICATION -> RESOURCE_SPECIFICATION [311:12] + | | | |--LPAREN -> ( [311:12] + | | | |--RESOURCES -> RESOURCES [311:13] + | | | | |--RESOURCE -> RESOURCE [311:13] + | | | | | |--MODIFIERS -> MODIFIERS [311:13] + | | | | | |--TYPE -> TYPE [311:13] + | | | | | | `--IDENT -> BufferedReader [311:13] + | | | | | |--IDENT -> br1 [311:28] + | | | | | `--ASSIGN -> = [311:32] + | | | | | `--EXPR -> EXPR [311:34] + | | | | | `--LITERAL_NEW -> new [311:34] + | | | | | |--IDENT -> BufferedReader [311:38] + | | | | | |--LPAREN -> ( [311:52] + | | | | | |--ELIST -> ELIST [311:53] + | | | | | | `--EXPR -> EXPR [311:53] + | | | | | | `--LITERAL_NEW -> new [311:53] + | | | | | | |--IDENT -> InputStreamReader [311:57] + | | | | | | |--LPAREN -> ( [311:74] + | | | | | | |--ELIST -> ELIST [311:75] + | | | | | | | |--EXPR -> EXPR [311:75] + | | | | | | | | `--LITERAL_NULL -> null [311:75] + | | | | | | | |--COMMA -> , [311:79] + | | | | | | | `--EXPR -> EXPR [311:81] + | | | | | | | `--STRING_LITERAL -> "utf-8" [311:81] + | | | | | | `--RPAREN -> ) [311:88] + | | | | | `--RPAREN -> ) [311:89] + | | | | |--SEMI -> ; [311:90] + | | | | `--RESOURCE -> RESOURCE [312:16] + | | | | |--MODIFIERS -> MODIFIERS [312:16] + | | | | |--TYPE -> TYPE [312:16] + | | | | | `--IDENT -> BufferedReader [312:16] + | | | | |--IDENT -> br2 [312:31] + | | | | `--ASSIGN -> = [312:35] + | | | | `--EXPR -> EXPR [312:37] + | | | | `--LITERAL_NEW -> new [312:37] + | | | | |--IDENT -> BufferedReader [312:41] + | | | | |--LPAREN -> ( [312:55] + | | | | |--ELIST -> ELIST [312:56] + | | | | | `--EXPR -> EXPR [312:56] + | | | | | `--LITERAL_NEW -> new [312:56] + | | | | | |--IDENT -> InputStreamReader [312:60] + | | | | | |--LPAREN -> ( [312:77] + | | | | | |--ELIST -> ELIST [312:78] + | | | | | | |--EXPR -> EXPR [312:78] + | | | | | | | `--LITERAL_NULL -> null [312:78] + | | | | | | |--COMMA -> , [312:82] + | | | | | | `--EXPR -> EXPR [312:84] + | | | | | | `--STRING_LITERAL -> "utf-8" [312:84] + | | | | | `--RPAREN -> ) [312:91] + | | | | `--RPAREN -> ) [312:92] + | | | |--SEMI -> ; [312:93] + | | | `--RPAREN -> ) [312:94] + | | `--SLIST -> { [312:96] + | | `--RCURLY -> } [312:97] + | |--EXPR -> EXPR [315:14] + | | `--ASSIGN -> = [315:14] + | | |--IDENT -> test4 [315:8] + | | `--DOT -> . [315:41] + | | |--IDENT -> InputRegressionJavaClass1 [315:16] + | | `--LITERAL_CLASS -> class [315:42] + | |--SEMI -> ; [315:47] + | |--EXPR -> EXPR [316:14] + | | `--ASSIGN -> = [316:14] + | | |--IDENT -> test4 [316:8] + | | `--DOT -> . [316:22] + | | |--IDENT -> List [316:16] + | | |--ARRAY_DECLARATOR -> [ [316:20] + | | | `--RBRACK -> ] [316:21] + | | `--LITERAL_CLASS -> class [316:23] + | |--SEMI -> ; [316:28] + | |--EXPR -> EXPR [317:14] + | | `--ASSIGN -> = [317:14] + | | |--IDENT -> test4 [317:8] + | | `--DOT -> . [317:25] + | | |--LITERAL_BOOLEAN -> boolean [317:16] + | | |--ARRAY_DECLARATOR -> [ [317:23] + | | | `--RBRACK -> ] [317:24] + | | `--LITERAL_CLASS -> class [317:26] + | |--SEMI -> ; [317:31] + | |--EXPR -> EXPR [318:18] + | | `--ASSIGN -> = [318:18] + | | |--INDEX_OP -> [ [318:14] + | | | |--IDENT -> varray [318:8] + | | | |--EXPR -> EXPR [318:15] + | | | | `--NUM_INT -> 0 [318:15] + | | | `--RBRACK -> ] [318:16] + | | `--NUM_INT -> 0 [318:20] + | |--SEMI -> ; [318:21] + | |--LITERAL_FOR -> for [319:8] + | | |--LPAREN -> ( [319:12] + | | |--FOR_EACH_CLAUSE -> FOR_EACH_CLAUSE [319:13] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [319:13] + | | | | |--MODIFIERS -> MODIFIERS [319:13] + | | | | |--TYPE -> TYPE [319:13] + | | | | | |--IDENT -> String [319:13] + | | | | | `--ARRAY_DECLARATOR -> [ [319:19] + | | | | | `--RBRACK -> ] [319:20] + | | | | `--IDENT -> s [319:22] + | | | |--COLON -> : [319:24] + | | | `--EXPR -> EXPR [319:26] + | | | `--LITERAL_NEW -> new [319:26] + | | | |--IDENT -> String [319:30] + | | | |--ARRAY_DECLARATOR -> [ [319:36] + | | | | `--RBRACK -> ] [319:37] + | | | |--ARRAY_DECLARATOR -> [ [319:38] + | | | | `--RBRACK -> ] [319:39] + | | | `--ARRAY_INIT -> { [319:40] + | | | |--ARRAY_INIT -> { [319:41] + | | | | `--RCURLY -> } [319:42] + | | | `--RCURLY -> } [319:43] + | | |--RPAREN -> ) [319:44] + | | `--EMPTY_STAT -> ; [319:46] + | |--LITERAL_FOR -> for [320:8] + | | |--LPAREN -> ( [320:12] + | | |--FOR_EACH_CLAUSE -> FOR_EACH_CLAUSE [320:16] + | | | |--VARIABLE_DEF -> VARIABLE_DEF [320:16] + | | | | |--MODIFIERS -> MODIFIERS [320:16] + | | | | |--TYPE -> TYPE [320:16] + | | | | | `--DOT -> . [320:16] + | | | | | |--IDENT -> Map [320:13] + | | | | | |--IDENT -> Entry [320:17] + | | | | | `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [320:22] + | | | | | |--GENERIC_START -> < [320:22] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [320:23] + | | | | | | `--IDENT -> String [320:23] + | | | | | |--COMMA -> , [320:29] + | | | | | |--TYPE_ARGUMENT -> TYPE_ARGUMENT [320:31] + | | | | | | |--IDENT -> String [320:31] + | | | | | | `--ARRAY_DECLARATOR -> [ [320:37] + | | | | | | `--RBRACK -> ] [320:38] + | | | | | `--GENERIC_END -> > [320:39] + | | | | `--IDENT -> e [320:41] + | | | |--COLON -> : [320:43] + | | | `--EXPR -> EXPR [320:58] + | | | `--METHOD_CALL -> ( [320:58] + | | | |--DOT -> . [320:49] + | | | | |--IDENT -> vmap [320:45] + | | | | `--IDENT -> entrySet [320:50] + | | | |--ELIST -> ELIST [320:59] + | | | `--RPAREN -> ) [320:59] + | | |--RPAREN -> ) [320:60] + | | `--SLIST -> { [320:62] + | | `--RCURLY -> } [320:64] + | |--LITERAL_FOR -> for [323:8] + | | |--LPAREN -> ( [323:12] + | | |--FOR_INIT -> FOR_INIT [323:13] + | | |--SEMI -> ; [323:13] + | | |--FOR_CONDITION -> FOR_CONDITION [323:14] + | | |--SEMI -> ; [323:14] + | | |--FOR_ITERATOR -> FOR_ITERATOR [323:15] + | | |--RPAREN -> ) [323:15] + | | `--SLIST -> { [323:17] + | | |--LITERAL_BREAK -> break [323:18] + | | | `--SEMI -> ; [323:23] + | | `--RCURLY -> } [323:24] + | |--LABELED_STAT -> : [324:19] + | | |--IDENT -> test_label2 [324:8] + | | `--LITERAL_FOR -> for [325:8] + | | |--LPAREN -> ( [325:12] + | | |--FOR_INIT -> FOR_INIT [325:13] + | | |--SEMI -> ; [325:13] + | | |--FOR_CONDITION -> FOR_CONDITION [325:14] + | | |--SEMI -> ; [325:14] + | | |--FOR_ITERATOR -> FOR_ITERATOR [325:15] + | | |--RPAREN -> ) [325:15] + | | `--SLIST -> { [325:17] + | | |--LITERAL_BREAK -> break [325:18] + | | | |--IDENT -> test_label2 [325:24] + | | | `--SEMI -> ; [325:35] + | | `--RCURLY -> } [325:36] + | |--LITERAL_IF -> if [326:8] + | | |--LPAREN -> ( [326:11] + | | |--EXPR -> EXPR [326:12] + | | | `--IDENT -> b [326:12] + | | |--RPAREN -> ) [326:13] + | | `--SLIST -> { [326:15] + | | |--LITERAL_FOR -> for [326:17] + | | | |--LPAREN -> ( [326:21] + | | | |--FOR_INIT -> FOR_INIT [326:22] + | | | |--SEMI -> ; [326:22] + | | | |--FOR_CONDITION -> FOR_CONDITION [326:23] + | | | |--SEMI -> ; [326:23] + | | | |--FOR_ITERATOR -> FOR_ITERATOR [326:24] + | | | |--RPAREN -> ) [326:24] + | | | `--SLIST -> { [326:26] + | | | |--LITERAL_CONTINUE -> continue [326:27] + | | | | `--SEMI -> ; [326:35] + | | | `--RCURLY -> } [326:36] + | | `--RCURLY -> } [326:38] + | |--LITERAL_IF -> if [327:8] + | | |--LPAREN -> ( [327:11] + | | |--EXPR -> EXPR [327:12] + | | | `--IDENT -> b [327:12] + | | |--RPAREN -> ) [327:13] + | | `--SLIST -> { [327:15] + | | |--LABELED_STAT -> : [327:28] + | | | |--IDENT -> test_label3 [327:17] + | | | `--LITERAL_FOR -> for [327:30] + | | | |--LPAREN -> ( [327:34] + | | | |--FOR_INIT -> FOR_INIT [327:35] + | | | |--SEMI -> ; [327:35] + | | | |--FOR_CONDITION -> FOR_CONDITION [327:36] + | | | |--SEMI -> ; [327:36] + | | | |--FOR_ITERATOR -> FOR_ITERATOR [327:37] + | | | |--RPAREN -> ) [327:37] + | | | `--SLIST -> { [327:39] + | | | |--LITERAL_CONTINUE -> continue [327:40] + | | | | |--IDENT -> test_label3 [327:49] + | | | | `--SEMI -> ; [327:60] + | | | `--RCURLY -> } [327:61] + | | `--RCURLY -> } [327:63] + | |--LITERAL_IF -> if [328:8] + | | |--LPAREN -> ( [328:11] + | | |--EXPR -> EXPR [328:12] + | | | `--LITERAL_FALSE -> false [328:12] + | | |--RPAREN -> ) [328:17] + | | `--LITERAL_RETURN -> return [328:19] + | | `--SEMI -> ; [328:25] + | |--LITERAL_IF -> if [329:8] + | | |--LPAREN -> ( [329:11] + | | |--EXPR -> EXPR [329:12] + | | | `--LITERAL_FALSE -> false [329:12] + | | |--RPAREN -> ) [329:17] + | | `--LITERAL_THROW -> throw [329:19] + | | |--EXPR -> EXPR [329:25] + | | | `--LITERAL_NEW -> new [329:25] + | | | |--IDENT -> Exception [329:29] + | | | |--LPAREN -> ( [329:38] + | | | |--ELIST -> ELIST [329:39] + | | | `--RPAREN -> ) [329:39] + | | `--SEMI -> ; [329:40] + | |--LITERAL_ASSERT -> assert [330:8] + | | |--EXPR -> EXPR [330:14] + | | | |--LPAREN -> ( [330:14] + | | | |--LITERAL_FALSE -> false [330:15] + | | | `--RPAREN -> ) [330:20] + | | `--SEMI -> ; [330:21] + | |--LITERAL_ASSERT -> assert [331:8] + | | |--EXPR -> EXPR [331:15] + | | | `--LITERAL_TRUE -> true [331:15] + | | |--COLON -> : [331:20] + | | |--EXPR -> EXPR [331:22] + | | | `--STRING_LITERAL -> "false" [331:22] + | | `--SEMI -> ; [331:29] + | |--EXPR -> EXPR [332:11] + | | `--ASSIGN -> = [332:11] + | | |--IDENT -> f9 [332:8] + | | `--TYPECAST -> ( [332:13] + | | |--TYPE -> TYPE [332:14] + | | | `--IDENT -> Object [332:14] + | | |--RPAREN -> ) [332:20] + | | `--IDENT -> f9 [332:22] + | |--SEMI -> ; [332:24] + | |--EXPR -> EXPR [333:17] + | | `--METHOD_CALL -> ( [333:17] + | | |--DOT -> . [333:10] + | | | |--IDENT -> f9 [333:8] + | | | `--IDENT -> equals [333:11] + | | |--ELIST -> ELIST [333:18] + | | | `--EXPR -> EXPR [333:18] + | | | |--LPAREN -> ( [333:18] + | | | |--LPAREN -> ( [333:19] + | | | |--ASSIGN -> = [333:28] + | | | | |--IDENT -> vstring [333:20] + | | | | `--STRING_LITERAL -> "" [333:30] + | | | |--RPAREN -> ) [333:32] + | | | `--RPAREN -> ) [333:33] + | | `--RPAREN -> ) [333:34] + | |--SEMI -> ; [333:35] + | |--LITERAL_FOR -> for [334:8] + | | |--LPAREN -> ( [334:12] + | | |--FOR_INIT -> FOR_INIT [334:13] + | | | `--VARIABLE_DEF -> VARIABLE_DEF [334:13] + | | | |--MODIFIERS -> MODIFIERS [334:13] + | | | |--TYPE -> TYPE [334:13] + | | | | `--LITERAL_INT -> int [334:13] + | | | |--IDENT -> i [334:17] + | | | `--ASSIGN -> = [334:19] + | | | `--EXPR -> EXPR [334:21] + | | | `--NUM_INT -> 0 [334:21] + | | |--SEMI -> ; [334:22] + | | |--FOR_CONDITION -> FOR_CONDITION [334:24] + | | | `--EXPR -> EXPR [334:24] + | | | |--LPAREN -> ( [334:24] + | | | |--LT -> < [334:29] + | | | | |--LPAREN -> ( [334:25] + | | | | |--IDENT -> i [334:26] + | | | | |--RPAREN -> ) [334:27] + | | | | |--LPAREN -> ( [334:31] + | | | | |--PLUS -> + [334:33] + | | | | | |--NUM_INT -> 6 [334:32] + | | | | | `--NUM_INT -> 6 [334:34] + | | | | `--RPAREN -> ) [334:35] + | | | `--RPAREN -> ) [334:36] + | | |--SEMI -> ; [334:37] + | | |--FOR_ITERATOR -> FOR_ITERATOR [334:40] + | | | `--ELIST -> ELIST [334:40] + | | | `--EXPR -> EXPR [334:40] + | | | `--POST_INC -> ++ [334:40] + | | | `--IDENT -> i [334:39] + | | |--RPAREN -> ) [334:42] + | | `--EMPTY_STAT -> ; [334:44] + | |--LITERAL_IF -> if [335:8] + | | |--LPAREN -> ( [335:11] + | | |--EXPR -> EXPR [335:12] + | | | |--LPAREN -> ( [335:12] + | | | |--BAND -> & [335:15] + | | | | |--IDENT -> b [335:13] + | | | | `--IDENT -> b [335:17] + | | | `--RPAREN -> ) [335:18] + | | |--RPAREN -> ) [335:19] + | | `--SLIST -> { [335:21] + | | `--RCURLY -> } [335:22] + | |--EXPR -> EXPR [338:13] + | | `--ASSIGN -> = [338:13] + | | |--IDENT -> vint [338:8] + | | `--QUESTION -> ? [338:24] + | | |--IDENT -> vboolean [338:15] + | | |--LPAREN -> ( [338:26] + | | |--ASSIGN -> = [338:32] + | | | |--IDENT -> vint [338:27] + | | | `--NUM_INT -> 1 [338:34] + | | |--RPAREN -> ) [338:35] + | | |--COLON -> : [338:37] + | | |--LPAREN -> ( [338:39] + | | |--ASSIGN -> = [338:45] + | | | |--IDENT -> vint [338:40] + | | | `--NUM_INT -> 0 [338:47] + | | `--RPAREN -> ) [338:48] + | |--SEMI -> ; [338:49] + | |--EXPR -> EXPR [339:21] + | | `--ASSIGN -> = [339:21] + | | |--INDEX_OP -> [ [339:14] + | | | |--IDENT -> varray [339:8] + | | | |--EXPR -> EXPR [339:15] + | | | | `--IDENT -> vint [339:15] + | | | `--RBRACK -> ] [339:19] + | | `--METHOD_CALL -> ( [339:39] + | | |--DOT -> . [339:30] + | | | |--IDENT -> Integer [339:23] + | | | `--IDENT -> parseInt [339:31] + | | |--ELIST -> ELIST [339:40] + | | | `--EXPR -> EXPR [339:40] + | | | `--STRING_LITERAL -> "0" [339:40] + | | `--RPAREN -> ) [339:43] + | |--SEMI -> ; [339:44] + | `--RCURLY -> } [340:4] + |--ANNOTATION_DEF -> ANNOTATION_DEF [342:4] + | |--MODIFIERS -> MODIFIERS [342:4] + | | `--LITERAL_PUBLIC -> public [342:4] + | |--AT -> @ [342:11] + | |--LITERAL_INTERFACE -> interface [342:12] + | |--IDENT -> innerAnnotation [342:22] + | `--OBJBLOCK -> OBJBLOCK [342:38] + | |--LCURLY -> { [342:38] + | `--RCURLY -> } [342:39] + `--RCURLY -> } [343:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/PackageAnnotations.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/PackageAnnotations.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/PackageAnnotations.java @@ -0,0 +1,24 @@ +package com.puppycrawl.tools.checkstyle.grammar.antlr4; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Repeatable; +import java.lang.annotation.Target; + +/** + * This is not a test-input. Actual test input is in the file package-info.java. + */ + +@Target(ElementType.PACKAGE) +@interface PackageAnnotations { + + PackageAnnotation[] value(); + +} + +@Repeatable(PackageAnnotations.class) +@Target(ElementType.PACKAGE) +@interface PackageAnnotation { + + String value() default ""; + +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/package-info.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/package-info.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/package-info.java @@ -0,0 +1,11 @@ +@PackageAnnotation(value = "foo") + @PackageAnnotation("") //warn +@PackageAnnotation( + "bar" +) +package + com. + puppycrawl. + tools + .checkstyle.grammar + .antlr4; diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/javaparser/InputJavaParserNoStackOverflowOnDeepStringConcat.java b/src/test/resources/com/puppycrawl/tools/checkstyle/javaparser/InputJavaParserNoStackOverflowOnDeepStringConcat.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/javaparser/InputJavaParserNoStackOverflowOnDeepStringConcat.java @@ -0,0 +1,275 @@ +package com.puppycrawl.tools.checkstyle.javaparser; + +public class InputJavaParserNoStackOverflowOnDeepStringConcat { + public static final String X = +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ +"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+"a"+ + + "b"; +}
Upgrade Java Grammar from ANTLR2 to ANTLR4 From https://github.com/checkstyle/checkstyle/wiki/Checkstyle-GSoC-2021-Project-Ideas#project-name-upgrade-java-grammar-from-antlr2-to-antlr4: > Checkstyle needs to have new Java grammar that is based on ANTLR4 version. This task is very difficult but it is critical for Checkstyle as ANTLR2 library is not supported (from 2006) and is far less efficient. Old version has a bunch of syntax analysis limitations that have already been resolved in ANTLR4. Our team is already experiencing difficulties with support of current grammar as it is too complicated due to limited parsing abilities of ANTLR2. In this issue, we can discuss finer points of this upgrade and remaining issues from https://github.com/checkstyle-antlr4/checkstyle-antlr4: [Grammar should use all caps in naming of literals ](https://github.com/checkstyle-antlr4/checkstyle-antlr4/issues/22) [Criteria for main repo merge](https://github.com/checkstyle-antlr4/checkstyle-antlr4/issues/13) [Add EOF token to AST](https://github.com/checkstyle-antlr4/checkstyle-antlr4/issues/12)
There are a couple of cases where Checkstyle can currently parse non-compilable files: [Example 1](https://github.com/INRIA/spoon/blob/master/src/test/resources/executable-reference/Foo.java) reason for not compiling - missing semicolon on line 7. [Example 2](https://github.com/INRIA/spoon/blob/spoon-core-8.0.0/src/test/resources/noclasspath/SubscriptionAdapter.java) reason for not compiling - super constructor call not first statement in constructor (line 15) There are a few good reasons to drop support for this syntax: 1. Performance - especially for example 2, supporting this syntax makes for more complicated and ambiguous grammar 2. Checkstyle shouldn't be expected to parse Java syntax that doesn't compile. Is there any good reason to continue supporting this syntax? No. If the java compiler cannot compile a file, there is no much reason to parse such file. This is documented feature: https://checkstyle.org/writingchecks.html#Limitations
2021-07-07T21:29:19Z
8.45
checkstyle/checkstyle
10,216
checkstyle__checkstyle-10216
[ "10208" ]
b464b2501e23fb63b7c6d49f7f1f28759c55b996
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java b/src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java @@ -166,7 +166,7 @@ public ParseStatus parseJavadocAsDetailNode(DetailAST javadocCommentAst) { */ private static JavadocParser createJavadocParser(String blockComment, DescriptiveErrorListener errorListener) { - final JavadocLexer lexer = new JavadocLexer(CharStreams.fromString(blockComment)); + final JavadocLexer lexer = new JavadocLexer(CharStreams.fromString(blockComment), true); final CommonTokenStream tokens = new CommonTokenStream(lexer); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerSimulator.java b/src/main/java/com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerSimulator.java new file mode 100644 --- /dev/null +++ b/src/main/java/com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerSimulator.java @@ -0,0 +1,77 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2021 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package com.puppycrawl.tools.checkstyle.grammar; + +import org.antlr.v4.runtime.CharStream; +import org.antlr.v4.runtime.Lexer; +import org.antlr.v4.runtime.atn.ATN; +import org.antlr.v4.runtime.atn.LexerATNSimulator; +import org.antlr.v4.runtime.atn.PredictionContextCache; +import org.antlr.v4.runtime.dfa.DFA; + +/** + * Extends the LexerATNSimulator class in order to override + * the 'consume()' method so that we can handle '\r' line + * endings (pre-OSX macOs line endings) correctly in the + * ANTLR lexer. + */ +public class CrAwareLexerSimulator extends LexerATNSimulator { + + /** + * Constructs a CrAwareLexerSimulator to interpret the input + * from the lexer. + * + * @param lexer the current lexer + * @param augmented the augmented transition network + * @param decisionToDfa the DFA to store our states in + * @param sharedContextCache cache of PredictionContext objects + */ + public CrAwareLexerSimulator(Lexer lexer, ATN augmented, + DFA[] decisionToDfa, + PredictionContextCache sharedContextCache) { + super(lexer, augmented, decisionToDfa, sharedContextCache); + } + + /** + * Overrides the 'consume()' method to add support for + * '\r' (carriage return) line endings. + * + * @param input the Character stream of the file we are parsing + */ + @Override + public void consume(CharStream input) { + final int currentChar = input.LA(1); + if (currentChar == '\n') { + line++; + charPositionInLine = 0; + } + else if (currentChar == '\r') { + final int nextChar = input.LA(2); + if (nextChar != '\n') { + line++; + charPositionInLine = 0; + } + } + else { + charPositionInLine++; + } + input.consume(); + } +}
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerTest.java new file mode 100644 --- /dev/null +++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerTest.java @@ -0,0 +1,83 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2021 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package com.puppycrawl.tools.checkstyle.grammar; + +import static com.google.common.truth.Truth.assertWithMessage; + +import org.antlr.v4.runtime.CharStream; +import org.antlr.v4.runtime.CharStreams; +import org.junit.jupiter.api.Test; + +public class CrAwareLexerTest { + + @Test + public void testConsumeCarriageReturnZeroCharPositionInLine() { + final String text = "\r"; + final CharStream charStream = CharStreams.fromString(text); + final CrAwareLexerSimulator lexer = + new CrAwareLexerSimulator(null, null, null, null); + lexer.consume(charStream); + + assertWithMessage("Carriage return should reset column number.") + .that(lexer.getCharPositionInLine()) + .isEqualTo(0); + } + + @Test + public void testConsumeCarriageReturnNewline() { + final String text = "\r"; + final CharStream charStream = CharStreams.fromString(text); + final CrAwareLexerSimulator lexer = + new CrAwareLexerSimulator(null, null, null, null); + lexer.consume(charStream); + + assertWithMessage("Carriage return should increment line number.") + .that(lexer.getLine()) + .isEqualTo(2); + } + + @Test + public void testConsumeWindowsNewlineZeroCharPositionInLine() { + final String text = "\r\n"; + final CharStream charStream = CharStreams.fromString(text); + final CrAwareLexerSimulator lexer = + new CrAwareLexerSimulator(null, null, null, null); + lexer.consume(charStream); + lexer.consume(charStream); + + assertWithMessage("Carriage return should reset column number.") + .that(lexer.getCharPositionInLine()) + .isEqualTo(0); + } + + @Test + public void testConsumeWindowsNewline() { + final String text = "\r\n"; + final CharStream charStream = CharStreams.fromString(text); + final CrAwareLexerSimulator lexer = + new CrAwareLexerSimulator(null, null, null, null); + lexer.consume(charStream); + lexer.consume(charStream); + + assertWithMessage("Carriage return should increment line number.") + .that(lexer.getLine()) + .isEqualTo(2); + } +} diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/javadoc/JavadocParseTreeTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/javadoc/JavadocParseTreeTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/javadoc/JavadocParseTreeTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/javadoc/JavadocParseTreeTest.java @@ -394,4 +394,15 @@ public void testCdata() throws Exception { getHtmlPath("InputCdata.javadoc")); } + @Test + public void testCrAsNewlineMultiline() throws Exception { + verifyJavadocTree(getPath("expectedCrAsNewlineMultiline.txt"), + getPath("InputCrAsNewlineMultiline.javadoc")); + } + + @Test + public void testDosLineEndingAsNewlineMultiline() throws Exception { + verifyJavadocTree(getPath("expectedDosLineEndingAsNewlineMultiline.txt"), + getPath("InputDosLineEndingAsNewlineMultiline.javadoc")); + } } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/InputCrAsNewlineMultiline.javadoc b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/InputCrAsNewlineMultiline.javadoc new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/InputCrAsNewlineMultiline.javadoc @@ -0,0 +1 @@ +* line 0 * Checks that commentContent starts with '*' javadoc comment identifier. *&lt;property name="ignorePattern" value="^ *\* *[^ ]+$"/&gt* * This * is not a leading * * @return true if commentContent starts with '*' javadoc comment identifier * line 5 * line 6 \ No newline at end of file diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/InputDosLineEndingAsNewlineMultiline.javadoc b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/InputDosLineEndingAsNewlineMultiline.javadoc new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/InputDosLineEndingAsNewlineMultiline.javadoc @@ -0,0 +1,7 @@ +* line 0 +* Checks that commentContent starts with '*' javadoc comment identifier. + *&lt;property name="ignorePattern" value="^ *\* *[^ ]+$"/&gt* +* This * is not a leading * +* @return true if commentContent starts with '*' javadoc comment identifier +* line 5 + * line 6 diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/expectedCrAsNewlineMultiline.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/expectedCrAsNewlineMultiline.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/expectedCrAsNewlineMultiline.txt @@ -0,0 +1,28 @@ +JAVADOC -> JAVADOC [0:0] +|--LEADING_ASTERISK -> * [0:0] +|--TEXT -> line 0 [0:1] +|--NEWLINE -> \r [0:8] +|--LEADING_ASTERISK -> * [1:0] +|--TEXT -> Checks that commentContent starts with '*' javadoc comment identifier. [1:1] +|--NEWLINE -> \r [1:72] +|--LEADING_ASTERISK -> * [2:0] +|--TEXT -> &lt;property name="ignorePattern" value="^ *\* *[^ ]+$"/&gt* [2:5] +|--NEWLINE -> \r [2:65] +|--LEADING_ASTERISK -> * [3:0] +|--TEXT -> This * is not a leading * [3:1] +|--NEWLINE -> \r [3:27] +|--LEADING_ASTERISK -> * [4:0] +|--WS -> [4:1] +|--JAVADOC_TAG -> JAVADOC_TAG [4:2] +| |--RETURN_LITERAL -> @return [4:2] +| |--WS -> [4:9] +| `--DESCRIPTION -> DESCRIPTION [4:10] +| |--TEXT -> true if commentContent starts with '*' javadoc comment identifier [4:10] +| |--NEWLINE -> \r [4:75] +| |--LEADING_ASTERISK -> * [5:0] +| |--TEXT -> line 5 [5:1] +| |--NEWLINE -> \r [5:8] +| |--LEADING_ASTERISK -> * [6:0] +| |--TEXT -> line 6 [6:5] +| `--NEWLINE -> \r [6:12] +`--EOF -> <EOF> [7:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/expectedDosLineEndingAsNewlineMultiline.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/expectedDosLineEndingAsNewlineMultiline.txt new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/expectedDosLineEndingAsNewlineMultiline.txt @@ -0,0 +1,28 @@ +JAVADOC -> JAVADOC [0:0] +|--LEADING_ASTERISK -> * [0:0] +|--TEXT -> line 0 [0:1] +|--NEWLINE -> \n [0:8] +|--LEADING_ASTERISK -> * [1:0] +|--TEXT -> Checks that commentContent starts with '*' javadoc comment identifier. [1:1] +|--NEWLINE -> \n [1:72] +|--LEADING_ASTERISK -> * [2:0] +|--TEXT -> &lt;property name="ignorePattern" value="^ *\* *[^ ]+$"/&gt* [2:5] +|--NEWLINE -> \n [2:65] +|--LEADING_ASTERISK -> * [3:0] +|--TEXT -> This * is not a leading * [3:1] +|--NEWLINE -> \n [3:27] +|--LEADING_ASTERISK -> * [4:0] +|--WS -> [4:1] +|--JAVADOC_TAG -> JAVADOC_TAG [4:2] +| |--RETURN_LITERAL -> @return [4:2] +| |--WS -> [4:9] +| `--DESCRIPTION -> DESCRIPTION [4:10] +| |--TEXT -> true if commentContent starts with '*' javadoc comment identifier [4:10] +| |--NEWLINE -> \n [4:75] +| |--LEADING_ASTERISK -> * [5:0] +| |--TEXT -> line 5 [5:1] +| |--NEWLINE -> \n [5:8] +| |--LEADING_ASTERISK -> * [6:0] +| |--TEXT -> line 6 [6:5] +| `--NEWLINE -> \n [6:12] +`--EOF -> <EOF> [7:0] diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/expectedJavadocWithCrAsNewlineAst.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/expectedJavadocWithCrAsNewlineAst.txt --- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/expectedJavadocWithCrAsNewlineAst.txt +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/expectedJavadocWithCrAsNewlineAst.txt @@ -1,20 +1,20 @@ JAVADOC -> JAVADOC [0:0] |--NEWLINE -> \r [0:0] -|--LEADING_ASTERISK -> * [0:1] -|--TEXT -> Checks that commentContent starts with '*' javadoc comment identifier. [0:2] -|--NEWLINE -> \r [0:73] -|--LEADING_ASTERISK -> * [0:74] -|--TEXT -> &lt;property name="ignorePattern" value="^ *\* *[^ ]+$"/&gt* [0:79] -|--NEWLINE -> \r [0:139] -|--LEADING_ASTERISK -> \t* [0:140] -|--TEXT -> This * is not a leading * [0:142] -|--NEWLINE -> \r [0:168] -|--LEADING_ASTERISK -> * [0:169] -|--WS -> [0:170] -|--JAVADOC_TAG -> JAVADOC_TAG [0:171] -| |--RETURN_LITERAL -> @return [0:171] -| |--WS -> [0:178] -| `--DESCRIPTION -> DESCRIPTION [0:179] -| |--TEXT -> true if commentContent starts with '*' javadoc comment identifier [0:179] -| `--NEWLINE -> \r [0:244] -`--EOF -> <EOF> [0:245] +|--LEADING_ASTERISK -> * [1:0] +|--TEXT -> Checks that commentContent starts with '*' javadoc comment identifier. [1:1] +|--NEWLINE -> \r [1:72] +|--LEADING_ASTERISK -> * [2:0] +|--TEXT -> &lt;property name="ignorePattern" value="^ *\* *[^ ]+$"/&gt* [2:5] +|--NEWLINE -> \r [2:65] +|--LEADING_ASTERISK -> \t* [3:0] +|--TEXT -> This * is not a leading * [3:2] +|--NEWLINE -> \r [3:28] +|--LEADING_ASTERISK -> * [4:0] +|--WS -> [4:1] +|--JAVADOC_TAG -> JAVADOC_TAG [4:2] +| |--RETURN_LITERAL -> @return [4:2] +| |--WS -> [4:9] +| `--DESCRIPTION -> DESCRIPTION [4:10] +| |--TEXT -> true if commentContent starts with '*' javadoc comment identifier [4:10] +| `--NEWLINE -> \r [4:75] +`--EOF -> <EOF> [5:0]
Javadoc parser/grammar doesn't report the correct lines in Javadoc AST. Identified at https://github.com/checkstyle-antlr4/checkstyle-antlr4/issues/15, ANTLR doesn't support the `\r` (pre-OSX macos) line ending any longer, and has no plans to add support. Therefore, when parsing a Javadoc in a file that uses the `\r` line ending, the line number never increases in the Javadoc: ```java public class Test { /** * This is a javadoc comment. * More info, on another line. */ void doStuff() { } } ``` Unix utilities do not play well with `\r`, which renders as `^M` with `cat`: ```bash ➜ src cat -v Test.java public class Test {^M /**^M * This is a javadoc comment.^M * More info, on another line.^M */^M void doStuff() {^M^M }^M}^M% ➜ src java -jar checkstyle-8.44-all.jar -J Test.java CLASS_DEF -> CLASS_DEF [1:0] |--MODIFIERS -> MODIFIERS [1:0] | `--LITERAL_PUBLIC -> public [1:0] |--LITERAL_CLASS -> class [1:8] |--IDENT -> Test [1:14] `--OBJBLOCK -> OBJBLOCK [1:19] |--LCURLY -> { [1:19] |--METHOD_DEF -> METHOD_DEF [6:4] | |--MODIFIERS -> MODIFIERS [6:4] | |--TYPE -> TYPE [6:4] | | |--BLOCK_COMMENT_BEGIN -> /* [2:4] | | | |--COMMENT_CONTENT -> *\r * This is a javadoc comment.\r * More info, on another line.\r [2:6] | | | | `--JAVADOC -> JAVADOC [2:7] // ok | | | | |--NEWLINE -> \r [2:7] // ok | | | | |--LEADING_ASTERISK -> * [2:8] // wrong, should be 3 | | | | |--TEXT -> This is a javadoc comment. [2:14] // wrong, should be 3 | | | | |--NEWLINE -> \r [2:41] // wrong, should be 3 | | | | |--LEADING_ASTERISK -> * [2:42] // wrong, should be 4 | | | | |--TEXT -> More info, on another line. [2:48] // wrong, should be 4 | | | | |--NEWLINE -> \r [2:76] // wrong, should be 4 | | | | |--TEXT -> [2:77] // wrong, should be 5 | | | | `--EOF -> <EOF> [2:82] // wrong, should be 5 | | | `--BLOCK_COMMENT_END -> */ [5:5] | | `--LITERAL_VOID -> void [6:4] | |--IDENT -> doStuff [6:9] | |--LPAREN -> ( [6:16] | |--PARAMETERS -> PARAMETERS [6:17] | |--RPAREN -> ) [6:17] | `--SLIST -> { [6:19] | `--RCURLY -> } [8:4] `--RCURLY -> } [9:0] ``` As you can see, the Javadoc starts on line 2, but then the line number never advances within that Javadoc AST. This is because the `consume()` function in ANTLR's interpreter doesn't recognize the `\r` alone as a line ending any longer (it only looks for `\n`, which covers the other two line endings). We should be able to handle any line ending that Java supports, which is `\r`, `\n`, and `\r\n`. I would expect the Javadoc AST to track line numbers correctly. Similar issue was originally reported at https://github.com/checkstyle/checkstyle/issues/2329, and problem was also noted at https://github.com/checkstyle/checkstyle/issues/2329#issuecomment-311235254.
2021-06-28T16:10:27Z
8.44
checkstyle/checkstyle
9,942
checkstyle__checkstyle-9942
[ "9941" ]
5738af2e9aa34f5a7e66fe5bb412aa7b5d0345ab
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailAST.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailAST.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailAST.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailAST.java @@ -90,13 +90,13 @@ public interface DetailAST { * Checks if this branch of the parse tree contains a token * of the provided type. * + * @param type a TokenType + * @return true if and only if this branch (including this node) + * contains a token of type {@code type}. * @deprecated * Usage of this method is no longer accepted. We encourage * traversal of subtrees to be written per the needs of each check * to avoid unintended side effects. - * @param type a TokenType - * @return true if and only if this branch (including this node) - * contains a token of type {@code type}. */ @Deprecated boolean branchContains(int type); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheck.java @@ -272,6 +272,10 @@ private static int getParentType(DetailAST commentBlock) { if (result == TokenTypes.TYPE || result == TokenTypes.MODIFIERS) { result = parentNode.getParent().getType(); } + else if (parentNode.getParent() != null + && parentNode.getParent().getType() == TokenTypes.MODIFIERS) { + result = parentNode.getParent().getParent().getType(); + } } return result; }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheckTest.java @@ -188,4 +188,36 @@ public void testAtclauseOrderLotsOfRecords() throws Exception { verify(checkConfig, getNonCompilablePath("InputAtclauseOrderLotsOfRecords.java"), expected); } + @Test + public void testAtclause() throws Exception { + final String tagOrder = "[@author, @version, @param, @return, @throws, @exception, @see," + + " @since, @serial, @serialField, @serialData, @deprecated]"; + final DefaultConfiguration checkConfig = createModuleConfig(AtclauseOrderCheck.class); + final String[] expected = { + "12: " + getCheckMessage(MSG_KEY, tagOrder), + "13: " + getCheckMessage(MSG_KEY, tagOrder), + "14: " + getCheckMessage(MSG_KEY, tagOrder), + "24: " + getCheckMessage(MSG_KEY, tagOrder), + "25: " + getCheckMessage(MSG_KEY, tagOrder), + "26: " + getCheckMessage(MSG_KEY, tagOrder), + "36: " + getCheckMessage(MSG_KEY, tagOrder), + "37: " + getCheckMessage(MSG_KEY, tagOrder), + "38: " + getCheckMessage(MSG_KEY, tagOrder), + "51: " + getCheckMessage(MSG_KEY, tagOrder), + "52: " + getCheckMessage(MSG_KEY, tagOrder), + "53: " + getCheckMessage(MSG_KEY, tagOrder), + "65: " + getCheckMessage(MSG_KEY, tagOrder), + "66: " + getCheckMessage(MSG_KEY, tagOrder), + "67: " + getCheckMessage(MSG_KEY, tagOrder), + "80: " + getCheckMessage(MSG_KEY, tagOrder), + "81: " + getCheckMessage(MSG_KEY, tagOrder), + "82: " + getCheckMessage(MSG_KEY, tagOrder), + "92: " + getCheckMessage(MSG_KEY, tagOrder), + "93: " + getCheckMessage(MSG_KEY, tagOrder), + "94: " + getCheckMessage(MSG_KEY, tagOrder), + }; + + verify(checkConfig, + getPath("InputAtclauseOrderWithAnnotationsOutsideJavadoc.java"), expected); + } } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderWithAnnotationsOutsideJavadoc.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderWithAnnotationsOutsideJavadoc.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderWithAnnotationsOutsideJavadoc.java @@ -0,0 +1,97 @@ +package com.puppycrawl.tools.checkstyle.checks.javadoc.atclauseorder; + +/* Config: default + */ + +public class InputAtclauseOrderWithAnnotationsOutsideJavadoc { + /** + * Some javadoc. + * + * @author max + * @deprecated Some javadoc. + * @see Some javadoc. // violation + * @version 1.0 // violation + * @since Some javadoc. // violation + */ + @Deprecated + public boolean branchContains(int type) { return true; } + + /** + * Some javadoc. + * + * @author max + * @deprecated Some javadoc. + * @see Some javadoc. // violation + * @version 1.0 // violation + * @since Some javadoc. // violation + */ + public boolean branchContains2(int type) { return true; } +} + +/** + * Some javadoc. + * + * @author max + * @deprecated Some javadoc. + * @see Some javadoc. // violation + * @version 1.0 // violation + * @since Some javadoc. // violation + */ +@Deprecated +class TestClass { + +} + +class TestInnerClasses extends InputAtclauseOrderWithAnnotationsOutsideJavadoc{ + /** + * Some javadoc. + * + * @author max + * @deprecated Some javadoc. + * @see Some javadoc. // violation + * @version 1.0 // violation + * @since Some javadoc. // violation + */ + @Deprecated + TestClass one = new TestClass(){ + + }; + + /** + * Some javadoc. + * + * @author max + * @deprecated Some javadoc. + * @see Some javadoc. // violation + * @version 1.0 // violation + * @since Some javadoc. // violation + */ + @Override + public boolean branchContains(int type) { + return false; + } +} + +/** + * Some javadoc. + * + * @author max + * @deprecated Some javadoc. + * @see Some javadoc. // violation + * @version 1.0 // violation + * @since Some javadoc. // violation + */ +@Deprecated +enum TestEnums {} + +/** + * Some javadoc. + * + * @author max + * @deprecated Some javadoc. + * @see Some javadoc. // violation + * @version 1.0 // violation + * @since Some javadoc. // violation + */ +@Deprecated +interface TestInterfaces {}
AtclauseOrder: Falsely ignores method with annotation Identified at https://github.com/checkstyle/checkstyle/pull/9939 ```` $ cat TestClass.java public class TestClass { /** * Test. * * @deprecated Test. * @param type Test. * @return Test. */ @Deprecated public boolean branchContains(int type) { return true; } /** * Test. * * @deprecated Test. * @param type Test. * @return Test. */ public boolean branchContains2(int type) { return true; } } $ cat TestConfig.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <property name="charset" value="UTF-8"/> <module name="TreeWalker"> <module name="AtclauseOrder"> <property name="tagOrder" value="@param, @return, @throws, @deprecated"/> <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/> </module> </module> </module> $ java -jar checkstyle-8.41.1-all.jar -c TestConfig.xml TestClass.java Starting audit... [ERROR] TestClass.java:16: Block tags have to appear in the order '[@param, @return, @throws, @deprecated]'. [AtclauseOrder] [ERROR] TestClass.java:17: Block tags have to appear in the order '[@param, @return, @throws, @deprecated]'. [AtclauseOrder] Audit done. Checkstyle ends with 2 errors. ```` Method without annotation prints 2 violations while one with annotation prints none. Method annotations should not play into this check's behavior and I expect the same violations between both examples.
https://github.com/checkstyle/checkstyle/blob/13481f2c410e4944ecf5ab93ec49948a523a0c82/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheck.java#L267-L277 Issue is method returns the annotation definition instead of the method definition. The code wrongly believes we are looking at an annotation instead of method. ```` |--METHOD_DEF -> METHOD_DEF [9:4] | |--MODIFIERS -> MODIFIERS [9:4] | | |--ANNOTATION -> ANNOTATION [9:4] | | | |--BLOCK_COMMENT_BEGIN -> /* [2:4] ```` As seen in structure, getting the parent on the block just gives us the annotation and should skip that and the modifiers to give us the method definition. I am on it.
2021-04-27T07:13:48Z
8.43
checkstyle/checkstyle
9,759
checkstyle__checkstyle-9759
[ "8971" ]
96a383ba3cea293e29c1bde4abce8c6885abe827
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java @@ -26,6 +26,7 @@ import com.puppycrawl.tools.checkstyle.api.AbstractCheck; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.TokenUtil; /** * <p> @@ -51,7 +52,9 @@ * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT"> * STATIC_INIT</a>, * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF"> - * COMPACT_CTOR_DEF</a>. + * COMPACT_CTOR_DEF</a>, + * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA"> + * LAMBDA</a>. * </li> * </ul> * <p> @@ -119,6 +122,7 @@ public int[] getDefaultTokens() { TokenTypes.STATIC_INIT, TokenTypes.SLIST, TokenTypes.COMPACT_CTOR_DEF, + TokenTypes.LAMBDA, }; } @@ -136,6 +140,7 @@ public int[] getAcceptableTokens() { TokenTypes.STATIC_INIT, TokenTypes.SLIST, TokenTypes.COMPACT_CTOR_DEF, + TokenTypes.LAMBDA, }; } @@ -156,56 +161,43 @@ public void beginTree(DetailAST rootAST) { @Override public void visitToken(DetailAST ast) { - switch (ast.getType()) { - case TokenTypes.CTOR_DEF: - case TokenTypes.METHOD_DEF: - case TokenTypes.INSTANCE_INIT: - case TokenTypes.STATIC_INIT: - case TokenTypes.COMPACT_CTOR_DEF: - visitMemberDef(ast); - break; - case TokenTypes.SLIST: - visitSlist(ast); - break; - default: - throw new IllegalStateException(ast.toString()); + if (isContainerNode(ast)) { + visitContainerNode(ast); + } + else if (TokenUtil.isOfType(ast, TokenTypes.SLIST)) { + visitSlist(ast); + } + else { + throw new IllegalStateException(ast.toString()); } } @Override public void leaveToken(DetailAST ast) { - switch (ast.getType()) { - case TokenTypes.CTOR_DEF: - case TokenTypes.METHOD_DEF: - case TokenTypes.INSTANCE_INIT: - case TokenTypes.STATIC_INIT: - case TokenTypes.COMPACT_CTOR_DEF: - leaveMemberDef(ast); - break; - case TokenTypes.SLIST: - // Do nothing - break; - default: - throw new IllegalStateException(ast.toString()); + if (isContainerNode(ast)) { + leaveContainerNode(ast); + } + else if (!TokenUtil.isOfType(ast, TokenTypes.SLIST)) { + throw new IllegalStateException(ast.toString()); } } /** - * Process the start of the member definition. + * Process the start of the container node. * - * @param ast the token representing the member definition. + * @param ast the token representing the container node. */ - private void visitMemberDef(DetailAST ast) { + private void visitContainerNode(DetailAST ast) { contextStack.push(context); context = new Context(ast); } /** - * Process the end of a member definition. + * Process the end of a container node. * - * @param ast the token representing the member definition. + * @param ast the token representing the container node. */ - private void leaveMemberDef(DetailAST ast) { + private void leaveContainerNode(DetailAST ast) { final int count = context.getCount(); if (count > max) { log(ast, MSG_KEY, count, max); @@ -219,33 +211,27 @@ private void leaveMemberDef(DetailAST ast) { * @param ast the token representing the statement list. */ private void visitSlist(DetailAST ast) { - if (context.getAST() != null) { - // find member AST for the statement list - final DetailAST contextAST = context.getAST(); - DetailAST parent = ast.getParent(); - int type = parent.getType(); - while (type != TokenTypes.METHOD_DEF - && !isConstructorOrInit(type)) { - parent = parent.getParent(); - type = parent.getType(); - } - if (parent == contextAST) { - context.addCount(ast.getChildCount() / 2); - } + final DetailAST contextAST = context.getAST(); + DetailAST parent = ast.getParent(); + while (parent != null && !isContainerNode(parent)) { + parent = parent.getParent(); + } + if (parent == contextAST) { + context.addCount(ast.getChildCount() / 2); } } /** - * Check if token type is a ctor (compact or canonical) or instance/ static initializer. + * Check if the node is of type ctor (compact or canonical), + * instance/ static initializer, method definition or lambda. * - * @param tokenType type of token we are checking - * @return true if token type is constructor or initializer + * @param node AST node we are checking + * @return true if node is of the given types */ - private static boolean isConstructorOrInit(int tokenType) { - return tokenType == TokenTypes.CTOR_DEF - || tokenType == TokenTypes.INSTANCE_INIT - || tokenType == TokenTypes.STATIC_INIT - || tokenType == TokenTypes.COMPACT_CTOR_DEF; + private static boolean isContainerNode(DetailAST node) { + return TokenUtil.isOfType(node, TokenTypes.METHOD_DEF, + TokenTypes.LAMBDA, TokenTypes.CTOR_DEF, TokenTypes.INSTANCE_INIT, + TokenTypes.STATIC_INIT, TokenTypes.COMPACT_CTOR_DEF); } /**
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java @@ -75,6 +75,7 @@ public void testMaxZero() throws Exception { "71:5: " + getCheckMessage(MSG_KEY, 2, 0), "80:5: " + getCheckMessage(MSG_KEY, 2, 0), "83:13: " + getCheckMessage(MSG_KEY, 1, 0), + "94:29: " + getCheckMessage(MSG_KEY, 1, 0), }; verify(checkConfig, getPath("InputExecutableStatementCountMaxZero.java"), expected); @@ -210,4 +211,23 @@ public void testExecutableStatementCountRecords() throws Exception { expected); } + @Test + public void testExecutableStatementCountLambdas() throws Exception { + final DefaultConfiguration checkConfig = + createModuleConfig(ExecutableStatementCountCheck.class); + checkConfig.addAttribute("max", "1"); + checkConfig.addAttribute("tokens", "LAMBDA"); + + final int max = 1; + + final String[] expected = { + "13:22: " + getCheckMessage(MSG_KEY, 6, max), + "22:22: " + getCheckMessage(MSG_KEY, 2, max), + "23:26: " + getCheckMessage(MSG_KEY, 2, max), + "27:26: " + getCheckMessage(MSG_KEY, 4, max), + }; + + verify(checkConfig, getPath("InputExecutableStatementCountLambdas.java"), expected); + } + } diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/executablestatementcount/InputExecutableStatementCountRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/executablestatementcount/InputExecutableStatementCountRecords.java --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/executablestatementcount/InputExecutableStatementCountRecords.java +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/executablestatementcount/InputExecutableStatementCountRecords.java @@ -71,4 +71,20 @@ record R76(int x) { return R76.class; } } + + private int id(int i) { + return i; + } + + private final int value = 2; + + private final int field = id(switch(value) { + case 0 -> -1; + case 2 -> { + int temp = 0; + temp += 3; + yield temp; + } + default -> throw new IllegalStateException(); + }); } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/executablestatementcount/InputExecutableStatementCountLambdas.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/executablestatementcount/InputExecutableStatementCountLambdas.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/executablestatementcount/InputExecutableStatementCountLambdas.java @@ -0,0 +1,34 @@ +package com.puppycrawl.tools.checkstyle.checks.sizes.executablestatementcount; + +import java.util.function.Consumer; +import java.util.function.Function; + +/* Config: + * max = 1 + * tokens = LAMBDA + */ + +public class InputExecutableStatementCountLambdas { + + Consumer a = (o) -> { // violation + o.toString(); // 1 + o.toString(); // 2 + o.toString(); // 3 + o.toString(); // 4 + o.toString(); // 5 + o.toString(); // 6 + }; + + Consumer b = (x) -> { // violation + Consumer c = (s) -> { // violation + String str = s.toString(); + str = str + "!"; + }; + Consumer d = (s) -> { // violation + String str = s.toString(); + Consumer t = a -> a.toString().trim(); // ok + Function x1 = a -> a; // ok + Function y = a -> null; // ok + }; + }; +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/executablestatementcount/InputExecutableStatementCountMaxZero.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/executablestatementcount/InputExecutableStatementCountMaxZero.java --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/executablestatementcount/InputExecutableStatementCountMaxZero.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/executablestatementcount/InputExecutableStatementCountMaxZero.java @@ -91,7 +91,7 @@ public void run() { // violation /** Empty constructor */ public InputExecutableStatementCountMaxZero(String someString) {} // ok - static Runnable r1 = () -> { // ok + static Runnable r1 = () -> { // violation String.valueOf("Hello world one!"); }; }
ExecutableStatementCount should allow LAMBDA token from discussion at https://github.com/checkstyle/checkstyle/issues/8966 https://checkstyle.org/config_sizes.html#ExecutableStatementCount ``` $ javac Test.java $ cat Test.java public class Test { java.util.function.Consumer a = (o) -> { o.toString(); // 1 o.toString(); // 2 o.toString(); // 3 o.toString(); // 4 o.toString(); // 5 o.toString(); // 6 }; } $ cat config.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <module name="TreeWalker"> <module name="ExecutableStatementCount"> <property name="max" value="5"/> </module> </module> </module> $ java -jar checkstyle-8.36.2-all.jar -c config.xml Test.java Starting audit... Audit done. ``` Expected: violation over lambda on line 2
abandoned PR - https://github.com/checkstyle/checkstyle/pull/9067 , everyone is welcome to pickup code from this PR and create new PR to fix issue.
2021-03-29T14:42:58Z
8.42
checkstyle/checkstyle
9,728
checkstyle__checkstyle-9728
[ "8186" ]
baa2894516d47ee9aca623a7414473f75fedac39
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoWhitespaceBeforeCaseDefaultColonTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoWhitespaceBeforeCaseDefaultColonTest.java new file mode 100644 --- /dev/null +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoWhitespaceBeforeCaseDefaultColonTest.java @@ -0,0 +1,139 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2021 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package org.checkstyle.suppressionxpathfilter; + +import java.io.File; +import java.util.Collections; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import com.puppycrawl.tools.checkstyle.DefaultConfiguration; +import com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceBeforeCaseDefaultColonCheck; + +public class XpathRegressionNoWhitespaceBeforeCaseDefaultColonTest + extends AbstractXpathTestSupport { + + private final String checkName = NoWhitespaceBeforeCaseDefaultColonCheck.class.getSimpleName(); + + @Override + protected String getCheckName() { + return checkName; + } + + @Test + public void testOne() throws Exception { + final File fileToProcess = + new File(getPath( + "SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonOne.java")); + + final DefaultConfiguration moduleConfig = + createModuleConfig(NoWhitespaceBeforeCaseDefaultColonCheck.class); + + final String[] expectedViolation = { + "6:20: " + getCheckMessage(NoWhitespaceBeforeCaseDefaultColonCheck.class, + NoWhitespaceBeforeCaseDefaultColonCheck.MSG_KEY, ":"), + }; + + final List<String> expectedXpathQueries = Collections.singletonList( + "/CLASS_DEF[./IDENT[@text=" + + "'SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonOne']]" + + "/OBJBLOCK/INSTANCE_INIT/SLIST/LITERAL_SWITCH/CASE_GROUP/LITERAL_CASE/COLON" + ); + + runVerifications(moduleConfig, fileToProcess, expectedViolation, + expectedXpathQueries); + } + + @Test + public void testTwo() throws Exception { + final File fileToProcess = + new File(getPath( + "SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonTwo.java")); + + final DefaultConfiguration moduleConfig = + createModuleConfig(NoWhitespaceBeforeCaseDefaultColonCheck.class); + + final String[] expectedViolation = { + "10:21: " + getCheckMessage(NoWhitespaceBeforeCaseDefaultColonCheck.class, + NoWhitespaceBeforeCaseDefaultColonCheck.MSG_KEY, ":"), + }; + + final List<String> expectedXpathQueries = Collections.singletonList( + "/CLASS_DEF[./IDENT[@text=" + + "'SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonTwo']]" + + "/OBJBLOCK/INSTANCE_INIT/SLIST/LITERAL_SWITCH/CASE_GROUP" + + "/LITERAL_DEFAULT/COLON" + ); + + runVerifications(moduleConfig, fileToProcess, expectedViolation, + expectedXpathQueries); + } + + @Test + public void testThree() throws Exception { + final File fileToProcess = + new File(getPath( + "SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonThree.java")); + + final DefaultConfiguration moduleConfig = + createModuleConfig(NoWhitespaceBeforeCaseDefaultColonCheck.class); + + final String[] expectedViolation = { + "7:21: " + getCheckMessage(NoWhitespaceBeforeCaseDefaultColonCheck.class, + NoWhitespaceBeforeCaseDefaultColonCheck.MSG_KEY, ":"), + }; + + final List<String> expectedXpathQueries = Collections.singletonList( + "/CLASS_DEF[./IDENT[@text=" + + "'SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonThree']]" + + "/OBJBLOCK/INSTANCE_INIT/SLIST/LITERAL_SWITCH/CASE_GROUP" + + "/LITERAL_CASE/COLON" + ); + + runVerifications(moduleConfig, fileToProcess, expectedViolation, + expectedXpathQueries); + } + + @Test + public void testFour() throws Exception { + final File fileToProcess = + new File(getPath( + "SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonFour.java")); + + final DefaultConfiguration moduleConfig = + createModuleConfig(NoWhitespaceBeforeCaseDefaultColonCheck.class); + + final String[] expectedViolation = { + "11:21: " + getCheckMessage(NoWhitespaceBeforeCaseDefaultColonCheck.class, + NoWhitespaceBeforeCaseDefaultColonCheck.MSG_KEY, ":"), + }; + + final List<String> expectedXpathQueries = Collections.singletonList( + "/CLASS_DEF[./IDENT[@text=" + + "'SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonFour']]" + + "/OBJBLOCK/INSTANCE_INIT/SLIST/LITERAL_SWITCH/CASE_GROUP" + + "/LITERAL_DEFAULT/COLON" + ); + + runVerifications(moduleConfig, fileToProcess, expectedViolation, + expectedXpathQueries); + } +} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonFour.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonFour.java new file mode 100644 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonFour.java @@ -0,0 +1,15 @@ +package org.checkstyle.suppressionxpathfilter.nowhitespacebeforecasedefaultcolon; + +public class SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonFour { + { + switch(1) { + case 1: + break; + case 2: + break; + default + : // warn + break; + } + } +} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonOne.java new file mode 100644 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonOne.java @@ -0,0 +1,14 @@ +package org.checkstyle.suppressionxpathfilter.nowhitespacebeforecasedefaultcolon; + +public class SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonOne { + { + switch(1) { + case 1 : // warn + break; + case 2: + break; + default: + break; + } + } +} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonThree.java new file mode 100644 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonThree.java @@ -0,0 +1,15 @@ +package org.checkstyle.suppressionxpathfilter.nowhitespacebeforecasedefaultcolon; + +public class SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonThree { + { + switch(1) { + case 1 + : // warn + break; + case 2: + break; + default: + break; + } + } +} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonTwo.java new file mode 100644 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonTwo.java @@ -0,0 +1,14 @@ +package org.checkstyle.suppressionxpathfilter.nowhitespacebeforecasedefaultcolon; + +public class SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonTwo { + { + switch(1) { + case 1: + break; + case 2: + break; + default : // warn + break; + } + } +} diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java b/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java @@ -829,6 +829,8 @@ private static void fillChecksFromWhitespacePackage() { BASE_PACKAGE + ".checks.whitespace.NoWhitespaceAfterCheck"); NAME_TO_FULL_MODULE_NAME.put("NoWhitespaceBeforeCheck", BASE_PACKAGE + ".checks.whitespace.NoWhitespaceBeforeCheck"); + NAME_TO_FULL_MODULE_NAME.put("NoWhitespaceBeforeCaseDefaultColonCheck", + BASE_PACKAGE + ".checks.whitespace.NoWhitespaceBeforeCaseDefaultColonCheck"); NAME_TO_FULL_MODULE_NAME.put("OperatorWrapCheck", BASE_PACKAGE + ".checks.whitespace.OperatorWrapCheck"); NAME_TO_FULL_MODULE_NAME.put("ParenPadCheck", diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonCheck.java new file mode 100644 --- /dev/null +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonCheck.java @@ -0,0 +1,220 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2021 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package com.puppycrawl.tools.checkstyle.checks.whitespace; + +import com.puppycrawl.tools.checkstyle.StatelessCheck; +import com.puppycrawl.tools.checkstyle.api.AbstractCheck; +import com.puppycrawl.tools.checkstyle.api.DetailAST; +import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.TokenUtil; + +/** + * <p> + * Checks that there is no whitespace before the colon in a switch block. + * </p> + * <p> + * To configure the check: + * </p> + * <pre> + * &lt;module name=&quot;NoWhitespaceBeforeCaseDefaultColon&quot;/&gt; + * </pre> + * <p>Example:</p> + * <pre> + * class Test { + * { + * switch(1) { + * case 1 : // violation, whitespace before ':' is not allowed here + * break; + * case 2: // ok + * break; + * default : // violation, whitespace before ':' is not allowed here + * break; + * } + * + * switch(2) { + * case 2: // ok + * break; + * case 3, 4 + * : break; // violation, whitespace before ':' is not allowed here + * case 4, + * 5: break; // ok + * default + * : // violation, whitespace before ':' is not allowed here + * break; + * } + * + * switch(day) { + * case MONDAY, FRIDAY, SUNDAY: System.out.println(" 6"); break; + * case TUESDAY : System.out.println(" 7"); break; // violation + * } + * } + * </pre> + * <p> + * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker} + * </p> + * <p> + * Violation Message Keys: + * </p> + * <ul> + * <li> + * {@code ws.preceded} + * </li> + * </ul> + * + * @since 8.45 + */ +@StatelessCheck +public class NoWhitespaceBeforeCaseDefaultColonCheck + extends AbstractCheck { + + /** + * A key is pointing to the warning message text in "messages.properties" + * file. + */ + public static final String MSG_KEY = "ws.preceded"; + + @Override + public int[] getDefaultTokens() { + return getRequiredTokens(); + } + + @Override + public int[] getAcceptableTokens() { + return getRequiredTokens(); + } + + @Override + public int[] getRequiredTokens() { + return new int[] {TokenTypes.COLON}; + } + + @Override + public boolean isCommentNodesRequired() { + return true; + } + + @Override + public void visitToken(DetailAST ast) { + if (isInSwitch(ast) && isWhiteSpaceBeforeColon(ast)) { + log(ast, MSG_KEY, ast.getText()); + } + } + + /** + * Checks if the colon is inside a switch block. + * + * @param colonAst DetailAST to check. + * @return true, if colon case is inside a switch block. + */ + private static boolean isInSwitch(DetailAST colonAst) { + return TokenUtil.isOfType(colonAst.getParent(), TokenTypes.LITERAL_CASE, + TokenTypes.LITERAL_DEFAULT); + } + + /** + * Checks if there is a whitespace before the colon of a switch case or switch default. + * + * @param colonAst DetailAST to check. + * @return true, if there is whitespace preceding colonAst. + */ + private static boolean isWhiteSpaceBeforeColon(DetailAST colonAst) { + final DetailAST parent = colonAst.getParent(); + final boolean result; + if (isOnDifferentLineWithPreviousToken(colonAst)) { + result = true; + } + else if (parent.getType() == TokenTypes.LITERAL_CASE) { + result = isWhitespaceBeforeColonOfCase(colonAst); + } + else { + result = isWhitespaceBeforeColonOfDefault(colonAst); + } + return result; + } + + /** + * Checks if there is a whitespace before the colon of a switch case. + * + * @param colonAst DetailAST to check. + * @return true, if there is whitespace preceding colonAst. + */ + private static boolean isWhitespaceBeforeColonOfCase(DetailAST colonAst) { + final DetailAST previousSibling = colonAst.getPreviousSibling(); + int offset = 0; + if (previousSibling.getType() == TokenTypes.BLOCK_COMMENT_BEGIN) { + offset = 1; + } + return colonAst.getColumnNo() != getLastColumnNumberOf(previousSibling) + offset; + } + + /** + * Checks if there is a whitespace before the colon of a switch default. + * + * @param colonAst DetailAST to check. + * @return true, if there is whitespace preceding colonAst. + */ + private static boolean isWhitespaceBeforeColonOfDefault(DetailAST colonAst) { + final boolean result; + final DetailAST previousSibling = colonAst.getPreviousSibling(); + if (previousSibling == null) { + final DetailAST literalDefault = colonAst.getParent(); + result = colonAst.getColumnNo() + != literalDefault.getColumnNo() + literalDefault.getText().length(); + } + else { + result = + colonAst.getColumnNo() != getLastColumnNumberOf(previousSibling) + 1; + } + return result; + } + + /** + * Checks if the colon is on same line as of case or default. + * + * @param colonAst DetailAST to check. + * @return true, if colon case is in different line as of case or default. + */ + private static boolean isOnDifferentLineWithPreviousToken(DetailAST colonAst) { + final DetailAST previousSibling; + final DetailAST parent = colonAst.getParent(); + if (parent.getType() == TokenTypes.LITERAL_CASE) { + previousSibling = colonAst.getPreviousSibling(); + } + else { + previousSibling = colonAst.getParent(); + } + return !TokenUtil.areOnSameLine(previousSibling, colonAst); + } + + /** + * Returns the last column number of an ast. + * + * @param ast DetailAST to check. + * @return ast's last column number. + */ + private static int getLastColumnNumberOf(DetailAST ast) { + DetailAST lastChild = ast; + while (lastChild.hasChildren()) { + lastChild = lastChild.getLastChild(); + } + return lastChild.getColumnNo() + lastChild.getText().length(); + } + +}
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/NoWhitespaceBeforeCaseDefaultColonTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/NoWhitespaceBeforeCaseDefaultColonTest.java new file mode 100644 --- /dev/null +++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/NoWhitespaceBeforeCaseDefaultColonTest.java @@ -0,0 +1,52 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2021 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package com.google.checkstyle.test.chapter4formatting.rule462horizontalwhitespace; + +import org.junit.jupiter.api.Test; + +import com.google.checkstyle.test.base.AbstractGoogleModuleTestSupport; +import com.puppycrawl.tools.checkstyle.api.Configuration; +import com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceBeforeCheck; + +public class NoWhitespaceBeforeCaseDefaultColonTest extends AbstractGoogleModuleTestSupport { + + @Override + protected String getPackageLocation() { + return "com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace"; + } + + @Test + public void test() throws Exception { + final Class<NoWhitespaceBeforeCheck> clazz = NoWhitespaceBeforeCheck.class; + final String messageKeyPreceded = "ws.preceded"; + + final String[] expected = { + "6:20: " + getCheckMessage(clazz, messageKeyPreceded, ":"), + "10:21: " + getCheckMessage(clazz, messageKeyPreceded, ":"), + }; + final Configuration checkConfig = getModuleConfig("NoWhitespaceBeforeCaseDefaultColon"); + final String filePath = getPath("InputNoWhitespaceBeforeCaseDefaultColon.java"); + + final Integer[] warnList = getLinesWithWarn(filePath); + verify(checkConfig, filePath, expected, warnList); + } + +} + diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/InputNoWhitespaceBeforeCaseDefaultColon.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/InputNoWhitespaceBeforeCaseDefaultColon.java new file mode 100644 --- /dev/null +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/InputNoWhitespaceBeforeCaseDefaultColon.java @@ -0,0 +1,14 @@ +package com.google.checkstyle.test.chapter4formatting.rule462horizontalwhitespace; + +public class InputNoWhitespaceBeforeCaseDefaultColon { + { + switch(1) { + case 1 : // warn + break; + case 2: + break; + default : // warn + break; + } + } +} diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonCheckTest.java new file mode 100644 --- /dev/null +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonCheckTest.java @@ -0,0 +1,90 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2021 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package com.puppycrawl.tools.checkstyle.checks.whitespace; + +import static com.google.common.truth.Truth.assertWithMessage; +import static com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceBeforeCaseDefaultColonCheck.MSG_KEY; + +import org.junit.jupiter.api.Test; + +import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport; +import com.puppycrawl.tools.checkstyle.DefaultConfiguration; +import com.puppycrawl.tools.checkstyle.api.TokenTypes; + +public class NoWhitespaceBeforeCaseDefaultColonCheckTest + extends AbstractModuleTestSupport { + + @Override + protected String getPackageLocation() { + return "com/puppycrawl/tools/checkstyle/checks/whitespace" + + "/nowhitespacebeforecasedefaultcolon"; + } + + @Test + public void testDefault() throws Exception { + final DefaultConfiguration checkConfig = createModuleConfig( + NoWhitespaceBeforeCaseDefaultColonCheck.class); + final String[] expected = { + "15:20: " + getCheckMessage(MSG_KEY, ":"), + "19:21: " + getCheckMessage(MSG_KEY, ":"), + "32:37: " + getCheckMessage(MSG_KEY, ":"), + "40:21: " + getCheckMessage(MSG_KEY, ":"), + "44:28: " + getCheckMessage(MSG_KEY, ":"), + "47:1: " + getCheckMessage(MSG_KEY, ":"), + "50:27: " + getCheckMessage(MSG_KEY, ":"), + "61:38: " + getCheckMessage(MSG_KEY, ":"), + "66:38: " + getCheckMessage(MSG_KEY, ":"), + "79:24: " + getCheckMessage(MSG_KEY, ":"), + "82:21: " + getCheckMessage(MSG_KEY, ":"), + "89:38: " + getCheckMessage(MSG_KEY, ":"), + "92:35: " + getCheckMessage(MSG_KEY, ":"), + }; + verify(checkConfig, getPath("InputNoWhitespaceBeforeCaseDefaultColon.java"), + expected); + } + + @Test + public void testDefaultNonCompilable() throws Exception { + final DefaultConfiguration checkConfig = createModuleConfig( + NoWhitespaceBeforeCaseDefaultColonCheck.class); + final String[] expected = { + "33:22: " + getCheckMessage(MSG_KEY, ":"), + "36:21: " + getCheckMessage(MSG_KEY, ":"), + "39:25: " + getCheckMessage(MSG_KEY, ":"), + "58:20: " + getCheckMessage(MSG_KEY, ":"), + "71:32: " + getCheckMessage(MSG_KEY, ":"), + "88:17: " + getCheckMessage(MSG_KEY, ":"), + "91:20: " + getCheckMessage(MSG_KEY, ":"), + "94:21: " + getCheckMessage(MSG_KEY, ":"), + }; + verify(checkConfig, + getNonCompilablePath("InputNoWhitespaceBeforeCaseDefaultColonEnumAndStrings.java"), + expected); + } + + @Test + public void testAcceptableTokenIsColon() { + final NoWhitespaceBeforeCaseDefaultColonCheck check = + new NoWhitespaceBeforeCaseDefaultColonCheck(); + assertWithMessage("Acceptable token should be colon").that(new int[] {TokenTypes.COLON}) + .isEqualTo(check.getAcceptableTokens()); + } + +} diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebeforecasedefaultcolon/InputNoWhitespaceBeforeCaseDefaultColonEnumAndStrings.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebeforecasedefaultcolon/InputNoWhitespaceBeforeCaseDefaultColonEnumAndStrings.java new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebeforecasedefaultcolon/InputNoWhitespaceBeforeCaseDefaultColonEnumAndStrings.java @@ -0,0 +1,101 @@ +//non-compiled with javac: Compilable with Java14 +package com.puppycrawl.tools.checkstyle.checks.whitespace.nowhitespacebeforecasedefaultcolon; + +/* + * Config: default + */ +class InputNoWhitespaceBeforeCaseDefaultColonEnumAndStrings { + + enum Day { + MON, + TUE, + WED, + THU, + FRI, + SAT, + SUN, + } + + String whatIsToday(Day day) { + return switch (day) { + case SAT, SUN -> "Weekend"; + case MON, TUE, WED, THU, FRI -> "Working day"; + default -> throw new IllegalArgumentException("Invalid day: " + day.name()); + }; + } + + int assignment(Day day) { + int numLetters = -1; + switch (day) { + case MON, + FRI: numLetters = 6; // ok + break; + case TUE : numLetters = 7; // violation + break; + case THU, SAT + : numLetters = 8; // violation + break; + case WED, + SUN : numLetters = 9; // volation + break; + }; + return numLetters; + } + + int complexCase(Day day) { + int someInt = -1; + return switch (day) { + case MON, + TUE: { // ok + int l = day.toString().length(); + yield l + someInt; + } + case WED: { // ok + int l = day.toString().length(); + yield l + someInt * 2; + } + default + : { // violation + int l = day.toString().length(); + yield l; + } + }; + } + + int numberOfDays(String month) { + int days = -1; + switch (month) { + case "FEB": days = 28; // ok + break; + case "JAN", "MAR" + , "MAY" : days = 31; break; // violation + case "APR", "JUN": days = 30; // ok + break; + }; + return days; + } + + enum T { + A, B, C; + } + + static { + int x; + T e = T.B; + + boolean t8 = (switch (e) { + case A + : // violation + x = 1; + yield true; + case B : // violation + yield (x = 1) == 1 || true; + default + :yield false; // violation + }) && x == 1; + + if (!t8) { + throw new IllegalStateException("Unexpected result."); + } + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebeforecasedefaultcolon/InputNoWhitespaceBeforeCaseDefaultColon.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebeforecasedefaultcolon/InputNoWhitespaceBeforeCaseDefaultColon.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebeforecasedefaultcolon/InputNoWhitespaceBeforeCaseDefaultColon.java @@ -0,0 +1,110 @@ +/* +NoWhitespaceBeforeCaseDefaultColon + + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.whitespace.nowhitespacebeforecasedefaultcolon; + +import com.puppycrawl.tools.checkstyle.api.TokenTypes; + +public class InputNoWhitespaceBeforeCaseDefaultColon { + { + switch(1) { + case 1 : // violation + break; + case 2: + break; + default : // violation + break; + } + + switch(2) { + case 2: + break; + default: + break; + + } + + switch(3) { + case 3/* space after */ : // violation + break; + default/* no space after */: + break; + } + + switch(4) { + case 4 + : // violation + break; + default: + switch(5) { + case 5 : // violation + break; + case 6 +: // violation + break; + case 7 + : // violation + break; + default: + break; + } + break; + } + + switch(8) { + case 8/* no space after */: + break; + default/* space after */ : // violation + break; + } + + switch (TokenTypes.ABSTRACT) { + case TokenTypes.TYPECAST : // violation + break; + case TokenTypes.ARRAY_DECLARATOR: + break; + default: + break; + } + + switch(9) { + case + 9: + break; + case + 10 : // violation + break; + default + : // violation + break; + + } + + switch(11) { + case + /* comment */ 11 : // violation + break; + default + /* comment */ : // violation + break; + + } + + for (int var1 : new int[]{}) {} + + for (int var2: new int[]{}) {} + + int i = true ? 0 : 1; + + int j = false ? 0 + : 1; + + for (int t = 10; --t >= 0; ) { + } + + } +}
new Check: NoWhitespaceBeforeCaseDefaultColon The idea of this check originates from https://github.com/checkstyle/checkstyle/issues/8045 This check should report whitespaces before colon token of switch cases and default. ``` cat Test.java class Test { { switch(1) { case 1 : // expected violation break; case 2: break; default : // expected violation break; } } } $ cat config.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <property name="charset" value="UTF-8"/> <module name="TreeWalker"> <module name="NoWhitespaceBeforeCaseDefaultColon"/> </module> </module> /var/tmp $ java $RUN_LOCALE -jar checkstyle-8.31-all.jar -c config.xml TestClass.java Starting audit... [ERROR] /var/tmp/Test.java:4: ':' is preceded with whitespace. [NoWhitespaceBeforeCaseDefaultColon] [ERROR] /var/tmp/Test.java:6: ':' is preceded with whitespace. [NoWhitespaceBeforeCaseDefaultColon] Audit done. Checkstyle ends with 2 errors. ``` Rationale: The official [google java style guide](https://google.github.io/styleguide/javaguide.html#s4.6-whitespace) does not allow whitespaces before the colon of switch cases and default. Adding this check will improve checkstyle's support for google's java style guide. Also, we can see in comments of https://github.com/checkstyle/checkstyle/issues/8045 that users are well receptive to the check.
Also, no whitespace is expected in [LabeledStatements](https://docs.oracle.com/javase/specs/jls/se8/html/jls-14.html#jls-LabeledStatement): ```java outer: for(;;) { for(;;) { break outer; } } ``` If we come up with a good name, we can also handle them. @pbludov, we handle this already. See Issue https://github.com/checkstyle/checkstyle/issues/8124 and corresponding PR https://github.com/checkstyle/checkstyle/pull/8125 > @pbludov, we handle this already. > See Issue #8124 and corresponding PR #8125 Sorry, I missed it. Well, it looks weird: actually, it should be "no whitespace **after** labeled statement." @romani may be it is better to revert #8124 and add this to the new check? @pbludov I agree with you that it seems weird, but I think the weirdness comes from the tree structure, from the fact that the colon ':' of a labeled statement is not a child of the `LABELED_STAT` token, but instead is the text of `LABELED_STAT` token. | |--LABELED_STAT -> : [4:24] | | |--IDENT -> mylabel [4:16] | | |--SINGLE_LINE_COMMENT -> // [4:27] | | | `--COMMENT_CONTENT -> expected violation\n [4:29] What we wanted in #8124 was a check that reports whitespace *before* the colon of a labeled statement, so it made sense to add that token to `NoWhitespaceBeforeCheck` I am on it.
2021-03-26T20:42:44Z
8.44
checkstyle/checkstyle
9,539
checkstyle__checkstyle-9539
[ "8179" ]
d728b6e43bf8d8459bfcecd1c9187c52883a298e
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyLineSeparatorTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyLineSeparatorTest.java --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyLineSeparatorTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyLineSeparatorTest.java @@ -122,21 +122,38 @@ public void testFour() throws Exception { moduleConfig.addAttribute("allowMultipleEmptyLines", "false"); final String[] expectedViolation = { - "12:5: " + getCheckMessage(EmptyLineSeparatorCheck.class, - EmptyLineSeparatorCheck.MSG_MULTIPLE_LINES_AFTER, "METHOD_DEF"), + "12:25: " + getCheckMessage(EmptyLineSeparatorCheck.class, + EmptyLineSeparatorCheck.MSG_MULTIPLE_LINES_AFTER, "}"), }; - final List<String> expectedXpathQueries = Arrays.asList( + final List<String> expectedXpathQueries = Collections.singletonList( "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionEmptyLineSeparator4']]" - + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]", + + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]/SLIST/RCURLY" + ); - "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionEmptyLineSeparator4']]" - + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]" - + "/MODIFIERS", + runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries); + } - "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionEmptyLineSeparator4']]" - + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]" - + "/MODIFIERS/LITERAL_PUBLIC" + @Test + public void testFive() throws Exception { + final File fileToProcess = new File( + getPath("SuppressionXpathRegressionEmptyLineSeparator5.java") + ); + + final DefaultConfiguration moduleConfig = + createModuleConfig(EmptyLineSeparatorCheck.class); + moduleConfig.addAttribute("allowMultipleEmptyLines", "false"); + moduleConfig.addAttribute("allowMultipleEmptyLinesInsideClassMembers", "false"); + + final String[] expectedViolation = { + "14:15: " + getCheckMessage(EmptyLineSeparatorCheck.class, + EmptyLineSeparatorCheck.MSG_MULTIPLE_LINES_INSIDE), + }; + + final List<String> expectedXpathQueries = Collections.singletonList( + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionEmptyLineSeparator5']]" + + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]/SLIST/LITERAL_TRY/SLIST" + + "/SINGLE_LINE_COMMENT/COMMENT_CONTENT" ); runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries); diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator5.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator5.java new file mode 100644 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator5.java @@ -0,0 +1,22 @@ +package org.checkstyle.suppressionxpathfilter.emptylineseparator; + +import java.io.IOException; + +public class SuppressionXpathRegressionEmptyLineSeparator5 { + + int foo1() throws Exception { + int a = 1; + int b = 2; + try { + if (a != b) { + throw new IOException(); + } + // warn + + + } catch(IOException e) { + return 1; + } + return 0; + } +} diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java @@ -444,7 +444,9 @@ private void checkToken(DetailAST ast, DetailAST nextToken) { default: if (nextToken.getType() == TokenTypes.RCURLY) { if (hasNotAllowedTwoEmptyLinesBefore(nextToken)) { - log(ast, MSG_MULTIPLE_LINES_AFTER, ast.getText()); + final DetailAST result = getLastElementBeforeEmptyLines(ast, + nextToken.getLineNo()); + log(result, MSG_MULTIPLE_LINES_AFTER, result.getText()); } } else if (!hasEmptyLineAfter(ast)) { @@ -477,12 +479,65 @@ private void processMultipleLinesInside(DetailAST ast) { if (isClassMemberBlock(astType)) { final List<Integer> emptyLines = getEmptyLines(ast); final List<Integer> emptyLinesToLog = getEmptyLinesToLog(emptyLines); - for (Integer lineNo : emptyLinesToLog) { - // Checkstyle counts line numbers from 0 but IDE from 1 - log(lineNo + 1, MSG_MULTIPLE_LINES_INSIDE); + log(getLastElementBeforeEmptyLines(ast, lineNo), MSG_MULTIPLE_LINES_INSIDE); + } + } + } + + /** + * Returns the element after which empty lines exist. + * + * @param ast the ast to check. + * @param line the empty line which gives violation. + * @return The DetailAST after which empty lines are present. + */ + private static DetailAST getLastElementBeforeEmptyLines(DetailAST ast, int line) { + DetailAST result = ast; + if (ast.getFirstChild().getLineNo() <= line) { + result = ast.getFirstChild(); + while (result.getNextSibling() != null + && result.getNextSibling().getLineNo() <= line) { + result = result.getNextSibling(); + } + if (result.hasChildren()) { + result = getLastElementBeforeEmptyLines(result, line); + } + } + + if (result.getNextSibling() != null) { + final Optional<DetailAST> postFixNode = getPostFixNode(result.getNextSibling()); + if (postFixNode.isPresent()) { + // A post fix AST will always have a sibling METHOD CALL + // METHOD CALL will at least have two children + // The first first child is DOT in case of POSTFIX which have at least 2 children + // First child of DOT again puts us back to normal AST tree which will + // recurse down below from here + final DetailAST firstChildAfterPostFix = postFixNode.get(); + result = getLastElementBeforeEmptyLines(firstChildAfterPostFix, line); } } + return result; + } + + /** + * Gets postfix Node from AST if present. + * + * @param ast the AST used to get postfix Node. + * @return Optional postfix node. + */ + private static Optional<DetailAST> getPostFixNode(DetailAST ast) { + Optional<DetailAST> result = Optional.empty(); + if (ast.getType() == TokenTypes.EXPR + // EXPR always has at least one child + && ast.getFirstChild().getType() == TokenTypes.METHOD_CALL) { + // METHOD CALL always has at two least child + final DetailAST node = ast.getFirstChild().getFirstChild(); + if (node.getType() == TokenTypes.DOT) { + result = Optional.of(node); + } + } + return result; } /** @@ -534,7 +589,7 @@ private static List<Integer> getEmptyLinesToLog(List<Integer> emptyLines) { int previousEmptyLineNo = emptyLines.get(0); for (int emptyLineNo : emptyLines) { if (previousEmptyLineNo + 1 == emptyLineNo) { - emptyLinesToLog.add(emptyLineNo); + emptyLinesToLog.add(previousEmptyLineNo); } previousEmptyLineNo = emptyLineNo; }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java @@ -103,7 +103,7 @@ public void testMultipleEmptyLinesBetweenClassMembers() throws Exception { "33:5: " + getCheckMessage(MSG_MULTIPLE_LINES, "VARIABLE_DEF"), "38:5: " + getCheckMessage(MSG_MULTIPLE_LINES, "VARIABLE_DEF"), "43:5: " + getCheckMessage(MSG_MULTIPLE_LINES, "METHOD_DEF"), - "45:5: " + getCheckMessage(MSG_MULTIPLE_LINES_AFTER, "METHOD_DEF"), + "45:33: " + getCheckMessage(MSG_MULTIPLE_LINES_AFTER, "}"), }; verify(checkConfig, getPath("InputEmptyLineSeparatorMultipleEmptyLines.java"), expected); } @@ -256,10 +256,12 @@ public void testPreviousLineEmptiness() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(EmptyLineSeparatorCheck.class); checkConfig.addAttribute("allowMultipleEmptyLinesInsideClassMembers", "false"); final String[] expected = { - "11: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), - "16: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), - "22: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), - "31: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), + "13:30: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), + "18:5: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), + "24:67: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), + "33:48: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), + "43:21: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), + }; verify(checkConfig, getPath("InputEmptyLineSeparatorPreviousLineEmptiness.java"), expected); @@ -270,12 +272,11 @@ public void testDisAllowMultipleEmptyLinesInsideClassMembers() throws Exception final DefaultConfiguration checkConfig = createModuleConfig(EmptyLineSeparatorCheck.class); checkConfig.addAttribute("allowMultipleEmptyLinesInsideClassMembers", "false"); final String[] expected = { - "27: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), - "39: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), - "45: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), - "50: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), - "55: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), - "56: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), + "25:11: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), + "37:11: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), + "43:11: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), + "48:31: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), + "53:11: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), "60:1: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "CLASS_DEF"), }; verify(checkConfig, @@ -464,8 +465,8 @@ public void testEmptyLineSeparatorRecordsAndCompactCtorsNoEmptyLines() throws Ex final String[] expected = { "2:1: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "package"), - "16: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), - "22: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), + "14:27: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), + "20:29: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), }; verify(checkConfig, @@ -486,4 +487,55 @@ public void testEmptyLineSeparatorMultipleSingleTypeVariables() throws Exception expected); } + @Test + public void testEmptyLineSeparatorEmptyLinesInsideClassMembersRecursive() throws Exception { + final DefaultConfiguration checkConfig = createModuleConfig(EmptyLineSeparatorCheck.class); + checkConfig.addAttribute("allowMultipleEmptyLinesInsideClassMembers", "false"); + final String[] expected = { + "19:15: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), + }; + verify(checkConfig, + getPath("InputEmptyLineSeparatorRecursive.java"), + expected); + } + + @Test + public void testEmptyLineSeparatorNewMethodDef() throws Exception { + final DefaultConfiguration checkConfig = createModuleConfig(EmptyLineSeparatorCheck.class); + checkConfig.addAttribute("allowMultipleEmptyLinesInsideClassMembers", "false"); + final String[] expected = { + "21:34: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), + "30:26: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), + }; + verify(checkConfig, + getPath("InputEmptyLineSeparatorNewMethodDef.java"), + expected); + } + + @Test + public void testEmptyLineSeparatorPostFixCornerCases() throws Exception { + final DefaultConfiguration checkConfig = createModuleConfig(EmptyLineSeparatorCheck.class); + checkConfig.addAttribute("allowMultipleEmptyLinesInsideClassMembers", "false"); + final String[] expected = { + "10:19: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), + "24:29: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), + "35:29: " + getCheckMessage(MSG_MULTIPLE_LINES_INSIDE), + }; + verify(checkConfig, + getPath("InputEmptyLineSeparatorPostFixCornerCases.java"), + expected); + } + + @Test + public void testEmptyLineSeparatorAnnotation() throws Exception { + final DefaultConfiguration checkConfig = createModuleConfig(EmptyLineSeparatorCheck.class); + checkConfig.addAttribute("allowMultipleEmptyLines", "false"); + final String[] expected = { + "10:22: " + getCheckMessage(MSG_MULTIPLE_LINES_AFTER, "}"), + }; + verify(checkConfig, + getPath("InputEmptyLineSeparatorAnnotations.java"), + expected); + } + } diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorRecordsAndCompactCtorsNoEmptyLines.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorRecordsAndCompactCtorsNoEmptyLines.java --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorRecordsAndCompactCtorsNoEmptyLines.java +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorRecordsAndCompactCtorsNoEmptyLines.java @@ -11,15 +11,15 @@ * */ public class InputEmptyLineSeparatorRecordsAndCompactCtorsNoEmptyLines { - public void foo() { + public void foo() { // violation - } // ^ violation + } public record MyRecord1(){ - public MyRecord1{ + public MyRecord1{ // violation - } // ^ violation + } } } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorAnnotations.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorAnnotations.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorAnnotations.java @@ -0,0 +1,15 @@ +package com.puppycrawl.tools.checkstyle.checks.whitespace.emptylineseparator; + +/** + * Config: + * allowMultipleEmptyLines = false + */ +public class InputEmptyLineSeparatorAnnotations { + @Deprecated + @SuppressWarnings("unchecked") + class SomeClass {} // violation + + + + +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorNewMethodDef.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorNewMethodDef.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorNewMethodDef.java @@ -0,0 +1,35 @@ +package com.puppycrawl.tools.checkstyle.checks.whitespace.emptylineseparator; + +import java.util.ArrayList; + +/** + * Config: + * allowMultipleEmptyLinesInsideClassMembers = false + */ +public class InputEmptyLineSeparatorNewMethodDef { + private static final int MULTIPLICATOR; + + void processOne() { // ok + + int a; + + int b; + + new ArrayList<String>() { + { + add("String One"); + add("String Two"); // violation + + + add("String Three"); + } + }.add("String Four"); + } + + static { // violation at line below + MULTIPLICATOR = 5; + + + } + +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorPostFixCornerCases.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorPostFixCornerCases.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorPostFixCornerCases.java @@ -0,0 +1,41 @@ +package com.puppycrawl.tools.checkstyle.checks.whitespace.emptylineseparator; + +/** + * Config: + * allowMultipleEmptyLinesInsideClassMembers = false + */ +public class InputEmptyLineSeparatorPostFixCornerCases { + + protected void foo1() throws Exception { + int a = 25; + // violation + + + foo(a); + } + + void foo(int a) { + System.out.println(a); + } + + protected void foo() { + + Object[] defaults = new Object[] { + "String One", + // violation + + + "String Two", + + }; + } + + protected void foo2() { + Object[] defaults = new Object[] { + "String One", 13, + + + "String Two", // violation above this line. + }; + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorPreviousLineEmptiness.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorPreviousLineEmptiness.java --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorPreviousLineEmptiness.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorPreviousLineEmptiness.java @@ -1,12 +1,16 @@ package com.puppycrawl.tools.checkstyle.checks.whitespace.emptylineseparator; +/** + * Config: + * allowMultipleEmptyLinesInsideClassMembers = false + */ public class InputEmptyLineSeparatorPreviousLineEmptiness { private static final int MULTIPLICATOR; private int base; static { - MULTIPLICATOR = 5; + MULTIPLICATOR = 5; // violation } @@ -17,7 +21,7 @@ public class InputEmptyLineSeparatorPreviousLineEmptiness { base = 33; } - public InputEmptyLineSeparatorPreviousLineEmptiness(int base) { + public InputEmptyLineSeparatorPreviousLineEmptiness(int base) { // violation this.base = base; @@ -26,9 +30,18 @@ public InputEmptyLineSeparatorPreviousLineEmptiness(int base) { public InputEmptyLineSeparatorPreviousLineEmptiness() { } - public static int increment(int value) { + public static int increment(int value) { // violation return value * MULTIPLICATOR + 1; } + + void foo2() { // ok + } + + + void foo3() { // violation + + + } } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorRecursive.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorRecursive.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorRecursive.java @@ -0,0 +1,28 @@ +package com.puppycrawl.tools.checkstyle.checks.whitespace.emptylineseparator; + +import java.io.IOException; + +/** + * Config: + * allowMultipleEmptyLinesInsideClassMembers = false + */ +public class InputEmptyLineSeparatorRecursive { + + int foo1() throws Exception { + int a = 1; + int b = 2; + try { + if (a != b) { + throw new IOException(); + } + // empty lines below should cause a violation + // violation + + + } catch(IOException e) { + System.out.println("IO error: " + e.getMessage()); + return 1; + } + return 0; + } +}
EmptyLineSeparator: Inability to use xpath for violation on empty line Split from #7956 https://github.com/checkstyle/checkstyle/blob/a8a90cf2423c27fb3fe227fc1906fdfc255f5d9b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java#L419 There is no AST node associated an empty line for which the violations are logged. This results the inability of such violations to be xpath suppressed. We may need to change the violation a bit to make it compliant with xpath. ``` C:\Users\Shashwat\Documents>cat config.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <module name="TreeWalker"> <module name="EmptyLineSeparator"> <property name="allowMultipleEmptyLinesInsideClassMembers" value="false"/> <property name="allowMultipleEmptyLines" value="false"/> </module> </module> </module> C:\Users\Shashwat\Documents>cat Test.java class A { void foo() { // line 5 } // line 9 } C:\Users\Shashwat\Documents>java -jar checkstyle-8.31-all.jar -c config.xml Test.java Starting audit... [ERROR] C:\Users\Shashwat\Documents\Test.java:5: 'METHOD_DEF' has more than 1 empty lines before. [EmptyLineSeparator] [ERROR] C:\Users\Shashwat\Documents\Test.java:7: There is more than 1 empty line one after another. [EmptyLineSeparator] [ERROR] C:\Users\Shashwat\Documents\Test.java:8: There is more than 1 empty line one after another. [EmptyLineSeparator] Audit done. Checkstyle ends with 3 errors. ``` In the above example it is clear that when we have to log violation for a similar case, outside the class members, we do it in a single go. ```Test.java:5: 'METHOD_DEF' has more than 1 empty lines before. [EmptyLineSeparator]``` This can be extended to solve this issue as well, where instead of logging for every empty line, we can log violation for the above example as follows: ```Test.java:9: There is more than 1 empty line above. [EmptyLineSeparator]``` However, the node to be logged is a bit uncertain. This needs to be dicussed.
it is not critical on what node to print violation as in java you always have some character after - end of class scope. It would be good to report on previous token always, as we always know it existed and we do NOT know what will be on next line, this will be more reliable approach I think. @romani it' ok to move violation report on previous token, right? If yes, I will plan to solve this issue. >it' ok to move violation report on previous token, right? Right. You are welcome to send PR I am on it.
2021-03-15T09:02:04Z
8.41
checkstyle/checkstyle
9,744
checkstyle__checkstyle-9744
[ "9315" ]
625a85ca14a10a2ee1b9760945cf7473d0538677
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheck.java @@ -225,6 +225,10 @@ private static List<DetailNode> getAllNewlineNodes(DetailNode descriptionNode) { final List<DetailNode> textNodes = new ArrayList<>(); DetailNode node = JavadocUtil.getFirstChild(descriptionNode); while (JavadocUtil.getNextSibling(node) != null) { + if (node.getType() == JavadocTokenTypes.HTML_ELEMENT) { + final DetailNode descriptionNodeChild = JavadocUtil.getFirstChild(node); + textNodes.addAll(getAllNewlineNodes(descriptionNodeChild)); + } if (node.getType() == JavadocTokenTypes.LEADING_ASTERISK) { textNodes.add(node); }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheckTest.java @@ -126,6 +126,19 @@ public void testBlockTag() throws Exception { "86: " + getCheckMessage(MSG_KEY, 4), "87: " + getCheckMessage(MSG_KEY, 4), "88: " + getCheckMessage(MSG_KEY, 4), + "89: " + getCheckMessage(MSG_KEY, 4), + "90: " + getCheckMessage(MSG_KEY, 4), + "91: " + getCheckMessage(MSG_KEY, 4), + "92: " + getCheckMessage(MSG_KEY, 4), + "93: " + getCheckMessage(MSG_KEY, 4), + "94: " + getCheckMessage(MSG_KEY, 4), + "95: " + getCheckMessage(MSG_KEY, 4), + "96: " + getCheckMessage(MSG_KEY, 4), + "97: " + getCheckMessage(MSG_KEY, 4), + "98: " + getCheckMessage(MSG_KEY, 4), + "99: " + getCheckMessage(MSG_KEY, 4), + "104: " + getCheckMessage(MSG_KEY, 4), + "105: " + getCheckMessage(MSG_KEY, 4), }; verify(checkConfig, getPath("InputJavadocTagContinuationIndentationBlockTag.java"), expected); diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctagcontinuationindentation/InputJavadocTagContinuationIndentationBlockTag.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctagcontinuationindentation/InputJavadocTagContinuationIndentationBlockTag.java --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctagcontinuationindentation/InputJavadocTagContinuationIndentationBlockTag.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctagcontinuationindentation/InputJavadocTagContinuationIndentationBlockTag.java @@ -86,18 +86,24 @@ public boolean isMultipleLines2() { * if the commandline is initially null, the function is a noop * otherwise the function append to the commandline arguments concerning * <ul> // violation, not correctly indented - * <li> // ok, inside a HTML element - * cvs package // ok, inside a HTML element - * </li> // ok, inside a HTML element - * <li> // ok, inside a HTML element - * compression // ok, inside a HTML element - * </li> // ok, inside a HTML element - * <li> // ok, inside a HTML element - * quiet or reallyquiet // ok, inside a HTML element - * </li> // ok, inside a HTML element - * <li>cvsroot</li> // ok, inside a HTML element - * <li>noexec</li> // ok, inside a HTML element - * </ul> // ok, inside a HTML element + * <li> // violation, not correctly indented + * cvs package // violation, not correctly indented + * </li> // violation, not correctly indented + * <li> // violation, not correctly indented + * compression // violation, not correctly indented + * </li> // violation, not correctly indented + * <li> // violation, not correctly indented + * quiet or reallyquiet // violation, not correctly indented + * </li> // violation, not correctly indented + * <li>cvsroot</li> // violation, not correctly indented + * <li>noexec</li> // violation, not correctly indented + * <li> + * another item // ok + * </li> + * <li> yet another item </li> // ok + * </ul> // violation, not correctly indented + * some text <i>word</i> more text. // violation + * some text <i>word</i> more text. // ok */ public String regressionNestedHtml(CharSequence c) { return "";
JavadocTagContinuationIndentation does not check text inside HTML elements From https://github.com/checkstyle/checkstyle/pull/8177#discussion_r579386002 Check documentation: https://checkstyle.org/config_javadoc.html#JavadocTagContinuationIndentation ```cmd D:\checkstyletest>type config.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <property name="severity" value="error"/> <module name="TreeWalker"> <module name="JavadocTagContinuationIndentation"/> </module> </module> D:\checkstyletest>type test\MyClass.java class MyClass { /** * Javadoc. * * @param x This is the start of a param tag. * Continuing lines must have indentation. // ok * Lines without indentation are violations. // violation * <p>HTML tags are also affected by this rule.</p> // not a violation yet, will be fixed in #8177 * And subsequent text is also checked. // violation * <p> * However, text nested inside HTML elements are unaffected. // no violation * </p> */ void foo(int x) { // do stuff } } D:\checkstyletest>set RUN_LOCALE="-Duser.language=en -Duser.country=US" D:\checkstyletest>java -jar "-Duser.language=en -Duser.country=US" checkstyle-8.40-all.jar -c config.xml test\MyClass.java Starting audit... [ERROR] D:\checkstyletest\test\MyClass.java:8: Line continuation have incorrect indentation level, expected level should be 4. [JavadocTagContinuationIndentation] [ERROR] D:\checkstyletest\test\MyClass.java:10: Line continuation have incorrect indentation level, expected level should be 4. [JavadocTagContinuationIndentation] Audit done. Checkstyle ends with 2 errors. ``` --- The line `However, text nested inside HTML elements are unaffected.` does not raise any violation, despite having no indentation with respect to the `@param` tag. In general, when HTML elements are involved the text between the start and end tags is not checked. This behavior may be unintuitive as the check documentation does not have any examples on whether or not this is considered a violation. - ~~If this is intended behavior, then the documentation should be updated to include a similar example so that future users will not be confused by this case.~~ see https://github.com/checkstyle/checkstyle/issues/9315#issuecomment-808765706 - Otherwise, if this is considered a bug then please see https://github.com/checkstyle/checkstyle/pull/8177#discussion_r579386002 for details on how it may be fixed.
@romani I want to work on this. > if this is considered a bug is this a bug? or do I need to update the documentation? it is bug, nor now, I do not think we need to update docuemntation
2021-03-28T18:25:36Z
8.45
checkstyle/checkstyle
9,370
checkstyle__checkstyle-9370
[ "9010" ]
3124419d3dbe26f6269ed84ae98b601e7e95898b
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.java @@ -19,19 +19,14 @@ package com.puppycrawl.tools.checkstyle.checks; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import java.util.regex.Pattern; import com.puppycrawl.tools.checkstyle.StatelessCheck; import com.puppycrawl.tools.checkstyle.api.AbstractCheck; import com.puppycrawl.tools.checkstyle.api.DetailAST; -import com.puppycrawl.tools.checkstyle.api.TextBlock; import com.puppycrawl.tools.checkstyle.api.TokenTypes; import com.puppycrawl.tools.checkstyle.utils.CommonUtil; +import com.puppycrawl.tools.checkstyle.utils.TokenUtil; /** * <p> @@ -139,11 +134,8 @@ public class TrailingCommentCheck extends AbstractCheck { */ public static final String MSG_KEY = "trailing.comments"; - /** - * A Map contains illegal lines, the key is lineNo, the value is - * ColumnNo. - */ - private final Map<Integer, Integer> illegalLines = new HashMap<>(); + /** Specify pattern for strings to be formatted without comment specifiers. */ + private static final Pattern FORMAT_LINE = Pattern.compile("/"); /** * Define pattern for text allowed in trailing comments. @@ -200,76 +192,96 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { + if (ast.getType() == TokenTypes.SINGLE_LINE_COMMENT) { + checkSingleLineComment(ast); + } + else { + checkBlockComment(ast); + } + } + + /** + * Checks if single line comment is legal. + * + * @param ast Detail ast element to be checked. + */ + private void checkSingleLineComment(DetailAST ast) { final int lineNo = ast.getLineNo(); - if (illegalLines.get(lineNo) != null - && illegalLines.get(lineNo).equals(ast.getColumnNo())) { + final String comment = ast.getFirstChild().getText(); + final String line = getLines()[lineNo - 1]; + final String lineBefore = line.substring(0, ast.getColumnNo()); + + if (!format.matcher(lineBefore).find() + && !isLegalSingleLineComment(comment)) { log(ast, MSG_KEY); } } - @Override - public void beginTree(DetailAST rootAST) { - final Map<Integer, TextBlock> cppComments = getFileContents() - .getSingleLineComments(); - final Map<Integer, List<TextBlock>> cComments = getFileContents() - .getBlockComments(); - final Set<Integer> lines = new HashSet<>(); - lines.addAll(cppComments.keySet()); - lines.addAll(cComments.keySet()); + /** + * Method to check if block comment is in correct format. + * + * @param ast Detail ast element to be checked. + */ + private void checkBlockComment(DetailAST ast) { + final int lineNo = ast.getLineNo(); + final String comment = ast.getFirstChild().getText(); + String line = getLines()[lineNo - 1]; + + if (line.length() > ast.getLastChild().getColumnNo() + 1) { + line = line.substring(ast.getLastChild().getColumnNo() + 2); + } + + line = FORMAT_LINE.matcher(line).replaceAll(""); - for (Integer lineNo : lines) { - final String line = getLines()[lineNo - 1]; - final String lineBefore; - final TextBlock comment; - if (cppComments.containsKey(lineNo)) { - comment = cppComments.get(lineNo); - lineBefore = line.substring(0, comment.getStartColNo()); - } - else { - final List<TextBlock> commentList = cComments.get(lineNo); - comment = commentList.get(commentList.size() - 1); - lineBefore = line.substring(0, comment.getStartColNo()); + final String lineBefore = getLines()[lineNo - 1].substring(0, ast.getColumnNo()); - // do not check comment which doesn't end line - if (comment.getText().length == 1 - && !CommonUtil.isBlank(line - .substring(comment.getEndColNo() + 1))) { - continue; - } - } - if (!format.matcher(lineBefore).find() - && !isLegalComment(comment)) { - illegalLines.put(lineNo, comment.getStartColNo()); - } + // do not check comment which doesn't end line + if ((ast.getLineNo() != ast.getLastChild().getLineNo() || CommonUtil.isBlank(line)) + && !format.matcher(lineBefore).find() + && !isLegalBlockComment(ast, comment)) { + log(ast, MSG_KEY); } } /** - * Checks if given comment is legal (single-line and matches to the - * pattern). + * Checks if block comment is legal and matches to the pattern. * + * @param ast Detail ast element to be checked. * @param comment comment to check. * @return true if the comment if legal. */ - private boolean isLegalComment(final TextBlock comment) { + private boolean isLegalBlockComment(DetailAST ast, String comment) { final boolean legal; // multi-line comment can not be legal - if (legalComment == null || comment.getStartLineNo() != comment.getEndLineNo()) { + if (legalComment == null + || !TokenUtil.areOnSameLine(ast.getFirstChild(), ast.getLastChild())) { legal = false; } else { - String commentText = comment.getText()[0]; - // remove chars which start comment - commentText = commentText.substring(2); - // if this is a C-style comment we need to remove its end - if (commentText.endsWith("*/")) { - commentText = commentText.substring(0, commentText.length() - 2); - } - commentText = commentText.trim(); + final String commentText = comment.trim(); legal = legalComment.matcher(commentText).find(); } return legal; } + /** + * Checks if given single line comment is legal (single-line and matches to the + * pattern). + * + * @param comment comment to check. + * @return true if the comment if legal. + */ + private boolean isLegalSingleLineComment(String comment) { + final boolean legal; + if (legalComment == null) { + legal = false; + } + else { + // remove chars which start comment + final String commentText = comment.substring(1).trim(); + legal = legalComment.matcher(commentText).find(); + } + return legal; + } }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheckTest.java @@ -103,8 +103,10 @@ public void testFormat() throws Exception { "29:50: " + getCheckMessage(MSG_KEY), "30:51: " + getCheckMessage(MSG_KEY), "31:31: " + getCheckMessage(MSG_KEY), + "34:9: " + getCheckMessage(MSG_KEY), + "35:9: " + getCheckMessage(MSG_KEY), + "43:5: " + getCheckMessage(MSG_KEY), }; verify(checkConfig, getPath("InputTrailingComment.java"), expected); } - } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/trailingcomment/InputTrailingComment.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/trailingcomment/InputTrailingComment.java --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/trailingcomment/InputTrailingComment.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/trailingcomment/InputTrailingComment.java @@ -18,16 +18,31 @@ public void run() { /* c-style */ // cpp-style /* c-style 1 */ /*c-style 2 */ - void method2(long ms /* we should ignore this */) { + /* package */ void method2(long ms /* we should ignore this */) { /* comment before text */int z; /* int y */int y/**/; } /** - * comment with trailing space + * comment with trailing space. */ final static public String NAME="Some Name"; // NOI18N final static public String NAME2="Some Name"; /*NOI18N*/ String NAME3="Some Name"; /*NOI18N */ + /* package */ void method3() { + /* violation on this block */ + // violation here for format NOT FOUND + } + + private static class TimerEntry { + /* ok */ final String operation = null; + /* ok */ final long start = 0L; + } + + /** + * violation above this line. + **/ + /* package */ void addError() { + } }
TrailingComment report violation on comment at the begining of line detected at https://github.com/checkstyle/checkstyle/pull/8711 detected problem: ``` /*package*/ void setAutoflush(boolean autoflush) { this.autoflush = autoflush; } ``` There should be no violation on this code We need to avoid usage of following code https://github.com/checkstyle/checkstyle/blob/41769cee1881c8c92cc59762b90b83529406208a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.java#L191-L195 and use only AST based code, as all content of comments is present in tree.
I am on it I am on it.
2021-03-11T04:05:12Z
8.41
checkstyle/checkstyle
9,209
checkstyle__checkstyle-9209
[ "9204" ]
23c7f55794fbe0b3e46e95b988d6874a466ebf47
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheck.java @@ -41,7 +41,8 @@ * Property {@code violateExecutionOnNonTightHtml} - Control when to print violations if the * Javadoc being examined by this check violates the tight html rules defined at * <a href="https://checkstyle.org/writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>. - * Type is {@code boolean}. Default value is {@code false}. + * Type is {@code boolean}. + * Default value is {@code false}. * </li> * </ul> * <p> diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.java b/src/main/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.java @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashSet; +import java.util.Locale; import java.util.Map; import java.util.Optional; import java.util.Set; @@ -57,14 +58,14 @@ public class JavadocMetadataScraper extends AbstractJavadocCheck { private static final Pattern PROPERTY_TAG = Pattern.compile("\\s*Property\\s*"); /** Regular expression for property type location in class-level javadocs. */ - private static final Pattern TYPE_TAG = Pattern.compile("\\s.*Type is\\s.*"); + private static final Pattern TYPE_TAG = Pattern.compile("^ Type is\\s.*"); /** Regular expression for property validation type location in class-level javadocs. */ private static final Pattern VALIDATION_TYPE_TAG = Pattern.compile("\\s.*Validation type is\\s.*"); /** Regular expression for property default value location in class-level javadocs. */ - private static final Pattern DEFAULT_VALUE_TAG = Pattern.compile("\\s*Default value is:*.*"); + private static final Pattern DEFAULT_VALUE_TAG = Pattern.compile("^ Default value is:*.*"); /** Regular expression for check example location in class-level javadocs. */ private static final Pattern EXAMPLES_TAG = @@ -104,6 +105,17 @@ public class JavadocMetadataScraper extends AbstractJavadocCheck { + "config.html#Checker>Checker</a> module" ))); + /** + * Format for exception message for missing type for check property. + */ + private static final String PROP_TYPE_MISSING = "Type for property '%s' is missing"; + + /** + * Format for exception message for missing default value for check property. + */ + private static final String PROP_DEFAULT_VALUE_MISSING = + "Default value for property '%s' is missing"; + /** ModuleDetails instance for each module AST traversal. */ private ModuleDetails moduleDetails; @@ -261,38 +273,41 @@ private static ModulePropertyDetails createProperties(DetailNode nodeLi) { JavadocTokenTypes.JAVADOC_INLINE_TAG, 0); if (propertyNameNode.isPresent()) { final DetailNode propertyNameTag = propertyNameNode.get(); + final String propertyName = getTextFromTag(propertyNameTag); - final Optional<DetailNode> propertyTypeNode = - getFirstChildOfMatchingText(nodeLi, TYPE_TAG); - if (propertyTypeNode.isPresent()) { - final DetailNode propertyType = propertyTypeNode.get(); - final String propertyDesc = DESC_CLEAN.matcher( - constructSubTreeText(nodeLi, propertyNameTag.getIndex() + 1, - propertyType.getIndex() - 1)) - .replaceAll(Matcher.quoteReplacement("")); - - modulePropertyDetails.setDescription(propertyDesc.trim()); - } - - modulePropertyDetails.setName(getTextFromTag(propertyNameTag)); - } + final DetailNode propertyType = getFirstChildOfMatchingText(nodeLi, TYPE_TAG) + .orElseThrow(() -> { + return new MetadataGenerationException(String.format( + Locale.ROOT, PROP_TYPE_MISSING, propertyName) + ); + }); + final String propertyDesc = DESC_CLEAN.matcher( + constructSubTreeText(nodeLi, propertyNameTag.getIndex() + 1, + propertyType.getIndex() - 1)) + .replaceAll(Matcher.quoteReplacement("")); - final Optional<DetailNode> typeNode = getFirstChildOfMatchingText(nodeLi, TYPE_TAG); - if (typeNode.isPresent()) { - modulePropertyDetails.setType(getTagTextFromProperty(nodeLi, typeNode.get())); - } + modulePropertyDetails.setDescription(propertyDesc.trim()); + modulePropertyDetails.setName(propertyName); + modulePropertyDetails.setType(getTagTextFromProperty(nodeLi, propertyType)); - final Optional<DetailNode> validationTypeNodeOpt = getFirstChildOfMatchingText(nodeLi, + final Optional<DetailNode> validationTypeNodeOpt = getFirstChildOfMatchingText(nodeLi, VALIDATION_TYPE_TAG); - if (validationTypeNodeOpt.isPresent()) { - final DetailNode validationTypeNode = validationTypeNodeOpt.get(); - modulePropertyDetails.setValidationType(getTagTextFromProperty(nodeLi, + if (validationTypeNodeOpt.isPresent()) { + final DetailNode validationTypeNode = validationTypeNodeOpt.get(); + modulePropertyDetails.setValidationType(getTagTextFromProperty(nodeLi, validationTypeNode)); - } + } - final String defaultValue = getPropertyDefaultText(nodeLi); - if (!PROPERTIES_TO_NOT_WRITE.contains(defaultValue)) { - modulePropertyDetails.setDefaultValue(defaultValue); + final String defaultValue = getFirstChildOfMatchingText(nodeLi, DEFAULT_VALUE_TAG) + .map(defaultValueNode -> getPropertyDefaultText(nodeLi, defaultValueNode)) + .orElseThrow(() -> { + return new MetadataGenerationException(String.format( + Locale.ROOT, PROP_DEFAULT_VALUE_MISSING, propertyName) + ); + }); + if (!PROPERTIES_TO_NOT_WRITE.contains(defaultValue)) { + modulePropertyDetails.setDefaultValue(defaultValue); + } } return modulePropertyDetails; } @@ -398,28 +413,24 @@ else if (exampleSectionStartIdx > -1) { * Create property default text, which is either normal property value or list of tokens. * * @param nodeLi list item javadoc node + * @param defaultValueNode default value node * @return default property text */ - private static String getPropertyDefaultText(DetailNode nodeLi) { - String result = ""; - final Optional<DetailNode> defaultValueNodeOpt = getFirstChildOfMatchingText(nodeLi, - DEFAULT_VALUE_TAG); - if (defaultValueNodeOpt.isPresent()) { - final DetailNode defaultValueNode = defaultValueNodeOpt.get(); - final Optional<DetailNode> propertyDefaultValueTagNode = getFirstChildOfType(nodeLi, - JavadocTokenTypes.JAVADOC_INLINE_TAG, defaultValueNode.getIndex() + 1); - DetailNode propertyDefaultValueTag = null; - if (propertyDefaultValueTagNode.isPresent()) { - propertyDefaultValueTag = propertyDefaultValueTagNode.get(); - } - if (propertyDefaultValueTag == null) { - final String tokenText = constructSubTreeText(nodeLi, - defaultValueNode.getIndex(), nodeLi.getChildren().length); - result = cleanDefaultTokensText(tokenText); - } - else { - result = getTextFromTag(propertyDefaultValueTag); - } + private static String getPropertyDefaultText(DetailNode nodeLi, DetailNode defaultValueNode) { + final Optional<DetailNode> propertyDefaultValueTagNode = getFirstChildOfType(nodeLi, + JavadocTokenTypes.JAVADOC_INLINE_TAG, defaultValueNode.getIndex() + 1); + DetailNode propertyDefaultValueTag = null; + if (propertyDefaultValueTagNode.isPresent()) { + propertyDefaultValueTag = propertyDefaultValueTagNode.get(); + } + final String result; + if (propertyDefaultValueTag == null) { + final String tokenText = constructSubTreeText(nodeLi, + defaultValueNode.getIndex(), nodeLi.getChildren().length); + result = cleanDefaultTokensText(tokenText); + } + else { + result = getTextFromTag(propertyDefaultValueTag); } return result; } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/meta/MetadataGenerationException.java b/src/main/java/com/puppycrawl/tools/checkstyle/meta/MetadataGenerationException.java new file mode 100644 --- /dev/null +++ b/src/main/java/com/puppycrawl/tools/checkstyle/meta/MetadataGenerationException.java @@ -0,0 +1,49 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2021 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package com.puppycrawl.tools.checkstyle.meta; + +/** + * Exception for metadata generation errors. + */ +public class MetadataGenerationException extends RuntimeException { + + /** For serialization that will never happen. */ + private static final long serialVersionUID = -254525356420746283L; + + /** + * Creates a new {@code MetadataGenerationException} instance. + * + * @param message a {@code String} value + */ + public MetadataGenerationException(String message) { + super(message); + } + + /** + * Creates a new {@code MetadataGenerationException} instance + * that was caused by another exception. + * + * @param message a message that explains this exception + * @param cause the Exception that is wrapped by this exception + */ + public MetadataGenerationException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtil.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtil.java @@ -35,7 +35,6 @@ import com.puppycrawl.tools.checkstyle.DefaultConfiguration; import com.puppycrawl.tools.checkstyle.TreeWalker; import com.puppycrawl.tools.checkstyle.api.CheckstyleException; -import com.puppycrawl.tools.checkstyle.utils.TokenUtil; /** Class which handles all the metadata generation and writing calls. */ public final class MetadataGeneratorUtil { @@ -99,15 +98,4 @@ private static void dumpMetadata(Checker checker, String path) throws Checkstyle checker.process(validFiles); } - - /** - * Return all token types present in checkstyle. - * - * @return list of token type names - */ - public static List<String> fetchAllTokens() { - return Arrays.stream(TokenUtil.getAllTokenIds()) - .mapToObj(TokenUtil::getTokenName) - .collect(Collectors.toList()); - } }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtilTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtilTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtilTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtilTest.java @@ -19,7 +19,9 @@ package com.puppycrawl.tools.checkstyle.meta; +import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThrows; import java.nio.file.Files; import java.nio.file.Path; @@ -33,9 +35,15 @@ import org.junit.jupiter.api.Test; +import com.puppycrawl.tools.checkstyle.api.CheckstyleException; import com.puppycrawl.tools.checkstyle.internal.utils.CheckUtil; public final class MetadataGeneratorUtilTest { + + private final String invalidMetadataPackage = System.getProperty("user.dir") + + "/src/test/resources/com/puppycrawl/tools/checkstyle" + + "/meta/javadocmetadatascraper/invalid_metadata"; + private final List<String> modulesContainingNoMetadataFile = Arrays.asList( "Checker", "TreeWalker", @@ -43,7 +51,7 @@ public final class MetadataGeneratorUtilTest { ); @Test - public void generateMetadataFiles() throws Exception { + public void testMetadataFilesGenerationAllFiles() throws Exception { MetadataGeneratorUtil.generate(System.getProperty("user.dir") + "/src/main/java/com/puppycrawl/tools/checkstyle"); final Set<String> metaFiles; @@ -67,6 +75,50 @@ public void generateMetadataFiles() throws Exception { + "module", checkstyleModules, metaFiles); } + @Test + public void testMetadataFileGenerationDefaultValueMisplaced() { + final CheckstyleException exc = assertThrows(CheckstyleException.class, () -> { + MetadataGeneratorUtil.generate(invalidMetadataPackage + + "/InputJavadocMetadataScraperPropertyMisplacedDefaultValueCheck.java"); + }); + assertThat(exc.getCause()).isInstanceOf(MetadataGenerationException.class); + assertThat(exc.getCause().getMessage()).isEqualTo( + "Default value for property 'misplacedDefaultValue' is missing"); + } + + @Test + public void testMetadataFileGenerationTypeMisplaced() { + final CheckstyleException exc = assertThrows(CheckstyleException.class, () -> { + MetadataGeneratorUtil.generate(invalidMetadataPackage + + "/InputJavadocMetadataScraperPropertyMisplacedTypeCheck.java"); + }); + assertThat(exc.getCause()).isInstanceOf(MetadataGenerationException.class); + assertThat(exc.getCause().getMessage()).isEqualTo( + "Type for property 'misplacedType' is missing"); + } + + @Test + public void testMetadataFileGenerationTypeMissing() { + final CheckstyleException exc = assertThrows(CheckstyleException.class, () -> { + MetadataGeneratorUtil.generate(invalidMetadataPackage + + "/InputJavadocMetadataScraperPropertyMissingTypeCheck.java"); + }); + assertThat(exc.getCause()).isInstanceOf(MetadataGenerationException.class); + assertThat(exc.getCause().getMessage()).isEqualTo( + "Type for property 'missingType' is missing"); + } + + @Test + public void testMetadataFileGenerationDefaultValueMissing() { + final CheckstyleException exc = assertThrows(CheckstyleException.class, () -> { + MetadataGeneratorUtil.generate(invalidMetadataPackage + + "/InputJavadocMetadataScraperPropertyMissingDefaultValueCheck.java"); + }); + assertThat(exc.getCause()).isInstanceOf(MetadataGenerationException.class); + assertThat(exc.getCause().getMessage()).isEqualTo( + "Default value for property 'missingDefaultValue' is missing"); + } + /** * Get meta file name from full file name. * diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/meta/javadocmetadatascraper/invalid_metadata/InputJavadocMetadataScraperPropertyMisplacedDefaultValueCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/meta/javadocmetadatascraper/invalid_metadata/InputJavadocMetadataScraperPropertyMisplacedDefaultValueCheck.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/meta/javadocmetadatascraper/invalid_metadata/InputJavadocMetadataScraperPropertyMisplacedDefaultValueCheck.java @@ -0,0 +1,17 @@ +package com.puppycrawl.tools.checkstyle.meta.javadocmetadatascraper.invalid_metadata; + +/** + * <p> + * Description. + * </p> + * <ul> + * <li> + * Property {@code misplacedDefaultValue} - Some description. + * Type is {@code java.lang.String}. Default value is {@code ""}. + * </li> + * </ul> + * + * @since 8.33 + */ +public class InputJavadocMetadataScraperPropertyMisplacedDefaultValueCheck { +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/meta/javadocmetadatascraper/invalid_metadata/InputJavadocMetadataScraperPropertyMisplacedTypeCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/meta/javadocmetadatascraper/invalid_metadata/InputJavadocMetadataScraperPropertyMisplacedTypeCheck.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/meta/javadocmetadatascraper/invalid_metadata/InputJavadocMetadataScraperPropertyMisplacedTypeCheck.java @@ -0,0 +1,30 @@ +package com.puppycrawl.tools.checkstyle.meta.javadocmetadatascraper.invalid_metadata; + +/** + * <p> + * Checks whether file contains code. Files which are considered to have no code: + * </p> + * <ul> + * <li> + * File with no text + * </li> + * <li> + * File with single line comment(s) + * </li> + * <li> + * File with a multi line comment(s). + * </li> + * </ul> + * <p> + * <ul> + * <li> + * Property {@code misplacedType} - Some long wrapped + * description. Type is {@code java.lang.String}. + * Default value is {@code ""}. + * </li> + * </ul> + * + * @since 8.33 + */ +public class InputJavadocMetadataScraperPropertyMisplacedTypeCheck { +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/meta/javadocmetadatascraper/invalid_metadata/InputJavadocMetadataScraperPropertyMissingDefaultValueCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/meta/javadocmetadatascraper/invalid_metadata/InputJavadocMetadataScraperPropertyMissingDefaultValueCheck.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/meta/javadocmetadatascraper/invalid_metadata/InputJavadocMetadataScraperPropertyMissingDefaultValueCheck.java @@ -0,0 +1,17 @@ +package com.puppycrawl.tools.checkstyle.meta.javadocmetadatascraper.invalid_metadata; + +/** + * <p> + * Description. + * </p> + * <ul> + * <li> + * Property {@code missingDefaultValue} - Some description. + * Type is {@code java.lang.String}. + * </li> + * </ul> + * + * @since 8.33 + */ +public class InputJavadocMetadataScraperPropertyMissingDefaultValueCheck { +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/meta/javadocmetadatascraper/invalid_metadata/InputJavadocMetadataScraperPropertyMissingTypeCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/meta/javadocmetadatascraper/invalid_metadata/InputJavadocMetadataScraperPropertyMissingTypeCheck.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/meta/javadocmetadatascraper/invalid_metadata/InputJavadocMetadataScraperPropertyMissingTypeCheck.java @@ -0,0 +1,29 @@ +package com.puppycrawl.tools.checkstyle.meta.javadocmetadatascraper.invalid_metadata; + +/** + * <p> + * Checks whether file contains code. Files which are considered to have no code: + * </p> + * <ul> + * <li> + * File with no text + * </li> + * <li> + * File with single line comment(s) + * </li> + * <li> + * File with a multi line comment(s). + * </li> + * </ul> + * <p> + * <ul> + * <li> + * Property {@code missingType} - Some description. + * Default value is {@code ""}. + * </li> + * </ul> + * + * @since 8.33 + */ +public class InputJavadocMetadataScraperPropertyMissingTypeCheck { +}
Metadata generation fails on line wrapped type description Discovered at https://github.com/checkstyle/checkstyle/pull/9076#discussion_r559056728, when a check's class level javadoc property description is line wrapped in mid-sentence, metadata generation is incomplete. From https://github.com/checkstyle/checkstyle/pull/9076: ```java * Property {@code requiredJavadocPhrase} - Specify the comment text pattern which qualifies a * method as designed for extension. Supports multi-line regex. Type is * {@code java.util.regex.Pattern}. * Default value is {@code ".*"}. ``` Yields: ```xml <property default-value=".*" name="requiredJavadocPhrase" type=""> <description/> </property> ``` Also, ```java * Property {@code requiredJavadocPhrase} - Specify the comment text pattern which qualifies a * method as designed for extension. Type is {@code java.util.regex.Pattern}. * Default value is {@code ".*"}. * ``` Yields: ```xml <property default-value=".*" name="requiredJavadocPhrase" type="java.util.regex.Pattern"> <description>Specify the comment text pattern which qualifies a</description> </property> ``` ----- **The following is outdated and incorrect, and can be fixed at https://github.com/checkstyle/checkstyle/pull/9209:** During a fix remove from configs: In `config/checkstyle_non_main_files_suppressions.xml`: ```xml <!-- until https://github.com/checkstyle/checkstyle/issues/9204 --> <suppress id="lineLength" files="config_design\.xml" lines="163"/> ``` In `config/suppressions.xml`: ```xml <!-- until https://github.com/checkstyle/checkstyle/issues/9204 --> <suppress id="lineLengthXml" files="config_design\.xml" lines="163"/> ```
2021-01-25T12:34:04Z
8.39
checkstyle/checkstyle
9,261
checkstyle__checkstyle-9261
[ "9236" ]
c312f7571c1aaded5465c35b0047e946feabfd56
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.java @@ -63,7 +63,8 @@ private DetailAST getTryResRparen() { public IndentLevel getSuggestedChildIndent(AbstractExpressionHandler child) { final IndentLevel result; if (child instanceof CatchHandler - || child instanceof FinallyHandler) { + || child instanceof FinallyHandler + || child instanceof NewHandler) { result = getIndent(); } else {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java @@ -2617,23 +2617,10 @@ public void testNewHandler() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(IndentationCheck.class); checkConfig.addAttribute("tabWidth", "4"); final String[] expected = { - "8:1: " + getCheckMessage(MSG_ERROR, "Object", 0, 12), - "10:1: " + getCheckMessage(MSG_ERROR, "(", 0, 12), - "13:1: " + getCheckMessage(MSG_CHILD_ERROR, "new", 0, 8), - "15:1: " + getCheckMessage(MSG_ERROR, "new lparen", 0, 8), - }; - verifyWarns(checkConfig, getPath("InputIndentationNewHandler.java"), expected); - } - - @Test - public void testNewHandler2() throws Exception { - final DefaultConfiguration checkConfig = createModuleConfig(IndentationCheck.class); - checkConfig.addAttribute("tabWidth", "4"); - final String[] expected = { - "8:1: " + getCheckMessage(MSG_ERROR, "Object", 0, 12), - "10:1: " + getCheckMessage(MSG_ERROR, "(", 0, 12), - "13:1: " + getCheckMessage(MSG_CHILD_ERROR, "new", 0, 8), - "15:1: " + getCheckMessage(MSG_ERROR, "new lparen", 0, 8), + "10:1: " + getCheckMessage(MSG_ERROR, "Object", 0, 12), + "12:1: " + getCheckMessage(MSG_ERROR, "(", 0, 12), + "15:1: " + getCheckMessage(MSG_CHILD_ERROR, "new", 0, 8), + "17:1: " + getCheckMessage(MSG_ERROR, "new lparen", 0, 8), }; verifyWarns(checkConfig, getPath("InputIndentationNewHandler.java"), expected); } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationNewHandler.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationNewHandler.java --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationNewHandler.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationNewHandler.java @@ -1,5 +1,7 @@ package com.puppycrawl.tools.checkstyle.checks.indentation.indentation; //indent:0 exp:0 +import java.io.InputStreamReader; //indent:0 exp:0 + public class InputIndentationNewHandler //indent:0 exp:0 { //indent:0 exp:0 public void test() { //indent:4 exp:4 @@ -13,5 +15,9 @@ public void test() { //indent:4 exp:4 Integer("".indexOf("5")); //indent:0 exp:8 warn o = new Integer//indent:8 exp:8 ("".indexOf("5")); //indent:0 exp:8 warn + try (InputStreamReader reader = //indent:8 exp:8 + new InputStreamReader(System.in)) { //indent:12 exp:12 + } catch (Exception e) { //indent:8 exp:8 + } //indent:8 exp:8 } //indent:4 exp:4 } //indent:0 exp:0
Regression in IndentationCheck 8.40 regarding the white spaces needed in a second line of a try/resource declaration https://checkstyle.org/config_misc.html#Indentation $ javac Test.java successful compilation $ Test.java ```java import java.io.*; class Test { void test() { try (InputStreamReader reader = new InputStreamReader(System.in)) { // violation // try block... } catch (Exception e) { // catch block... } } } ``` $ config.java ```xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <module name="TreeWalker"> <module name="Indentation" /> </module> </module> </module> ``` Actual $ java -jar checkstyle-8.40-all.jar -c config.xml t2.java ``` [ERROR] /home/abhishhek/playground/Test.java:6:13: 'operator new' has incorrect indentation level 12, expected level should be 16. [Indentation] ``` Expected No violations ----- #9071 seems to have caused an unexpected side effect in the default behavior of IndentationCheck. The following line used to be valid with Checkstyle 8.37: https://github.com/xwiki/xwiki-platform/blob/xwiki-platform-13.0/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-default/src/main/java/org/xwiki/icon/internal/DefaultIconSetManager.java#L129 and is now failing with > 'new' has incorrect indentation level 16, expected level should be 20. My configuration is https://github.com/xwiki/xwiki-commons/blob/xwiki-commons-13.0/xwiki-commons-tools/xwiki-commons-tool-verification-resources/src/main/resources/checkstyle.xml#L205
@tmortagne Please edit your post to follow template https://checkstyle.org/report_issue.html#How_to_report_a_bug.3F we did regression in xwiki code base that is not part of our execution :( we use xwiki-common but problem is in xwiki-platform. @Abhishek-kumar09 , can you take a look ? @romani do you want me to try making the non regression job (not really sure where it is) build also xwiki-rendering and xwiki-platform ? It's much bigger than xwiki-commons so it will take longer to build. job is at https://github.com/checkstyle/checkstyle/blob/master/.ci/wercker.sh#L97 but wercker is already over used. we can think on extension at Travis like we do for another project: https://github.com/checkstyle/checkstyle/blob/3d8b43445818246cd34ee97b3739dac75b10fae6/.ci/travis/travis.sh#L250 @tmortagne , you can send PR to make it happen it would be awesome, should be done in scope of different issue. ----- as less efforts action we can add xwiki-platform to https://github.com/checkstyle/contribution/blob/master/checkstyle-tester/projects-to-test-on.properties so we might see problem in regression testing. > @tmortagne , you can send PR to make it happen it would be awesome Sure, I will also try to give some info about how much longer it takes compared to xwiki-commons in the pull request description, and you can decide to apply it or not. Might not have the time to finish it before Monday with the FOSDEM this weekend but will see. > should be done in scope of different issue. Noted. $ javac Test.java ``` successful compilation ``` $ Test.java ```java import java.io.*; class Test { void test() { try (InputStreamReader reader = new InputStreamReader(System.in)) { // violation // try block... } catch (Exception e) { // catch block... } } } ``` $ config.java ```bash <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <module name="TreeWalker"> <module name="Indentation" /> </module> </module> </module> ``` # Actual $ java -jar checkstyle-8.40-all.jar -c config.xml t2.java ``` [ERROR] /home/abhishhek/playground/Test.java:6:13: 'operator new' has incorrect indentation level 12, expected level should be 16. [Indentation] ``` # Expected No violations @tmortagne You can add these codes on your issue description to make it more clear. Here is the issue template for bug report: https://checkstyle.org/report_issue.html#How_to_report_a_bug.3F OK thanks @Abhishek-kumar09 > @tmortagne , you can send PR to make it happen it would be awesome, should be done in scope of different issue. Issue: #9242 Pull request: #9243 I will be working on it.
2021-02-08T15:22:04Z
8.4
checkstyle/checkstyle
9,018
checkstyle__checkstyle-9018
[ "8933" ]
79f8ffca08fdca9f844ff8ebac6be4fd697b6dc6
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java @@ -19,12 +19,13 @@ package com.puppycrawl.tools.checkstyle.checks.coding; -import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.regex.Pattern; +import java.util.stream.Collectors; +import java.util.stream.Stream; import com.puppycrawl.tools.checkstyle.FileStatefulCheck; import com.puppycrawl.tools.checkstyle.api.AbstractCheck; @@ -113,7 +114,7 @@ * This property does not affect method calls nor method references. * Type is {@code java.lang.String[]}. * Validation type is {@code tokenTypesSet}. - * Default value is {@code no tokens}. + * Default value is {@code ""}. * </li> * <li> * Property {@code tokens} - tokens to check @@ -348,7 +349,7 @@ public final class IllegalTypeCheck extends AbstractCheck { * Control whether to check only methods and fields with any of the specified modifiers. * This property does not affect method calls nor method references. */ - private List<Integer> memberModifiers; + private List<Integer> memberModifiers = Collections.emptyList(); /** Specify RegExp for illegal abstract class names. */ private Pattern illegalAbstractClassNameFormat = Pattern.compile("^(.*[.])?Abstract.*$"); @@ -462,7 +463,7 @@ public void visitToken(DetailAST ast) { */ private boolean isVerifiable(DetailAST methodOrVariableDef) { boolean result = true; - if (memberModifiers != null) { + if (!memberModifiers.isEmpty()) { final DetailAST modifiersAst = methodOrVariableDef .findFirstToken(TokenTypes.MODIFIERS); result = isContainVerifiableType(modifiersAst); @@ -823,11 +824,11 @@ public void setLegalAbstractClassNames(String... classNames) { * @param modifiers String contains modifiers. */ public void setMemberModifiers(String modifiers) { - final List<Integer> modifiersList = new ArrayList<>(); - for (String modifier : modifiers.split(",")) { - modifiersList.add(TokenUtil.getTokenId(modifier.trim())); - } - memberModifiers = modifiersList; + memberModifiers = Stream.of(modifiers.split(",")) + .map(String::trim) + .filter(token -> !token.isEmpty()) + .map(TokenUtil::getTokenId) + .collect(Collectors.toList()); } }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java @@ -76,6 +76,21 @@ public void testDefaults() throws Exception { verify(checkConfig, getPath("InputIllegalType.java"), expected); } + @Test + public void testDefaultsEmptyStringMemberModifiers() throws Exception { + final DefaultConfiguration checkConfig = createModuleConfig(IllegalTypeCheck.class); + checkConfig.addAttribute("memberModifiers", ""); + + final String[] expected = { + "17:13: " + getCheckMessage(MSG_KEY, "java.util.TreeSet"), + "18:13: " + getCheckMessage(MSG_KEY, "TreeSet"), + "43:14: " + getCheckMessage(MSG_KEY, "HashMap"), + "45:5: " + getCheckMessage(MSG_KEY, "HashMap"), + }; + + verify(checkConfig, getPath("InputIllegalType.java"), expected); + } + @Test public void testIgnoreMethodNames() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(IllegalTypeCheck.class); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java @@ -1136,10 +1136,7 @@ else if (fieldClass == int[].class) { if (isPropertyTokenType(sectionName, propertyName)) { boolean first = true; - if (value == null) { - result = "no tokens"; - } - else if (value instanceof BitSet) { + if (value instanceof BitSet) { final BitSet list = (BitSet) value; final StringBuilder sb = new StringBuilder(20);
IllegalType: inability to set default value for property memberModifiers Check documentation: https://checkstyle.org/config_coding.html#IllegalType ``` $ cat Test.java public class Test { private Optional<String> field1; } $ cat config.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <module name="TreeWalker"> <module name="IllegalType"> <property name="illegalClassNames" value="java.util.Optional" /> <property name="tokens" value="VARIABLE_DEF" /> <property name="memberModifiers" value=""/> </module> </module> </module> $ java -jar checkstyle-8.36.2-all.jar -c config.xml Test.java com.puppycrawl.tools.checkstyle.api.CheckstyleException: cannot initialize module TreeWalker - cannot initialize module IllegalType - Cannot set property 'memberModifiers' to '' at com.puppycrawl.tools.checkstyle.Checker.setupChild(Checker.java:482) at com.puppycrawl.tools.checkstyle.api.AutomaticBean.configure(AutomaticBean.java:201) at com.puppycrawl.tools.checkstyle.Main.runCheckstyle(Main.java:404) at com.puppycrawl.tools.checkstyle.Main.runCli(Main.java:331) at com.puppycrawl.tools.checkstyle.Main.execute(Main.java:190) at com.puppycrawl.tools.checkstyle.Main.main(Main.java:125) Caused by: com.puppycrawl.tools.checkstyle.api.CheckstyleException: cannot initialize module IllegalType - Cannot set property 'memberModifiers' to '' at com.puppycrawl.tools.checkstyle.TreeWalker.setupChild(TreeWalker.java:125) at com.puppycrawl.tools.checkstyle.api.AutomaticBean.configure(AutomaticBean.java:201) at com.puppycrawl.tools.checkstyle.Checker.setupChild(Checker.java:477) ... 5 more Caused by: com.puppycrawl.tools.checkstyle.api.CheckstyleException: Cannot set property 'memberModifiers' to '' at com.puppycrawl.tools.checkstyle.api.AutomaticBean.tryCopyProperty(AutomaticBean.java:241) at com.puppycrawl.tools.checkstyle.api.AutomaticBean.configure(AutomaticBean.java:194) at com.puppycrawl.tools.checkstyle.TreeWalker.setupChild(TreeWalker.java:120) ... 7 more Caused by: java.lang.reflect.InvocationTargetException at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at org.apache.commons.beanutils.PropertyUtilsBean.invokeMethod(PropertyUtilsBean.java:2128) at org.apache.commons.beanutils.PropertyUtilsBean.setSimpleProperty(PropertyUtilsBean.java:2109) at org.apache.commons.beanutils.BeanUtilsBean.copyProperty(BeanUtilsBean.java:437) at com.puppycrawl.tools.checkstyle.api.AutomaticBean.tryCopyProperty(AutomaticBean.java:231) ... 9 more Caused by: java.lang.IllegalArgumentException: given name at com.puppycrawl.tools.checkstyle.utils.TokenUtil.getTokenId(TokenUtil.java:174) at com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.setMemberModifiers(IllegalTypeCheck.java:828) ... 17 more Checkstyle ends with 1 errors. ``` Expected: work as `memberModifiers` is not mentioned in config.
2020-11-24T12:09:00Z
8.38
checkstyle/checkstyle
8,984
checkstyle__checkstyle-8984
[ "8957" ]
1f38561218e5be40a8e8ace134f5fca1c9415c15
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java @@ -20,7 +20,6 @@ package com.puppycrawl.tools.checkstyle.checks.whitespace; import java.util.ArrayList; -import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.Optional; @@ -32,6 +31,7 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes; import com.puppycrawl.tools.checkstyle.utils.CommonUtil; import com.puppycrawl.tools.checkstyle.utils.JavadocUtil; +import com.puppycrawl.tools.checkstyle.utils.TokenUtil; /** * <p> @@ -166,6 +166,17 @@ * </pre> * * <p> + * Example: + * </p> + * + * <pre> + * class Foo { + * int field1; // ok + * double field2; // ok + * long field3, field4 = 10L, field5; // ok + * } + * </pre> + * <p> * Example of declarations with multiple empty lines between class members (allowed by default): * </p> * @@ -319,11 +330,6 @@ public class EmptyLineSeparatorCheck extends AbstractCheck { public static final String MSG_MULTIPLE_LINES_INSIDE = "empty.line.separator.multiple.lines.inside"; - /** List of AST token types, which can not have comment nodes to check inside. */ - private static final List<Integer> TOKEN_TYPES_WITHOUT_COMMENTS_TO_CHECK_INSIDE = - Arrays.asList(TokenTypes.PACKAGE_DEF, TokenTypes.IMPORT, TokenTypes.STATIC_IMPORT, - TokenTypes.STATIC_INIT); - /** Allow no empty line between fields. */ private boolean allowNoEmptyLineBetweenFields; @@ -408,7 +414,7 @@ public void visitToken(DetailAST ast) { checkCommentInModifiers(ast); } DetailAST nextToken = ast.getNextSibling(); - while (nextToken != null && isComment(nextToken)) { + while (isComment(nextToken)) { nextToken = nextToken.getNextSibling(); } if (nextToken != null) { @@ -486,11 +492,9 @@ private void processMultipleLinesInside(DetailAST ast) { * @return true if the AST is a class member block. */ private static boolean isClassMemberBlock(int astType) { - return astType == TokenTypes.STATIC_INIT - || astType == TokenTypes.INSTANCE_INIT - || astType == TokenTypes.METHOD_DEF - || astType == TokenTypes.CTOR_DEF - || astType == TokenTypes.COMPACT_CTOR_DEF; + return TokenUtil.isOfType(astType, + TokenTypes.STATIC_INIT, TokenTypes.INSTANCE_INIT, TokenTypes.METHOD_DEF, + TokenTypes.CTOR_DEF, TokenTypes.COMPACT_CTOR_DEF); } /** @@ -583,8 +587,8 @@ private void processPackage(DetailAST ast, DetailAST nextToken) { * @param nextToken next token */ private void processImport(DetailAST ast, DetailAST nextToken) { - if (nextToken.getType() != TokenTypes.IMPORT - && nextToken.getType() != TokenTypes.STATIC_IMPORT && !hasEmptyLineAfter(ast)) { + if (!TokenUtil.isOfType(nextToken, TokenTypes.IMPORT, TokenTypes.STATIC_IMPORT) + && !hasEmptyLineAfter(ast)) { log(nextToken, MSG_SHOULD_BE_SEPARATED, nextToken.getText()); } } @@ -612,7 +616,7 @@ && isViolatingEmptyLineBetweenFieldsPolicy(nextToken)) { private boolean isViolatingEmptyLineBetweenFieldsPolicy(DetailAST detailAST) { return detailAST.getType() != TokenTypes.RCURLY && (!allowNoEmptyLineBetweenFields - || detailAST.getType() != TokenTypes.VARIABLE_DEF); + || !TokenUtil.isOfType(detailAST, TokenTypes.COMMA, TokenTypes.VARIABLE_DEF)); } /** @@ -633,7 +637,9 @@ private boolean hasNotAllowedTwoEmptyLinesBefore(DetailAST token) { */ private void checkComments(DetailAST token) { if (!allowMultipleEmptyLines) { - if (TOKEN_TYPES_WITHOUT_COMMENTS_TO_CHECK_INSIDE.contains(token.getType())) { + if (TokenUtil.isOfType(token, + TokenTypes.PACKAGE_DEF, TokenTypes.IMPORT, + TokenTypes.STATIC_IMPORT, TokenTypes.STATIC_INIT)) { DetailAST previousNode = token.getPreviousSibling(); while (isCommentInBeginningOfLine(previousNode)) { if (hasEmptyLineBefore(previousNode) && isPrePreviousLineEmpty(previousNode)) { @@ -813,8 +819,8 @@ private static boolean isPrecededByJavadoc(DetailAST token) { * @return true, if given ast is comment. */ private static boolean isComment(DetailAST ast) { - return ast.getType() == TokenTypes.SINGLE_LINE_COMMENT - || ast.getType() == TokenTypes.BLOCK_COMMENT_BEGIN; + return TokenUtil.isOfType(ast, + TokenTypes.SINGLE_LINE_COMMENT, TokenTypes.BLOCK_COMMENT_BEGIN); } /** @@ -824,9 +830,8 @@ private static boolean isComment(DetailAST ast) { * @return true variable definition is a type field. */ private static boolean isTypeField(DetailAST variableDef) { - final int parentType = variableDef.getParent().getParent().getType(); - return parentType == TokenTypes.CLASS_DEF - || parentType == TokenTypes.RECORD_DEF; + return TokenUtil.isOfType(variableDef.getParent().getParent(), + TokenTypes.CLASS_DEF, TokenTypes.RECORD_DEF); } }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java @@ -474,4 +474,16 @@ public void testEmptyLineSeparatorRecordsAndCompactCtorsNoEmptyLines() throws Ex expected); } + @Test + public void testEmptyLineSeparatorMultipleSingleTypeVariables() throws Exception { + final DefaultConfiguration checkConfig = createModuleConfig(EmptyLineSeparatorCheck.class); + checkConfig.addAttribute("allowNoEmptyLineBetweenFields", "true"); + + final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; + + verify(checkConfig, + getPath("InputEmptyLineSeparatorSingleTypeVariables.java"), + expected); + } + } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparator.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparator.java --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparator.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparator.java @@ -151,3 +151,7 @@ public int compareTo(InputEmptyLineSeparator aObject) //ok } }; } + +class Class3 { + int field; +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorSingleTypeVariables.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorSingleTypeVariables.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorSingleTypeVariables.java @@ -0,0 +1,33 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2020 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package com.puppycrawl.tools.checkstyle.checks.whitespace.emptylineseparator; + +/* + * Config: + * allowNoEmptyLineBetweenFields = true + */ + +public class InputEmptyLineSeparatorSingleTypeVariables { + int a; // ok + int b; // ok + int c; // ok + int a1, b1, c1; // ok + +}
EmptyLineSeparator flags commas for multiple single type variables on line **Check documentation:** https://checkstyle.org/config_whitespace.html#EmptyLineSeparator ``` /var/tmp $ javac Test.java /var/tmp $ cat Test.java public class Test { int readOnly; int p01; int p11; int q01, q02, q03, q04, q05, q06, q07, q08; } /var/tmp $ cat config.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <module name="TreeWalker"> <module name="EmptyLineSeparator"> <property name="allowNoEmptyLineBetweenFields" value="true" /> </module> </module> </module> /var/tmp $ RUN_LOCALE="-Duser.language=en -Duser.country=US" /var/tmp $ java $RUN_LOCALE -jar checkstyle-8.36.jar -c config.xml Test.java Starting audit... [ERROR] /var/temp/Test.java:5:10: ',' should be separated from previous statement. [EmptyLineSeparator] [ERROR] /var/temp/Test.java:5:15: ',' should be separated from previous statement. [EmptyLineSeparator] [ERROR] /var/temp/Test.java:5:20: ',' should be separated from previous statement. [EmptyLineSeparator] [ERROR] /var/temp/Test.java:5:25: ',' should be separated from previous statement. [EmptyLineSeparator] [ERROR] /var/temp/Test.java:5:30: ',' should be separated from previous statement. [EmptyLineSeparator] [ERROR] /var/temp/Test.java:5:35: ',' should be separated from previous statement. [EmptyLineSeparator] [ERROR] /var/temp/Test.java:5:40: ',' should be separated from previous statement. [EmptyLineSeparator] Audit done. ``` **Expected:** No violations.
2020-11-13T11:36:31Z
8.37
checkstyle/checkstyle
8,913
checkstyle__checkstyle-8913
[ "8895" ]
dfec36a68198f335475976c47ca7c4f2dd553603
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java @@ -33,6 +33,7 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes; import com.puppycrawl.tools.checkstyle.utils.CheckUtil; import com.puppycrawl.tools.checkstyle.utils.ScopeUtil; +import com.puppycrawl.tools.checkstyle.utils.TokenUtil; /** * <p> @@ -778,10 +779,8 @@ private static boolean isInLambda(DetailAST paramDef) { */ private static DetailAST findFirstUpperNamedBlock(DetailAST ast) { DetailAST astTraverse = ast; - while (astTraverse.getType() != TokenTypes.METHOD_DEF - && astTraverse.getType() != TokenTypes.CLASS_DEF - && astTraverse.getType() != TokenTypes.ENUM_DEF - && astTraverse.getType() != TokenTypes.CTOR_DEF + while (!TokenUtil.isOfType(astTraverse, TokenTypes.METHOD_DEF, TokenTypes.CLASS_DEF, + TokenTypes.ENUM_DEF, TokenTypes.CTOR_DEF, TokenTypes.COMPACT_CTOR_DEF) && !ScopeUtil.isClassFieldDef(astTraverse)) { astTraverse = astTraverse.getParent(); }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java @@ -86,6 +86,17 @@ public void testDefault() throws Exception { verify(checkConfig, getPath("InputFinalLocalVariable.java"), expected); } + @Test + public void testRecordsInput() throws Exception { + final DefaultConfiguration checkConfig = + createModuleConfig(FinalLocalVariableCheck.class); + final String[] expected = { + "15:17: " + getCheckMessage(MSG_KEY, "b"), + }; + verify(checkConfig, + getNonCompilablePath("InputFinalLocalVariableCheckRecords.java"), expected); + } + @Test public void testParameter() throws Exception { final DefaultConfiguration checkConfig = diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableCheckRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableCheckRecords.java new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableCheckRecords.java @@ -0,0 +1,19 @@ +//non-compiled with javac: Compilable with Java14 +package com.puppycrawl.tools.checkstyle.checks.coding.finallocalvariable; + +/* Config: + * default + */ +public record InputFinalLocalVariableCheckRecords(boolean t, boolean f) { + public InputFinalLocalVariableCheckRecords { + int a = 0; // ok + a = 1; + } + + record bad(int i) { + public bad { + int b = 0; // violation + } + } +} +
FinalLocalVariable: NPE in records Check documentation: https://checkstyle.org/config_coding.html#FinalLocalVariable problem was detected during https://github.com/checkstyle/contribution/commit/529fc836f88e0f88148ab7760a5ec7ba4d100715 `**/resources-noncompilable/**/checks/metrics/cyclomaticcomplexity/InputCyclomaticComplexityRecords.java` is name of file in our repo that cause problem. ``` $ cat MyRecord2.java //non-compiled with javac: Compilable with Java14 public record MyRecord2(boolean t, boolean f) { public MyRecord2 { // violation int a = 1; int b = 1; int c = 1; int d = 1; int n = 8; if (a == 1) { // 2, if } else if (a == b // 3, if && a == c) { // 4, && operator if (c == 2) { // 5, if } } else if (a == d) { // 6, if try { } catch (Exception e) { // 7, catch } } else { switch (n) { case 1: // 8, case break; case 2: // 9, case break; case 3: // 10, case break; default: break; } } d = a < 0 ? -1 : 1; // 11, ternary operator } } $ cat config.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> <module name="Checker"> <module name="TreeWalker"> <module name="FinalLocalVariable"/> </module> </module> $ java -jar checkstyle-8.36.2-all.jar -c config.xml MyRecord2.java Starting audit... com.puppycrawl.tools.checkstyle.api.CheckstyleException: Exception was thrown while processing MyRecord2.java at com.puppycrawl.tools.checkstyle.Checker.processFiles(Checker.java:311) at com.puppycrawl.tools.checkstyle.Checker.process(Checker.java:221) at com.puppycrawl.tools.checkstyle.Main.runCheckstyle(Main.java:408) at com.puppycrawl.tools.checkstyle.Main.runCli(Main.java:331) at com.puppycrawl.tools.checkstyle.Main.execute(Main.java:190) at com.puppycrawl.tools.checkstyle.Main.main(Main.java:125) Caused by: java.lang.NullPointerException at com.puppycrawl.tools.checkstyle.checks.coding.FinalLocalVariableCheck.findFirstUpperNamedBlock(FinalLocalVariableCheck.java:781) at com.puppycrawl.tools.checkstyle.checks.coding.FinalLocalVariableCheck.isSameVariables(FinalLocalVariableCheck.java:800) at com.puppycrawl.tools.checkstyle.checks.coding.FinalLocalVariableCheck.access$700(FinalLocalVariableCheck.java:142) at com.puppycrawl.tools.checkstyle.checks.coding.FinalLocalVariableCheck$ScopeData.findFinalVariableCandidateForAst(FinalLocalVariableCheck.java:863) at com.puppycrawl.tools.checkstyle.checks.coding.FinalLocalVariableCheck.getFinalCandidate(FinalLocalVariableCheck.java:444) at com.puppycrawl.tools.checkstyle.checks.coding.FinalLocalVariableCheck.visitToken(FinalLocalVariableCheck.java:304) at com.puppycrawl.tools.checkstyle.TreeWalker.notifyVisit(TreeWalker.java:340) at com.puppycrawl.tools.checkstyle.TreeWalker.processIter(TreeWalker.java:451) at com.puppycrawl.tools.checkstyle.TreeWalker.walk(TreeWalker.java:278) at com.puppycrawl.tools.checkstyle.TreeWalker.processFiltered(TreeWalker.java:151) at com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.process(AbstractFileSetCheck.java:87) at com.puppycrawl.tools.checkstyle.Checker.processFile(Checker.java:337) at com.puppycrawl.tools.checkstyle.Checker.processFiles(Checker.java:298) ... 5 more Checkstyle ends with 1 errors ``` after fix we should remove this exclude from contribution repo.
@anhminhtran235 , can you help us to resole this issue ? @romani Absolutely! I am on it. @romani Is this the 2nd NPE found after the fact because of our ignore list? Maybe we should run regression on everything to see if there is anything else. Please suggest how to run to detect only exceptions. Right now ignore list is for several files only, that are compiled by design on all jdk. Ignore unrelated exceptions (Like https://github.com/checkstyle/contribution/blob/master/checkstyle-tester/my_check.xml#L45 ) and either put all check severity to ignore or suppress all non-exception violations from a check. make sense. But right now checkstyle validation is better form before, we filter out only files (not that much of them) that are non-compilable. but I agree that this is good model for activation of validation for openjdk14 codebase. We might miss new syntax (same as we do now), but we will not miss exceptions in Checks. https://github.com/checkstyle/checkstyle/issues/8901 @romani @rnveach It's interesting that a null pointer exception occurred. It shouldn't. When I look at the exception stack trace: ``` Caused by: java.lang.NullPointerException at com.puppycrawl.tools.checkstyle.checks.coding.FinalLocalVariableCheck.findFirstUpperNamedBlock(FinalLocalVariableCheck.java:781) at com.puppycrawl.tools.checkstyle.checks.coding.FinalLocalVariableCheck.isSameVariables(FinalLocalVariableCheck.java:800) at com.puppycrawl.tools.checkstyle.checks.coding.FinalLocalVariableCheck.access$700(FinalLocalVariableCheck.java:142) at com.puppycrawl.tools.checkstyle.checks.coding.FinalLocalVariableCheck$ScopeData.findFinalVariableCandidateForAst(FinalLocalVariableCheck.java:863) . . . ``` Basically `findFinalVariableCandidateForAst` called `isSameVariables`: ``` public Optional<FinalVariableCandidate> findFinalVariableCandidateForAst(DetailAST ast) { Optional<FinalVariableCandidate> result = Optional.empty(); DetailAST storedVariable = null; final Optional<FinalVariableCandidate> candidate = Optional.ofNullable(scope.get(ast.getText())); if (candidate.isPresent()) { storedVariable = candidate.get().variableIdent; } if (storedVariable != null && isSameVariables(storedVariable, ast)) { // RIGHT HERE result = candidate; } return result; } ``` `storedVariable` is checked != null. So it shouldn't be equal to null. Then `isSameVariables` called `findFirstUpperNamedBlock`: ``` private static boolean isSameVariables(DetailAST ast1, DetailAST ast2) { final DetailAST classOrMethodOfAst1 = findFirstUpperNamedBlock(ast1); // RIGHT HERE final DetailAST classOrMethodOfAst2 = findFirstUpperNamedBlock(ast2); return classOrMethodOfAst1 == classOrMethodOfAst2 && ast1.getText().equals(ast2.getText()); } ``` `ast1` is `storedVariable`. So it shouldn't be null either. Then it crashed at `findFirstUpperNamedBlock` due to `null pointer exception`: ``` private static DetailAST findFirstUpperNamedBlock(DetailAST ast) { DetailAST astTraverse = ast; while (astTraverse.getType() != TokenTypes.METHOD_DEF // CRASHED HERE && astTraverse.getType() != TokenTypes.CLASS_DEF && astTraverse.getType() != TokenTypes.ENUM_DEF && astTraverse.getType() != TokenTypes.CTOR_DEF && !ScopeUtil.isClassFieldDef(astTraverse)) { astTraverse = astTraverse.getParent(); } return astTraverse; } ``` But `astTraverse` shouldn't be null. (I haven't run the debugger. I will do that tomorrow morning). Did I miss something here? The only thing I didn't understand is this: ``` at com.puppycrawl.tools.checkstyle.checks.coding.FinalLocalVariableCheck.access$700(FinalLocalVariableCheck.java:142) ``` It stands between `findFinalVariableCandidateForAst` and `isSameVariables` in the exception stack trace. So maybe it does something that I don't know about? You will have to debug it. Already looking at the code and file, I can see how it will produce an NPE. > access$700 I forget the exact name for this, but its an intermediator between 2 methods/fields that can't normally be accessed because of the visibility each is in. It requires Java to create this extra to bridge the gap between the 2 visibilities. `findFinalVariableCandidateForAst` is inside a separate class than `isSameVariables`, one is in a nested static class and the other is in the main class. `isSameVariables` is a private method which means it cannot be normally accessed by another external class. That is the gap that must be bridged for the 2 to talk to each other even though the Java rules say this is allowed. Just imagine how this would play out, if you had to code this manually for these 2 methods to be in completely separate classes and not nested. That is what the intermediator is doing. This should not play into the NPE. @anhminhtran235 , please copy case code to our UT Inputs, write UT method (there are tons of examples on how to do this) and debug it. Checkstyle use Test Driven Development model for bug fixes. I ran the unit test and understood how it will produce NPE now. It's because of this > astTraverse = astTraverse.getParent(); I'm trying to figure out what happens there. I'll tell you guys if there's any questions / updates. @romani @rnveach I think I figured out what went wrong. First of all, the error occurs when checking this line: > d = a < 0 ? -1 : 1; // 11, ternary operator Conditional expression ` a < 0 ? -1 : 1` is not a problem. In fact, if I change the whole MyRecord2.java to the following: ``` public record MyRecord2(boolean t, boolean f) { public MyRecord2 { int a = 1; a = 2; // ERROR when checking this line } } ``` The same error occurred. The reason is simple: When `isSameVariables` checks if `int a = 1` and `a = 2` are the same variables, it called `findFirstUpperNamedBlock` to see if they belongs to the same block. ``` private static DetailAST findFirstUpperNamedBlock(DetailAST ast) { DetailAST astTraverse = ast; while (astTraverse.getType() != TokenTypes.METHOD_DEF && astTraverse.getType() != TokenTypes.CLASS_DEF && astTraverse.getType() != TokenTypes.ENUM_DEF && astTraverse.getType() != TokenTypes.CTOR_DEF && !ScopeUtil.isClassFieldDef(astTraverse)) { astTraverse = astTraverse.getParent(); } return astTraverse; } ``` It should stop at `MyRecord2`, but it didn't because `MyRecord2` is a `COMPACT_CTOR_DEF`, which is NOT included in the while loop condition. So, the program keeps executing `astTraverse = astTraverse.getParent();` until `NPE`. Adding `&& astTraverse.getType() != TokenTypes.COMPACT_CTOR_DEF` solves the problem. ``` $ cat MyRecord2.java //non-compiled with javac: Compilable with Java14 public record MyRecord2(boolean t, boolean f) { public MyRecord2 { // violation int a = 1; int b = 1; int c = 1; int d = 1; int n = 8; if (a == 1) { // 2, if } else if (a == b // 3, if && a == c) { // 4, && operator if (c == 2) { // 5, if } } else if (a == d) { // 6, if try { } catch (Exception e) { // 7, catch } } else { switch (n) { case 1: // 8, case break; case 2: // 9, case break; case 3: // 10, case break; default: break; } } d = a < 0 ? -1 : 1; // 11, ternary operator } } cat FinalLocalVariableCheckTest.java . . . @Test public void testNPE() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(FinalLocalVariableCheck.class); final String[] expected = { "5:13: " + getCheckMessage(MSG_KEY, "a"), "6:13: " + getCheckMessage(MSG_KEY, "b"), "7:13: " + getCheckMessage(MSG_KEY, "c"), "9:13: " + getCheckMessage(MSG_KEY, "n"), }; verify(checkConfig, getPath("MyRecord2.java"), expected); } ``` 20/20 test cases passed. No null pointer exception. **Question:** I want to make a PR, but was a bit concern about Java version. Should I add `testNPE` in my PR? Because `MyRecord2.java` only works with Java 14. Also, is there anything else I need to change in this PR? @romani mentioned > after fix we should remove this exclude from contribution repo. One final question: Is there any command I need to run to make sure nothing went wrong? @anhminhtran235 you need to place your test input to non-compileable resources folder, you can find examples for any check that checks records. Please name your test method to something like testRecordsInput. Test file can be shortened to cover only things that is needed. By the way, instead of adding there one more comparison with token, please change whole expression to use util method https://github.com/checkstyle/checkstyle/blob/3c2249b239cbfe002af3649f1f7c1f9ae61df3b1/src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtil.java#L308 I messed up and now the PR is closed. What should I do? Should I open a new PR / Keep adding commit to current PR? Reopen PR, always push with force to GitHub ![img](https://user-images.githubusercontent.com/54651212/96489852-db11c780-11f4-11eb-8027-3a0b2c5ba29e.PNG) @romani I can't. The button is disabled. I tried to push force but nothing happens. I think the PR has been merged and closed. According to [Stack overflow](https://stackoverflow.com/a/12838195/10566888), it cannot be reopened. Should I open a new PR? Sorry for the trouble please create new PR and keep it open, even work in incomplete or CI is red or .... .
2020-10-21T20:52:22Z
8.36
checkstyle/checkstyle
8,907
checkstyle__checkstyle-8907
[ "6346" ]
1d500f05b91773a40e35cac884eb697c661ec5a6
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.java @@ -55,6 +55,8 @@ public abstract class AbstractClassCouplingCheck extends AbstractCheck { /** Class names to ignore. */ private static final Set<String> DEFAULT_EXCLUDED_CLASSES = Collections.unmodifiableSet( Arrays.stream(new String[] { + // reserved type name + "var", // primitives "boolean", "byte", "char", "double", "float", "int", "long", "short", "void", diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheck.java @@ -94,7 +94,7 @@ * Object, Override, Queue, RuntimeException, SafeVarargs, SecurityException, Set, Short, * SortedMap, SortedSet, String, StringBuffer, StringBuilder, SuppressWarnings, Throwable, * TreeMap, TreeSet, UnsupportedOperationException, Void, boolean, byte, char, double, - * float, int, long, short, void}. + * float, int, long, short, var, void}. * </li> * <li> * Property {@code excludeClassesRegexps} - Specify user-configured regular diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheck.java @@ -61,7 +61,7 @@ * Object, Override, Queue, RuntimeException, SafeVarargs, SecurityException, Set, Short, * SortedMap, SortedSet, String, StringBuffer, StringBuilder, SuppressWarnings, Throwable, * TreeMap, TreeSet, UnsupportedOperationException, Void, boolean, byte, char, double, - * float, int, long, short, void}. + * float, int, long, short, var, void}. * </li> * <li> * Property {@code excludeClassesRegexps} - Specify user-configured regular @@ -96,6 +96,10 @@ * Date date = new Date(); // Counted, 1 * Time time = new Time(); // Counted, 2 * Place place = new Place(); // Counted, 3 + * int value = 10; // int is ignored due to default excludedClasses property + * void method() { + * var result = "result"; // var is ignored due to default excludedClasses property + * } * } * </pre> * <p>
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java @@ -302,6 +302,16 @@ public void testClassFanOutComplexityRecords() throws Exception { getNonCompilablePath("InputClassFanOutComplexityRecords.java"), expected); } + @Test + public void testClassFanOutComplexityIgnoreVar() throws Exception { + final DefaultConfiguration checkConfig = + createModuleConfig(ClassFanOutComplexityCheck.class); + checkConfig.addAttribute("max", "0"); + final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; + verify(checkConfig, + getNonCompilablePath("InputClassFanOutComplexityVar.java"), expected); + } + /** * We cannot reproduce situation when visitToken is called and leaveToken is not. * So, we have to use reflection to be sure that even in such situation diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityVar.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityVar.java new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityVar.java @@ -0,0 +1,19 @@ +//non-compiled with javac: Compilable with Java10 +package com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity; + +import javax.naming.NamingException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/* Config: + * max = 0 + */ +class InputClassFanOutComplexityVar { // ok + void method() { + var x = 1; + } +}
ClassFanOutComplexity: false positive on var Taken from https://github.com/checkstyle/checkstyle/issues/6316#issuecomment-451522961 ```` $ cat TestClass.java public class TestClass { void method() { var x = 1; } } $ cat TestConfig.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> <module name="Checker"> <property name="charset" value="UTF-8"/> <module name="TreeWalker"> <module name="ClassFanOutComplexity"> <property name="max" value="0"/> </module> </module> </module> $ java -jar checkstyle-8.15-all.jar -c TestConfig.xml TestClass.java Starting audit... [ERROR] TestClass.java:1:1: Class Fan-Out Complexity is 1 (max allowed is 0). [ClassFanOutComplexity] Audit done. Checkstyle ends with 1 errors. ```` `var` should not be affecting ClassFanOutComplexity by default. With `var` changed to `Object`, no violation is produced. https://checkstyle.org/config_metrics.html#ClassFanOutComplexity should ignore var,int type should be counted ... as it is not a class..
@rnveach This check should ignore `var` completely? if not, issue requires clarification - if right side is, for example, a method invocation ``` var myVar = godKnowsWhatThisMethodReturns(); ``` I guess we cannot infer type here. The only case when we know type is a String/int/char/etc. literal on right side. @romani Please review. > This check should ignore var completely? My initial response is yes. Based on the JLS, https://docs.oracle.com/javase/specs/jls/se10/html/jls-14.html#jls-14.4.1 > If LocalVariableType is var, then let T be the type of the initializer expression when treated as if it did not appear in an assignment context, and were thus a standalone expression (§15.2). The type of the local variable is the upward projection of T with respect to all synthetic type variables mentioned by T (§4.10.5). I would say the document is saying `var` behaves the same as `T` as if it was a template for a method/class. > `<T> void method(T param) {}` So our check should act the same too, but I checked this out with the check, and it flags template classes too. @romani Do you agree that template classes shouldn't be flagged too? ```` $ cat TestClass.java public class TestClass { <T> void method(T param) { } } $ cat TestConfig.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <property name="charset" value="UTF-8"/> <module name="TreeWalker"> <module name="ClassFanOutComplexity"> <property name="max" value="0"/> </module> </module> </module> $ java -jar checkstyle-8.20-all.jar -c TestConfig.xml TestClass.java Starting audit... [ERROR] TestClass.java:1:1: Class Fan-Out Complexity is 1 (max allowed is 0). [ClassFanOutComplexity] Audit done. Checkstyle ends with 1 errors. ```` >I guess we cannot infer type here. Checkstyle can not infer types. Checkstyle works with string values. "var" for us is the same as Object. >Do you agree that template classes shouldn't be flagged too? It is ok, to be counted, as it some type and it is distinct. So amount of types is amount of tepmplate names. Var is different for us, as amount of vars, it not amount of distinct types. So it is better to ignore it completely. @romani ClassFanOutComplexity and ClassDataAbstractionCoupling have same superclass and same list of ignored classes. var can be added to this list and it looks like it will solve this issue, but there is side effect on ClassDataAbstractionCouplingCheck, it will ignore cases like: ``` Object a = new var(); ``` where var is a class name. It is not forbidden in java9 and lower. Looks weird and breaks java naming convention, but still possible. In my opinion, there are two options - add note to ClassDataAbstractionCouplingCheck or change existing design to add var only to ClassFanOutComplexity default excluded classes. if we add `var` to excluded classes, it will force it to appear in documentation. `var` is not a class for users. It is internal checkstyle's nuance that we treat it same as type. Ideally we should update grammar to keep it part of tokens. both such Checks should ignore `var` (in definition/left side) to my mind.
2020-10-20T09:03:14Z
8.36
checkstyle/checkstyle
8,720
checkstyle__checkstyle-8720
[ "8726" ]
3ee42d3deb541e191cf270aa6027a5cec137649e
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.java @@ -55,7 +55,7 @@ * <li> * Property {@code maximumDepth} - Specify the maximum depth for descendant counts. * Type is {@code int}. - * Default value is {@code java.lang.Integer.MAX_VALUE}. + * Default value is {@code 2147483647}. * </li> * <li> * Property {@code minimumNumber} - Specify a minimum count for descendants. @@ -65,7 +65,7 @@ * <li> * Property {@code maximumNumber} - Specify a maximum count for descendants. * Type is {@code int}. - * Default value is {@code java.lang.Integer.MAX_VALUE}. + * Default value is {@code 2147483647}. * </li> * <li> * Property {@code sumTokenCounts} - Control whether the number of tokens found diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java @@ -44,7 +44,7 @@ * Property {@code excludedClasses} - Specify pattern for qualified names of * classes which are allowed to have a {@code main} method. * Type is {@code java.util.regex.Pattern}. - * Default value is {@code "^$" (empty)}. + * Default value is {@code "^$"}. * </li> * </ul> * <p> diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java @@ -42,7 +42,7 @@ * associated with exception. If check meets variable name matching specified value - empty * block is suppressed. * Type is {@code java.util.regex.Pattern}. - * Default value is {@code "^$" (empty)}. + * Default value is {@code "^$"}. * </li> * <li> * Property {@code commentFormat} - Specify the RegExp for the first comment inside empty diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.java @@ -37,7 +37,7 @@ * Property {@code format} - Define the RegExp for illegal pattern. * Type is {@code java.lang.String}. * Validation type is {@code java.util.regex.Pattern}. - * Default value is {@code "^$" (empty)}. + * Default value is {@code "^$"}. * </li> * <li> * Property {@code ignoreCase} - Control whether to ignore case when matching. diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java @@ -153,7 +153,7 @@ * <li> * Property {@code specialImportsRegExp} - Specify RegExp for SPECIAL_IMPORTS group imports. * Type is {@code java.util.regex.Pattern}. - * Default value is {@code "^$" (empty)}. + * Default value is {@code "^$"}. * </li> * <li> * Property {@code separateLineBetweenGroups} - Force empty line separator between diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java @@ -50,7 +50,7 @@ * <li> * Property {@code forbiddenSummaryFragments} - Specify the regexp for forbidden summary fragments. * Type is {@code java.util.regex.Pattern}. - * Default value is {@code "^$" (empty)}. + * Default value is {@code "^$"}. * </li> * <li> * Property {@code period} - Specify the period symbol at the end of first javadoc sentence. diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheck.java @@ -88,7 +88,7 @@ * <li> * Property {@code format} - Specify the pattern to match against. * Type is {@code java.util.regex.Pattern}. - * Default value is {@code "^$"}(empty). + * Default value is {@code "^$"}. * </li> * <li> * Property {@code message} - Specify message which is used to notify about diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheck.java @@ -59,7 +59,7 @@ * <li> * Property {@code ignorePattern} - Specify pattern for lines to ignore. * Type is {@code java.util.regex.Pattern}. - * Default value is {@code "^$" (empty)}. + * Default value is {@code "^$"}. * </li> * <li> * Property {@code max} - Specify the maximum line length allowed.
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java @@ -1096,7 +1096,7 @@ else if (fieldClass == boolean.class) { } else if (fieldClass == int.class) { if (value.equals(Integer.MAX_VALUE)) { - result = "java.lang.Integer.MAX_VALUE"; + result = "2147483647"; } else { result = value.toString(); @@ -1211,10 +1211,6 @@ else if (fieldClass == Pattern.class) { if (value != null) { result = '"' + value.toString().replace("\n", "\\n").replace("\t", "\\t") .replace("\r", "\\r").replace("\f", "\\f") + '"'; - - if ("\"^$\"".equals(result)) { - result += " (empty)"; - } } } else if (fieldClass == Pattern[].class) {
Mofication of module property default values to reflect actual working data Some check properties have default values which wont work when copy-pasted in module configurations. For example: `null`: https://github.com/checkstyle/checkstyle/blob/6f58247b85ff4d74eb22dbd8c51d72b69fe51839/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheck.java#L72 `charset of parent module`: https://github.com/checkstyle/checkstyle/blob/6f58247b85ff4d74eb22dbd8c51d72b69fe51839/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheck.java#L64 We need to fix all such instances.
2020-08-19T21:52:51Z
8.35
checkstyle/checkstyle
8,420
checkstyle__checkstyle-8420
[ "8394" ]
f5cfb9e3c9d141d98bb480c900ebcc320a9f281c
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.java @@ -19,6 +19,9 @@ package com.puppycrawl.tools.checkstyle.checks.design; +import java.util.Arrays; +import java.util.List; + import com.puppycrawl.tools.checkstyle.FileStatefulCheck; import com.puppycrawl.tools.checkstyle.api.AbstractCheck; import com.puppycrawl.tools.checkstyle.api.DetailAST; @@ -28,7 +31,8 @@ /** * <p> * Checks nested (internal) classes/interfaces are declared at the bottom of the - * primary (top-level) class after all method and field declarations. + * primary (top-level) class after all init and static init blocks, + * method, constructor and field declarations. * </p> * <p> * To configure the check: @@ -45,6 +49,12 @@ * } * * class Test2 { + * static {}; // OK + * class InnerTest1 {} + * public Test2() {} // violation, constructor should be declared before inner types. + * } + * + * class Test3 { * private String s; // OK * public void test() {} // OK * class InnerTest1 {} @@ -73,6 +83,15 @@ public class InnerTypeLastCheck extends AbstractCheck { */ public static final String MSG_KEY = "arrangement.members.before.inner"; + /** List of class member tokens. */ + private static final List<Integer> CLASS_MEMBER_TOKENS = Arrays.asList( + TokenTypes.VARIABLE_DEF, + TokenTypes.METHOD_DEF, + TokenTypes.CTOR_DEF, + TokenTypes.INSTANCE_INIT, + TokenTypes.STATIC_INIT + ); + /** Meet a root class. */ private boolean rootClass = true; @@ -106,8 +125,7 @@ public void visitToken(DetailAST ast) { DetailAST nextSibling = ast.getNextSibling(); while (nextSibling != null) { if (!ScopeUtil.isInCodeBlock(ast) - && (nextSibling.getType() == TokenTypes.VARIABLE_DEF - || nextSibling.getType() == TokenTypes.METHOD_DEF)) { + && CLASS_MEMBER_TOKENS.contains(nextSibling.getType())) { log(nextSibling, MSG_KEY); } nextSibling = nextSibling.getNextSibling();
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheckTest.java @@ -87,6 +87,18 @@ public void testIfRootClassChecked3() throws Exception { }, "InputInnerTypeLastClassRootClass.java", expected); } + @Test + public void testInnerTypeBeforeCtor() throws Exception { + final DefaultConfiguration checkConfig = + createModuleConfig(InnerTypeLastCheck.class); + final String[] expected = { + "8:5: " + getCheckMessage(MSG_KEY), + "17:5: " + getCheckMessage(MSG_KEY), + "26:5: " + getCheckMessage(MSG_KEY), + }; + verify(checkConfig, getPath("InputInnerTypeLastClassCtorsInitBlocks.java"), expected); + } + @Test public void testGetAcceptableTokens() { final InnerTypeLastCheck obj = new InnerTypeLastCheck(); diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/InputInnerTypeLastClassCtorsInitBlocks.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/InputInnerTypeLastClassCtorsInitBlocks.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/InputInnerTypeLastClassCtorsInitBlocks.java @@ -0,0 +1,27 @@ +package com.puppycrawl.tools.checkstyle.checks.design.innertypelast; + +/** Config: default */ +public class InputInnerTypeLastClassCtorsInitBlocks { + public class Inner { // violation + } + + public InputInnerTypeLastClassCtorsInitBlocks() { + } +} + +class BeforeInitBlock { + + public class Inner2 { // violation + } + + {} + +} + +class BeforeStaticInitBlock { + + public interface Inner3 { // violation + } + + static {} +}
InnerTypeLast should handle ctors and static init blocks https://checkstyle.sourceforge.io/config_design.html#InnerTypeLast From the Check description: >> Checks nested (internal) classes/interfaces are declared at the bottom of the primary (top-level) class after all method and field declarations. It is a bit unclear whether **constructors** should be declared before an inner type. I think they should be. $ javac TestClass.java ``` (no output) ``` $ cat config.xml ```xml <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> <module name="Checker"> <module name="TreeWalker"> <module name="InnerTypeLast"> </module> </module> </module> ``` $ cat TestClass.java ```java class TestClass1 { public class Inner { // Expected violation } public TestClass1(Object x) { // ctor } } class TestClass2 { public class Inner { // Expected violation } static { // static init block } } ``` $ RUN_LOCALE="-Duser.language=en -Duser.country=US" $ java $RUN_LOCALE -jar checkstyle-8.34-all.jar -c config.xml TestClass.java ``` Starting audit... Audit done. ```
I agree ctors should be included. I question static ctors and instance ctors without the method declaration (just `{}`), but I think it does make some sense they are included too.
2020-07-08T15:11:33Z
8.34
checkstyle/checkstyle
8,273
checkstyle__checkstyle-8273
[ "8266" ]
7b55584d331154daf37ab8f56b83be2951ef263f
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheck.java @@ -450,12 +450,18 @@ private boolean shouldCheck(final DetailAST ast, final Scope nodeScope) { private static Scope calculateScope(final DetailAST ast) { final Scope scope; - if (ScopeUtil.isInInterfaceOrAnnotationBlock(ast)) { + if (ScopeUtil.isInAnnotationBlock(ast)) { scope = Scope.PUBLIC; } else { final DetailAST mods = ast.findFirstToken(TokenTypes.MODIFIERS); - scope = ScopeUtil.getScopeFromMods(mods); + final Scope modifiersScope = ScopeUtil.getScopeFromMods(mods); + if (modifiersScope == Scope.PACKAGE && ScopeUtil.isInInterfaceBlock(ast)) { + scope = Scope.PUBLIC; + } + else { + scope = modifiersScope; + } } return scope; }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheckTest.java @@ -463,4 +463,29 @@ public void testConstructor() throws Exception { }; verify(checkConfig, getPath("InputMissingJavadocMethodConstructor.java"), expected); } + + @Test + public void testNotPublicInterfaceMethods() throws Exception { + final DefaultConfiguration checkConfig = createModuleConfig( + MissingJavadocMethodCheck.class); + checkConfig.addAttribute("scope", "public"); + final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; + verify(checkConfig, getNonCompilablePath( + "InputMissingJavadocMethodInterfacePrivateMethod.java"), expected); + } + + @Test + public void testPublicMethods() throws Exception { + final DefaultConfiguration checkConfig = createModuleConfig( + MissingJavadocMethodCheck.class); + final String[] expected = { + "9:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "11:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "15:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "18:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + "22:5: " + getCheckMessage(MSG_JAVADOC_MISSING), + }; + verify(checkConfig, getPath("InputMissingJavadocMethodPublicMethods.java"), expected); + + } } diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodInterfacePrivateMethod.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodInterfacePrivateMethod.java new file mode 100644 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodInterfacePrivateMethod.java @@ -0,0 +1,11 @@ +//non-compiled with javac: Compilable with Java9 +// private method in interface + +package com.puppycrawl.tools.checkstyle.checks.javadoc.missingjavadocmethod; + +public interface InputMissingJavadocMethodInterfacePrivateMethod { + + private static void myPrivateMethod() { + + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodPublicMethods.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodPublicMethods.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodPublicMethods.java @@ -0,0 +1,58 @@ +package com.puppycrawl.tools.checkstyle.checks.javadoc.missingjavadocmethod; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; + +/* Config = default */ +public class InputMissingJavadocMethodPublicMethods { + + public void annotation(final char @SomeAnnotation [] arg) {} + + public @SomeAnnotation String @SomeAnnotation [] annotationInSignature() { + return new String[]{}; + } + + public static <T> T[] typeInSignature(T[] array) { + return null; + } + public static <T> T[][] typeInSignature2(T[][] array) { + return null; + } + + public static void main(String[] args) throws Exception {} + + /** + * Some javadoc + */ + public void annotation1(final char @SomeAnnotation [] arg) {} + + /** + * Some javadoc + */ + public @SomeAnnotation String @SomeAnnotation [] annotationInSignature1() { + return new String[]{}; + } + + /** + * Some javadoc + */ + public static <T> T[] typeInSignature3(T[] array) { + return null; + } + + /** + * Some javadoc + */ + public static <T> T[][] typeInSignature4(T[][] array) { + return null; + } + + /** + * Some javadoc + */ + public static void mainWithArgs(String[] args) throws Exception {} + + @Target(ElementType.TYPE_USE) + @interface SomeAnnotation { + } +}
MissingJavadocMethod flagging private methods even target scope is public methods only https://checkstyle.sourceforge.io/config_javadoc.html#MissingJavadocMethod ``` $ javac CheckstylePrivateMethodTest.java $ ``` ``` $ cat config.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name = "Checker"> <module name="TreeWalker"> <module name="MissingJavadocMethod"> <property name="scope" value="public"/> <property name="minLineCount" value="2"/> <property name="tokens" value="METHOD_DEF"/> </module> </module> </module> ``` ``` $ cat CheckstylePrivateMethodTest.java public interface CheckstylePrivateMethodTest { private static void whyIsMissingJavadocMethodBeingFlagged() { System.out.println(); System.out.println(); System.out.println(); System.out.println(); } } ``` ``` $ java -jar checkstyle-8.32-all.jar -c config.xml CheckstylePrivateMethodTest.java Starting audit... [ERROR] CheckstylePrivateMethodTest.java:2:3: Missing a Javadoc comment. [MissingJavadocMethod] Audit done. Checkstyle ends with 1 errors. ``` --------------- Expected - no violation. When an interface has a private static method that goes beyond the line limit, it gets flagged as needing a javadoc comment, even though private methods are supposed to be exempt. --------------
@ChrisTrenkamp Please correct your config example to only one failing check. Issue is in line https://github.com/checkstyle/checkstyle/blob/6275303e6b5fd4d5e9a6504b390efd0e4aee564d/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheck.java#L453-L455 interfaces can have private methods since Java 9 So it looks like a bug > > > @ChrisTrenkamp Please correct your config example to only one failing check. Done.
2020-05-29T14:46:23Z
8.33
checkstyle/checkstyle
8,103
checkstyle__checkstyle-8103
[ "7736" ]
2a7aff864ca7a7c5ef14030bb702d8f48a59953d
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInterfaceMemberImpliedModifierTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInterfaceMemberImpliedModifierTest.java new file mode 100644 --- /dev/null +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInterfaceMemberImpliedModifierTest.java @@ -0,0 +1,136 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2020 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package org.checkstyle.suppressionxpathfilter; + +import java.io.File; +import java.util.Arrays; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import com.puppycrawl.tools.checkstyle.DefaultConfiguration; +import com.puppycrawl.tools.checkstyle.checks.modifier.InterfaceMemberImpliedModifierCheck; + +public class XpathRegressionInterfaceMemberImpliedModifierTest extends AbstractXpathTestSupport { + + @Override + protected String getCheckName() { + return InterfaceMemberImpliedModifierCheck.class.getSimpleName(); + } + + @Test + public void testOne() throws Exception { + final File fileToProcess = new File( + getPath("SuppressionXpathRegressionInterfaceMemberImpliedModifier1.java") + ); + + final DefaultConfiguration moduleConfig = + createModuleConfig(InterfaceMemberImpliedModifierCheck.class); + + final String[] expectedViolation = { + "4:5: " + getCheckMessage(InterfaceMemberImpliedModifierCheck.class, + InterfaceMemberImpliedModifierCheck.MSG_KEY, "final"), + }; + + final List<String> expectedXpathQueries = Arrays.asList( + "/INTERFACE_DEF[./IDENT" + + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier1']]" + + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='str']]", + + "/INTERFACE_DEF[./IDENT" + + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier1']]" + + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='str']]" + + "/MODIFIERS", + + "/INTERFACE_DEF[./IDENT" + + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier1']]" + + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='str']]" + + "/MODIFIERS/LITERAL_PUBLIC" + ); + + runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries); + } + + @Test + public void testTwo() throws Exception { + final File fileToProcess = new File( + getPath("SuppressionXpathRegressionInterfaceMemberImpliedModifier2.java") + ); + + final DefaultConfiguration moduleConfig = + createModuleConfig(InterfaceMemberImpliedModifierCheck.class); + + final String[] expectedViolation = { + "4:5: " + getCheckMessage(InterfaceMemberImpliedModifierCheck.class, + InterfaceMemberImpliedModifierCheck.MSG_KEY, "public"), + }; + + final List<String> expectedXpathQueries = Arrays.asList( + "/INTERFACE_DEF[./IDENT" + + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier2']]" + + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='setData']]", + + "/INTERFACE_DEF[./IDENT" + + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier2']]" + + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='setData']]" + + "/MODIFIERS", + + "/INTERFACE_DEF[./IDENT" + + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier2']]" + + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='setData']]" + + "/MODIFIERS/ABSTRACT" + ); + + runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries); + } + + @Test + public void testThree() throws Exception { + final File fileToProcess = new File( + getPath("SuppressionXpathRegressionInterfaceMemberImpliedModifier3.java") + ); + + final DefaultConfiguration moduleConfig = + createModuleConfig(InterfaceMemberImpliedModifierCheck.class); + + final String[] expectedViolation = { + "4:5: " + getCheckMessage(InterfaceMemberImpliedModifierCheck.class, + InterfaceMemberImpliedModifierCheck.MSG_KEY, "static"), + }; + + final List<String> expectedXpathQueries = Arrays.asList( + "/INTERFACE_DEF[./IDENT" + + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier3']]" + + "/OBJBLOCK/INTERFACE_DEF[./IDENT[@text='Data']]", + + "/INTERFACE_DEF[./IDENT" + + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier3']]" + + "/OBJBLOCK/INTERFACE_DEF[./IDENT[@text='Data']]" + + "/MODIFIERS", + + "/INTERFACE_DEF[./IDENT" + + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier3']]" + + "/OBJBLOCK/INTERFACE_DEF[./IDENT[@text='Data']]" + + "/MODIFIERS/LITERAL_PUBLIC" + ); + + runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries); + } +} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier1.java new file mode 100644 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier1.java @@ -0,0 +1,5 @@ +package org.checkstyle.suppressionxpathfilter.interfacememberimpliedmodifier; + +public interface SuppressionXpathRegressionInterfaceMemberImpliedModifier1 { + public static String str = "random string"; // warn +} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier2.java new file mode 100644 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier2.java @@ -0,0 +1,5 @@ +package org.checkstyle.suppressionxpathfilter.interfacememberimpliedmodifier; + +public interface SuppressionXpathRegressionInterfaceMemberImpliedModifier2 { + abstract void setData(); // warn +} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier3.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier3.java new file mode 100644 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier3.java @@ -0,0 +1,5 @@ +package org.checkstyle.suppressionxpathfilter.interfacememberimpliedmodifier; + +public interface SuppressionXpathRegressionInterfaceMemberImpliedModifier3 { + public interface Data {} // warn +} diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java @@ -59,9 +59,6 @@ * Indentation * </li> * <li> - * InterfaceMemberImpliedModifier - * </li> - * <li> * JavadocMethod * </li> * <li>
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java @@ -59,7 +59,6 @@ public class XpathRegressionTest extends AbstractModuleTestSupport { "CustomImportOrder", "EmptyLineSeparator", "Indentation", - "InterfaceMemberImpliedModifier", "JavadocMethod", "JavadocType", "MissingJavadocType",
Update AbstractChecks to log DetailAST - InterfaceMemberImpliedModifier Child of https://github.com/checkstyle/checkstyle/issues/5777 This issue specifically focuses on InterfaceMemberImpliedModifier.
i am on it @romani @rnveach can you help me to resolve this issue. I read bit about Xpath and about checkstyle filter from https://checkstyle.org/config_filters.html but didn't get much idea. @pkpale Look at work done by other contributors for similar issues and it will give you an idea of what needs to be done. https://github.com/checkstyle/checkstyle/issues?q=label%3A%22gsoc+second+issue%22+is%3Aclosed I'm on it!
2020-04-15T08:21:15Z
8.31
checkstyle/checkstyle
8,127
checkstyle__checkstyle-8127
[ "3201" ]
c473838188f35321b53b602fecd19630eec2be39
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheck.java @@ -38,7 +38,7 @@ * }; * </pre> * <p> - * The check demands a comma at the end if neither left nor right curly braces + * By default, the check demands a comma at the end if neither left nor right curly braces * are on the same line as the last element of the array. * </p> * <pre> @@ -89,6 +89,13 @@ * 100000000000000000001, // More work needed to duplicate * } * </pre> + * <ul> + * <li> + * Property {@code alwaysDemandTrailingComma} - Control whether to always check for a trailing + * comma, even when an array is inline. + * Default value is {@code false}. + * </li> + * </ul> * <p> * To configure the check: * </p> @@ -132,6 +139,47 @@ * ,}; // no violation * </pre> * + * <p>To configure check to always validate trailing comma:</p> + * <pre> + * &lt;module name="ArrayTrailingComma"&gt; + * &lt;property name="alwaysDemandTrailingComma" value="true"/&gt; + * &lt;/module&gt; + * </pre> + * <p>Example:</p> + * <pre> + * int[] numbers = {1, 2, 3}; // violation + * boolean[] bools = { + * true, + * true, + * false // violation + * }; + * + * String[][] text = {{},{},}; // OK + * + * double[][] decimals = { + * {0.5, 2.3, 1.1,}, // OK + * {1.7, 1.9, 0.6}, // violation + * {0.8, 7.4, 6.5} // violation + * }; // violation, previous line misses a comma + * + * char[] chars = {'a', 'b', 'c' // violation + * }; + * + * String[] letters = { + * "a", "b", "c"}; // violation + * + * int[] a1 = new int[]{ + * 1, + * 2 + * , + * }; // OK + * + * int[] a2 = new int[]{ + * 1, + * 2 + * ,}; // OK + * </pre> + * * @since 3.2 */ @StatelessCheck @@ -143,6 +191,20 @@ public class ArrayTrailingCommaCheck extends AbstractCheck { */ public static final String MSG_KEY = "array.trailing.comma"; + /** + * Control whether to always check for a trailing comma, even when an array is inline. + */ + private boolean alwaysDemandTrailingComma; + + /** + * Setter to control whether to always check for a trailing comma, even when an array is inline. + * + * @param alwaysDemandTrailingComma whether to always check for a trailing comma. + */ + public void setAlwaysDemandTrailingComma(boolean alwaysDemandTrailingComma) { + this.alwaysDemandTrailingComma = alwaysDemandTrailingComma; + } + @Override public int[] getDefaultTokens() { return getRequiredTokens(); @@ -164,8 +226,9 @@ public void visitToken(DetailAST arrayInit) { final DetailAST previousSibling = rcurly.getPreviousSibling(); if (arrayInit.getChildCount() != 1 - && !TokenUtil.areOnSameLine(rcurly, previousSibling) - && !TokenUtil.areOnSameLine(arrayInit, previousSibling) + && (alwaysDemandTrailingComma + || !TokenUtil.areOnSameLine(rcurly, previousSibling) + && !TokenUtil.areOnSameLine(arrayInit, previousSibling)) && previousSibling.getType() != TokenTypes.COMMA) { log(previousSibling, MSG_KEY); }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheckTest.java @@ -57,4 +57,25 @@ public void testTokensNotNull() { assertNotNull(check.getRequiredTokens(), "Invalid required tokens"); } + @Test + public void testAlwaysDemandTrailingComma() throws Exception { + final DefaultConfiguration checkConfig = + createModuleConfig(ArrayTrailingCommaCheck.class); + checkConfig.addAttribute("alwaysDemandTrailingComma", "true"); + final String[] expected = { + "12:26: " + getCheckMessage(MSG_KEY), + "19:29: " + getCheckMessage(MSG_KEY), + "24:14: " + getCheckMessage(MSG_KEY), + "26:17: " + getCheckMessage(MSG_KEY), + "29:20: " + getCheckMessage(MSG_KEY), + "35:17: " + getCheckMessage(MSG_KEY), + "44:13: " + getCheckMessage(MSG_KEY), + "49:28: " + getCheckMessage(MSG_KEY), + "51:17: " + getCheckMessage(MSG_KEY), + "53:13: " + getCheckMessage(MSG_KEY), + }; + verify(checkConfig, + getPath("InputArrayTrailingCommaAlwaysDemandTrailingComma.java"), expected); + } + } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/InputArrayTrailingCommaAlwaysDemandTrailingComma.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/InputArrayTrailingCommaAlwaysDemandTrailingComma.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/InputArrayTrailingCommaAlwaysDemandTrailingComma.java @@ -0,0 +1,56 @@ +package com.puppycrawl.tools.checkstyle.checks.coding.arraytrailingcomma; + +/** + * Config: + * alwaysDemandTrailingComma = true + */ +public class InputArrayTrailingCommaAlwaysDemandTrailingComma { + public int[] test() { + if (true) { + return new int[]{0,}; + } + return new int[]{0}; // violation + } + + public int[] test2() { + if (true) { + return new int[]{0, 1,}; + } + return new int[]{0, 1}; // violation + } + + public void test3() { + int[] a = new int[] + {0}; // violation + int[] b = new int[] + {0, 1}; // violation + int[] c = new int[] + {0, 1, + 2, 3 + }; // violation + int[] d = new int[] + { + 1, + 2, + 3 + }; // violation + int[] e = new int[] + { + 1, + 5, + 6, + }; + int[] f = {1, + 2 + }; // violation + int[] g = {1, + 2, + }; + int[][] empty2d = {{}}; // violation + int[][] multiDimensionalArray = { + {1, 2}, // violation + {1,}, + {3, 2, 1,} + }; // violation + } +}
Allow to configure if ArrayTrailingComma should ignore single-line arrays Currently the [ArrayTrailingComma](http://checkstyle.sourceforge.net/config_coding.html#ArrayTrailingComma) automatically ignores inline declarations. So using a configuration such as: ``` xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> <module name="Checker"> <module name="TreeWalker"> <module name="ArrayTrailingComma"/> </module> </module> ``` will never report on constructs such as: ``` java public class Foo { public int[] getBar() { return new int[] { 0 }; // ^ doesn't report missing trailing comma } } ``` ``` bash $ java -jar ~/Downloads/checkstyle-6.18/checkstyle-6.18-all.jar -c config.xml Foo.java Starting audit... Audit done. ``` This behaviour is by design and is documented. However, it would be nice if such behaviour could be configured through a property (keeping the current behaviour as default for backwards compatibility), so that we may write a configuration such as: ``` xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> <module name="Checker"> <module name="TreeWalker"> <module name="ArrayTrailingComma"> <property name="ignoreInlineArrays" value="false"/> </module> </module> </module> ``` And have it report a missing trailing comma on the given code, forcing developers to write: ``` java public class Foo { public int[] getBar() { return new int[] { 0, }; } } ``` Making the new `ignoreInlineArrays` property default to `true` would guarantee backwards compatibility, allowing users to opt-in to this behaviour. ##
connection with @unrealwork is lost, PR is closed as incomplete. If smb want to continue from scratch or from where @unrealwork is finished, please be welcome . @jsotuyod , we got PullRequest with fix for your issue, so it bring my attention back to this issue. can you provide more details on why it is reasonable to ignore single line array declarations ? We need to put reason in documentation. we need to find better name for property as `ignore.....` usually mean completely skip from consideration but you do expect violation. @kukreja-vikramaditya , can you suggest good name ? from documentation: > The check demands a comma at the end if neither left nor right curly braces are on the same line as the last element of the array so there should be violation on a case that @jsotuyod is provided , it is even show in documentation .... strange ... looks like we have a bug. The whole point of having a trailing comma is to simplify reordering the array. In general, and in particular under the current implementation, this is restricted to swapping lines in the IDE / cutting and pasting whole lines in a different order. However, the cut and paste approach should still work for single line arrays. For instance, given the following array: ```java int color[] = { BLACK, RED, BLUE, YELLOW, } ``` I can stand *at any one point*, and performing a 3 word cut, go paste it at a different position and the result will be consistent (for all VIM fans out there `3ciw`!). This wouldn't work without the trailing comma after `YELLOW`. As for the name, I suggested `ignoreInlineArrays` default to true so as to completely ignore them by default (backwards-compatible), and I would only expect a violation when set to `false`. I believe this is right according to your own reasoning. @jsotuyod , thanks for explanation. > I believe this is right according to your own reasoning. yes, thanks for correcting me. I have some concerns about name of property - `...Inline...`. To my mind it is better to use smth like `ignoreSameLineDeclaration` ..... but in result and consider your reason ... Why we so focused on single line arrays ? If follow you reasoning you always want to have comma in array, examples: ``` $ cat MyClass.java public class MyClass { public int[] getBar() { return new int[] { 0 }; return new int[] { 0, 1 }; return new int[] { 0 }; return new int[] { 0, 1 }; return new int[] { 0, 1, 2, 3 // now violation is only there }; } } $ cat config.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd"> <module name="Checker"> <module name="TreeWalker"> <module name="ArrayTrailingComma"> </module> </module> </module> $ java -jar checkstyle-8.1-all.jar -c config.xml MyClass.java Starting audit... [ERROR] /var/tmp/MyClass.java:12: Array should contain trailing comma. [ArrayTrailingComma] Audit done. Checkstyle ends with 1 errors. ``` and by your reasoning/logic you will expect violation in all that cases if some option is use, am I right ? if yes, so we can have property `alwaysDemandTrailingComma` @romani yes, definitely better. I agree with your reasoning. @romani So I would only need to update the property name to `alwaysDemandTrailingComma` ( **UPDATE 1** which defaults to `false`) and update the documentation of the ArrayTrailingComma check? >The check demands a comma at the end if neither left nor right curly braces are on the same line as the last element of the array **UPDATE 1** So if the property name is `alwaysDemandTrailingComma`, I would only have to detect a `}` and verify a comma exists (which can be ignored in the case of an empty array as per the reasoning given by @jsotuyod ?) @jsotuyod Do you think we should have special processing for anonymous arrays (like only check them or skip them) ? Or i guess it would be clear more once reports are generated . @kukreja-vikramaditya I think all arrays should be treated equally. yes, lets treat all arrays in the same way. @kukreja-vikramaditya , name of property is good. if that property is TRUE all you need to make sure that there is `,` at the end of array AST. Please close your current PR, as it should seriously redone. @kukreja-vikramaditya , please review why we do not report violation on `return new int[] { 0 };` , html documentation clain there should be violation. Smth is not right code or documentation. On it @romani if @kukreja-vikramaditya is not working on this issue, can I take it? Since it hasn't been touched for a long time? @Gaurav-Punjabi yes, you can take this issue I'm on it.
2020-04-18T22:33:14Z
8.32
checkstyle/checkstyle
8,070
checkstyle__checkstyle-8070
[ "7767" ]
65122e39bc3852862d0b55eb3317137893cd3ebb
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java @@ -97,9 +97,6 @@ * <li> * VariableDeclarationUsageDistance * </li> - * <li> - * WriteTag - * </li> * </ul> * <p> * Also, the filter does not support suppressions inside javadoc reported by Javadoc checks: @@ -135,6 +132,9 @@ * <li> * SummaryJavadoc * </li> + * <li> + * WriteTag + * </li> * </ul> * <p> * Note, that support for these Checks will be available after resolving issues
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java @@ -45,6 +45,7 @@ import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport; import com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck; import com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck; +import com.puppycrawl.tools.checkstyle.checks.javadoc.WriteTagCheck; import com.puppycrawl.tools.checkstyle.internal.utils.CheckUtil; public class XpathRegressionTest extends AbstractModuleTestSupport { @@ -70,8 +71,7 @@ public class XpathRegressionTest extends AbstractModuleTestSupport { "TodoComment", "TrailingComment", "UnnecessaryParentheses", - "VariableDeclarationUsageDistance", - "WriteTag" + "VariableDeclarationUsageDistance" ))); // Javadoc checks are not compatible with SuppressionXpathFilter @@ -89,13 +89,16 @@ public class XpathRegressionTest extends AbstractModuleTestSupport { "MissingDeprecated", "NonEmptyAtclauseDescription", "SingleLineJavadoc", - "SummaryJavadoc" + "SummaryJavadoc", + "WriteTag" ))); // Older regex-based checks that are under INCOMPATIBLE_JAVADOC_CHECK_NAMES // but not subclasses of AbstractJavadocCheck. - private static final Set<Class<?>> REGEXP_JAVADOC_CHECKS = - Collections.singleton(JavadocStyleCheck.class); + private static final Set<Class<?>> REGEXP_JAVADOC_CHECKS = new HashSet<>(Arrays.asList( + JavadocStyleCheck.class, + WriteTagCheck.class + )); // Checks that allowed to have no XPath IT Regression Testing // till https://github.com/checkstyle/checkstyle/issues/6207
move WriteTag Check to list of javadoc Check in XpathSuppressionFilter documentation ~Child of https://github.com/checkstyle/checkstyle/issues/5777~ This issue specifically focuses on WriteTag.
I am on it
2020-04-10T21:34:09Z
8.31
checkstyle/checkstyle
8,008
checkstyle__checkstyle-8008
[ "7925" ]
b284d53b95138c3dad37c9ac04dfc6a5a99286cd
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java @@ -19,17 +19,13 @@ package com.puppycrawl.tools.checkstyle.checks.javadoc; -import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.Deque; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.ListIterator; -import java.util.Map; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -332,9 +328,6 @@ public class JavadocMethodCheck extends AbstractCheck { private static final Pattern MATCH_JAVADOC_NOARG_CURLY = CommonUtil.createPattern("\\{\\s*@(inheritDoc)\\s*\\}"); - /** Stack of maps for type params. */ - private final Deque<Map<String, ClassInfo>> currentTypeParams = new ArrayDeque<>(); - /** Name of current class. */ private String currentClassName; @@ -459,9 +452,6 @@ public final void visitToken(DetailAST ast) { processClass(ast); } else { - if (ast.getType() == TokenTypes.METHOD_DEF) { - processTypeParams(ast); - } processAST(ast); } } @@ -474,10 +464,6 @@ public final void leaveToken(DetailAST ast) { // perhaps it was inner class final int dotIdx = currentClassName.lastIndexOf('$'); currentClassName = currentClassName.substring(0, dotIdx); - currentTypeParams.pop(); - } - else if (ast.getType() == TokenTypes.METHOD_DEF) { - currentTypeParams.pop(); } } @@ -730,7 +716,7 @@ private static List<DetailAST> getParameters(DetailAST ast) { * @param ast the method node. * @return the list of exception nodes for ast. */ - private List<ExceptionInfo> getThrows(DetailAST ast) { + private static List<ExceptionInfo> getThrows(DetailAST ast) { final List<ExceptionInfo> returnValue = new ArrayList<>(); final DetailAST throwsAST = ast .findFirstToken(TokenTypes.LITERAL_THROWS); @@ -741,7 +727,7 @@ private List<ExceptionInfo> getThrows(DetailAST ast) { || child.getType() == TokenTypes.DOT) { final FullIdent ident = FullIdent.createFullIdent(child); final ExceptionInfo exceptionInfo = new ExceptionInfo( - createClassInfo(new Token(ident), currentClassName)); + new ClassInfo(new Token(ident))); returnValue.add(exceptionInfo); } child = child.getNextSibling(); @@ -756,7 +742,7 @@ private List<ExceptionInfo> getThrows(DetailAST ast) { * @param methodAst method DetailAST object where to find exceptions * @return list of ExceptionInfo */ - private List<ExceptionInfo> getThrowed(DetailAST methodAst) { + private static List<ExceptionInfo> getThrowed(DetailAST methodAst) { final List<ExceptionInfo> returnValue = new ArrayList<>(); final DetailAST blockAst = methodAst.findFirstToken(TokenTypes.SLIST); if (blockAst != null) { @@ -768,7 +754,7 @@ private List<ExceptionInfo> getThrowed(DetailAST methodAst) { if (newAst.getType() == TokenTypes.LITERAL_NEW) { final FullIdent ident = FullIdent.createFullIdent(newAst.getFirstChild()); final ExceptionInfo exceptionInfo = new ExceptionInfo( - createClassInfo(new Token(ident), currentClassName)); + new ClassInfo(new Token(ident))); returnValue.add(exceptionInfo); } } @@ -1018,8 +1004,7 @@ private void checkThrowsTags(List<JavadocTag> tags, // Loop looking for matching throw final Token token = new Token(tag.getFirstArg(), tag.getLineNo(), tag .getColumnNo()); - final ClassInfo documentedClassInfo = createClassInfo(token, - currentClassName); + final ClassInfo documentedClassInfo = new ClassInfo(token); processThrows(throwsList, documentedClassInfo, foundThrows); } // Now dump out all throws without tags :- unless @@ -1099,39 +1084,6 @@ private static boolean isClassNamesSame(String class1, String class2) { return result; } - /** - * Process type params (if any) for given class, enum or method. - * - * @param ast class, enum or method to process. - */ - private void processTypeParams(DetailAST ast) { - final DetailAST params = - ast.findFirstToken(TokenTypes.TYPE_PARAMETERS); - - final Map<String, ClassInfo> paramsMap = new HashMap<>(); - currentTypeParams.push(paramsMap); - - if (params != null) { - for (DetailAST child = params.getFirstChild(); - child != null; - child = child.getNextSibling()) { - if (child.getType() == TokenTypes.TYPE_PARAMETER) { - final DetailAST bounds = - child.findFirstToken(TokenTypes.TYPE_UPPER_BOUNDS); - if (bounds != null) { - final FullIdent name = - FullIdent.createFullIdentBelow(bounds); - final ClassInfo classInfo = - createClassInfo(new Token(name), currentClassName); - final String alias = - child.findFirstToken(TokenTypes.IDENT).getText(); - paramsMap.put(alias, classInfo); - } - } - } - } - } - /** * Processes class definition. * @@ -1143,48 +1095,6 @@ private void processClass(DetailAST ast) { innerClass = "$" + innerClass; currentClassName += innerClass; - processTypeParams(ast); - } - - /** - * Creates class info for given name. - * - * @param name name of type. - * @param surroundingClass name of surrounding class. - * @return class info for given name. - */ - private ClassInfo createClassInfo(final Token name, - final String surroundingClass) { - final ClassInfo result; - final ClassInfo classInfo = findClassAlias(name.getText()); - if (classInfo == null) { - result = new RegularClass(name, surroundingClass, this); - } - else { - result = new ClassAlias(name, classInfo); - } - return result; - } - - /** - * Looking if a given name is alias. - * - * @param name given name - * @return ClassInfo for alias if it exists, null otherwise - * @noinspection WeakerAccess - */ - private ClassInfo findClassAlias(final String name) { - ClassInfo classInfo = null; - final Iterator<Map<String, ClassInfo>> iterator = currentTypeParams - .descendingIterator(); - while (iterator.hasNext()) { - final Map<String, ClassInfo> paramMap = iterator.next(); - classInfo = paramMap.get(name); - if (classInfo != null) { - break; - } - } - return classInfo; } /** @@ -1202,10 +1112,6 @@ private static class ClassInfo { * @throws IllegalArgumentException when className is nulls */ protected ClassInfo(final Token className) { - if (className == null) { - throw new IllegalArgumentException( - "ClassInfo's name should be non-null"); - } name = className; } @@ -1220,63 +1126,6 @@ public final Token getName() { } - /** Represents regular classes/enums. */ - private static final class RegularClass extends ClassInfo { - - /** Name of surrounding class. */ - private final String surroundingClass; - /** The check we use to resolve classes. */ - private final JavadocMethodCheck check; - - /** - * Creates new instance of of class information object. - * - * @param name {@code FullIdent} associated with new object. - * @param surroundingClass name of current surrounding class. - * @param check the check we use to load class. - */ - /* package */ RegularClass(final Token name, - final String surroundingClass, - final JavadocMethodCheck check) { - super(name); - this.surroundingClass = surroundingClass; - this.check = check; - } - - @Override - public String toString() { - return "RegularClass[name=" + getName() - + ", in class='" + surroundingClass + '\'' - + ", check=" + check.hashCode() - + ']'; - } - - } - - /** Represents type param which is "alias" for real type. */ - private static class ClassAlias extends ClassInfo { - - /** Class information associated with the alias. */ - private final ClassInfo classInfo; - - /** - * Creates new instance of the class. - * - * @param name token which represents name of class alias. - * @param classInfo class information associated with the alias. - */ - /* package */ ClassAlias(final Token name, ClassInfo classInfo) { - super(name); - this.classInfo = classInfo; - } - - @Override - public String toString() { - return "ClassAlias[alias " + getName() + " for " + classInfo.getName() + "]"; - } - - } - /** * Represents text element with location in the text. */
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java @@ -27,11 +27,8 @@ import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.MSG_UNUSED_TAG_GENERAL; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import org.junit.jupiter.api.Test; @@ -511,83 +508,6 @@ public void testTokenToString() throws Exception { assertEquals("Token[blablabla(1x1)]", result, "Invalid toString result"); } - @Test - public void testClassRegularClass() throws Exception { - final Class<?> tokenType = Class.forName("com.puppycrawl.tools.checkstyle.checks.javadoc." - + "JavadocMethodCheck$Token"); - - final Class<?> regularClassType = Class - .forName("com.puppycrawl.tools.checkstyle.checks.javadoc." - + "JavadocMethodCheck$RegularClass"); - final Constructor<?> regularClassConstructor = regularClassType.getDeclaredConstructor( - tokenType, String.class, JavadocMethodCheck.class); - regularClassConstructor.setAccessible(true); - - try { - regularClassConstructor.newInstance(null, "", new JavadocMethodCheck()); - fail("Exception is expected"); - } - catch (InvocationTargetException ex) { - assertTrue(ex.getCause() instanceof IllegalArgumentException, - "Invalid exception class, expected: IllegalArgumentException.class"); - assertEquals("ClassInfo's name should be non-null", ex.getCause().getMessage(), - "Invalid exception message"); - } - - final Constructor<?> tokenConstructor = tokenType.getDeclaredConstructor(String.class, - int.class, int.class); - final Object token = tokenConstructor.newInstance("blablabla", 1, 1); - - final JavadocMethodCheck methodCheck = new JavadocMethodCheck(); - final Object regularClass = regularClassConstructor.newInstance(token, "sur", - methodCheck); - - final Method toString = regularClass.getClass().getDeclaredMethod("toString"); - toString.setAccessible(true); - final String result = (String) toString.invoke(regularClass); - final String expected = "RegularClass[name=Token[blablabla(1x1)], in class='sur', check=" - + methodCheck.hashCode() + "]"; - - assertEquals(expected, result, "Invalid toString result"); - } - - @Test - public void testClassAliasToString() throws Exception { - final Class<?> tokenType = Class.forName("com.puppycrawl.tools.checkstyle.checks.javadoc." - + "JavadocMethodCheck$Token"); - - final Class<?> regularClassType = Class - .forName("com.puppycrawl.tools.checkstyle.checks.javadoc." - + "JavadocMethodCheck$RegularClass"); - final Constructor<?> regularClassConstructor = regularClassType.getDeclaredConstructor( - tokenType, String.class, JavadocMethodCheck.class); - regularClassConstructor.setAccessible(true); - - final Constructor<?> tokenConstructor = tokenType.getDeclaredConstructor(String.class, - int.class, int.class); - final Object token = tokenConstructor.newInstance("blablabla", 1, 1); - - final Object regularClass = regularClassConstructor.newInstance(token, "sur", - new JavadocMethodCheck()); - - final Class<?> classAliasType = Class.forName( - "com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck$ClassAlias"); - final Class<?> abstractTypeInfoType = Class - .forName("com.puppycrawl.tools.checkstyle.checks.javadoc." - + "JavadocMethodCheck$ClassInfo"); - - final Constructor<?> classAliasConstructor = classAliasType - .getDeclaredConstructor(tokenType, abstractTypeInfoType); - classAliasConstructor.setAccessible(true); - - final Object classAlias = classAliasConstructor.newInstance(token, regularClass); - final Method toString = classAlias.getClass().getDeclaredMethod("toString"); - toString.setAccessible(true); - final String result = (String) toString.invoke(classAlias); - assertEquals("ClassAlias[alias Token[blablabla(1x1)] for Token[blablabla(1x1)]]", result, - "Invalid toString result"); - } - @Test public void testWithoutLogErrors() throws Exception { final DefaultConfiguration config = createModuleConfig(JavadocMethodCheck.class);
Resolve Pitest Issues - JavadocMethodCheck (4) Child issue of https://github.com/checkstyle/checkstyle/issues/7797 , https://github.com/checkstyle/checkstyle/blob/f9131f9536c71d963c83aab1550b7a0371aa9ff5/.ci/pitest.sh#L185
2020-04-01T11:46:37Z
8.32
checkstyle/checkstyle
7,899
checkstyle__checkstyle-7899
[ "5969", "7675" ]
18b792ebc5b6d5a2d427ccf61a45b122ba90ff53
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LambdaHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LambdaHandler.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LambdaHandler.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LambdaHandler.java @@ -66,7 +66,7 @@ protected IndentLevel getIndentImpl() { // If the start of the lambda is the first element on the line; // assume line wrapping with respect to its parent. final DetailAST firstChild = getMainAst().getFirstChild(); - if (getLineStart(firstChild) == firstChild.getColumnNo()) { + if (getLineStart(firstChild) == expandedTabsColumnNo(firstChild)) { level = new IndentLevel(level, getIndentCheck().getLineWrappingIndentation()); } @@ -77,19 +77,19 @@ protected IndentLevel getIndentImpl() { public void checkIndentation() { // If the argument list is the first element on the line final DetailAST firstChild = getMainAst().getFirstChild(); - if (getLineStart(firstChild) == firstChild.getColumnNo()) { + if (getLineStart(firstChild) == expandedTabsColumnNo(firstChild)) { final IndentLevel level = getIndent(); - if (!level.isAcceptable(firstChild.getColumnNo())) { - logError(firstChild, "arguments", firstChild.getColumnNo(), level); + if (!level.isAcceptable(expandedTabsColumnNo(firstChild))) { + logError(firstChild, "arguments", expandedTabsColumnNo(firstChild), level); } } // If the "->" is the first element on the line, assume line wrapping. - if (getLineStart(getMainAst()) == getMainAst().getColumnNo()) { + if (getLineStart(getMainAst()) == expandedTabsColumnNo(getMainAst())) { final IndentLevel level = new IndentLevel(getIndent(), getIndentCheck().getLineWrappingIndentation()); - if (!level.isAcceptable(getMainAst().getColumnNo())) { - logError(getMainAst(), "", getMainAst().getColumnNo(), level); + if (!level.isAcceptable(expandedTabsColumnNo(getMainAst()))) { + logError(getMainAst(), "", expandedTabsColumnNo(getMainAst()), level); } } }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java @@ -1759,6 +1759,47 @@ public void testLambda2() throws Exception { verifyWarns(checkConfig, getPath("InputIndentationLambda2.java"), expected); } + @Test + public void testLambda3() throws Exception { + final DefaultConfiguration checkConfig = createModuleConfig(IndentationCheck.class); + checkConfig.addAttribute("tabWidth", "4"); + checkConfig.addAttribute("basicOffset", "4"); + checkConfig.addAttribute("lineWrappingIndentation", "8"); + final String[] expected = { + "15: " + getCheckMessage(MSG_CHILD_ERROR, "method def", 12, 8), + "23: " + getCheckMessage(MSG_ERROR_MULTI, "lambda arguments", 20, "12, 16"), + "29: " + getCheckMessage(MSG_CHILD_ERROR, "method def", 12, 8), + "30: " + getCheckMessage(MSG_CHILD_ERROR, "block", 12, 16), + "31: " + getCheckMessage(MSG_ERROR, "block rcurly", 8, 12), + "43: " + getCheckMessage(MSG_ERROR, "lambda arguments", 20, 16), + "65: " + getCheckMessage(MSG_CHILD_ERROR, "method def", 12, 8), + "67: " + getCheckMessage(MSG_ERROR, "lambda", 28, 24), + "87: " + getCheckMessage(MSG_ERROR, "method def rcurly", 12, 8), + }; + verifyWarns(checkConfig, getPath("InputIndentationLambda3.java"), expected); + } + + @Test + public void testLambda4() throws Exception { + final DefaultConfiguration checkConfig = createModuleConfig(IndentationCheck.class); + checkConfig.addAttribute("tabWidth", "4"); + checkConfig.addAttribute("basicOffset", "4"); + checkConfig.addAttribute("lineWrappingIndentation", "8"); + final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; + verifyWarns(checkConfig, getPath("InputIndentationLambda4.java"), expected); + } + + @Test + public void testLambda5() throws Exception { + final DefaultConfiguration checkConfig = createModuleConfig(IndentationCheck.class); + checkConfig.addAttribute("tabWidth", "3"); + checkConfig.addAttribute("basicOffset", "3"); + checkConfig.addAttribute("caseIndent", "0"); + checkConfig.addAttribute("lineWrappingIndentation", "6"); + final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; + verifyWarns(checkConfig, getPath("InputIndentationLambda5.java"), expected); + } + @Test public void testSeparatedStatements() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(IndentationCheck.class); diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationLambda3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationLambda3.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationLambda3.java @@ -0,0 +1,89 @@ +//a comment //indent:0 exp:0 +package com.puppycrawl.tools.checkstyle.checks.indentation.indentation; //indent:0 exp:0 + +import java.util.Arrays; //indent:0 exp:0 +import java.util.List; //indent:0 exp:0 +import java.util.Optional; //indent:0 exp:0 +import java.util.function.BinaryOperator; //indent:0 exp:0 +import java.util.function.Consumer; //indent:0 exp:0 +import java.util.stream.Collectors; //indent:0 exp:0 +import java.util.stream.Stream; //indent:0 exp:0 + + +public class InputIndentationLambda3 { //indent:0 exp:0 + public <T> Consumer<Integer> par(Consumer<Integer> f1, Consumer<Integer> f2) { //indent:4 exp:4 + return f2; //indent:12 exp:8 warn + } //indent:4 exp:4 + + private void print(int i) { //indent:4 exp:4 + } //indent:4 exp:4 + + public Consumer<Integer> returnFunctionOfLambda() { //indent:4 exp:4 + return par( //indent:8 exp:8 + (x) -> print(x * 1), //indent:20 exp:12,16 warn + (x) -> print(x * 2) //indent:16 exp:16 + ); //indent:8 exp:8 + } //indent:4 exp:4 + + public static <T> BinaryOperator<T> returnLambda() { //indent:4 exp:4 + return (t1, t2) -> { //indent:12 exp:8 warn + return t1; //indent:12 exp:16 warn + }; //indent:8 exp:12 warn + } //indent:4 exp:4 + + class TwoParams { //indent:4 exp:4 + TwoParams(Consumer<Integer> c1, Consumer<Integer> c2) { //indent:8 exp:8 + } //indent:8 exp:8 + } //indent:4 exp:4 + + public void makeTwoParams() { //indent:4 exp:4 + TwoParams t0 = new TwoParams( //indent:8 exp:8 + intValueA //indent:16 exp:16 + -> print(intValueA * 1), //indent:24 exp:24 + (x) -> //indent:20 exp:16 warn + print(x * 2) //indent:24 exp:24 + ); //indent:8 exp:8 + + TwoParams t1 = new TwoParams( //indent:8 exp:8 + x //indent:16 exp:16 + -> print(x * 1), //indent:24 exp:24 + (aggregateValue) -> //indent:16 exp:16 + print(aggregateValue * 2)); //indent:24 exp:24 + } //indent:4 exp:4 + + // see https://github.com/checkstyle/checkstyle/issues/5969 //indent:4 exp:4 + List<Integer> test(List<String> input) { //indent:4 exp:4 + return input.stream() //indent:8 exp:8 + .flatMap(each -> Arrays.stream(each.split(""))) //indent:16 exp:16 + .flatMap(in -> Arrays.stream(in.split(""))) //indent:16 exp:16 + // only 2 char parameter has violation //indent:16 exp:16 + .map(Integer::valueOf) //indent:16 exp:16 + .collect(Collectors.toList()); //indent:16 exp:16 + } //indent:4 exp:4 + + String test2(String input) { //indent:4 exp:4 + return Optional.ofNullable(input) //indent:12 exp:8 warn + .filter(in //indent:16 exp:16 + -> //indent:28 exp:24 warn + in.contains("e")) //indent:20 exp:20 + .filter(inp -> inp.contains("e")) //indent:12 exp:12 + // only 3 char parameter has violation //indent:16 exp:16 + .orElse(null); //indent:16 exp:16 + } //indent:4 exp:4 + + // see https://github.com/checkstyle/checkstyle/issues/7675 //indent:4 exp:4 + public void test(Stream<Inner<?>> stream) { //indent:4 exp:4 + stream //indent:8 exp:8 +.sorted() //indent:0 exp:0 +.filter(ps -> ps instanceof Inner) //indent:0 exp:0 + .map(ps -> ((Inner<?>) ps).getPropertyNames()) //indent:16 exp:16 + // This line above originally breaks //indent:16 exp:16 + .forEach(System.out::println); //indent:16 exp:16 + } //indent:4 exp:4 + + private static class Inner<T> { //indent:4 exp:4 + String[] getPropertyNames() { //indent:8 exp:8 + return new String[] {"a", "b"}; //indent:12 exp:12 + } //indent:12 exp:8 warn + } //indent:4 exp:4 +} //indent:0 exp:0 diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationLambda4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationLambda4.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationLambda4.java @@ -0,0 +1,64 @@ +//a comment //indent:0 exp:0 +package com.puppycrawl.tools.checkstyle.checks.indentation.indentation; //indent:0 exp:0 + +import java.util.Arrays; //indent:0 exp:0 +import java.util.List; //indent:0 exp:0 +import java.util.Optional; //indent:0 exp:0 +import java.util.function.BinaryOperator; //indent:0 exp:0 +import java.util.function.Consumer; //indent:0 exp:0 +import java.util.stream.Collectors; //indent:0 exp:0 + + +public class InputIndentationLambda4 { //indent:0 exp:0 + public <T> Consumer<Integer> par(Consumer<Integer> f1, Consumer<Integer> f2) { //indent:4 exp:4 + return f2; //indent:8 exp:8 + } //indent:4 exp:4 + + private void print(int i) { //indent:4 exp:4 + } //indent:4 exp:4 + + public Consumer<Integer> returnFunctionOfLambda() { //indent:4 exp:4 + return par( //indent:8 exp:8 + (x) -> print(x * 1), //indent:16 exp:16 + (x) -> print(x * 2) //indent:16 exp:16 + ); //indent:8 exp:8 + } //indent:4 exp:4 + + public static <T> BinaryOperator<T> returnLambda() { //indent:4 exp:4 + return (t1, t2) -> { //indent:8 exp:8 + return t1; //indent:12 exp:12 + }; //indent:8 exp:8 + } //indent:4 exp:4 + + class TwoParams { //indent:4 exp:4 + TwoParams(Consumer<Integer> c1, Consumer<Integer> c2) { //indent:8 exp:8 + } //indent:8 exp:8 + } //indent:4 exp:4 + + public void makeTwoParams() { //indent:4 exp:4 + TwoParams t0 = new TwoParams( //indent:8 exp:8 + (x) -> print(x * 1), //indent:16 exp:16 + (x) -> print(x * 2) //indent:16 exp:16 + ); //indent:8 exp:8 + + TwoParams t1 = new TwoParams( //indent:8 exp:8 + (x) -> print(x * 1), //indent:16 exp:16 + (x) -> print(x * 2)); //indent:16 exp:16 + } //indent:4 exp:4 + + // see https://github.com/checkstyle/checkstyle/issues/5969 //indent:4 exp:4 + List<Integer> test(List<String> input) { //indent:4 exp:4 + return input.stream() //indent:8 exp:8 + .flatMap(in -> Arrays.stream(in.split(""))) //indent:16 exp:16 + // only 2 char parameter has violation //indent:16 exp:16 + .map(Integer::valueOf) //indent:16 exp:16 + .collect(Collectors.toList()); //indent:16 exp:16 + } //indent:4 exp:4 + + String test2(String input) { //indent:4 exp:4 + return Optional.ofNullable(input) //indent:8 exp:8 + .filter(inp -> inp.contains("e")) //indent:16 exp:16 + // only 3 char parameter has violation //indent:16 exp:16 + .orElse(null); //indent:16 exp:16 + } //indent:4 exp:4 +} //indent:0 exp:0 diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationLambda5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationLambda5.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationLambda5.java @@ -0,0 +1,17 @@ +package com.puppycrawl.tools.checkstyle.checks.indentation.indentation; //indent:0 exp:0 +// see https://github.com/checkstyle/checkstyle/issues/7675 //indent:0 exp:0 +import java.util.stream.Stream; //indent:0 exp:0 +public class InputIndentationLambda5 { //indent:0 exp:0 + public void test(Stream<Inner<?>> stream) { //indent:3 exp:3 + stream //indent:6 exp:6 + .filter(ps -> ps instanceof Inner) //indent:12 exp:12 + .map(ps -> ((Inner<?>) ps).getPropertyNames()) //indent:12 exp:12 + .forEach(System.out::println); //indent:12 exp:12 + } //indent:3 exp:3 + + private static class Inner<T> { //indent:3 exp:3 + String[] getPropertyNames() { //indent:6 exp:6 + return new String[] {"a", "b"}; //indent:9 exp:9 + } //indent:6 exp:6 + } //indent:3 exp:3 +} //indent:0 exp:0
Indentation violation for lambda depends on tab symbols in code ATTENTION: code with tab symbols. ``` /tmp $ javac Test.java /tmp $ cat config.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name = "Checker"> <module name="TreeWalker"> <property name="tabWidth" value="4"/> <module name="Indentation"/> </module> </module> /tmp $ cat Test.java import java.lang.*; import java.util.*; import java.util.stream.*; class Test { List<Integer> test(List<String> input) { return input.stream() .flatMap(in -> Arrays.stream(in.split(""))) // only 2 char parameter has violation .map(Integer::valueOf) .collect(Collectors.toList()); } String test2(String input) { return Optional.ofNullable(input) .filter(inp -> inp.contains("e")) // only 3 char parameter has violation .orElse(null); } } /tmp $ java -jar checkstyle-8.10.1-all.jar -c config.xml Test.java Starting audit... [ERROR] /tmp/Test.java:8: 'lambda' has incorrect indentation level 16, expected level should be 20. [Indentation] [ERROR] /tmp/Test.java:15: 'lambda' has incorrect indentation level 16, expected level should be 20. [Indentation] Audit done. Checkstyle ends with 2 errors. ``` --------------- Expectation: lambda parameter name length should not affect the indentation rule, and the example code above should not have any violations. If you change line 8's lamdba parameter to `i` or `inp` or any other name that is not 2 characters, the indentation violation goes away. Likewise, line 15's lambda parameter can be changed to any name that is not 3 characters and the indentation violation goes away. -------------- If tabs changed to spaces, no problems are reported, but we use tabs in code. http://checkstyle.sourceforge.net/config_misc.html#Indentation no special property for tab size, tab should be taken from Treewalker. Confusing violation of Indentation rule Im having a problem with the https://checkstyle.sourceforge.io/config_misc.html#Indentation check. ```/home/serra/dev/cs-repro $ javac Test.java``` [no output here] ```/home/serra/dev/cs-repro $ cat my-checks.xml``` ```xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <property name="charset" value="UTF-8" /> <property name="tabWidth" value="3" /> <module name="TreeWalker"> <module name="Indentation"> <property name="basicOffset" value="3" /> <property name="caseIndent" value="0" /> <property name="lineWrappingIndentation" value="6" /> </module> </module> </module> ``` ```/home/serra/dev/cs-repro $ cat Test.java``` ```java import java.util.Arrays; import java.util.stream.Stream; public class Test { public void test(Stream<Inner<?>> stream) { stream .filter(ps -> ps instanceof Inner) .map(ps -> ((Inner<?>) ps).getPropertyNames()) .forEach(System.out::println); } private static class Inner<T> { String[] getPropertyNames() { return new String[] {"a", "b"}; } } } ``` ```/home/serra/dev/cs-repro $ java -Duser.language=en -Duser.country=us -jar checkstyle-8.29-all.jar -c my-checks.xml Test.java Starting audit... [ERROR] /home/serra/dev/cs-repro/Test.java:8: 'lambda' has incorrect indentation level 12, expected level should be 18. [Indentation] Audit done. ``` --------------- I expected the code to be conforming to my rules. As far as I can recognize I adhere to all the rules in the xml. I am not sure if this is a bug or if I am just misunderstandung how the rule is working.
This looks like a bug to me from the information I am seeing, but indentation is always tricky. Lambda does not start the line and should not have been the one reporting the problem if the indentation was wrong. I would expect the `.` or referenced the message call to be where the failure message to be. Duplicate of #5969.
2020-03-19T05:11:48Z
8.3
checkstyle/checkstyle
7,894
checkstyle__checkstyle-7894
[ "7128" ]
5a87cb59188b2e6e334b8787f5a878ddf2b29c0d
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java @@ -135,8 +135,8 @@ * </p> * <ul> * <li> - * Property {@code customImportOrderRules} - Specify list of order declaration customizing by user. - * Default value is {@code {}}. + * Property {@code customImportOrderRules} - Specify format of order declaration + * customizing by user. Default value is {@code ""}. * </li> * <li> * Property {@code standardPackageRegExp} - Specify RegExp for STANDARD_JAVA_PACKAGE group imports. @@ -410,12 +410,15 @@ public class CustomImportOrderCheck extends AbstractCheck { /** Pattern used to separate groups of imports. */ private static final Pattern GROUP_SEPARATOR_PATTERN = Pattern.compile("\\s*###\\s*"); - /** Specify list of order declaration customizing by user. */ - private final List<String> customImportOrderRules = new ArrayList<>(); + /** Processed list of import order rules. */ + private final List<String> customOrderRules = new ArrayList<>(); /** Contains objects with import attributes. */ private final List<ImportDetails> importToGroupList = new ArrayList<>(); + /** Specify format of order declaration customizing by user. */ + private String customImportOrderRules = ""; + /** Specify RegExp for SAME_PACKAGE group imports. */ private String samePackageDomainsRegExp = ""; @@ -487,15 +490,18 @@ public final void setSortImportsInGroupAlphabetically(boolean value) { } /** - * Setter to specify list of order declaration customizing by user. + * Setter to specify format of order declaration customizing by user. * @param inputCustomImportOrder * user value. */ public final void setCustomImportOrderRules(final String inputCustomImportOrder) { - for (String currentState : GROUP_SEPARATOR_PATTERN.split(inputCustomImportOrder)) { - addRulesToList(currentState); + if (!customImportOrderRules.equals(inputCustomImportOrder)) { + for (String currentState : GROUP_SEPARATOR_PATTERN.split(inputCustomImportOrder)) { + addRulesToList(currentState); + } + customOrderRules.add(NON_GROUP_RULE_GROUP); } - customImportOrderRules.add(NON_GROUP_RULE_GROUP); + customImportOrderRules = inputCustomImportOrder; } @Override @@ -549,7 +555,7 @@ public void finishTree(DetailAST rootAST) { /** Examine the order of all the imports and log any violations. */ private void finishImportList() { String currentGroup = getFirstGroup(); - int currentGroupNumber = customImportOrderRules.indexOf(currentGroup); + int currentGroupNumber = customOrderRules.indexOf(currentGroup); ImportDetails previousImportObjectFromCurrentGroup = null; String previousImportFromCurrentGroup = null; @@ -571,13 +577,13 @@ private void finishImportList() { } else { // not the last group, last one is always NON_GROUP - if (customImportOrderRules.size() > currentGroupNumber + 1) { + if (customOrderRules.size() > currentGroupNumber + 1) { final String nextGroup = getNextImportGroup(currentGroupNumber + 1); if (importGroup.equals(nextGroup)) { validateMissedEmptyLine(previousImportObjectFromCurrentGroup, importObject, fullImportIdent); currentGroup = nextGroup; - currentGroupNumber = customImportOrderRules.indexOf(nextGroup); + currentGroupNumber = customOrderRules.indexOf(nextGroup); previousImportFromCurrentGroup = fullImportIdent; } else { @@ -719,13 +725,13 @@ else if (NON_GROUP_RULE_GROUP.equals(currentGroupNumber)) { private String getNextImportGroup(int currentGroupNumber) { int nextGroupNumber = currentGroupNumber; - while (customImportOrderRules.size() > nextGroupNumber + 1) { - if (hasAnyImportInCurrentGroup(customImportOrderRules.get(nextGroupNumber))) { + while (customOrderRules.size() > nextGroupNumber + 1) { + if (hasAnyImportInCurrentGroup(customOrderRules.get(nextGroupNumber))) { break; } nextGroupNumber++; } - return customImportOrderRules.get(nextGroupNumber); + return customOrderRules.get(nextGroupNumber); } /** @@ -756,11 +762,11 @@ private boolean hasAnyImportInCurrentGroup(String currentGroup) { */ private String getImportGroup(boolean isStatic, String importPath) { RuleMatchForImport bestMatch = new RuleMatchForImport(NON_GROUP_RULE_GROUP, 0, 0); - if (isStatic && customImportOrderRules.contains(STATIC_RULE_GROUP)) { + if (isStatic && customOrderRules.contains(STATIC_RULE_GROUP)) { bestMatch.group = STATIC_RULE_GROUP; bestMatch.matchLength = importPath.length(); } - else if (customImportOrderRules.contains(SAME_PACKAGE_RULE_GROUP)) { + else if (customOrderRules.contains(SAME_PACKAGE_RULE_GROUP)) { final String importPathTrimmedToSamePackageDepth = getFirstDomainsFromIdent(samePackageMatchingDepth, importPath); if (samePackageDomainsRegExp.equals(importPathTrimmedToSamePackageDepth)) { @@ -769,7 +775,7 @@ else if (customImportOrderRules.contains(SAME_PACKAGE_RULE_GROUP)) { } } if (bestMatch.group.equals(NON_GROUP_RULE_GROUP)) { - for (String group : customImportOrderRules) { + for (String group : customOrderRules) { if (STANDARD_JAVA_PACKAGE_RULE_GROUP.equals(group)) { bestMatch = findBetterPatternMatch(importPath, STANDARD_JAVA_PACKAGE_RULE_GROUP, standardPackageRegExp, bestMatch); @@ -781,7 +787,7 @@ else if (customImportOrderRules.contains(SAME_PACKAGE_RULE_GROUP)) { } } if (bestMatch.group.equals(NON_GROUP_RULE_GROUP) - && customImportOrderRules.contains(THIRD_PARTY_PACKAGE_RULE_GROUP) + && customOrderRules.contains(THIRD_PARTY_PACKAGE_RULE_GROUP) && thirdPartyPackageRegExp.matcher(importPath).find()) { bestMatch.group = THIRD_PARTY_PACKAGE_RULE_GROUP; } @@ -895,7 +901,7 @@ private void addRulesToList(String ruleStr) { || THIRD_PARTY_PACKAGE_RULE_GROUP.equals(ruleStr) || STANDARD_JAVA_PACKAGE_RULE_GROUP.equals(ruleStr) || SPECIAL_IMPORTS_RULE_GROUP.equals(ruleStr)) { - customImportOrderRules.add(ruleStr); + customOrderRules.add(ruleStr); } else if (ruleStr.startsWith(SAME_PACKAGE_RULE_GROUP)) { final String rule = ruleStr.substring(ruleStr.indexOf('(') + 1, @@ -905,7 +911,7 @@ else if (ruleStr.startsWith(SAME_PACKAGE_RULE_GROUP)) { throw new IllegalArgumentException( "SAME_PACKAGE rule parameter should be positive integer: " + ruleStr); } - customImportOrderRules.add(SAME_PACKAGE_RULE_GROUP); + customOrderRules.add(SAME_PACKAGE_RULE_GROUP); } else { throw new IllegalStateException("Unexpected rule: " + ruleStr);
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheckTest.java @@ -157,6 +157,18 @@ public void testNonSpecifiedImports() throws Exception { verify(checkConfig, getPath("InputCustomImportOrderDefault.java"), expected); } + @Test + public void testOrderRuleEmpty() throws Exception { + final DefaultConfiguration checkConfig = + createModuleConfig(CustomImportOrderCheck.class); + checkConfig.addAttribute("customImportOrderRules", ""); + final String[] expected = { + "5: " + getCheckMessage(MSG_SEPARATED_IN_GROUP, "java.util.List"), + }; + + verify(checkConfig, getPath("InputCustomImportOrderEmptyRule.java"), expected); + } + @Test public void testOrderRuleWithOneGroup() throws Exception { final DefaultConfiguration checkConfig = diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java @@ -937,11 +937,6 @@ private static String getModulePropertyExpectedTypeName(String sectionName, Clas // dynamic custom expression result = "Regular Expression"; } - else if ("CustomImportOrder".equals(sectionName) - && "customImportOrderRules".equals(propertyName)) { - // specially separated list - result = "String"; - } else if (fieldClass == boolean.class) { result = "Boolean"; } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderEmptyRule.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderEmptyRule.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderEmptyRule.java @@ -0,0 +1,15 @@ +package com.puppycrawl.tools.checkstyle.checks.imports.customimportorder; + +import java.util.Map; + +import java.util.List; // violation, extra separation in import group + +public class InputCustomImportOrderEmptyRule { +} +/* + * test: testOrderRuleEmpty() + * + * Config = default + * customImportOrderRules = "" + * + */
CustomImportOrderCheck.customImportOrderRules does not support the default value https://checkstyle.org/config_imports.html#CustomImportOrder In this example: ``` <property name="customImportOrderRules" value="${checkstyle.customimportorder.customimportorderrules}" default="{}"/> ``` I am trying to allow users to specify their own values, as recommended in [the documentation [1]](https://checkstyle.org/config.html#Properties). This approach requires a default value, and per [the documentation [2]](https://checkstyle.org/config_imports.html#CustomImportOrder_Properties), `{}` is the default. Expected behavior: `{}` should behave the same as not setting the value at all. Actual behavior: [checkstyle does not support `{}` [3]](https://github.com/checkstyle/checkstyle/blob/394030d57239730a5cb622baff934a12be3d0693/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java#L489) ------- Links 1. https://checkstyle.org/config.html#Properties 2. https://checkstyle.org/config_imports.html 3. https://github.com/checkstyle/checkstyle/blob/394030d57239730a5cb622baff934a12be3d0693/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java#L488
https://github.com/checkstyle/checkstyle/blob/master/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java#L1095 `{}` is used to represent an empty list, and not necessarily the value for the property. `customImportOrderRules` is converted to a list of strings from the single string you provide it. How else should we signify an empty list? The property is not a list. It is a `###`-delimited string. See [link #3](https://github.com/checkstyle/checkstyle/blob/394030d57239730a5cb622baff934a12be3d0693/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java#L488) that I posted earlier. Specifying any value results in the code performing `"###".split(input)`, which can never return an empty list. If you set the value to "", then the `"###".split("")` will return `String[]{""}`, which causes the code to throw an `IllegalStateException` in `addRulesToList()` because `""` is not a valid rule. Adding a special case handler for `"{}"` or `""` would make the code behavior match the documentation. ------ The proposed code would look something like this: ```java public final void setCustomImportOrderRules(final String inputCustomImportOrder) { if (inputCustomImportOrder == null || "".equals(inputCustomImportOrder) || "{}".equals(inputCustomImportOrder)) { // Default value, do nothing return; } for (String currentState : GROUP_SEPARATOR_PATTERN.split(inputCustomImportOrder)) { addRulesToList(currentState); } customImportOrderRules.add(NON_GROUP_RULE_GROUP); } ``` > The property is not a list. It is a ###-delimited string The internal field of the property is a list and this is how we determine what is put on the xdocs and determine the default value to display. https://github.com/checkstyle/checkstyle/blob/394030d57239730a5cb622baff934a12be3d0693/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java#L408 @romani Can answer about what to allow for a default value. @scottanderson , sorry for delay in reply. fact that `{}` is placed in our doc is mistake, there should be `""`. Setter need to be updated to expect empty string and keep empty list for `customImportOrderRules` class field. Please be welcome to send PullRequest with fix. I am on it
2020-03-18T14:53:09Z
8.31
checkstyle/checkstyle
7,853
checkstyle__checkstyle-7853
[ "7726" ]
341ef2d7296242b03bff99f37454784ccea82906
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidStaticImportTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidStaticImportTest.java new file mode 100644 --- /dev/null +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidStaticImportTest.java @@ -0,0 +1,82 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2020 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package org.checkstyle.suppressionxpathfilter; + +import java.io.File; +import java.util.Collections; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import com.puppycrawl.tools.checkstyle.DefaultConfiguration; +import com.puppycrawl.tools.checkstyle.checks.imports.AvoidStaticImportCheck; + +public class XpathRegressionAvoidStaticImportTest + extends AbstractXpathTestSupport { + + private static final Class<AvoidStaticImportCheck> CLASS = + AvoidStaticImportCheck.class; + + @Override + protected String getCheckName() { + return CLASS.getSimpleName(); + } + + @Test + public void testOne() throws Exception { + final File fileToProcess = new File(getPath( + "SuppressionXpathRegressionAvoidStaticImport1.java")); + + final DefaultConfiguration moduleConfig = + createModuleConfig(CLASS); + + final String[] expectedViolation = { + "3:42: " + getCheckMessage(CLASS, + AvoidStaticImportCheck.MSG_KEY, "javax.swing.WindowConstants.*"), + }; + + final List<String> expectedXpathQueries = Collections.singletonList( + "/STATIC_IMPORT/DOT" + ); + + runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries); + } + + @Test + public void testTwo() throws Exception { + final File fileToProcess = new File(getPath( + "SuppressionXpathRegressionAvoidStaticImport2.java")); + + final DefaultConfiguration moduleConfig = + createModuleConfig(CLASS); + + final String[] expectedViolation = { + "3:27: " + getCheckMessage(CLASS, + AvoidStaticImportCheck.MSG_KEY, "java.io.File.createTempFile"), + }; + + final List<String> expectedXpathQueries = Collections.singletonList( + "/STATIC_IMPORT/DOT[./IDENT[@text='createTempFile']]" + ); + + runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries); + } + +} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstaticimport/SuppressionXpathRegressionAvoidStaticImport1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstaticimport/SuppressionXpathRegressionAvoidStaticImport1.java new file mode 100644 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstaticimport/SuppressionXpathRegressionAvoidStaticImport1.java @@ -0,0 +1,6 @@ +package org.checkstyle.suppressionxpathfilter.avoidstaticimport; + +import static javax.swing.WindowConstants.*; // warn + +public class SuppressionXpathRegressionAvoidStaticImport1 { +} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstaticimport/SuppressionXpathRegressionAvoidStaticImport2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstaticimport/SuppressionXpathRegressionAvoidStaticImport2.java new file mode 100644 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstaticimport/SuppressionXpathRegressionAvoidStaticImport2.java @@ -0,0 +1,6 @@ +package org.checkstyle.suppressionxpathfilter.avoidstaticimport; + +import static java.io.File.createTempFile; // warn + +public class SuppressionXpathRegressionAvoidStaticImport2 { +} diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java @@ -125,7 +125,7 @@ public void visitToken(final DetailAST ast) { final FullIdent name = FullIdent.createFullIdent(startingDot); if (!isExempt(name.getText())) { - log(startingDot.getLineNo(), MSG_KEY, name.getText()); + log(startingDot, MSG_KEY, name.getText()); } } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java @@ -56,9 +56,6 @@ * AvoidStarImport * </li> * <li> - * AvoidStaticImport - * </li> - * <li> * CommentsIndentation * </li> * <li>
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheckTest.java @@ -50,17 +50,16 @@ public void testDefaultOperation() final DefaultConfiguration checkConfig = createModuleConfig(AvoidStaticImportCheck.class); final String[] expected = { - "23: " + getCheckMessage(MSG_KEY, "java.io.File.listRoots"), - "25: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), - "26: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), - "27: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"), - "28: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"), - "29: " + getCheckMessage(MSG_KEY, "java.lang.Math.E"), - "30: " + getCheckMessage(MSG_KEY, "java.lang.Math.sqrt"), - "31: " + getCheckMessage(MSG_KEY, + "23:27: " + getCheckMessage(MSG_KEY, "java.io.File.listRoots"), + "25:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), + "26:27: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"), + "27:27: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"), + "28:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.E"), + "29:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.sqrt"), + "30:113: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports." + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass"), - "32: " + getCheckMessage(MSG_KEY, + "31:124: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports." + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass.one"), }; @@ -76,14 +75,13 @@ public void testStarExcludes() checkConfig.addAttribute("excludes", "java.io.File.*,sun.net.ftpclient.FtpClient.*"); // allow the "java.io.File.*" AND "sun.net.ftpclient.FtpClient.*" star imports final String[] expected = { - "25: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), - "26: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), - "29: " + getCheckMessage(MSG_KEY, "java.lang.Math.E"), - "30: " + getCheckMessage(MSG_KEY, "java.lang.Math.sqrt"), - "31: " + getCheckMessage(MSG_KEY, + "25:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), + "28:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.E"), + "29:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.sqrt"), + "30:113: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports." + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass"), - "32: " + getCheckMessage(MSG_KEY, + "31:124: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports." + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass.one"), }; @@ -98,15 +96,14 @@ public void testMemberExcludes() checkConfig.addAttribute("excludes", "java.io.File.listRoots,java.lang.Math.E"); // allow the java.io.File.listRoots and java.lang.Math.E member imports final String[] expected = { - "25: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), - "26: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), - "27: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"), - "28: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"), - "30: " + getCheckMessage(MSG_KEY, "java.lang.Math.sqrt"), - "31: " + getCheckMessage(MSG_KEY, + "25:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), + "26:27: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"), + "27:27: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"), + "29:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.sqrt"), + "30:113: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports." + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass"), - "32: " + getCheckMessage(MSG_KEY, + "31:124: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports." + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass.one"), }; @@ -126,17 +123,16 @@ public void testBogusMemberExcludes() + "sun.net.ftpclient.FtpClient.*FtpClient, sun.net.ftpclient.FtpClientjunk," + " java.io.File.listRootsmorejunk"); final String[] expected = { - "23: " + getCheckMessage(MSG_KEY, "java.io.File.listRoots"), - "25: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), - "26: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), - "27: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"), - "28: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"), - "29: " + getCheckMessage(MSG_KEY, "java.lang.Math.E"), - "30: " + getCheckMessage(MSG_KEY, "java.lang.Math.sqrt"), - "31: " + getCheckMessage(MSG_KEY, + "23:27: " + getCheckMessage(MSG_KEY, "java.io.File.listRoots"), + "25:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), + "26:27: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"), + "27:27: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"), + "28:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.E"), + "29:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.sqrt"), + "30:113: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports." + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass"), - "32: " + getCheckMessage(MSG_KEY, + "31:124: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports." + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass.one"), }; @@ -156,14 +152,13 @@ public void testInnerClassMemberExcludesStar() "com.puppycrawl.tools.checkstyle.checks.imports." + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass.*"); final String[] expected = { - "23: " + getCheckMessage(MSG_KEY, "java.io.File.listRoots"), - "25: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), - "26: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), - "27: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"), - "28: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"), - "29: " + getCheckMessage(MSG_KEY, "java.lang.Math.E"), - "30: " + getCheckMessage(MSG_KEY, "java.lang.Math.sqrt"), - "31: " + getCheckMessage(MSG_KEY, + "23:27: " + getCheckMessage(MSG_KEY, "java.io.File.listRoots"), + "25:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), + "26:27: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"), + "27:27: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"), + "28:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.E"), + "29:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.sqrt"), + "30:113: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports." + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass"), }; @@ -181,3 +176,4 @@ public void testGetAcceptableTokens() { } } + diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java @@ -56,7 +56,6 @@ public class XpathRegressionTest extends AbstractModuleTestSupport { "AnnotationUseStyle", "AvoidEscapedUnicodeCharacters", "AvoidStarImport", - "AvoidStaticImport", "CommentsIndentation", "CustomImportOrder", "EmptyLineSeparator", diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault.java --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault.java @@ -22,7 +22,6 @@ import javax.swing.BorderFactory; import static java.io.File.listRoots; -import static javax.swing.WindowConstants.*; import static javax.swing.WindowConstants.*; import static java.io.File.createTempFile; import static java.io.File.pathSeparator;
Update AbstractChecks to log DetailAST - AvoidStaticImport Child of https://github.com/checkstyle/checkstyle/issues/5777 This issue specifically focuses on AvoidStaticImport .
I am on it
2020-03-15T15:46:14Z
8.3
checkstyle/checkstyle
7,851
checkstyle__checkstyle-7851
[ "7768" ]
dfc5efc22bdf5924f5a99760179e43f291eca7ec
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAnnotationLocationTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAnnotationLocationTest.java new file mode 100644 --- /dev/null +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAnnotationLocationTest.java @@ -0,0 +1,233 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2020 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package org.checkstyle.suppressionxpathfilter; + +import java.io.File; +import java.util.Arrays; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import com.puppycrawl.tools.checkstyle.DefaultConfiguration; +import com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationLocationCheck; + +public class XpathRegressionAnnotationLocationTest extends AbstractXpathTestSupport { + + private final String checkName = AnnotationLocationCheck.class.getSimpleName(); + + @Override + protected String getCheckName() { + return checkName; + } + + @Test + public void testClass() throws Exception { + final File fileToProcess = new File(getPath( + "SuppressionXpathRegressionAnnotationLocationClass.java")); + + final DefaultConfiguration moduleConfig = + createModuleConfig(AnnotationLocationCheck.class); + + final String[] expectedViolation = { + "6:1: " + getCheckMessage(AnnotationLocationCheck.class, + AnnotationLocationCheck.MSG_KEY_ANNOTATION_LOCATION_ALONE, "ClassAnnotation"), + }; + + final List<String> expectedXpathQueries = Arrays.asList( + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationClass']]", + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationClass']]" + + "/MODIFIERS", + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationClass']]/" + + "MODIFIERS/ANNOTATION[./IDENT[@text='ClassAnnotation']]", + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationClass']]/" + + "MODIFIERS/ANNOTATION[./IDENT[@text='ClassAnnotation']]/AT" + ); + + runVerifications(moduleConfig, fileToProcess, expectedViolation, + expectedXpathQueries); + } + + @Test + public void testInterface() throws Exception { + final File fileToProcess = new File(getPath( + "SuppressionXpathRegressionAnnotationLocationInterface.java")); + + final DefaultConfiguration moduleConfig = + createModuleConfig(AnnotationLocationCheck.class); + + final String[] expectedViolation = { + "7:1: " + getCheckMessage(AnnotationLocationCheck.class, + AnnotationLocationCheck.MSG_KEY_ANNOTATION_LOCATION_ALONE, + "InterfaceAnnotation"), + }; + + final List<String> expectedXpathQueries = Arrays.asList( + "/INTERFACE_DEF[./IDENT[@text='SuppressionXpathRegression" + + "AnnotationLocationInterface']]", + "/INTERFACE_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationInterface'" + + "]]/MODIFIERS", + "/INTERFACE_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationInterface']]" + + "/MODIFIERS/ANNOTATION[./IDENT[@text='InterfaceAnnotation']]", + "/INTERFACE_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationInterface']]" + + "/MODIFIERS/ANNOTATION[./IDENT[@text='InterfaceAnnotation']]/AT" + ); + + runVerifications(moduleConfig, fileToProcess, expectedViolation, + expectedXpathQueries); + } + + @Test + public void testEnum() throws Exception { + final File fileToProcess = new File(getPath( + "SuppressionXpathRegressionAnnotationLocationEnum.java")); + + final DefaultConfiguration moduleConfig = + createModuleConfig(AnnotationLocationCheck.class); + + final String[] expectedViolation = { + "6:1: " + getCheckMessage(AnnotationLocationCheck.class, + AnnotationLocationCheck.MSG_KEY_ANNOTATION_LOCATION_ALONE, + "EnumAnnotation"), + }; + + final List<String> expectedXpathQueries = Arrays.asList( + "/ENUM_DEF[./IDENT[@text='SuppressionXpathRegression" + + "AnnotationLocationEnum']]", + "/ENUM_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationEnum']]" + + "/MODIFIERS", + "/ENUM_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationEnum']]" + + "/MODIFIERS/ANNOTATION[./IDENT[@text='EnumAnnotation']]", + "/ENUM_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationEnum']]" + + "/MODIFIERS/ANNOTATION[./IDENT[@text='EnumAnnotation']]/AT" + ); + + runVerifications(moduleConfig, fileToProcess, expectedViolation, + expectedXpathQueries); + + } + + @Test + public void testMethod() throws Exception { + final File fileToProcess = new File(getPath( + "SuppressionXpathRegressionAnnotationLocationMethod.java")); + + final DefaultConfiguration moduleConfig = + createModuleConfig(AnnotationLocationCheck.class); + moduleConfig.addAttribute("tokens", "METHOD_DEF"); + + final String[] expectedViolation = { + "4:6: " + getCheckMessage(AnnotationLocationCheck.class, + AnnotationLocationCheck.MSG_KEY_ANNOTATION_LOCATION_ALONE, + "MethodAnnotation"), + }; + + final List<String> expectedXpathQueries = Arrays.asList( + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationMethod']]/" + + "OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]", + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationMethod']]/" + + "OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]/MODIFIERS", + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationMethod']]/" + + "OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]/MODIFIERS/" + + "ANNOTATION[./IDENT[@text='MethodAnnotation']]", + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationMethod']]/" + + "OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]/MODIFIERS/" + + "ANNOTATION[./IDENT[@text='MethodAnnotation']]/AT" + ); + + runVerifications(moduleConfig, fileToProcess, expectedViolation, + expectedXpathQueries); + + } + + @Test + public void testVariable() throws Exception { + final File fileToProcess = new File(getPath( + "SuppressionXpathRegressionAnnotationLocationVariable.java")); + + final DefaultConfiguration moduleConfig = + createModuleConfig(AnnotationLocationCheck.class); + moduleConfig.addAttribute("tokens", "VARIABLE_DEF"); + + final String[] expectedViolation = { + "4:5: " + getCheckMessage(AnnotationLocationCheck.class, + AnnotationLocationCheck.MSG_KEY_ANNOTATION_LOCATION_ALONE, + "VariableAnnotation"), + }; + + final List<String> expectedXpathQueries = Arrays.asList( + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationVariable']]/" + + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='b']]", + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationVariable']]/" + + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='b']]/MODIFIERS", + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationVariable']]/" + + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='b']]/MODIFIERS/" + + "ANNOTATION[./IDENT[@text='VariableAnnotation']]", + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationVariable']]/" + + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='b']]/MODIFIERS/" + + "ANNOTATION[./IDENT[@text='VariableAnnotation']]/AT" + ); + + runVerifications(moduleConfig, fileToProcess, expectedViolation, + expectedXpathQueries); + + } + + @Test + public void testConstructor() throws Exception { + final File fileToProcess = new File(getPath( + "SuppressionXpathRegressionAnnotationLocationCTOR.java")); + + final DefaultConfiguration moduleConfig = + createModuleConfig(AnnotationLocationCheck.class); + moduleConfig.addAttribute("tokens", "CTOR_DEF"); + + final String[] expectedViolation = { + "4:5: " + getCheckMessage(AnnotationLocationCheck.class, + AnnotationLocationCheck.MSG_KEY_ANNOTATION_LOCATION_ALONE, + "CTORAnnotation"), + }; + + final List<String> expectedXpathQueries = Arrays.asList( + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegression" + + "AnnotationLocationCTOR']]/OBJBLOCK/CTOR_DEF" + + "[./IDENT[@text='SuppressionXpathRegression" + + "AnnotationLocationCTOR']]", + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegression" + + "AnnotationLocationCTOR']]/OBJBLOCK/CTOR_DEF" + + "[./IDENT[@text='SuppressionXpathRegression" + + "AnnotationLocationCTOR']]/MODIFIERS", + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegression" + + "AnnotationLocationCTOR']]/OBJBLOCK/CTOR_DEF" + + "[./IDENT[@text='SuppressionXpathRegression" + + "AnnotationLocationCTOR']]/" + + "MODIFIERS/ANNOTATION[./IDENT[@text='CTORAnnotation']]", + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegression" + + "AnnotationLocationCTOR']]/OBJBLOCK/CTOR_DEF" + + "[./IDENT[@text='SuppressionXpathRegression" + + "AnnotationLocationCTOR']]/" + + "MODIFIERS/ANNOTATION[./IDENT[@text='CTORAnnotation']]/AT" + ); + + runVerifications(moduleConfig, fileToProcess, expectedViolation, + expectedXpathQueries); + + } + +} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationAnnotation.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationAnnotation.java new file mode 100644 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationAnnotation.java @@ -0,0 +1,15 @@ +package org.checkstyle.suppressionxpathfilter.annotationlocation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; + +@Annotation("bar") @interface SuppressionXpathRegressionAnnotationLocationAnnotation {//warn + +} + +@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD}) +@interface Annotation { + + String value() default ""; + +} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationCTOR.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationCTOR.java new file mode 100644 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationCTOR.java @@ -0,0 +1,12 @@ +package org.checkstyle.suppressionxpathfilter.annotationlocation; + +public class SuppressionXpathRegressionAnnotationLocationCTOR { + @CTORAnnotation(value = "") public SuppressionXpathRegressionAnnotationLocationCTOR()//warn + { + // comment + } +} + +@interface CTORAnnotation { + String value(); +} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationClass.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationClass.java new file mode 100644 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationClass.java @@ -0,0 +1,15 @@ +package org.checkstyle.suppressionxpathfilter.annotationlocation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; + +@ClassAnnotation("bar") class SuppressionXpathRegressionAnnotationLocationClass { //warn + +} + +@Target({ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.TYPE}) +@interface ClassAnnotation { + + String value() default ""; + +} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationEnum.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationEnum.java new file mode 100644 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationEnum.java @@ -0,0 +1,18 @@ +package org.checkstyle.suppressionxpathfilter.annotationlocation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; + +@EnumAnnotation("bar") enum SuppressionXpathRegressionAnnotationLocationEnum { //warn + + SuppressionXpathRegressionAnnotationLocationEnum() { + } + +} + +@Target({ElementType.FIELD, ElementType.TYPE}) +@interface EnumAnnotation { + + String value() default ""; + +} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationInterface.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationInterface.java new file mode 100644 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationInterface.java @@ -0,0 +1,25 @@ +package org.checkstyle.suppressionxpathfilter.annotationlocation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Repeatable; +import java.lang.annotation.Target; + +@InterfaceAnnotation("bar") interface SuppressionXpathRegressionAnnotationLocationInterface { //warn + +} + +@Repeatable(InterfaceAnnotations.class) +@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE}) +@interface InterfaceAnnotation { + + String value() default ""; + +} + +@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE}) +@interface InterfaceAnnotations { + + InterfaceAnnotation[] value(); + +} + diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationMethod.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationMethod.java new file mode 100644 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationMethod.java @@ -0,0 +1,10 @@ +package org.checkstyle.suppressionxpathfilter.annotationlocation; + +public class SuppressionXpathRegressionAnnotationLocationMethod { + @MethodAnnotation("foo") void foo1() {}//warn +} +@interface MethodAnnotation { + String value(); +} + + diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationVariable.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationVariable.java new file mode 100644 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationVariable.java @@ -0,0 +1,8 @@ +package org.checkstyle.suppressionxpathfilter.annotationlocation; + +public class SuppressionXpathRegressionAnnotationLocationVariable { + @VariableAnnotation(value = "") public int b; //warn +} +@interface VariableAnnotation { + String value(); +} diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.java @@ -282,11 +282,11 @@ private void checkAnnotations(DetailAST modifierNode, int correctIndentation) { final boolean hasParameters = isParameterized(annotation); if (!isCorrectLocation(annotation, hasParameters)) { - log(annotation.getLineNo(), + log(annotation, MSG_KEY_ANNOTATION_LOCATION_ALONE, getAnnotationName(annotation)); } else if (annotation.getColumnNo() != correctIndentation && !hasNodeBefore(annotation)) { - log(annotation.getLineNo(), MSG_KEY_ANNOTATION_LOCATION, + log(annotation, MSG_KEY_ANNOTATION_LOCATION, getAnnotationName(annotation), annotation.getColumnNo(), correctIndentation); } annotation = annotation.getNextSibling(); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java @@ -44,9 +44,6 @@ * </p> * <ul id="SuppressionXpathFilter_IncompatibleChecks"> * <li> - * AnnotationLocation - * </li> - * <li> * AnnotationOnSameLine * </li> * <li>
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule485annotations/AnnotationLocationTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule485annotations/AnnotationLocationTest.java --- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule485annotations/AnnotationLocationTest.java +++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule485annotations/AnnotationLocationTest.java @@ -42,18 +42,18 @@ public void testAnnotation() throws Exception { final String msgLocationAlone = "annotation.location.alone"; final String msgLocation = "annotation.location"; final String[] expected = { - "3: " + getCheckMessage(clazz, msgLocationAlone, "MyAnnotation1"), - "20: " + getCheckMessage(clazz, msgLocation, "MyAnnotation1", "8", "4"), - "27: " + getCheckMessage(clazz, msgLocation, "MyAnnotation2", "7", "4"), - "31: " + getCheckMessage(clazz, msgLocation, "MyAnnotation2", "8", "4"), - "32: " + getCheckMessage(clazz, msgLocation, "MyAnnotation3", "6", "4"), - "33: " + getCheckMessage(clazz, msgLocation, "MyAnnotation4", "10", "4"), - "54: " + getCheckMessage(clazz, msgLocation, "MyAnnotation2", "12", "8"), - "58: " + getCheckMessage(clazz, msgLocation, "MyAnnotation2", "12", "8"), - "78: " + getCheckMessage(clazz, msgLocation, "MyAnnotation2", "11", "8"), - "81: " + getCheckMessage(clazz, msgLocation, "MyAnnotation2", "10", "8"), - "90: " + getCheckMessage(clazz, msgLocation, "MyAnnotation2", "1", "0"), - "93: " + getCheckMessage(clazz, msgLocationAlone, "MyAnnotationWithParam"), + "3:16: " + getCheckMessage(clazz, msgLocationAlone, "MyAnnotation1"), + "20:9: " + getCheckMessage(clazz, msgLocation, "MyAnnotation1", "8", "4"), + "27:8: " + getCheckMessage(clazz, msgLocation, "MyAnnotation2", "7", "4"), + "31:9: " + getCheckMessage(clazz, msgLocation, "MyAnnotation2", "8", "4"), + "32:7: " + getCheckMessage(clazz, msgLocation, "MyAnnotation3", "6", "4"), + "33:11: " + getCheckMessage(clazz, msgLocation, "MyAnnotation4", "10", "4"), + "54:13: " + getCheckMessage(clazz, msgLocation, "MyAnnotation2", "12", "8"), + "58:13: " + getCheckMessage(clazz, msgLocation, "MyAnnotation2", "12", "8"), + "78:12: " + getCheckMessage(clazz, msgLocation, "MyAnnotation2", "11", "8"), + "81:11: " + getCheckMessage(clazz, msgLocation, "MyAnnotation2", "10", "8"), + "90:2: " + getCheckMessage(clazz, msgLocation, "MyAnnotation2", "1", "0"), + "93:1: " + getCheckMessage(clazz, msgLocationAlone, "MyAnnotationWithParam"), }; final String filePath = getPath("InputAnnotationLocation.java"); @@ -71,7 +71,7 @@ public void testAnnotationVariables() throws Exception { final String msgLocation = "annotation.location"; final String[] expected = { - "63: " + getCheckMessage(clazz, msgLocation, "MyAnnotation2", "7", "4"), + "63:8: " + getCheckMessage(clazz, msgLocation, "MyAnnotation2", "7", "4"), }; final String filePath = getPath("InputAnnotationLocationVariables.java"); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheckTest.java @@ -56,30 +56,30 @@ public void testCorrect() throws Exception { public void testIncorrect() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(AnnotationLocationCheck.class); final String[] expected = { - "6: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnn"), - "11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "14: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "17: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 8, 4), - "25: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 8, 4), - "29: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "29: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation2"), - "32: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 7, 4), - "36: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 8, 4), - "37: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation3", 6, 4), - "38: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation4", 10, 4), - "41: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "45: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "48: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 12, 8), - "56: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "61: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 12, 8), - "65: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 12, 8), - "70: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 7, 4), - "73: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "75: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "85: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 11, 8), - "88: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 10, 8), - "91: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "98: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 0, 3), + "6:16: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnn"), + "11:20: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), + "14:5: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), + "17:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 8, 4), + "25:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 8, 4), + "29:5: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), + "29:27: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation2"), + "32:8: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 7, 4), + "36:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 8, 4), + "37:7: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation3", 6, 4), + "38:11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation4", 10, 4), + "41:24: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), + "45:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), + "48:13: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 12, 8), + "56:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), + "61:13: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 12, 8), + "65:13: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 12, 8), + "70:8: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 7, 4), + "73:24: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), + "75:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), + "85:12: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 11, 8), + "88:11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 10, 8), + "91:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), + "98:1: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 0, 3), }; verify(checkConfig, getPath("InputAnnotationLocationIncorrect.java"), expected); } @@ -91,30 +91,30 @@ public void testIncorrectAllTokens() throws Exception { + "CTOR_DEF, VARIABLE_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF, " + "ENUM_CONSTANT_DEF, PACKAGE_DEF"); final String[] expected = { - "6: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnn"), - "11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "14: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "17: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 8, 4), - "25: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 8, 4), - "29: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "29: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation2"), - "32: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 7, 4), - "36: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 8, 4), - "37: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation3", 6, 4), - "38: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation4", 10, 4), - "41: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "45: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "48: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 12, 8), - "56: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "61: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 12, 8), - "65: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 12, 8), - "70: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 7, 4), - "73: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "75: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "85: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 11, 8), - "88: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 10, 8), - "91: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "98: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 0, 3), + "6:16: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnn"), + "11:20: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), + "14:5: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), + "17:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 8, 4), + "25:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 8, 4), + "29:5: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), + "29:27: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation2"), + "32:8: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 7, 4), + "36:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 8, 4), + "37:7: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation3", 6, 4), + "38:11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation4", 10, 4), + "41:24: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), + "45:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), + "48:13: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 12, 8), + "56:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), + "61:13: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 12, 8), + "65:13: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 12, 8), + "70:8: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 7, 4), + "73:24: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), + "75:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), + "85:12: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 11, 8), + "88:11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 10, 8), + "91:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), + "98:1: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 0, 3), }; verify(checkConfig, getPath("InputAnnotationLocationIncorrect.java"), expected); } @@ -152,19 +152,19 @@ public void testWithParameters() throws Exception { checkConfig.addAttribute("allowSamelineParameterizedAnnotation", "true"); checkConfig.addAttribute("allowSamelineMultipleAnnotations", "true"); final String[] expected = { - "17: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 8, 4), - "25: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 8, 4), - "32: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 7, 4), - "36: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 8, 4), - "37: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation3", 6, 4), - "38: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation4", 10, 4), - "48: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 12, 8), - "61: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 12, 8), - "65: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 12, 8), - "70: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 7, 4), - "85: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 11, 8), - "88: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 10, 8), - "98: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 0, 3), + "17:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 8, 4), + "25:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 8, 4), + "32:8: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 7, 4), + "36:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 8, 4), + "37:7: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation3", 6, 4), + "38:11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation4", 10, 4), + "48:13: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 12, 8), + "61:13: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 12, 8), + "65:13: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 12, 8), + "70:8: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 7, 4), + "85:12: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 11, 8), + "88:11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 10, 8), + "98:1: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 0, 3), }; verify(checkConfig, getPath("InputAnnotationLocationIncorrect.java"), expected); } @@ -174,9 +174,9 @@ public void testWithMultipleAnnotations() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(AnnotationLocationCheck.class); checkConfig.addAttribute("allowSamelineSingleParameterlessAnnotation", "false"); final String[] expected = { - "3: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation11"), - "3: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation12"), - "3: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation13"), + "3:1: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation11"), + "3:17: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation12"), + "3:33: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation13"), }; verify(checkConfig, getPath("InputAnnotationLocationCustomAnnotationsDeclared.java"), expected); @@ -196,10 +196,10 @@ public void testAnnotation() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(AnnotationLocationCheck.class); checkConfig.addAttribute("tokens", "ANNOTATION_DEF, ANNOTATION_FIELD_DEF"); final String[] expected = { - "17: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "AnnotationAnnotation", 2, 0), - "18: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "AnnotationAnnotation"), - "21: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "AnnotationAnnotation", 6, 4), - "22: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "AnnotationAnnotation"), + "17:3: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "AnnotationAnnotation", 2, 0), + "18:1: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "AnnotationAnnotation"), + "21:7: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "AnnotationAnnotation", 6, 4), + "22:5: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "AnnotationAnnotation"), }; verify(checkConfig, getPath("InputAnnotationLocationAnnotation.java"), expected); } @@ -209,12 +209,12 @@ public void testClass() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(AnnotationLocationCheck.class); checkConfig.addAttribute("tokens", "CLASS_DEF, CTOR_DEF, VARIABLE_DEF"); final String[] expected = { - "17: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "ClassAnnotation", 2, 0), - "18: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "ClassAnnotation"), - "21: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "ClassAnnotation", 6, 4), - "22: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "ClassAnnotation"), - "25: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "ClassAnnotation", 6, 4), - "26: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "ClassAnnotation"), + "17:3: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "ClassAnnotation", 2, 0), + "18:1: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "ClassAnnotation"), + "21:7: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "ClassAnnotation", 6, 4), + "22:5: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "ClassAnnotation"), + "25:7: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "ClassAnnotation", 6, 4), + "26:5: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "ClassAnnotation"), }; verify(checkConfig, getPath("InputAnnotationLocationClass.java"), expected); } @@ -224,10 +224,10 @@ public void testEnum() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(AnnotationLocationCheck.class); checkConfig.addAttribute("tokens", "ENUM_DEF, ENUM_CONSTANT_DEF"); final String[] expected = { - "17: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "EnumAnnotation", 2, 0), - "18: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "EnumAnnotation"), - "21: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "EnumAnnotation", 6, 4), - "22: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "EnumAnnotation"), + "17:3: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "EnumAnnotation", 2, 0), + "18:1: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "EnumAnnotation"), + "21:7: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "EnumAnnotation", 6, 4), + "22:5: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "EnumAnnotation"), }; verify(checkConfig, getPath("InputAnnotationLocationEnum.java"), expected); } @@ -237,10 +237,10 @@ public void testInterface() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(AnnotationLocationCheck.class); checkConfig.addAttribute("tokens", "INTERFACE_DEF, METHOD_DEF"); final String[] expected = { - "17: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "InterfaceAnnotation", 2, 0), - "18: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "InterfaceAnnotation"), - "21: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "InterfaceAnnotation", 6, 4), - "22: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "InterfaceAnnotation"), + "17:3: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "InterfaceAnnotation", 2, 0), + "18:1: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "InterfaceAnnotation"), + "21:7: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "InterfaceAnnotation", 6, 4), + "22:5: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "InterfaceAnnotation"), }; verify(checkConfig, getPath("InputAnnotationLocationInterface.java"), expected); } @@ -250,8 +250,8 @@ public void testPackage() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(AnnotationLocationCheck.class); checkConfig.addAttribute("tokens", "PACKAGE_DEF"); final String[] expected = { - "11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "PackageAnnotation", 2, 0), - "12: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "PackageAnnotation"), + "11:3: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "PackageAnnotation", 2, 0), + "12:1: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "PackageAnnotation"), }; verify(checkConfig, getPath("inputs/package-info.java"), expected); } @@ -285,10 +285,13 @@ public void testAnnotationParameterized() throws Exception { checkConfig.addAttribute("allowSamelineSingleParameterlessAnnotation", "false"); checkConfig.addAttribute("allowSamelineParameterizedAnnotation", "true"); final String[] expected = { - "15: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), - "17: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), - "23: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), - "25: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), + "15:5: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), + "17:5: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), + "17:17: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), + "23:5: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), + "23:17: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), + "23:33: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), + "25:21: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), }; verify(checkConfig, getPath("InputAnnotationLocationParameterized.java"), expected); } @@ -300,11 +303,13 @@ public void testAnnotationSingleParameterless() throws Exception { checkConfig.addAttribute("allowSamelineSingleParameterlessAnnotation", "true"); checkConfig.addAttribute("allowSamelineParameterizedAnnotation", "false"); final String[] expected = { - "19: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), - "21: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), - "23: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), - "25: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), - "27: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), + "19:17: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), + "21:5: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), + "23:5: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), + "25:17: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), + "25:33: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), + "27:5: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), + "27:21: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Annotation"), }; verify(checkConfig, getPath("InputAnnotationLocationSingleParameterless.java"), expected); } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java @@ -52,7 +52,6 @@ public class XpathRegressionTest extends AbstractModuleTestSupport { // till https://github.com/checkstyle/checkstyle/issues/5777 public static final Set<String> INCOMPATIBLE_CHECK_NAMES = Collections.unmodifiableSet(new HashSet<>(Arrays.asList( - "AnnotationLocation", "AnnotationOnSameLine", "AnnotationUseStyle", "AvoidEscapedUnicodeCharacters",
Update AbstractChecks to log DetailAST - AnnotationLocation Child of https://github.com/checkstyle/checkstyle/issues/5777 This issue specifically focuses on AnnotationLocation .
I am on it. Hi @romani, As per my understanding, the requirement is to overload the log function in the AnnotationLocationCheck providing AST. However, I feel like I am missing something. Could you clarify a little on what should be done? Thanks. @Malintha1996 All checks call a log method to report violations. They can either send a line only, a line and column, or the AST. We are in the process of changing all our `log` calls in AbstractChecks to pass the AST instead of anything else. The reason is for xpath suppressions, it needs the AST to know where the violation is in the tree to determine if it matches a suppression xpath supplied by the user. Besides making this change, all tests need to pass and regression needs to be provided for the changes. Got it. Thanks for the assistance. @rnveach , Will you briefly mention the XpathRegression tests that should be added. Should I consider all possible tokens such as 'CLASS_DEF' in adding tests @Malintha1996 See https://github.com/checkstyle/checkstyle/issues/7729 and it's final commit as an example of completed work for this issue. Let me know if you have any more questions.
2020-03-14T20:44:46Z
8.3
checkstyle/checkstyle
7,798
checkstyle__checkstyle-7798
[ "7752" ]
ddde906ef9d6e00796414434e59eee7fa9146715
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoFinalizerTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoFinalizerTest.java new file mode 100644 --- /dev/null +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoFinalizerTest.java @@ -0,0 +1,98 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2020 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package org.checkstyle.suppressionxpathfilter; + +import java.io.File; +import java.util.Arrays; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import com.puppycrawl.tools.checkstyle.DefaultConfiguration; +import com.puppycrawl.tools.checkstyle.checks.coding.NoFinalizerCheck; + +public class XpathRegressionNoFinalizerTest extends AbstractXpathTestSupport { + + @Override + protected String getCheckName() { + return NoFinalizerCheck.class.getSimpleName(); + } + + @Test + public void testOne() throws Exception { + final File fileToProcess = new File( + getPath("SuppressionXpathRegressionNoFinalizer1.java")); + + final DefaultConfiguration moduleConfig = + createModuleConfig(NoFinalizerCheck.class); + + final String[] expectedViolation = { + "8:5: " + getCheckMessage(NoFinalizerCheck.class, + NoFinalizerCheck.MSG_KEY), + }; + + final List<String> expectedXpathQueries = Arrays.asList( + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionNoFinalizer1']]" + + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='finalize']]", + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionNoFinalizer1']]" + + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='finalize']]/MODIFIERS", + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionNoFinalizer1']]" + + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='finalize']]/MODIFIERS/LITERAL_PROTECTED" + ); + + runVerifications(moduleConfig, fileToProcess, expectedViolation, + expectedXpathQueries); + } + + @Test + public void testTwo() throws Exception { + final File fileToProcess = new File( + getPath("SuppressionXpathRegressionNoFinalizer2.java")); + + final DefaultConfiguration moduleConfig = + createModuleConfig(NoFinalizerCheck.class); + + final String[] expectedViolation = { + "10:9: " + getCheckMessage(NoFinalizerCheck.class, + NoFinalizerCheck.MSG_KEY), + }; + + final List<String> expectedXpathQueries = Arrays.asList( + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionNoFinalizer2']]" + + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='InnerClass']]/OBJBLOCK/" + + "METHOD_DEF[./IDENT[@text='finalize']]", + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionNoFinalizer2']]" + + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='InnerClass']]/OBJBLOCK/" + + "METHOD_DEF[./IDENT[@text='finalize']]/MODIFIERS", + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionNoFinalizer2']]" + + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='InnerClass']]/OBJBLOCK/" + + "METHOD_DEF[./IDENT[@text='finalize']]/MODIFIERS/" + + "ANNOTATION[./IDENT[@text='Override']]", + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionNoFinalizer2']]" + + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='InnerClass']]/OBJBLOCK/" + + "METHOD_DEF[./IDENT[@text='finalize']]/MODIFIERS/" + + "ANNOTATION[./IDENT[@text='Override']]/AT" + ); + + runVerifications(moduleConfig, fileToProcess, expectedViolation, + expectedXpathQueries); + } + +} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nofinalizer/SuppressionXpathRegressionNoFinalizer1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nofinalizer/SuppressionXpathRegressionNoFinalizer1.java new file mode 100644 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nofinalizer/SuppressionXpathRegressionNoFinalizer1.java @@ -0,0 +1,11 @@ +package org.checkstyle.suppressionxpathfilter.nofinalizer; + +public class SuppressionXpathRegressionNoFinalizer1 { + public static void main(String[] args) { + // some code here + } + + protected void finalize() throws Throwable { // warn + + } +} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nofinalizer/SuppressionXpathRegressionNoFinalizer2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nofinalizer/SuppressionXpathRegressionNoFinalizer2.java new file mode 100644 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nofinalizer/SuppressionXpathRegressionNoFinalizer2.java @@ -0,0 +1,16 @@ +package org.checkstyle.suppressionxpathfilter.nofinalizer; + +public class SuppressionXpathRegressionNoFinalizer2 { + public static void doStuff() { + // some code here + } + + class InnerClass { + + @Override // warn + @Deprecated + protected void finalize() throws Throwable { + + } + } +} diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheck.java @@ -73,17 +73,17 @@ public int[] getRequiredTokens() { } @Override - public void visitToken(DetailAST aAST) { - final DetailAST mid = aAST.findFirstToken(TokenTypes.IDENT); + public void visitToken(DetailAST ast) { + final DetailAST mid = ast.findFirstToken(TokenTypes.IDENT); final String name = mid.getText(); if ("finalize".equals(name)) { - final DetailAST params = aAST.findFirstToken(TokenTypes.PARAMETERS); + final DetailAST params = ast.findFirstToken(TokenTypes.PARAMETERS); final boolean hasEmptyParamList = params.findFirstToken(TokenTypes.PARAMETER_DEF) == null; if (hasEmptyParamList) { - log(aAST.getLineNo(), MSG_KEY); + log(ast, MSG_KEY); } } } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java @@ -134,9 +134,6 @@ * NeedBraces * </li> * <li> - * NoFinalizer - * </li> - * <li> * NoLineWrap * </li> * <li>
diff --git a/src/it/java/com/google/checkstyle/test/chapter6programpractice/rule64finalizers/NoFinalizerTest.java b/src/it/java/com/google/checkstyle/test/chapter6programpractice/rule64finalizers/NoFinalizerTest.java --- a/src/it/java/com/google/checkstyle/test/chapter6programpractice/rule64finalizers/NoFinalizerTest.java +++ b/src/it/java/com/google/checkstyle/test/chapter6programpractice/rule64finalizers/NoFinalizerTest.java @@ -37,7 +37,7 @@ public void testNoFinalizerBasic() throws Exception { final String msg = getCheckMessage(NoFinalizerCheck.class, "avoid.finalizer.method"); final String[] expected = { - "5: " + msg, + "5:5: " + msg, }; final Configuration checkConfig = getModuleConfig("NoFinalizer"); @@ -52,15 +52,15 @@ public void testNoFinalizerExtended() throws Exception { final String msg = getCheckMessage(NoFinalizerCheck.class, "avoid.finalizer.method"); final String[] expected = { - "9: " + msg, - "21: " + msg, - "33: " + msg, - "45: " + msg, - "57: " + msg, - "69: " + msg, - "79: " + msg, - "119: " + msg, - "136: " + msg, + "9:5: " + msg, + "21:5: " + msg, + "33:5: " + msg, + "45:5: " + msg, + "57:5: " + msg, + "69:5: " + msg, + "79:9: " + msg, + "119:13: " + msg, + "136:5: " + msg, }; final Configuration checkConfig = getModuleConfig("NoFinalizer"); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheckTest.java @@ -57,7 +57,7 @@ public void testHasFinalizer() final DefaultConfiguration checkConfig = createModuleConfig(NoFinalizerCheck.class); final String[] expected = { - "5: " + getCheckMessage(MSG_KEY), + "5:5: " + getCheckMessage(MSG_KEY), }; verify(checkConfig, getPath("InputNoFinalizerHasFinalizer.java"), expected); } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java @@ -82,7 +82,6 @@ public class XpathRegressionTest extends AbstractModuleTestSupport { "MissingOverride", "MissingSwitchDefault", "NeedBraces", - "NoFinalizer", "NoLineWrap", "OuterTypeFilename", "OverloadMethodsDeclarationOrder",
Update AbstractChecks to log DetailAST - NoFinalizer Child of https://github.com/checkstyle/checkstyle/issues/5777 This issue specifically focuses on NoFinalizer.
I am on it.
2020-03-08T17:09:37Z
8.3
checkstyle/checkstyle
7,193
checkstyle__checkstyle-7193
[ "7329" ]
baa250c454de5845151b64ae940173744f4d0435
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/PropertiesExpander.java b/src/main/java/com/puppycrawl/tools/checkstyle/PropertiesExpander.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/PropertiesExpander.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/PropertiesExpander.java @@ -39,7 +39,7 @@ public final class PropertiesExpander * Creates a new PropertiesExpander. * @param properties the underlying properties to use for * property resolution. - * @throws IllegalArgumentException indicates null was passed + * @throws IllegalArgumentException when properties argument is null */ public PropertiesExpander(Properties properties) { if (properties == null) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/ClassResolver.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/ClassResolver.java deleted file mode 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/ClassResolver.java +++ /dev/null @@ -1,244 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2019 the original author or authors. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -//////////////////////////////////////////////////////////////////////////////// - -package com.puppycrawl.tools.checkstyle.checks.javadoc; - -import java.util.HashSet; -import java.util.Set; - -/** - * Utility class to resolve a class name to an actual class. Note that loaded - * classes are not initialized. - * <p>Limitations: this does not handle inner classes very well.</p> - * - */ -public class ClassResolver { - - /** Period literal. */ - private static final String PERIOD = "."; - /** Dollar sign literal. */ - private static final String DOLLAR_SIGN = "$"; - - /** Name of the package to check if the class belongs to. **/ - private final String pkg; - /** Set of imports to check against. **/ - private final Set<String> imports; - /** Use to load classes. **/ - private final ClassLoader loader; - - /** - * Creates a new {@code ClassResolver} instance. - * - * @param loader the ClassLoader to load classes with. - * @param pkg the name of the package the class may belong to - * @param imports set of imports to check if the class belongs to - */ - public ClassResolver(ClassLoader loader, String pkg, Set<String> imports) { - this.loader = loader; - this.pkg = pkg; - this.imports = new HashSet<>(imports); - this.imports.add("java.lang.*"); - } - - /** - * Attempts to resolve the Class for a specified name. The algorithm is - * to check: - * - fully qualified name - * - explicit imports - * - enclosing package - * - star imports - * @param name name of the class to resolve - * @param currentClass name of current class (for inner classes). - * @return the resolved class - * @throws ClassNotFoundException if unable to resolve the class - */ - // -@cs[ForbidWildcardAsReturnType] This method can return any type, so no way to avoid wildcard - public Class<?> resolve(String name, String currentClass) - throws ClassNotFoundException { - // See if the class is full qualified - Class<?> clazz = resolveQualifiedName(name); - if (clazz == null) { - // try matching explicit imports - clazz = resolveMatchingExplicitImport(name); - - if (clazz == null) { - // See if in the package - clazz = resolveInPackage(name); - - if (clazz == null) { - // see if inner class of this class - clazz = resolveInnerClass(name, currentClass); - - if (clazz == null) { - clazz = resolveByStarImports(name); - // -@cs[NestedIfDepth] it is better to have single return point from method - if (clazz == null) { - throw new ClassNotFoundException(name); - } - } - } - } - } - return clazz; - } - - /** - * Try to find class by search in package. - * @param name class name - * @return class object - */ - private Class<?> resolveInPackage(String name) { - Class<?> clazz = null; - if (pkg != null && !pkg.isEmpty()) { - final Class<?> classFromQualifiedName = resolveQualifiedName(pkg + PERIOD + name); - if (classFromQualifiedName != null) { - clazz = classFromQualifiedName; - } - } - return clazz; - } - - /** - * Try to find class by matching explicit Import. - * @param name class name - * @return class object - */ - private Class<?> resolveMatchingExplicitImport(String name) { - Class<?> clazz = null; - for (String imp : imports) { - // Very important to add the "." in the check below. Otherwise you - // when checking for "DataException", it will match on - // "SecurityDataException". This has been the cause of a very - // difficult bug to resolve! - if (imp.endsWith(PERIOD + name)) { - clazz = resolveQualifiedName(imp); - if (clazz != null) { - break; - } - } - } - return clazz; - } - - /** - * See if inner class of this class. - * @param name name of the search Class to search - * @param currentClass class where search in - * @return class if found , or null if not resolved - * @throws ClassNotFoundException if an error occurs - */ - private Class<?> resolveInnerClass(String name, String currentClass) - throws ClassNotFoundException { - Class<?> clazz = null; - if (!currentClass.isEmpty()) { - String innerClass = currentClass + DOLLAR_SIGN + name; - - if (!pkg.isEmpty()) { - innerClass = pkg + PERIOD + innerClass; - } - - if (isLoadable(innerClass)) { - clazz = safeLoad(innerClass); - } - } - return clazz; - } - - /** - * Try star imports. - * @param name name of the Class to search - * @return class if found , or null if not resolved - */ - private Class<?> resolveByStarImports(String name) { - Class<?> clazz = null; - for (String imp : imports) { - if (imp.endsWith(".*")) { - final String fqn = imp.substring(0, imp.lastIndexOf('.') + 1) + name; - clazz = resolveQualifiedName(fqn); - if (clazz != null) { - break; - } - } - } - return clazz; - } - - /** - * Checks if the given class name can be loaded. - * @param name name of the class to check - * @return whether a specified class is loadable with safeLoad(). - */ - public boolean isLoadable(String name) { - boolean result; - try { - safeLoad(name); - result = true; - } - catch (final ClassNotFoundException | NoClassDefFoundError ignored) { - result = false; - } - return result; - } - - /** - * Will load a specified class is such a way that it will NOT be - * initialised. - * @param name name of the class to load - * @return the {@code Class} for the specified class - * @throws ClassNotFoundException if an error occurs - * @throws NoClassDefFoundError if an error occurs - */ - // -@cs[ForbidWildcardAsReturnType] The class is deprecated and will be removed soon. - private Class<?> safeLoad(String name) throws ClassNotFoundException, NoClassDefFoundError { - // The next line will load the class using the specified class - // loader. The magic is having the "false" parameter. This means the - // class will not be initialised. Very, very important. - return Class.forName(name, false, loader); - } - - /** - * Tries to resolve a class for fully-specified name. - * @param name a given name of class. - * @return Class object for the given name or null. - */ - private Class<?> resolveQualifiedName(final String name) { - Class<?> classObj = null; - try { - if (isLoadable(name)) { - classObj = safeLoad(name); - } - else { - //Perhaps it's fully-qualified inner class - final int dot = name.lastIndexOf('.'); - if (dot != -1) { - final String innerName = - name.substring(0, dot) + DOLLAR_SIGN + name.substring(dot + 1); - classObj = resolveQualifiedName(innerName); - } - } - } - catch (final ClassNotFoundException ex) { - // we shouldn't get this exception here, - // so this is unexpected runtime exception - throw new IllegalStateException(ex); - } - return classObj; - } - -} diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java @@ -30,6 +30,7 @@ import java.util.List; import java.util.ListIterator; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -49,10 +50,7 @@ /** * <p> - * Checks the Javadoc of a method or constructor. By default, - * check does not validate methods and constructors for unused throws. - * To allow documented exceptions derived from {@code java.lang.RuntimeException} - * that are not declared, set property {@code allowUndeclaredRTE} to true. + * Checks the Javadoc of a method or constructor. * The scope to verify is specified using the {@code Scope} class and defaults * to {@code Scope.PRIVATE}. To verify another scope, set property scope to * a different <a href="https://checkstyle.org/property_types.html#scope">scope</a>. @@ -60,10 +58,10 @@ * <p> * Violates parameters and type parameters for which no param tags are present * can be suppressed by defining property {@code allowMissingParamTags}. - * Violates exceptions which are declared to be thrown, but for which no throws - * tag is present can be suppressed by defining property {@code allowMissingThrowsTags}. * Violates methods which return non-void but for which no return tag is present * can be suppressed by defining property {@code allowMissingReturnTag}. + * Violates exceptions which are declared to be thrown, but for which no throws + * tag is present by activation of property {@code validateThrows}. * </p> * <p> * Javadoc is not required on a method that is tagged with the {@code @Override} @@ -87,10 +85,6 @@ * JavadocTag[] aTags, * int aLineNo) * </pre> - * <p> - * The classpath may need to be configured to locate the class information. - * The classpath configuration is dependent on the mechanism used to invoke Checkstyle. - * </p> * <ul> * <li> * Property {@code allowedAnnotations} - Specify the list of annotations @@ -111,52 +105,16 @@ * Default value is {@code null}. * </li> * <li> - * Property {@code allowUndeclaredRTE} - Control whether to allow documented exceptions - * that are not declared if they are a subclass of {@code java.lang.RuntimeException}. - * Default value is {@code false}. - * </li> - * <li> - * Property {@code allowThrowsTagsForSubclasses} - Control whether to allow - * documented exceptions that are subclass of one of declared exception. - * Default value is {@code false}. - * </li> - * <li> * Property {@code allowMissingParamTags} - Control whether to ignore violations * when a method has parameters but does not have matching {@code param} tags in the javadoc. * Default value is {@code false}. * </li> * <li> - * Property {@code allowMissingThrowsTags} - Control whether to ignore violations - * when a method declares that it throws exceptions but does not have matching - * {@code throws} tags in the javadoc. - * Default value is {@code false}. - * </li> - * <li> * Property {@code allowMissingReturnTag} - Control whether to ignore violations * when a method returns non-void type and does not have a {@code return} tag in the javadoc. * Default value is {@code false}. * </li> * <li> - * Property {@code logLoadErrors} - Control checkstyle's error handling when - * a class loading fails. This check may need to load exception classes mentioned - * in the {@code @throws} tag to check whether they are RuntimeExceptions. - * If set to {@code false} a classpath configuration problem is assumed and - * the TreeWalker stops operating on the class completely. If set to {@code true} - * (the default), checkstyle assumes a typo or refactoring problem in the javadoc - * and logs the problem in the normal checkstyle report (potentially masking - * a configuration error). - * Default value is {@code true}. - * </li> - * <li> - * Property {@code suppressLoadErrors} - Control whether to suppress violations - * when a class loading fails. When logLoadErrors is set to true, the TreeWalker - * completely processes a class and displays any problems with loading exceptions - * as checkstyle violations. When this property is set to true, the violations - * generated when logLoadErrors is set true are suppressed from being reported as - * violations in the checkstyle report. - * Default value is {@code false}. - * </li> - * <li> * Property {@code tokens} - tokens to check Default value is: * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF"> * METHOD_DEF</a>, @@ -173,36 +131,64 @@ * &lt;module name="JavadocMethod"/&gt; * </pre> * <p> - * To configure the check for {@code public} scope and to allow documentation - * of undeclared RuntimeExceptions: + * To configure the check for {@code public} scope, ignoring any missing param tags is: * </p> * <pre> * &lt;module name="JavadocMethod"&gt; * &lt;property name="scope" value="public"/&gt; - * &lt;property name="allowUndeclaredRTE" value="true"/&gt; + * &lt;property name="allowMissingParamTags" value="true"/&gt; * &lt;/module&gt; * </pre> * <p> - * To configure the check for for {@code public} scope, to allow documentation - * of undeclared RuntimeExceptions, while ignoring any missing param tags is: + * To configure the check for methods which are in {@code private}, + * but not in {@code protected} scope: * </p> * <pre> * &lt;module name="JavadocMethod"&gt; - * &lt;property name="scope" value="public"/&gt; - * &lt;property name="allowUndeclaredRTE" value="true"/&gt; - * &lt;property name="allowMissingParamTags" value="true"/&gt; + * &lt;property name="scope" value="private"/&gt; + * &lt;property name="excludeScope" value="protected"/&gt; * &lt;/module&gt; * </pre> * <p> - * To configure the check for methods which are in {@code private}, - * but not in {@code protected} scope: + * To configure the check to validate {@code throws} tags, you can use following config. + * ATTENTION: Checkstyle does not have information about hierarchy of exception types so usage + * of base class is considered as separate exception type. As workaround you need to + * specify both types in javadoc (parent and exact type). * </p> * <pre> * &lt;module name="JavadocMethod"&gt; - * &lt;property name="scope" value="private"/&gt; - * &lt;property name="excludeScope" value="protected"/&gt; + * &lt;property name="validateThrows" value="true"/&gt; * &lt;/module&gt; * </pre> + * <pre> + * &#47;** + * * Actual exception thrown is child class of class that is declared in throws. + * * It is limitation of checkstyle (as checkstyle does not know type hierarchy). + * * Javadoc is valid not declaring FileNotFoundException + * * BUT checkstyle can not distinguish relationship between exceptions. + * * &#64;param file some file + * * &#64;throws IOException if some problem + * *&#47; + * public void doSomething8(File file) throws IOException { + * if (file == null) { + * throw new FileNotFoundException(); // violation + * } + * } + * + * &#47;** + * * Exact throw type referencing in javadoc even first is parent of second type. + * * It is a limitation of checkstyle (as checkstyle does not know type hierarchy). + * * This javadoc is valid for checkstyle and for javadoc tool. + * * &#64;param file some file + * * &#64;throws IOException if some problem + * * &#64;throws FileNotFoundException if file is not found + * *&#47; + * public void doSomething9(File file) throws IOException { + * if (file == null) { + * throw new FileNotFoundException(); + * } + * } + * </pre> * * @since 3.0 */ @@ -279,57 +265,34 @@ public class JavadocMethodCheck extends AbstractCheck { CommonUtil.createPattern("\\{\\s*@(inheritDoc)\\s*\\}"); /** Stack of maps for type params. */ - private final Deque<Map<String, AbstractClassInfo>> currentTypeParams = new ArrayDeque<>(); + private final Deque<Map<String, ClassInfo>> currentTypeParams = new ArrayDeque<>(); - /** Imports details. **/ + /** + * Imports details. + * @noinspection MismatchedQueryAndUpdateOfCollection + */ private final Set<String> imports = new HashSet<>(); - /** Full identifier for package of the method. **/ - private FullIdent packageFullIdent; - /** Name of current class. */ private String currentClassName; - /** {@code ClassResolver} instance for current tree. */ - private ClassResolver classResolver; - /** Specify the visibility scope where Javadoc comments are checked. */ private Scope scope = Scope.PRIVATE; /** Specify the visibility scope where Javadoc comments are not checked. */ private Scope excludeScope; - /** - * Control whether to allow documented exceptions that are not declared if - * they are a subclass of {@code java.lang.RuntimeException}. - */ - // -@cs[AbbreviationAsWordInName] We can not change it as, - // check's property is part of API (used in configurations). - private boolean allowUndeclaredRTE; - /** * Control whether to validate {@code throws} tags. */ private boolean validateThrows; - /** - * Control whether to allow documented exceptions that are subclass of one - * of declared exception. - */ - private boolean allowThrowsTagsForSubclasses; - /** * Control whether to ignore violations when a method has parameters but does * not have matching {@code param} tags in the javadoc. */ private boolean allowMissingParamTags; - /** - * Control whether to ignore violations when a method declares that it throws - * exceptions but does not have matching {@code throws} tags in the javadoc. - */ - private boolean allowMissingThrowsTags; - /** * Control whether to ignore violations when a method returns non-void type * and does not have a {@code return} tag in the javadoc. @@ -375,28 +338,6 @@ public void setExcludeScope(Scope excludeScope) { this.excludeScope = excludeScope; } - /** - * Setter to control whether to allow documented exceptions that are not declared if - * they are a subclass of {@code java.lang.RuntimeException}. - * - * @param flag a {@code Boolean} value - */ - // -@cs[AbbreviationAsWordInName] We can not change it as, - // check's property is part of API (used in configurations). - public void setAllowUndeclaredRTE(boolean flag) { - allowUndeclaredRTE = flag; - } - - /** - * Setter to control whether to allow documented exceptions that are subclass of one - * of declared exception. - * - * @param flag a {@code Boolean} value - */ - public void setAllowThrowsTagsForSubclasses(boolean flag) { - allowThrowsTagsForSubclasses = flag; - } - /** * Setter to control whether to ignore violations when a method has parameters * but does not have matching {@code param} tags in the javadoc. @@ -407,16 +348,6 @@ public void setAllowMissingParamTags(boolean flag) { allowMissingParamTags = flag; } - /** - * Setter to control whether to ignore violations when a method declares that it throws - * exceptions but does not have matching {@code throws} tags in the javadoc. - * - * @param flag a {@code Boolean} value - */ - public void setAllowMissingThrowsTags(boolean flag) { - allowMissingThrowsTags = flag; - } - /** * Setter to control whether to ignore violations when a method returns non-void type * and does not have a {@code return} tag in the javadoc. @@ -427,42 +358,9 @@ public void setAllowMissingReturnTag(boolean flag) { allowMissingReturnTag = flag; } - /** - * Setter to control checkstyle's error handling when a class loading fails. - * This check may need to load exception classes mentioned in the {@code @throws} - * tag to check whether they are RuntimeExceptions. If set to {@code false} - * a classpath configuration problem is assumed and the TreeWalker stops operating - * on the class completely. If set to {@code true}(the default), checkstyle assumes - * a typo or refactoring problem in the javadoc and logs the problem in the normal - * checkstyle report (potentially masking a configuration error). - * - * @param logLoadErrors true if errors should be logged - * @deprecated No substitute. - */ - @Deprecated - public final void setLogLoadErrors(boolean logLoadErrors) { - // no code - } - - /** - * Setter to control whether to suppress violations when a class loading fails. - * When logLoadErrors is set to true, the TreeWalker completely processes - * a class and displays any problems with loading exceptions as checkstyle violations. - * When this property is set to true, the violations generated when logLoadErrors - * is set true are suppressed from being reported as violations in the checkstyle report. - * - * @param suppressLoadErrors true if errors shouldn't be shown - * @deprecated No substitute. - */ - @Deprecated - public final void setSuppressLoadErrors(boolean suppressLoadErrors) { - // no code - } - @Override public final int[] getRequiredTokens() { return new int[] { - TokenTypes.PACKAGE_DEF, TokenTypes.IMPORT, TokenTypes.CLASS_DEF, TokenTypes.INTERFACE_DEF, @@ -478,7 +376,6 @@ public int[] getDefaultTokens() { @Override public int[] getAcceptableTokens() { return new int[] { - TokenTypes.PACKAGE_DEF, TokenTypes.IMPORT, TokenTypes.CLASS_DEF, TokenTypes.ENUM_DEF, @@ -491,21 +388,16 @@ public int[] getAcceptableTokens() { @Override public void beginTree(DetailAST rootAST) { - packageFullIdent = FullIdent.createFullIdent(null); imports.clear(); // add java.lang.* since it's always imported imports.add("java.lang.*"); - classResolver = null; currentClassName = ""; currentTypeParams.clear(); } @Override public final void visitToken(DetailAST ast) { - if (ast.getType() == TokenTypes.PACKAGE_DEF) { - processPackage(ast); - } - else if (ast.getType() == TokenTypes.IMPORT) { + if (ast.getType() == TokenTypes.IMPORT) { processImport(ast); } else if (ast.getType() == TokenTypes.CLASS_DEF @@ -604,7 +496,9 @@ private void checkComment(DetailAST ast, TextBlock comment) { && !AnnotationUtil.containsAnnotation(ast, allowedAnnotations); checkParamTags(tags, ast, reportExpectedTags); - checkThrowsTags(tags, getThrows(ast), reportExpectedTags); + final List<ExceptionInfo> throwed = + combineExceptionInfo(getThrows(ast), getThrowed(ast)); + checkThrowsTags(tags, throwed, reportExpectedTags); if (CheckUtil.isNonVoidMethod(ast)) { checkReturnTag(tags, ast.getLineNo(), reportExpectedTags); } @@ -810,6 +704,75 @@ private List<ExceptionInfo> getThrows(DetailAST ast) { return returnValue; } + /** + * Get ExceptionInfo for all exceptions that throws in method code by 'throw new'. + * @param methodAst method DetailAST object where to find exceptions + * @return list of ExceptionInfo + */ + private List<ExceptionInfo> getThrowed(DetailAST methodAst) { + final List<ExceptionInfo> returnValue = new ArrayList<>(); + final DetailAST blockAst = methodAst.findFirstToken(TokenTypes.SLIST); + if (blockAst != null) { + final List<DetailAST> throwLiterals = findTokensInAstByType(blockAst, + TokenTypes.LITERAL_THROW); + for (DetailAST throwAst : throwLiterals) { + final DetailAST newAst = throwAst.getFirstChild().getFirstChild(); + if (newAst.getType() == TokenTypes.LITERAL_NEW) { + final FullIdent ident = FullIdent.createFullIdent(newAst.getFirstChild()); + final ExceptionInfo exceptionInfo = new ExceptionInfo( + createClassInfo(new Token(ident), currentClassName)); + returnValue.add(exceptionInfo); + } + } + } + return returnValue; + } + + /** + * Combine ExceptionInfo lists together by matching names. + * @param list1 list of ExceptionInfo + * @param list2 list of ExceptionInfo + * @return combined list of ExceptionInfo + */ + private static List<ExceptionInfo> combineExceptionInfo(List<ExceptionInfo> list1, + List<ExceptionInfo> list2) { + final List<ExceptionInfo> result = new ArrayList<>(list1); + for (ExceptionInfo expectionInfo : list2) { + if (result.stream().noneMatch(item -> isExceptionInfoSame(item, expectionInfo))) { + result.add(expectionInfo); + } + } + return result; + } + + /** + * Finds node of specified type among root children, siblings, siblings children + * on any deep level. + * @param root DetailAST + * @param astType value of TokenType + * @return {@link Optional} of {@link DetailAST} node which matches the predicate. + */ + public static List<DetailAST> findTokensInAstByType(DetailAST root, int astType) { + final List<DetailAST> result = new ArrayList<>(); + DetailAST curNode = root; + while (curNode != null) { + DetailAST toVisit = curNode.getFirstChild(); + while (curNode != null && toVisit == null) { + toVisit = curNode.getNextSibling(); + curNode = curNode.getParent(); + if (curNode == root) { + toVisit = null; + break; + } + } + curNode = toVisit; + if (curNode != null && curNode.getType() == astType) { + result.add(curNode); + } + } + return result; + } + /** * Checks a set of tags for matching parameters. * @@ -970,31 +933,15 @@ private void checkThrowsTags(List<JavadocTag> tags, tagIt.remove(); // Loop looking for matching throw - final String documentedEx = tag.getFirstArg(); final Token token = new Token(tag.getFirstArg(), tag.getLineNo(), tag .getColumnNo()); - final AbstractClassInfo documentedClassInfo = createClassInfo(token, + final ClassInfo documentedClassInfo = createClassInfo(token, currentClassName); - final boolean found = foundThrows.contains(documentedEx) - || isInThrows(throwsList, documentedClassInfo, foundThrows); - - // Handle extra JavadocTag. - if (!found) { - boolean reqd = true; - if (allowUndeclaredRTE) { - reqd = !isUnchecked(documentedClassInfo.getClazz()); - } - - if (reqd && validateThrows) { - log(tag.getLineNo(), tag.getColumnNo(), - MSG_UNUSED_TAG, - JavadocTagInfo.THROWS.getText(), tag.getFirstArg()); - } - } + processThrows(throwsList, documentedClassInfo, foundThrows); } // Now dump out all throws without tags :- unless // the user has chosen to suppress these problems - if (!allowMissingThrowsTags && reportExpectedTags) { + if (validateThrows && reportExpectedTags) { throwsList.stream().filter(exceptionInfo -> !exceptionInfo.isFound()) .forEach(exceptionInfo -> { final Token token = exceptionInfo.getName(); @@ -1011,128 +958,60 @@ private void checkThrowsTags(List<JavadocTag> tags, * @param throwsList list of throws * @param documentedClassInfo documented exception class info * @param foundThrows previously found throws - * @return true if documented exception is in throws. */ - private boolean isInThrows(List<ExceptionInfo> throwsList, - AbstractClassInfo documentedClassInfo, Set<String> foundThrows) { - boolean found = false; + private static void processThrows(List<ExceptionInfo> throwsList, + ClassInfo documentedClassInfo, Set<String> foundThrows) { ExceptionInfo foundException = null; // First look for matches on the exception name for (ExceptionInfo exceptionInfo : throwsList) { - if (exceptionInfo.getName().getText().equals( + if (isClassNamesSame(exceptionInfo.getName().getText(), documentedClassInfo.getName().getText())) { - found = true; foundException = exceptionInfo; break; } } - // Now match on the exception type - final ListIterator<ExceptionInfo> exceptionInfoIt = throwsList.listIterator(); - while (!found && exceptionInfoIt.hasNext()) { - final ExceptionInfo exceptionInfo = exceptionInfoIt.next(); - - if (documentedClassInfo.getClazz() == exceptionInfo.getClazz()) { - found = true; - foundException = exceptionInfo; - } - else if (allowThrowsTagsForSubclasses) { - found = isSubclass(documentedClassInfo.getClazz(), exceptionInfo.getClazz()); - } - } - if (foundException != null) { foundException.setFound(); foundThrows.add(documentedClassInfo.getName().getText()); } - - return found; - } - - /** - * Is exception is unchecked (subclass of {@code RuntimeException} - * or {@code Error}. - * - * @param exception {@code Class} of exception to check - * @return true if exception is unchecked - * false if exception is checked - */ - private static boolean isUnchecked(Class<?> exception) { - return isSubclass(exception, RuntimeException.class) - || isSubclass(exception, Error.class); - } - - /** - * Checks if one class is subclass of another. - * - * @param child {@code Class} of class - * which should be child - * @param parent {@code Class} of class - * which should be parent - * @return true if aChild is subclass of aParent - * false otherwise - */ - private static boolean isSubclass(Class<?> child, Class<?> parent) { - return parent != null && child != null - && parent.isAssignableFrom(child); } /** - * Returns the current tree's ClassResolver. - * @return {@code ClassResolver} for current tree. + * Check that ExceptionInfo objects are same by name. + * @param info1 ExceptionInfo object + * @param info2 ExceptionInfo object + * @return true is ExceptionInfo object have the same name */ - private ClassResolver getClassResolver() { - if (classResolver == null) { - classResolver = - new ClassResolver(getClass().getClassLoader(), - packageFullIdent.getText(), - imports); - } - return classResolver; + private static boolean isExceptionInfoSame(ExceptionInfo info1, ExceptionInfo info2) { + return isClassNamesSame(info1.getName().getText(), + info2.getName().getText()); } /** - * Attempts to resolve the Class for a specified name. - * @param resolvableClassName name of the class to resolve - * @param className name of surrounding class. - * @return the resolved class or {@code null} - * if unable to resolve the class. - * @noinspection WeakerAccess + * Check that class names are same by short name of class. If some class name is fully + * qualified it is cut to short name. + * @param class1 class name + * @param class2 class name + * @return true is ExceptionInfo object have the same name */ - // -@cs[ForbidWildcardAsReturnType] The class is deprecated and will be removed soon. - private Class<?> resolveClass(String resolvableClassName, - String className) { - Class<?> clazz; - try { - clazz = getClassResolver().resolve(resolvableClassName, className); + private static boolean isClassNamesSame(String class1, String class2) { + boolean result = false; + if (class1.equals(class2)) { + result = true; } - // -@cs[IllegalCatch] Exception type is not predictable. - catch (final Exception ignored) { - clazz = null; + else { + final String separator = "."; + if (class1.contains(separator) || class2.contains(separator)) { + final String class1ShortName = class1 + .substring(class1.lastIndexOf('.') + 1); + final String class2ShortName = class2 + .substring(class2.lastIndexOf('.') + 1); + result = class1ShortName.equals(class2ShortName); + } } - return clazz; - } - - /** - * Tries to load class. Logs error if unable. - * @param ident name of class which we try to load. - * @param className name of surrounding class. - * @return {@code Class} for a ident. - * @noinspection WeakerAccess, MethodOnlyUsedFromInnerClass - */ - // -@cs[ForbidWildcardAsReturnType] The class is deprecated and will be removed soon. - private Class<?> tryLoadClass(Token ident, String className) { - return resolveClass(ident.getText(), className); - } - - /** - * Collects the details of a package. - * @param ast node containing the package details - */ - private void processPackage(DetailAST ast) { - final DetailAST nameAST = ast.getLastChild().getPreviousSibling(); - packageFullIdent = FullIdent.createFullIdent(nameAST); + return result; } /** @@ -1152,7 +1031,7 @@ private void processTypeParams(DetailAST ast) { final DetailAST params = ast.findFirstToken(TokenTypes.TYPE_PARAMETERS); - final Map<String, AbstractClassInfo> paramsMap = new HashMap<>(); + final Map<String, ClassInfo> paramsMap = new HashMap<>(); currentTypeParams.push(paramsMap); if (params != null) { @@ -1165,7 +1044,7 @@ private void processTypeParams(DetailAST ast) { if (bounds != null) { final FullIdent name = FullIdent.createFullIdentBelow(bounds); - final AbstractClassInfo classInfo = + final ClassInfo classInfo = createClassInfo(new Token(name), currentClassName); final String alias = child.findFirstToken(TokenTypes.IDENT).getText(); @@ -1197,10 +1076,10 @@ private void processClass(DetailAST ast) { * @param surroundingClass name of surrounding class. * @return class info for given name. */ - private AbstractClassInfo createClassInfo(final Token name, - final String surroundingClass) { - final AbstractClassInfo result; - final AbstractClassInfo classInfo = findClassAlias(name.getText()); + private ClassInfo createClassInfo(final Token name, + final String surroundingClass) { + final ClassInfo result; + final ClassInfo classInfo = findClassAlias(name.getText()); if (classInfo == null) { result = new RegularClass(name, surroundingClass, this); } @@ -1216,12 +1095,12 @@ private AbstractClassInfo createClassInfo(final Token name, * @return ClassInfo for alias if it exists, null otherwise * @noinspection WeakerAccess */ - private AbstractClassInfo findClassAlias(final String name) { - AbstractClassInfo classInfo = null; - final Iterator<Map<String, AbstractClassInfo>> iterator = currentTypeParams + private ClassInfo findClassAlias(final String name) { + ClassInfo classInfo = null; + final Iterator<Map<String, ClassInfo>> iterator = currentTypeParams .descendingIterator(); while (iterator.hasNext()) { - final Map<String, AbstractClassInfo> paramMap = iterator.next(); + final Map<String, ClassInfo> paramMap = iterator.next(); classInfo = paramMap.get(name); if (classInfo != null) { break; @@ -1233,7 +1112,7 @@ private AbstractClassInfo findClassAlias(final String name) { /** * Contains class's {@code Token}. */ - private abstract static class AbstractClassInfo { + private static class ClassInfo { /** {@code FullIdent} associated with this class. */ private final Token name; @@ -1241,8 +1120,9 @@ private abstract static class AbstractClassInfo { /** * Creates new instance of class information object. * @param className token which represents class name. + * @throws IllegalArgumentException when className is nulls */ - protected AbstractClassInfo(final Token className) { + protected ClassInfo(final Token className) { if (className == null) { throw new IllegalArgumentException( "ClassInfo's name should be non-null"); @@ -1250,13 +1130,6 @@ protected AbstractClassInfo(final Token className) { name = className; } - /** - * Returns class associated with that object. - * @return {@code Class} associated with an object. - */ - // -@cs[ForbidWildcardAsReturnType] The class is deprecated and will be removed soon. - public abstract Class<?> getClazz(); - /** * Gets class name. * @return class name @@ -1268,16 +1141,12 @@ public final Token getName() { } /** Represents regular classes/enums. */ - private static final class RegularClass extends AbstractClassInfo { + private static final class RegularClass extends ClassInfo { /** Name of surrounding class. */ private final String surroundingClass; /** The check we use to resolve classes. */ private final JavadocMethodCheck check; - /** Is class loadable. */ - private boolean loadable = true; - /** {@code Class} object of this class if it's loadable. */ - private Class<?> classObj; /** * Creates new instance of of class information object. @@ -1293,56 +1162,32 @@ private static final class RegularClass extends AbstractClassInfo { this.check = check; } - @Override - public Class<?> getClazz() { - if (loadable && classObj == null) { - setClazz(check.tryLoadClass(getName(), surroundingClass)); - } - return classObj; - } - - /** - * Associates {@code Class} with an object. - * @param clazz {@code Class} to associate with. - */ - private void setClazz(Class<?> clazz) { - classObj = clazz; - loadable = clazz != null; - } - @Override public String toString() { return "RegularClass[name=" + getName() + ", in class='" + surroundingClass + '\'' + ", check=" + check.hashCode() - + ", loadable=" + loadable - + ", class=" + classObj + ']'; } } /** Represents type param which is "alias" for real type. */ - private static class ClassAlias extends AbstractClassInfo { + private static class ClassAlias extends ClassInfo { /** Class information associated with the alias. */ - private final AbstractClassInfo classInfo; + private final ClassInfo classInfo; /** * Creates new instance of the class. * @param name token which represents name of class alias. * @param classInfo class information associated with the alias. */ - /* package */ ClassAlias(final Token name, AbstractClassInfo classInfo) { + /* package */ ClassAlias(final Token name, ClassInfo classInfo) { super(name); this.classInfo = classInfo; } - @Override - public final Class<?> getClazz() { - return classInfo.getClazz(); - } - @Override public String toString() { return "ClassAlias[alias " + getName() + " for " + classInfo.getName() + "]"; @@ -1420,7 +1265,7 @@ public String toString() { private static class ExceptionInfo { /** Class information associated with this exception. */ - private final AbstractClassInfo classInfo; + private final ClassInfo classInfo; /** Does the exception have throws tag associated with. */ private boolean found; @@ -1429,7 +1274,7 @@ private static class ExceptionInfo { * * @param classInfo class info */ - /* package */ ExceptionInfo(AbstractClassInfo classInfo) { + /* package */ ExceptionInfo(ClassInfo classInfo) { this.classInfo = classInfo; } @@ -1454,14 +1299,6 @@ private Token getName() { return classInfo.getName(); } - /** - * Gets exception class. - * @return class for this exception - */ - private Class<?> getClazz() { - return classInfo.getClazz(); - } - } }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/ClassResolverTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/ClassResolverTest.java deleted file mode 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/ClassResolverTest.java +++ /dev/null @@ -1,114 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2019 the original author or authors. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -//////////////////////////////////////////////////////////////////////////////// - -package com.puppycrawl.tools.checkstyle.checks.javadoc; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.fail; - -import java.util.HashSet; -import java.util.Set; - -import org.junit.jupiter.api.Test; - -public class ClassResolverTest { - - @Test - public void testResolveInPackage() throws ClassNotFoundException { - final Set<String> imports = new HashSet<>(); - final ClassResolver classResolver = new ClassResolver( - Thread.currentThread().getContextClassLoader(), "java.util", imports); - assertNotNull(classResolver.resolve("List", ""), "Class should be resolved"); - try { - classResolver.resolve("NoSuchClass", ""); - fail("ClassNotFoundException is expected"); - } - catch (ClassNotFoundException ex) { - // exception is expected - assertEquals("NoSuchClass", ex.getMessage(), "Invalid exception message"); - } - } - - @Test - public void testResolveMatchingExplicitImport() throws ClassNotFoundException { - final Set<String> imports = new HashSet<>(); - imports.add("java.text.ChoiceFormat"); - imports.add("no.such.package.ChoiceFormat"); - final ClassResolver classResolver = new ClassResolver( - Thread.currentThread().getContextClassLoader(), null, imports); - assertNotNull(classResolver.resolve("ChoiceFormat", ""), "Class should be resolved"); - } - - @Test - public void testResolveByStarImports() throws ClassNotFoundException { - final Set<String> imports = new HashSet<>(); - imports.add("no.such.package.*"); - final ClassResolver classResolver = new ClassResolver( - Thread.currentThread().getContextClassLoader(), null, imports); - assertNotNull(classResolver.resolve("StringBuffer", ""), "Class should be resolved"); - } - - @Test - public void testExistedImportCantBeResolved() { - final Set<String> imports = new HashSet<>(); - imports.add("java.applet.someClass"); - final ClassResolver classResolver = new ClassResolver( - Thread.currentThread().getContextClassLoader(), - "", imports); - - try { - classResolver.resolve("someClass", ""); - fail("ClassNotFoundException is expected"); - } - catch (ClassNotFoundException ex) { - // exception is expected - assertEquals("someClass", ex.getMessage(), "Invalid exception message"); - } - } - - @Test - public void testResolveInnerClass() throws Exception { - final Set<String> imports = new HashSet<>(); - final ClassResolver classResolver = new ClassResolver( - Thread.currentThread().getContextClassLoader(), - "java.util", imports); - - final Class<?> entry = classResolver.resolve("Entry", "Map"); - assertEquals("java.util.Map$Entry", entry.getName(), "Invalid resolve result"); - } - - @Test - public void testResolveInnerClassWithEmptyPackage() { - final Set<String> imports = new HashSet<>(); - final ClassResolver classResolver = new ClassResolver( - Thread.currentThread().getContextClassLoader(), - "", imports); - - try { - classResolver.resolve("Entry", "Map"); - fail("ClassNotFoundException is expected"); - } - catch (ClassNotFoundException ex) { - // exception is expected - assertEquals("Entry", ex.getMessage(), "Invalid exception message"); - } - } - -} diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java @@ -27,8 +27,6 @@ import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.MSG_UNUSED_TAG_GENERAL; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -57,7 +55,6 @@ public void testGetAcceptableTokens() { final int[] actual = javadocMethodCheck.getAcceptableTokens(); final int[] expected = { - TokenTypes.PACKAGE_DEF, TokenTypes.IMPORT, TokenTypes.CLASS_DEF, TokenTypes.ENUM_DEF, @@ -70,14 +67,6 @@ public void testGetAcceptableTokens() { assertArrayEquals(expected, actual, "Default acceptable tokens are invalid"); } - @Test - public void testLogLoadErrors() throws Exception { - final DefaultConfiguration config = createModuleConfig(JavadocMethodCheck.class); - config.addAttribute("logLoadErrors", "true"); - config.addAttribute("allowUndeclaredRTE", "true"); - verify(config, getPath("InputJavadocMethodLoadErrors.java"), CommonUtil.EMPTY_STRING_ARRAY); - } - @Test public void extendAnnotationTest() throws Exception { final DefaultConfiguration config = createModuleConfig(JavadocMethodCheck.class); @@ -94,6 +83,21 @@ public void allowedAnnotationsTest() throws Exception { verify(config, getPath("InputJavadocMethodAllowedAnnotations.java"), expected); } + @Test + public void testExtraThrows() throws Exception { + final DefaultConfiguration config = createModuleConfig(JavadocMethodCheck.class); + config.addAttribute("validateThrows", "true"); + final String[] expected = { + "41:56: " + getCheckMessage(MSG_EXPECTED_TAG, "@throws", "IllegalStateException"), + "56:23: " + getCheckMessage(MSG_EXPECTED_TAG, "@throws", "IllegalArgumentException"), + "68:23: " + getCheckMessage(MSG_EXPECTED_TAG, "@throws", "IllegalArgumentException"), + "80:23: " + getCheckMessage(MSG_EXPECTED_TAG, "@throws", + "java.lang.IllegalArgumentException"), + "119:23: " + getCheckMessage(MSG_EXPECTED_TAG, "@throws", "FileNotFoundException"), + }; + verify(config, getPath("InputJavadocMethodExtraThrows.java"), expected); + } + @Test public void testTags() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(JavadocMethodCheck.class); @@ -104,7 +108,6 @@ public void testTags() throws Exception { "33: " + getCheckMessage(MSG_RETURN_EXPECTED), "40:16: " + getCheckMessage(MSG_EXPECTED_TAG, "@throws", "Exception"), "49:16: " + getCheckMessage(MSG_EXPECTED_TAG, "@throws", "Exception"), - "53:9: " + getCheckMessage(MSG_UNUSED_TAG, "@throws", "WrongException"), "55:16: " + getCheckMessage(MSG_EXPECTED_TAG, "@throws", "Exception"), "55:27: " + getCheckMessage(MSG_EXPECTED_TAG, "@throws", "NullPointerException"), "60:22: " + getCheckMessage(MSG_EXPECTED_TAG, "@param", "aOne"), @@ -115,10 +118,6 @@ public void testTags() throws Exception { "78:8: " + getCheckMessage(MSG_UNUSED_TAG, "@param", "Unneeded"), "79: " + getCheckMessage(MSG_UNUSED_TAG_GENERAL), "87:8: " + getCheckMessage(MSG_DUPLICATE_TAG, "@return"), - "178:8: " + getCheckMessage(MSG_UNUSED_TAG, "@throws", "ThreadDeath"), - "179:8: " + getCheckMessage(MSG_UNUSED_TAG, "@throws", "ArrayStoreException"), - "236:8: " + getCheckMessage(MSG_UNUSED_TAG, "@throws", "java.io.FileNotFoundException"), - "254:8: " + getCheckMessage(MSG_UNUSED_TAG, "@throws", "java.io.FileNotFoundException"), "256:28: " + getCheckMessage(MSG_EXPECTED_TAG, "@throws", "IOException"), "262:8: " + getCheckMessage(MSG_UNUSED_TAG, "@param", "aParam"), "305: " + getCheckMessage(MSG_RETURN_EXPECTED), @@ -133,7 +132,6 @@ public void testTags() throws Exception { @Test public void testTagsWithResolver() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(JavadocMethodCheck.class); - checkConfig.addAttribute("allowUndeclaredRTE", "true"); checkConfig.addAttribute("validateThrows", "true"); final String[] expected = { "18:9: " + getCheckMessage(MSG_UNUSED_TAG, "@param", "unused"), @@ -151,8 +149,6 @@ public void testTagsWithResolver() throws Exception { "78:8: " + getCheckMessage(MSG_UNUSED_TAG, "@param", "Unneeded"), "79: " + getCheckMessage(MSG_UNUSED_TAG_GENERAL), "87:8: " + getCheckMessage(MSG_DUPLICATE_TAG, "@return"), - "236:8: " + getCheckMessage(MSG_UNUSED_TAG, "@throws", "java.io.FileNotFoundException"), - "254:8: " + getCheckMessage(MSG_UNUSED_TAG, "@throws", "java.io.FileNotFoundException"), "256:28: " + getCheckMessage(MSG_EXPECTED_TAG, "@throws", "IOException"), "262:8: " + getCheckMessage(MSG_UNUSED_TAG, "@param", "aParam"), "305: " + getCheckMessage(MSG_RETURN_EXPECTED), @@ -216,7 +212,6 @@ public void testScopeAnonInnerAnonInner() throws Exception { @Test public void testScopeAnonInnerWithResolver() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(JavadocMethodCheck.class); - checkConfig.addAttribute("allowUndeclaredRTE", "true"); final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; verify(checkConfig, getPath("InputJavadocMethodScopeAnonInner.java"), expected); } @@ -224,7 +219,6 @@ public void testScopeAnonInnerWithResolver() throws Exception { @Test public void testTagsWithSubclassesAllowed() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(JavadocMethodCheck.class); - checkConfig.addAttribute("allowThrowsTagsForSubclasses", "true"); checkConfig.addAttribute("validateThrows", "true"); final String[] expected = { "18:9: " + getCheckMessage(MSG_UNUSED_TAG, "@param", "unused"), @@ -242,8 +236,6 @@ public void testTagsWithSubclassesAllowed() throws Exception { "78:8: " + getCheckMessage(MSG_UNUSED_TAG, "@param", "Unneeded"), "79: " + getCheckMessage(MSG_UNUSED_TAG_GENERAL), "87:8: " + getCheckMessage(MSG_DUPLICATE_TAG, "@return"), - "178:8: " + getCheckMessage(MSG_UNUSED_TAG, "@throws", "ThreadDeath"), - "179:8: " + getCheckMessage(MSG_UNUSED_TAG, "@throws", "ArrayStoreException"), "256:28: " + getCheckMessage(MSG_EXPECTED_TAG, "@throws", "IOException"), "262:8: " + getCheckMessage(MSG_UNUSED_TAG, "@param", "aParam"), "305: " + getCheckMessage(MSG_RETURN_EXPECTED), @@ -294,7 +286,6 @@ public void testExcludeScope() throws Exception { public void testAllowMissingJavadocTags() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(JavadocMethodCheck.class); checkConfig.addAttribute("allowMissingParamTags", "true"); - checkConfig.addAttribute("allowMissingThrowsTags", "true"); checkConfig.addAttribute("allowMissingReturnTag", "true"); final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; verify(checkConfig, getPath("InputJavadocMethodMissingJavadocTags.java"), expected); @@ -306,7 +297,6 @@ public void testDoAllowMissingJavadocTagsByDefault() throws Exception { final String[] expected = { "10: " + getCheckMessage(MSG_RETURN_EXPECTED), "20:26: " + getCheckMessage(MSG_EXPECTED_TAG, "@param", "number"), - "30:42: " + getCheckMessage(MSG_EXPECTED_TAG, "@throws", "ThreadDeath"), "51: " + getCheckMessage(MSG_RETURN_EXPECTED), "61: " + getCheckMessage(MSG_RETURN_EXPECTED), "72: " + getCheckMessage(MSG_RETURN_EXPECTED), @@ -374,8 +364,6 @@ public void test11684082() throws Exception { @Test public void test11684083() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(JavadocMethodCheck.class); - checkConfig.addAttribute("allowThrowsTagsForSubclasses", "true"); - checkConfig.addAttribute("allowUndeclaredRTE", "true"); final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; verify(checkConfig, getPath("InputJavadocMethod_03.java"), expected); } @@ -383,13 +371,10 @@ public void test11684083() throws Exception { @Test public void testGenerics1() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(JavadocMethodCheck.class); - checkConfig.addAttribute("allowThrowsTagsForSubclasses", "true"); - checkConfig.addAttribute("allowUndeclaredRTE", "true"); checkConfig.addAttribute("validateThrows", "true"); final String[] expected = { "17:34: " + getCheckMessage(MSG_EXPECTED_TAG, "@throws", "RE"), "33:13: " + getCheckMessage(MSG_EXPECTED_TAG, "@param", "<NPE>"), - "40:12: " + getCheckMessage(MSG_UNUSED_TAG, "@throws", "E"), "43:38: " + getCheckMessage(MSG_EXPECTED_TAG, "@throws", "RuntimeException"), "44:13: " + getCheckMessage(MSG_EXPECTED_TAG, "@throws", "java.lang.RuntimeException"), }; @@ -399,12 +384,10 @@ public void testGenerics1() throws Exception { @Test public void testGenerics2() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(JavadocMethodCheck.class); - checkConfig.addAttribute("allowThrowsTagsForSubclasses", "true"); checkConfig.addAttribute("validateThrows", "true"); final String[] expected = { "17:34: " + getCheckMessage(MSG_EXPECTED_TAG, "@throws", "RE"), "33:13: " + getCheckMessage(MSG_EXPECTED_TAG, "@param", "<NPE>"), - "40:12: " + getCheckMessage(MSG_UNUSED_TAG, "@throws", "E"), "43:38: " + getCheckMessage(MSG_EXPECTED_TAG, "@throws", "RuntimeException"), "44:13: " + getCheckMessage(MSG_EXPECTED_TAG, "@throws", "java.lang.RuntimeException"), }; @@ -416,10 +399,8 @@ public void testGenerics3() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(JavadocMethodCheck.class); checkConfig.addAttribute("validateThrows", "true"); final String[] expected = { - "8:8: " + getCheckMessage(MSG_UNUSED_TAG, "@throws", "RE"), "17:34: " + getCheckMessage(MSG_EXPECTED_TAG, "@throws", "RE"), "33:13: " + getCheckMessage(MSG_EXPECTED_TAG, "@param", "<NPE>"), - "40:12: " + getCheckMessage(MSG_UNUSED_TAG, "@throws", "E"), "43:38: " + getCheckMessage(MSG_EXPECTED_TAG, "@throws", "RuntimeException"), "44:13: " + getCheckMessage(MSG_EXPECTED_TAG, "@throws", "java.lang.RuntimeException"), }; @@ -429,8 +410,6 @@ public void testGenerics3() throws Exception { @Test public void test1379666() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(JavadocMethodCheck.class); - checkConfig.addAttribute("allowThrowsTagsForSubclasses", "true"); - checkConfig.addAttribute("allowUndeclaredRTE", "true"); final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; verify(checkConfig, getPath("InputJavadocMethod_1379666.java"), expected); } @@ -495,20 +474,9 @@ public void testConstructor() throws Exception { verify(checkConfig, getPath("InputJavadocMethodConstructor.java"), expected); } - @Test - public void testIsSubclassWithNulls() throws Exception { - final JavadocMethodCheck check = new JavadocMethodCheck(); - final Method method = check.getClass() - .getDeclaredMethod("isSubclass", Class.class, Class.class); - method.setAccessible(true); - assertFalse((boolean) method.invoke(check, null, null), - "Should return false if at least one of the params is null"); - } - @Test public void testGetRequiredTokens() { final int[] expected = { - TokenTypes.PACKAGE_DEF, TokenTypes.IMPORT, TokenTypes.CLASS_DEF, TokenTypes.INTERFACE_DEF, @@ -566,18 +534,9 @@ public void testClassRegularClass() throws Exception { toString.setAccessible(true); final String result = (String) toString.invoke(regularClass); final String expected = "RegularClass[name=Token[blablabla(1x1)], in class='sur', check=" - + methodCheck.hashCode() + "," + " loadable=true, class=null]"; + + methodCheck.hashCode() + "]"; assertEquals(expected, result, "Invalid toString result"); - - final Method setClazz = regularClass.getClass().getDeclaredMethod("setClazz", Class.class); - setClazz.setAccessible(true); - final Class<?> arg = null; - setClazz.invoke(regularClass, arg); - - final Method getClazz = regularClass.getClass().getDeclaredMethod("getClazz"); - getClazz.setAccessible(true); - assertNull(getClazz.invoke(regularClass), "Expected null"); } @Test @@ -603,7 +562,7 @@ public void testClassAliasToString() throws Exception { "com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck$ClassAlias"); final Class<?> abstractTypeInfoType = Class .forName("com.puppycrawl.tools.checkstyle.checks.javadoc." - + "JavadocMethodCheck$AbstractClassInfo"); + + "JavadocMethodCheck$ClassInfo"); final Constructor<?> classAliasConstructor = classAliasType .getDeclaredConstructor(tokenType, abstractTypeInfoType); @@ -620,19 +579,8 @@ public void testClassAliasToString() throws Exception { @Test public void testWithoutLogErrors() throws Exception { final DefaultConfiguration config = createModuleConfig(JavadocMethodCheck.class); - config.addAttribute("allowUndeclaredRTE", "true"); verify(config, getPath("InputJavadocMethodLoadErrors.java"), CommonUtil.EMPTY_STRING_ARRAY); } - @Test - public void testWithSuppressLoadErrors() throws Exception { - final DefaultConfiguration checkConfig = createModuleConfig(JavadocMethodCheck.class); - checkConfig.addAttribute("suppressLoadErrors", "true"); - checkConfig.addAttribute("allowUndeclaredRTE", "true"); - final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; - - verify(checkConfig, getPath("InputJavadocMethodLoadErrors.java"), expected); - } - } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/powermock/ClassResolverPowerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/powermock/ClassResolverPowerTest.java deleted file mode 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/powermock/ClassResolverPowerTest.java +++ /dev/null @@ -1,91 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// checkstyle: Checks Java source code for adherence to a set of rules. -// Copyright (C) 2001-2019 the original author or authors. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -//////////////////////////////////////////////////////////////////////////////// - -package com.puppycrawl.tools.checkstyle.internal.powermock; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.ArgumentMatchers.any; - -import java.util.HashSet; -import java.util.Set; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; - -import com.puppycrawl.tools.checkstyle.checks.javadoc.ClassResolver; -import com.puppycrawl.tools.checkstyle.checks.javadoc.ClassResolverTest; - -@RunWith(PowerMockRunner.class) -@PrepareForTest({ ClassResolver.class, ClassResolverTest.class }) -public class ClassResolverPowerTest { - - @Test - public void testResolveQualifiedNameFails() throws Exception { - final Set<String> imports = new HashSet<>(); - imports.add("java.applet.someClass"); - - final ClassResolver classResolver = PowerMockito.spy(new ClassResolver(Thread - .currentThread().getContextClassLoader(), "", imports)); - - PowerMockito.doThrow(new ClassNotFoundException("expected exception")) - .when(classResolver, "safeLoad", any()); - PowerMockito.doReturn(true).when(classResolver, "isLoadable", any()); - - try { - classResolver.resolve("someClass", ""); - fail("IllegalStateException is expected"); - } - catch (IllegalStateException ex) { - // exception is expected - final String expected = "expected exception"; - assertTrue("Invalid exception cause, should be: ClassNotFoundException", - ex.getCause() instanceof ClassNotFoundException); - assertTrue("Invalid exception message, should end with: " + expected, - ex.getMessage().endsWith(expected)); - } - } - - /** - * This test exists to prevent any possible regression and let of - * https://github.com/checkstyle/checkstyle/issues/1192 to be persistent - * event is not very obvious. - * - * @throws Exception when smth is not expected - */ - @Test - public void testIsLoadableWithNoClassDefFoundError() throws Exception { - final Set<String> imports = new HashSet<>(); - imports.add("java.applet.someClass"); - - final ClassResolver classResolver = PowerMockito.spy(new ClassResolver(Thread - .currentThread().getContextClassLoader(), "", imports)); - - PowerMockito.doThrow(new NoClassDefFoundError("expected exception")) - .when(classResolver, "safeLoad", any()); - - final boolean result = classResolver.isLoadable("someClass"); - assertFalse("result should be false", result); - } - -} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodExtraThrows.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodExtraThrows.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodExtraThrows.java @@ -0,0 +1,136 @@ +package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocmethod; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; + +public class InputJavadocMethodExtraThrows { + + /** + * Extra throws in javadoc it is ok. + * @param properties some value + * @throws IllegalArgumentException when argument is wrong // ok + * @throws NullPointerException indicates null was passed // ok + */ + public InputJavadocMethodExtraThrows(String properties) { + // here is NPE possible + if (properties.charAt(0) == 0) { + throw new IllegalArgumentException("cannot have char with code 0"); + } + } + + /** + * Extra throws in javadoc it is ok + * @param properties some value + * @throws java.lang.IllegalArgumentException when argument is wrong // ok + * @throws java.lang.NullPointerException indicates null was passed // ok + */ + public void doSomething(String properties) throws IllegalArgumentException { + // here is NPE possible + if (properties.charAt(0) == 0) { + throw new IllegalArgumentException("cannot have char with code 0"); + } + } + + /** + * declared exception in method signature is missed in javadoc // violation + * @param properties some value + * @throws java.lang.IllegalArgumentException when argument is wrong // ok + * @throws java.lang.NullPointerException indicates null was passed // ok + */ + public void doSomething2(String properties) throws IllegalStateException { + // here is NPE possible + if (properties.charAt(0) == 0) { + throw new IllegalArgumentException("cannot have char with code 0"); + } + } + + /** + * exception is explitly thrown in code missed in javadoc // violation + * @param properties some value + * @throws java.lang.IllegalStateException when argument is wrong // ok + */ + public void doSomething3(String properties) throws IllegalStateException { + // here is NPE possible + if (properties.charAt(0) == 0) { + throw new IllegalArgumentException("cannot have char with code 0"); + } + } + + /** + * exception is explitly thrown in code missed in javadoc // violation + * @param properties some value + * @throws java.lang.IllegalStateException when argument is wrong // ok + */ + public void doSomething4(String properties) { + // here is NPE possible + if (properties.charAt(0) == 0) { + throw new IllegalArgumentException("cannot have char with code 0"); + } + } + + /** + * exception is explitly thrown in code missed in javadoc // violation + * @param properties some value + * @throws java.lang.IllegalStateException when argument is wrong // ok + */ + public void doSomething5(String properties) { + // here is NPE possible + if (properties.charAt(0) == 0) { + throw new java.lang.IllegalArgumentException("cannot have char with code 0"); + } + } + + /** + * expicitly throwed is declared in javadoc // ok + * @param properties some value + * @throws IllegalArgumentException when argument is wrong // ok + */ + public void doSomething6(String properties) { + // here is NPE possible + if (properties.charAt(0) == 0) { + throw new java.lang.IllegalArgumentException("cannot have char with code 0"); + } + } + + /** + * expicitly throwed but throwed as variable, we do not catch this for now // ok + * @param properties some value + */ + public void doSomething7(String properties) { + // here is NPE possible + if (properties.charAt(0) == 0) { + IllegalArgumentException exception = + new IllegalArgumentException("cannot have char with code 0"); + throw exception; + } + } + + /** + * Actual exception thrown is child class of class that is declared in throws. + * It is limitation of checkstyle (as checkstyle does not know type hierarchy). + * Javadoc is valid not declaring {@link FileNotFoundException} + * BUT checkstyle can not distinguish relationship between exceptions. + * @param file some file + * @throws IOException if some problem + */ + public void doSomething8(File file) throws IOException { + if (file == null) { + throw new FileNotFoundException(); + } + } + + /** + * Exact throw type referencing in javadoc even first is parent of second type. + * It is a limitation of checkstyle (as checkstyle does not know type hierarchy). + * This javadoc is valid for checkstyle and for javadoc tool. + * @param file some file + * @throws IOException if some problem + * @throws FileNotFoundException if file is not found + */ + public void doSomething9(File file) throws IOException { + if (file == null) { + throw new FileNotFoundException(); + } + } +}
Remove properties related to class loading from JavadocMethod part of #7116 . We need to remove from Check any attempt to use classloader to validate source code. Checkstyle cannot make this reliably and it is whole tool limitation for now - https://checkstyle.org/writingchecks.html#Limitations **Migration Notes:** properties `allowMissingThrowsTags`, `allowUndeclaredRTE` and `allowThrowsTagsForSubclasses`, `logLoadErrors`, `suppressLoadErrors` should be just removed from configs. Behavior will change as there will be less violations in code, such properties did not work well so their removal should be ok, as there will be less false-positives. **Throws will not be validated by default !!** If you need to validate `@throws` please enable property `validateThrows` but please read documentation as there some limitations - https://checkstyle.org/config_javadoc.html#JavadocMethod . Old documentation is at https://checkstyle.sourceforge.io/version/8.27/config_javadoc.html#JavadocMethod
2019-10-13T14:15:24Z
8.27
checkstyle/checkstyle
7,172
checkstyle__checkstyle-7172
[ "7161" ]
44485ef5ce629ad13f6bcecd0cf0298bb0e26439
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java @@ -19,6 +19,7 @@ package com.puppycrawl.tools.checkstyle.checks.blocks; +import java.util.Arrays; import java.util.Locale; import com.puppycrawl.tools.checkstyle.DetailAstImpl; @@ -34,7 +35,7 @@ * Checks the placement of right curly braces (<code>'}'</code>) * for if-else, try-catch-finally blocks, while-loops, for-loops, * method definitions, class definitions, constructor definitions, - * instance, static initialization blocks and annotation definitions. + * instance, static initialization blocks, annotation definitions and enum definitions. * For right curly brace of expression blocks please follow issue * <a href="https://github.com/checkstyle/checkstyle/issues/5945">#5945</a>. * </p> @@ -143,6 +144,7 @@ public int[] getAcceptableTokens() { TokenTypes.STATIC_INIT, TokenTypes.INSTANCE_INIT, TokenTypes.ANNOTATION_DEF, + TokenTypes.ENUM_DEF, }; } @@ -337,6 +339,15 @@ private static boolean hasLineBreakBefore(DetailAST rightCurly) { */ private static final class Details { + /** + * Token types that identify tokens that will never have SLIST in their AST. + */ + private static final int[] TOKENS_WITH_NO_CHILD_SLIST = { + TokenTypes.CLASS_DEF, + TokenTypes.ENUM_DEF, + TokenTypes.ANNOTATION_DEF, + }; + /** Right curly. */ private final DetailAST rcurly; /** Left curly. */ @@ -455,7 +466,7 @@ private static Details getDetailsForIfElse(DetailAST ast) { /** * Collects validation details for CLASS_DEF, METHOD DEF, CTOR_DEF, STATIC_INIT, - * INSTANCE_INIT and ANNOTATION_DEF. + * INSTANCE_INIT, ANNOTATION_DEF and ENUM_DEF. * @param ast a {@code DetailAST} value * @return an object containing all details to make a validation */ @@ -463,7 +474,7 @@ private static Details getDetailsForOthers(DetailAST ast) { DetailAST rcurly = null; final DetailAST lcurly; final int tokenType = ast.getType(); - if (tokenType == TokenTypes.CLASS_DEF || tokenType == TokenTypes.ANNOTATION_DEF) { + if (isTokenWithNoChildSlist(tokenType)) { final DetailAST child = ast.getLastChild(); lcurly = child.getFirstChild(); rcurly = child.getLastChild(); @@ -478,6 +489,16 @@ private static Details getDetailsForOthers(DetailAST ast) { return new Details(lcurly, rcurly, getNextToken(ast), true); } + /** + * Tests whether the provided tokenType will never have a SLIST as child in its AST. + * Like CLASS_DEF, ANNOTATION_DEF etc. + * @param tokenType the tokenType to test against. + * @return weather provided tokenType is definition token. + */ + private static boolean isTokenWithNoChildSlist(int tokenType) { + return Arrays.stream(TOKENS_WITH_NO_CHILD_SLIST).anyMatch(token -> token == tokenType); + } + /** * Collects validation details for loops' tokens. * @param ast a {@code DetailAST} value
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/RightCurlyTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/RightCurlyTest.java --- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/RightCurlyTest.java +++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/RightCurlyTest.java @@ -81,15 +81,20 @@ public void testRightCurlySameAndLiteralDoDefault() throws Exception { @Test public void testRightCurlyAloneOther() throws Exception { final String[] expected = { + "72:5: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_ALONE, "}", 5), "97:5: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_ALONE, "}", 5), "97:6: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_ALONE, "}", 6), "108:5: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_ALONE, "}", 5), "108:6: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_ALONE, "}", 6), "122:5: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_ALONE, "}", 5), "122:6: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_ALONE, "}", 6), + "125:57: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_ALONE, "}", 57), "148:39: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_ALONE, "}", 39), "150:61: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_ALONE, "}", 61), "153:28: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_ALONE, "}", 28), + "163:16: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_ALONE, "}", 16), + "165:30: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_ALONE, "}", 30), + "168:16: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_ALONE, "}", 16), }; final Configuration checkConfig = getModuleConfig("RightCurly", "RightCurlyAlone"); diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputRightCurlyOtherAlone.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputRightCurlyOtherAlone.java --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputRightCurlyOtherAlone.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputRightCurlyOtherAlone.java @@ -69,7 +69,7 @@ public enum GreetingsEnum { HELLO, GOODBYE - }; //ok + }; //warn void method2() { @@ -122,7 +122,7 @@ public void fooInnerMethod () }} //warn class EnumContainerAlone { - private enum Suit { CLUBS, HEARTS, SPADES, DIAMONDS } // ok + private enum Suit { CLUBS, HEARTS, SPADES, DIAMONDS } // warn } class WithArraysAlone { @@ -159,3 +159,17 @@ class Interface { public @interface TestAnnotation4 { String someValue(); } //ok } + +enum TestEnum {} //warn + +enum TestEnum1 { SOME_VALUE; } //warn + +enum TestEnum2 { + SOME_VALUE;} //warn + +enum TestEnum3 { + SOME_VALUE; +} + +enum TestEnum4 { SOME_VALUE; +} diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheckTest.java @@ -67,12 +67,14 @@ public void testSame() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(RightCurlyCheck.class); checkConfig.addAttribute("option", RightCurlyOption.SAME.toString()); checkConfig.addAttribute("tokens", "LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, " - + "LITERAL_IF, LITERAL_ELSE, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO"); + + "LITERAL_IF, LITERAL_ELSE, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, " + + "ANNOTATION_DEF, ENUM_DEF"); final String[] expected = { "25:17: " + getCheckMessage(MSG_KEY_LINE_SAME, "}", 17), "28:17: " + getCheckMessage(MSG_KEY_LINE_SAME, "}", 17), "40:13: " + getCheckMessage(MSG_KEY_LINE_SAME, "}", 13), "44:13: " + getCheckMessage(MSG_KEY_LINE_SAME, "}", 13), + "86:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), "93:27: " + getCheckMessage(MSG_KEY_LINE_BREAK_BEFORE, "}", 27), "188:9: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 9), "189:53: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 53), @@ -93,7 +95,7 @@ public void testSameDoesNotComplainForNonMultilineConstructs() throws Exception final DefaultConfiguration checkConfig = createModuleConfig(RightCurlyCheck.class); checkConfig.addAttribute("option", RightCurlyOption.SAME.toString()); checkConfig.addAttribute("tokens", "LITERAL_DO, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT," - + "INSTANCE_INIT, CLASS_DEF, METHOD_DEF, CTOR_DEF, ANNOTATION_DEF"); + + "INSTANCE_INIT, CLASS_DEF, METHOD_DEF, CTOR_DEF, ANNOTATION_DEF, ENUM_DEF"); final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; verify(checkConfig, getPath("InputRightCurlySame.java"), expected); } @@ -123,8 +125,10 @@ public void testAlone() throws Exception { public void testNewLine() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(RightCurlyCheck.class); checkConfig.addAttribute("option", RightCurlyOption.ALONE.toString()); - checkConfig.addAttribute("tokens", "CLASS_DEF, METHOD_DEF, CTOR_DEF, ANNOTATION_DEF"); + checkConfig.addAttribute("tokens", "CLASS_DEF, METHOD_DEF, CTOR_DEF, " + + "ANNOTATION_DEF, ENUM_DEF"); final String[] expected = { + "86:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), "111:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), "111:6: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 6), "122:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), @@ -143,8 +147,10 @@ public void testNewLine() throws Exception { public void testShouldStartLine2() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(RightCurlyCheck.class); checkConfig.addAttribute("option", RightCurlyOption.ALONE_OR_SINGLELINE.toString()); - checkConfig.addAttribute("tokens", "CLASS_DEF, METHOD_DEF, ANNOTATION_DEF"); + checkConfig.addAttribute("tokens", "CLASS_DEF, METHOD_DEF, " + + "ANNOTATION_DEF, ENUM_DEF"); final String[] expected = { + "86:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), "111:6: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 6), "122:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), "122:6: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 6), @@ -183,7 +189,7 @@ public void testNullPointerException() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(RightCurlyCheck.class); checkConfig.addAttribute("option", RightCurlyOption.ALONE.toString()); checkConfig.addAttribute("tokens", "CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, " - + "LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT, ANNOTATION_DEF"); + + "LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF"); final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; verify(checkConfig, getPath("InputRightCurlyEmptyAbstractMethod.java"), expected); } @@ -194,7 +200,7 @@ public void testWithAnnotations() throws Exception { checkConfig.addAttribute("option", RightCurlyOption.ALONE.toString()); checkConfig.addAttribute("tokens", "LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, " + "LITERAL_IF, LITERAL_ELSE, CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, " - + "LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT, ANNOTATION_DEF"); + + "LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF"); final String[] expected = { "8:77: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 77), "11:65: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 65), @@ -276,7 +282,7 @@ public void testAloneOrSingleLine() throws Exception { checkConfig.addAttribute("option", RightCurlyOption.ALONE_OR_SINGLELINE.toString()); checkConfig.addAttribute("tokens", "LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, " + "LITERAL_IF, LITERAL_ELSE, CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, " - + "LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT, ANNOTATION_DEF"); + + "LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF"); final String[] expected = { "60:26: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 26), "74:42: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 42), @@ -460,7 +466,7 @@ public void testOptionAlone() throws Exception { checkConfig.addAttribute("option", RightCurlyOption.ALONE.toString()); checkConfig.addAttribute("tokens", "CLASS_DEF, METHOD_DEF, LITERAL_IF, LITERAL_ELSE, " + "LITERAL_DO, LITERAL_WHILE, LITERAL_FOR, STATIC_INIT, " - + "INSTANCE_INIT, ANNOTATION_DEF"); + + "INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF"); final String[] expected = { "7:15: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 15), "8:21: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 21), @@ -490,7 +496,7 @@ public void testOptionAloneOrSingleLine() throws Exception { checkConfig.addAttribute("option", RightCurlyOption.ALONE_OR_SINGLELINE.toString()); checkConfig.addAttribute("tokens", "CLASS_DEF, METHOD_DEF, LITERAL_IF, LITERAL_ELSE, " + "LITERAL_DO, LITERAL_WHILE, LITERAL_FOR, STATIC_INIT, " - + "INSTANCE_INIT, ANNOTATION_DEF"); + + "INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF"); final String[] expected = { "12:26: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 26), "21:37: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 37), @@ -508,7 +514,7 @@ public void testBlocksEndingWithSemiOptionSame() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(RightCurlyCheck.class); checkConfig.addAttribute("option", RightCurlyOption.SAME.toString()); checkConfig.addAttribute("tokens", "CLASS_DEF, METHOD_DEF, " - + "CTOR_DEF, ANNOTATION_DEF"); + + "CTOR_DEF, ANNOTATION_DEF, ENUM_DEF"); final String[] expected = { "14:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), "19:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), @@ -516,6 +522,9 @@ public void testBlocksEndingWithSemiOptionSame() throws Exception { "33:29: " + getCheckMessage(MSG_KEY_LINE_BREAK_BEFORE, "}", 29), "39:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), "42:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), + "49:20: " + getCheckMessage(MSG_KEY_LINE_BREAK_BEFORE, "}", 20), + "55:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), + "58:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), }; verify(checkConfig, getPath("InputRightCurlySameBlocksWithSemi.java"), expected); } @@ -525,7 +534,7 @@ public void testBlocksEndingWithSemiOptionAlone() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(RightCurlyCheck.class); checkConfig.addAttribute("option", RightCurlyOption.ALONE.toString()); checkConfig.addAttribute("tokens", "CLASS_DEF, METHOD_DEF, " - + "CTOR_DEF, ANNOTATION_DEF"); + + "CTOR_DEF, ANNOTATION_DEF, ENUM_DEF"); final String[] expected = { "11:31: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 31), "14:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), @@ -538,6 +547,11 @@ public void testBlocksEndingWithSemiOptionAlone() throws Exception { "39:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), "42:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), "44:61: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 61), + "46:19: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 19), + "49:20: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 20), + "51:34: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 34), + "55:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), + "58:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), }; verify(checkConfig, getPath("InputRightCurlyAloneBlocksWithSemi.java"), expected); } @@ -548,7 +562,7 @@ public void testBlocksEndingWithSemiOptionAloneOrSingleLine() throws Exception { checkConfig.addAttribute("option", RightCurlyOption.ALONE_OR_SINGLELINE.toString()); checkConfig.addAttribute("tokens", "CLASS_DEF, METHOD_DEF, " - + "CTOR_DEF, ANNOTATION_DEF"); + + "CTOR_DEF, ANNOTATION_DEF, ENUM_DEF"); final String[] expected = { "14:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), "19:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), @@ -556,9 +570,48 @@ public void testBlocksEndingWithSemiOptionAloneOrSingleLine() throws Exception { "33:29: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 29), "39:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), "42:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), + "49:20: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 20), + "55:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), + "58:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 5), }; verify(checkConfig, getPath("InputRightCurlyAloneOrSingleLineBlocksWithSemi.java"), expected); } + @Test + public void testNewTokensAlone() throws Exception { + final DefaultConfiguration checkConfig = createModuleConfig(RightCurlyCheck.class); + checkConfig.addAttribute("option", RightCurlyOption.ALONE.toString()); + checkConfig.addAttribute("tokens", "ENUM_DEF"); + final String[] expected = { + "11:19: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 19), + "14:20: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 20), + "16:34: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 34), + }; + verify(checkConfig, getPath("InputRightCurlyAloneNewTokens.java"), expected); + } + + @Test + public void testNewTokensAloneOrSingleLine() throws Exception { + final DefaultConfiguration checkConfig = createModuleConfig(RightCurlyCheck.class); + checkConfig.addAttribute("option", + RightCurlyOption.ALONE_OR_SINGLELINE.toString()); + checkConfig.addAttribute("tokens", "ENUM_DEF"); + final String[] expected = { + "14:20: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 20), + }; + verify(checkConfig, getPath("InputRightCurlyAloneOrSingleLineNewTokens.java"), expected); + } + + @Test + public void testNewTokensSame() throws Exception { + final DefaultConfiguration checkConfig = createModuleConfig(RightCurlyCheck.class); + checkConfig.addAttribute("option", RightCurlyOption.SAME.toString()); + checkConfig.addAttribute("tokens", "ENUM_DEF"); + final String[] expected = { + "14:20: " + getCheckMessage(MSG_KEY_LINE_BREAK_BEFORE, "}", 20), + }; + verify(checkConfig, getPath("InputRightCurlySameNewTokens.java"), expected); + } + } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyAloneBlocksWithSemi.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyAloneBlocksWithSemi.java --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyAloneBlocksWithSemi.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyAloneBlocksWithSemi.java @@ -1,7 +1,7 @@ /* * Config: * option = alone - * tokens = CLASS_DEF, METHOD_DEF, CTOR_DEF, ANNOTATION_DEF + * tokens = CLASS_DEF, METHOD_DEF, CTOR_DEF, ANNOTATION_DEF, ENUM_DEF */ package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly; @@ -43,4 +43,18 @@ public void testMethod11() { public @interface TestAnnotation9 { String someValue(); }; //violation + enum TestEnum{}; //violation + + enum TestEnum1{ + SOME_VALUE;}; //violation + + enum TestEnum2 { SOME_VALUE; }; //violation + + enum TestEnum3{ + SOME_VALUE; + }; //violation + + enum TestEnum4{ SOME_VALUE; + }; //violation + } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyAloneNewTokens.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyAloneNewTokens.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyAloneNewTokens.java @@ -0,0 +1,24 @@ +/* + * Config: + * option = alone + * tokens = ENUM_DEF + */ + +package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly; + +public class InputRightCurlyAloneNewTokens { + + enum TestEnum{} //violation + + enum TestEnum1{ + SOME_VALUE;} //violation + + enum TestEnum2 { SOME_VALUE; } //violation + + enum TestEnum3{ + SOME_VALUE; + } + + enum TestEnum4{ SOME_VALUE; + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyAloneOrSingleLineBlocksWithSemi.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyAloneOrSingleLineBlocksWithSemi.java --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyAloneOrSingleLineBlocksWithSemi.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyAloneOrSingleLineBlocksWithSemi.java @@ -1,7 +1,7 @@ /* * Config: * option = alone_or_singleline - * tokens = CLASS_DEF, METHOD_DEF, CTOR_DEF, ANNOTATION_DEF + * tokens = CLASS_DEF, METHOD_DEF, CTOR_DEF, ANNOTATION_DEF, ENUM_DEF */ package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly; @@ -42,4 +42,18 @@ public void testMethod11() { }; //violation public @interface TestAnnotation9 { String someValue(); }; + + enum TestEnum{}; + + enum TestEnum1{ + SOME_VALUE;}; //violation + + enum TestEnum2 { SOME_VALUE; }; + + enum TestEnum3{ + SOME_VALUE; + }; //violation + + enum TestEnum4{ SOME_VALUE; + }; //violation } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyAloneOrSingleLineNewTokens.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyAloneOrSingleLineNewTokens.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyAloneOrSingleLineNewTokens.java @@ -0,0 +1,24 @@ +/* + * Config: + * option = alone_or_singleline + * tokens = ENUM_DEF + */ + +package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly; + +public class InputRightCurlyAloneOrSingleLineNewTokens { + + enum TestEnum{} + + enum TestEnum1{ + SOME_VALUE;} //violation + + enum TestEnum2 { SOME_VALUE; } + + enum TestEnum3{ + SOME_VALUE; + } + + enum TestEnum4{ SOME_VALUE; + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeft.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeft.java --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeft.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeft.java @@ -83,7 +83,7 @@ public enum GreetingsEnum { HELLO, GOODBYE - }; + }; //violation void method2() { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlySame.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlySame.java --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlySame.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlySame.java @@ -30,20 +30,33 @@ public void forLoop() { } } - public void function(){}; + public void function() { + } + + ; + + public class TestClass { + } + + ; - public class TestClass {}; + public void testMethod() { + } - public void testMethod() {}; + ; - public @interface TestAnnotation {} + public @interface TestAnnotation { + } - public @interface TestAnnotation1 { String someValue(); } + public @interface TestAnnotation1 { + String someValue(); + } public @interface TestAnnotation3 { String someValue(); } - public @interface TestAnnotation4 {String someValue(); + public @interface TestAnnotation4 { + String someValue(); } } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlySameBlocksWithSemi.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlySameBlocksWithSemi.java --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlySameBlocksWithSemi.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlySameBlocksWithSemi.java @@ -1,7 +1,7 @@ /* * Config: * option = same - * tokens = CLASS_DEF, METHOD_DEF, CTOR_DEF, ANNOTATION_DEF + * tokens = CLASS_DEF, METHOD_DEF, CTOR_DEF, ANNOTATION_DEF, ENUM_DEF */ package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly; @@ -42,4 +42,18 @@ public void testMethod11() { }; //violation public @interface TestAnnotation9 { String someValue(); }; + + enum TestEnum{}; + + enum TestEnum1{ + SOME_VALUE;}; //violation + + enum TestEnum2 { SOME_VALUE; }; + + enum TestEnum3{ + SOME_VALUE; + }; //violation + + enum TestEnum4{ SOME_VALUE; + }; //violation } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlySameNewTokens.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlySameNewTokens.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlySameNewTokens.java @@ -0,0 +1,24 @@ +/* + * Config: + * option = same + * tokens = ENUM_DEF + */ + +package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly; + +public class InputRightCurlySameNewTokens { + + enum TestEnum{} + + enum TestEnum1{ + SOME_VALUE;} //violation + + enum TestEnum2 { SOME_VALUE; } + + enum TestEnum3{ + SOME_VALUE; + } + + enum TestEnum4{ SOME_VALUE; + } +}
ENUM_DEF token support in RightCurlyCheck Currently RightCurly accepts a lot less tokens (13 tokens) than LeftCurly ([20 tokens](https://checkstyle.sourceforge.io/config_blocks.html#LeftCurly_Properties)). It is unclear if this is just a mistake or if there is some underlying reason. This issue aims at adding support for `ENUM_DEF` token in RightCurlyCheck. Solving this issue will help solve Issue #3547.
2019-10-07T16:27:42Z
8.28
checkstyle/checkstyle
6,882
checkstyle__checkstyle-6882
[ "6879" ]
6ac55c23b85c4cd874f5ee50aebb70e321b09428
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java @@ -707,24 +707,50 @@ public int hashCode() { * @return true if the source of event matches the text of this tag. */ public boolean isMatch(TreeWalkerAuditEvent event) { + return (isCheckMatch(event) || isIdMatch(event)) && isMessageMatch(event); + } + + /** + * Checks whether {@link TreeWalkerAuditEvent} source name matches the check format. + * @param event {@link TreeWalkerAuditEvent} instance. + * @return true if the {@link TreeWalkerAuditEvent} source name matches the check format. + */ + private boolean isCheckMatch(TreeWalkerAuditEvent event) { + final Matcher checkMatcher = tagCheckRegexp.matcher(event.getSourceName()); + return checkMatcher.find(); + } + + /** + * Checks whether the {@link TreeWalkerAuditEvent} module ID matches the ID format. + * @param event {@link TreeWalkerAuditEvent} instance. + * @return true if the {@link TreeWalkerAuditEvent} module ID matches the ID format. + */ + private boolean isIdMatch(TreeWalkerAuditEvent event) { boolean match = false; - final Matcher tagMatcher = tagCheckRegexp.matcher(event.getSourceName()); - if (tagMatcher.find()) { - if (tagMessageRegexp == null) { - match = true; - } - else { - final Matcher messageMatcher = tagMessageRegexp.matcher(event.getMessage()); - match = messageMatcher.find(); - } - } - else if (event.getModuleId() != null) { + if (event.getModuleId() != null) { final Matcher idMatcher = tagCheckRegexp.matcher(event.getModuleId()); match = idMatcher.find(); } return match; } + /** + * Checks whether the {@link TreeWalkerAuditEvent} message matches the message format. + * @param event {@link TreeWalkerAuditEvent} instance. + * @return true if the {@link TreeWalkerAuditEvent} message matches the message format. + */ + private boolean isMessageMatch(TreeWalkerAuditEvent event) { + final boolean match; + if (tagMessageRegexp == null) { + match = true; + } + else { + final Matcher messageMatcher = tagMessageRegexp.matcher(event.getMessage()); + match = messageMatcher.find(); + } + return match; + } + @Override public String toString() { return "Tag[text='" + text + '\''
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java @@ -390,6 +390,50 @@ public void testSuppressById() throws Exception { "15:18: " + getCheckMessage(AbstractNameCheck.class, MSG_INVALID_PATTERN, "ID", "^[a-z][a-zA-Z0-9]*$"), + "18:17: " + + getCheckMessage(AbstractNameCheck.class, + MSG_INVALID_PATTERN, "DEF", "^[a-z][a-zA-Z0-9]*$"), + "21:17: " + + getCheckMessage(AbstractNameCheck.class, + MSG_INVALID_PATTERN, "XYZ", "^[a-z][a-zA-Z0-9]*$"), + }; + + verifySuppressed(filterConfig, getPath("InputSuppressionCommentFilterSuppressById.java"), + expectedViolationMessages, suppressedViolationMessages); + } + + @Test + public void testSuppressByIdAndMessage() throws Exception { + final DefaultConfiguration filterConfig = + createModuleConfig(SuppressionCommentFilter.class); + filterConfig.addAttribute("offCommentFormat", "CSOFF (\\w+) \\(allow (\\w+)\\)"); + filterConfig.addAttribute("onCommentFormat", "CSON (\\w+)"); + filterConfig.addAttribute("checkFormat", "$1"); + filterConfig.addAttribute("messageFormat", "$2"); + final String[] suppressedViolationMessages = { + "18:17: " + + getCheckMessage(AbstractNameCheck.class, + MSG_INVALID_PATTERN, "DEF", "^[a-z][a-zA-Z0-9]*$"), + }; + final String[] expectedViolationMessages = { + "6:17: " + + getCheckMessage(AbstractNameCheck.class, + MSG_INVALID_PATTERN, "A1", "^[a-z][a-zA-Z0-9]*$"), + "9:30: " + + getCheckMessage(AbstractNameCheck.class, + MSG_INVALID_PATTERN, "abc", "^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"), + "12:9: " + + getCheckMessage(AbstractNameCheck.class, + MSG_INVALID_PATTERN, "line_length", "^[a-z][a-zA-Z0-9]*$"), + "15:18: " + + getCheckMessage(AbstractNameCheck.class, + MSG_INVALID_PATTERN, "ID", "^[a-z][a-zA-Z0-9]*$"), + "18:17: " + + getCheckMessage(AbstractNameCheck.class, + MSG_INVALID_PATTERN, "DEF", "^[a-z][a-zA-Z0-9]*$"), + "21:17: " + + getCheckMessage(AbstractNameCheck.class, + MSG_INVALID_PATTERN, "XYZ", "^[a-z][a-zA-Z0-9]*$"), }; verifySuppressed(filterConfig, getPath("InputSuppressionCommentFilterSuppressById.java"), diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/InputSuppressionCommentFilterSuppressById.java b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/InputSuppressionCommentFilterSuppressById.java --- a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/InputSuppressionCommentFilterSuppressById.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/InputSuppressionCommentFilterSuppressById.java @@ -13,4 +13,10 @@ public class InputSuppressionCommentFilterSuppressById { //CSON ignore private long ID = 1; + + // CSOFF ignore (allow DEF) + private int DEF = 2; + + // CSOFF ignore (allow xyz) + private int XYZ = 3; }
SuppressionCommentFilter ignores messageFormat when matching on ID ``` $ cat TestClass.java package com.puppycrawl.tools.checkstyle.filters.suppressioncommentfilter; public class InputSuppressionCommentFilter { // CSOFF naming public int ABC; // CSON naming } $ cat TestConfig.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> <module name="Checker"> <property name="charset" value="UTF-8"/> <property name="severity" value="warning"/> <property name="haltOnException" value="false"/> <module name="TreeWalker"> <module name="MemberName"> <property name="id" value="naming"/> </module> <module name="SuppressionCommentFilter"> <property name="offCommentFormat" value="CSOFF naming"/> <property name="onCommentFormat" value="CSON naming"/> <property name="checkFormat" value="^naming$"/> <property name="messageFormat" value="NonMatchingMessage"/> </module> </module> </module> $ java -jar checkstyle-8.22-all.jar -c TestConfig.xml TestClass.java Starting audit... Audit done. ``` --------------- Identified in https://github.com/checkstyle/checkstyle/pull/6876#discussion_r300830774, this is an edge case where if the filter matches on the module ID (`naming`) rather than the source name (`MemberName`), the `messageFormat` is ignored. In the example above, the configured `"NonMatchingMessage"` message format does not match the `"Name 'ABC' must match pattern ..."` message, so the violation should not be suppressed. Expected output: ``` $ java -jar checkstyle-8.22-all.jar -c TestConfig.xml TestClass.java Starting audit... [WARN] TestClass.java:5:16: Name 'ABC' must match pattern '^[a-z][a-zA-Z0-9]*$'. [naming] Audit done. ```
2019-07-08T23:29:19Z
8.22
checkstyle/checkstyle
6,567
checkstyle__checkstyle-6567
[ "6490" ]
d61dccb3c7fd391506a512dce96a2620a5f93ac3
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java @@ -37,7 +37,7 @@ * </p> * <p> * According to - * <a href="https://www.oracle.com/technetwork/java/javase/documentation/codeconventions-141855.html#1852"> + * <a href="https://checkstyle.org/styleguides/sun-code-conventions-19990420/CodeConventions.doc2.html#a1852"> * Code Conventions for the Java Programming Language</a>, the parts of a class * or interface declaration should appear in the following order: * </p> diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheck.java @@ -32,7 +32,7 @@ * </p> * <p> * Rationale: <a - * href="https://www.oracle.com/technetwork/java/javase/documentation/codeconventions-141270.html"> + * href="https://checkstyle.org/styleguides/sun-code-conventions-19990420/CodeConventions.doc5.html#a2992"> * the SUN Code conventions chapter 6.1</a> recommends that * declarations should be one per line. * </p>
diff --git a/src/it/java/com/sun/checkstyle/test/chapter6declarations/rule61numberperline/MultipleVariableDeclarationsTest.java b/src/it/java/com/sun/checkstyle/test/chapter6declarations/rule61numberperline/MultipleVariableDeclarationsTest.java new file mode 100644 --- /dev/null +++ b/src/it/java/com/sun/checkstyle/test/chapter6declarations/rule61numberperline/MultipleVariableDeclarationsTest.java @@ -0,0 +1,72 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2019 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// + +package com.sun.checkstyle.test.chapter6declarations.rule61numberperline; + +import org.junit.Test; + +import com.google.checkstyle.test.base.AbstractModuleTestSupport; +import com.puppycrawl.tools.checkstyle.api.Configuration; +import com.puppycrawl.tools.checkstyle.checks.coding.MultipleVariableDeclarationsCheck; + +public class MultipleVariableDeclarationsTest extends AbstractModuleTestSupport { + + @Override + protected String getPackageLocation() { + return "com/sun/checkstyle/test/chapter6declarations/rule61numberperline"; + } + + @Test + public void testMultipleVariableDeclarations() throws Exception { + final String msgComma = getCheckMessage(MultipleVariableDeclarationsCheck.class, + "multiple.variable.declarations.comma"); + final String msg = getCheckMessage(MultipleVariableDeclarationsCheck.class, + "multiple.variable.declarations"); + + final String[] expected = { + "5:5: " + msgComma, + "6:5: " + msg, + "9:9: " + msgComma, + "10:9: " + msg, + "14:5: " + msg, + "17:5: " + msg, + "31:9: " + msgComma, + "32:9: " + msg, + "35:13: " + msgComma, + "36:13: " + msg, + "40:9: " + msg, + "43:9: " + msg, + "57:13: " + msgComma, + "58:13: " + msg, + "61:17: " + msgComma, + "62:17: " + msg, + "66:13: " + msg, + "69:13: " + msg, + "86:5: " + msgComma, + "89:5: " + msgComma, + }; + + final Configuration checkConfig = getModuleConfig("MultipleVariableDeclarations"); + final String filePath = getPath("InputMultipleVariableDeclarations.java"); + + final Integer[] warnList = getLinesWithWarn(filePath); + verify(checkConfig, filePath, expected, warnList); + } + +} diff --git a/src/it/resources/com/sun/checkstyle/test/chapter6declarations/rule61numberperline/InputMultipleVariableDeclarations.java b/src/it/resources/com/sun/checkstyle/test/chapter6declarations/rule61numberperline/InputMultipleVariableDeclarations.java new file mode 100644 --- /dev/null +++ b/src/it/resources/com/sun/checkstyle/test/chapter6declarations/rule61numberperline/InputMultipleVariableDeclarations.java @@ -0,0 +1,90 @@ +package com.sun.checkstyle.test.chapter6declarations.rule61numberperline; + +public class InputMultipleVariableDeclarations +{ + int i, j; //warn + int i1; int j1; //warn + + void method1() { + String str, str1; //warn + java.lang.Object obj; Object obj1; //warn + } + // second definition is wrapped + // line of VARIABLE_DEF is not the same as first line of the definition + java.lang.String string; java.lang.String //warn + strings[]; + //both definitions is wrapped + java.lang. //warn + String string1; java.lang.String + strings1[]; + + void method2() { + for (int i=0, j=0; i < 10; i++, j--) { //ok + } + + for(int i=0; i<4;i++) { + + } + } + + class Inner { + int i, j; //warn + int i1; int j1; //warn + + void method1() { + String str, str1; //warn + java.lang.Object obj; Object obj1; //warn + } + // second definition is wrapped + // line of VARIABLE_DEF is not the same as first line of the definition + java.lang.String string; java.lang.String //warn + strings[]; + //both definitions is wrapped + java.lang. //warn + String string1; java.lang.String + strings1[]; + + void method2() { + for (int i=0, j=0; i < 10; i++, j--) { //ok + } + + for(int i=0; i<4;i++) { + + } + } + Inner anon = new Inner() + { + int i, j; //warn + int i1; int j1; //warn + + void method1() { + String str, str1; //warn + java.lang.Object obj; Object obj1; //warn + } + // second definition is wrapped + // line of VARIABLE_DEF is not the same as first line of the definition + java.lang.String string; java.lang.String //warn + strings[]; + //both definitions is wrapped + java.lang. //warn + String string1; java.lang.String + strings1[]; + + void method2() { + for (int i=0, j=0; i < 10; i++, j--) { //ok + } + + for(int i=0; i<4;i++) { + + } + } + }; + } +} + +class Suppress { + @SuppressWarnings("unused") //warn + long q1, q2, q3; + + @SuppressWarnings("unused") long q4, q5, q6; //warn +} diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java @@ -19,7 +19,10 @@ package com.puppycrawl.tools.checkstyle.internal; +import static java.lang.Integer.parseInt; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.hamcrest.CoreMatchers.describedAs; +import static org.hamcrest.CoreMatchers.is; import java.beans.PropertyDescriptor; import java.io.File; @@ -46,6 +49,7 @@ import java.util.Set; import java.util.TreeSet; import java.util.regex.Pattern; +import java.util.stream.IntStream; import org.apache.commons.beanutils.PropertyUtils; import org.junit.Assert; @@ -143,6 +147,72 @@ public class XdocsPagesTest { private static final Set<String> SUN_MODULES = Collections.unmodifiableSet( new HashSet<>(CheckUtil.getConfigSunStyleModules())); + // ignore the not yet properly covered modules while testing newly added ones + // add proper sections to the coverage report and integration tests + // and then remove this list eventually + private static final List<String> IGNORED_SUN_MODULES = Arrays.asList( + "ArrayTypeStyle", + "AvoidNestedBlocks", + "AvoidStarImport", + "ConstantName", + "DesignForExtension", + "EmptyBlock", + "EmptyForIteratorPad", + "EmptyStatement", + "EqualsHashCode", + "FileLength", + "FileTabCharacter", + "FinalClass", + "FinalParameters", + "GenericWhitespace", + "HiddenField", + "HideUtilityClassConstructor", + "IllegalImport", + "IllegalInstantiation", + "InnerAssignment", + "InterfaceIsType", + "JavadocMethod", + "JavadocPackage", + "JavadocStyle", + "JavadocType", + "JavadocVariable", + "LeftCurly", + "LineLength", + "LocalFinalVariableName", + "LocalVariableName", + "MagicNumber", + "MemberName", + "MethodLength", + "MethodName", + "MethodParamPad", + "MissingSwitchDefault", + "ModifierOrder", + "NeedBraces", + "NewlineAtEndOfFile", + "NoWhitespaceAfter", + "NoWhitespaceBefore", + "OperatorWrap", + "PackageName", + "ParameterName", + "ParameterNumber", + "ParenPad", + "RedundantImport", + "RedundantModifier", + "RegexpSingleline", + "RightCurly", + "SimplifyBooleanExpression", + "SimplifyBooleanReturn", + "StaticVariableName", + "TodoComment", + "Translation", + "TypecastParenPad", + "TypeName", + "UnusedImports", + "UpperEll", + "VisibilityModifier", + "WhitespaceAfter", + "WhitespaceAround" + ); private static final Set<String> GOOGLE_MODULES = Collections.unmodifiableSet( new HashSet<>(CheckUtil.getConfigGoogleStyleModules())); @@ -1334,19 +1404,29 @@ private static Set<String> getProperties(Class<?> clss) { public void testAllStyleRules() throws Exception { for (Path path : XdocUtil.getXdocsStyleFilePaths(XdocUtil.getXdocsFilePaths())) { final String fileName = path.getFileName().toString(); + final String styleName = fileName.substring(0, fileName.lastIndexOf('_')); final String input = new String(Files.readAllBytes(path), UTF_8); final Document document = XmlUtil.getRawXml(fileName, input, input); final NodeList sources = document.getElementsByTagName("tr"); - Set<String> styleChecks = null; - if (path.toFile().getName().contains("google")) { - styleChecks = new HashSet<>(GOOGLE_MODULES); - } - else if (path.toFile().getName().contains("sun")) { - styleChecks = new HashSet<>(); + final Set<String> styleChecks; + switch (styleName) { + case "google": + styleChecks = new HashSet<>(GOOGLE_MODULES); + break; + + case "sun": + styleChecks = new HashSet<>(SUN_MODULES); + styleChecks.removeAll(IGNORED_SUN_MODULES); + break; + + default: + Assert.fail("Missing modules list for style file '" + fileName + "'"); + styleChecks = null; } String lastRuleName = null; + String[] lastRuleNumberParts = null; for (int position = 0; position < sources.getLength(); position++) { final Node row = sources.item(position); @@ -1358,14 +1438,8 @@ else if (path.toFile().getName().contains("sun")) { } final String ruleName = columns.get(1).getTextContent().trim(); - - if (lastRuleName != null) { - Assert.assertTrue( - fileName + " rule '" + ruleName + "' is out of order compared to '" - + lastRuleName + "'", - ruleName.toLowerCase(Locale.ENGLISH).compareTo( - lastRuleName.toLowerCase(Locale.ENGLISH)) >= 0); - } + lastRuleNumberParts = validateRuleNameOrder( + fileName, lastRuleName, lastRuleNumberParts, ruleName); if (!"--".equals(ruleName)) { validateStyleAnchors(XmlUtil.findChildElementsByTag(columns.get(0), "a"), @@ -1373,7 +1447,7 @@ else if (path.toFile().getName().contains("sun")) { } validateStyleModules(XmlUtil.findChildElementsByTag(columns.get(2), "a"), - XmlUtil.findChildElementsByTag(columns.get(3), "a"), styleChecks, fileName, + XmlUtil.findChildElementsByTag(columns.get(3), "a"), styleChecks, styleName, ruleName); lastRuleName = ruleName; @@ -1389,6 +1463,70 @@ else if (path.toFile().getName().contains("sun")) { } } + private static String[] validateRuleNameOrder(String fileName, String lastRuleName, + String[] lastRuleNumberParts, String ruleName) { + final String[] ruleNumberParts = ruleName.split(" ", 2)[0].split("\\."); + + if (lastRuleName != null) { + final int ruleNumberPartsAmount = ruleNumberParts.length; + final int lastRuleNumberPartsAmount = lastRuleNumberParts.length; + final String outOfOrderReason = fileName + " rule '" + ruleName + + "' is out of order compared to '" + lastRuleName + "'"; + boolean lastRuleNumberPartWasEqual = false; + int partIndex; + for (partIndex = 0; partIndex < ruleNumberPartsAmount; partIndex++) { + if (lastRuleNumberPartsAmount <= partIndex) { + // equal up to here and last rule has less parts, + // thus order is correct, stop comparing + break; + } + + final String ruleNumberPart = ruleNumberParts[partIndex]; + final String lastRuleNumberPart = lastRuleNumberParts[partIndex]; + final boolean ruleNumberPartsAreNumeric = IntStream.concat( + ruleNumberPart.chars(), + lastRuleNumberPart.chars() + ).allMatch(Character::isDigit); + + if (ruleNumberPartsAreNumeric) { + final int numericRuleNumberPart = parseInt(ruleNumberPart); + final int numericLastRuleNumberPart = parseInt(lastRuleNumberPart); + Assert.assertThat( + outOfOrderReason, + numericRuleNumberPart < numericLastRuleNumberPart, + describedAs("'%0' should not be less than '%1'", + is(false), + numericRuleNumberPart, numericLastRuleNumberPart)); + } + else { + Assert.assertThat( + outOfOrderReason, + ruleNumberPart.compareToIgnoreCase(lastRuleNumberPart) < 0, + describedAs("'%0' should not be less than '%1'", + is(false), + ruleNumberPart, lastRuleNumberPart)); + } + lastRuleNumberPartWasEqual = ruleNumberPart.equalsIgnoreCase(lastRuleNumberPart); + if (!lastRuleNumberPartWasEqual) { + // number part is not equal but properly ordered, + // thus order is correct, stop comparing + break; + } + } + if (ruleNumberPartsAmount == partIndex && lastRuleNumberPartWasEqual) { + if (lastRuleNumberPartsAmount == partIndex) { + Assert.fail(fileName + " rule '" + ruleName + "' and rule '" + + lastRuleName + "' have the same rule number"); + } + else { + Assert.fail(outOfOrderReason); + } + } + } + + return ruleNumberParts; + } + private static void validateStyleAnchors(Set<Node> anchors, String fileName, String ruleName) { Assert.assertEquals(fileName + " rule '" + ruleName + "' must have two row anchors", 2, anchors.size()); @@ -1423,7 +1561,7 @@ private static void validateStyleAnchors(Set<Node> anchors, String fileName, Str } private static void validateStyleModules(Set<Node> checks, Set<Node> configs, - Set<String> styleChecks, String fileName, String ruleName) { + Set<String> styleChecks, String styleName, String ruleName) { final Iterator<Node> itrChecks = checks.iterator(); final Iterator<Node> itrConfigs = configs.iterator(); @@ -1436,7 +1574,7 @@ private static void validateStyleModules(Set<Node> checks, Set<Node> configs, continue; } - Assert.assertTrue(fileName + " rule '" + ruleName + "' module '" + moduleName + Assert.assertTrue(styleName + "_style.xml rule '" + ruleName + "' module '" + moduleName + "' shouldn't end with 'Check'", !moduleName.endsWith("Check")); styleChecks.remove(moduleName); @@ -1448,43 +1586,45 @@ private static void validateStyleModules(Set<Node> checks, Set<Node> configs, config = itrConfigs.next(); } catch (NoSuchElementException ignore) { - Assert.fail(fileName + " rule '" + ruleName + "' module '" + moduleName - + "' is missing the config link: " + configName); + Assert.fail(styleName + "_style.xml rule '" + ruleName + "' module '" + + moduleName + "' is missing the config link: " + configName); } - Assert.assertEquals(fileName + " rule '" + ruleName + "' module '" + moduleName - + "' has mismatched config/test links", configName, config.getTextContent() - .trim()); + Assert.assertEquals(styleName + "_style.xml rule '" + ruleName + "' module '" + + moduleName + "' has mismatched config/test links", configName, + config.getTextContent().trim()); final String configUrl = config.getAttributes().getNamedItem("href") .getTextContent(); if ("config".equals(configName)) { final String expectedUrl = "https://github.com/search?q=" - + "path%3Asrc%2Fmain%2Fresources+filename%3Agoogle_checks.xml+" - + "repo%3Acheckstyle%2Fcheckstyle+" + moduleName; + + "path%3Asrc%2Fmain%2Fresources+filename%3A" + styleName + + "_checks.xml+repo%3Acheckstyle%2Fcheckstyle+" + moduleName; - Assert.assertEquals(fileName + " rule '" + ruleName + "' module '" + moduleName - + "' should have matching " + configName + " url", expectedUrl, - configUrl); + Assert.assertEquals(styleName + "_style.xml rule '" + ruleName + "' module '" + + moduleName + "' should have matching " + configName + " url", + expectedUrl, configUrl); } else if ("test".equals(configName)) { - Assert.assertTrue(fileName + " rule '" + ruleName + "' module '" + moduleName - + "' should have matching " + configName + " url", + Assert.assertTrue(styleName + "_style.xml rule '" + ruleName + "' module '" + + moduleName + "' should have matching " + configName + " url", configUrl.startsWith("https://github.com/checkstyle/checkstyle/" - + "blob/master/src/it/java/com/google/checkstyle/test/")); - Assert.assertTrue(fileName + " rule '" + ruleName + "' module '" + moduleName - + "' should have matching " + configName + " url", + + "blob/master/src/it/java/com/" + styleName + + "/checkstyle/test/")); + Assert.assertTrue(styleName + "_style.xml rule '" + ruleName + "' module '" + + moduleName + "' should have matching " + configName + " url", configUrl.endsWith("/" + moduleName + "Test.java")); - Assert.assertTrue(fileName + " rule '" + ruleName + "' module '" + moduleName - + "' should have a test that exists", new File(configUrl.substring(53) - .replace('/', File.separatorChar)).exists()); + Assert.assertTrue(styleName + "_style.xml rule '" + ruleName + "' module '" + + moduleName + "' should have a test that exists", + new File(configUrl.substring(53) + .replace('/', File.separatorChar)).exists()); } } } - Assert.assertFalse(fileName + " rule '" + ruleName + "' has too many configs", + Assert.assertFalse(styleName + "_style.xml rule '" + ruleName + "' has too many configs", itrConfigs.hasNext()); }
MultipleVariableDeclarations missing from sun style The rational of the check says the sun style demands this, but it is not part of the sun checks XML. https://checkstyle.org/config_coding.html#MultipleVariableDeclarations
https://checkstyle.org/sun_style.html this page is empty, because style guide is not properly created. Sun config is seriously in unclear state. One day we will find contributor to make like https://checkstyle.org/google_style.html , but this is a big project https://github.com/checkstyle/checkstyle/wiki/Checkstyle-GSoC-2019-Project-Ideas#project-name-sun-and-open-jdk-code-convention-coverage Did you maybe misunderstand me? Because I cannot relate your comment to my report @romani. The rationale of the check says that the sun style demands what this check validates. But the `sun_checks.xml` file does not include this check which is what I reported. @Vampire Our sun and google configuration files are validated against the written guides from sun and google respectively. We create a table to show what line of text in the guide related to the check we have setup and configured to prove we follow the guide. We already have a complete mapping for google: http://checkstyle.sourceforge.net/google_style.html#Google_Coverage_table http://checkstyle.sourceforge.net/reports/google-java-style-20170228.html Sun's mapping is empty because no one has sat down and worked on it. Any text that says style is a demand of sun could be wrong. https://checkstyle.org/sun_style.html#Sun_Coverage_table Ah, now I understand what you mean, but actually the rational is correct: ![grafik](https://user-images.githubusercontent.com/325196/53899541-b62a0a00-403a-11e9-9af7-4db133ec2aea.png)
2019-03-12T18:55:41Z
8.19
checkstyle/checkstyle
6,515
checkstyle__checkstyle-6515
[ "6513" ]
bd7621fae3b1b887d46b8a678600db7e6d03185c
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java @@ -159,6 +159,11 @@ public class EmptyCatchBlockCheck extends AbstractCheck { */ public static final String MSG_KEY_CATCH_BLOCK_EMPTY = "catch.block.empty"; + /** + * A pattern to split on line ends. + */ + private static final Pattern LINE_END_PATTERN = Pattern.compile("\\r?+\\n|\\r"); + /** * Specify the RegExp for the name of the variable associated with exception. * If check meets variable name matching specified value - empty block is suppressed. @@ -250,7 +255,7 @@ private static String getCommentFirstLine(DetailAST catchAst) { } else if (firstElementInBlock.getType() == TokenTypes.BLOCK_COMMENT_BEGIN) { commentContent = firstElementInBlock.getFirstChild().getText(); - final String[] lines = commentContent.split(System.getProperty("line.separator")); + final String[] lines = LINE_END_PATTERN.split(commentContent); for (String line : lines) { if (!line.isEmpty()) { commentContent = line;
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheckTest.java @@ -73,6 +73,32 @@ public void testWithUserSetValues() throws Exception { verify(checkConfig, getPath("InputEmptyCatchBlockDefault.java"), expected); } + @Test + public void testLinesAreProperlySplitSystemIndependently() throws Exception { + final DefaultConfiguration checkConfig = + createModuleConfig(EmptyCatchBlockCheck.class); + checkConfig.addAttribute("exceptionVariableName", "expected|ignore|myException"); + checkConfig.addAttribute("commentFormat", "This is expected"); + final String[] expected = { + "35: " + getCheckMessage(MSG_KEY_CATCH_BLOCK_EMPTY), + "63: " + getCheckMessage(MSG_KEY_CATCH_BLOCK_EMPTY), + "97: " + getCheckMessage(MSG_KEY_CATCH_BLOCK_EMPTY), + "186: " + getCheckMessage(MSG_KEY_CATCH_BLOCK_EMPTY), + "195: " + getCheckMessage(MSG_KEY_CATCH_BLOCK_EMPTY), + "214: " + getCheckMessage(MSG_KEY_CATCH_BLOCK_EMPTY), + "230: " + getCheckMessage(MSG_KEY_CATCH_BLOCK_EMPTY), + "239: " + getCheckMessage(MSG_KEY_CATCH_BLOCK_EMPTY), + }; + final String originalLineSeparator = System.getProperty("line.separator"); + try { + System.setProperty("line.separator", "\r\n"); + verify(checkConfig, getPath("InputEmptyCatchBlockDefaultLF.java"), expected); + } + finally { + System.setProperty("line.separator", originalLineSeparator); + } + } + @Test public void testGetAcceptableTokens() { final EmptyCatchBlockCheck constantNameCheckObj = new EmptyCatchBlockCheck(); diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/InputEmptyCatchBlockDefaultLF.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/InputEmptyCatchBlockDefaultLF.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/InputEmptyCatchBlockDefaultLF.java @@ -0,0 +1,244 @@ +//////////////////////////////////////////////////////////////////////////////// +// checkstyle: Checks Java source code for adherence to a set of rules. +// Copyright (C) 2001-2019 the original author or authors. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +//////////////////////////////////////////////////////////////////////////////// +package com.puppycrawl.tools.checkstyle.checks.blocks.emptycatchblock; +import java.io.IOException; +public class InputEmptyCatchBlockDefaultLF +{ + + private void foo() { + try { + throw new RuntimeException(); + } catch (Exception expected) { + //Expected + } + } + + private void foo1() { + try { + throw new RuntimeException(); + } catch (Exception e) {} + + } + + private void foo2() { + try { + throw new IOException(); + } catch (IOException | NullPointerException | ArithmeticException ignore) { + } + } + + private void foo3() { // comment + try { + throw new IOException(); + } catch (IOException | NullPointerException | ArithmeticException e) { //This is expected + } + } + + private void foo4() { + try { + throw new IOException(); + } catch (IOException | NullPointerException | ArithmeticException e) { /* This is expected*/ + } + } + + private void foo5() { + try { + throw new IOException(); + } catch (IOException | NullPointerException | ArithmeticException e) { // Some singleline comment + } + } + + private void foo6() { + try { + throw new IOException(); + } catch (IOException expected) { // This is expected + int k = 0; + } + } + + public void testTryCatch() + { + try { + int y=0; + int u=8; + int e=u-y; + return; + } + catch (Exception e) { + System.identityHashCode(e); + return; + } + finally + { + return; + } + } + + public void testTryCatch2() + { + try { + } + catch (Exception e) { //OK + //This is expected + /* This is expected */ + /**This is expected */ + } + finally + { + } + } + + public void testTryCatch3() + { + try { + int y=0; + int u=8; + int e=u-y; + } + catch (IllegalArgumentException e) { + System.identityHashCode(e); //some comment + return; + } + catch (IllegalStateException ex) { + System.identityHashCode(ex); + return; + } + } + + public void testTryCatch4() + { + int y=0; + int u=8; + try { + int e=u-y; + } + catch (IllegalArgumentException e) { + System.identityHashCode(e); + return; + } + } + public void setFormats() { + try { + int k = 4; + } catch (Exception e) { + Object k = null; + if (k != null) + k = "ss"; + else { + return; + } + } + } + public void setFormats1() { + try { + int k = 4; + } catch (Exception e) { + Object k = null; + if (k != null) { + k = "ss"; + } else { + return; + } + } + } + public void setFormats2() { + try { + int k = 4; + } catch (Exception e) { + Object k = null; + if (k != null) { + k = "ss"; + return; + } + } + } + public void setFormats3() { + try { + int k = 4; + } catch (Exception e) { + Object k = null; + if (k != null) { + k = "ss"; + + } + } + } + + private void some() { + try { + throw new IOException(); + } catch (IOException e) { + /* ololo + * blalba + */ + } + } + private void some1() { + try { + throw new IOException(); + } catch (IOException e) { + /* lalala + * This is expected + */ + } + } + private void some2() { + try { + throw new IOException(); + } catch (IOException e) { + /* + * This is expected + * lalala + */ + } + } + private void some3() { + try { + throw new IOException(); + } catch (IOException e) { + // some comment + //This is expected + } + } + private void some4() { + try { + throw new IOException(); + } catch (IOException e) { + //This is expected + // some comment + } + } + private void some5() { + try { + throw new IOException(); + } catch (IOException e) { + /* some comment */ + //This is expected + } + } + + private void emptyMultilineComment() { + try { + throw new IOException(); + } catch (IOException e) { + /* +*/ + } + } +}
EmptyCatchBlock check does not work properly with non-system line endings in files ``` /var/tmp $ javac Foo.java /var/tmp $ cat config.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <module name="TreeWalker"> <module name="EmptyCatchBlock"> <property name="commentFormat" value="This is expected"/> </module> </module> </module> /var/tmp $ cat Foo.java import java.io.IOException; class Foo { private void foo() { try { throw new IOException(); } catch (IOException e) { /* * some comment * This is expected */ } } } /var/tmp $ xxd Foo.java 00000000: 696d 706f 7274 206a 6176 612e 696f 2e49 import java.io.I 00000010: 4f45 7863 6570 7469 6f6e 3b0a 0a63 6c61 OException;..cla 00000020: 7373 2046 6f6f 207b 0a20 2020 2070 7269 ss Foo {. pri 00000030: 7661 7465 2076 6f69 6420 666f 6f28 2920 vate void foo() 00000040: 7b0a 2020 2020 2020 2020 7472 7920 7b0a {. try {. 00000050: 2020 2020 2020 2020 2020 2020 7468 726f thro 00000060: 7720 6e65 7720 494f 4578 6365 7074 696f w new IOExceptio 00000070: 6e28 293b 0a20 2020 2020 2020 207d 2063 n();. } c 00000080: 6174 6368 2028 494f 4578 6365 7074 696f atch (IOExceptio 00000090: 6e20 6529 207b 0a20 2020 2020 2020 2020 n e) {. 000000a0: 2020 202f 2a0a 2020 2020 2020 2020 2020 /*. 000000b0: 2020 202a 2073 6f6d 6520 636f 6d6d 656e * some commen 000000c0: 740a 2020 2020 2020 2020 2020 2020 202a t. * 000000d0: 2054 6869 7320 6973 2065 7870 6563 7465 This is expecte 000000e0: 640a 2020 2020 2020 2020 2020 2020 202a d. * 000000f0: 2f0a 2020 2020 2020 2020 7d0a 2020 2020 /. }. 00000100: 7d0a 7d0a }.}. /var/tmp $ java -Duser.language=en -Duser.country=US -Dline.separator=$'\n' -jar checkstyle-8.18-all.jar -c config.xml Foo.java Starting audit... [ERROR] D:\Sourcecode\other\discord-logger\tmp\Foo.java:7: Empty catch block. [EmptyCatchBlock] Audit done. Checkstyle ends with 1 errors. /var/tmp $ java -Duser.language=en -Duser.country=US -Dline.separator=$'\r\n' -jar checkstyle-8.18-all.jar -c config.xml Foo.java Starting audit... Audit done. ``` --------------- When having non-system line endings in files as is quite common for cross-platform projects, the `EmptyCatchBlock` check fails to properly extract the first line of a block comment with CS 8.18 to check it against the comment format pattern. Instead for example the full comment will be used when a file has linux line endings on windows, or the comment to test has an extra carriage return character in the end when a file has windows line endings on linux. This even happens in `EmptyCatchBlockCheckTest#testWithUserSetValues` when the `InputEmptyCatchBlockDefault.java` file has linux line endings and you run the test on a windows system.
2019-03-06T03:12:53Z
8.2
checkstyle/checkstyle
4,463
checkstyle__checkstyle-4463
[ "4449" ]
ecb07add954061f0f92e8477cbbc0a7c6a7afe76
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java b/src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java @@ -24,7 +24,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; -import java.net.URL; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -93,7 +92,7 @@ public class CheckstyleAntTask extends Task { private String fileName; /** Config file containing configuration. */ - private String configLocation; + private String config; /** Whether to fail build on violations. */ private boolean failOnViolation = true; @@ -230,42 +229,13 @@ public void setFile(File file) { /** * Sets configuration file. - * @param file the configuration file to use + * @param configuration the configuration file, URL, or resource to use */ - public void setConfig(File file) { - setConfigLocation(file.getAbsolutePath()); - } - - /** - * Sets URL to the configuration. - * @param url the URL of the configuration to use - * @deprecated please use setConfigUrl instead - */ - // -@cs[AbbreviationAsWordInName] Should be removed at 7.0 version, - // we keep for some time to avoid braking compatibility. - @Deprecated - public void setConfigURL(URL url) { - setConfigUrl(url); - } - - /** - * Sets URL to the configuration. - * @param url the URL of the configuration to use - */ - public void setConfigUrl(URL url) { - setConfigLocation(url.toExternalForm()); - } - - /** - * Sets the location of the configuration. - * @param location the location, which is either a - */ - private void setConfigLocation(String location) { - if (configLocation != null) { - throw new BuildException("Attributes 'config' and 'configURL' " - + "must not be set at the same time"); + public void setConfig(String configuration) { + if (config != null) { + throw new BuildException("Attribute 'config' has already been set"); } - configLocation = location; + config = configuration; } /** @@ -316,7 +286,7 @@ public void execute() { "Must specify at least one of 'file' or nested 'fileset' or 'path'.", getLocation()); } - if (configLocation == null) { + if (config == null) { throw new BuildException("Must specify 'config'.", getLocation()); } realExecute(version); @@ -381,7 +351,7 @@ private void processFiles(RootModule rootModule, final SeverityLevelCounter warn log("Running Checkstyle " + checkstyleVersion + " on " + files.size() + " files", Project.MSG_INFO); - log("Using configuration " + configLocation, Project.MSG_VERBOSE); + log("Using configuration " + config, Project.MSG_VERBOSE); final int numErrs; @@ -421,9 +391,9 @@ private RootModule createRootModule() { final RootModule rootModule; try { final Properties props = createOverridingProperties(); - final Configuration config = + final Configuration configuration = ConfigurationLoader.loadConfiguration( - configLocation, + config, new PropertiesExpander(props), !executeIgnoredModules); @@ -433,7 +403,7 @@ private RootModule createRootModule() { final ModuleFactory factory = new PackageObjectFactory( Checker.class.getPackage().getName() + ".", moduleClassLoader); - rootModule = (RootModule) factory.createModule(config.getName()); + rootModule = (RootModule) factory.createModule(configuration.getName()); rootModule.setModuleClassLoader(moduleClassLoader); if (rootModule instanceof Checker) { @@ -443,11 +413,11 @@ private RootModule createRootModule() { ((Checker) rootModule).setClassLoader(loader); } - rootModule.configure(config); + rootModule.configure(configuration); } catch (final CheckstyleException ex) { throw new BuildException(String.format(Locale.ROOT, "Unable to create Root Module: " - + "configLocation {%s}, classpath {%s}.", configLocation, classpath), ex); + + "config {%s}, classpath {%s}.", config, classpath), ex); } return rootModule; }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTaskTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTaskTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTaskTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTaskTest.java @@ -73,6 +73,7 @@ public class CheckstyleAntTaskTest extends BaseCheckTestSupport { private static final String WARNING_INPUT = "ant/checkstyleanttask/InputCheckstyleAntTaskWarning.java"; private static final String CONFIG_FILE = "ant/ant_task_test_checks.xml"; + private static final String CONFIG_RESOURCE = "/com/puppycrawl/tools/checkstyle/" + CONFIG_FILE; private static final String CUSTOM_ROOT_CONFIG_FILE = "config-custom-root-module.xml"; private static final String NOT_EXISTING_FILE = "target/not_existing.xml"; private static final String FAILURE_PROPERTY_VALUE = "myValue"; @@ -83,7 +84,7 @@ private CheckstyleAntTask getCheckstyleAntTask() throws IOException { private CheckstyleAntTask getCheckstyleAntTask(String configFile) throws IOException { final CheckstyleAntTask antTask = new CheckstyleAntTask(); - antTask.setConfig(new File(getPath(configFile))); + antTask.setConfig(getPath(configFile)); antTask.setProject(new Project()); return antTask; } @@ -184,7 +185,7 @@ public final void testNoConfigFile() throws IOException { @Test public final void testNonExistingConfig() throws IOException { final CheckstyleAntTask antTask = new CheckstyleAntTask(); - antTask.setConfig(new File(getPath(NOT_EXISTING_FILE))); + antTask.setConfig(getPath(NOT_EXISTING_FILE)); antTask.setProject(new Project()); antTask.setFile(new File(getPath(FLAWLESS_INPUT))); try { @@ -193,14 +194,14 @@ public final void testNonExistingConfig() throws IOException { } catch (BuildException ex) { assertTrue("Error message is unexpected", - ex.getMessage().startsWith("Unable to create Root Module: configLocation")); + ex.getMessage().startsWith("Unable to create Root Module: config")); } } @Test public final void testEmptyConfigFile() throws IOException { final CheckstyleAntTask antTask = new CheckstyleAntTask(); - antTask.setConfig(new File(getPath("ant/empty_config.xml"))); + antTask.setConfig(getPath("ant/empty_config.xml")); antTask.setProject(new Project()); antTask.setFile(new File(getPath(FLAWLESS_INPUT))); try { @@ -209,7 +210,7 @@ public final void testEmptyConfigFile() throws IOException { } catch (BuildException ex) { assertTrue("Error message is unexpected", - ex.getMessage().startsWith("Unable to create Root Module: configLocation")); + ex.getMessage().startsWith("Unable to create Root Module: config")); } } @@ -253,7 +254,7 @@ public final void testMaxErrors() throws IOException { @Test public final void testFailureProperty() throws IOException { final CheckstyleAntTask antTask = new CheckstyleAntTask(); - antTask.setConfig(new File(getPath(CONFIG_FILE))); + antTask.setConfig(getPath(CONFIG_FILE)); antTask.setFile(new File(getPath(VIOLATED_INPUT))); final Project project = new Project(); @@ -323,32 +324,29 @@ public final void testConfigurationByUrl() throws IOException { final CheckstyleAntTask antTask = new CheckstyleAntTask(); antTask.setProject(new Project()); final URL url = new File(getPath(CONFIG_FILE)).toURI().toURL(); - antTask.setConfigURL(url); + antTask.setConfig(url.toString()); + antTask.setFile(new File(getPath(FLAWLESS_INPUT))); + antTask.execute(); + } + + @Test + public final void testConfigurationByResource() throws IOException { + final CheckstyleAntTask antTask = new CheckstyleAntTask(); + antTask.setProject(new Project()); + antTask.setConfig(CONFIG_RESOURCE); antTask.setFile(new File(getPath(FLAWLESS_INPUT))); antTask.execute(); } @Test public final void testSimultaneousConfiguration() throws IOException { - CheckstyleAntTask antTask; final File file = new File(getPath(CONFIG_FILE)); final URL url = file.toURI().toURL(); - final String expected = - "Attributes 'config' and 'configURL' must not be set at the same time"; - try { - antTask = new CheckstyleAntTask(); - antTask.setConfigUrl(url); - antTask.setConfig(file); - fail("Exception is expected"); - } - catch (BuildException ex) { - assertEquals("Error message is unexpected", - expected, ex.getMessage()); - } + final String expected = "Attribute 'config' has already been set"; try { - antTask = new CheckstyleAntTask(); - antTask.setConfig(file); - antTask.setConfigUrl(url); + final CheckstyleAntTask antTask = new CheckstyleAntTask(); + antTask.setConfig(url.toString()); + antTask.setConfig(file.toString()); fail("Exception is expected"); } catch (BuildException ex) { @@ -515,7 +513,7 @@ public void testSetClasspathRef() { @Test public void testCheckerException() throws IOException { final CheckstyleAntTask antTask = new CheckstyleAntTaskStub(); - antTask.setConfig(new File(getPath(CONFIG_FILE))); + antTask.setConfig(getPath(CONFIG_FILE)); antTask.setProject(new Project()); antTask.setFile(new File("")); try { @@ -533,7 +531,7 @@ public final void testExecuteLogOutput() throws Exception { final CheckstyleAntTaskLogStub antTask = new CheckstyleAntTaskLogStub(); final URL url = new File(getPath(CONFIG_FILE)).toURI().toURL(); antTask.setProject(new Project()); - antTask.setConfigURL(url); + antTask.setConfig(url.toString()); antTask.setFile(new File(getPath(FLAWLESS_INPUT))); mockStatic(System.class);
CheckstyleAntTask: substitude setConfig(File) with setConfig(String) Ant's configUrl requires a full URL - relative paths don't work Background in Issue #3119: As I understand it, you should be able to specify a relative path (to a resource on the classpath) in the `configUrl` attribute of the Ant task. However I'm getting an error when I attempt to do so, and instead have to specify the full resource URL (`jar:file:PATH_TO_JAR!/PATH_TO_RESOURCE`), which is brittle and overspecified. --------------- ``` $ ant -version Apache Ant(TM) version 1.10.1 compiled on February 2 2017 $ hg diff diff -r 57a890e81233 build.xml --- a/build.xml Sat Jun 10 15:06:52 2017 -0700 +++ b/build.xml Tue Jun 13 09:18:42 2017 -0700 @@ -124,7 +124,7 @@ <!-- Checkstyle --> <target name="checkstyle" depends="build-test" description="Style linter"> - <checkstyle configUrl="jar:file:lib/checkstyle-7.8.1-all.jar!/google_checks.xml" maxWarnings="0"> + <checkstyle configUrl="/google_checks.xml" maxWarnings="0"> <fileset dir="${core.src}" includes="**/*.java"/> </checkstyle> <checkstyle configUrl="jar:file:lib/checkstyle-7.8.1-all.jar!/google_checks.xml" maxWarnings="0"> $ ant checkstyle Buildfile: /.../build.xml init: build: build-test: checkstyle: BUILD FAILED /.../build.xml:127: java.net.MalformedURLException: no protocol: /google_checks.xml at java.net.URL.<init>(URL.java:593) at java.net.URL.<init>(URL.java:490) at java.net.URL.<init>(URL.java:439) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) at java.lang.reflect.Constructor.newInstance(Constructor.java:423) at org.apache.tools.ant.IntrospectionHelper$11.set(IntrospectionHelper.java:1206) at org.apache.tools.ant.IntrospectionHelper$AttributeSetter.setObject(IntrospectionHelper.java:1512) at org.apache.tools.ant.IntrospectionHelper.setAttribute(IntrospectionHelper.java:412) at org.apache.tools.ant.RuntimeConfigurable.maybeConfigure(RuntimeConfigurable.java:528) at org.apache.tools.ant.RuntimeConfigurable.maybeConfigure(RuntimeConfigurable.java:464) at org.apache.tools.ant.Task.maybeConfigure(Task.java:202) at org.apache.tools.ant.UnknownElement.configure(UnknownElement.java:200) at org.apache.tools.ant.UnknownElement.maybeConfigure(UnknownElement.java:164) at org.apache.tools.ant.Task.perform(Task.java:347) at org.apache.tools.ant.Target.execute(Target.java:435) at org.apache.tools.ant.Target.performTasks(Target.java:456) at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1405) at org.apache.tools.ant.Project.executeTarget(Project.java:1376) at org.apache.tools.ant.helper.DefaultExecutor.executeTargets(DefaultExecutor.java:41) at org.apache.tools.ant.Project.executeTargets(Project.java:1260) at org.apache.tools.ant.Main.runBuild(Main.java:857) at org.apache.tools.ant.Main.startAnt(Main.java:236) at org.apache.tools.ant.launch.Launcher.run(Launcher.java:287) at org.apache.tools.ant.launch.Launcher.main(Launcher.java:113) Total time: 0 seconds ``` Checkstyle runs successfully without this local mod (i.e. with the fully-qualified URL). I see this same error on both OSX and Windows.
interesting that I do not see any "checkstyle" in stacktrace , so resolving to URL is done by ANT completely. We do load of in sequence that I described at - https://github.com/checkstyle/checkstyle/commit/20506e1ceb2de74c9a85367135be714f8208643f#diff-2be5da6521926564b0fd9efc2fc60390R124 As we use the same config file for multiple of usages (ant, cli, maven, eclipse, .......) ... we cannot change anything. Looks like nuance of ANT pre-processing of `URL` types (`public void setConfigUrl(URL url) {`([code](https://github.com/checkstyle/checkstyle/blob/master/src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java#L255))), so such syntax might be required. ToDo if that is feature of ANT, we need to have a link to specification and probably(I am not sure now!!!) make new setter for config with `String` type, to let ANT do nothing and trigger checkstyle logic on priority of files load. @dimo414 , if you have a time please help us and your self to resolve this issue. I don't think it's a nuance of Ant's preprocessing - Ant's just constructing a `URL` instance since that's the type the `setConfigUrl()` method expects. The exception is coming from `java.net.URL`'s constructor, so there's nothing Ant can really do about it. I agree swapping `setConfigUrl()` to take a `String` instead seems like the right fix, I'll try to verify that works and send a pull request if it does.
2017-06-16T21:14:02Z
7.8
checkstyle/checkstyle
3,366
checkstyle__checkstyle-3366
[ "3186" ]
e905a2746ab7765314e2f8e6ce62717f209fd294
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java @@ -211,15 +211,7 @@ && shouldCheckEnhancedForLoopVariable(ast)) { if (isAssignOperator(parentType) && isFirstChild(ast)) { final Optional<FinalVariableCandidate> candidate = getFinalCandidate(ast); if (candidate.isPresent()) { - if (isInSpecificCodeBlock(ast, TokenTypes.LITERAL_IF)) { - candidate.get().assignInIfBlock = true; - if (isInSpecificCodeBlock(ast, TokenTypes.CASE_GROUP)) { - candidate.get().assignInIfBlockWhichIsInsideCaseBlock = true; - } - } - else { - candidate.get().assignOutsideConditionalBlock = true; - } + determineAssignmentConditions(ast, candidate.get()); } removeFinalVariableCandidateFromStack(ast); } @@ -264,6 +256,24 @@ public void leaveToken(DetailAST ast) { } } + /** + * Determines identifier assignment conditions (assigned or already assigned). + * @param ident identifier. + * @param candidate final local variable candidate. + */ + private static void determineAssignmentConditions(DetailAST ident, + FinalVariableCandidate candidate) { + if (candidate.assigned) { + if (!isInSpecificCodeBlock(ident, TokenTypes.LITERAL_ELSE) + && !isInSpecificCodeBlock(ident, TokenTypes.CASE_GROUP)) { + candidate.alreadyAssigned = true; + } + } + else { + candidate.assigned = true; + } + } + /** * Checks whether the scope of a node is restricted to a specific code block. * @param node node. @@ -473,9 +483,7 @@ private static boolean shouldRemoveFinalVariableCandidate(ScopeData scopeData, D // more than once in this case if (isInTheSameLoop(variable, ast) || !isUseOfExternalVariableInsideLoop(ast)) { final FinalVariableCandidate candidate = scopeData.scope.get(ast.getText()); - shouldRemove = candidate.assignInIfBlock - && candidate.assignOutsideConditionalBlock - && !candidate.assignInIfBlockWhichIsInsideCaseBlock; + shouldRemove = candidate.alreadyAssigned; } scopeData.uninitializedVariables.remove(variable); break; @@ -653,12 +661,10 @@ public Optional<FinalVariableCandidate> findFinalVariableCandidateForAst(DetailA private static class FinalVariableCandidate { /** Identifier token. */ private final DetailAST variableIdent; - /** Whether variable is assigned in if block. */ - private boolean assignInIfBlock; - /** Whether variable is assigned outside conditional block. */ - private boolean assignOutsideConditionalBlock; - /** Whether variable is assigned in if block which is located inside case block. */ - private boolean assignInIfBlockWhichIsInsideCaseBlock; + /** Whether the variable is assigned. */ + private boolean assigned; + /** Whether the variable is already assigned. */ + private boolean alreadyAssigned; /** * Creates new instance.
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java @@ -211,4 +211,32 @@ public void testVariavleWhichIsAssignedMultipleTimes() throws Exception { }; verify(checkConfig, getPath("InputFinalLocalVariableAssignedMultipleTimes.java"), expected); } + + @Test + public void testVariableIsAssignedInsideAndOutsideSwitchBlock() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(FinalLocalVariableCheck.class); + final String[] expected = { + "31:13: " + getCheckMessage(MSG_KEY, "b"), + }; + verify(checkConfig, getPath("InputFinalLocalVariableAssignedInsideAndOutsideSwitch.java"), + expected); + } + + @Test + public void testFinalLocalVariableFalsePositives() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(FinalLocalVariableCheck.class); + final String[] expected = { + "341:16: " + getCheckMessage(MSG_KEY, "c2"), + "2184:16: " + getCheckMessage(MSG_KEY, "b"), + }; + verify(checkConfig, getPath("InputFinalLocalVariableFalsePositives.java"), expected); + } + + @Test + public void testMultipleAndNestedConditions() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(FinalLocalVariableCheck.class); + final String[] expected = CommonUtils.EMPTY_STRING_ARRAY; + verify(checkConfig, getPath("InputFinalLocalVariableMultipleAndNestedConditions.java"), + expected); + } } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputFinalLocalVariableAssignedInsideAndOutsideSwitch.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputFinalLocalVariableAssignedInsideAndOutsideSwitch.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputFinalLocalVariableAssignedInsideAndOutsideSwitch.java @@ -0,0 +1,63 @@ +package com.puppycrawl.tools.checkstyle.checks.coding; + +import java.util.ArrayList; + +public class InputFinalLocalVariableAssignedInsideAndOutsideSwitch { + + private static void foo1(final int[][] m, final int x, final int y, + final int d, final int[] regionSizes) { + final int a = m[y][x] & 1; + int b; + switch (d) { + case 1: + b = m[y - 1][x]; + break; + case 2: + b = m[y][x - 1]; + break; + case 3: + b = m[y][x + 1]; + break; + default: + b = m[y + 1][x]; + break; + } + b &= 5; + } + + private static void foo2(final int[][] m, final int x, final int y, + final int d, final int[] regionSizes) { + final int a = m[y][x] & 1; + int b; // violation + switch (d) { + case 1: + break; + case 2: + b = m[y][x - 1]; + break; + case 3: + b = m[y][x + 1]; + break; + default: + b = m[y + 1][x]; + break; + } + } + + private static void foo3(final int[][] m, final int x, final int y, + final int d, final int[] regionSizes) { + final int a = m[y][x] & 1; + int b; + switch (d) { + case 1: + case 2: + case 3: + b = m[y][x + 1]; + break; + default: + b = m[y + 1][x]; + break; + } + b &= 5; + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputFinalLocalVariableFalsePositives.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputFinalLocalVariableFalsePositives.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputFinalLocalVariableFalsePositives.java @@ -0,0 +1,2204 @@ +package com.puppycrawl.tools.checkstyle.checks.coding; + +public class InputFinalLocalVariableFalsePositives { + + // spring-framework/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java + private void foo1() { + String value; + if (true) { + try { + value = ""; + } + catch (Exception ex) { + if (true) { + + } + value = ""; + } + } + else { + value = ""; + } + } + + // spring-framework/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java + private void foo2() { + String stompAccessor; + + if (true) { + throw new IllegalStateException( + "No header accessor (not using the SimpMessagingTemplate?): "); + } + else if (true) { + stompAccessor = ""; + } + else if (true) { + stompAccessor = ""; + } + else { + throw new IllegalStateException("Unexpected header accessor type "); + } + + if (true) { + if (true) { + if (true) { + } + return; + } + stompAccessor.toString(); + } + + if (true) { + return; + } + + if (true) { + if (true) { + } + stompAccessor = ""; + stompAccessor.toString(); + stompAccessor.toString(); + if (true) { + stompAccessor.toString(); + } + } + else if (true) { + if (true) { + if (true) { + } + return; + } + } + else { + if (true) { + if (true) { + } + return; + } + } + } + + // spring-framework/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodesFactory.java + private void foo3() { + String errorCodes; + + try { + if (true) { + } + else { + } + + if (true) { + } + + errorCodes = ""; + if (true) { + } + } + catch (Exception ex) { + errorCodes = ""; + } + + final String s = errorCodes; + } + + // spring-framework/spring-context/src/main/java/org/springframework/scheduling/config/TaskExecutorFactoryBean.java + private void foo4() { + if (true) { + try { + int corePoolSize; + if (true) { + corePoolSize = Integer.valueOf("1"); + if (corePoolSize > 2) { + } + if (true) { + if (corePoolSize == 0) { + corePoolSize = 2; + } + else { + } + } + } + else { + corePoolSize = 1; + } + } + catch (NumberFormatException ex) { + } + } + } + + // spring-framework/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java + private void foo5() { + if (true) { + final String s = ""; + String constructorToUse; + synchronized (s) { + constructorToUse = ""; + if (constructorToUse == null) { + if (true) { + } + try { + if (System.getSecurityManager() != null) { + constructorToUse = ""; + } + else { + constructorToUse = ""; + } + } + catch (Exception ex) { + } + } + } + } + else { + } + } + + // openjdk8/src/windows/classes/sun/print/Win32PrintJob.java + private void foo6() { + String[] attrs; + if (true) { + attrs = null; + for (int i = 0; i < attrs.length; i++) { + } + } + + if (true) { + attrs = null; + for (int i = 0; i < attrs.length; i++) { + if (attrs[i] instanceof Object) { + } + if (attrs[i] instanceof Object) { + } + } + } + } + + // openjdk8/src/windows/classes/sun/awt/windows/WInputMethod.java + private void foo7() { + int index; + if (true) { + index = 0; + } + else if (true) { + index = 2; + } + else { + return; + } + if (true) { + index += 1; + } + } + + // openjdk8/src/solaris/classes/sun/print/UnixPrintJob.java + private void foo8() { + String[] attrs; + if (true) { + attrs = null; + for (int i = 0; i < attrs.length; i++) { + if (attrs[i] instanceof String) { + } + } + } + if (true) { + attrs = null; + for (int i = 0; i < attrs.length; i++) { + if (attrs[i] instanceof Object) { + } + if (attrs[i] instanceof String) { + } + } + } + } + + // openjdk8/src/solaris/classes/sun/java2d/xr/XRRenderer.java + private void foo9() { + int transx, transy; + + if (true) { + if (true) { + if (true) { + } + else { + } + transx = 2; + transy = 1; + } + else { + transx = 0; + transy = 0; + } + } + if (true) { + transx = 1; + transy = 2; + } + else { + transx = transy = 0; + } + + try { + } + finally { + } + } + + // openjdk8/src/solaris/classes/sun/awt/X11InputMethod.java + private void foo10() { + int index; + if (false) { + index = 0; + } + else if (true) { + index = 2; + } + else { + return; + } + if (false) { + index += 1; + } + } + + // jdk8/src/solaris/classes/java/util/prefs/FileSystemPreferences.java + private void foo11() { + if (true) + if (true) + return; + long lastModifiedTime; + if (true) { + lastModifiedTime = 1L; + if (true) { + } + } + else if (true) { + } + if (true) { + lastModifiedTime = 2L; + if (true) { + } + } + } + + // openjdk8/src/share/classes/sun/util/locale/provider/LocaleResources.java + private void foo12() { + String numElemKey; + if (true) { + numElemKey = ".NumberElements"; + if (true) { + } + } + if (true) { + numElemKey = ""; + if (true) { + } + } + } + + // openjdk8/src/share/classes/sun/tools/jar/Main.java + private void foo13() { + String out; + if (true) { + out = ""; + } + else { + out = ""; + if (true) { + } + } + if (true) { + out = ""; + } + if (true) { + } + out.toString(); + if (true) { + try { + out = ""; + } + catch (Exception ioe) { + } + finally { + if (true) { + } + if (true) { + out.toString(); + } + if (true) { + } + if (true) { + } + if (true) { + } + } + } + } + + // openjdk8/src/share/classes/sun/text/normalizer/NormalizerBase.java + private void foo14() { + int c, c2; // violation: Variable 'c2' should be declared final + if (true) { + } + if (true) { + if ((c = 'd') >= 0) { + if (true) { + c2 = 'a'; + if (true) { + if (true) { + if (true) { + } + c = c2; + } + else { + } + } + } + + if (true) { + } + } + return; + } + + } + + // openjdk8/src/share/classes/sun/text/normalizer/CharTrie.java + private void foo15() { + int limit; + if (true) { + limit = 0xdc00 >> 1; + limit = 2 + 1; + + } + } + + // openjdk8/src/share/classes/sun/text/bidi/BidiBase.java + private void foo16() { + final int a = 1; + byte level; + if (true) { + switch (a) { + case 1: + break; + case 2: + break; + case 3: + if (true) { + } + if ((true) || + (true)) { + level = 1; + if (true) { + } + if (true) { + } + break; + } + for (int i = 0; i < 14; i++) { + } + if (true) { + } + break; + case 4: + if (true) + break; + case 5: + if (true) { + if (true) { + break; + } + if (true) { + } + break; + } + if (true) { + } + break; + case 6: + break; + case 7: + for (int i = 0; i < 15458; i++) { + } + if (true) { + } + break; + + case 8: + break; + + case 9: + if (true) { + } + break; + case 10: + level = (byte) 1; + for (int i = 0; i < 12; i++) { + if (true) { + } + } + break; + case 11: + level = 1; + for (int i = 0; i < 12; i++) { + if (true) { + while (level < 2) { + } + while (true) { + } + } + if (true) { + continue; + } + } + break; + case 12: + level = (byte) 2; + for (int i = 0; i < 12; i++) { + if (true) { + } + } + break; + default: + throw new IllegalStateException("Internal ICU error in processPropertySeq"); + } + } + if (true) { + level = (byte) 12; + for (; ; ) { + } + } + } + + // openjdk8/src/share/classes/sun/security/ssl/CipherBox.java + private void foo17() { + try { + int newLen; + if (true) { + try { + newLen = 1; + } + catch (Exception ibse) { + } + } + else { + newLen = 2; + if (true) { + } + } + if (true) { + try { + } + catch (Exception e) { + } + } + if (true) { + newLen = 3; + if (true) { + if (true) { + } + } + } + return; + } + catch (Exception e) { + throw new ArrayIndexOutOfBoundsException(e.toString()); + } + } + + // openjdk8/src/share/classes/sun/security/ssl/CipherBox.java + private void foo18() throws Exception { + int newLen; + if (true) { + try { + newLen = 1; + } + catch (Exception ibse) { + } + } + else { + newLen = 2; + if (true) { + } + } + if (true) { + try { + } + catch (Exception e) { + } + } + if (true) { + newLen = 1; + if (true) { + if (true) { + throw new Exception("invalid explicit IV"); + } + } + } + return; + } + + // openjdk8/src/share/classes/sun/security/rsa/RSACore.java + private String foo19() { + String params; + synchronized (this) { + params = "blindingCache.get(modulus)"; + } + if (true) { + return params; + } + params = "new BlindingParameters(e, re, rInv)"; + synchronized (this) { + } + return params; + } + + // openjdk8/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java + private void foo20() { + String cert; + if (true) { + cert = "certPair.getForward()"; + if (true) { + } + } + if (true) { + cert = "certPair.getReverse()"; + if (true) { + } + } + } + + // openjdk8/src/share/classes/sun/security/pkcs11/P11KeyGenerator.java + private void foo21() throws Exception { + try { + final int keyType = 8; + String[] attributes; + switch (keyType) { + case 1: + case 2: + case 3: + attributes = null; + break; + default: + attributes = null; + break; + } + attributes = null; + return; + } + catch (Exception e) { + throw new Exception("Could not generate key", e); + } + finally { + } + } + + // openjdk8/src/share/classes/sun/security/krb5/internal/KDCReqBody.java + private void foo22() throws Exception { + String subDer; + if (true) { + subDer = ""; + if (true) { + while ("".equals(subDer)) { + } + for (int i = 0; i < 1541; i++) { + + } + } + else { + throw new Exception(); + } + } + else { + throw new Exception(); + } + if (true) { + } + if (true) { + } + if (true) { + if (true) { + subDer = ""; + if (true) { + while ("".equals(subDer)) { + } + } + else { + throw new Exception(); + } + if (true) { + } + } + else { + throw new Exception(); + } + } + if (true) { + throw new Exception(); + } + } + + // openjdk8/src/share/classes/sun/security/krb5/internal/KDCReq.java + private void foo23() throws Exception { + int bint; + if (true) { + throw new Exception(); + } + if (true) { + throw new Exception(); + } + if (true) { + bint = 1; + if (true) { + throw new Exception(""); + } + } + else { + throw new Exception(); + } + if (true) { + bint = 2; + if (bint == 4) { + throw new Exception(); + } + } + else { + throw new Exception(); + } + } + + // openjdk8/src/share/classes/sun/rmi/server/LoaderHandler.java + private void foo24() { + final String a = ""; + String loader; + synchronized (this) { + while ("".equals(a)) { + if (true) { + } + } + if (true) { + if (true) { + } + loader = ""; + } + loader = ""; + } + } + + // openjdk8/src/share/classes/sun/print/RasterPrinterJob.java + private void foo25() { + double w, h; + if (true) { + if (true) { + w = 11.0; + h = 12.2; + } + } + if (true) { + w = 1.0; + h = 2.5; + } + return; + } + + // openjdk8/src/share/classes/sun/print/PSStreamPrintJob.java + private void foo26() { + String[] attrs; + if (true) { + attrs = null; + for (int i = 0; i < attrs.length; i++) { + if (true) { + } + } + } + if (true) { + attrs = null; + for (int i = 0; i < attrs.length; i++) { + if (attrs[i] instanceof String) { + } + if (attrs[i] instanceof String) { + } + } + } + } + + // openjdk8/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java + private void foo27() { + String locUrl; + try { + locUrl = ""; + if (true) { + return; + } + } + catch (Exception mue) { + + locUrl = ""; + } + } + + // openjdk8/src/share/classes/sun/misc/Launcher.java + private void foo28() { + final String a = ""; + String[] path; + if (true) { + while ("".equals(a)) { + } + path = new String[5]; + while ("".equals(a)) { + if (true) { + path[1] = ""; + } + else { + path[2] = ""; + } + } + if (true) { + path[3] = ""; + } + else { + path[4] = ""; + } + if (true) { + path = new String[14]; + } + } + else { + path = new String[81]; + } + return; + } + + // openjdk8/src/share/classes/sun/misc/FloatingDecimal.java + private void foo29() { + int decExp; + parseNumber: + try { + if (true) { + throw new NumberFormatException("empty String"); + } + int i = 0; + switch (i) { + case '-': + case '+': + i++; + } + if (true) { + if (true) { + return; + } + break parseNumber; + } + else if (true) { + if (true) { + return; + } + break parseNumber; + } + else if (true) { + if (true) { + if (true) { + return; + } + } + } + skipLeadingZerosLoop: + while (i < 15) { + if (true) { + } + else if (true) { + if (true) { + throw new NumberFormatException("multiple points"); + } + if (true) { + } + } + else { + break skipLeadingZerosLoop; + } + i++; + } + digitLoop: + while (i < 12) { + if (true) { + } + else if (true) { + } + else if (true) { + if (true) { + throw new NumberFormatException("multiple points"); + } + if (true) { + } + } + else { + break digitLoop; + } + i++; + } + if (true) { + break parseNumber; + } + if (true) { + decExp = 1; + } + else { + decExp = 2; + } + if (true) { + switch (i) { + case '-': + case '+': + i++; + } + final int expAt = i; + expLoop: + while (i < 54) { + if (true) { + } + if (true) { + } + else { + i--; + break expLoop; + } + } + if (true) { + decExp = 12; + } + else { + decExp = decExp + 123; + } + if (i == expAt) { + break parseNumber; + } + } + if (i < 9788) { + break parseNumber; + } + if (true) { + return; + } + return; + } + catch (StringIndexOutOfBoundsException e) { + } + throw new NumberFormatException(); + } + + // openjdk8/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java + private void foo30() { + int transx, transy; + if (true) { + if (true) { + if (true) { + } + else { + } + transx = 1; + transy = 2; + } + else { + transx = 0; + transy = 0; + } + } + if (true) { + transx = 4; + transy = 1; + } + else { + transx = transy = 0; + } + } + + // openjdk8/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java + private void foo31() throws Exception { + String srcIL; + if (true) { + srcIL = ""; + if (srcIL != null) { + return; + } + } + if (true) { + try { + srcIL = ""; + } + catch (Exception e) { + throw new Exception("Unable to convert rasters"); + } + for (int y = 0; y < 12; y++) { + for (int x = 0; x < 12; x++) { + for (int i = 0; i < 5478; i++) { + } + } + for (int x = 0; x < 5; x++) { + for (int i = 0; i < 541; i++) { + } + } + } + } + else { + try { + srcIL = ""; + } + catch (Exception e) { + throw new Exception("Unable to convert rasters"); + } + } + } + + // openjdk8/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java + private void foo32() throws Exception { + String srcIL, dstIL; + try { + if (true) { + dstIL = ""; + + if (dstIL != null) { + srcIL = ""; + if (srcIL != null) { + return; + } + } + } + } + catch (Exception e) { + throw new Exception("Unable to convert images"); + } + if (true) { + if (true) { + } + try { + srcIL = ""; + dstIL = ""; + } + catch (Exception e) { + throw new Exception("Unable to convert images"); + } + } + else { + dstIL = ""; + } + } + + // openjdk8/src/share/classes/sun/font/FileFontStrike.java + private void foo33() { + float advance; + if (true) { + advance = 1234; + if (advance != Float.MAX_VALUE) { + if (true) { + return; + } + else { + return; + } + } + } + else if (true) { + if (true) { + advance = 123; + if (advance != Float.MAX_VALUE) { + if (true) { + return; + } + else { + return; + } + } + } + } + if (true) { + return; + } + if (true) { + advance = 12435; + } + else { + if (true) { + } + else { + } + if (true) { + advance = 123; + } + else { + advance = 123414; + } + } + if (true) { + } + else if (true) { + if (true) { + for (int i = 0; i < 214; i++) { + } + } + } + return; + } + + // openjdk8/src/share/classes/sun/awt/geom/AreaOp.java + private void foo34() { + final String s = ""; + int etag; + if (true) { + etag = 1; + do { + if (true) { + } + if (true) { + } + } while ("".equals(s)); + if (true) { + etag = 13213; + } + else { + } + } + else { + etag = 12312; + } + } + + // openjdk8/src/share/classes/javax/swing/text/html/parser/Parser.java + private void foo35() { + final int a = 8; + String elem; + switch (a) { + case 1: + switch (a) { + case '-': + while (true) { + if (true) { + } + } + default: + } + case '/': + switch (a) { + case '>': + case '<': + if (true) { + + } + elem = ""; + break; + default: + if (true) { + return; + } + switch (a) { + case '>': + case '<': + break; + default: + } + if (true) { + elem = ""; + } + else { + elem = ""; + } + break; + } + if (true) { + elem = ""; + if (true) { + return; + } + } + else { + if (true) { + elem = ""; + } + else { + elem = ""; + } + } + elem = ""; + } + } + + // openjdk8/src/share/classes/javax/swing/text/html/parser/Parser.java + private void foo36() { + String attname; + if (true) { + attname = ""; + if (true) { + } + else { + if (true) { + if (true) { + } + else { + } + } + } + } + else if (true) { + } + else if (true) { + if (true) { + attname = ""; + if (true) { + } + if (true) { + } + else { + if (true) { + if (true) { + } + } + } + } + else { + } + } + else if (true) { + attname = ""; + } + else if (true) { + return; + } + else { + if (true) { + } + else { + return; + } + } + if (true) { + attname = ""; + } + else { + } + } + + // openjdk8/src/share/classes/javax/swing/text/JTextComponent.java + private void foo37() { + int dot; + if (true) { + dot = 213213; + if (true) { + if (true) { + } + } + if (true) { + dot += 1; + if (true) { + try { + } + catch (Exception ble) { + } + } + } + } + else if (true) { + dot = 31; + } + } + + // openjdk8/src/share/classes/javax/swing/plaf/synth/ParsedSynthStyle.java + private void foo38() { + String painter; + if (true) { + if ((painter = "").equals("")) { + return; + } + } + if ((painter = "").equals("")) { + return; + } + } + + // openjdk8/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java + private void foo39() { + int spacing; + if (true) { + if (true) { + if (true); + } + else { + spacing = 4; + if (true) return; + } + } + if (true) { + spacing = 123; + if (true) return; + } + if (true) { + spacing = 12; + } + } + + // openjdk8/src/share/classes/javax/swing/plaf/basic/BasicBorders.java + private void foo40() { + String cBounds; + if (true) { + if (true) { + cBounds = ""; + } + if (true) { + cBounds = ""; + } + } + else { + if (true) { + cBounds = ""; + } + if (true) { + cBounds = ""; + } + } + } + + // openjdk8/src/share/classes/javax/swing/border/CompoundBorder.java + private void foo41() { + String nextInsets; + if (true) { + nextInsets = ""; + } + if (true) { + nextInsets = ""; + } + } + + // openjdk8/src/share/classes/javax/swing/JTree.java + private String foo42() { + if (true) { + String rowBounds; + if (true) { + rowBounds = ""; + if (true) { + if (true) { + return ""; + } + return ""; + } + if (true) { + if (true) { + rowBounds = ""; + return rowBounds; + } + } + else { + return rowBounds; + } + } + return ""; + } + return ""; + } + + // openjdk8/src/share/classes/javax/sql/rowset/spi/SyncFactory.java + private void foo43() { + String providerImpls; + try { + providerImpls = ""; + } + catch (Exception ex) { + providerImpls = null; + } + String strRowsetProperties; + try { + strRowsetProperties = ""; + } + catch (Exception ex) { + strRowsetProperties = ""; + } + } + + // openjdk8/src/share/classes/javax/sound/sampled/AudioSystem.java + private void foo45() { + String mixer; + if (true) { + if (true) { + if (true) { + mixer = ""; + if (mixer != null) { + return; + } + } + else { + mixer = ""; + if (mixer != null) { + return; + } + } + + } + } + if (true) { + mixer = ""; + if (mixer != null) { + return; + } + } + } + + // openjdk8/src/share/classes/javax/security/auth/SubjectDomainCombiner.java + private void foo46() { + String e; + if (true) { + synchronized (this) { + e = ""; + + } + synchronized (this) { + e = ""; + + } + } + } + + // openjdk8/src/share/classes/javax/naming/spi/NamingManager.java + private void foo47() { + final String a = ""; + String factory; + if (true) { + factory = ""; + } + if ("".equals(a)) { + factory = ""; + } + } + + // openjdk8/src/share/classes/java/util/regex/Pattern.java + private void foo48() { + int ch; + if (true) { + ch = 1; + } + if (true) { + ch = 2; + } + } + + // openjdk8/src/share/classes/java/util/concurrent/locks/StampedLock.java + private String foo49() { + long next; + if (!Thread.interrupted()) { + if (true) { + if (true) { + if ((next = 5) == 5) + return "next"; + } + else if ((next = 5) == 5) + return "next"; + } + if (true) + return "0L"; + if (true) + if ((next = 5) == 5) + return "next"; + } + return ""; + } + + // openjdk8/src/share/classes/java/time/Duration.java + private void foo50() { + long nanos; + try { + nanos = 1L; + } + catch (Exception ex2) { + nanos = 0L; + } + } + + // openjdk8/src/share/classes/java/text/CollationElementIterator.java + private void foo51() { + if (true) { + int vowel; + if (true) { + vowel = 1; + } + if (true) { + vowel = 2; + } + } + if (true) { + int consonant; + if (true) { + consonant = 23; + } + if (true) { + consonant =2; + } + } + } + + // openjdk8/src/share/classes/java/sql/DriverManager.java + private void foo52() { + String drivers; + try { + drivers = ""; + } + catch (Exception ex) { + drivers = null; + } + } + + // openjdk8/src/share/classes/java/security/Policy.java + private void foo53() { + String pc; + synchronized (this) { + pc = "Hello"; + } + pc = ""; + } + + // openjdk8/src/share/classes/java/lang/invoke/DirectMethodHandle.java + private void foo54() { + final int a = 1; + final String linkerName; + String lambdaName; + switch (a) { + case 1: + linkerName = "linkToVirtual"; + lambdaName = "DMH" + + ".invokeVirtual"; + break; + case 2: + linkerName = "linkToStatic"; + lambdaName = "DMH" + + ".invokeStatic"; + break; + case 3: + linkerName = "linkToStatic"; + lambdaName = "DMH.invokeStaticInit"; + break; + case 4: + linkerName = "linkToSpecial"; + lambdaName = "DMH" + + ".invokeSpecial"; + break; + case 5: + linkerName = "linkToInterface"; + lambdaName = "DMH" + + ".invokeInterface"; + break; + case 6: + linkerName = "linkToSpecial"; + lambdaName = "DMH" + + ".newInvokeSpecial"; + break; + default: + throw new InternalError("which="); + } + lambdaName += "_"; + } + + // openjdk8/src/share/classes/java/lang/Class.java + private String foo55() { + String res; + if (true) { + res = ""; + if (res != null) return res; + } + if (true) { + res = "temporaryRes"; + } + else { + res = ""; + } + if (true) { + if (true) { + } + else { + } + } + return ""; + } + + // openjdk8/src/share/classes/java/awt/geom/CubicCurve2D.java + private void foo56() { + int num; + if (true) { + num = 3; + } + else { + num = 1; + if (true) { + num = 2; + } + } + if (num > 1) { + num = 2; + } + } + + // openjdk8/src/share/classes/java/awt/geom/AffineTransform.java + private void foo57() { + final int a = 1; + double T01, T10; + switch (a) { + case 1: + break; + case 9: + case 11: + case 12: + break; + case 123: + case 14: + break; + case 1234: + case 12345: + break; + case 566: + case 8678: + break; + case 534: + case 7968: + case 86785678: + case 86759789: + break; + case 346547: + T01 =1; + T10 = 2; + break; + case 432534523: + case 5345235: + break; + case 235345: + case 523452345: + break; + case 75675467: + break; + } + T01 = 21; + T10 = 53; + } + + // openjdk8/src/share/classes/java/awt/event/WindowEvent.java + private void foo58() { + final int a = 54; + String typeStr; + switch (a) { + case 1: + typeStr = "WINDOW_OPENED"; + break; + case 2: + typeStr = "WINDOW_CLOSING"; + break; + case 3: + typeStr = "WINDOW_CLOSED"; + break; + case 4: + typeStr = "WINDOW_ICONIFIED"; + break; + case 5: + typeStr = "WINDOW_DEICONIFIED"; + break; + case 6: + typeStr = "WINDOW_ACTIVATED"; + break; + case 7: + typeStr = "WINDOW_DEACTIVATED"; + break; + case 8: + typeStr = "WINDOW_GAINED_FOCUS"; + break; + case 9: + typeStr = "WINDOW_LOST_FOCUS"; + break; + case 10: + typeStr = "WINDOW_STATE_CHANGED"; + break; + default: + typeStr = "unknown type"; + } + typeStr += ","; + } + + // openjdk8/src/share/classes/com/sun/tools/example/debug/tty/Commands.java + private void foo59() { + String spec; + if (true) { + spec = ""; + } + if (true) { + spec = ""; + } + } + + // openjdk8/src/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java + private void foo60() throws Exception { + final int a = 1; + String text; + switch (a) { + case 1: + text = ""; + break; + case 2: + text = "Warning: "; + break; + case 3: + text = "Error: "; + break; + default: + throw new Exception(); + } + final String message = ""; + if (message != null) { + text += message; + } + } + + // openjdk8/src/share/classes/com/sun/net/ssl/SSLSecurity.java + private void foo61() { + String tmaw; + if (true) { + tmaw = ""; + for (int i = 0; i < 10; i++) { + if (true) { + if (true) { + tmaw = ""; + } + } + else { + tmaw = ""; + } + } + if (true) { + tmaw = ""; + } + } + else { + tmaw = null; + } + } + + // openjdk8/src/share/classes/com/sun/jndi/dns/DnsContext.java + private void foo62() { + String znode; + synchronized (this) { + znode = ""; + } + if (znode != null) { + synchronized (znode) { + } + if (true) { + if (true) { + synchronized (znode) { + if (true) { + } + else if (true) { + } + else { + return; + } + } + if (true) { + return; + } + } + } + } + synchronized (this) { + znode = ""; + } + } + + // openjdk8/src/share/classes/com/sun/java/swing/plaf/gtk/GTKColorType.java + private void foo63() { + float h; + float l; + float s; + synchronized (this) { + h = 1; + l = 2; + s = 3; + } + h = 4; + l = 5; + s = 6; + } + + // openjdk8/src/macosx/classes/sun/lwawt/macosx/CInputMethod.java + private void foo64() { + int index; + if (true) { + index = 0; + } + else if (true) { + index = 2; + } + else { + return; + } + if (true) { + index += 1; + } + } + + // apache-struts/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java + private void foo65() { + String name; + if (true) { + name = "uri"; + } + else if (true) { + name = ""; + } + else if (true) { + name = ""; + } + else { + name = ""; + } + if (true) { + if (true) { + name = ""; + } + } + } + + // infinispan/remoting/transport/jgroups/JGroupsTransport.java + private void foo66() { + String cfg; + if (true) { + if (true) { + cfg = ""; + } + if (true) { + cfg = ""; + } + if (true) { + cfg = ""; + } + } + } + + // hibernate-core/src/main/java/org/hibernate/bytecode/internal/javassist/BytecodeProviderImpl.java + private void foo67() { + String fastClass; + try { + fastClass = ""; + if (true) { + if (fastClass == null) { + } + else { + } + } + } + catch (Throwable t) { + fastClass = null; + } + } + + // guava-mvnstyle/guava/src/com/google/common/net/InetAddresses.java + private void foo68() { + int partsLo; + if (true) { + partsLo = 1; + if ( --partsLo != 0) { + return; + } + if (true) { + return; + } + } + else { + partsLo = 0; + } + } + + // guava-mvnstyle/guava/src/com/google/common/collect/TreeMultiset.java + private void foo69() { + String node; + if (true) { + node = ""; + if (node == null) { + return; + } + if (true) { + node = ""; + } + } + else { + node = ""; + } + } + + // guava-mvnstyle/guava/src/com/google/common/cache/LongAddables.java + private void foo70() { + String supplier; + try { + supplier = ""; + } + catch (Throwable t) { + supplier = ""; + } + } + + // findbugs/src/java/edu/umd/cs/findbugs/detect/FindNullDeref.java + private void foo71() { + int priority; + if (true) { + priority = 1; + } + else if (true) { + priority = 2; + } + else { + return; + } + if (true) { + priority++; + } + if (true) { + priority++; + } + } + + // findbugs/src/java/edu/umd/cs/findbugs/ba/PruneUnconditionalExceptionThrowerEdges.java + private void foo72() { + String p; + try { + p = ""; + } + catch (RuntimeException e) { + p = ""; + } + } + + // findbugs/eclipsePlugin/src/de/tobject/findbugs/actions/MarkerRulerAction.java + private void foo73() { + String control; + if (true) { + if (true) { + control = ""; + if (control != null) { + } + } + } + if (true) { + if (true) { + } + if (true) { + control = ""; + if (control != null) { + } + } + } + } + + // findbugs/eclipsePlugin/src/de/tobject/findbugs/DetectorsExtensionHelper.java + private void foo75() { + String libPathAsString; + try { + libPathAsString = ""; + if (libPathAsString == null) { + } + libPathAsString = ""; + if (libPathAsString == null) { + } + + } catch(Exception ex) { + + } + } + + // findbugs/src/java/edu/umd/cs/findbugs/detect/FindNullDeref.java + private void foo76() { + int priority; + if (true) { + priority = 2; + } + else if (true) { + priority = 3; + } + else { + return; + } + + if (true) { + priority++; + } + if (true) { + priority++; + } + } + + // elasticsearch/src/main/java/org/elasticsearch/index/search/child/ParentIdsFilter.java + private void foo77() { + if (true) { + int docId; + if (true) { + docId = 21; + if (docId != 1254) { + } + else { + } + } + else { + docId = 45234; + if (true) { + } + } + if (true) { + docId = 3213213; + } + } + } + + // elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/BindingBuilder.java + private void foo78() { + String injectionPoints; + if (true) { + try { + injectionPoints = ""; + } + catch (Exception e) { + injectionPoints = ""; + } + } + else { + injectionPoints = ""; + } + } + + // apache-struts/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java + private void foo79() { + String name; + if (true) { + name = ""; + } + else if (true) { + name = ""; + } + else if (true) { + name = ""; + } + else { + name = ""; + } + if (true) { + if (true) { + name = ""; + } + } + } + + // apache-ant/src/main/org/apache/tools/ant/types/PropertySet.java + private void foo80() { + String names; + if (true) { + names = ""; + if (true) { + names = ""; + } + } + else { + names = ""; + } + } + + // apache-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java + private void foo81() { + StringBuffer msg; + synchronized (this) { + msg = new StringBuffer(" ["); + } + synchronized (this) { + msg = new StringBuffer(" ["); + } + } + + // Hbase/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java + private void foo82() { + String filesToCompact; + try { + synchronized (this) { + filesToCompact = ""; + filesToCompact = ""; + } + } + finally { + } + } + + // Hbase/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java + private void foo83() { + String key; + if (true) { + try { + key = ""; + } + catch (Exception e) { + if (true) { + try { + key = ""; + } + catch (Exception ex) { + } + } + } + } + else { + key = ""; + } + } + + // Hbase/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.java + private void foo84() { + float newMemstoreSize; + float newBlockCacheSize; + if (true) { + newBlockCacheSize = 354; + newMemstoreSize = 534; + } + else if (true) { + newBlockCacheSize = 213213; + newMemstoreSize = 53425; + } + else { + return; + } + if (true) { + newMemstoreSize = 2; + } + else if (true) { + newMemstoreSize = 3; + } + if (true) { + newBlockCacheSize = 354; + } + else if (true) { + newBlockCacheSize = 14; + } + } + + // Hbase/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java + private void foo85() { + boolean needNewPlan; + try { + if (true) { + } + if (true) { + needNewPlan = true; + } + else { + if (true) { + } + return; + } + } + catch (Throwable t) { + if (t instanceof Object) { + } + if (true) { + if (true) { + if (t instanceof Object) { + } + else { + } + } + try { + needNewPlan = false; + if (true) { + } + else if (true) { + needNewPlan = true; + } + } + catch (Exception ie) { + return; + } + } + else if (true) { + needNewPlan = false; + } + else { + needNewPlan = true; + } + } + } + + // Hbase/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.java + private void foo86() { + String result; + try { + try { + result = ""; + if (true) { + if (true) { + } + } + } + catch (Exception e) { + if (true) { + } + if (true) { + } + else { + } + result = ""; + } + } + catch (Exception ex) { + } + } + + // Hbase/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java + private void foo87() { + int count; + if (true) { + return; + } + try { + count = 2; + } + catch (Exception ieo) { + throw ieo; + } + catch (Error e) { + count = -1; + } + } + + // Hbase/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java + private void foo88() { + String c; + synchronized (this) { + try { + c = ""; + } + catch (Exception e) { + return; + } + } + if (true) { + if (true) + c = null; + } + } + + private void foo89() { + final int a = 8; + String b; + switch (a) { + case 8: + b = "b"; + break; + default: + b = "c"; + break; + } + } + + private void foo90() { + final int a = 8; + String b; + switch (a) { + default: + b = "c"; + } + b = "b"; + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputFinalLocalVariableMultipleAndNestedConditions.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputFinalLocalVariableMultipleAndNestedConditions.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputFinalLocalVariableMultipleAndNestedConditions.java @@ -0,0 +1,79 @@ +package com.puppycrawl.tools.checkstyle.checks.coding; + +public class InputFinalLocalVariableMultipleAndNestedConditions { + + // False positive + // https://github.com/checkstyle/checkstyle/issues/3186 + void method() { + for (int i = 0; i < 2; i++) { + final Object converter = new Object(); + final String type = getType(); + Object value; + + if ("s1".equals(type)) { + if (getCondition(1)) { + value = getValue(1); + } + else { + continue; + } + } + else if ("s2".equals(type)) { + if (getCondition(2)) { + value = getValue(2); + } + else { + continue; + } + } + else { + continue; + } + + if (converter != null) { + value = /* converter. */getValue(1, type, value); + } + } + } + + // False positive + // https://github.com/checkstyle/checkstyle/issues/3186 + void method2() { + for (int i = 0; i < 2; i++) { + final Object converter = new Object(); + final Object element = new Object(); + String name; + + if (getCondition(1)) { + name = "1"; + } else if (getCondition(2)) { + name = "2"; + } else { + continue; + } + + if (converter != null) { + name = /* converter. */getName(element, name); + + if (name == null) + continue; + } + } + } + + public Object getValue(int i) { + return null; + } + public Object getValue(int i, String type, Object value) { + return value; + } + public boolean getCondition(int i) { + return true; + } + public String getType() { + return "s1"; + } + private String getName(Object element, String name) { + return "s"; + } +}
FinalLocalVariableCheck: false positive from multiple and nested conditions ``` $ cat TestClass.java package test; public class TestClass { void method() { for (int i = 0; i < 2; i++) { final Object converter = new Object(); final String type = getType(); Object value; if ("s1".equals(type)) { if (getCondition(1)) { value = getValue(1); } else { continue; } } else if ("s2".equals(type)) { if (getCondition(2)) { value = getValue(2); } else { continue; } } else { continue; } if (converter != null) { value = /* converter. */getValue(1, type, value); } } } void method2() { for (int i = 0; i < 2; i++) { final Object converter = new Object(); final Object element = new Object(); String name; if (getCondition(1)) { name = "1"; } else if (getCondition(2)) { name = "2"; } else { continue; } if (converter != null) { name = /* converter. */getName(element, name); if (name == null) continue; } } } public Object getValue(int i) { return null; } public Object getValue(int i, String type, Object value) { return value; } public boolean getCondition(int i) { return true; } public String getType() { return "s1"; } private String getName(Object element, String name) { return "s"; } } $ cat TestConfig.xml <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> <module name="Checker"> <property name="charset" value="UTF-8"/> <module name="TreeWalker"> <module name="FinalLocalVariable" /> </module> </module> $ java -jar checkstyle-6.18-all.jar -c TestConfig.xml TestClass.java Starting audit... [ERROR] TestClass.java:8:20: Variable 'value' should be declared final. [FinalLocalVariable] [ERROR] TestClass.java:40:20: Variable 'name' should be declared final. [FinalLocalVariable] Audit done. Checkstyle ends with 2 errors. ``` This is a trimmed down version of my code. As before, these can't be declared `final` since there is a chance they can be assigned twice. Eclipse confirms this for me by giving an error when I try to declare them `final`.
It seems like the issue might be with these lines: [FinalLocalVariableCheck.java#L477](https://github.com/checkstyle/checkstyle/blob/eb5b977a475c2240db5efc83aec8973d734895eb/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java#L477) and [FinalLocalVariableCheck.java#L215](https://github.com/checkstyle/checkstyle/blob/eb5b977a475c2240db5efc83aec8973d734895eb/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java#L215) `assignOutsideConditionalBlock` is false, for these cases which is why it isn't removed. It thinks of the code as one big grouped conditional block, instead of many separately grouped conditional blocks. The check needs to be updated to differentiate between separate grouped conditional blocks, If the variable is assigned in atleast 2 different grouped conditional blocks then it can't be final. `method2` is the simple example. `method1` shows that multi-layered if statements need to be merged up to next if statement level. Even though the second level ifs are all separate, they are part of the bigger first level if.
2016-07-22T18:01:01Z
7
checkstyle/checkstyle
1,485
checkstyle__checkstyle-1485
[ "1349" ]
ee33ed57cd2c88888e9821a2047f587f07283d98
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.java @@ -33,7 +33,7 @@ * lineWrappingIndentation parameter. * * @author maxvetrenko - * + * @author <a href="mailto:piotr.listkiewicz@gmail.com">liscju</a> */ public class LineWrappingHandler { @@ -222,10 +222,13 @@ private void checkAnnotationIndentation(DetailAST atNode, while (firstNodesOnLines.size() > 1) { final DetailAST node = itr.next(); - if (node.getLineNo() < lastAnnotationLine - || node.getLineNo() == lastAnnotationLine) { + if (node.getLineNo() <= lastAnnotationLine) { final DetailAST parentNode = node.getParent(); - if (node.getType() == TokenTypes.AT + final boolean isCurrentNodeCloseAnnotationAloneInLine = + node.getLineNo() == lastAnnotationLine + && node.equals(lastAnnotationNode); + if (isCurrentNodeCloseAnnotationAloneInLine + || node.getType() == TokenTypes.AT && parentNode.getParent().getType() == TokenTypes.MODIFIERS) { logWarningMessage(node, firstNodeIndent); }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java @@ -331,6 +331,24 @@ public void testDifficultAnnotations() throws Exception { verifyWarns(checkConfig, getPath("InputDifficultAnnotations.java"), expected); } + @Test + public void testAnnotationClosingParenthesisEndsInSameIndentationAsOpening() throws Exception { + final DefaultConfiguration checkConfig = createCheckConfig(IndentationCheck.class); + + checkConfig.addAttribute("basicOffset", "4"); + checkConfig.addAttribute("forceStrictCondition", "true"); + checkConfig.addAttribute("tabWidth", "4"); + + final String[] expected = { + "19: " + getCheckMessage(MSG_ERROR, ")", 16, 0), + "22: " + getCheckMessage(MSG_ERROR, ")", 8, 4), + }; + + verifyWarns(checkConfig, + getPath("InputAnnotationClosingParenthesisEndsInSameIndentationAsOpening.java"), + expected); + } + @Test public void testAnonClassesFromGuava() throws Exception { final DefaultConfiguration checkConfig = createCheckConfig(IndentationCheck.class); diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputAnnotationClosingParenthesisEndsInSameIndentationAsOpening.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputAnnotationClosingParenthesisEndsInSameIndentationAsOpening.java new file mode 100644 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputAnnotationClosingParenthesisEndsInSameIndentationAsOpening.java @@ -0,0 +1,24 @@ +package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0 + +@interface SimpleType { //indent:0 exp:0 + Class<?> value(); //indent:4 exp:4 +} //indent:0 exp:0 + +@SimpleType( //indent:0 exp:0 + value = Boolean.class //indent:4 exp:4 +) //indent:0 exp:0 +public class InputAnnotationClosingParenthesisEndsInSameIndentationAsOpening { //indent:0 exp:0 +} //indent:0 exp:0 + +@SimpleType( value = Boolean.class //indent:0 exp:0 +) //indent:0 exp:0 +class InputAnnotationClosingParenthesisJustLineAfterOpeningSameIndentationAsOpening { //indent:0 exp:0 +} //indent:0 exp:0 + +@SimpleType( value = Boolean.class //indent:0 exp:0 + ) //indent:16 exp:0 warn +class InputAnnotationClosingParenthesHasBadIndentation { //indent:0 exp:0 + @SimpleType( value = Boolean.class //indent:4 exp:4 + ) //indent:8 exp:4 warn + Boolean booleanField; //indent:4 exp:4 +} //indent:0 exp:0 \ No newline at end of file
Indentation on annotation parameters is wrong When using `<property name="tabWidth" value="4"/><module name="Indentation"/>`, during build checkstyle 6.8.1 complains about: ``` @Cascade( org.hibernate.annotations.CascadeType.DELETE_ORPHAN ) ``` with: ``` ClickConfig.java:77: ')' have incorrect indentation level 4, expected level should be 8. ``` But it should accept such formatting as the right parenthes closes a block that started on indentation level 4, so it should also be on 4, not on 8.
2015-07-26T21:19:09Z
6.14
checkstyle/checkstyle
1,399
checkstyle__checkstyle-1399
[ "1421" ]
c09131defe36dde56b2d9767d1953d93e20bd200
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.java --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.java @@ -24,9 +24,9 @@ import com.puppycrawl.tools.checkstyle.api.FileContents; import com.puppycrawl.tools.checkstyle.api.JavadocTagInfo; import com.puppycrawl.tools.checkstyle.api.Scope; -import com.puppycrawl.tools.checkstyle.ScopeUtils; import com.puppycrawl.tools.checkstyle.api.TextBlock; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.ScopeUtils; import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.checks.CheckUtils; import java.util.List; @@ -37,6 +37,9 @@ /** * Checks the Javadoc of a type. * + * <p>Does not perform checks for author and version tags for inner classes, as + * they should be redundant because of outer class. + * * @author Oliver Burn * @author Michael Tamm */ @@ -184,13 +187,15 @@ public void visitToken(DetailAST ast) { if (cmt == null) { log(lineNo, JAVADOC_MISSING); } - else if (ScopeUtils.isOuterMostType(ast)) { - // don't check author/version for inner classes + else { final List<JavadocTag> tags = getJavadocTags(cmt); - checkTag(lineNo, tags, JavadocTagInfo.AUTHOR.getName(), - authorFormatPattern, authorFormat); - checkTag(lineNo, tags, JavadocTagInfo.VERSION.getName(), - versionFormatPattern, versionFormat); + if (ScopeUtils.isOuterMostType(ast)) { + // don't check author/version for inner classes + checkTag(lineNo, tags, JavadocTagInfo.AUTHOR.getName(), + authorFormatPattern, authorFormat); + checkTag(lineNo, tags, JavadocTagInfo.VERSION.getName(), + versionFormatPattern, versionFormat); + } final List<String> typeParamNames = CheckUtils.getTypeParameterNames(ast);
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckTest.java --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckTest.java @@ -319,6 +319,8 @@ public void testTypeParameters() throws Exception { final String[] expected = { "7:4: " + getCheckMessage(UNUSED_TAG, "@param", "<D123>"), "11: " + getCheckMessage(MISSING_TAG, "@param <C456>"), + "44:8: " + getCheckMessage(UNUSED_TAG, "@param", "<C>"), + "47: " + getCheckMessage(MISSING_TAG, "@param <B>"), }; verify(checkConfig, getPath("InputTypeParamsTags.java"), expected); } @@ -330,6 +332,7 @@ public void testAllowMissingTypeParameters() throws Exception { checkConfig.addAttribute("allowMissingParamTags", "true"); final String[] expected = { "7:4: " + getCheckMessage(UNUSED_TAG, "@param", "<D123>"), + "44:8: " + getCheckMessage(UNUSED_TAG, "@param", "<C>"), }; verify(checkConfig, getPath("InputTypeParamsTags.java"), expected); } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputTypeParamsTags.java b/src/test/resources/com/puppycrawl/tools/checkstyle/InputTypeParamsTags.java --- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputTypeParamsTags.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/InputTypeParamsTags.java @@ -37,4 +37,14 @@ public <Z> void doSomethingElse() public <L> void doSomethingElse2(L aAnEl) { } + + /** + * Example inner class. + * @param <A> documented parameter + * @param <C> extra parameter + */ + + public static class InnerClass<A,B> + { + } }
JavadocType ignores param tags in InnerClass Inner classes are not checked with JavadocType check for missing or extra `@param` tags The following code is Ok, but `@param` tags are wrong set in the javadoc ``` java /** * Example inner class. * @param <A> documented parameter * @param <C> extra parameter */ public static class InnerClass<A,B> { } ```
2015-07-17T09:32:07Z
6.8
iamkun/dayjs
2,369
iamkun__dayjs-2369
[ "2364" ]
f0a0b546b074b3b511c2319a1ce83d412894b91f
diff --git a/src/plugin/duration/index.js b/src/plugin/duration/index.js --- a/src/plugin/duration/index.js +++ b/src/plugin/duration/index.js @@ -198,7 +198,7 @@ class Duration { } else { base = this.$d[pUnit] } - return base === 0 ? 0 : base // a === 0 will be true on both 0 and -0 + return base || 0 // a === 0 will be true on both 0 and -0 } add(input, unit, isSubtract) {
diff --git a/test/plugin/duration.test.js b/test/plugin/duration.test.js --- a/test/plugin/duration.test.js +++ b/test/plugin/duration.test.js @@ -186,6 +186,12 @@ describe('Add', () => { expect(a.add({ days: 5 }).days()).toBe(6) }) +describe('Add to a dayjs()', () => { + const a = dayjs() + const b = dayjs.duration({ hours: 7, minutes: 10 }) + expect(a.add(b)).toEqual(a.add(7, 'hours').add(10, 'minutes')) +}) + test('Add duration', () => { const a = dayjs('2020-10-01') const days = dayjs.duration(2, 'days')
dayjs add duration returns Invalid Date **Describe the bug** dayjs().add(dayjs.duration({ "hours" : 7, "minutes" : 10) })) returns "invalid Date" only "hours" and "minutes" are in the duration object dayjs.duration(7, "hours").add(10, "minutes") is working **Information** - Day.js Version 1.11.9 - Time zone: GMT+02:00 [MESZ]
Can reproduce after upgrading from 1.11.7 to 1.11.9. Example usage ``` dayjs.extend(duration) dayjs.extend(utc) dayjs.extend(objectSupport) // Invalid Date dayjs.utc({ hours: 11, minutes: 30, seconds: 0} ).add(dayjs.duration({ hours: 11, minutes: 0, seconds: 0 }) ``` I've used `dayjs().add(duration.asSeconds(), 'seconds')` as a workaround which works for my usecase will fix soon
2023-07-10T12:49:23Z
1.11
iamkun/dayjs
2,377
iamkun__dayjs-2377
[ "2376" ]
f0a0b546b074b3b511c2319a1ce83d412894b91f
diff --git a/src/plugin/duration/index.js b/src/plugin/duration/index.js --- a/src/plugin/duration/index.js +++ b/src/plugin/duration/index.js @@ -139,7 +139,8 @@ class Duration { let seconds = this.$d.seconds || 0 if (this.$d.milliseconds) { - seconds += Math.round(this.$d.milliseconds) / 1000 + seconds += this.$d.milliseconds / 1000 + seconds = Math.round(seconds * 1000) / 1000 } const S = getNumberUnitFormat(seconds, 'S')
diff --git a/test/plugin/duration.test.js b/test/plugin/duration.test.js --- a/test/plugin/duration.test.js +++ b/test/plugin/duration.test.js @@ -77,6 +77,15 @@ describe('Creating', () => { expect(dayjs.duration(1000.5).toISOString()).toBe('PT1.001S') expect(dayjs.duration(-1000.5).toISOString()).toBe('-PT1S') }) + it('should handle floating point rounding errors', () => { + // An example of this is when adding 2 to 0.812 seconds, which is how + // the seconds component is calculated in .toISOString(). + // > 2 + 0.812 + // 2.8120000000000003 + expect(dayjs.duration(-2812).toISOString()).toBe('-PT2.812S') // was -PT2.8120000000000003S + expect(dayjs.duration(3121632.27382247).toISOString()).toBe('PT52M1.632S') // was PT52M1.6320000000000001S + expect(dayjs.duration(7647826.525774224).toISOString()).toBe('PT2H7M27.827S') // was PT2H7M27.826999999999998S + }) }) describe('Parse ISO string', () => {
`Duration.toISOString()` fractional seconds still have precision issues with certain values Problem: originally submitted in #2366 - I didn't completely fix this apparently. I mistakenly assumed I could round the milliseconds value alone, and then add it to the integer of seconds. However Javascript will encounter floating-point rounding errors occasionally and the same precision issues are seen. Expected behavior Example: Input: duration(2812) Expected: PT2.812S Actual: PT2.8120000000000003S Information Day.js Version [e.g. dev] OS: All Browser All Time zone: N/A
2023-07-14T19:51:39Z
1.11
iamkun/dayjs
2,231
iamkun__dayjs-2231
[ "2230" ]
e70bee7f840c89ec523b9ac997e5ac621a522726
diff --git a/src/index.js b/src/index.js --- a/src/index.js +++ b/src/index.js @@ -280,7 +280,7 @@ class Dayjs { const matches = { YY: String(this.$y).slice(-2), - YYYY: this.$y, + YYYY: Utils.s(this.$y, 4, '0'), M: $M + 1, MM: Utils.s($M + 1, 2, '0'), MMM: getShort(locale.monthsShort, $M, months, 3),
diff --git a/test/display.test.js b/test/display.test.js --- a/test/display.test.js +++ b/test/display.test.js @@ -260,3 +260,15 @@ it('As JSON -> toJSON', () => { it('As ISO 8601 String -> toISOString e.g. 2013-02-04T22:44:30.652Z', () => { expect(dayjs().toISOString()).toBe(moment().toISOString()) }) + +it('Year 1 formatted with YYYY should pad with zeroes', () => { + const date = new Date(1, 0, 1) + date.setUTCFullYear(1) // Required because 0-99 are parsed as 19xx in JS: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/Date#year + expect(dayjs(date).format('YYYY')).toBe('0001') +}) + +it('Year 1 formatting matches moment format', () => { + const date = new Date(1, 0, 1) + date.setUTCFullYear(1) + expect(dayjs(date).format('YYYY')).toBe(moment(date).format('YYYY')) +})
'YYYY' results in missing leading zeroes when year <1000 **Describe the bug** If the year component of a date is less than 1000, the leading zeroes are omitted when trying to format the year with `'YYYY'`. E.g.: ```js dayjs(Date.parse('0001-01-01')).format('YYYY-MM-DD') //=> '1-01-01' dayjs(Date.parse('0010-01-01')).format('YYYY-MM-DD') //=> '10-01-01' dayjs(Date.parse('0100-01-01')).format('YYYY-MM-DD') //=> '100-01-01' ``` **Expected behavior** `'YYYY'` in the format string should place leading zeroes to make sure the year takes up 4 digits in the output. E.g.: ```js dayjs(Date.parse('0001-01-01')).format('YYYY-MM-DD') //=> '0001-01-01' dayjs(Date.parse('0010-01-01')).format('YYYY-MM-DD') //=> '0010-01-01' dayjs(Date.parse('0100-01-01')).format('YYYY-MM-DD') //=> '0100-01-01' ``` **Information** - Day.js Version: v1.11.7 - OS: Windows 11 - Browser Firefox, NodeJS console - Time zone: CET (UTC +1), Central European Time (Europe/Stockholm) (DST not in effect)
2023-02-07T09:19:20Z
1.11
iamkun/dayjs
1,571
iamkun__dayjs-1571
[ "1569" ]
755fc8bb1c532eb991459f180eee81367d12016c
diff --git a/src/plugin/customParseFormat/index.js b/src/plugin/customParseFormat/index.js --- a/src/plugin/customParseFormat/index.js +++ b/src/plugin/customParseFormat/index.js @@ -232,7 +232,10 @@ export default (o, C, d) => { this.$d = parseFormattedInput(date, format, utc) this.init() if (pl && pl !== true) this.$L = this.locale(pl).$L - if (isStrict && date !== this.format(format)) { + // use != to treat + // input number 1410715640579 and format string '1410715640579' equal + // eslint-disable-next-line eqeqeq + if (isStrict && date != this.format(format)) { this.$d = new Date('') } // reset global locale to make parallel unit test
diff --git a/test/plugin/customParseFormat.test.js b/test/plugin/customParseFormat.test.js --- a/test/plugin/customParseFormat.test.js +++ b/test/plugin/customParseFormat.test.js @@ -5,6 +5,7 @@ import '../../src/locale/ru' import uk from '../../src/locale/uk' import '../../src/locale/zh-cn' import customParseFormat from '../../src/plugin/customParseFormat' +import advancedFormat from '../../src/plugin/advancedFormat' import localizedFormats from '../../src/plugin/localizedFormat' dayjs.extend(customParseFormat) @@ -376,4 +377,8 @@ it('parse X x', () => { const input2 = '1410715640579' const format2 = 'x' expect(dayjs(input2, format2).valueOf()).toBe(moment(input2, format2).valueOf()) + + // x X starct parse requires advancedFormat plugin + dayjs.extend(advancedFormat) + expect(dayjs(input2, format2, true).valueOf()).toBe(moment(input2, format2, true).valueOf()) })
Parsing with Unix Timestamp tokens (X/x) and other visual tokens in strict mode results in Invalid Date **Describe the bug** When X/x token is used and there are visual/escaped tokens in strict mode you get `Invalid Date`, best described with this code snippet and log result: <details><summary>source: </summary> ```js const dayjs = require('dayjs'); dayjs.extend(require('dayjs/plugin/customParseFormat')) dayjs.extend(require('dayjs/plugin/advancedFormat')) console.log( [ [ 'now format', () => dayjs().format('x'), () => dayjs().format('X'), ], [ 'x', () => dayjs('/Date(1623787200000)/', '/[Date](x)/').format('/[Date](x)/'), () => dayjs('/1623787200000/', '/X/').format('/[Date](X)/'), () => dayjs('--1623787200000--', '--X--').format('/[Date](X)/'), () => dayjs('1623787200000', 'x').format('x'), () => dayjs('1623787200000', 'x').format('YYYY-MM-DD'), ], [ 'X', () => dayjs('/Date(1623787200)/', '/[Date](X)/').format('/[Date](X)/'), () => dayjs('/1623787200/', '/X/').format('/[Date](X)/'), () => dayjs('--1623787200--', '--X--').format('/[Date](X)/'), () => dayjs('1623787200', 'X').format('X'), () => dayjs('1623787200', 'X').format('YYYY-MM-DD'), ], [ 'x STRICT', () => dayjs('/Date(1623787200000)/', '/[Date](x)/', true).format('/[Date](x)/'), () => dayjs('/1623787200000/', '/x/', true).format('/[Date](x)/'), () => dayjs('--1623787200000--', '--x--', true).format('/[Date](x)/'), () => dayjs('1623787200000', 'x', true).format('x'), () => dayjs('1623787200000', 'x', true).format('YYYY-MM-DD'), ], [ 'X STRICT', () => dayjs('/Date(1623787200)/', '/[Date](X)/', true).format('/[Date](X)/'), () => dayjs('/1623787200/', '/X/', true).format('/[Date](X)/'), () => dayjs('--1623787200--', '--X--', true).format('/[Date](X)/'), () => dayjs('1623787200', 'X', true).format('X'), () => dayjs('1623787200', 'X', true).format('YYYY-MM-DD'), ], ] .map( ([name, ...cases]) => '\n// ' + name + '\n' + cases.map((f) => `${f.toString().substring(6)} // ${f()}`).join('\n') ) .join('\n') ); ``` </details> output: ```js // now format dayjs().format('x') // 1625563406782 dayjs().format('X') // 1625563406 // x dayjs('/Date(1623787200000)/', '/[Date](x)/').format('/[Date](x)/') // /Date(1625515200000)/ dayjs('/1623787200000/', '/X/').format('/[Date](X)/') // /Date(1625515200)/ dayjs('--1623787200000--', '--X--').format('/[Date](X)/') // /Date(1625515200)/ dayjs('1623787200000', 'x').format('x') // 1623787200000 dayjs('1623787200000', 'x').format('YYYY-MM-DD') // 2021-06-16 // X dayjs('/Date(1623787200)/', '/[Date](X)/').format('/[Date](X)/') // /Date(1625515200)/ dayjs('/1623787200/', '/X/').format('/[Date](X)/') // /Date(1625515200)/ dayjs('--1623787200--', '--X--').format('/[Date](X)/') // /Date(1625515200)/ dayjs('1623787200', 'X').format('X') // 1623787200 dayjs('1623787200', 'X').format('YYYY-MM-DD') // 2021-06-16 // x STRICT dayjs('/Date(1623787200000)/', '/[Date](x)/', true).format('/[Date](x)/') // Invalid Date dayjs('/1623787200000/', '/x/', true).format('/[Date](x)/') // Invalid Date dayjs('--1623787200000--', '--x--', true).format('/[Date](x)/') // Invalid Date dayjs('1623787200000', 'x', true).format('x') // 1623787200000 dayjs('1623787200000', 'x', true).format('YYYY-MM-DD') // 2021-06-16 // X STRICT dayjs('/Date(1623787200)/', '/[Date](X)/', true).format('/[Date](X)/') // Invalid Date dayjs('/1623787200/', '/X/', true).format('/[Date](X)/') // Invalid Date dayjs('--1623787200--', '--X--', true).format('/[Date](X)/') // Invalid Date dayjs('1623787200', 'X', true).format('X') // 1623787200 dayjs('1623787200', 'X', true).format('YYYY-MM-DD') // 2021-06-16 ``` **Expected behavior** not to get `Invalid Date` **Information** - Day.js Version 1.10.6 - Node version: 14.17.0 - Time zone: [e.g. GMT +4:00] related https://github.com/iamkun/dayjs/issues/1533 #1567
I see. Cause x X format is supported via advancedFormat plugin, you may enable it to use in strict mode https://day.js.org/docs/en/plugin/advanced-format It's enabled. look at the collapsed "source" section of the issue I have this there: ```js const dayjs = require('dayjs'); dayjs.extend(require('dayjs/plugin/customParseFormat')) dayjs.extend(require('dayjs/plugin/advancedFormat')) ```
2021-07-07T06:40:14Z
1.1
iamkun/dayjs
1,321
iamkun__dayjs-1321
[ "1238" ]
344bdc0eed6843edb05723dc7853a41833d88f08
diff --git a/src/plugin/customParseFormat/index.js b/src/plugin/customParseFormat/index.js --- a/src/plugin/customParseFormat/index.js +++ b/src/plugin/customParseFormat/index.js @@ -11,7 +11,7 @@ const matchSigned = /[+-]?\d+/ // -inf - inf const matchOffset = /[+-]\d\d:?(\d\d)?/ // +00:00 -00:00 +0000 or -0000 +00 const matchWord = /\d*[^\s\d-:/()]+/ // Word -let locale +let locale = {} function offsetFromString(string) { if (!string) return 0 @@ -216,8 +216,9 @@ export default (o, C, d) => { const isStrict = isStrictWithoutLocale || isStrictWithLocale let pl = args[2] if (isStrictWithLocale) [,, pl] = args - if (!isStrictWithoutLocale) { - locale = pl ? d.Ls[pl] : this.$locale() + locale = this.$locale() + if (!isStrictWithoutLocale && pl) { + locale = d.Ls[pl] } this.$d = parseFormattedInput(date, format, utc) this.init() @@ -226,7 +227,7 @@ export default (o, C, d) => { this.$d = new Date('') } // reset global locale to make parallel unit test - locale = undefined + locale = {} } else if (format instanceof Array) { const len = format.length for (let i = 1; i <= len; i += 1) {
diff --git a/test/plugin/customParseFormat.test.js b/test/plugin/customParseFormat.test.js --- a/test/plugin/customParseFormat.test.js +++ b/test/plugin/customParseFormat.test.js @@ -294,6 +294,8 @@ describe('Strict mode', () => { const format = 'YYYY-MM-DD' expect(dayjs(input, format).isValid()).toBe(true) expect(dayjs(input, format, true).isValid()).toBe(false) + expect(dayjs('2020-Jan-01', 'YYYY-MMM-DD', true).isValid()).toBe(true) + expect(dayjs('30/1/2020 10:59 PM', 'D/M/YYYY h:mm A', true).isValid()).toBe(true) }) it('with locale', () => { const input = '2018 三月 99'
Invalid dates are parsed as valid Invalid dates are parsed resulting in incorrect values e.g, const dt = dayjs('1993-51-11') `dt.isValid()` returns `true` and `dt.format('YYYY-MM-DD')` returns `1997-03-11` const dt = dayjs('1993-51-41') `dt.isValid()` returns `true` and `dt.format('YYYY-MM-DD')` returns `1997-04-10` infact `dayjs('1993-08-21', 'YYYY/MM/DD')` returns true for isValid() isValid() should return false for all these **Information** - Day.js Version: v1.9.6 - OS: macOS 11 BigSur - Browser: chrome 86 - Time zone: GMT
Yes, this is valid to js Date. You can use strict parsing to get what you need. https://day.js.org/docs/en/parse/string-format ``` dayjs('1970-00-00', 'YYYY-MM-DD', true).isValid() // false ``` Does Day.js strict parsing validate time formats as well? Following returns true. Should it return false since date string is missing the time? `dayjs('12/3/2020', 'M/D/YYYY h:mm A', true).isValid() // true` well, seems this is something we've never think about it. this depends on how we define 'isValid', it should be a valid date-time? or valid and match the given format? IMHO, it should match the given format. Btw, I also found the following: `dayjs('1/30/2020', 'M/D/YYYY', true).isValid() // true` but `dayjs('30/1/2020 10:59 PM', 'D/M/YYYY h:mm A', true).isValid() // false` Both should be true. +1 using the strict boolean does not work here as well. `dayjs('00-00-1990', 'DD-MM-YYYY', true).isValid() // true` `edit:` As @bornova script shows, it really works. Maybe my mistake were somewhere else > using the strict boolean does not work here as well. > `dayjs('00-00-1990', 'DD-MM-YYYY', true).isValid() // true` @Gabee01 Your example returns the correct value (false) on my end: https://runkit.com/5fd149b2b4b41f001d9b4bf4/5fd149f5b4b41f001d9b4c26 @bornova I'm now wondering what have I done wrong at the time. I tested the validation several times, before giving up on this. It really looks like its working on runkit.. Do remember this dependent on CustomParseFormat plugin to work https://day.js.org/docs/en/parse/string-format @iamkun CustomParseFormat was really missing. thanks! @iamkun My issue still remains: https://runkit.com/5fd79efc6abad7001a703bb0/5fd79f0342c42e001ad68c00 Any plans to address this in the near future? I had to switch back to Moment.js for the time being. Thanks for all your effort in this library!
2021-01-07T12:23:39Z
1.1
iamkun/dayjs
1,414
iamkun__dayjs-1414
[ "1363" ]
b1abdc40ee6c9d18ff46c311a114e0755677ea6f
diff --git a/src/locale/es-do.js b/src/locale/es-do.js --- a/src/locale/es-do.js +++ b/src/locale/es-do.js @@ -6,7 +6,7 @@ const locale = { weekdays: 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'), weekdaysShort: 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'), weekdaysMin: 'do_lu_ma_mi_ju_vi_sá'.split('_'), - months: 'Enero_Febrero_Marzo_Abril_Mayo_Junio_Julio_Agosto_Septiembre_Octubre_Noviembre_Diciembre'.split('_'), + months: 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'), monthsShort: 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_'), weekStart: 1, relativeTime: { diff --git a/src/locale/es-pr.js b/src/locale/es-pr.js --- a/src/locale/es-pr.js +++ b/src/locale/es-pr.js @@ -7,7 +7,7 @@ const locale = { weekdays: 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'), weekdaysShort: 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'), weekdaysMin: 'do_lu_ma_mi_ju_vi_sá'.split('_'), - months: 'Enero_Febrero_Marzo_Abril_Mayo_Junio_Julio_Agosto_Septiembre_Octubre_Noviembre_Diciembre'.split('_'), + months: 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'), weekStart: 1, formats: { LT: 'h:mm A', diff --git a/src/locale/es-us.js b/src/locale/es-us.js --- a/src/locale/es-us.js +++ b/src/locale/es-us.js @@ -6,7 +6,7 @@ const locale = { weekdays: 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'), weekdaysShort: 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'), weekdaysMin: 'do_lu_ma_mi_ju_vi_sá'.split('_'), - months: 'Enero_Febrero_Marzo_Abril_Mayo_Junio_Julio_Agosto_Septiembre_Octubre_Noviembre_Diciembre'.split('_'), + months: 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'), monthsShort: 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_'), relativeTime: { future: 'en %s', diff --git a/src/locale/es.js b/src/locale/es.js --- a/src/locale/es.js +++ b/src/locale/es.js @@ -7,7 +7,7 @@ const locale = { weekdays: 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'), weekdaysShort: 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'), weekdaysMin: 'do_lu_ma_mi_ju_vi_sá'.split('_'), - months: 'Enero_Febrero_Marzo_Abril_Mayo_Junio_Julio_Agosto_Septiembre_Octubre_Noviembre_Diciembre'.split('_'), + months: 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'), weekStart: 1, formats: { LT: 'H:mm',
diff --git a/test/locale.test.js b/test/locale.test.js --- a/test/locale.test.js +++ b/test/locale.test.js @@ -17,7 +17,7 @@ const NOT_SUPPORTED_LOCALE_STRING = 'not_supported_locale_string' it('Uses spanish locale through constructor', () => { // not recommend expect(dayjs('2018-4-28', { locale: es }) .format(format)) - .toBe('sábado 28, Abril') + .toBe('sábado 28, abril') }) it('set locale for one instance only', () => { @@ -27,7 +27,7 @@ it('set locale for one instance only', () => { expect(dayjs('2018-4-28') .locale(es).format(format)) - .toBe('sábado 28, Abril') + .toBe('sábado 28, abril') expect(dayjs('2018-4-28') .format(format)) @@ -40,7 +40,7 @@ it('set global locale', () => { .toBe('Saturday 28, April') dayjs.locale(es) expect(dayjs('2018-4-28').format(format)) - .toBe('sábado 28, Abril') + .toBe('sábado 28, abril') dayjs.locale('en') expect(dayjs('2018-4-28').format(format)) .toBe('Saturday 28, April') @@ -63,10 +63,10 @@ it('immutable instance locale', () => { expect(origin.format(format)) .toBe('Saturday 28, April') expect(origin.locale('es').format(format)) - .toBe('sábado 28, Abril') + .toBe('sábado 28, abril') const changed = origin.locale('es') expect(changed.format(format)) - .toBe('sábado 28, Abril') + .toBe('sábado 28, abril') expect(origin.format(format)) .toBe('Saturday 28, April') }) @@ -86,30 +86,30 @@ describe('Instance locale inheritance', () => { it('Clone', () => { expect(esDayjs.clone().format(format)) - .toBe('sábado 28, Abril') + .toBe('sábado 28, abril') expect(dayjs(esDayjs).format(format)) - .toBe('sábado 28, Abril') + .toBe('sábado 28, abril') }) it('StartOf EndOf', () => { expect(esDayjs.startOf('year').format(format)) - .toBe('lunes 1, Enero') + .toBe('lunes 1, enero') expect(esDayjs.endOf('day').format(format)) - .toBe('sábado 28, Abril') + .toBe('sábado 28, abril') }) it('Set', () => { expect(esDayjs.set('year', 2017).format(format)) - .toBe('viernes 28, Abril') + .toBe('viernes 28, abril') }) it('Add', () => { expect(esDayjs.add(1, 'year').format(format)) - .toBe('domingo 28, Abril') + .toBe('domingo 28, abril') expect(esDayjs.add(1, 'month').format(format)) - .toBe('lunes 28, Mayo') + .toBe('lunes 28, mayo') expect(esDayjs.add(1, 'minute').format(format)) - .toBe('sábado 28, Abril') + .toBe('sábado 28, abril') }) it('dayjs.locale() returns locale name', () => {
Spanish days and months should be lowercase Spanish speaking people do not capitalize their months or days.
would you like to create a pull request to update it?
2021-03-13T19:51:51Z
1.1
iamkun/dayjs
1,229
iamkun__dayjs-1229
[ "1212" ]
34cfb920b9653ad44d4b31fe49e533692a3ce01b
diff --git a/src/plugin/timezone/index.js b/src/plugin/timezone/index.js --- a/src/plugin/timezone/index.js +++ b/src/plugin/timezone/index.js @@ -114,6 +114,17 @@ export default (o, c, d) => { return result && result.value } + const oldStartOf = proto.startOf + proto.startOf = function (units, startOf) { + if (!this.$x || !this.$x.$timezone) { + return oldStartOf.call(this, units, startOf) + } + + const withoutTz = d(this.format('YYYY-MM-DD HH:mm:ss:SSS')) + const startOfWithoutTz = oldStartOf.call(withoutTz, units, startOf) + return startOfWithoutTz.tz(this.$x.$timezone, true) + } + d.tz = function (input, arg1, arg2) { const parseFormat = arg2 && arg1 const timezone = arg2 || arg1 || defaultTimezone
diff --git a/test/plugin/timezone.test.js b/test/plugin/timezone.test.js --- a/test/plugin/timezone.test.js +++ b/test/plugin/timezone.test.js @@ -290,3 +290,17 @@ describe('CustomPraseFormat', () => { expect(dayjs.tz('10/15/2020 12:30', 'MM/DD/YYYY HH:mm', DEN).unix()).toBe(result) }) }) + +describe('startOf and endOf', () => { + it('corrects for timezone offset in startOf', () => { + const originalDay = dayjs.tz('2010-01-01 00:00:00', NY) + const startOfDay = originalDay.startOf('day') + expect(startOfDay.valueOf()).toEqual(originalDay.valueOf()) + }) + + it('corrects for timezone offset in endOf', () => { + const originalDay = dayjs.tz('2009-12-31 23:59:59.999', NY) + const endOfDay = originalDay.endOf('day') + expect(endOfDay.valueOf()).toEqual(originalDay.valueOf()) + }) +}) diff --git a/test/timezone.test.js b/test/timezone.test.js --- a/test/timezone.test.js +++ b/test/timezone.test.js @@ -1,9 +1,11 @@ import MockDate from 'mockdate' import moment from 'moment' import dayjs from '../src' +import timezone from '../src/plugin/timezone' import utc from '../src/plugin/utc' dayjs.extend(utc) +dayjs.extend(timezone) beforeEach(() => { MockDate.set(new Date())
Getting wrong startOf('day') in a different timezone **Describe the bug** On calculating startOf('day') in a different timezone, I am getting the wrong result. Note that I tried this at 6 PM on November 12 in Asia/Kolkata timezone. Code - `dayjs.tz(new Date()).tz('America/New_York').startOf('day').toString()` Result - `"Thu, 12 Nov 2020 15:30:00 GMT"` **Expected behavior** It should be `Thu, 12 Nov 2020 05:00:00 GMT` **Information** - Day.js Version - Tried in browser console on day.js.org website - OS - MacOS Mojave - Browser - Chrome 86.0.4240.193 - Time zone: Asia/Kolkata
I have a reproduction for this in the dayjs test suite, but I'm not sure how to fix it. Here is how I reproduced it in `test/timezone.test.js`: ```js it('startOf day across timezones', () => { const originalDay = dayjs('2010-01-01T00:00:00Z').tz('UTC') const startOfDay = originalDay.startOf('day') expect(startOfDay.valueOf()).toEqual(originalDay.valueOf()) }) ``` (I also had to extend `dayjs` with the `timezone` plugin to make this run.) I'm going to keep at this and see if I can come up with a fix, but if a maintainer has an idea I'd love to hear it since I'm not very familiar with the dayjs internals. I meant to paste the output from this test, sorry about that. Here it is: ``` $ env TZ=America/Whitehorse yarn run test-tz yarn run v1.22.10 $ date && jest test/timezone.test --coverage=false Sun Nov 15 11:43:34 MST 2020 FAIL test/timezone.test.js ✓ Add Time days (DST) (9ms) ✓ Utc Offset (1ms) ✓ Diff (DST) (5ms) ✓ UTC add day in DST (2ms) ✓ UTC and utcOffset (1ms) ✓ UTC diff in DST (1ms) ✕ startOf day across timezones (13ms) ● startOf day across timezones expect(received).toEqual(expected) Expected value to equal: 1262304000000 Received: 1262275200000 77 | const originalDay = dayjs('2010-01-01T00:00:00Z').tz('UTC') 78 | const startOfDay = originalDay.startOf('day') > 79 | expect(startOfDay.valueOf()).toEqual(originalDay.valueOf()) 80 | }) 81 | at Object.<anonymous> (test/timezone.test.js:79:32) Test Suites: 1 failed, 1 total Tests: 1 failed, 6 passed, 7 total Snapshots: 0 total Time: 0.823s, estimated 1s Ran all test suites matching /test\/timezone.test/i. error Command failed with exit code 1. info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command. ```
2020-11-16T19:32:50Z
1.9
iamkun/dayjs
1,086
iamkun__dayjs-1086
[ "1079" ]
a78956e8664afa61bb2744c7a1bbe01d2589a4fe
diff --git a/src/index.js b/src/index.js --- a/src/index.js +++ b/src/index.js @@ -1,6 +1,6 @@ import * as C from './constant' -import U from './utils' import en from './locale/en' +import U from './utils' let L = 'en' // global locale const Ls = {} // global loaded locale @@ -43,6 +43,7 @@ const wrapper = (date, instance) => dayjs(date, { locale: instance.$L, utc: instance.$u, + x: instance.$x, $offset: instance.$offset // todo: refactor; do not use this.$offset in you code }) @@ -81,6 +82,7 @@ class Dayjs { parse(cfg) { this.$d = parseDate(cfg) + this.$x = cfg.x || {} this.init() } diff --git a/src/locale/en-SG.js b/src/locale/en-sg.js similarity index 98% rename from src/locale/en-SG.js rename to src/locale/en-sg.js --- a/src/locale/en-SG.js +++ b/src/locale/en-sg.js @@ -2,7 +2,7 @@ import dayjs from 'dayjs' const locale = { - name: 'en-SG', + name: 'en-sg', weekdays: 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'), months: 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'), weekStart: 1, diff --git a/src/plugin/advancedFormat/index.js b/src/plugin/advancedFormat/index.js --- a/src/plugin/advancedFormat/index.js +++ b/src/plugin/advancedFormat/index.js @@ -13,7 +13,7 @@ export default (o, c, d) => { // locale needed later const locale = this.$locale() const utils = this.$utils() const str = formatStr || FORMAT_DEFAULT - const result = str.replace(/\[([^\]]+)]|Q|wo|ww|w|gggg|Do|X|x|k{1,2}|S/g, (match) => { + const result = str.replace(/\[([^\]]+)]|Q|wo|ww|w|zzz|z|gggg|Do|X|x|k{1,2}|S/g, (match) => { switch (match) { case 'Q': return Math.ceil((this.$M + 1) / 3) @@ -33,6 +33,10 @@ export default (o, c, d) => { // locale needed later return Math.floor(this.$d.getTime() / 1000) case 'x': return this.$d.getTime() + case 'z': + return `[${this.offsetName()}]` + case 'zzz': + return `[${this.offsetName('long')}]` default: return match } diff --git a/src/plugin/duration/index.js b/src/plugin/duration/index.js --- a/src/plugin/duration/index.js +++ b/src/plugin/duration/index.js @@ -60,7 +60,7 @@ class Duration { calMilliseconds() { this.$ms = Object.keys(this.$d).reduce((total, unit) => ( - total + ((this.$d[unit] || 0) * (unitToMS[unit] || 1)) + total + ((this.$d[unit] || 0) * (unitToMS[unit])) ), 0) } @@ -106,7 +106,7 @@ class Duration { } as(unit) { - return this.$ms / (unitToMS[prettyUnit(unit)] || 1) + return this.$ms / (unitToMS[prettyUnit(unit)]) } get(unit) { diff --git a/src/plugin/timezone/index.js b/src/plugin/timezone/index.js --- a/src/plugin/timezone/index.js +++ b/src/plugin/timezone/index.js @@ -9,13 +9,15 @@ const typeToPos = { const ms = 'ms' -export default (o, c, d) => { - let defaultTimezone - - const localUtcOffset = d().utcOffset() - const tzOffset = (timestamp, timezone) => { - const date = new Date(timestamp) - const dtf = new Intl.DateTimeFormat('en-US', { +// Cache time-zone lookups from Intl.DateTimeFormat, +// as it is a *very* slow method. +const dtfCache = {} +const getDateTimeFormat = (timezone, options = {}) => { + const timeZoneName = options.timeZoneName || 'short' + const key = `${timezone}|${timeZoneName}` + let dtf = dtfCache[key] + if (!dtf) { + dtf = new Intl.DateTimeFormat('en-US', { hour12: false, timeZone: timezone, year: 'numeric', @@ -23,9 +25,27 @@ export default (o, c, d) => { day: '2-digit', hour: '2-digit', minute: '2-digit', - second: '2-digit' + second: '2-digit', + timeZoneName }) - const formatResult = dtf.formatToParts(date) + dtfCache[key] = dtf + } + return dtf +} + +export default (o, c, d) => { + let defaultTimezone + + const localUtcOffset = d().utcOffset() + + const makeFormatParts = (timestamp, timezone, options = {}) => { + const date = new Date(timestamp) + const dtf = getDateTimeFormat(timezone, options) + return dtf.formatToParts(date) + } + + const tzOffset = (timestamp, timezone) => { + const formatResult = makeFormatParts(timestamp, timezone) const filled = [] for (let i = 0; i < formatResult.length; i += 1) { const { type, value } = formatResult[i] @@ -35,13 +55,14 @@ export default (o, c, d) => { filled[pos] = parseInt(value, 10) } } + const hour = filled[3] // Workaround for the same behavior in different node version // https://github.com/nodejs/node/issues/33027 - const hour = filled[3] + /* istanbul ignore next */ const fixedHour = hour === 24 ? 0 : hour const utcString = `${filled[0]}-${filled[1]}-${filled[2]} ${fixedHour}:${filled[4]}:${filled[5]}:000` const utcTs = d.utc(utcString).valueOf() - let asTS = +date + let asTS = +timestamp const over = asTS % 1000 asTS -= over return (utcTs - asTS) / (60 * 1000) @@ -76,7 +97,16 @@ export default (o, c, d) => { proto.tz = function (timezone = defaultTimezone) { const target = this.toDate().toLocaleString('en-US', { timeZone: timezone }) const diff = Math.round((this.toDate() - new Date(target)) / 1000 / 60) - return d(target).utcOffset(localUtcOffset - diff, true).$set(ms, this.$ms) + const ins = d(target).$set(ms, this.$ms).utcOffset(localUtcOffset - diff, true) + ins.$x.$timezone = timezone + return ins + } + + proto.offsetName = function (type) { + // type: short(default) / long + const zone = this.$x.$timezone || d.tz.guess() + const result = makeFormatParts(this.valueOf(), zone, { timeZoneName: type }).find(m => m.type.toLowerCase() === 'timezonename') + return result && result.value } d.tz = function (input, timezone = defaultTimezone) { @@ -89,6 +119,7 @@ export default (o, c, d) => { localTs = localTs || d.utc(input).valueOf() const [targetTs, targetOffset] = fixOffset(localTs, previousOffset, timezone) const ins = d(targetTs).utcOffset(targetOffset) + ins.$x.$timezone = timezone return ins } diff --git a/src/plugin/utc/index.js b/src/plugin/utc/index.js --- a/src/plugin/utc/index.js +++ b/src/plugin/utc/index.js @@ -1,15 +1,18 @@ import { MILLISECONDS_A_MINUTE, MIN } from '../../constant' export default (option, Dayjs, dayjs) => { - const localOffset = (new Date()).getTimezoneOffset() const proto = Dayjs.prototype dayjs.utc = function (date) { const cfg = { date, utc: true, args: arguments } // eslint-disable-line prefer-rest-params return new Dayjs(cfg) // eslint-disable-line no-use-before-define } - proto.utc = function () { - return dayjs(this.toDate(), { locale: this.$L, utc: true }) + proto.utc = function (keepLocalTime) { + const ins = dayjs(this.toDate(), { locale: this.$L, utc: true }) + if (keepLocalTime) { + return ins.add(this.utcOffset(), MIN) + } + return ins } proto.local = function () { @@ -64,8 +67,11 @@ export default (option, Dayjs, dayjs) => { return ins } if (input !== 0) { - ins = this.local().add(offset + localOffset, MIN) + const localTimezoneOffset = this.$u + ? this.toDate().getTimezoneOffset() : -1 * this.utcOffset() + ins = this.local().add(offset + localTimezoneOffset, MIN) ins.$offset = offset + ins.$x.$localOffset = localTimezoneOffset } else { ins = this.utc() } @@ -81,7 +87,7 @@ export default (option, Dayjs, dayjs) => { proto.valueOf = function () { const addedOffset = !this.$utils().u(this.$offset) - ? this.$offset + localOffset : 0 + ? this.$offset + (this.$x.$localOffset || (new Date()).getTimezoneOffset()) : 0 return this.$d.valueOf() - (addedOffset * MILLISECONDS_A_MINUTE) } diff --git a/types/plugin/duration.d.ts b/types/plugin/duration.d.ts --- a/types/plugin/duration.d.ts +++ b/types/plugin/duration.d.ts @@ -11,7 +11,7 @@ export declare class Duration { clone(): Duration - humanize(withSuffix: boolean): string + humanize(withSuffix?: boolean): string milliseconds(): number asMilliseconds(): number diff --git a/types/plugin/timezone.d.ts b/types/plugin/timezone.d.ts --- a/types/plugin/timezone.d.ts +++ b/types/plugin/timezone.d.ts @@ -5,12 +5,13 @@ export = plugin declare module 'dayjs' { interface Dayjs { - tz(timezone: string): Dayjs + tz(timezone?: string): Dayjs } interface DayjsTimezone { - (date: ConfigType, timezone: string): Dayjs + (date: ConfigType, timezone?: string): Dayjs guess(): string + setDefault(timezone?: string): void } const tz: DayjsTimezone diff --git a/types/plugin/utc.d.ts b/types/plugin/utc.d.ts --- a/types/plugin/utc.d.ts +++ b/types/plugin/utc.d.ts @@ -6,7 +6,7 @@ export = plugin declare module 'dayjs' { interface Dayjs { - utc(): Dayjs + utc(keepLocalTime?: boolean): Dayjs local(): Dayjs
diff --git a/test/plugin/advancedFormat.test.js b/test/plugin/advancedFormat.test.js --- a/test/plugin/advancedFormat.test.js +++ b/test/plugin/advancedFormat.test.js @@ -4,8 +4,12 @@ import dayjs from '../../src' import advancedFormat from '../../src/plugin/advancedFormat' import weekOfYear from '../../src/plugin/weekOfYear' import weekYear from '../../src/plugin/weekYear' +import timezone from '../../src/plugin/timezone' +import utc from '../../src/plugin/utc' import '../../src/locale/zh-cn' +dayjs.extend(utc) +dayjs.extend(timezone) dayjs.extend(weekYear) dayjs.extend(weekOfYear) dayjs.extend(advancedFormat) @@ -83,6 +87,14 @@ it('Format Week Year gggg', () => { expect(dayjs(d).format('gggg')).toBe(moment(d).format('gggg')) }) +it('Format offsetName z zzz', () => { + const dtz = dayjs.tz('2012-03-11 01:59:59', 'America/New_York') + expect(dtz.format('z')).toBe('EST') + expect(dtz.format('zzz')).toBe('Eastern Standard Time') + expect(dayjs().format('z')).toBeDefined() + expect(dayjs().format('zzz')).toBeDefined() +}) + it('Skips format strings inside brackets', () => { expect(dayjs().format('[Q]')).toBe('Q') expect(dayjs().format('[Do]')).toBe('Do') diff --git a/test/plugin/timezone.test.js b/test/plugin/timezone.test.js --- a/test/plugin/timezone.test.js +++ b/test/plugin/timezone.test.js @@ -86,6 +86,13 @@ describe('Convert', () => { }) }) + it('convert from time with timezone to target time', () => { + const losAngelesInUTC = dayjs('2014-06-01T05:00:00-07:00').tz('UTC') + const MlosAngelesInUTC = moment('2014-06-01T05:00:00-07:00').tz('UTC') + expect(losAngelesInUTC.format()).toBe('2014-06-01T12:00:00Z') + expect(losAngelesInUTC.format()).toBe(MlosAngelesInUTC.format()) + }) + it('DST', () => { [dayjs, moment].forEach((_) => { const jun = _('2014-06-01T12:00:00Z') @@ -252,3 +259,17 @@ describe('set Default', () => { expect(tokyo.valueOf()).toBe(1401591600000) }) }) + +describe('Get offsetName', () => { + const dtz = dayjs.tz('2012-03-11 01:59:59', NY) + it('short', () => { + const d = dtz.offsetName('short') + const m = moment.tz('2012-03-11 01:59:59', NY).format('z') + expect(d).toBe(m) + expect(d).toBe('EST') + }) + it('long', () => { + const d = dtz.offsetName('long') + expect(d).toBe('Eastern Standard Time') + }) +}) diff --git a/test/plugin/utc.test.js b/test/plugin/utc.test.js --- a/test/plugin/utc.test.js +++ b/test/plugin/utc.test.js @@ -1,8 +1,8 @@ import MockDate from 'mockdate' import moment from 'moment' import dayjs from '../../src' -import utc from '../../src/plugin/utc' import customParseFormat from '../../src/plugin/customParseFormat' +import utc from '../../src/plugin/utc' dayjs.extend(utc) @@ -250,3 +250,19 @@ describe('Diff', () => { .toBe(moment.utc(d1).diff(d2, 'm')) }) }) + +it('utc keepLocalTime', () => { + const t = '2016-05-03 22:15:01' + const d = dayjs(t).utc(true) + const m = moment(t).utc(true) + const fd = d.format() + const dd = d.toDate() + const vd = d.valueOf() + const fm = m.format() + const dm = m.toDate() + const vm = m.valueOf() + expect(fd).toEqual(fm) + expect(fd).toEqual('2016-05-03T22:15:01Z') + expect(dd).toEqual(dm) + expect(vd).toEqual(vm) +}) diff --git a/test/timezone.test.js b/test/timezone.test.js --- a/test/timezone.test.js +++ b/test/timezone.test.js @@ -1,5 +1,5 @@ -import moment from 'moment' import MockDate from 'mockdate' +import moment from 'moment' import dayjs from '../src' import utc from '../src/plugin/utc' @@ -54,3 +54,11 @@ it('UTC add day in DST', () => { .toBe(momentTest.clone().add(2, 'day').format()) }) +it('UTC and utcOffset', () => { + const test1 = 1331449199000 // 2012/3/11 14:59:59 + expect(moment(test1).utcOffset(-300).format()) + .toBe(dayjs(test1).utcOffset(-300).format()) + const test2 = '2000-01-01T06:31:00Z' + expect(moment.utc(test2).utcOffset(-60).format()) + .toBe(dayjs.utc(test2).utcOffset(-60).format()) +})
`dayjs.tz()` needs to have timezone parameter as optional **Describe the bug** Because you can set a default timezone, the `dayjs.tz()` method should have the second parameter (timezone) as optional. It works fine in JS — just missing the correct types for TS. **Expected behavior** 1. Set `dayjs.tz.setDefault("America/Phoenix");` 2. `dayjs.tz('some valid date')` <- that shouldn't throw a TypeScript error 3. `dayjs('some valid date').tz()` <- that shouldn't throw a TypeScript error either **Potential Solution** ``` declare module 'dayjs' { interface Dayjs { tz(timezone?: string): Dayjs; } interface DayjsTimezone { (date?: ConfigType, timezone?: string): Dayjs; } } ``` **Information** - Day.js Version: v1.8.36 - OS: macOS v10.15.6 - Browser: Firefox Developer Edition v82.0b2 - Time zone: America/Phoenix
2020-09-28T02:27:17Z
1.8
iamkun/dayjs
1,101
iamkun__dayjs-1101
[ "1105" ]
16937d16e053b8c1d4a607622fa2fdbfd9809832
diff --git a/src/plugin/localeData/index.js b/src/plugin/localeData/index.js --- a/src/plugin/localeData/index.js +++ b/src/plugin/localeData/index.js @@ -1,3 +1,5 @@ +import { t } from '../localizedFormat' + export default (o, c, dayjs) => { // locale needed later const proto = c.prototype const getLocalePart = part => (part && (part.indexOf ? part : part.s)) @@ -11,6 +13,9 @@ export default (o, c, dayjs) => { // locale needed later return result.map((_, index) => (result[(index + (weekStart || 0)) % 7])) } const getDayjsLocaleObject = () => dayjs.Ls[dayjs.locale()] + const getLongDateFormat = (l, format) => + l.formats[format] || t(l.formats[format.toUpperCase()]) + const localeData = function () { return { months: instance => @@ -23,7 +28,8 @@ export default (o, c, dayjs) => { // locale needed later (instance ? instance.format('dd') : getShort(this, 'weekdaysMin', 'weekdays', 2)), weekdaysShort: instance => (instance ? instance.format('ddd') : getShort(this, 'weekdaysShort', 'weekdays', 3)), - longDateFormat: format => this.$locale().formats[format] + longDateFormat: format => getLongDateFormat(this.$locale(), format) + } } proto.localeData = function () { @@ -39,7 +45,7 @@ export default (o, c, dayjs) => { // locale needed later weekdaysMin: () => dayjs.weekdaysMin(), months: () => dayjs.months(), monthsShort: () => dayjs.monthsShort(), - longDateFormat: format => localeObject.formats[format] + longDateFormat: format => getLongDateFormat(localeObject, format) } } diff --git a/src/plugin/localizedFormat/index.js b/src/plugin/localizedFormat/index.js --- a/src/plugin/localizedFormat/index.js +++ b/src/plugin/localizedFormat/index.js @@ -1,5 +1,8 @@ import { FORMAT_DEFAULT } from '../../constant' +export const t = format => + format.replace(/(\[[^\]]+])|(MMMM|MM|DD|dddd)/g, (_, a, b) => a || b.slice(1)) + export default (o, c, d) => { const proto = c.prototype const oldFormat = proto.format @@ -12,7 +15,6 @@ export default (o, c, d) => { LLLL: 'dddd, MMMM D, YYYY h:mm A' } d.en.formats = englishFormats - const t = format => format.replace(/(\[[^\]]+])|(MMMM|MM|DD|dddd)/g, (_, a, b) => a || b.slice(1)) proto.format = function (formatStr = FORMAT_DEFAULT) { const { formats = {} } = this.$locale() const result = formatStr.replace(/(\[[^\]]+])|(LTS?|l{1,4}|L{1,4})/g, (_, a, b) => {
diff --git a/test/plugin/localeData.test.js b/test/plugin/localeData.test.js --- a/test/plugin/localeData.test.js +++ b/test/plugin/localeData.test.js @@ -38,7 +38,7 @@ describe('Instance localeData', () => { expect(dayjsLocaleData.weekdaysMin()).toEqual(momentLocaleData.weekdaysMin()) expect(dayjsLocaleData.weekdaysShort(d)).toBe(momentLocaleData.weekdaysShort(m)) expect(dayjsLocaleData.weekdaysShort()).toEqual(momentLocaleData.weekdaysShort()) - const longDateFormats = ['LT', 'LTS', 'L', 'LL', 'LLL', 'LLLL'] + const longDateFormats = ['LT', 'LTS', 'L', 'LL', 'LLL', 'LLLL', 'l', 'll', 'lll', 'llll'] longDateFormats.forEach((f) => { expect(dayjsLocaleData.longDateFormat(f)).toEqual(momentLocaleData.longDateFormat(f)) }) @@ -61,7 +61,7 @@ it('Global localeData', () => { expect(dayjsLocaleData.weekdays()).toEqual(momentLocaleData.weekdays()) expect(dayjsLocaleData.weekdaysShort()).toEqual(momentLocaleData.weekdaysShort()) expect(dayjsLocaleData.weekdaysMin()).toEqual(momentLocaleData.weekdaysMin()) - const longDateFormats = ['LT', 'LTS', 'L', 'LL', 'LLL', 'LLLL'] + const longDateFormats = ['LT', 'LTS', 'L', 'LL', 'LLL', 'LLLL', 'l', 'll', 'lll', 'llll'] longDateFormats.forEach((f) => { expect(dayjsLocaleData.longDateFormat(f)).toEqual(momentLocaleData.longDateFormat(f)) })
wrong day in my timezone (UTC+3) **Describe the bug** I noticed a utc test failing after midnight at my timezone. **Expected behavior** Run tests. **Information** - Day.js dev branch - OS: macos - Node v14.11.0 - Time zone:(UTC+3) ![Screenshot 2020-10-02 at 1 55 43](https://user-images.githubusercontent.com/130606/94871507-d0b0a900-0452-11eb-8cbf-2d72c9ea184f.png) ``` FAIL test/plugin/objectSupport.test.js ● Constructor from Object UTC expect(received).toBe(expected) // Object.is equality Expected value to be: "2020-10-02 15:25:50.125" Received: "2020-10-01 15:25:50.125" 121 | for (let i = 0; i < tests.length; i += 1) { 122 | expect(dayjs.utc(tests[i][0]).format(fmt)).toBe(tests[i][1]) > 123 | expect(moment.utc(tests[i][0]).format(fmt)).toBe(tests[i][1]) 124 | } 125 | }) 126 | it('Set from Object', () => { at Object.<anonymous> (test/plugin/objectSupport.test.js:123:49) Test Suites: 1 failed, 58 passed, 59 total Tests: 1 failed, 569 passed, 570 total Snapshots: 0 total Time: 3.982s Ran all test suites. ```
2020-10-01T09:36:08Z
1.9
iamkun/dayjs
1,003
iamkun__dayjs-1003
[ "1002" ]
6e5ffce3af00df88428ac3634d6a89c985d79217
diff --git a/src/plugin/timezone/index.js b/src/plugin/timezone/index.js --- a/src/plugin/timezone/index.js +++ b/src/plugin/timezone/index.js @@ -7,6 +7,8 @@ const typeToPos = { second: 5 } +const ms = 'ms' + export default (o, c, d) => { const localUtcOffset = d().utcOffset() const tzOffset = (timestamp, timezone) => { @@ -55,7 +57,7 @@ export default (o, c, d) => { proto.tz = function (timezone) { const target = this.toDate().toLocaleString('en-US', { timeZone: timezone }) const diff = Math.round((this.toDate() - new Date(target)) / 1000 / 60) - return d(target).utcOffset(localUtcOffset - diff, true) + return d(target).utcOffset(localUtcOffset - diff, true).$set(ms, this.$ms) } d.tz = function (input, timezone) { const previousOffset = tzOffset(+d(), timezone)
diff --git a/test/plugin/timezone.test.js b/test/plugin/timezone.test.js --- a/test/plugin/timezone.test.js +++ b/test/plugin/timezone.test.js @@ -56,6 +56,14 @@ describe('Parse', () => { expect(newYork.tz('America/Los_Angeles').format()).toBe('2014-06-01T09:00:00-07:00') expect(newYork.tz('Europe/London').format()).toBe('2014-06-01T17:00:00+01:00') }) + + it('preserve milliseconds', () => { + const d = dayjs(1596735327399) + const oldMs = d.millisecond() + const dTz = d.tz('America/New_York') + const newMs = dTz.millisecond() + expect(oldMs).toEqual(newMs) + }) }) describe('Convert', () => {
Changing timezone sets milliseconds to 0 **Describe the bug** ```js let d = dayjs(1596735327399); console.log(d.millisecond()); // Will print 399 d = d.tz('America/New_York'); console.log(d.millisecond()); // Will print 0 ``` **Expected behavior** Milliseconds should be preserved. **Information** - Day.js Version: v1.8.33 - OS: macOS - Browser: Chrome 84 - Time zone: GMT-04:00 DST
Thanks, Fixed.
2020-08-13T18:14:40Z
1.8
iamkun/dayjs
1,023
iamkun__dayjs-1023
[ "1022" ]
a09d259a407b81d1cb6bb5623fad551c775d8674
diff --git a/src/utils.js b/src/utils.js --- a/src/utils.js +++ b/src/utils.js @@ -18,9 +18,9 @@ const monthDiff = (a, b) => { // function from moment.js in order to keep the same result if (a.date() < b.date()) return -monthDiff(b, a) const wholeMonthDiff = ((b.year() - a.year()) * 12) + (b.month() - a.month()) - const anchor = a.add(wholeMonthDiff, C.M) + const anchor = a.clone().add(wholeMonthDiff, C.M) const c = b - anchor < 0 - const anchor2 = a.add(wholeMonthDiff + (c ? -1 : 1), C.M) + const anchor2 = a.clone().add(wholeMonthDiff + (c ? -1 : 1), C.M) return +(-(wholeMonthDiff + ((b - anchor) / (c ? (anchor - anchor2) : (anchor2 - anchor)))) || 0) }
diff --git a/test/plugin/badMutable.test.js b/test/plugin/badMutable.test.js --- a/test/plugin/badMutable.test.js +++ b/test/plugin/badMutable.test.js @@ -164,6 +164,16 @@ it('Locale', () => { expect(d.format(format)).toBe(m.format(format)) }) +it('Diff', () => { + const d = dayjs() + const m = moment() + const unit = 'year' + const d2 = d.clone().add(1, unit) + const m2 = m.clone().add(1, unit) + expect(d.diff(d2, unit)).toBe(-1) + expect(m.diff(m2, unit)).toBe(-1) +}) + it('isAfter isBefore isSame', () => { const d = dayjs() const format = dayjs().format()
RelativeTime plugin bug while using BadMutable plugin **Describe the bug** When I use RelativeTime plugin with BadMutable plugin in my react project, I get wrong answer. For Example: The time variable gets `in infinity years` instead of `4 months ago`. ```javascript import React from 'react'; import dayjs from 'dayjs'; import relativeTime from 'dayjs/plugin/relativeTime'; import badMutable from 'dayjs'/plugin/badMutable'; dayjs.extend(relativeTime); dayjs.extend(badMutable); const App = () => { // 1588262400000 stands for 2020-05-1 const time = dayjs(new Date(1588262400000)).fromNow(); return <div>{time}</div> } ``` **Expected behavior** As above, the time variable should be `4 months ago`. **Information** - Day.js Version: 1.8.34 - OS: MAC - Browser: Chrome 83 - Time zone: 2020-08-22 China Beijing
2020-08-22T09:10:02Z
1.8
iamkun/dayjs
996
iamkun__dayjs-996
[ "692" ]
747c0fb4eba6353755b5dad3417fd8d5a408c378
diff --git a/src/plugin/pluralGetSet/index.js b/src/plugin/pluralGetSet/index.js new file mode 100644 --- /dev/null +++ b/src/plugin/pluralGetSet/index.js @@ -0,0 +1,21 @@ +export default (o, c) => { + const proto = c.prototype + + const pluralAliases = [ + 'milliseconds', + 'seconds', + 'minutes', + 'hours', + 'days', + 'weeks', + 'isoWeeks', + 'months', + 'quarters', + 'years', + 'dates' + ] + + pluralAliases.forEach((alias) => { + proto[alias] = proto[alias.replace(/s$/, '')] + }) +} diff --git a/types/plugin/pluralGetSet.d.ts b/types/plugin/pluralGetSet.d.ts new file mode 100644 --- /dev/null +++ b/types/plugin/pluralGetSet.d.ts @@ -0,0 +1,44 @@ +import { PluginFunc, UnitType, ConfigType } from 'dayjs' + +declare const plugin: PluginFunc +export = plugin + +declare module 'dayjs' { + interface Dayjs { + years(): number + + years(value: number): Dayjs + + months(): number + + months(value: number): Dayjs + + dates(): number + + dates(value: number): Dayjs + + weeks(): number + + weeks(value: number): Dayjs + + days(): number + + days(value: number): Dayjs + + hours(): number + + hours(value: number): Dayjs + + minutes(): number + + minutes(value: number): Dayjs + + seconds(): number + + seconds(value: number): Dayjs + + milliseconds(): number + + milliseconds(value: number): Dayjs + } +}
diff --git a/test/plugin/pluralGetSet.test.js b/test/plugin/pluralGetSet.test.js new file mode 100644 --- /dev/null +++ b/test/plugin/pluralGetSet.test.js @@ -0,0 +1,125 @@ +import MockDate from 'mockdate' +import moment from 'moment' +import dayjs from '../../src' +import pluralGetSet from '../../src/plugin/pluralGetSet' + +dayjs.extend(pluralGetSet) + +beforeEach(() => { + MockDate.set(new Date()) +}) + +afterEach(() => { + MockDate.reset() +}) + +it('Years', () => { + expect(dayjs().get('years')).toBe(moment().get('years')) + expect(dayjs().years()).toBe(moment().years()) + expect(dayjs().years(0).valueOf()).toBe(moment().years(0).valueOf()) + expect(dayjs().years(2000).valueOf()).toBe(moment().years(2000).valueOf()) +}) + +it('Months', () => { + expect(dayjs().get('months')).toBe(moment().get('months')) + expect(dayjs().months()).toBe(moment().months()) + expect(dayjs().months(0).valueOf()).toBe(moment().months(0).valueOf()) + expect(dayjs().months(1).valueOf()).toBe(moment().months(1).valueOf()) +}) + +it('Days of Week', () => { + expect(dayjs().get('days')).toBe(moment().get('days')) + expect(dayjs().days()).toBe(moment().days()) + expect(dayjs().days(0).format()).toBe(moment().days(0).format()) + expect(dayjs().days(1).format()).toBe(moment().days(1).format()) +}) + +it('Dates', () => { + expect(dayjs().get('dates')).toBe(moment().get('dates')) + expect(dayjs().dates()).toBe(moment().dates()) + expect(dayjs().dates(0).valueOf()).toBe(moment().dates(0).valueOf()) + expect(dayjs().dates(1).valueOf()).toBe(moment().dates(1).valueOf()) +}) + +it('Hours', () => { + expect(dayjs().get('hours')).toBe(moment().get('hours')) + expect(dayjs().hours()).toBe(moment().hours()) + expect(dayjs().hours(0).valueOf()).toBe(moment().hours(0).valueOf()) + expect(dayjs().hours(1).valueOf()).toBe(moment().hours(1).valueOf()) +}) + +it('Minutes', () => { + expect(dayjs().get('minutes')).toBe(moment().get('minutes')) + expect(dayjs().minutes()).toBe(moment().minutes()) + expect(dayjs().minutes(0).valueOf()).toBe(moment().minutes(0).valueOf()) + expect(dayjs().minutes(1).valueOf()).toBe(moment().minutes(1).valueOf()) +}) + +it('Seconds', () => { + expect(dayjs().get('seconds')).toBe(moment().get('seconds')) + expect(dayjs().seconds()).toBe(moment().seconds()) + expect(dayjs().seconds(0).valueOf()).toBe(moment().seconds(0).valueOf()) + expect(dayjs().seconds(1).valueOf()).toBe(moment().seconds(1).valueOf()) +}) + +it('Milliseconds', () => { + expect(dayjs().get('milliseconds')).toBe(moment().get('milliseconds')) + expect(dayjs().milliseconds()).toBe(moment().milliseconds()) + expect(dayjs().milliseconds(0).valueOf()).toBe(moment().milliseconds(0).valueOf()) + expect(dayjs().milliseconds(1).valueOf()).toBe(moment().milliseconds(1).valueOf()) +}) + +it('Set Dates', () => { + expect(dayjs().date(30).valueOf()).toBe(moment().dates(30).valueOf()) + expect(dayjs().set('dates', 30).valueOf()).toBe(moment().set('dates', 30).valueOf()) +}) + +it('Set Days of Week', () => { + expect(dayjs().days(0).valueOf()).toBe(moment().days(0).valueOf()) + expect(dayjs().set('days', 0).valueOf()).toBe(moment().set('days', 0).valueOf()) +}) + +it('Set Months', () => { + expect(dayjs().months(11).valueOf()).toBe(moment().months(11).valueOf()) + expect(dayjs().set('months', 11).valueOf()).toBe(moment().set('months', 11).valueOf()) +}) + +it('Set Years', () => { + expect(dayjs().years(2008).valueOf()).toBe(moment().year(2008).valueOf()) + expect(dayjs().set('years', 2008).valueOf()).toBe(moment().set('years', 2008).valueOf()) +}) + +it('Set Hours', () => { + expect(dayjs().set('hours', 6).valueOf()).toBe(moment().set('hours', 6).valueOf()) + expect(dayjs().hours(6).valueOf()).toBe(moment().hours(6).valueOf()) +}) + +it('Set Minutes', () => { + expect(dayjs().minutes(59).valueOf()).toBe(moment().minutes(59).valueOf()) + expect(dayjs().set('minutes', 59).valueOf()).toBe(moment().set('minutes', 59).valueOf()) +}) + +it('Set Seconds', () => { + expect(dayjs().seconds(59).valueOf()).toBe(moment().seconds(59).valueOf()) + expect(dayjs().set('second', 59).valueOf()).toBe(moment().set('second', 59).valueOf()) +}) + +it('Set Milliseconds', () => { + expect(dayjs().milliseconds(999).valueOf()).toBe(moment().milliseconds(999).valueOf()) + expect(dayjs().set('millisecond', 999).valueOf()).toBe(moment().set('millisecond', 999).valueOf()) +}) + +it('Set Month and Year in last day of month', () => { + // 2011-07-31 -> 2011-02-28 + const origin = dayjs('2011-07-31T14:48:00.000Z') + const setMonth = origin.set('month', 1) + expect(setMonth.months()).toBe(1) + expect(origin.dates()).toBe(31) + expect(setMonth.dates()).toBe(28) + // 2000-02-29 -> 2001-02-28 + const origin2 = dayjs('2000-02-29T14:48:00.000Z') + const setYear = origin2.set('years', 2001) + expect(setYear.months()).toBe(1) + expect(origin2.dates()).toBe(29) + expect(setYear.dates()).toBe(28) +})
Getter/setter plural aliases missing (e.g. hour() works but hours() does not) https://github.com/iamkun/dayjs/issues/58#issuecomment-540910296
It's easy to add this as a plugin, but is it necessary? @iamkun I definitely think so. You have plural support in `diff`, e.g. https://github.com/iamkun/dayjs/blob/4c862f682e763c5ad27ebc2492f7a40d0030ea4f/test/display.test.js#L180. yes, that plural for unit I think that if you have plural and singular in some parts of this library, it should be consistent everywhere else. Having a MomentJS advertised compatible API should add this in - especially since it's so easy to add it in as you say. I'll pending this issue for more discussion. The top 1 reason is always this total bundle size. I don't want to add even 1 more byte for features that are not that important. Any chance we could get this in as a feature? I'd gladly tip. I don't think it'd add much to make it so plural versions work, and the developer experience would greatly be in favor of this, it would also be in parity with moment, and make it easier for people to switch massive codebases over. Agree to add it as a plugin, but not in the main bundle.
2020-08-08T16:51:18Z
1.8
iamkun/dayjs
980
iamkun__dayjs-980
[ "979" ]
90c98e44a74512d092585c9fa49c7f6710aa8b29
diff --git a/src/constant.js b/src/constant.js --- a/src/constant.js +++ b/src/constant.js @@ -26,5 +26,5 @@ export const FORMAT_DEFAULT = 'YYYY-MM-DDTHH:mm:ssZ' export const INVALID_DATE_STRING = 'Invalid Date' // regex -export const REGEX_PARSE = /^(\d{4})-?(\d{1,2})?-?(\d{0,2})[^0-9]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?.?(\d{1,3})?$/ +export const REGEX_PARSE = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[^0-9]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?.?(\d{1,3})?$/ export const REGEX_FORMAT = /\[([^\]]+)]|Y{2,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g
diff --git a/test/parse.test.js b/test/parse.test.js --- a/test/parse.test.js +++ b/test/parse.test.js @@ -1,6 +1,7 @@ import moment from 'moment' import MockDate from 'mockdate' import dayjs from '../src' +import { REGEX_PARSE } from '../src/constant' beforeEach(() => { MockDate.set(new Date()) @@ -125,3 +126,12 @@ it('Clone with same value', () => { const another = newBase.clone() expect(newBase.toString()).toBe(another.toString()) }) + +describe('REGEX_PARSE', () => { + it('2020/9/30', () => { + const date = '2020/9/30' + const d = date.match(REGEX_PARSE) + expect(dayjs(date).valueOf()).toBe(moment(date).valueOf()) + expect(d.join('-')).toBe('2020/9/30-2020-9-30----') + }) +})
parseDate error from recent release. **Describe the bug** from https://github.com/iamkun/dayjs/pull/969 ``` // v1.8.30 export var REGEX_PARSE = /^(\d{4})-?(\d{1,2})-?(\d{0,2})[^0-9]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?.?(\d{1,3})?$/; // v1.8.31 export var REGEX_PARSE = /^(\d{4})-?(\d{1,2})?-?(\d{0,2})[^0-9]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?.?(\d{1,3})?$/; ``` result: ![image](https://user-images.githubusercontent.com/17005098/89159563-3ba04980-d5a2-11ea-9ce8-ca809da1c0c8.png) ``` // v1.8.31 dayjs('2020/9/30').format(); // result: 2020-01-01T09:00:00+08:00 ``` **Expected behavior** ``` // v1.8.30 dayjs('2020/9/30').format(); // result: 2020-09-30T00:00:00+08:00 ``` **Information** - Day.js Version [e.g. v1.8.31]
Thanks, fixed in https://github.com/iamkun/dayjs/pull/980#issuecomment-667884647
2020-08-03T08:24:39Z
1.8
iamkun/dayjs
851
iamkun__dayjs-851
[ "830" ]
29a7e74e97232bf2de2cf3399d5787d789ab211a
diff --git a/src/plugin/relativeTime/index.js b/src/plugin/relativeTime/index.js --- a/src/plugin/relativeTime/index.js +++ b/src/plugin/relativeTime/index.js @@ -1,6 +1,7 @@ import * as C from '../../constant' export default (o, c, d) => { + o = o || {} const proto = c.prototype d.en.relativeTime = { future: 'in %s', @@ -19,7 +20,7 @@ export default (o, c, d) => { } const fromTo = (input, withoutSuffix, instance, isFrom) => { const loc = instance.$locale().relativeTime - const T = [ + const T = o.thresholds || [ { l: 's', r: 44, d: C.S }, { l: 'm', r: 89 }, { l: 'mm', r: 44, d: C.MIN }, @@ -44,10 +45,10 @@ export default (o, c, d) => { ? d(input).diff(instance, t.d, true) : instance.diff(input, t.d, true) } - const abs = Math.round(Math.abs(result)) + const abs = (o.rounding || Math.round)(Math.abs(result)) isFuture = result > 0 if (abs <= t.r || !t.r) { - if (abs === 1 && i > 0) t = T[i - 1] // 1 minutes -> a minute + if (abs <= 1 && i > 0) t = T[i - 1] // 1 minutes -> a minute, 0 seconds -> 0 second const format = loc[t.l] if (typeof format === 'string') { out = format.replace('%d', abs) diff --git a/types/index.d.ts b/types/index.d.ts --- a/types/index.d.ts +++ b/types/index.d.ts @@ -96,9 +96,9 @@ declare namespace dayjs { locale(preset: string | ILocale, object?: Partial<ILocale>): Dayjs } - export type PluginFunc = (option: any, c: typeof Dayjs, d: typeof dayjs) => void + export type PluginFunc<T = unknown> = (option: T, c: typeof Dayjs, d: typeof dayjs) => void - export function extend(plugin: PluginFunc, option?: any): Dayjs + export function extend<T = unknown>(plugin: PluginFunc<T>, option?: T): Dayjs export function locale(preset: string | ILocale, object?: Partial<ILocale>, isLocal?: boolean): string diff --git a/types/plugin/relativeTime.d.ts b/types/plugin/relativeTime.d.ts --- a/types/plugin/relativeTime.d.ts +++ b/types/plugin/relativeTime.d.ts @@ -1,6 +1,17 @@ import { PluginFunc, ConfigType } from 'dayjs' -declare const plugin: PluginFunc +declare interface RelativeTimeThreshold { + l: string + r?: number + d?: string +} + +declare interface RelativeTimeOptions { + rounding?: (num: number) => number + thresholds?: RelativeTimeThreshold[] +} + +declare const plugin: PluginFunc<RelativeTimeOptions> export = plugin declare module 'dayjs' {
diff --git a/test/plugin/relativeTime.test.js b/test/plugin/relativeTime.test.js --- a/test/plugin/relativeTime.test.js +++ b/test/plugin/relativeTime.test.js @@ -1,6 +1,7 @@ import MockDate from 'mockdate' import moment from 'moment' import dayjs from '../../src' +import * as C from '../../src/constant' import relativeTime from '../../src/plugin/relativeTime' import utc from '../../src/plugin/utc' import '../../src/locale/ru' @@ -115,3 +116,24 @@ it('Time from now with UTC', () => { expect(dutc.fromNow()).toBe(mutc.fromNow()) }) + +it('Custom thresholds and rounding support', () => { + expect(dayjs().subtract(45, 'm').fromNow()).toBe('an hour ago') + dayjs.extend(relativeTime, { + rounding: Math.floor, + thresholds: [ + { l: 's', r: 1 }, + { l: 'm', r: 1 }, + { l: 'mm', r: 59, d: C.MIN }, + { l: 'h', r: 1 }, + { l: 'hh', r: 23, d: C.H }, + { l: 'd', r: 1 }, + { l: 'dd', r: 29, d: C.D }, + { l: 'M', r: 1 }, + { l: 'MM', r: 11, d: C.M }, + { l: 'y' }, + { l: 'yy', d: C.Y } + ] + }) + expect(dayjs().subtract(45, 'm').fromNow()).toBe('45 minutes ago') +})
How to get precise second(s) in `relativeTime` plugin? **Describe the bug** https://github.com/iamkun/dayjs/blob/dev/src/plugin/relativeTime/index.js#L8 All `seconds` displays `a few seconds` **Expected behavior** I want to display `1 second, 2 seconds...` **Information** - Day.js Version: 1.8.22
You can customize these string using: https://day.js.org/docs/en/display/from-now#list-of-breakdown-range But why they're different with other units by default? And I tried ```js dayjs.updateLocale('en', { relativeTime: { ...dayjs.Ls.en.relativeTime, s: 'a second', ss: '%d seconds', }, }); ``` It seems `ss` is not working at all. And when it comes to 44 seconds, it changes to `1 minute` suddenly. Is that possible to change the threads to real world? We don't need the fuzzification. Maybe we can add another plugin `relativeTimeStrict` like [`formatDistanceStrict`](https://date-fns.org/v2.10.0/docs/formatDistanceStrict) from `date-fns`. How do you think? <img width="537" alt="Screen Shot 2020-03-10 at 3 53 55 PM" src="https://user-images.githubusercontent.com/17680888/76292935-1ce7a080-62eb-11ea-8fc5-d9e2d1685041.png"> We do not support `ss` What we really need is a duration plugin? Yes, we can do `s: '%d seconds'`, but it's incorrect for `1 seconds`. What did you mean with `a duration plugin`? I see. You can pass a function then: https://day.js.org/docs/en/customization/relative-time#additional-token-processing @iamkun How about add a `strict` option for `relativeTime` plugin? ```ts // based on https://github.com/iamkun/dayjs/blob/dev/src/plugin/relativeTime/index.js /// <reference path="./relative-time.shim.d.ts" /> import { ConfigType, Dayjs, PluginFunc, UnitType } from 'dayjs'; export const MS = 'millisecond'; export const S = 'second'; export const MIN = 'minute'; export const H = 'hour'; export const D = 'day'; export const W = 'week'; export const M = 'month'; export const Q = 'quarter'; export const Y = 'year'; export interface RelativeTimeThread { l: string; r?: number; d?: UnitType; } export interface RelativeTimeOptions { strict?: boolean; threads?: RelativeTimeThread[]; } export const relativeTime: PluginFunc = ( options: RelativeTimeOptions, c, d, // eslint-disable-next-line sonarjs/cognitive-complexity ) => { const proto = c.prototype; d.Ls.en.relativeTime = { future: 'in %s', past: '%s ago', s: 'a few seconds', m: 'a minute', mm: '%d minutes', h: 'an hour', hh: '%d hours', d: 'a day', dd: '%d days', M: 'a month', MM: '%d months', y: 'a year', yy: '%d years', }; if (options?.strict) { Object.assign(d.Ls.en.relativeTime, { s: '%d second', ss: '%d seconds', m: '1 minute', h: '1 hour', d: '1 day', M: '1 month', y: '1 year', }); } const fromTo = ( input: ConfigType, withoutSuffix: boolean, instance: Dayjs, isFrom = false, ) => { // @ts-ignore const loc = instance.$locale().relativeTime; const T: RelativeTimeThread[] = options?.threads || options?.strict ? [ { l: 's', r: 1 }, { l: 'ss', r: 59, d: S }, { l: 'm', r: 1 }, { l: 'mm', r: 59, d: MIN }, { l: 'h', r: 1 }, { l: 'hh', r: 23, d: H }, { l: 'd', r: 1 }, { l: 'dd', r: 30, d: D }, { l: 'M', r: 1 }, { l: 'MM', r: 11, d: M }, { l: 'y' }, { l: 'yy', d: Y }, ] : [ { l: 's', r: 44, d: S }, { l: 'm', r: 89 }, { l: 'mm', r: 44, d: MIN }, { l: 'h', r: 89 }, { l: 'hh', r: 21, d: H }, { l: 'd', r: 35 }, { l: 'dd', r: 25, d: D }, { l: 'M', r: 45 }, { l: 'MM', r: 10, d: M }, { l: 'y', r: 17 }, { l: 'yy', d: Y }, ]; if (!loc.ss) { loc.ss = loc.s; } const Tl = T.length; let result; let out; let isFuture; for (let i = 0; i < Tl; i += 1) { let t = T[i]; if (t.d) { result = isFrom ? d(input).diff(instance, t.d, true) : instance.diff(input, t.d, true); } const abs = Math[options?.strict ? 'floor' : 'round'](Math.abs(result)); isFuture = result > 0; if (abs <= t.r || !t.r) { if (abs <= 1 && i > 0) t = T[i - 1]; // 1 minutes -> a minute const format = loc[t.l]; if (typeof format === 'string') { out = format.replace('%d', String(abs)); } else { out = format(abs, withoutSuffix, t.l, isFuture); } break; } } if (withoutSuffix) return out; return (isFuture ? loc.future : loc.past).replace('%s', out); }; proto.to = function(input, withoutSuffix) { return fromTo(input, withoutSuffix, this, true); }; proto.from = function(input, withoutSuffix) { return fromTo(input, withoutSuffix, this); }; // @ts-ignore const makeNow = (thisDay: Dayjs) => ('$u' in thisDay ? d.utc() : d()); proto.toNow = function(withoutSuffix) { return this.to(makeNow(this), withoutSuffix); }; proto.fromNow = function(withoutSuffix) { return this.from(makeNow(this), withoutSuffix); }; }; ``` I can raise a PR if you'd like to have this feature. Looks sweet. 😁 Let me think for a while. @iamkun Any news for this? Why not 😬 thanks
2020-03-26T16:05:26Z
1.8
iamkun/dayjs
1,112
iamkun__dayjs-1112
[ "1111" ]
7937ccdeac47d094a60e65ebb62a6020b81c46f4
diff --git a/src/locale/hu.js b/src/locale/hu.js --- a/src/locale/hu.js +++ b/src/locale/hu.js @@ -13,17 +13,17 @@ const locale = { relativeTime: { future: '%s múlva', past: '%s', - s: 'néhány másodperc', - m: 'egy perc', - mm: '%d perc', - h: 'egy óra', - hh: '%d óra', - d: 'egy nap', - dd: '%d nap', - M: 'egy hónap', - MM: '%d hónap', - y: 'egy éve', - yy: '%d év' + s: (_, s, ___, isFuture) => `néhány másodperc${isFuture || s ? '' : 'e'}`, + m: (_, s, ___, isFuture) => `egy perc${isFuture || s ? '' : 'e'}`, + mm: (n, s, ___, isFuture) => `${n} perc${isFuture || s ? '' : 'e'}`, + h: (_, s, ___, isFuture) => `egy ${isFuture || s ? 'óra' : 'órája'}`, + hh: (n, s, ___, isFuture) => `${n} ${isFuture || s ? 'óra' : 'órája'}`, + d: (_, s, ___, isFuture) => `egy ${isFuture || s ? 'nap' : 'napja'}`, + dd: (n, s, ___, isFuture) => `${n} ${isFuture || s ? 'nap' : 'napja'}`, + M: (_, s, ___, isFuture) => `egy ${isFuture || s ? 'hónap' : 'hónapja'}`, + MM: (n, s, ___, isFuture) => `${n} ${isFuture || s ? 'hónap' : 'hónapja'}`, + y: (_, s, ___, isFuture) => `egy ${isFuture || s ? 'év' : 'éve'}`, + yy: (n, s, ___, isFuture) => `${n} ${isFuture || s ? 'év' : 'éve'}` }, formats: { LT: 'H:mm', @@ -38,4 +38,3 @@ const locale = { dayjs.locale(locale, null, true) export default locale -
diff --git a/test/locale/hu.test.js b/test/locale/hu.test.js new file mode 100644 --- /dev/null +++ b/test/locale/hu.test.js @@ -0,0 +1,45 @@ +import moment from 'moment' +import dayjs from '../../src' +import relativeTime from '../../src/plugin/relativeTime' +import '../../src/locale/hu' + +dayjs.extend(relativeTime) + +it('RelativeTime: Time from X', () => { + const T = [ + [44.4, 'second'], // a few seconds + [89.5, 'second'], // a minute + [2, 'minute'], // 2 minutes + [43, 'minute'], // 43 minutes + [45, 'minute'], // an hour + [3, 'hour'], // 3 hours + [21, 'hour'], // 21 hours + [1, 'day'], // a day + [3, 'day'], // 3 day + [25, 'day'], // 25 days + [1, 'month'], // a month + [2, 'month'], // 2 month + [10, 'month'], // 10 month + [1, 'year'], // a year + [2, 'year'], // 2 year + [5, 'year'], // 5 year + [18, 'month'] // 2 years + ] + + T.forEach((t) => { + dayjs.locale('hu') + moment.locale('hu') + + const dayjsDay = dayjs() + const momentDay = moment() + + const dayjsCompare = dayjs().add(t[0], t[1]) + const momentCompare = moment().add(t[0], t[1]) + + expect(dayjsDay.from(dayjsCompare)).toBe(momentDay.from(momentCompare)) + + expect(dayjsDay.to(dayjsCompare)).toBe(momentDay.to(momentCompare)) + + expect(dayjsDay.from(dayjsCompare, true)).toBe(momentDay.from(momentCompare, true)) + }) +})
Improve hungarian localization Hi! I would like to improve the hungarian localization! Currently the package does not handle the past relative times at all. The main problem is that in hungarian we don't have a single word to show that a date is in the past, like `ago` in english. Instead we add letters to each word, for example: `3 years ago` => `3 éve` where `év` means `year` in hungarian `2 hours ago` => `2 órája` where `óra` means `hour` in hungarian `15 minutes ago` => `15 perce ` where `perc` means `minute` in hungarian Does the package support this kind of localization? If not yet I'm happy to dig in the code and add a solution to this if someone can point me in the right direction. [Here is how date-fns implements this. ](https://github.com/date-fns/date-fns/blob/master/src/locale/hu/_lib/formatDistance/index.js) Thanks!
Maybe this is what you are looking for https://day.js.org/docs/en/customization/relative-time#additional-token-processing Exactly, thanks, will customize my localization locally and once it's looking good I will create a PR to provide a fix for everybody.
2020-10-04T18:13:22Z
1.9
iamkun/dayjs
891
iamkun__dayjs-891
[ "888" ]
bcea06730da2d19ddbad844de3557ee077af821c
diff --git a/src/index.js b/src/index.js --- a/src/index.js +++ b/src/index.js @@ -28,13 +28,14 @@ const parseLocale = (preset, object, isLocal) => { return l || (!isLocal && L) } -const dayjs = (date, c, pl) => { +const dayjs = function (date, c) { if (isDayjs(date)) { return date.clone() } // eslint-disable-next-line no-nested-ternary - const cfg = c ? (typeof c === 'string' ? { format: c, pl } : c) : {} + const cfg = typeof c === 'object' ? c : {} cfg.date = date + cfg.args = arguments// eslint-disable-line prefer-rest-params return new Dayjs(cfg) // eslint-disable-line no-use-before-define } diff --git a/src/plugin/customParseFormat/index.js b/src/plugin/customParseFormat/index.js --- a/src/plugin/customParseFormat/index.js +++ b/src/plugin/customParseFormat/index.js @@ -181,16 +181,26 @@ export default (o, C, d) => { proto.parse = function (cfg) { const { date, - format, - pl, - utc + utc, + args } = cfg this.$u = utc - if (format) { - locale = pl ? d.Ls[pl] : this.$locale() + const format = args[1] + if (typeof format === 'string') { + const isStrictWithoutLocale = args[2] === true + const isStrictWithLocale = args[3] === true + const isStrict = isStrictWithoutLocale || isStrictWithLocale + let pl = args[2] + if (isStrictWithLocale) [,, pl] = args + if (!isStrictWithoutLocale) { + locale = pl ? d.Ls[pl] : this.$locale() + } this.$d = parseFormattedInput(date, format, utc) this.init(cfg) - if (pl) this.$L = pl + if (isStrict && date !== this.format(format)) { + this.$d = new Date('') + } + if (pl && pl !== true) this.$L = pl } else { oldParse.call(this, cfg) } diff --git a/src/plugin/duration/index.js b/src/plugin/duration/index.js --- a/src/plugin/duration/index.js +++ b/src/plugin/duration/index.js @@ -95,7 +95,7 @@ class Duration { seconds += this.$d.milliseconds / 1000 } const S = seconds ? `${seconds}S` : '' - const T = (H || M || S) ? 'T' : '' + const T = (H || m || S) ? 'T' : '' const result = `P${Y}${M}${D}${T}${H}${m}${S}` return result === 'P' ? 'P0D' : result } diff --git a/src/plugin/relativeTime/index.js b/src/plugin/relativeTime/index.js --- a/src/plugin/relativeTime/index.js +++ b/src/plugin/relativeTime/index.js @@ -3,7 +3,7 @@ import * as C from '../../constant' export default (o, c, d) => { o = o || {} const proto = c.prototype - d.en.relativeTime = { + const relObj = { future: 'in %s', past: '%s ago', s: 'a few seconds', @@ -18,8 +18,9 @@ export default (o, c, d) => { y: 'a year', yy: '%d years' } + d.en.relativeTime = relObj const fromTo = (input, withoutSuffix, instance, isFrom) => { - const loc = instance.$locale().relativeTime + const loc = instance.$locale().relativeTime || relObj const T = o.thresholds || [ { l: 's', r: 44, d: C.S }, { l: 'm', r: 89 }, diff --git a/src/plugin/utc/index.js b/src/plugin/utc/index.js --- a/src/plugin/utc/index.js +++ b/src/plugin/utc/index.js @@ -3,8 +3,8 @@ import { MILLISECONDS_A_MINUTE, MIN } from '../../constant' export default (option, Dayjs, dayjs) => { const localOffset = (new Date()).getTimezoneOffset() const proto = Dayjs.prototype - dayjs.utc = function (date, format) { - const cfg = { date, utc: true, format } + dayjs.utc = function (date) { + const cfg = { date, utc: true, args: arguments } // eslint-disable-line prefer-rest-params return new Dayjs(cfg) // eslint-disable-line no-use-before-define } diff --git a/src/plugin/weekOfYear/index.js b/src/plugin/weekOfYear/index.js --- a/src/plugin/weekOfYear/index.js +++ b/src/plugin/weekOfYear/index.js @@ -1,6 +1,6 @@ import { MS, Y, D, W } from '../../constant' -export default (o, c) => { +export default (o, c, d) => { const proto = c.prototype proto.week = function (week = null) { if (week !== null) { @@ -8,17 +8,18 @@ export default (o, c) => { } const yearStart = this.$locale().yearStart || 1 if (this.month() === 11 && this.date() > 25) { - const nextYearStartDay = this.startOf(Y).add(1, Y).date(yearStart) - const thisEndOfWeek = this.endOf(W) + // d(this) is for badMutable + const nextYearStartDay = d(this).startOf(Y).add(1, Y).date(yearStart) + const thisEndOfWeek = d(this).endOf(W) if (nextYearStartDay.isBefore(thisEndOfWeek)) { return 1 } } - const yearStartDay = this.startOf(Y).date(yearStart) + const yearStartDay = d(this).startOf(Y).date(yearStart) const yearStartWeek = yearStartDay.startOf(W).subtract(1, MS) const diffInWeek = this.diff(yearStartWeek, W, true) if (diffInWeek < 0) { - return this.startOf('week').week() + return d(this).startOf('week').week() } return Math.ceil(diffInWeek) }
diff --git a/test/plugin/badMutable.test.js b/test/plugin/badMutable.test.js --- a/test/plugin/badMutable.test.js +++ b/test/plugin/badMutable.test.js @@ -2,9 +2,11 @@ import MockDate from 'mockdate' import moment from 'moment' import dayjs from '../../src' import badMutable from '../../src/plugin/badMutable' +import weekOfYear from '../../src/plugin/weekOfYear' import '../../src/locale/zh-cn' dayjs.extend(badMutable) +dayjs.extend(weekOfYear) beforeEach(() => { MockDate.set(new Date()) @@ -175,3 +177,10 @@ it('isAfter isBefore isSame', () => { expect(d.format()).toBe(format) expect(d.isAfter()).toBe(false) }) + +it('WeekOfYear get week won"t change instance', () => { + const d = dayjs() + const format = d.format() + d.week() + expect(d.format()).toBe(format) +}) diff --git a/test/plugin/customParseFormat.test.js b/test/plugin/customParseFormat.test.js --- a/test/plugin/customParseFormat.test.js +++ b/test/plugin/customParseFormat.test.js @@ -146,13 +146,13 @@ it('parse month from string with locale in config', () => { const input = '2018 лютий 03' const format = 'YYYY MMMM DD' - expect(dayjs(input, { format, locale: uk }).valueOf()).toBe(moment(input, format, 'uk').valueOf()) + expect(dayjs(input, format, 'uk').valueOf()).toBe(moment(input, format, 'uk').valueOf()) }) it('parse month from short string with locale in config', () => { const input = '2018 трав 03' const format = 'YYYY MMM DD' - expect(dayjs(input, { format, locale: uk }).valueOf()).toBe(moment(input, format, 'uk').valueOf()) + expect(dayjs(input, format, 'uk').valueOf()).toBe(moment(input, format, 'uk').valueOf()) }) it('parse month from short string with locale in argument', () => { @@ -232,3 +232,19 @@ it('correctly parse ordinal', () => { expect(dayjsCN.locale()) .toBe(momentCN.locale()) }) + + +describe('Strict mode', () => { + it('without locale', () => { + const input = '1970-00-00' + const format = 'YYYY-MM-DD' + expect(dayjs(input, format).isValid()).toBe(true) + expect(dayjs(input, format, true).isValid()).toBe(false) + }) + it('with locale', () => { + const input = '2018 三月 99' + const format = 'YYYY MMMM DD' + expect(dayjs(input, format, 'zh-cn').isValid()).toBe(true) + expect(dayjs(input, format, 'zh-cn', true).isValid()).toBe(false) + }) +}) diff --git a/test/plugin/duration.test.js b/test/plugin/duration.test.js --- a/test/plugin/duration.test.js +++ b/test/plugin/duration.test.js @@ -23,7 +23,7 @@ describe('Creating', () => { }) it('two argument will bubble up to the next', () => { expect(dayjs.duration(59, 'seconds').toISOString()).toBe('PT59S') - expect(dayjs.duration(60, 'seconds').toISOString()).toBe('P1M') + expect(dayjs.duration(60, 'seconds').toISOString()).toBe('PT1M') expect(dayjs.duration(13213, 'seconds').toISOString()).toBe('PT3H40M13S') }) it('object with float', () => { @@ -78,7 +78,7 @@ it('Is duration', () => { it('toJSON', () => { expect(JSON.stringify({ postDuration: dayjs.duration(5, 'minutes') - })).toBe('{"postDuration":"P5M"}') + })).toBe('{"postDuration":"PT5M"}') }) describe('Humanize', () => { diff --git a/test/plugin/isoWeek.test.js b/test/plugin/isoWeek.test.js --- a/test/plugin/isoWeek.test.js +++ b/test/plugin/isoWeek.test.js @@ -38,6 +38,7 @@ it('isoWeekday', () => { for (let i = 0; i < 7; i += 1) { expect(dayjs().add(i, 'day').isoWeekday()).toBe(moment().add(i, 'day').isoWeekday()) expect(dayjs().isoWeekday(i).valueOf()).toBe(moment().isoWeekday(i).valueOf()) + expect(dayjs().add(1, 'day').isoWeekday(i).valueOf()).toBe(moment().add(1, 'day').isoWeekday(i).valueOf()) } }) diff --git a/test/plugin/relativeTime.test.js b/test/plugin/relativeTime.test.js --- a/test/plugin/relativeTime.test.js +++ b/test/plugin/relativeTime.test.js @@ -137,3 +137,9 @@ it('Custom thresholds and rounding support', () => { }) expect(dayjs().subtract(45, 'm').fromNow()).toBe('45 minutes ago') }) + +it('Locale without relativeTime config fallback', () => { + expect(dayjs().locale({ + name: 'test-locale' + }).fromNow()).toEqual(expect.any(String)) +})
Duration.toISOString() returns wrong result **Describe the bug** dayjs.duration(dayjs.duration(1, 'minutes').toISOString()).as('minutes') returns 43200 dayjs.duration(1, 'minutes').toISOString() return 'P1M' **Expected behavior** Should return 1 Suppose that dayjs.duration(1, 'minutes').toISOString() should return 'PT1M' **Information** - Day.js Version [1.8.24] - OS: [macOS Mojave 10.14.6] - Browser [chrome 81.0.4044.122 (Official Build) (64-bit)] - Time zone: [GMT+3 (Moscow Standard Time)]
2020-04-30T04:04:45Z
1.8
iamkun/dayjs
768
iamkun__dayjs-768
[ "761" ]
6b587dabc13b06a73c6bec9b77ec8aca890ebf0a
diff --git a/src/locale/cs.js b/src/locale/cs.js --- a/src/locale/cs.js +++ b/src/locale/cs.js @@ -1,5 +1,52 @@ import dayjs from 'dayjs' +function plural(n) { + return (n > 1) && (n < 5) && (~~(n / 10) !== 1) // eslint-disable-line +} +/* eslint-disable */ +function translate(number, withoutSuffix, key, isFuture) { + const result = `${number} ` + switch (key) { + case 's': // a few seconds / in a few seconds / a few seconds ago + return (withoutSuffix || isFuture) ? 'pár sekund' : 'pár sekundami' + case 'm': // a minute / in a minute / a minute ago + return withoutSuffix ? 'minuta' : (isFuture ? 'minutu' : 'minutou') + case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago + if (withoutSuffix || isFuture) { + return result + (plural(number) ? 'minuty' : 'minut') + } + return `${result}minutami` + case 'h': // an hour / in an hour / an hour ago + return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou') + case 'hh': // 9 hours / in 9 hours / 9 hours ago + if (withoutSuffix || isFuture) { + return result + (plural(number) ? 'hodiny' : 'hodin') + } + return `${result}hodinami` + case 'd': // a day / in a day / a day ago + return (withoutSuffix || isFuture) ? 'den' : 'dnem' + case 'dd': // 9 days / in 9 days / 9 days ago + if (withoutSuffix || isFuture) { + return result + (plural(number) ? 'dny' : 'dní') + } + return `${result}dny` + case 'M': // a month / in a month / a month ago + return (withoutSuffix || isFuture) ? 'měsíc' : 'měsícem' + case 'MM': // 9 months / in 9 months / 9 months ago + if (withoutSuffix || isFuture) { + return result + (plural(number) ? 'měsíce' : 'měsíců') + } + return `${result}měsíci` + case 'y': // a year / in a year / a year ago + return (withoutSuffix || isFuture) ? 'rok' : 'rokem' + case 'yy': // 9 years / in 9 years / 9 years ago + if (withoutSuffix || isFuture) { + return result + (plural(number) ? 'roky' : 'let') + } + return `${result}lety` + } +} +/* eslint-enable */ const locale = { name: 'cs', weekdays: 'neděle_pondělí_úterý_středa_čtvrtek_pátek_sobota'.split('_'), @@ -21,17 +68,17 @@ const locale = { relativeTime: { future: 'za %s', past: 'před %s', - s: 'několik sekund', - m: 'minuta', - mm: '%d minut', - h: 'hodina', - hh: '%d hodin', - d: 'den', - dd: '%d dnů', - M: 'měsíc', - MM: '%d měsíců', - y: 'rok', - yy: '%d roků' + s: translate, + m: translate, + mm: translate, + h: translate, + hh: translate, + d: translate, + dd: translate, + M: translate, + MM: translate, + y: translate, + yy: translate } } diff --git a/src/locale/ru.js b/src/locale/ru.js --- a/src/locale/ru.js +++ b/src/locale/ru.js @@ -7,6 +7,26 @@ const monthShortFormat = 'янв._февр._мар._апр._мая_июня_ию const monthShortStandalone = 'янв._февр._март_апр._май_июнь_июль_авг._сент._окт._нояб._дек.'.split('_') const MONTHS_IN_FORMAT = /D[oD]?(\[[^[\]]*\]|\s)+MMMM?/ + +function plural(word, num) { + const forms = word.split('_') + return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]) // eslint-disable-line +} +function relativeTimeWithPlural(number, withoutSuffix, key) { + const format = { + mm: withoutSuffix ? 'минута_минуты_минут' : 'минуту_минуты_минут', + hh: 'час_часа_часов', + dd: 'день_дня_дней', + MM: 'месяц_месяца_месяцев', + yy: 'год_года_лет' + } + if (key === 'm') { + return withoutSuffix ? 'минута' : 'минуту' + } + + return `${number} ${plural(format[key], +number)}` +} + const locale = { name: 'ru', weekdays: 'воскресенье_понедельник_вторник_среда_четверг_пятница_суббота'.split('_'), @@ -37,16 +57,16 @@ const locale = { future: 'через %s', past: '%s назад', s: 'несколько секунд', - m: 'минута', - mm: '%d минут', + m: relativeTimeWithPlural, + mm: relativeTimeWithPlural, h: 'час', - hh: '%d часов', + hh: relativeTimeWithPlural, d: 'день', - dd: '%d дней', + dd: relativeTimeWithPlural, M: 'месяц', - MM: '%d месяцев', + MM: relativeTimeWithPlural, y: 'год', - yy: '%d лет' + yy: relativeTimeWithPlural }, ordinal: n => n } diff --git a/src/locale/uk.js b/src/locale/uk.js --- a/src/locale/uk.js +++ b/src/locale/uk.js @@ -1,5 +1,25 @@ import dayjs from 'dayjs' +function plural(word, num) { + const forms = word.split('_') + return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]) // eslint-disable-line +} +function relativeTimeWithPlural(number, withoutSuffix, key) { + const format = { + ss: withoutSuffix ? 'секунда_секунди_секунд' : 'секунду_секунди_секунд', + mm: withoutSuffix ? 'хвилина_хвилини_хвилин' : 'хвилину_хвилини_хвилин', + hh: withoutSuffix ? 'година_години_годин' : 'годину_години_годин', + dd: 'день_дні_днів', + MM: 'місяць_місяці_місяців', + yy: 'рік_роки_років' + } + if (key === 'm') { + return withoutSuffix ? 'хвилина' : 'хвилину' + } + + return `${number} ${plural(format[key], +number)}` +} + const locale = { name: 'uk', weekdays: 'неділя_понеділок_вівторок_середа_четвер_п’ятниця_субота'.split('_'), @@ -9,19 +29,19 @@ const locale = { monthsShort: 'сiч_лют_бер_квiт_трав_черв_лип_серп_вер_жовт_лист_груд'.split('_'), weekStart: 1, relativeTime: { - future: 'через %s', + future: 'за %s', past: '%s тому', s: 'декілька секунд', - m: 'хвилина', - mm: '%d хвилин', - h: 'година', - hh: '%d годин', + m: relativeTimeWithPlural, + mm: relativeTimeWithPlural, + h: 'годину', + hh: relativeTimeWithPlural, d: 'день', - dd: '%d днів', + dd: relativeTimeWithPlural, M: 'місяць', - MM: '%d місяців', + MM: relativeTimeWithPlural, y: 'рік', - yy: '%d роки' + yy: relativeTimeWithPlural }, ordinal: n => n, formats: { diff --git a/src/plugin/customParseFormat/index.js b/src/plugin/customParseFormat/index.js --- a/src/plugin/customParseFormat/index.js +++ b/src/plugin/customParseFormat/index.js @@ -159,9 +159,9 @@ const parseFormattedInput = (input, format, utc) => { ) + (zone.offset * 60 * 1000)) } const now = new Date() + const d = day || ((!year && !month) ? now.getDate() : 1) const y = year || now.getFullYear() const M = month > 0 ? month - 1 : now.getMonth() - const d = day || now.getDate() const h = hours || 0 const m = minutes || 0 const s = seconds || 0 @@ -191,6 +191,7 @@ export default (o, C, d) => { locale = pl ? d.Ls[pl] : this.$locale() this.$d = parseFormattedInput(date, format, utc) this.init(cfg) + if (pl) this.$L = pl } else { oldParse.call(this, cfg) } diff --git a/src/plugin/relativeTime/index.js b/src/plugin/relativeTime/index.js --- a/src/plugin/relativeTime/index.js +++ b/src/plugin/relativeTime/index.js @@ -35,6 +35,7 @@ export default (o, c, d) => { const Tl = T.length let result let out + let isFuture for (let i = 0; i < Tl; i += 1) { let t = T[i] @@ -44,14 +45,20 @@ export default (o, c, d) => { : instance.diff(input, t.d, true) } const abs = Math.round(Math.abs(result)) + isFuture = result > 0 if (abs <= t.r || !t.r) { if (abs === 1 && i > 0) t = T[i - 1] // 1 minutes -> a minute - out = loc[t.l].replace('%d', abs) + const format = loc[t.l] + if (typeof format === 'string') { + out = format.replace('%d', abs) + } else { + out = format(abs, withoutSuffix, t.l, isFuture) + } break } } if (withoutSuffix) return out - return ((result > 0) ? loc.future : loc.past).replace('%s', out) + return (isFuture ? loc.future : loc.past).replace('%s', out) } proto.to = function (input, withoutSuffix) { return fromTo(input, withoutSuffix, this, true) diff --git a/src/plugin/updateLocale/index.js b/src/plugin/updateLocale/index.js new file mode 100644 --- /dev/null +++ b/src/plugin/updateLocale/index.js @@ -0,0 +1,13 @@ +export default (option, Dayjs, dayjs) => { + dayjs.updateLocale = function (locale, customConfig) { + const localeList = dayjs.Ls + const localeConfig = localeList[locale] + if (!localeConfig) return + const customConfigKeys = customConfig ? Object.keys(customConfig) : [] + customConfigKeys.forEach((c) => { + localeConfig[c] = customConfig[c] + }) + return localeConfig // eslint-disable-line consistent-return + } +} + diff --git a/src/plugin/weekOfYear/index.js b/src/plugin/weekOfYear/index.js --- a/src/plugin/weekOfYear/index.js +++ b/src/plugin/weekOfYear/index.js @@ -6,25 +6,14 @@ export default (o, c, d) => { if (week !== null) { return this.add((week - this.week()) * 7, 'day') } - const weekStart = this.$locale().weekStart || 0 - - // d(this) clone is for badMutable plugin - const endOfYear = d(this).endOf(Y) - if ( - weekStart === 0 && - endOfYear.day() !== 6 && - this.month() === 11 && - 31 - this.date() <= endOfYear.day() - ) { - return 1 - } - const startOfYear = d(this).startOf(Y) const compareDay = startOfYear.subtract(startOfYear.day() - weekStart, D).subtract(1, MS) const diffInWeek = this.diff(compareDay, W, true) - return Math.ceil(diffInWeek) + const result = Math.ceil(diffInWeek) + return result > 52 ? 1 : result } + proto.weeks = function (week = null) { return this.week(week) } diff --git a/types/plugin/minMax.d.ts b/types/plugin/minMax.d.ts --- a/types/plugin/minMax.d.ts +++ b/types/plugin/minMax.d.ts @@ -1,4 +1,4 @@ -import { PluginFunc, ConfigType } from 'dayjs' +import { PluginFunc } from 'dayjs' declare const plugin: PluginFunc export = plugin diff --git a/types/plugin/updateLocale.d.ts b/types/plugin/updateLocale.d.ts new file mode 100644 --- /dev/null +++ b/types/plugin/updateLocale.d.ts @@ -0,0 +1,8 @@ +import { PluginFunc } from 'dayjs' + +declare const plugin: PluginFunc +export = plugin + +declare module 'dayjs' { + export function updateLocale(localeName: String, customConfig: Object): any +}
diff --git a/test/locale/cs.test.js b/test/locale/cs.test.js new file mode 100644 --- /dev/null +++ b/test/locale/cs.test.js @@ -0,0 +1,52 @@ +import moment from 'moment' +import MockDate from 'mockdate' +import dayjs from '../../src' +import relativeTime from '../../src/plugin/relativeTime' +import '../../src/locale/cs' + +dayjs.extend(relativeTime) + +beforeEach(() => { + MockDate.set(new Date()) +}) + +afterEach(() => { + MockDate.reset() +}) + +it('RelativeTime: Time from X', () => { + const T = [ + [44.4, 'second'], // a few seconds + [89.5, 'second'], // a minute + [2, 'minute'], // 2 minutes + [43, 'minute'], // 44 minutes + [45, 'minute'], // an hour + [3, 'hour'], // 3 hours + [21, 'hour'], // 21 hours + [1, 'day'], // a day + [3, 'day'], // 3 day + [25, 'day'], // 25 days + [1, 'month'], // a month + [2, 'month'], // 2 month + [10, 'month'], // 10 month + [1, 'year'], // a year + [2, 'year'], // 2 year + [5, 'year'], // 5 year + [18, 'month'] // 2 years + ] + + T.forEach((t) => { + dayjs.locale('cs') + moment.locale('cs') + const dayjsDay = dayjs() + const momentDay = moment() + const dayjsCompare = dayjs().add(t[0], t[1]) + const momentCompare = moment().add(t[0], t[1]) + expect(dayjsDay.from(dayjsCompare)) + .toBe(momentDay.from(momentCompare)) + expect(dayjsDay.to(dayjsCompare)) + .toBe(momentDay.to(momentCompare)) + expect(dayjsDay.from(dayjsCompare, true)) + .toBe(momentDay.from(momentCompare, true)) + }) +}) diff --git a/test/locale/ru.test.js b/test/locale/ru.test.js --- a/test/locale/ru.test.js +++ b/test/locale/ru.test.js @@ -1,8 +1,11 @@ import moment from 'moment' import MockDate from 'mockdate' import dayjs from '../../src' +import relativeTime from '../../src/plugin/relativeTime' import '../../src/locale/ru' +dayjs.extend(relativeTime) + beforeEach(() => { MockDate.set(new Date()) }) @@ -23,3 +26,24 @@ it('Format Month with locale function', () => { expect(dayjsRU.format(testFormat3)).toEqual(momentRU.format(testFormat3)) } }) + +it('RelativeTime: Time from X', () => { + const T = [ + [44.4, 'second'], // a few seconds + [89.5, 'second'], // a minute + [43, 'minute'], // 44 minutes + [21, 'hour'], // 21 hours + [25, 'day'], // 25 days + [10, 'month'], // 2 month + [18, 'month'] // 2 years + ] + + T.forEach((t) => { + dayjs.locale('ru') + moment.locale('ru') + expect(dayjs().from(dayjs().add(t[0], t[1]))) + .toBe(moment().from(moment().add(t[0], t[1]))) + expect(dayjs().from(dayjs().add(t[0], t[1]), true)) + .toBe(moment().from(moment().add(t[0], t[1]), true)) + }) +}) diff --git a/test/locale/uk.test.js b/test/locale/uk.test.js new file mode 100644 --- /dev/null +++ b/test/locale/uk.test.js @@ -0,0 +1,36 @@ +import moment from 'moment' +import MockDate from 'mockdate' +import dayjs from '../../src' +import relativeTime from '../../src/plugin/relativeTime' +import '../../src/locale/uk' + +dayjs.extend(relativeTime) + +beforeEach(() => { + MockDate.set(new Date()) +}) + +afterEach(() => { + MockDate.reset() +}) + +it('RelativeTime: Time from X', () => { + const T = [ + [44.4, 'second'], // a few seconds + [89.5, 'second'], // a minute + [43, 'minute'], // 44 minutes + [21, 'hour'], // 21 hours + [25, 'day'], // 25 days + [10, 'month'], // 2 month + [18, 'month'] // 2 years + ] + + T.forEach((t) => { + dayjs.locale('uk') + moment.locale('uk') + expect(dayjs().from(dayjs().add(t[0], t[1]))) + .toBe(moment().from(moment().add(t[0], t[1]))) + expect(dayjs().from(dayjs().add(t[0], t[1]), true)) + .toBe(moment().from(moment().add(t[0], t[1]), true)) + }) +}) diff --git a/test/plugin/customParseFormat.test.js b/test/plugin/customParseFormat.test.js --- a/test/plugin/customParseFormat.test.js +++ b/test/plugin/customParseFormat.test.js @@ -161,6 +161,10 @@ it('return Invalid Date when parse corrupt short string', () => { expect(dayjs(input, format).format()).toBe('Invalid Date') }) +it('YYYY-MM set 1st day of the month', () => { + expect(dayjs('2019-02', 'YYYY-MM').format('YYYY-MM-DD')).toBe('2019-02-01') +}) + it('Invalid Dates', () => { expect(dayjs('10/12/2014', 'YYYY-MM-DD').format('MM-DD-YYYY')).toBe('Invalid Date') expect(dayjs('10-12-2014', 'YYYY-MM-DD').format('MM-DD-YYYY')).toBe('Invalid Date') @@ -192,12 +196,20 @@ it('correctly parse ordinal', () => { const inputFalse = '7st March 2019' const inputZHCN = '7日 三月 2019' const format = 'Do MMMM YYYY' + const displayFormatWithLocale = 'MMMM dddd' expect(dayjs(input, format).valueOf()) .toBe(moment(input, format).valueOf()) expect(dayjs(input2, format).valueOf()) .toBe(moment(input2, format).valueOf()) expect(dayjs(inputFalse, format).valueOf()) .toBe(moment(inputFalse, format).valueOf()) - expect(dayjs(inputZHCN, format, 'zh-cn').valueOf()) - .toBe(moment(inputZHCN, format, 'zh-cn').valueOf()) + + const dayjsCN = dayjs(inputZHCN, format, 'zh-cn') + const momentCN = moment(inputZHCN, format, 'zh-cn') + expect(dayjsCN.valueOf()) + .toBe(momentCN.valueOf()) + expect(dayjsCN.format(displayFormatWithLocale)) + .toBe(momentCN.format(displayFormatWithLocale)) + expect(dayjsCN.locale()) + .toBe(momentCN.locale()) }) diff --git a/test/plugin/relativeTime.test.js b/test/plugin/relativeTime.test.js --- a/test/plugin/relativeTime.test.js +++ b/test/plugin/relativeTime.test.js @@ -3,6 +3,7 @@ import moment from 'moment' import dayjs from '../../src' import relativeTime from '../../src/plugin/relativeTime' import utc from '../../src/plugin/utc' +import '../../src/locale/ru' dayjs.extend(relativeTime) @@ -50,7 +51,7 @@ it('Time from X', () => { [1, 'month'], // a month [45, 'day'], // a month [47, 'day'], // 2 month - [10, 'month'], // 2 month + [10, 'month'], // 10 month [11, 'month'], // a year [1, 'year'], // a year [17, 'month'], // a year @@ -83,6 +84,15 @@ it('Time to X', () => { expect(dayjs().to(dayjs().subtract(3, 'year'))).toBe(moment().to(moment().subtract(3, 'year'))) }) +it('Locale Fonction', () => { + // e.g. in ru locale, m: x minute require additional processing + // and provides as a function instead of a string + const str0 = '2020-01-06 15:53:00' + const str = '2020-01-06 15:52:15' + const result = dayjs(str0).locale('ru').to(str) + expect(result).toEqual(expect.any(String)) +}) + // https://github.com/iamkun/dayjs/issues/646 it('Time from now with UTC', () => { dayjs.extend(utc) diff --git a/test/plugin/updateLocale.test.js b/test/plugin/updateLocale.test.js new file mode 100644 --- /dev/null +++ b/test/plugin/updateLocale.test.js @@ -0,0 +1,71 @@ +import MockDate from 'mockdate' +import moment from 'moment' +import dayjs from '../../src' +import updateLocale from '../../src/plugin/updateLocale' +import localizedFormat from '../../src/plugin/localizedFormat' +import '../../src/locale/zh-cn' + +dayjs.extend(updateLocale) +dayjs.extend(localizedFormat) + +beforeEach(() => { + MockDate.set(new Date()) +}) + +afterEach(() => { + MockDate.reset() +}) + +const newLocale = { + months: new Array(12).fill('testMonth'), + formats: { // formats for dayjs and longDateFormat for momentjs + LT: '[testFormat]' + }, + longDateFormat: { + LT: '[testFormat]' + } +} + +const formatString = 'MMMM LT' + +describe('Update locale', () => { + it('Invalid argument', () => { + const result = dayjs.updateLocale('InvalidLocaleName', {}) + expect(result) + .toEqual(undefined) + expect(dayjs().format(formatString)) + .toEqual(moment().format(formatString)) + }) + + it('Return value', () => { + const result1 = dayjs.updateLocale('en') + expect(typeof result1).toEqual('object') + const result2 = dayjs.updateLocale('en', {}) + expect(typeof result2).toEqual('object') + const result3 = dayjs.updateLocale('en', newLocale) + expect(typeof result3).toEqual('object') + }) + + it('Update build-in en locale', () => { + moment.updateLocale('en', newLocale) + dayjs.updateLocale('en', newLocale) + + expect(dayjs().format(formatString)) + .toEqual('testMonth testFormat') + + expect(dayjs().format(formatString)) + .toEqual(moment().format(formatString)) + }) + + it('Update imported zh-cn locale', () => { + moment.updateLocale('zh-cn', newLocale) + dayjs.updateLocale('zh-cn', newLocale) + dayjs.locale('zh-cn') + moment.locale('zh-cn') + expect(dayjs().format(formatString)) + .toEqual('testMonth testFormat') + + expect(dayjs().format(formatString)) + .toEqual(moment().format(formatString)) + }) +}) diff --git a/test/plugin/weekOfYear.test.js b/test/plugin/weekOfYear.test.js --- a/test/plugin/weekOfYear.test.js +++ b/test/plugin/weekOfYear.test.js @@ -40,6 +40,7 @@ it('Week of year with locale', () => { // Edges expect(dayjs('2018-12-30').week()).toBe(moment('2018-12-30').week()) expect(dayjs('2019-12-29').week()).toBe(moment('2019-12-29').week()) + expect(dayjs('2019-12-30').week()).toBe(moment('2019-12-30').week()) }) it('Format w ww wo', () => {
the result of dayjs("2019-02", "YYYY-MM") is wrong **Describe the bug** ``` import dayjs from "dayjs"; import customParseFormat from "dayjs/plugin/customParseFormat"; dayjs.extend(customParseFormat); 2019-02 dayjs format: {dayjs("2019-02", "YYYY-MM").format("YYYY-MM")} ``` result: `2019-03` expected: `2019-02` **Information** - Day.js Version 1.1.18 - OS: mac - Browser: chrome 79.0.3945.88 - Time: 2019-12-30T15:30:00+08:00 Reproduce address: https://codesandbox.io/s/gifted-feynman-bshbk?fontsize=14&hidenavigation=1&theme=dark
2020-01-06T09:04:03Z
1.8
iamkun/dayjs
719
iamkun__dayjs-719
[ "676" ]
7241da91aab31613e316dce72cd723c162d2b54e
diff --git a/src/index.js b/src/index.js --- a/src/index.js +++ b/src/index.js @@ -38,7 +38,12 @@ const dayjs = (date, c, pl) => { return new Dayjs(cfg) // eslint-disable-line no-use-before-define } -const wrapper = (date, instance) => dayjs(date, { locale: instance.$L, utc: instance.$u }) +const wrapper = (date, instance) => + dayjs(date, { + locale: instance.$L, + utc: instance.$u, + $offset: instance.$offset // todo: refactor; do not use this.$offset in you code + }) const Utils = U // for plugin use Utils.l = parseLocale @@ -263,7 +268,7 @@ class Dayjs { [C.S]: C.MILLISECONDS_A_SECOND }[unit] || 1 // ms - const nextTimeStamp = this.valueOf() + (number * step) + const nextTimeStamp = this.$d.getTime() + (number * step) return Utils.w(nextTimeStamp, this) } @@ -366,11 +371,11 @@ class Dayjs { } clone() { - return Utils.w(this.toDate(), this) + return Utils.w(this.$d, this) } toDate() { - return new Date(this.$d) + return new Date(this.valueOf()) } toJSON() { diff --git a/src/locale/ka.js b/src/locale/ka.js --- a/src/locale/ka.js +++ b/src/locale/ka.js @@ -2,7 +2,7 @@ import dayjs from 'dayjs' const locale = { name: 'ka', - weekdays: 'კვირა_ორშაბათი_სამშაბათი_გარემო_ხუთშაბათი_პარასკევი_შაბათს'.split('_'), + weekdays: 'კვირა_ორშაბათი_სამშაბათი_ოთხშაბათი_ხუთშაბათი_პარასკევი_შაბათი'.split('_'), weekdaysShort: 'კვი_ორშ_სამ_ოთხ_ხუთ_პარ_შაბ'.split('_'), weekdaysMin: 'კვ_ორ_სა_ოთ_ხუ_პა_შა'.split('_'), months: 'იანვარი_თებერვალი_მარტი_აპრილი_მაისი_ივნისი_ივლისი_აგვისტო_სექტემბერი_ოქტომბერი_ნოემბერი_დეკემბერი'.split('_'), diff --git a/src/locale/nb.js b/src/locale/nb.js --- a/src/locale/nb.js +++ b/src/locale/nb.js @@ -19,7 +19,7 @@ const locale = { }, relativeTime: { future: 'om %s', - past: 'for %s siden', + past: '%s siden', s: 'noen sekunder', m: 'ett minutt', mm: '%d minutter', diff --git a/src/locale/pl.js b/src/locale/pl.js --- a/src/locale/pl.js +++ b/src/locale/pl.js @@ -17,8 +17,8 @@ const locale = { mm: '%d minut', h: 'godzina', hh: '%d godzin', - d: 'tydzień', - dd: '%d tygodni', + d: 'dzień', + dd: '%d dni', M: 'miesiąc', MM: '%d miesięcy', y: 'rok', diff --git a/src/locale/uk.js b/src/locale/uk.js --- a/src/locale/uk.js +++ b/src/locale/uk.js @@ -10,7 +10,7 @@ const locale = { weekStart: 1, relativeTime: { future: 'через %s', - past: '%s назад', + past: '%s тому', s: 'декілька секунд', m: 'хвилина', mm: '%d хвилин', diff --git a/src/plugin/advancedFormat/index.js b/src/plugin/advancedFormat/index.js --- a/src/plugin/advancedFormat/index.js +++ b/src/plugin/advancedFormat/index.js @@ -13,7 +13,7 @@ export default (o, c, d) => { // locale needed later const locale = this.$locale() const utils = this.$utils() const str = formatStr || FORMAT_DEFAULT - const result = str.replace(/\[([^\]]+)]|Q|wo|gggg|Do|X|x|k{1,2}|S/g, (match) => { + const result = str.replace(/\[([^\]]+)]|Q|wo|ww|w|gggg|Do|X|x|k{1,2}|S/g, (match) => { switch (match) { case 'Q': return Math.ceil((this.$M + 1) / 3) @@ -23,6 +23,9 @@ export default (o, c, d) => { // locale needed later return this.weekYear() case 'wo': return locale.ordinal(this.week(), 'W') // W for week + case 'w': + case 'ww': + return utils.s(this.week(), match === 'w' ? 1 : 2, '0') case 'k': case 'kk': return utils.s(String(this.$H === 0 ? 24 : this.$H), match === 'k' ? 1 : 2, '0') diff --git a/src/plugin/utc/index.js b/src/plugin/utc/index.js --- a/src/plugin/utc/index.js +++ b/src/plugin/utc/index.js @@ -1,4 +1,7 @@ +import { MILLISECONDS_A_MINUTE, MIN } from '../../constant' + export default (option, Dayjs, dayjs) => { + const localOffset = (new Date()).getTimezoneOffset() const proto = Dayjs.prototype dayjs.utc = function (date, format) { const cfg = { date, utc: true, format } @@ -18,6 +21,9 @@ export default (option, Dayjs, dayjs) => { if (cfg.utc) { this.$u = true } + if (!this.$utils().u(cfg.$offset)) { + this.$offset = cfg.$offset + } oldParse.call(this, cfg) } @@ -39,11 +45,26 @@ export default (option, Dayjs, dayjs) => { } const oldUtcOffset = proto.utcOffset - proto.utcOffset = function () { - if (this.$u) { - return 0 + proto.utcOffset = function (input) { + const { u } = this.$utils() + if (u(input)) { + if (this.$u) { + return 0 + } + if (!u(this.$offset)) { + return this.$offset + } + return oldUtcOffset.call(this) } - return oldUtcOffset.call(this) + const offset = Math.abs(input) <= 16 ? input * 60 : input + let ins + if (input !== 0) { + ins = this.local().add(offset + localOffset, MIN) + ins.$offset = offset + } else { + ins = this.utc() + } + return ins } const oldFormat = proto.format @@ -53,7 +74,21 @@ export default (option, Dayjs, dayjs) => { return oldFormat.call(this, str) } + proto.valueOf = function () { + const addedOffset = !this.$utils().u(this.$offset) + ? this.$offset + localOffset : 0 + return this.$d.valueOf() - (addedOffset * MILLISECONDS_A_MINUTE) + } + proto.isUTC = function () { return !!this.$u } + + proto.toISOString = function () { + return this.toDate().toISOString() + } + + proto.toString = function () { + return this.toDate().toUTCString() + } } diff --git a/types/plugin/utc.d.ts b/types/plugin/utc.d.ts --- a/types/plugin/utc.d.ts +++ b/types/plugin/utc.d.ts @@ -11,6 +11,8 @@ declare module 'dayjs' { local(): Dayjs isUTC(): boolean + + utcOffset(offset: number): Dayjs } export function utc(config?: ConfigType, format?: string): Dayjs
diff --git a/test/plugin/utc-utcOffset.test.js b/test/plugin/utc-utcOffset.test.js new file mode 100644 --- /dev/null +++ b/test/plugin/utc-utcOffset.test.js @@ -0,0 +1,103 @@ +import MockDate from 'mockdate' +import moment from 'moment' +import dayjs from '../../src' +import utc from '../../src/plugin/utc' + +dayjs.extend(utc) + +beforeEach(() => { + MockDate.set(new Date()) +}) + +afterEach(() => { + MockDate.reset() +}) + +it('Set utcOffset -> Get utcOffset', () => { + expect(dayjs().utcOffset(540).utcOffset()).toBe(moment().utcOffset(540).utcOffset()) + expect(dayjs().utcOffset(540).format()).toBe(moment().utcOffset(540).format()) + expect(dayjs().utcOffset(60).format()).toBe(moment().utcOffset(60).format()) + expect(dayjs().utcOffset(8).format()).toBe(moment().utcOffset(8).format()) + + expect(dayjs().utcOffset(-540).utcOffset()).toBe(moment().utcOffset(-540).utcOffset()) + expect(dayjs().utcOffset(-540).format()).toBe(moment().utcOffset(-540).format()) + + expect(dayjs().utcOffset(-60).format()).toBe(moment().utcOffset(-60).format()) + expect(dayjs().utcOffset(-8).format()).toBe(moment().utcOffset(-8).format()) +}) + +it('valueOf, toDate, toString, toISOString should be the same as original', () => { + const d = dayjs() + const du = dayjs().utcOffset(9) + const mu = moment().utcOffset(9) + expect(d.valueOf()).toBe(du.valueOf()) + expect(du.valueOf()).toBe(mu.valueOf()) + expect(d.toDate()).toEqual(du.toDate()) + expect(du.toDate()).toEqual(mu.toDate()) + expect(du.toISOString()).toEqual(mu.toISOString()) + expect(d.toString()).toEqual(d.toString()) +}) + +it('clone', () => { + const du = dayjs().utcOffset(9) + const duClone = du.clone() + expect(du.valueOf()).toBe(duClone.valueOf()) + expect(du.format()).toBe(duClone.format()) + expect(du.utcOffset()).toBe(duClone.utcOffset()) +}) + +it('immutable', () => { + const d = dayjs() + const du = d.utcOffset(9) + expect(d.utcOffset()).not.toBe(du.utcOffset()) + expect(d.format()).not.toBe(du.format()) +}) + +it('utcOffset(0) enable utc mode', () => { + expect(dayjs().utcOffset(0).format()).toBe(moment().utcOffset(0).format()) + expect(dayjs().utcOffset(0).isUTC()).toBeTruthy() +}) + +test('UTC mode', () => { + const d = dayjs.utc('2000-01-01T06:00:00Z') + expect(d.isUTC()).toBeTruthy() + expect(d.utcOffset(0).isUTC()).toBeTruthy() + expect(d.utcOffset(1).isUTC()).toBeFalsy() +}) + +test('change hours when changing the utc offset in UTC mode', () => { + const d = dayjs.utc('2000-01-01T06:31:00Z') + expect(d.hour()).toBe(6) + expect(d.utcOffset(0).hour()).toBe(6) + expect(d.utcOffset(-60).hour()).toBe(5) + expect(d.utcOffset(60).hour()).toBe(7) + expect(d.utcOffset(-30).format('HH:mm')).toBe('06:01') + expect(d.utcOffset(30).format('HH:mm')).toBe('07:01') + expect(d.utcOffset(-1380).format('HH:mm')).toBe('07:31') +}) + +test('utc costrustor', () => { + const d = new Date(2019, 8, 11, 0, 0, 0).getTime() + expect(moment(d).utc().utcOffset(480).valueOf()) + .toBe(dayjs(d).utc().utcOffset(480).valueOf()) + + expect(moment(d).utc().local() + .utcOffset(480) + .valueOf()) + .toBe(dayjs(d).utc().local() + .utcOffset(480) + .valueOf()) +}) + +test('utc startOf', () => { + const d = new Date(2019, 8, 11, 0, 0, 0, 0).getTime() + expect(moment(d).utc().utcOffset(480).endOf('day') + .valueOf()) + .toBe(dayjs(d).utc().utcOffset(480).endOf('day') + .valueOf()) + + expect(moment(d).utc().utcOffset(480).endOf('day') + .valueOf()) + .toBe(dayjs(d).utc().utcOffset(480).endOf('day') + .valueOf()) +}) diff --git a/test/plugin/weekOfYear.test.js b/test/plugin/weekOfYear.test.js --- a/test/plugin/weekOfYear.test.js +++ b/test/plugin/weekOfYear.test.js @@ -2,8 +2,10 @@ import moment from 'moment' import MockDate from 'mockdate' import dayjs from '../../src' import weekOfYear from '../../src/plugin/weekOfYear' +import advancedFormat from '../../src/plugin/advancedFormat' import '../../src/locale/en-gb' +dayjs.extend(advancedFormat) dayjs.extend(weekOfYear) beforeEach(() => { @@ -39,3 +41,10 @@ it('Week of year with locale', () => { expect(dayjs('2018-12-30').week()).toBe(moment('2018-12-30').week()) expect(dayjs('2019-12-29').week()).toBe(moment('2019-12-29').week()) }) + +it('Format w ww wo', () => { + const day = '2019-07-28' + const D = dayjs(day) + const M = moment(day) + expect(D.format('w ww wo')).toBe(M.format('w ww wo')) +})
dayjs().format('YYYY w Week') error result **Describe the bug** 使用dayjs().format('YYYY年第w周') 期望可以得到 2019年第29周 **Expected behavior** 使用dayjs().format('YYYY年第w周') 期望可以得到 2019年第29周,实际上却展示为2019年第w周 **Information** - Day.js 版本1.8.16 - OS: Linux - Browser chrome 74.0.3729.131 - Time zone: GMT+08:00
2019-11-06T04:55:21Z
1.8
iamkun/dayjs
678
iamkun__dayjs-678
[ "676" ]
88778838e71dd309e79cd1a8094d5bea36ca3390
diff --git a/src/plugin/advancedFormat/index.js b/src/plugin/advancedFormat/index.js --- a/src/plugin/advancedFormat/index.js +++ b/src/plugin/advancedFormat/index.js @@ -13,7 +13,7 @@ export default (o, c, d) => { // locale needed later const locale = this.$locale() const utils = this.$utils() const str = formatStr || FORMAT_DEFAULT - const result = str.replace(/\[([^\]]+)]|Q|wo|gggg|Do|X|x|k{1,2}|S/g, (match) => { + const result = str.replace(/\[([^\]]+)]|Q|wo|ww|w|gggg|Do|X|x|k{1,2}|S/g, (match) => { switch (match) { case 'Q': return Math.ceil((this.$M + 1) / 3) @@ -23,6 +23,9 @@ export default (o, c, d) => { // locale needed later return this.weekYear() case 'wo': return locale.ordinal(this.week(), 'W') // W for week + case 'w': + case 'ww': + return utils.s(this.week(), match === 'w' ? 1 : 2, '0') case 'k': case 'kk': return utils.s(String(this.$H === 0 ? 24 : this.$H), match === 'k' ? 1 : 2, '0')
diff --git a/test/plugin/weekOfYear.test.js b/test/plugin/weekOfYear.test.js --- a/test/plugin/weekOfYear.test.js +++ b/test/plugin/weekOfYear.test.js @@ -2,8 +2,10 @@ import moment from 'moment' import MockDate from 'mockdate' import dayjs from '../../src' import weekOfYear from '../../src/plugin/weekOfYear' +import advancedFormat from '../../src/plugin/advancedFormat' import '../../src/locale/en-gb' +dayjs.extend(advancedFormat) dayjs.extend(weekOfYear) beforeEach(() => { @@ -39,3 +41,10 @@ it('Week of year with locale', () => { expect(dayjs('2018-12-30').week()).toBe(moment('2018-12-30').week()) expect(dayjs('2019-12-29').week()).toBe(moment('2019-12-29').week()) }) + +it('Format w ww wo', () => { + const day = '2019-07-28' + const D = dayjs(day) + const M = moment(day) + expect(D.format('w ww wo')).toBe(M.format('w ww wo')) +})
dayjs().format('YYYY w Week') error result **Describe the bug** 使用dayjs().format('YYYY年第w周') 期望可以得到 2019年第29周 **Expected behavior** 使用dayjs().format('YYYY年第w周') 期望可以得到 2019年第29周,实际上却展示为2019年第w周 **Information** - Day.js 版本1.8.16 - OS: Linux - Browser chrome 74.0.3729.131 - Time zone: GMT+08:00
Bug confirmed. Current workaround ``` var dayjs = require("dayjs") var advancedFormat = require('dayjs/plugin/advancedFormat') var weekOfYear = require('dayjs/plugin/weekOfYear') dayjs.extend(advancedFormat) dayjs.extend(weekOfYear) dayjs().format('YYYY年第wo周') ```
2019-09-17T14:05:47Z
1.8
iamkun/dayjs
539
iamkun__dayjs-539
[ "531" ]
6e29a4aa793d48cc57635da6a19ef227fbe3e3b5
diff --git a/src/locale/az.js b/src/locale/az.js new file mode 100644 --- /dev/null +++ b/src/locale/az.js @@ -0,0 +1,39 @@ +import dayjs from 'dayjs' + +const locale = { + name: 'az', + weekdays: 'Bazar_Bazar ertəsi_Çərşənbə axşamı_Çərşənbə_Cümə axşamı_Cümə_Şənbə'.split('_'), + weekdaysShort: 'Baz_BzE_ÇAx_Çər_CAx_Cüm_Şən'.split('_'), + weekdaysMin: 'Bz_BE_ÇA_Çə_CA_Cü_Şə'.split('_'), + months: 'yanvar_fevral_mart_aprel_may_iyun_iyul_avqust_sentyabr_oktyabr_noyabr_dekabr'.split('_'), + monthsShort: 'yan_fev_mar_apr_may_iyn_iyl_avq_sen_okt_noy_dek'.split('_'), + weekStart: 1, + formats: { + LT: 'H:mm', + LTS: 'H:mm:ss', + L: 'DD.MM.YYYY', + LL: 'D MMMM YYYY г.', + LLL: 'D MMMM YYYY г., H:mm', + LLLL: 'dddd, D MMMM YYYY г., H:mm' + }, + relativeTime: { + future: '%s sonra', + past: '%s əvvəl', + s: 'bir neçə saniyə', + m: 'bir dəqiqə', + mm: '%d dəqiqə', + h: 'bir saat', + hh: '%d saat', + d: 'bir gün', + dd: '%d gün', + M: 'bir ay', + MM: '%d ay', + y: 'bir il', + yy: '%d il' + }, + ordinal: n => n +} + +dayjs.locale(locale, null, true) + +export default locale diff --git a/src/locale/pt.js b/src/locale/pt.js --- a/src/locale/pt.js +++ b/src/locale/pt.js @@ -3,9 +3,19 @@ import dayjs from 'dayjs' const locale = { name: 'pt', weekdays: 'Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado'.split('_'), + weekdaysShort: 'Dom_Seg_Ter_Qua_Qui_Sex_Sab'.split('_'), months: 'Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro'.split('_'), + monthsShort: 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'), ordinal: n => `${n}º`, weekStart: 1, + formats: { + LT: 'HH:mm', + LTS: 'HH:mm:ss', + L: 'DD/MM/YYYY', + LL: 'D [de] MMMM [de] YYYY', + LLL: 'D [de] MMMM [de] YYYY [às] HH:mm', + LLLL: 'dddd, D [de] MMMM [de] YYYY [às] HH:mm' + }, relativeTime: { future: 'em %s', past: 'há %s', diff --git a/src/plugin/customParseFormat/index.js b/src/plugin/customParseFormat/index.js --- a/src/plugin/customParseFormat/index.js +++ b/src/plugin/customParseFormat/index.js @@ -9,7 +9,7 @@ const matchUpperCaseAMPM = /[AP]M/ const matchLowerCaseAMPM = /[ap]m/ const matchSigned = /[+-]?\d+/ // -inf - inf const matchOffset = /[+-]\d\d:?\d\d/ // +00:00 -00:00 +0000 or -0000 -const matchWord = /\d*[^\s\d]+/ // Word +const matchWord = /\d*[^\s\d-:/.()]+/ // Word let locale diff --git a/src/plugin/quarterOfYear/index.js b/src/plugin/quarterOfYear/index.js --- a/src/plugin/quarterOfYear/index.js +++ b/src/plugin/quarterOfYear/index.js @@ -1,6 +1,35 @@ +import { Q, M, D } from '../../constant' + export default (o, c) => { const proto = c.prototype - proto.quarter = function () { + proto.quarter = function (quarter) { + if (!this.$utils().u(quarter)) { + return this.add((quarter - 1) * 3, M) + } return Math.ceil((this.month() + 1) / 3) } + + const oldAdd = proto.add + proto.add = function (number, units) { + number = Number(number) // eslint-disable-line no-param-reassign + const unit = this.$utils().p(units) + if (unit === Q) { + return this.add(number * 3, M) + } + return oldAdd.bind(this)(number, units) + } + + const oldStartOf = proto.startOf + proto.startOf = function (units, startOf) { + const utils = this.$utils() + const isStartOf = !utils.u(startOf) ? startOf : true + const unit = utils.p(units) + if (unit === Q) { + const quarter = this.quarter() - 1 + return isStartOf ? this.month(quarter * 3) + .startOf(M).startOf(D) : + this.month((quarter * 3) + 2).endOf(M).endOf(D) + } + return oldStartOf.bind(this)(units, startOf) + } } diff --git a/src/utils.js b/src/utils.js --- a/src/utils.js +++ b/src/utils.js @@ -35,7 +35,8 @@ const prettyUnit = (u) => { h: C.H, m: C.MIN, s: C.S, - ms: C.MS + ms: C.MS, + Q: C.Q } return special[u] || String(u || '').toLowerCase().replace(/s$/, '') } diff --git a/types/index.d.ts b/types/index.d.ts --- a/types/index.d.ts +++ b/types/index.d.ts @@ -7,10 +7,10 @@ declare namespace dayjs { export type OptionType = { locale?: string, format?: string, utc?: boolean } | string type UnitTypeShort = 'd' | 'M' | 'y' | 'h' | 'm' | 's' | 'ms' - export type UnitType = 'millisecond' | 'second' | 'minute' | 'hour' | 'day' | 'month' | 'quarter' | 'year' | 'date' | UnitTypeShort; + export type UnitType = 'millisecond' | 'second' | 'minute' | 'hour' | 'day' | 'month' | 'year' | 'date' | UnitTypeShort; - type OpUnitTypeShort = 'w' - export type OpUnitType = UnitType | "week" | OpUnitTypeShort; + export type OpUnitType = UnitType | "week" | 'w'; + export type QUnitType = UnitType | "quarter" | 'Q'; class Dayjs { constructor (config?: ConfigType) @@ -63,7 +63,7 @@ declare namespace dayjs { format(template?: string): string - diff(date: ConfigType, unit: OpUnitType, float?: boolean): number + diff(date: ConfigType, unit: QUnitType, float?: boolean): number valueOf(): number diff --git a/types/plugin/quarterOfYear.d.ts b/types/plugin/quarterOfYear.d.ts --- a/types/plugin/quarterOfYear.d.ts +++ b/types/plugin/quarterOfYear.d.ts @@ -1,4 +1,4 @@ -import { PluginFunc } from 'dayjs' +import { PluginFunc, QUnitType } from 'dayjs' declare const plugin: PluginFunc export = plugin @@ -6,5 +6,15 @@ export = plugin declare module 'dayjs' { interface Dayjs { quarter(): number + + quarter(quarter: number): Dayjs + + add(value: number, unit: QUnitType): Dayjs + + subtract(value: number, unit: QUnitType): Dayjs + + startOf(unit: QUnitType): Dayjs + + endOf(unit: QUnitType): Dayjs } }
diff --git a/test/plugin/customParseFormat.test.js b/test/plugin/customParseFormat.test.js --- a/test/plugin/customParseFormat.test.js +++ b/test/plugin/customParseFormat.test.js @@ -26,6 +26,12 @@ it('parse padded string', () => { expect(dayjs(input, format).valueOf()).toBe(moment(input, format).valueOf()) }) +it('parse string for MMM month format', () => { + const input = '4/Mar/2019:11:16:26 +0800' + const format = 'D/MMM/YYYY:H:m:s zz' + expect(dayjs(input, format).valueOf()).toBe(moment(input, format).valueOf()) +}) + it('parse string January (getMonth() = 0)', () => { const input = '01/01/2019' const format = 'DD/MM/YYYY' diff --git a/test/plugin/quarterOfYear.test.js b/test/plugin/quarterOfYear.test.js --- a/test/plugin/quarterOfYear.test.js +++ b/test/plugin/quarterOfYear.test.js @@ -1,4 +1,5 @@ import MockDate from 'mockdate' +import moment from 'moment' import dayjs from '../../src' import quarterOfYear from '../../src/plugin/quarterOfYear' @@ -12,7 +13,7 @@ afterEach(() => { MockDate.reset() }) -it('QuarterOfYear', () => { +it('get QuarterOfYear', () => { expect(dayjs('2013-01-01T00:00:00.000').quarter()).toBe(1) expect(dayjs('2013-04-01T00:00:00.000').subtract(1, 'ms').quarter()).toBe(1) expect(dayjs('2013-04-01T00:00:00.000').quarter()).toBe(2) @@ -22,3 +23,26 @@ it('QuarterOfYear', () => { expect(dayjs('2013-10-01T00:00:00.000').quarter()).toBe(4) expect(dayjs('2014-01-01T00:00:00.000').subtract(1, 'ms').quarter()).toBe(4) }) + +it('set QuarterOfYear', () => { + const d1 = '2013-01-01T00:00:00.000' + expect(dayjs(d1).quarter(2).format()) + .toBe(moment(d1).quarter(2).format()) + const d2 = '2013-02-05T05:06:07.000' + expect(dayjs(d2).quarter(2).format()) + .toBe(moment(d2).quarter(2).format()) +}) + +it('add subtract quarter', () => { + expect(dayjs().add(2, 'quarter').format()) + .toBe(moment().add(2, 'quarter').format()) + expect(dayjs().subtract(2, 'quarter').format()) + .toBe(moment().subtract(2, 'quarter').format()) +}) + +it('startOf endOf quarter', () => { + expect(dayjs().startOf('quarter').format()) + .toBe(moment().startOf('quarter').format()) + expect(dayjs().endOf('quarter').format()) + .toBe(moment().endOf('quarter').format()) +}) diff --git a/test/utils.test.js b/test/utils.test.js --- a/test/utils.test.js +++ b/test/utils.test.js @@ -8,6 +8,9 @@ it('PrettyUnit', () => { expect(prettyUnit('Days')).toBe('day') expect(prettyUnit('days')).toBe('day') expect(prettyUnit('day')).toBe('day') + expect(prettyUnit('Q')).toBe('quarter') + expect(prettyUnit('quarter')).toBe('quarter') + expect(prettyUnit('quarters')).toBe('quarter') expect(prettyUnit()).toBe('') })
Typescript definition allows `quarter` as unit of time **Describe the bug** According to the typescript definition, this is valid: ```ts val now = dayjs() val nextQuarter = now.add(1, 'quarter') now.valueOf() == nextQuarter.valueOf() // true ``` **Expected behavior** Either the quarter calculation should work or the typescript definition should not allow passing `'quarter'` as unit of time. **Information** - Day.js Version: 1.8.10
Thanks, will fix soon
2019-03-21T04:40:34Z
1.8
iamkun/dayjs
528
iamkun__dayjs-528
[ "522" ]
8ddbe923eee5f996a089e55619686c92d69a85c2
diff --git a/src/index.js b/src/index.js --- a/src/index.js +++ b/src/index.js @@ -109,36 +109,41 @@ class Dayjs { return this.endOf(units) < dayjs(that) } - year() { - return this.$y + $g(input, get, set) { + if (Utils.u(input)) return this[get] + return this.set(set, input) } - month() { - return this.$M + year(input) { + return this.$g(input, '$y', C.Y) } - day() { - return this.$W + month(input) { + return this.$g(input, '$M', C.M) } - date() { - return this.$D + day(input) { + return this.$g(input, '$W', C.D) } - hour() { - return this.$H + date(input) { + return this.$g(input, '$D', C.DATE) } - minute() { - return this.$m + hour(input) { + return this.$g(input, '$H', C.H) } - second() { - return this.$s + minute(input) { + return this.$g(input, '$m', C.MIN) } - millisecond() { - return this.$ms + second(input) { + return this.$g(input, '$s', C.S) + } + + millisecond(input) { + return this.$g(input, '$ms', C.MS) } unix() { @@ -227,7 +232,8 @@ class Dayjs { number = Number(number) // eslint-disable-line no-param-reassign const unit = Utils.p(units) const instanceFactory = (u, n) => { - const date = this.set(C.DATE, 1).set(u, n + number) + // clone is for badMutable plugin + const date = this.clone().set(C.DATE, 1).set(u, n + number) return date.set(C.DATE, Math.min(this.$D, date.daysInMonth())) } const instanceFactorySet = (n) => { @@ -346,6 +352,7 @@ class Dayjs { } locale(preset, object) { + if (!preset) return this.$L const that = this.clone() that.$L = parseLocale(preset, object, true) return that @@ -359,18 +366,6 @@ class Dayjs { return new Date(this.$d) } - toArray() { - return [ - this.$y, - this.$M, - this.$D, - this.$H, - this.$m, - this.$s, - this.$ms - ] - } - toJSON() { return this.toISOString() } @@ -382,18 +377,6 @@ class Dayjs { return this.$d.toISOString() } - toObject() { - return { - years: this.$y, - months: this.$M, - date: this.$D, - hours: this.$H, - minutes: this.$m, - seconds: this.$s, - milliseconds: this.$ms - } - } - toString() { return this.$d.toUTCString() } diff --git a/src/locale/ne.js b/src/locale/ne.js new file mode 100644 --- /dev/null +++ b/src/locale/ne.js @@ -0,0 +1,27 @@ +import dayjs from 'dayjs' + +const locale = { + name: 'ne', + weekdays: 'आइतबार_सोमबार_मङ्गलबार_बुधबार_बिहिबार_शुक्रबार_शनिबार'.split('_'), + months: 'जनवरी_फेब्रुवरी_मार्च_अप्रिल_मे_जुन_जुलाई_अगष्ट_सेप्टेम्बर_अक्टोबर_नोभेम्बर_डिसेम्बर'.split('_'), + relativeTime: { + future: '%s पछि', + past: '%s अघि', + s: 'सेकेन्ड', + m: 'एक मिनेट', + mm: '%d मिनेट', + h: 'घन्टा', + hh: '%d घन्टा', + d: 'एक दिन', + dd: '%d दिन', + M: 'एक महिना', + MM: '%d महिना', + y: 'एक वर्ष', + yy: '%d वर्ष' + }, + ordinal: n => `${n}`.replace(/\d/g, i => '०१२३४५६७८९'[i]) +} + +dayjs.locale(locale, null, true) + +export default locale diff --git a/src/locale/zh-cn.js b/src/locale/zh-cn.js --- a/src/locale/zh-cn.js +++ b/src/locale/zh-cn.js @@ -7,7 +7,14 @@ const locale = { weekdaysMin: '日_一_二_三_四_五_六'.split('_'), months: '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'), monthsShort: '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'), - ordinal: n => `${n}日`, + ordinal: (number, period) => { + switch (period) { + case 'W': + return `${number}周` + default: + return `${number}日` + } + }, weekStart: 1, formats: { LT: 'HH:mm', diff --git a/src/plugin/advancedFormat/index.js b/src/plugin/advancedFormat/index.js --- a/src/plugin/advancedFormat/index.js +++ b/src/plugin/advancedFormat/index.js @@ -13,13 +13,16 @@ export default (o, c, d) => { // locale needed later const locale = this.$locale() const utils = this.$utils() const str = formatStr || FORMAT_DEFAULT - const result = str.replace(/Q|Do|X|x|k{1,2}|S/g, (match) => { + const result = str.replace(/Q|wo|gggg|Do|X|x|k{1,2}|S/g, (match) => { switch (match) { case 'Q': return Math.ceil((this.$M + 1) / 3) - case 'Do': { + case 'Do': return locale.ordinal(this.$D) - } + case 'gggg': + return this.weekYear() + case 'wo': + return locale.ordinal(this.week(), 'W') // W for week case 'k': case 'kk': return utils.s(String(this.$H === 0 ? 24 : this.$H), match === 'k' ? 1 : 2, '0') diff --git a/src/plugin/badMutable/index.js b/src/plugin/badMutable/index.js new file mode 100644 --- /dev/null +++ b/src/plugin/badMutable/index.js @@ -0,0 +1,53 @@ +export default (o, c) => { // locale needed later + const proto = c.prototype + proto.$g = function (input, get, set) { + if (this.$utils().u(input)) return this[get] + return this.$set(set, input) + } + + proto.set = function (string, int) { + return this.$set(string, int) + } + + const oldStartOf = proto.startOf + proto.startOf = function (units, startOf) { + this.$d = oldStartOf.bind(this)(units, startOf).toDate() + this.init() + return this + } + + const oldAdd = proto.add + proto.add = function (number, units) { + this.$d = oldAdd.bind(this)(number, units).toDate() + this.init() + return this + } + + const oldLocale = proto.locale + proto.locale = function (preset, object) { + if (!preset) return this.$L + this.$L = oldLocale.bind(this)(preset, object).$L + return this + } + + const oldDaysInMonth = proto.daysInMonth + proto.daysInMonth = function () { + return oldDaysInMonth.bind(this.clone())() + } + + const oldIsSame = proto.isSame + proto.isSame = function (that, units) { + return oldIsSame.bind(this.clone())(that, units) + } + + const oldIsBefore = proto.isBefore + proto.isBefore = function (that, units) { + return oldIsBefore.bind(this.clone())(that, units) + } + + const oldIsAfter = proto.isAfter + proto.isAfter = function (that, units) { + return oldIsAfter.bind(this.clone())(that, units) + } +} + diff --git a/src/plugin/customParseFormat/index.js b/src/plugin/customParseFormat/index.js --- a/src/plugin/customParseFormat/index.js +++ b/src/plugin/customParseFormat/index.js @@ -1,4 +1,4 @@ -const formattingTokens = /(\[[^[]*\])|([-:/.()\s]+)|(A|a|YYYY|YY?|MM?M?M?|DD?|hh?|HH?|mm?|ss?|S{1,3}|z|ZZ?)/g +const formattingTokens = /(\[[^[]*\])|([-:/.()\s]+)|(A|a|YYYY|YY?|MM?M?M?|Do|DD?|hh?|HH?|mm?|ss?|S{1,3}|z|ZZ?)/g const match1 = /\d/ // 0 - 9 const match2 = /\d\d/ // 00 - 99 @@ -47,15 +47,25 @@ const expressions = { this.milliseconds = +input }], s: [match1to2, addInput('seconds')], - ss: [match2, addInput('seconds')], + ss: [match1to2, addInput('seconds')], m: [match1to2, addInput('minutes')], - mm: [match2, addInput('minutes')], + mm: [match1to2, addInput('minutes')], H: [match1to2, addInput('hours')], h: [match1to2, addInput('hours')], - HH: [match2, addInput('hours')], - hh: [match2, addInput('hours')], + HH: [match1to2, addInput('hours')], + hh: [match1to2, addInput('hours')], D: [match1to2, addInput('day')], DD: [match2, addInput('day')], + Do: [matchWord, function (input) { + const { ordinal } = locale; + [this.day] = input.match(/\d+/) + if (!ordinal) return + for (let i = 1; i <= 31; i += 1) { + if (ordinal(i).replace(/\[|\]/g, '') === input) { + this.day = i + } + } + }], M: [match1to2, addInput('month')], MM: [match2, addInput('month')], MMM: [matchWord, function (input) { diff --git a/src/plugin/isMoment/index.js b/src/plugin/isMoment/index.js new file mode 100644 --- /dev/null +++ b/src/plugin/isMoment/index.js @@ -0,0 +1,6 @@ +export default (o, c, f) => { + f.isMoment = function (input) { + return f.isDayjs(input) + } +} + diff --git a/src/plugin/localeData/index.js b/src/plugin/localeData/index.js new file mode 100644 --- /dev/null +++ b/src/plugin/localeData/index.js @@ -0,0 +1,16 @@ +export default (o, c) => { // locale needed later + const proto = c.prototype + const localeData = function () { + return { + months: instance => instance.format('MMMM'), + monthsShort: instance => instance.format('MMM'), + firstDayOfWeek: () => this.$locale().weekStart || 0, + weekdaysMin: instance => instance.format('dd'), + weekdaysShort: instance => instance.format('ddd') + } + } + proto.localeData = function () { + return localeData.bind(this)() + } +} + diff --git a/src/plugin/toArray/index.js b/src/plugin/toArray/index.js new file mode 100644 --- /dev/null +++ b/src/plugin/toArray/index.js @@ -0,0 +1,15 @@ +export default (o, c) => { + const proto = c.prototype + proto.toArray = function () { + return [ + this.$y, + this.$M, + this.$D, + this.$H, + this.$m, + this.$s, + this.$ms + ] + } +} + diff --git a/src/plugin/toObject/index.js b/src/plugin/toObject/index.js new file mode 100644 --- /dev/null +++ b/src/plugin/toObject/index.js @@ -0,0 +1,15 @@ +export default (o, c) => { + const proto = c.prototype + proto.toObject = function () { + return { + years: this.$y, + months: this.$M, + date: this.$D, + hours: this.$H, + minutes: this.$m, + seconds: this.$s, + milliseconds: this.$ms + } + } +} + diff --git a/src/plugin/weekOfYear/index.js b/src/plugin/weekOfYear/index.js --- a/src/plugin/weekOfYear/index.js +++ b/src/plugin/weekOfYear/index.js @@ -6,11 +6,12 @@ export default (o, c, d) => { if (week !== null) { return this.add((week - this.week()) * 7, 'day') } - const endOfYear = this.endOf(Y) + // d(this) clone is for badMutable plugin + const endOfYear = d(this).endOf(Y) if (endOfYear.day() !== 6 && this.month() === 11 && (31 - this.date()) <= endOfYear.day()) { return 1 } - const startOfYear = d(this.$d).startOf(Y) + const startOfYear = d(this).startOf(Y) const compareDay = startOfYear.subtract(startOfYear.day(), D).subtract(1, MS) const diffInWeek = this.diff(compareDay, W, true) return Math.ceil(diffInWeek) diff --git a/src/plugin/weekYear/index.js b/src/plugin/weekYear/index.js new file mode 100644 --- /dev/null +++ b/src/plugin/weekYear/index.js @@ -0,0 +1,12 @@ +export default (o, c) => { + const proto = c.prototype + proto.weekYear = function () { + const month = this.month() + const weekOfYear = this.week() + const year = this.year() + if (weekOfYear === 1 && month === 11) { + return year + 1 + } + return year + } +} diff --git a/types/index.d.ts b/types/index.d.ts --- a/types/index.d.ts +++ b/types/index.d.ts @@ -12,16 +12,6 @@ declare namespace dayjs { type OpUnitTypeShort = 'w' export type OpUnitType = UnitType | "week" | OpUnitTypeShort; - interface DayjsObject { - years: number - months: number - date: number - hours: number - minutes: number - seconds: number - milliseconds: number - } - class Dayjs { constructor (config?: ConfigType) @@ -31,20 +21,36 @@ declare namespace dayjs { year(): number + year(value: number): Dayjs + month(): number + month(value: number): Dayjs + date(): number + date(value: number): Dayjs + day(): number + day(value: number): Dayjs + hour(): number + hour(value: number): Dayjs + minute(): number + minute(value: number): Dayjs + second(): number + second(value: number): Dayjs + millisecond(): number + millisecond(value: number): Dayjs + set(unit: UnitType, value: number): Dayjs add(value: number, unit: OpUnitType): Dayjs @@ -67,14 +73,10 @@ declare namespace dayjs { toDate(): Date - toArray(): number[] - toJSON(): string toISOString(): string - toObject(): DayjsObject - toString(): string utcOffset(): number @@ -85,6 +87,8 @@ declare namespace dayjs { isAfter(date: ConfigType, unit?: OpUnitType): boolean + locale(): string + locale(preset: string | { name: string, [key: string]: any }, object?: { [key: string]: any }): Dayjs } diff --git a/types/plugin/badMutable.d.ts b/types/plugin/badMutable.d.ts new file mode 100644 --- /dev/null +++ b/types/plugin/badMutable.d.ts @@ -0,0 +1,4 @@ +import { PluginFunc } from 'dayjs' + +declare const plugin: PluginFunc +export = plugin diff --git a/types/plugin/isMoment.d.ts b/types/plugin/isMoment.d.ts new file mode 100644 --- /dev/null +++ b/types/plugin/isMoment.d.ts @@ -0,0 +1,10 @@ +import { PluginFunc } from 'dayjs' + +declare const plugin: PluginFunc +export = plugin + +declare module 'dayjs' { + + export function isMoment(input: any): boolean + +} diff --git a/types/plugin/localeData.d.ts b/types/plugin/localeData.d.ts new file mode 100644 --- /dev/null +++ b/types/plugin/localeData.d.ts @@ -0,0 +1,10 @@ +import { PluginFunc } from 'dayjs' + +declare const plugin: PluginFunc +export = plugin + +declare module 'dayjs' { + interface Dayjs { + localeData(): any + } +} diff --git a/types/plugin/toArray.d.ts b/types/plugin/toArray.d.ts new file mode 100644 --- /dev/null +++ b/types/plugin/toArray.d.ts @@ -0,0 +1,10 @@ +import { PluginFunc } from 'dayjs' + +declare const plugin: PluginFunc +export = plugin + +declare module 'dayjs' { + interface Dayjs { + toArray(): number[] + } +} diff --git a/types/plugin/toObject.d.ts b/types/plugin/toObject.d.ts new file mode 100644 --- /dev/null +++ b/types/plugin/toObject.d.ts @@ -0,0 +1,20 @@ +import { PluginFunc } from 'dayjs' + +declare const plugin: PluginFunc +export = plugin + +interface DayjsObject { + years: number + months: number + date: number + hours: number + minutes: number + seconds: number + milliseconds: number +} + +declare module 'dayjs' { + interface Dayjs { + toObject(): DayjsObject + } +} diff --git a/types/plugin/weekOfYear.d.ts b/types/plugin/weekOfYear.d.ts --- a/types/plugin/weekOfYear.d.ts +++ b/types/plugin/weekOfYear.d.ts @@ -6,5 +6,7 @@ export = plugin declare module 'dayjs' { interface Dayjs { week(): number + + week(value : number): Dayjs } } diff --git a/types/plugin/weekYear.d.ts b/types/plugin/weekYear.d.ts new file mode 100644 --- /dev/null +++ b/types/plugin/weekYear.d.ts @@ -0,0 +1,10 @@ +import { PluginFunc } from 'dayjs' + +declare const plugin: PluginFunc +export = plugin + +declare module 'dayjs' { + interface Dayjs { + weekYear(): number + } +}
diff --git a/test/display.test.js b/test/display.test.js --- a/test/display.test.js +++ b/test/display.test.js @@ -230,10 +230,6 @@ it('As Javascript Date -> toDate', () => { expect(jsDate.toUTCString()).not.toBe(base.toString()) }) -it('As Array -> toArray', () => { - expect(dayjs().toArray()).toEqual(moment().toArray()) -}) - it('As JSON -> toJSON', () => { expect(dayjs().toJSON()).toBe(moment().toJSON()) }) @@ -241,7 +237,3 @@ it('As JSON -> toJSON', () => { it('As ISO 8601 String -> toISOString e.g. 2013-02-04T22:44:30.652Z', () => { expect(dayjs().toISOString()).toBe(moment().toISOString()) }) - -it('As Object -> toObject', () => { - expect(dayjs().toObject()).toEqual(moment().toObject()) -}) diff --git a/test/get-set.test.js b/test/get-set.test.js --- a/test/get-set.test.js +++ b/test/get-set.test.js @@ -12,34 +12,50 @@ afterEach(() => { it('Year', () => { expect(dayjs().year()).toBe(moment().year()) + expect(dayjs().year(0).valueOf()).toBe(moment().year(0).valueOf()) + expect(dayjs().year(2000).valueOf()).toBe(moment().year(2000).valueOf()) }) it('Month', () => { expect(dayjs().month()).toBe(moment().month()) + expect(dayjs().month(0).valueOf()).toBe(moment().month(0).valueOf()) + expect(dayjs().month(1).valueOf()).toBe(moment().month(1).valueOf()) }) it('Day of Week', () => { expect(dayjs().day()).toBe(moment().day()) + expect(dayjs().day(0).format()).toBe(moment().day(0).format()) + expect(dayjs().day(1).format()).toBe(moment().day(1).format()) }) it('Date', () => { expect(dayjs().date()).toBe(moment().date()) + expect(dayjs().date(0).valueOf()).toBe(moment().date(0).valueOf()) + expect(dayjs().date(1).valueOf()).toBe(moment().date(1).valueOf()) }) it('Hour', () => { expect(dayjs().hour()).toBe(moment().hour()) + expect(dayjs().hour(0).valueOf()).toBe(moment().hour(0).valueOf()) + expect(dayjs().hour(1).valueOf()).toBe(moment().hour(1).valueOf()) }) it('Minute', () => { expect(dayjs().minute()).toBe(moment().minute()) + expect(dayjs().minute(0).valueOf()).toBe(moment().minute(0).valueOf()) + expect(dayjs().minute(1).valueOf()).toBe(moment().minute(1).valueOf()) }) it('Second', () => { expect(dayjs().second()).toBe(moment().second()) + expect(dayjs().second(0).valueOf()).toBe(moment().second(0).valueOf()) + expect(dayjs().second(1).valueOf()).toBe(moment().second(1).valueOf()) }) it('Millisecond', () => { expect(dayjs().millisecond()).toBe(moment().millisecond()) + expect(dayjs().millisecond(0).valueOf()).toBe(moment().millisecond(0).valueOf()) + expect(dayjs().millisecond(1).valueOf()).toBe(moment().millisecond(1).valueOf()) }) it('Set Day', () => { diff --git a/test/locale.test.js b/test/locale.test.js --- a/test/locale.test.js +++ b/test/locale.test.js @@ -1,4 +1,5 @@ import MockDate from 'mockdate' +import moment from 'moment' import dayjs from '../src' import es from '../src/locale/es' @@ -44,6 +45,17 @@ it('set global locale', () => { .toBe('Saturday 28, April') }) +it('get instance locale name', () => { + expect(dayjs().locale()).toBe('en') + expect(dayjs().locale()).toBe(moment().locale()) + expect(dayjs().locale('es').locale()).toBe('es') + expect(dayjs().locale('es').locale()).toBe(moment().locale('es').locale()) + dayjs.locale(es) + moment.locale('es') + expect(dayjs().locale()).toBe('es') + expect(dayjs().locale()).toBe(moment().locale()) +}) + it('immutable instance locale', () => { dayjs.locale('en') const origin = dayjs('2018-4-28') diff --git a/test/plugin/advancedFormat.test.js b/test/plugin/advancedFormat.test.js --- a/test/plugin/advancedFormat.test.js +++ b/test/plugin/advancedFormat.test.js @@ -2,7 +2,12 @@ import MockDate from 'mockdate' import moment from 'moment' import dayjs from '../../src' import advancedFormat from '../../src/plugin/advancedFormat' +import weekOfYear from '../../src/plugin/weekOfYear' +import weekYear from '../../src/plugin/weekYear' +import '../../src/locale/zh-cn' +dayjs.extend(weekYear) +dayjs.extend(weekOfYear) dayjs.extend(advancedFormat) beforeEach(() => { @@ -65,3 +70,15 @@ it('Format Hour k kk 24-hour 1 - 24', () => { expect(dayjs(d).format('kk')).toBe('23') expect(dayjs(d).format('kk')).toBe(moment(d).format('kk')) }) + +it('Format Week of Year wo', () => { + const d = '2018-12-01' + expect(dayjs(d).format('wo')).toBe(moment(d).format('wo')) + expect(dayjs(d).locale('zh-cn').format('wo')) + .toBe(moment(d).locale('zh-cn').format('wo')) +}) + +it('Format Week Year gggg', () => { + const d = '2018-12-31' + expect(dayjs(d).format('gggg')).toBe(moment(d).format('gggg')) +}) diff --git a/test/plugin/badMutable.test.js b/test/plugin/badMutable.test.js new file mode 100644 --- /dev/null +++ b/test/plugin/badMutable.test.js @@ -0,0 +1,177 @@ +import MockDate from 'mockdate' +import moment from 'moment' +import dayjs from '../../src' +import badMutable from '../../src/plugin/badMutable' +import '../../src/locale/zh-cn' + +dayjs.extend(badMutable) + +beforeEach(() => { + MockDate.set(new Date()) +}) + +afterEach(() => { + MockDate.reset() +}) + +describe('Set', () => { + it('Setters', () => { + const d = dayjs() + const m = moment() + expect(d.year()).toBe(m.year()) + d.year(2000) + m.year(2000) + expect(d.format()).toBe(m.format()) + d.month(1) + m.month(1) + expect(d.format()).toBe(m.format()) + d.day(1) + m.day(1) + expect(d.format()).toBe(m.format()) + d.date(1) + m.date(1) + expect(d.format()).toBe(m.format()) + d.hour(1) + m.hour(1) + expect(d.format()).toBe(m.format()) + d.minute(1) + m.minute(1) + expect(d.format()).toBe(m.format()) + d.second(1) + m.second(1) + expect(d.format()).toBe(m.format()) + d.millisecond(1) + m.millisecond(1) + expect(d.format()).toBe(m.format()) + }) + + it('Set', () => { + const d = dayjs() + const m = moment() + d.set('year', 2000) + m.set('year', 2000) + expect(d.format()).toBe(m.format()) + d.set('month', 12) + m.set('month', 12) + expect(d.format()).toBe(m.format()) + d.set('day', 1) + m.set('day', 1) + expect(d.format()).toBe(m.format()) + d.set('date', 1) + m.set('date', 1) + expect(d.format()).toBe(m.format()) + d.set('hour', 1) + m.set('hour', 1) + expect(d.format()).toBe(m.format()) + d.set('minute', 1) + m.set('minute', 1) + expect(d.format()).toBe(m.format()) + d.set('second', 1) + m.set('second', 1) + expect(d.format()).toBe(m.format()) + d.set('millisecond', 1) + m.set('millisecond', 1) + expect(d.format()).toBe(m.format()) + }) +}) + +describe('StartOf', () => { + it('StartOf', () => { + const d = dayjs() + const m = moment() + d.startOf('year') + m.startOf('year') + expect(d.format()).toBe(m.format()) + d.startOf('month') + m.startOf('month') + expect(d.format()).toBe(m.format()) + d.startOf('day') + m.startOf('day') + expect(d.format()).toBe(m.format()) + d.startOf('date') + m.startOf('date') + expect(d.format()).toBe(m.format()) + d.startOf('hour') + m.startOf('hour') + expect(d.format()).toBe(m.format()) + d.startOf('minute') + m.startOf('minute') + expect(d.format()).toBe(m.format()) + d.startOf('second') + m.startOf('second') + expect(d.format()).toBe(m.format()) + d.startOf('millisecond') + m.startOf('millisecond') + expect(d.format()).toBe(m.format()) + d.startOf('week') + m.startOf('week') + expect(d.format()).toBe(m.format()) + }) +}) + +describe('Add', () => { + it('Add', () => { + const d = dayjs() + const m = moment() + d.add(1, 'year') + m.add(1, 'year') + expect(d.format()).toBe(m.format()) + d.add(12, 'month') + m.add(12, 'month') + expect(d.format()).toBe(m.format()) + d.add(1, 'day') + m.add(1, 'day') + expect(d.format()).toBe(m.format()) + d.add(1, 'date') + m.add(1, 'date') + expect(d.format()).toBe(m.format()) + d.add(1, 'hour') + m.add(1, 'hour') + expect(d.format()).toBe(m.format()) + d.add(1, 'minute') + m.add(1, 'minute') + expect(d.format()).toBe(m.format()) + d.add(1, 'second') + m.add(1, 'second') + expect(d.format()).toBe(m.format()) + d.add(1, 'millisecond') + m.add(1, 'millisecond') + expect(d.format()).toBe(m.format()) + d.add(1, 'week') + m.add(1, 'week') + expect(d.format()).toBe(m.format()) + }) +}) + +it('daysInMonth', () => { + const d = dayjs() + const m = moment() + expect(d.daysInMonth()).toBe(m.daysInMonth()) + expect(d.format()).toBe(m.format()) +}) + +it('Locale', () => { + const d = dayjs() + const m = moment() + const format = 'MMMM' + expect(d.locale()).toBe(m.locale()) + expect(d.format(format)).toBe(m.format(format)) + d.locale('zh-cn') + m.locale('zh-cn') + expect(d.locale()).toBe(m.locale()) + expect(d.format(format)).toBe(m.format(format)) +}) + +it('isAfter isBefore isSame', () => { + const d = dayjs() + const format = dayjs().format() + d.isSame(dayjs, 'year') + expect(d.format()).toBe(format) + expect(d.isSame()).toBe(true) + d.isBefore(dayjs, 'hour') + expect(d.format()).toBe(format) + expect(d.isBefore()).toBe(false) + d.isAfter(dayjs, 'month') + expect(d.format()).toBe(format) + expect(d.isAfter()).toBe(false) +}) diff --git a/test/plugin/customParseFormat.test.js b/test/plugin/customParseFormat.test.js --- a/test/plugin/customParseFormat.test.js +++ b/test/plugin/customParseFormat.test.js @@ -3,6 +3,7 @@ import moment from 'moment' import dayjs from '../../src' import customParseFormat from '../../src/plugin/customParseFormat' import uk from '../../src/locale/uk' +import '../../src/locale/zh-cn' dayjs.extend(customParseFormat) @@ -73,12 +74,30 @@ it('timezone with no hour', () => { expect(dayjs(input, format).valueOf()).toBe(moment(input, format).valueOf()) }) -it('parse just hh:mm)', () => { +it('parse hh:mm', () => { const input = '12:00' const format = 'hh:mm' expect(dayjs(input, format).valueOf()).toBe(moment(input, format).valueOf()) }) +it('parse HH:mm:ss', () => { + const input = '00:27:21' + const format = 'HH:mm:ss' + expect(dayjs(input, format).valueOf()).toBe(moment(input, format).valueOf()) +}) + +it('parse HH:mm:ss but only one digit', () => { + const input = '0:0:1' + const format = 'HH:mm:ss' + expect(dayjs(input, format).valueOf()).toBe(moment(input, format).valueOf()) +}) + +it('parse hh:mm:ss but only one digit', () => { + const input = '0:0:1' + const format = 'hh:mm:ss' + expect(dayjs(input, format).valueOf()).toBe(moment(input, format).valueOf()) +}) + it('fails with an invalid format', () => { const input = '2018-05-02 12:00 PM' const format = 'C' @@ -151,3 +170,19 @@ it('correctly parse month from string after changing locale globally', () => { moment.locale(momentLocale) } }) + +it('correctly parse ordinal', () => { + const input = '7th March 2019' + const input2 = '17th March 2019' + const inputFalse = '7st March 2019' + const inputZHCN = '7日 三月 2019' + const format = 'Do MMMM YYYY' + expect(dayjs(input, format).valueOf()) + .toBe(moment(input, format).valueOf()) + expect(dayjs(input2, format).valueOf()) + .toBe(moment(input2, format).valueOf()) + expect(dayjs(inputFalse, format).valueOf()) + .toBe(moment(inputFalse, format).valueOf()) + expect(dayjs(inputZHCN, format, 'zh-cn').valueOf()) + .toBe(moment(inputZHCN, format, 'zh-cn').valueOf()) +}) diff --git a/test/plugin/isMoment.test.js b/test/plugin/isMoment.test.js new file mode 100644 --- /dev/null +++ b/test/plugin/isMoment.test.js @@ -0,0 +1,18 @@ +import MockDate from 'mockdate' +import dayjs from '../../src' +import isMoment from '../../src/plugin/isMoment' + +dayjs.extend(isMoment) + +beforeEach(() => { + MockDate.set(new Date()) +}) + +afterEach(() => { + MockDate.reset() +}) + +it('IsLeapYear', () => { + expect(dayjs.isMoment(dayjs())).toBe(true) + expect(dayjs.isMoment(new Date())).toBe(false) +}) diff --git a/test/plugin/localeData.test.js b/test/plugin/localeData.test.js new file mode 100644 --- /dev/null +++ b/test/plugin/localeData.test.js @@ -0,0 +1,26 @@ +import MockDate from 'mockdate' +import moment from 'moment' +import dayjs from '../../src' +import localeData from '../../src/plugin/localeData' + +dayjs.extend(localeData) + +beforeEach(() => { + MockDate.set(new Date()) +}) + +afterEach(() => { + MockDate.reset() +}) + +it('localeData', () => { + const d = dayjs() + const m = moment() + const dayjsLocaleData = dayjs().localeData() + const momentLocaleData = moment().localeData() + expect(dayjsLocaleData.firstDayOfWeek()).toBe(momentLocaleData.firstDayOfWeek()) + expect(dayjsLocaleData.months(d)).toBe(momentLocaleData.months(m)) + expect(dayjsLocaleData.monthsShort(d)).toBe(momentLocaleData.monthsShort(m)) + expect(dayjsLocaleData.weekdaysMin(d)).toBe(momentLocaleData.weekdaysMin(m)) + expect(dayjsLocaleData.weekdaysShort(d)).toBe(momentLocaleData.weekdaysShort(m)) +}) diff --git a/test/plugin/toArray.test.js b/test/plugin/toArray.test.js new file mode 100644 --- /dev/null +++ b/test/plugin/toArray.test.js @@ -0,0 +1,18 @@ +import MockDate from 'mockdate' +import moment from 'moment' +import dayjs from '../../src' +import toArray from '../../src/plugin/toArray' + +dayjs.extend(toArray) + +beforeEach(() => { + MockDate.set(new Date()) +}) + +afterEach(() => { + MockDate.reset() +}) + +it('As Array -> toArray', () => { + expect(dayjs().toArray()).toEqual(moment().toArray()) +}) diff --git a/test/plugin/toObject.test.js b/test/plugin/toObject.test.js new file mode 100644 --- /dev/null +++ b/test/plugin/toObject.test.js @@ -0,0 +1,18 @@ +import MockDate from 'mockdate' +import moment from 'moment' +import dayjs from '../../src' +import toObject from '../../src/plugin/toObject' + +dayjs.extend(toObject) + +beforeEach(() => { + MockDate.set(new Date()) +}) + +afterEach(() => { + MockDate.reset() +}) + +it('As Object -> toObject', () => { + expect(dayjs().toObject()).toEqual(moment().toObject()) +}) diff --git a/test/plugin/weekYear.test.js b/test/plugin/weekYear.test.js new file mode 100644 --- /dev/null +++ b/test/plugin/weekYear.test.js @@ -0,0 +1,30 @@ +import moment from 'moment' +import MockDate from 'mockdate' +import dayjs from '../../src' +import weekYear from '../../src/plugin/weekYear' +import weekOfYear from '../../src/plugin/weekOfYear' + +dayjs.extend(weekYear) +dayjs.extend(weekOfYear) + +beforeEach(() => { + MockDate.set(new Date()) +}) + +afterEach(() => { + MockDate.reset() +}) + +it('Week Year', () => { + const daySet = [ + ['2018-12-01', 2018], + ['2018-12-30', 2019], + ['2018-12-31', 2019], + ['2019-01-01', 2019] + ] + daySet.forEach((d) => { + const [day, result] = d + expect(dayjs(day).weekYear()).toBe(result) + expect(dayjs(day).weekYear()).toBe(moment(day).weekYear()) + }) +})
CustomParseFormat doesn't parse ordinals correctly when AdvancedFormat is enabled **Describe the bug** When using `AdvancedFormat` plugin that allows ordinals, the `CustomParseFormat` plugin doesn't parse dates that have ordinals. So: ```javascript dayjs('7th March 2019', 'Do MMMM YYYY') ``` returns ```javascript { [Number: NaN] '$L': 'en', '$u': undefined, '$d': Invalid Date, '$y': NaN, '$M': NaN, '$D': NaN, '$W': NaN, '$H': NaN, '$m': NaN, '$s': NaN, '$ms': NaN } ``` **Expected behavior** When both `AdvancedFormat` and `CustomParseFormat` plugins are enabled ```javascript dayjs('7th March 2019', 'Do MMMM YYYY') ``` should return a dayjs object, either with or without the ordinal defined in it: ```javascript { [Number: 1551916800000] '$L': 'en', '$u': undefined, '$d': '2019-03-07T00:00:00.000Z', '$y': 2019, '$M': 2, '$D': 7, '$o': 'th', // maybe? '$W': 4, '$H': 0, '$m': 0, '$s': 0, '$ms': 0 } ``` **Information** - Day.js version 1.8.9 - OS: Windows Subsystem Linux using Node v9.11.2
2019-03-10T12:47:27Z
1.8
iamkun/dayjs
453
iamkun__dayjs-453
[ "384" ]
3bd06f2a028da36275d65b1aa6fdf340dbd779b3
diff --git a/src/constant.js b/src/constant.js --- a/src/constant.js +++ b/src/constant.js @@ -34,4 +34,3 @@ export const en = { weekdays: 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'), months: 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_') } - diff --git a/src/index.js b/src/index.js --- a/src/index.js +++ b/src/index.js @@ -212,7 +212,6 @@ class Dayjs { return this } - set(string, int) { return this.clone().$set(string, int) } @@ -303,9 +302,16 @@ class Dayjs { }) } + utcOffset() { + // Because a bug at FF24, we're rounding the timezone offset around 15 minutes + // https://github.com/moment/moment/pull/1871 + return -Math.round(this.$d.getTimezoneOffset() / 15) * 15 + } + diff(input, units, float) { const unit = Utils.prettyUnit(units) const that = dayjs(input) + const zoneDelta = (that.utcOffset() - this.utcOffset()) * C.MILLISECONDS_A_MINUTE const diff = this - that let result = Utils.monthDiff(this, that) @@ -313,8 +319,8 @@ class Dayjs { [C.Y]: result / 12, [C.M]: result, [C.Q]: result / 3, - [C.W]: diff / C.MILLISECONDS_A_WEEK, - [C.D]: diff / C.MILLISECONDS_A_DAY, + [C.W]: (diff - zoneDelta) / C.MILLISECONDS_A_WEEK, + [C.D]: (diff - zoneDelta) / C.MILLISECONDS_A_DAY, [C.H]: diff / C.MILLISECONDS_A_HOUR, [C.MIN]: diff / C.MILLISECONDS_A_MINUTE, [C.S]: diff / C.MILLISECONDS_A_SECOND
diff --git a/test/display.test.js b/test/display.test.js --- a/test/display.test.js +++ b/test/display.test.js @@ -86,7 +86,6 @@ it('Format Second s ss SSS', () => { expect(dayjs(date).format('s-ss-SSS')).toBe(moment(date).format('s-ss-SSS')) }) - it('Format Time Zone ZZ', () => { MockDate.set(new Date('2018-05-02T23:00:00.000'), 60 * 8) expect(dayjs().format('Z')).toBe(moment().format('Z')) @@ -104,9 +103,21 @@ it('Format Time Zone ZZ', () => { }) it('Format ddd dd MMM with short locale', () => { - expect(dayjs().locale(th).format('dd')).toBe(moment().locale('th').format('dd')) - expect(dayjs().locale(th).format('ddd')).toBe(moment().locale('th').format('ddd')) - expect(dayjs().locale(th).format('MMM')).toBe(moment().locale('th').format('MMM')) + expect(dayjs() + .locale(th) + .format('dd')).toBe(moment() + .locale('th') + .format('dd')) + expect(dayjs() + .locale(th) + .format('ddd')).toBe(moment() + .locale('th') + .format('ddd')) + expect(dayjs() + .locale(th) + .format('MMM')).toBe(moment() + .locale('th') + .format('MMM')) }) it('Format Complex with other string - : / ', () => { @@ -170,7 +181,6 @@ describe('Difference', () => { }) }) - it('MonthDiff', () => { expect(dayjs('2018-08-08').diff(dayjs('2018-08-08'), 'month')).toEqual(0) expect(dayjs('2018-09-08').diff(dayjs('2018-08-08'), 'month')).toEqual(1) @@ -192,6 +202,11 @@ it('Days in Month', () => { expect(dayjs('20140201').daysInMonth()).toBe(moment('20140201').daysInMonth()) }) +it('Utc Offset', () => { + expect(dayjs('2013-01-01T00:00:00.000').utcOffset()).toBe(moment('2013-01-01T00:00:00.000').utcOffset()) + expect(dayjs('2013-01-01T05:00:00.000').utcOffset()).toBe(moment('2013-01-01T05:00:00.000').utcOffset()) +}) + it('As Javascript Date -> toDate', () => { const base = dayjs() const momentBase = moment()
diff() in "days" broken after making add() "days" aware of daylight-saving changes Computing difference between two dates, which one was subtracted 1000 days from, returns 999 days, if the date is on the boundary of daylight-saving changes: ``` > d1 = dayjs('2018-10-28') 2018-10-27T22:00:00.000Z > d2 = dayjs('2018-10-28').add(-1000, 'days') 2016-01-31T23:00:00.000Z > d1.diff(d2, 'hours') 23999 > d1.diff(d2, 'days') 999 ``` Moment.js computes the difference correctly. Notice, that the difference in hours is correct in Day.js too: ``` > m1 = moment('2018-10-28') moment("2018-10-28T00:00:00.000") > m1.toDate() 2018-10-27T22:00:00.000Z > m2 = moment('2018-10-28').add(-1000, 'day') moment("2016-02-01T00:00:00.000") > m2.toDate() 2016-01-31T23:00:00.000Z > m1.diff(m2, 'hours') 23999 > m1.diff(m2, 'days') 1000 ``` This problem has been caused by 969acedc94461dca2b1d9313299a2c9db4aed7a9. It adds/subtracts days using the local time zone. Previously, days were added/subtracted in UTC (using UNIX time), like hours and shorter units. While it helps people, who were not aware of Day.js working in the local time zone (#262 and #329), it also made Day.js inconsistent, because computing difference in days is still done in UTC (using UNIX time). Once `add()` and `subtract()` methods were modified to expect the day count in the local time zone, the `diff()` method should be modified to return the day count in the local time zone too. Adding/subtracting hours and shorter units happens in UTC, computing the difference in these units happens in UTC as well. Handling hours and shorter units by Day.js is consistent. The tests were executed in Node.js 8 in the time zone "Europe/Prague" using Day.js 1.7.7 and Moment.js 2.22.2.
Related: Adding one `'day'` on a daylight-changing day is broken. It adds 24 hours, no matter if that day has 23, 24 or 25 hours. ``` let a = dayjs('2018-11-04'); console.log(a); // h {$d: Sun Nov 04 2018 00:00:00 GMT-0400 (Eastern Daylight Time), $y: 2018, $M: 10, $D: 4, ...} a = a.add(1, 'day'); console.log(a); // h {$d: Sun Nov 04 2018 23:00:00 GMT-0500 (Eastern Standard Time), $y: 2018, $M: 10, $D: 4, …} ```
2019-01-16T08:45:52Z
1.8
iamkun/dayjs
76
iamkun__dayjs-76
[ "70" ]
33151dac2b86b1a620e91573e42c2e8df6cf3d67
diff --git a/src/index.js b/src/index.js --- a/src/index.js +++ b/src/index.js @@ -3,6 +3,7 @@ import * as Utils from './utils' const parseConfig = (config) => { let reg + if (config === null) return new Date(NaN) // Treat null as an invalid date if (!config) return new Date() if (config instanceof Date) return config // eslint-disable-next-line no-cond-assign
diff --git a/test/parse.test.js b/test/parse.test.js --- a/test/parse.test.js +++ b/test/parse.test.js @@ -27,11 +27,12 @@ describe('Parse', () => { expect(dayjs(time).valueOf()).toBe(moment(time).valueOf()) }) - it('String Other and isValid', () => { + it('String Other, Null and isValid', () => { global.console.warn = jest.genMockFunction()// moment.js otherString will throw warn expect(dayjs('otherString').toString().toLowerCase()).toBe(moment('otherString').toString().toLowerCase()) expect(dayjs().isValid()).toBe(true) expect(dayjs('otherString').isValid()).toBe(false) + expect(dayjs(null).toString().toLowerCase()).toBe(moment(null).toString().toLowerCase()) }) })
Format need to check date is invalid & Don't format dayjs(null) ```js const dayjs = require('dayjs'); const moment = require('moment'); console.log('\n=== dayjs ==='); console.log(dayjs('wtf').format()); console.log(dayjs(null).format()); console.log('\n=== moment ==='); console.log(moment('wtf').format()); console.log(moment(null).format()); ``` That code will print: ``` === dayjs === NaN-NaN-NaNTNaN:NaN:NaN++N:00 2018-04-27T10:38:31+08:00 === moment === Deprecation warning: value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are discouraged and will be removed in an upcoming major release. Please refer to http://momentjs.com/guides/#/warnings/js-date/ for more info. Arguments: [0] _isAMomentObject: true, _isUTC: false, _useUTC: false, _l: undefined, _i: wtf, _f: undefined, _strict: undefined, _locale: [object Object] Error at Function.createFromInputFallback (/Users/ahonn/Desktop/test/node_modules/moment/moment.js:320:98) at configFromString (/Users/ahonn/Desktop/test/node_modules/moment/moment.js:2368:15) at configFromInput (/Users/ahonn/Desktop/test/node_modules/moment/moment.js:2594:13) at prepareConfig (/Users/ahonn/Desktop/test/node_modules/moment/moment.js:2577:13) at createFromConfig (/Users/ahonn/Desktop/test/node_modules/moment/moment.js:2544:44) at createLocalOrUTC (/Users/ahonn/Desktop/test/node_modules/moment/moment.js:2631:16) at createLocal (/Users/ahonn/Desktop/test/node_modules/moment/moment.js:2635:16) at hooks (/Users/ahonn/Desktop/test/node_modules/moment/moment.js:12:29) at Object.<anonymous> (/Users/ahonn/Desktop/test/index.js:16:13) at Module._compile (module.js:652:30) Invalid date Invalid date ``` You need to check date is invalid, `dayjs('wtf')` preferably returns `Invalid date`. And `dayjs(null)` should not return current date, `null` is not equal to `undefined`.
After checking ECMAScript docs, I found a interesting thing. ``` new Date(null) // Valid new Date(0) // Valid // but: new Date(undefined) // Invalid new Date('wtf') // Invalid ``` That is to say, null is considered as a valid date in JS. Still, I think `null` is different to `0`, and `null` should be an __invalid__ date. Please share your thoughts.
2018-04-28T02:43:20Z
1.5
iamkun/dayjs
55
iamkun__dayjs-55
[ "49" ]
b3a678d9e180ddcf4acf48fa8846468052f00229
diff --git a/src/index.js b/src/index.js --- a/src/index.js +++ b/src/index.js @@ -2,16 +2,15 @@ import * as C from './constant' import * as Utils from './utils' const parseConfig = (config) => { + let reg if (!config) return new Date() if (config instanceof Date) return config - const configStr = String(config) - if (/^(\d){8}$/.test(configStr)) { - const y = configStr.substr(0, 4) - const m = configStr.substr(4, 2) - const d = configStr.substr(6, 2) - return new Date(y, m - 1, d) - } - return new Date(config) // e.g. timestamp + // eslint-disable-next-line no-cond-assign + if (reg = String(config).match(/^(\d{4})-?(\d{2})-?(\d{1,2})$/)) { + // 2018-08-08 or 20180808 + return new Date(reg[1], reg[2] - 1, reg[3]) + } + return new Date(config) // timestamp } class Dayjs { @@ -21,8 +20,8 @@ class Dayjs { } init() { - this.timeZone = this.$d.getTimezoneOffset() / 60 - this.timeZoneString = Utils.padStart(String(this.timeZone * -1).replace(/^(.)?(\d)/, '$10$200'), 5, '+') + this.$zone = this.$d.getTimezoneOffset() / 60 + this.$zoneStr = Utils.padStart(String(this.$zone * -1).replace(/^(.)?(\d)/, '$10$200'), 5, '+') this.$y = this.$d.getFullYear() this.$M = this.$d.getMonth() this.$D = this.$d.getDate() @@ -92,17 +91,20 @@ class Dayjs { startOf(units, isStartOf = true) { // isStartOf -> endOf const unit = Utils.prettyUnit(units) + const instanceFactory = (d, m, y = this.$y, isEnd = false) => { + const ins = new Dayjs(new Date(y, m, d)) + return isEnd ? ins.endOf(C.D) : ins + } switch (unit) { case C.Y: - if (isStartOf) { - return new Dayjs(new Date(this.$y, 0, 1)) - } - return new Dayjs(new Date(this.$y, 11, 31)).endOf('day') + return isStartOf ? instanceFactory(1, 0) : + instanceFactory(31, 11, this.$y, true) case C.M: - if (isStartOf) { - return new Dayjs(new Date(this.$y, this.$M, 1)) - } - return new Dayjs(new Date(this.$y, this.$M + 1, 0)).endOf('day') + return isStartOf ? instanceFactory(1, this.$M) : + instanceFactory(0, this.$M + 1, this.$y, true) + case C.W: + return isStartOf ? instanceFactory(this.$D - this.$W, this.$M) : + instanceFactory(this.$D + (6 - this.$W), this.$M, this.$y, true) case C.D: if (isStartOf) { return new Dayjs(this.toDate().setHours(0, 0, 0, 0)) @@ -219,9 +221,9 @@ class Dayjs { case 'ss': return Utils.padStart(String(this.$s), 2, '0') case 'Z': - return `${this.timeZoneString.slice(0, -2)}:00` + return `${this.$zoneStr.slice(0, -2)}:00` default: // 'ZZ' - return this.timeZoneString + return this.$zoneStr } }) }
diff --git a/test/manipulate.test.js b/test/manipulate.test.js --- a/test/manipulate.test.js +++ b/test/manipulate.test.js @@ -10,25 +10,21 @@ afterEach(() => { MockDate.reset() }) -it('StartOf EndOf Year with s and upper case', () => { - expect(dayjs().startOf('YearS').unix()).toBe(moment().startOf('year').unix()) - expect(dayjs().endOf('year').unix()).toBe(moment().endOf('year').unix()) -}) - -it('StartOf EndOf Month', () => { - expect(dayjs().startOf('month').unix()).toBe(moment().startOf('month').unix()) - expect(dayjs().endOf('month').unix()).toBe(moment().endOf('month').unix()) -}) +describe('StartOf EndOf', () => { + it('StartOf EndOf Year ... with s and upper case', () => { + const testArr = ['Year', 'year', 'YearS', 'month', 'day', 'week'] + testArr.forEach((d) => { + expect(dayjs().startOf(d).unix()).toBe(moment().startOf(d).unix()) + expect(dayjs().endOf(d).unix()).toBe(moment().endOf(d).unix()) + }) + }) -it('StartOf EndOf Day', () => { - expect(dayjs().startOf('day').unix()).toBe(moment().startOf('day').unix()) - expect(dayjs().endOf('day').unix()).toBe(moment().endOf('day').unix()) + it('StartOf EndOf Other -> no change', () => { + expect(dayjs().startOf('otherString').unix()).toBe(moment().startOf('otherString').unix()) + expect(dayjs().endOf('otherString').unix()).toBe(moment().endOf('otherString').unix()) + }) }) -it('StartOf EndOf Other -> no change', () => { - expect(dayjs().startOf('otherString').unix()).toBe(moment().startOf('otherString').unix()) - expect(dayjs().endOf('otherString').unix()).toBe(moment().endOf('otherString').unix()) -}) it('Add Time days', () => { expect(dayjs().add(1, 's').unix()).toBe(moment().add(1, 's').unix()) diff --git a/test/parse.test.js b/test/parse.test.js --- a/test/parse.test.js +++ b/test/parse.test.js @@ -9,13 +9,17 @@ beforeEach(() => { afterEach(() => { MockDate.reset() }) + describe('Parse', () => { it('Now', () => { expect(dayjs().unix()).toBe(moment().unix()) }) it('String 20130208', () => { - expect(dayjs('20130208').unix()).toBe(moment('20130208').unix()) + const timeArr = ['20130108', '2018-04-24'] + timeArr.forEach((t) => { + expect(dayjs(t).unix()).toBe(moment(t).unix()) + }) }) it('String ISO 8601 date, time and zone', () => {
startOf 不支持week 选项 dayjs().startOf('week').format('YYYY-MM-DD') dayjs().endOf('week').format('YYYY-MM-DD')
自己写下吧!我也在用这个功能 嗯,我在写。。。。 我就不fork了,直接上代码: ```javascript //本周 let t = dayjs() let val1 = t.set('date', t.$D - t.$W).add(1, 'd').format('YYYY-MM-DD') //本周第一天(周一) let val2 = t.set('date', t.$D + (6 - t.$W)).add(1, 'd').format('YYYY-MM-DD') //本周最后一天(周日) //上周 let t = dayjs().subtract(1, 'w') let val1 = t.set('date', t.$D - t.$W).add(1, 'd').format('YYYY-MM-DD') //上周第一天(周一) let val2 = t.set('date', t.$D + (6 - t.$W)).add(1, 'd').format('YYYY-MM-DD') //上周最后一天(周日) ``` thx, doing ... ``` case C.W: let $W = null if (this.$W === 0) { $W = 6 } else if(this.$W === 1) { $W = 0 } else { $W = this.$W - 1 } if (isStartOf) { return new Dayjs(new Date(this.$y, this.$M, (this.$D - $W))) } return new Dayjs(new Date(this.$y, this.$M, this.$D + (6 - $W))) ``` // add dayjs().startOf('week') && dayjs().endOf('week') support // However, the logic needs to be separated into good
2018-04-25T15:40:50Z
1.5
iamkun/dayjs
337
iamkun__dayjs-337
[ "244" ]
36c4e94f014a78c186b354f003c048fdb5562464
diff --git a/src/index.js b/src/index.js --- a/src/index.js +++ b/src/index.js @@ -384,6 +384,8 @@ class Dayjs { } } +dayjs.prototype = Dayjs.prototype + dayjs.extend = (plugin, option) => { plugin(option, Dayjs, dayjs) return dayjs
diff --git a/test/constructor.test.js b/test/constructor.test.js new file mode 100644 --- /dev/null +++ b/test/constructor.test.js @@ -0,0 +1,18 @@ +import MockDate from 'mockdate' +import dayjs from '../src' + +beforeEach(() => { + MockDate.set(new Date()) +}) + +afterEach(() => { + MockDate.reset() +}) + +it('supports instanceof dayjs', () => { + expect(dayjs() instanceof dayjs).toBeTruthy() +}) + +it('does not break isDayjs', () => { + expect(dayjs.isDayjs(dayjs())).toBeTruthy() +})
dayjs() instanceof dayjs = false Hi, I tried to replace moment with dayjs,but some old code have this condition: ``` if (aMomentDate instanceof moment) { //do something } ``` if this meet dayjs, it would be false and the `if` can not be enter. after I found the problem , I tried this: ``` moment() instanceof moment //true ``` and this: ``` dayjs() instanceof dayjs //false ``` So, is it necessary to be fixed?
@wslx520 Thanks. Just added `dayjs.isDayjs` API to deal with this in release 1.6.9. So that you could do: ```javascript if (dayjs.isDayjs( aDayjsObject)) { // then } ``` But I have no idea about how to make `dayjs() instanceof dayjs` to be true. Any one could help? jQuery also: $() instanceOf $ // true some important source code from it maybe could give you some ideas: @iamkun: ```javascript jQuery = function( selector, context ) { // equals return self return new jQuery.fn.init( selector, context, rootjQuery ); }, jQuery.fn = jQuery.prototype = { //fn = prototype //important constructor: jQuery, init: function( selector, context, rootjQuery ) { ... // this is actually return a instance of self return this; } ... } //important jQuery.fn.init.prototype = jQuery.fn; ``` @wslx520 Thanks. I'll try. And at the moment, you could use `isDayjs ` instead.
2018-09-13T05:31:28Z
1.7
iamkun/dayjs
1,161
iamkun__dayjs-1161
[ "1149" ]
9a407a140b089345a387d1aceab4d0d1635229c7
diff --git a/src/plugin/timezone/index.js b/src/plugin/timezone/index.js --- a/src/plugin/timezone/index.js +++ b/src/plugin/timezone/index.js @@ -1,3 +1,5 @@ +import { MIN, MS } from '../../constant' + const typeToPos = { year: 0, month: 1, @@ -7,8 +9,6 @@ const typeToPos = { second: 5 } -const ms = 'ms' - // Cache time-zone lookups from Intl.DateTimeFormat, // as it is a *very* slow method. const dtfCache = {} @@ -94,10 +94,15 @@ export default (o, c, d) => { const proto = c.prototype - proto.tz = function (timezone = defaultTimezone) { + proto.tz = function (timezone = defaultTimezone, keepLocalTime) { + const oldOffset = this.utcOffset() const target = this.toDate().toLocaleString('en-US', { timeZone: timezone }) const diff = Math.round((this.toDate() - new Date(target)) / 1000 / 60) - const ins = d(target).$set(ms, this.$ms).utcOffset(localUtcOffset - diff, true) + let ins = d(target).$set(MS, this.$ms).utcOffset(localUtcOffset - diff, true) + if (keepLocalTime) { + const newOffset = ins.utcOffset() + ins = ins.add(oldOffset - newOffset, MIN) + } ins.$x.$timezone = timezone return ins } diff --git a/types/plugin/timezone.d.ts b/types/plugin/timezone.d.ts --- a/types/plugin/timezone.d.ts +++ b/types/plugin/timezone.d.ts @@ -5,7 +5,7 @@ export = plugin declare module 'dayjs' { interface Dayjs { - tz(timezone?: string): Dayjs + tz(timezone?: string, keepLocalTime?: boolean): Dayjs } interface DayjsTimezone {
diff --git a/test/plugin/timezone.test.js b/test/plugin/timezone.test.js --- a/test/plugin/timezone.test.js +++ b/test/plugin/timezone.test.js @@ -1,8 +1,8 @@ import MockDate from 'mockdate' import moment from 'moment-timezone' import dayjs from '../../src' -import utc from '../../src/plugin/utc' import timezone from '../../src/plugin/timezone' +import utc from '../../src/plugin/utc' dayjs.extend(utc) dayjs.extend(timezone) @@ -260,6 +260,14 @@ describe('set Default', () => { }) }) +describe('keepLocalTime', () => { + const base = dayjs.tz('2013-11-18 11:55', 'America/Toronto') + it('keepLocalTime', () => { + expect(base.tz('Europe/Berlin').format()).toBe('2013-11-18T17:55:00+01:00') + expect(base.tz('Europe/Berlin', true).format()).toBe('2013-11-18T11:55:00+01:00') + }) +}) + describe('Get offsetName', () => { const dtz = dayjs.tz('2012-03-11 01:59:59', NY) it('short', () => {
Only changing the timezone (similar to moment.tz(keeptime=true)) Here is a code sample from Moment's timezone. I would like to achieve the `true` flag so only the offset changes when time stays the same. ``` var m = moment.tz("2013-11-18 11:55", "America/Toronto"); m.format(); // 2013-11-18T11:55:00-05:00 m.tz('Europe/Berlin', true).format() // 2013-11-18T11:55:00+01:00 ``` The use case would be: I have something like an open hour: `08:00` to `16:00`, and want to set that as `America/New_York`, i.e. `8:00 AM EDT` to `16:00PM EDT`. Current behavior: ``` dayjs("08:00", "hh:mm").tz('America/New_York') => 2020-10-19T11:00:00-04:00 (depending on current timezone, in this case, America/Los_Angeles) ``` Desired behavior: ``` dayjs("08:00", "hh:mm").tz('America/New_York', true) => 2020-10-19T08:00:00-04:00 ```
@iamkun bumping this issue. Is this feature already available?
2020-10-21T08:06:37Z
1.9
iamkun/dayjs
952
iamkun__dayjs-952
[ "944" ]
bc071568f12cdb3fc00f7f20552b86c80c853d3a
diff --git a/src/plugin/duration/index.js b/src/plugin/duration/index.js --- a/src/plugin/duration/index.js +++ b/src/plugin/duration/index.js @@ -48,7 +48,7 @@ class Duration { const d = input.match(durationRegex) if (d) { [,, - this.$d.years, this.$d.months,, + this.$d.years, this.$d.months, this.$d.weeks, this.$d.days, this.$d.hours, this.$d.minutes, this.$d.seconds] = d this.calMilliseconds() return this @@ -83,7 +83,7 @@ class Duration { toISOString() { const Y = this.$d.years ? `${this.$d.years}Y` : '' const M = this.$d.months ? `${this.$d.months}M` : '' - let days = this.$d.days || 0 + let days = +this.$d.days || 0 if (this.$d.weeks) { days += this.$d.weeks * 7 } diff --git a/src/plugin/localeData/index.js b/src/plugin/localeData/index.js --- a/src/plugin/localeData/index.js +++ b/src/plugin/localeData/index.js @@ -1,11 +1,14 @@ export default (o, c, dayjs) => { // locale needed later const proto = c.prototype const getLocalePart = part => (part && (part.indexOf ? part : part.s)) - const getShort = (ins, target, full, num) => { + const getShort = (ins, target, full, num, localeOrder) => { const locale = ins.name ? ins : ins.$locale() const targetLocale = getLocalePart(locale[target]) const fullLocale = getLocalePart(locale[full]) - return targetLocale || fullLocale.map(f => f.substr(0, num)) + const result = targetLocale || fullLocale.map(f => f.substr(0, num)) + if (!localeOrder) return result + const { weekStart } = locale + return result.map((_, index) => (result[(index + (weekStart || 0)) % 7])) } const getDayjsLocaleObject = () => dayjs.Ls[dayjs.locale()] const localeData = function () { @@ -42,9 +45,9 @@ export default (o, c, dayjs) => { // locale needed later dayjs.monthsShort = () => getShort(getDayjsLocaleObject(), 'monthsShort', 'months', 3) - dayjs.weekdays = () => getDayjsLocaleObject().weekdays + dayjs.weekdays = localeOrder => getShort(getDayjsLocaleObject(), 'weekdays', null, null, localeOrder) - dayjs.weekdaysShort = () => getShort(getDayjsLocaleObject(), 'weekdaysShort', 'weekdays', 3) + dayjs.weekdaysShort = localeOrder => getShort(getDayjsLocaleObject(), 'weekdaysShort', 'weekdays', 3, localeOrder) - dayjs.weekdaysMin = () => getShort(getDayjsLocaleObject(), 'weekdaysMin', 'weekdays', 2) + dayjs.weekdaysMin = localeOrder => getShort(getDayjsLocaleObject(), 'weekdaysMin', 'weekdays', 2, localeOrder) } diff --git a/types/index.d.ts b/types/index.d.ts --- a/types/index.d.ts +++ b/types/index.d.ts @@ -1,12 +1,17 @@ /// <reference path="./locale/index.d.ts" /> export = dayjs; -declare function dayjs (date?: dayjs.ConfigType, option?: dayjs.OptionType, locale?: string): dayjs.Dayjs + +declare function dayjs (date?: dayjs.ConfigType): dayjs.Dayjs + +declare function dayjs (date?: dayjs.ConfigType, format?: dayjs.OptionType, strict?: boolean): dayjs.Dayjs + +declare function dayjs (date?: dayjs.ConfigType, format?: dayjs.OptionType, locale?: string, strict?: boolean): dayjs.Dayjs declare namespace dayjs { export type ConfigType = string | number | Date | Dayjs - export type OptionType = { locale?: string, format?: string, utc?: boolean } | string + export type OptionType = { locale?: string, format?: string, utc?: boolean } | string | string[] type UnitTypeShort = 'd' | 'M' | 'y' | 'h' | 'm' | 's' | 'ms' export type UnitType = 'millisecond' | 'second' | 'minute' | 'hour' | 'day' | 'month' | 'year' | 'date' | UnitTypeShort;
diff --git a/test/plugin/duration.test.js b/test/plugin/duration.test.js --- a/test/plugin/duration.test.js +++ b/test/plugin/duration.test.js @@ -62,6 +62,12 @@ describe('Parse ISO string', () => { it('Part ISO string', () => { expect(dayjs.duration('PT2777H46M40S').toISOString()).toBe('PT2777H46M40S') }) + it('ISO string with week', () => { + const d = dayjs.duration('P2M3W4D') + expect(d.toISOString()).toBe('P2M25D') + expect(d.asDays()).toBe(85) // moment 85, count 2M as 61 days + expect(d.asWeeks()).toBe(12.142857142857142) // moment 12.285714285714286 + }) it('Invalid ISO string', () => { expect(dayjs.duration('Invalid').toISOString()).toBe('P0D') }) diff --git a/test/plugin/localeData.test.js b/test/plugin/localeData.test.js --- a/test/plugin/localeData.test.js +++ b/test/plugin/localeData.test.js @@ -77,3 +77,15 @@ it('Month function', () => { expect(dayjs.months()).toEqual(moment.months()) expect(dayjs.monthsShort()).toEqual(moment.monthsShort()) }) + +it('Locale order', () => { + dayjs.locale('fr') + moment.locale('fr') + expect(dayjs.weekdays(true)).toEqual(moment.weekdays(true)) + expect(dayjs.weekdaysShort(true)).toEqual(moment.weekdaysShort(true)) + expect(dayjs.weekdaysMin(true)).toEqual(moment.weekdaysMin(true)) + expect(dayjs.weekdays()).not.toEqual(dayjs.weekdays(true)) + dayjs.locale('en') + moment.locale('en') + expect(dayjs.weekdays(true)).toEqual(moment.weekdays(true)) +})
Array format support is not reflected in the type definition for typescript **Describe the bug** Array format is supported by #906, but typescript gives the following type error. ```typescript dayjs('2020-02-02', ['YYYY', 'YYYY-DD-MM']) ``` ``` error TS2345: Argument of type 'string[]' is not assignable to parameter of type 'string | { locale?: string | undefined; format?: string | undefined; utc?: boolean | undefined; } | undefined'. Type 'string[]' is not assignable to type 'string'. ``` I think we need to update the function signature for typescript. **Expected behavior** It works just as well as javascript **Information** - Day.js Version : 1.8.28 - OS: macOS
2020-07-02T10:30:23Z
1.8
iamkun/dayjs
162
iamkun__dayjs-162
[ "138" ]
cdacf2dca8a2420f87bf45ed2986f36b0199da4f
diff --git a/index.d.ts b/index.d.ts --- a/index.d.ts +++ b/index.d.ts @@ -87,7 +87,7 @@ declare namespace dayjs { export type PluginFunc = (option: ConfigType, d1: Dayjs, d2: Dayjs) => void - export function extend(plugin: PluginFunc, option: ConfigType): Dayjs + export function extend(plugin: PluginFunc, option?: ConfigType): Dayjs export function local(arg1: any, arg2?: any): void } diff --git a/src/constant.js b/src/constant.js --- a/src/constant.js +++ b/src/constant.js @@ -24,7 +24,7 @@ export const DATE = 'date' export const FORMAT_DEFAULT = 'YYYY-MM-DDTHH:mm:ssZ' // regex -export const REGEX_PARSE = /^(\d{4})-?(\d{0,2})-?(\d{0,2})(.*?(\d{1,2}):(\d{1,2}):(\d{1,2}))?.?(\d{1,3})?$/ +export const REGEX_PARSE = /^(\d{4})-?(\d{1,2})-?(\d{0,2})(.*?(\d{1,2}):(\d{1,2}):(\d{1,2}))?.?(\d{1,3})?$/ export const REGEX_FORMAT = /\[.*?\]|Y{2,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g export const en = { diff --git a/src/index.js b/src/index.js --- a/src/index.js +++ b/src/index.js @@ -52,7 +52,7 @@ const parseDate = (date) => { if ((typeof date === 'string') && (reg = date.match(C.REGEX_PARSE))) { // 2018-08-08 or 20180808 return new Date( - reg[1], (reg[2] - 1) || 0, reg[3] || 1, + reg[1], reg[2] - 1, reg[3] || 1, reg[5] || 0, reg[6] || 0, reg[7] || 0, reg[8] || 0 ) } @@ -230,15 +230,15 @@ class Dayjs { number = Number(number) // eslint-disable-line no-param-reassign // units === 'ms' hard code here, will update in next release const unit = (units && (units.length === 1 || units === 'ms')) ? units : Utils.prettyUnit(units) + const instanceFactory = (u, n) => { + const date = this.set(C.DATE, 1).set(u, n + number) + return date.set(C.DATE, Math.min(this.$D, date.daysInMonth())) + } if (['M', C.M].indexOf(unit) > -1) { - let date = this.set(C.DATE, 1).set(C.M, this.$M + number) - date = date.set(C.DATE, Math.min(this.$D, date.daysInMonth())) - return date + return instanceFactory(C.M, this.$M) } if (['y', C.Y].indexOf(unit) > -1) { - let date = this.set(C.DATE, 1).set(C.Y, this.$y + number) - date = date.set(C.DATE, Math.min(this.$D, date.daysInMonth())) - return date + return instanceFactory(C.Y, this.$y) } let step switch (unit) { diff --git a/src/utils.js b/src/utils.js --- a/src/utils.js +++ b/src/utils.js @@ -15,16 +15,9 @@ const monthDiff = (a, b) => { // function from moment.js in order to keep the same result const wholeMonthDiff = ((b.year() - a.year()) * 12) + (b.month() - a.month()) const anchor = a.clone().add(wholeMonthDiff, 'months') - let anchor2 - let adjust - if (b - anchor < 0) { - anchor2 = a.clone().add(wholeMonthDiff - 1, 'months') - adjust = (b - anchor) / (anchor - anchor2) - } else { - anchor2 = a.clone().add(wholeMonthDiff + 1, 'months') - adjust = (b - anchor) / (anchor2 - anchor) - } - return Number(-(wholeMonthDiff + adjust)) + const c = b - anchor < 0 + const anchor2 = a.clone().add(wholeMonthDiff + (c ? -1 : 1), 'months') + return Number(-(wholeMonthDiff + ((b - anchor) / (c ? (anchor - anchor2) : (anchor2 - anchor))))) } const absFloor = n => (n < 0 ? Math.ceil(n) || 0 : Math.floor(n))
diff --git a/test/manipulate.test.js b/test/manipulate.test.js --- a/test/manipulate.test.js +++ b/test/manipulate.test.js @@ -43,6 +43,8 @@ it('Add Time days', () => { expect(dayjs().add(1, 'M').valueOf()).toBe(moment().add(1, 'M').valueOf()) expect(dayjs().add(1, 'y').valueOf()).toBe(moment().add(1, 'y').valueOf()) expect(dayjs('20111031').add(1, 'months').valueOf()).toBe(moment('20111031').add(1, 'months').valueOf()) + expect(dayjs('20160131').add(1, 'months').valueOf()).toBe(moment('20160131').add(1, 'months').valueOf()) + expect(dayjs('20160229').add(1, 'year').valueOf()).toBe(moment('20160229').add(1, 'year').valueOf()) expect(dayjs().add('2', 'years').valueOf()).toBe(moment().add('2', 'years').valueOf()) }) diff --git a/test/parse.test.js b/test/parse.test.js --- a/test/parse.test.js +++ b/test/parse.test.js @@ -29,6 +29,10 @@ describe('Parse', () => { expect(dayjs(d).valueOf()).toBe(moment(d).valueOf()) // not recommend d = '2018-4-1 1:1:1:223' expect(dayjs(d).valueOf()).toBe(moment(d).valueOf()) // not recommend + d = '2018-01' + expect(dayjs(d).valueOf()).toBe(moment(d).valueOf()) // not recommend + d = '2018' + expect(dayjs(d).format()).toBe(moment(d).format()) // not recommend }) it('String ISO 8601 date, time and zone', () => {
dayjs init data seems not right When I init data like this, not like `moment.js` can make right way to parse the Date String. ``` console.log(dayjs('2018-01')) output: Fri Dec 01 2017 00:00:00 GMT+0800 (CST ``` But I can solve by pass the Date, and init with `new Date(string)`. ``` console.log(dayjs(new Date('2018-01'))) output: Mon Jan 01 2018 08:00:00 GMT+0800 (CST) ``` 希望你能看得懂...
It's a bug. However, maybe dayjs('2018-01-01') would be better? '2018-01' could either be '2018-01-01' or '2018-01-31'
2018-05-18T07:55:52Z
1.6
python-pillow/Pillow
8,852
python-pillow__Pillow-8852
[ "8828" ]
869aa5843c79c092db074b17234e792682eada41
diff --git a/src/PIL/Image.py b/src/PIL/Image.py --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -2540,8 +2540,13 @@ def save( msg = f"unknown file extension: {ext}" raise ValueError(msg) from e + from . import ImageFile + # may mutate self! - self._ensure_mutable() + if isinstance(self, ImageFile.ImageFile) and filename == self.filename: + self._ensure_mutable() + else: + self.load() save_all = params.pop("save_all", None) self.encoderinfo = {**getattr(self, "encoderinfo", {}), **params}
diff --git a/Tests/test_image.py b/Tests/test_image.py --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -258,6 +258,15 @@ def test_readonly_save(self, tmp_path: Path) -> None: assert im.readonly im.save(temp_file) + def test_save_without_changing_readonly(self, tmp_path: Path) -> None: + temp_file = tmp_path / "temp.bmp" + + with Image.open("Tests/images/rgb32bf-rgba.bmp") as im: + assert im.readonly + + im.save(temp_file) + assert im.readonly + def test_dump(self, tmp_path: Path) -> None: im = Image.new("L", (10, 10)) im._dump(str(tmp_path / "temp_L.ppm"))
Image.save() causes images created by Image.frombuffer() to stop reflecting changes in that buffer Hi, recently messed with PIL to encounter what is probably a bug ### What did you do? ```python import numpy as np from PIL import Image # Source of data for image im_data: np.typing.NDArray = np.array([[255]], dtype=np.uint8) assert im_data[0, 0] == 255 # OK # Attach to buffer protocol of an array, should reflect changes in im_data im: Image.Image = Image.frombuffer(mode="L", size=(1, 1), data=im_data) assert im_data[0, 0] == 255 # OK assert im.getdata()[0] == 255 # OK im_data[:, :] = np.array([[128]], dtype=np.uint8) assert im_data[0, 0] == 128 # OK assert im.getdata()[0] == 128 # OK! im.save("./test_image.bmp") assert im_data[0, 0] == 128 # OK assert im.getdata()[0] == 128 # OK im_data[:, :] = np.array([[64]], dtype=np.uint8) assert im_data[0, 0] == 64 # OK assert im.getdata()[0] == 64 # Failed!!! It is still == 128 ``` ### What did you expect to happen? Line with last assert should pass the assertion: ``` ... assert im.getdata()[0] == 64 # Should pass ``` ### What actually happened? Yes, so it seams that `Image.save()` messes with image buffer state. Moreover, this is actually explicitly stated that it does in source code: https://github.com/python-pillow/Pillow/blob/af09976a5f57e8aebaedf332bc4025ea1b068af4/src/PIL/Image.py#L2513 ```python # def save(...): # ... # may mutate self! self._ensure_mutable() ``` Once one saved the image, one can no longer work with buffer and expect image working properly. I can *try* to work out some patches but really I am somewhat new to the pillow and not well aware of all internal connections with things. It would be nice to have some hints on what may going on - then I can try to fix this. ### What are your OS, Python and Pillow versions? #### OS: ```shell lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 22.04.5 LTS Release: 22.04 Codename: jammy ``` #### Python: - `Python 3.12.9` - Prebuilt binary from deadsnakes ppa if I remember correctly #### Pillow: ```shell poetry run python3 -m PIL --report -------------------------------------------------------------------- Pillow 11.1.0 Python 3.12.9 (main, Feb 5 2025, 08:49:00) [GCC 11.4.0] -------------------------------------------------------------------- Python executable is [...]/.venv/bin/python3 Environment Python files loaded from [...]/.venv System Python files loaded from /usr -------------------------------------------------------------------- Python Pillow modules loaded from [...]/.venv/lib/python3.12/site-packages/PIL Binary Pillow modules loaded from [...]/.venv/lib/python3.12/site-packages/PIL -------------------------------------------------------------------- --- PIL CORE support ok, compiled for 11.1.0 *** TKINTER support not installed --- FREETYPE2 support ok, loaded 2.13.2 --- LITTLECMS2 support ok, loaded 2.16 --- WEBP support ok, loaded 1.5.0 --- JPEG support ok, compiled for libjpeg-turbo 3.1.0 --- OPENJPEG (JPEG2000) support ok, loaded 2.5.3 --- ZLIB (PNG/ZIP) support ok, loaded 1.2.11, compiled for zlib-ng 2.2.2 --- LIBTIFF support ok, loaded 4.6.0 --- RAQM (Bidirectional Text) support ok, loaded 0.10.1, fribidi 1.0.8, harfbuzz 10.1.0 *** LIBIMAGEQUANT (Quantization method) support not installed --- XCB (X protocol) support ok -------------------------------------------------------------------- ```
To explain slightly, you can see in `frombuffer()` that `readonly` is set to 1. https://github.com/python-pillow/Pillow/blob/af09976a5f57e8aebaedf332bc4025ea1b068af4/src/PIL/Image.py#L3186 And when `_ensure_mutable` sees this, https://github.com/python-pillow/Pillow/blob/af09976a5f57e8aebaedf332bc4025ea1b068af4/src/PIL/Image.py#L631-L640 `self.im = self.im.copy()` means 'clone the copy of the image that lives in C, and use the clone from now on'. You may or may not consider this helpful - if you save a copy of the image instead, replacing `im.save("./test_image.bmp")` with `im.copy().save("./test_image.bmp")`, then the original image stays the same. If you're looking for context as to why `save()` calls `_ensure_mutable`, see #3724. You may also find #2973 and #2980 interesting. Now I understand the context better. Ok, so can you tell my why there is still `readonly = 1` flag set in `frombuffer()` constructor? I can see that in original https://github.com/python-pillow/Pillow/pull/2980 PR this line was a subject of change: https://github.com/python-pillow/Pillow/pull/2980/files#diff-4805c79264fea07df59058db82ed74bb2f5c5023e212ac678536a534c56e5be2R3185 This line was not touched since the original fork - this is not necessarily something bad - but maybe it can be revised, why `frombuffer()` constructor would want to have this set? I can see that when no readonly flag is set, the `.load()` method is called - and it does some mem allocation (based on docs). Despite it being unclear to me (though I believe that there is a good reason for calling `.load()` here); I would argue that opening API for controlling this flag can be rewarding: ```python def frombuffer( mode: str, size: tuple[int, int], data: bytes | SupportsArrayInterface, decoder_name: str = "raw", readonly: bool = True, *args: Any, ) -> Image: # ... # ... im.readonly = readonly return im ``` Then user controls it: ```python im: Image.Image = Image.frombuffer(mode="L", size=(1, 1), data=im_data, readonly=False) ``` HOWEVER I do not know if this is a good solution at all. I can only confirm that in *my* specific case this solves the issue - I can freely call `.save()` and still have data reflected from my buffer. I did not put any performance checks in this considerations also. It just *makes more sense* from the user point of view - that's all. Ok, so #2980 would resolve your issue. If @wiredfool is available, he might be better placed to answer your question. Apparently I've totally forgotten about that PR, since I've effectively implemented the majority of it again in the Arrow PR #8330 (at least the parts where we've got an internal read_only flag on the c image struct, but in this case it's enforced read only in the c layer where you can't change it to r/w). I don't recall why #2980 never went anywhere, other than what I see in the PR there now, in that there are no docs or tests. (actually, that was a couple weeks before a new job, so that was probably it) Looking at this in the context of the Arrow PR, I think that at least one significant use of Pillow in that context will be to take a large array and save the data to an image format. It definitely defeats the point of zero copy if we can't save data without copying it into our own storage first, and then shuffling it out to the file. The core issue with #3274 seems to be that we've opened a write connection to a file that's mmaped into our process, not that save is inherently something that requires mutability in the image data. I'd think that this should be solved at the `open()` stage, possibly with an exclusive flag or similar. As a somewhat side note -- once an arrow array is exported from a process, according to the arrow implementation guidelines, both ends are supposed to consider it read-only due to the likelihood of inconsistent data when there are writers and readers in separate threads. I assume similar issues could occur with the frombuffer call, though given the GIL and the python focus of the array interface, it's less likely than with arrow. Would https://github.com/radarhere/Pillow/commit/600411a1e60274d154d015b446e521ad225f8498 be sufficient to resolve this? I've tested it, and it causes your original code to work.
2025-04-01T07:41:26Z
11.1
python-pillow/Pillow
8,792
python-pillow__Pillow-8792
[ "8790" ]
5d52ede584c5137f3a0b00be97dea8764404306b
diff --git a/src/PIL/ImageOps.py b/src/PIL/ImageOps.py --- a/src/PIL/ImageOps.py +++ b/src/PIL/ImageOps.py @@ -729,11 +729,15 @@ def exif_transpose(image: Image.Image, *, in_place: bool = False) -> Image.Image r"<tiff:Orientation>([0-9])</tiff:Orientation>", ): value = exif_image.info[key] - exif_image.info[key] = ( - re.sub(pattern, "", value) - if isinstance(value, str) - else re.sub(pattern.encode(), b"", value) - ) + if isinstance(value, str): + value = re.sub(pattern, "", value) + elif isinstance(value, tuple): + value = tuple( + re.sub(pattern.encode(), b"", v) for v in value + ) + else: + value = re.sub(pattern.encode(), b"", value) + exif_image.info[key] = value if not in_place: return transposed_image elif not in_place:
diff --git a/Tests/test_imageops.py b/Tests/test_imageops.py --- a/Tests/test_imageops.py +++ b/Tests/test_imageops.py @@ -448,6 +448,15 @@ def check(orientation_im: Image.Image) -> None: assert 0x0112 not in transposed_im.getexif() +def test_exif_transpose_with_xmp_tuple() -> None: + with Image.open("Tests/images/xmp_tags_orientation.png") as im: + assert im.getexif()[0x0112] == 3 + + im.info["xmp"] = (b"test",) + transposed_im = ImageOps.exif_transpose(im) + assert 0x0112 not in transposed_im.getexif() + + def test_exif_transpose_xml_without_xmp() -> None: with Image.open("Tests/images/xmp_tags_orientation.png") as im: assert im.getexif()[0x0112] == 3
XMP <?xpacket> wrapper tags causes exception in ImageOps.exif_transpose() <!-- Thank you for reporting an issue. Follow these guidelines to ensure your issue is handled properly. If you have a ... 1. General question: consider asking the question on Stack Overflow with the python-imaging-library tag: * https://stackoverflow.com/questions/tagged/python-imaging-library Do not ask a question in both places. If you think you have found a bug or have an unexplained exception then file a bug report here. 2. Bug report: include a self-contained, copy-pastable example that generates the issue if possible. Be concise with code posted. Guidelines on how to provide a good bug report: * https://stackoverflow.com/help/mcve Bug reports which follow these guidelines are easier to diagnose, and are often handled much more quickly. 3. Feature request: do a quick search of existing issues to make sure this has not been asked before. We know asking good questions takes effort, and we appreciate your time. Thank you. --> ### What did you do? When converting a TIF to a JPG, if the image contains XMP data that uses a <?xpacket> wrapper, conversion fails with an exception bubbled up from re module. ### What did you expect to happen? Conversion should happen ### What actually happened? Exception generated ```pytb TypeError ("expected string or bytes-like object, got 'tuple'",) Traceback (most recent call last): File "<ipython-input-64-92aa2f62a20c>", line 5, in <module> jpeg_image = img.convert("RGB") ^^^^^^^^^^^^^^^^^^ File "/Users/graeme/.local/share/virtualenvs/sandbox-0NfWatfK/lib/python3.12/site-packages/PIL/Image.py", line 984, in convert self.load() File "/Users/graeme/.local/share/virtualenvs/sandbox-0NfWatfK/lib/python3.12/site-packages/PIL/TiffImagePlugin.py", line 1292, in load return self._load_libtiff() ^^^^^^^^^^^^^^^^^^^^ File "/Users/graeme/.local/share/virtualenvs/sandbox-0NfWatfK/lib/python3.12/site-packages/PIL/TiffImagePlugin.py", line 1402, in _load_libtiff self.load_end() File "/Users/graeme/.local/share/virtualenvs/sandbox-0NfWatfK/lib/python3.12/site-packages/PIL/TiffImagePlugin.py", line 1314, in load_end ImageOps.exif_transpose(self, in_place=True) File "/Users/graeme/.local/share/virtualenvs/sandbox-0NfWatfK/lib/python3.12/site-packages/PIL/ImageOps.py", line 725, in exif_transpose else re.sub(pattern.encode(), b"", value) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/opt/homebrew/Cellar/python@3.12/3.12.8/Frameworks/Python.framework/Versions/3.12/lib/python3.12/re/__init__.py", line 186, in sub return _compile(pattern, flags).sub(repl, string, count) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ TypeError: expected string or bytes-like object, got 'tuple' ``` ### What are your OS, Python and Pillow versions? * OS: MacOS Sequoia * Python: 3.12.8 * Pillow: 11.1.0 (via PIL.__version__) ```text % pipenv run python3 -m PIL.report -------------------------------------------------------------------- Pillow 11.1.0 Python 3.12.8 (main, Dec 3 2024, 18:42:41) [Clang 16.0.0 (clang-1600.0.26.4)] -------------------------------------------------------------------- Python executable is /Users/graeme/.local/share/virtualenvs/sandbox-0NfWatfK/bin/python3 Environment Python files loaded from /Users/graeme/.local/share/virtualenvs/sandbox-0NfWatfK System Python files loaded from /opt/homebrew/opt/python@3.12/Frameworks/Python.framework/Versions/3.12 -------------------------------------------------------------------- Python Pillow modules loaded from /Users/graeme/.local/share/virtualenvs/sandbox-0NfWatfK/lib/python3.12/site-packages/PIL Binary Pillow modules loaded from /Users/graeme/.local/share/virtualenvs/sandbox-0NfWatfK/lib/python3.12/site-packages/PIL -------------------------------------------------------------------- --- PIL CORE support ok, compiled for 11.1.0 *** TKINTER support not installed --- FREETYPE2 support ok, loaded 2.13.2 --- LITTLECMS2 support ok, loaded 2.16 --- WEBP support ok, loaded 1.5.0 --- JPEG support ok, compiled for libjpeg-turbo 3.1.0 --- OPENJPEG (JPEG2000) support ok, loaded 2.5.3 --- ZLIB (PNG/ZIP) support ok, loaded 1.3.1.zlib-ng, compiled for zlib-ng 2.2.2 --- LIBTIFF support ok, loaded 4.6.0 --- RAQM (Bidirectional Text) support ok, loaded 0.10.1, fribidi 1.0.16, harfbuzz 10.1.0 *** LIBIMAGEQUANT (Quantization method) support not installed --- XCB (X protocol) support ok -------------------------------------------------------------------- ``` ### Reproduction steps **I encountered this issue on a Mac. I've been struggling to isolate a more independant example. It's probably me struggling with exiftool** I can't attach tif files. Please obtain from this [Google Drive folder](https://drive.google.com/drive/folders/184vVENhH-GMlgZx_I5GMou15iX7miW_G?usp=drive_link) 1. Download no_xmp.tif and xmp.tif and run the following ```python from PIL import Image img = Image.open('xmp.tif') new_img = img.convert("RGB") ``` Conversion should be successful 2. Repeat with xmp_xpacket.tif. Exception will be produced 3. We can break out the specific logic causing the exception from ImageOps.exif_transpose() ```python def test_xmp(img): if 'xmp' in img.info: problematic_value = img.info['xmp'] pattern = r'tiff:Orientation="([0-9])' if isinstance(problematic_value, str): re.sub(pattern, "", problematic_value) else: if isinstance(problematic_value, tuple): print("Tuple found. Not good") else: print("No tuple found. Good") re.sub(pattern.encode(), b"", problematic_value) else: print("Didn't find xmp info") img_noxmp = Image.open("no_xmp.tif") test_xml(img_noxmp) ``` Will return "Didn't find xmp info" ```python img_xmp = Image.open("xmp.tif") test_xml(img_xmp) ``` Will return "No tuple found. Good" Finally ```python img_xpacket = Image.open("xmp_xpacket.tif") test_xml(img_xpacket) ``` Will return "Tuple found. Not good" 4. To preview the XMP in these images run `exiftool -XMP -b xmp_xpacket.tif` and you'll observe the <?xpacket> field ### How did xpacket get in there? I discovered that this is due to image rotation on a Mac. Specifically Quick Actions vs Preview app 1. Start with no_xmp.tif. Run `exiftool -XMP -b no_xmp.tif` 2. Open 'Preview' and rotate the image (cmd-L for shortcut) 3. Run exiftool again and observe some XMP data has been added to the image 4. In the Mac finder, select 'no_xmp.tif' and either - Tap space to open quicklook and press cmd-L, or click the 'rotate left' button - or right click on the image and select "Quick Actions -> Rotate left' This will insert the xpacket tag ### Summary So one could say there's an inconsistency in Mac on how XMP fragments are added depending on how you rotate the image. Looking at part 1 of the [XMP spec](https://www.adobe.com/devnet/xmp.html), specifically section 7.3.2 it does appear that the XMP is valid if those xpacket wrappers are present. I suspect that ImageOps.exif_transpose() needs to be adjusted
2025-03-03T08:10:20Z
11.1
python-pillow/Pillow
8,701
python-pillow__Pillow-8701
[ "8697" ]
cf7dd2f0e9ff3b0b228ad6cc5060096ab7267806
diff --git a/src/PIL/ImageDraw.py b/src/PIL/ImageDraw.py --- a/src/PIL/ImageDraw.py +++ b/src/PIL/ImageDraw.py @@ -643,6 +643,7 @@ def draw_text(ink: int, stroke_width: float = 0) -> None: features=features, language=language, stroke_width=stroke_width, + stroke_filled=True, anchor=anchor, ink=ink, start=start, @@ -692,7 +693,8 @@ def draw_text(ink: int, stroke_width: float = 0) -> None: draw_text(stroke_ink, stroke_width) # Draw normal text - draw_text(ink, 0) + if ink != stroke_ink: + draw_text(ink) else: # Only draw normal text draw_text(ink) diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -644,6 +644,7 @@ def fill(width: int, height: int) -> Image.core.ImagingCore: features, language, stroke_width, + kwargs.get("stroke_filled", False), anchor, ink, start[0],
diff --git a/Tests/test_imagedraw.py b/Tests/test_imagedraw.py --- a/Tests/test_imagedraw.py +++ b/Tests/test_imagedraw.py @@ -1396,6 +1396,28 @@ def test_stroke_descender() -> None: assert_image_similar_tofile(im, "Tests/images/imagedraw_stroke_descender.png", 6.76) +@skip_unless_feature("freetype2") +def test_stroke_inside_gap() -> None: + # Arrange + im = Image.new("RGB", (120, 130)) + draw = ImageDraw.Draw(im) + font = ImageFont.truetype("Tests/fonts/FreeMono.ttf", 120) + + # Act + draw.text((12, 12), "i", "#f00", font, stroke_width=20) + + # Assert + for y in range(im.height): + glyph = "" + for x in range(im.width): + if im.getpixel((x, y)) == (0, 0, 0): + if glyph == "started": + glyph = "ended" + else: + assert glyph != "ended", "Gap inside stroked glyph" + glyph = "started" + + @skip_unless_feature("freetype2") def test_split_word() -> None: # Arrange diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py --- a/Tests/test_imagefont.py +++ b/Tests/test_imagefont.py @@ -461,6 +461,20 @@ def test_free_type_font_get_mask(font: ImageFont.FreeTypeFont) -> None: assert mask.size == (108, 13) +def test_stroke_mask() -> None: + # Arrange + text = "i" + + # Act + font = ImageFont.truetype(FONT_PATH, 128) + mask = font.getmask(text, stroke_width=2) + + # Assert + assert mask.getpixel((34, 5)) == 255 + assert mask.getpixel((38, 5)) == 0 + assert mask.getpixel((42, 5)) == 255 + + def test_load_when_image_not_found() -> None: with tempfile.NamedTemporaryFile(delete=False) as tmp: pass
Stroke Text Tittles Not Working Correctly ### What did you do? When trying to create a piece of text with a stroke fill the tittles on `i` and `j` do not look correct. ### What did you expect to happen? I would expect that the stroke would fill all the way to the edge of the inner fill for the tittles. ### What actually happened? The tittles on the `i` and `j` look like they have a thin outline around them rather than filling to the tittle. ### What are your OS, Python and Pillow versions? * OS: Windows * Python 3.11: * Pillow: 10.3.0 ```text Pillow 10.3.0 Python 3.11.5 | packaged by Anaconda, Inc. | (main, Sep 11 2023, 13:26:23) [MSC v.1916 64 bit (AMD64)] Python executable is C:\Users\bradl\anaconda3\python.exe System Python files loaded from C:\Users\bradl\anaconda3 -------------------------------------------------------------------- Python Pillow modules loaded from C:\Users\USER\anaconda3\Lib\site-packages\PIL Binary Pillow modules loaded from C:\Users\USER\anaconda3\Lib\site-packages\PIL -------------------------------------------------------------------- --- PIL CORE support ok, compiled for 10.3.0 --- TKINTER support ok, loaded 8.6 --- FREETYPE2 support ok, loaded 2.13.2 --- LITTLECMS2 support ok, loaded 2.16 --- WEBP support ok, loaded 1.3.2 --- WEBP Transparency support ok --- WEBPMUX support ok --- WEBP Animation support ok --- JPEG support ok, compiled for libjpeg-turbo 3.0.2 --- OPENJPEG (JPEG2000) support ok, loaded 2.5.2 --- ZLIB (PNG/ZIP) support ok, loaded 1.3.1 --- LIBTIFF support ok, loaded 4.6.0 *** RAQM (Bidirectional Text) support not installed *** LIBIMAGEQUANT (Quantization method) support not installed *** XCB (X protocol) support not installed ``` ```python from PIL import Image, ImageDraw, ImageFont # Create an image with a white background width, height = 2000, 400 image = Image.new("RGB", (width, height), "white") # Load a font font_size = 100 font = ImageFont.load_default(font_size) # Create a drawing context draw = ImageDraw.Draw(image) # Define text and positions text = 'i j h o w' text_position = (100, 100) # Position of the text stroke_width = 14 # Width of the stroke stroke_fill = "black" # Color of the stroke text_fill = "blue" # Color of the text # Draw text with stroke draw.text( text_position, text, font=font, fill=text_fill, stroke_width=stroke_width, stroke_fill=stroke_fill, ) image.save("testing.png", dpi=(300, 300)) ``` ![Image](https://github.com/user-attachments/assets/75b14f62-199b-43fa-a9b6-f8eea2fb5fb4)
Taking a look, the gap between the regular text and the stroked text is generated by FreeType. It's not unique to our default font - the same issue occurs with Times New Roman.ttf on my macOS machine. I've contacted FreeType support to see if this is considered a bug.
2025-01-18T07:36:23Z
11.1
python-pillow/Pillow
8,535
python-pillow__Pillow-8535
[ "8530" ]
7fe56d62c6739a3aebcc80e2a2cf2c8700fa3726
diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1433,8 +1433,12 @@ def _setup(self) -> None: logger.debug("- YCbCr subsampling: %s", self.tag_v2.get(YCBCRSUBSAMPLING)) # size - xsize = self.tag_v2.get(IMAGEWIDTH) - ysize = self.tag_v2.get(IMAGELENGTH) + try: + xsize = self.tag_v2[IMAGEWIDTH] + ysize = self.tag_v2[IMAGELENGTH] + except KeyError as e: + msg = "Missing dimensions" + raise TypeError(msg) from e if not isinstance(xsize, int) or not isinstance(ysize, int): msg = "Invalid dimensions" raise ValueError(msg)
diff --git a/Tests/test_imagefile.py b/Tests/test_imagefile.py --- a/Tests/test_imagefile.py +++ b/Tests/test_imagefile.py @@ -93,6 +93,19 @@ def test_ico(self) -> None: assert p.image is not None assert (48, 48) == p.image.size + @pytest.mark.filterwarnings("ignore:Corrupt EXIF data") + def test_incremental_tiff(self) -> None: + with ImageFile.Parser() as p: + with open("Tests/images/hopper.tif", "rb") as f: + p.feed(f.read(1024)) + + # Check that insufficient data was given in the first feed + assert not p.image + + p.feed(f.read()) + assert p.image is not None + assert (128, 128) == p.image.size + @skip_unless_feature("webp") def test_incremental_webp(self) -> None: with ImageFile.Parser() as p:
Pillow 11.0.0 and Django: TiffImagePlugin raised 'Invalid dimensions' error Seems that v11.0.0 release add a Bug parsing tiff images: ```pytb ... File "django/core/files/images.py", line 63, in get_image_dimensions p.feed(data) File "PIL/ImageFile.py", line 471, in feed im = Image.open(fp) File "PIL/Image.py", line 3515, in open im = _open_core(fp, filename, prefix, formats) File "PIL/Image.py", line 3503, in _open_core im = factory(fp, filename) File "PIL/TiffImagePlugin.py", line 1153, in __init__ super().__init__(fp, filename) File "PIL/ImageFile.py", line 144, in __init__ self._open() File "PIL/TiffImagePlugin.py", line 1177, in _open self._seek(0) File "PIL/TiffImagePlugin.py", line 1248, in _seek self._setup() File "PIL/TiffImagePlugin.py", line 1426, in _setup raise ValueError(msg) ``` more info in Sentry message: ![grafik](https://github.com/user-attachments/assets/a984c9ef-48e3-41f7-8e2a-13c551a47e1e) Runtime: CPython v3.11.10(3.11.10 (main, Oct 19 2024, 01:04:28) [GCC 12.2.0]) It works with Pillow 10.4.0
Could you attach a copy of the image? no, sorry :( ... I'm guessing that you mean you can't for copyright/privacy reasons, but you still have a copy of the image you can test with? You can still replicate the problem on your end? Otherwise, you couldn't have determined that this passed with Pillow 10.4.0. Are you sure that the image isn't actually invalid? Are you able to open the image using other software? Are you able to modify your copy of Pillow to print `xsize` and `ysize` so we can see exactly how they are invalid? If you're unable to upload the image, can you run `exiftool -v -v` over the image and paste the output here? Yes, it's about copyright. I can play with the image locally. It's very strange, i can't reproduce with: ```python import sys import PIL from PIL import Image print(f'{sys.version=}') print(f'{PIL.__version__=}') with open("/tmp/foobar.tiff", "rb") as fp: im = Image.open(fp) print(f'{im.size=}') ``` It works in both cases: ``` sys.version='3.12.3 (main, Sep 11 2024, 14:17:37) [GCC 13.2.0]' PIL.__version__='10.4.0' im.size=(4000, 4000) ``` ``` sys.version='3.12.3 (main, Sep 11 2024, 14:17:37) [GCC 13.2.0]' PIL.__version__='11.0.0' im.size=(4000, 4000) ``` exiftool: ``` ExifToolVersion = 12.76 FileName = foobar.tiff Directory = /tmp FileSize = 9666494 FileModifyDate = 1730711096 FileAccessDate = 1730711097 FileInodeChangeDate = 1730711096 FilePermissions = 33204 FileType = TIFF FileTypeExtension = TIF MIMEType = image/tiff ExifByteOrder = II + [IFD0 directory with 22 entries] | 0) ImageWidth = 4000 | - Tag 0x0100 (2 bytes, int16u[1]) | 1) ImageHeight = 4000 | - Tag 0x0101 (2 bytes, int16u[1]) | 2) BitsPerSample = 8 8 8 | - Tag 0x0102 (6 bytes, int16u[3]) | 3) Compression = 8 | - Tag 0x0103 (2 bytes, int16u[1]) | 4) PhotometricInterpretation = 2 | - Tag 0x0106 (2 bytes, int16u[1]) | 5) StripOffsets = 8 1460 2912 4488 5986 7407 8887 10362 11801 13256 14743 16231 17[snip] | - Tag 0x0111 (16000 bytes, int32u[4000]) | 6) Orientation = 1 | - Tag 0x0112 (2 bytes, int16u[1]) | 7) SamplesPerPixel = 3 | - Tag 0x0115 (2 bytes, int16u[1]) | 8) RowsPerStrip = 1 | - Tag 0x0116 (2 bytes, int16u[1]) | 9) StripByteCounts = 1452 1452 1576 1498 1421 1480 1475 1439 1455 1487 1488 1402 1[snip] | - Tag 0x0117 (16000 bytes, int32u[4000]) | 10) XResolution = 300 (300/1) | - Tag 0x011a (8 bytes, rational64u[1]) | 11) YResolution = 300 (300/1) | - Tag 0x011b (8 bytes, rational64u[1]) | 12) PlanarConfiguration = 1 | - Tag 0x011c (2 bytes, int16u[1]) | 13) ResolutionUnit = 2 | - Tag 0x0128 (2 bytes, int16u[1]) | 14) Software = Adobe Photoshop Elements 6.0 Windows | - Tag 0x0131 (37 bytes, string[37]) | 15) ModifyDate = 2021:11:12 10:46:02 | - Tag 0x0132 (20 bytes, string[20]) | 16) Predictor = 2 | - Tag 0x013d (2 bytes, int16u[1]) | 17) ApplicationNotes (SubDirectory) --> | - Tag 0x02bc (3670 bytes, undef[3670]) | + [XMP directory, 3670 bytes] | | XMPToolkit = XMP Core 5.5.0 | | Format = image/tiff | | - Tag 'x:xmpmeta/rdf:RDF/rdf:Description/dc:format' | | ColorMode = 3 | | - Tag 'x:xmpmeta/rdf:RDF/rdf:Description/photoshop:ColorMode' | | History = | | - Tag 'x:xmpmeta/rdf:RDF/rdf:Description/photoshop:History' | | ICCProfileName = sRGB IEC61966-2.1 | | - Tag 'x:xmpmeta/rdf:RDF/rdf:Description/photoshop:ICCProfile' | | CreateDate = 2011-03-30T14:11:25+02:00 | | - Tag 'x:xmpmeta/rdf:RDF/rdf:Description/xmp:CreateDate' | | CreatorTool = Adobe Photoshop Elements 6.0 Windows | | - Tag 'x:xmpmeta/rdf:RDF/rdf:Description/xmp:CreatorTool' | | MetadataDate = 2021-11-12T10:46:02+01:00 | | - Tag 'x:xmpmeta/rdf:RDF/rdf:Description/xmp:MetadataDate' | | ModifyDate = 2021-11-12T10:46:02+01:00 | | - Tag 'x:xmpmeta/rdf:RDF/rdf:Description/xmp:ModifyDate' | | DocumentID = xmp.did:C9172B3515206811994CDBA4105FCF75 | | - Tag 'x:xmpmeta/rdf:RDF/rdf:Description/xmpMM:DocumentID' | | InstanceID = uuid:8511B8538A5BE011A5A9C61357626A13 | | - Tag 'x:xmpmeta/rdf:RDF/rdf:Description/xmpMM:InstanceID' | | OriginalDocumentID = xmp.did:C9172B3515206811994CDBA4105FCF75 | | - Tag 'x:xmpmeta/rdf:RDF/rdf:Description/xmpMM:OriginalDocumentID' | | HistoryAction = created | | - Tag 'x:xmpmeta/rdf:RDF/rdf:Description/xmpMM:History/rdf:Seq/rdf:li 10/xmpMM:action' | | HistoryInstanceID = xmp.iid:C9172B3515206811994CDBA4105FCF75 | | - Tag 'x:xmpmeta/rdf:RDF/rdf:Description/xmpMM:History/rdf:Seq/rdf:li 10/xmpMM:instanceID' | | HistorySoftwareAgent = Adobe Photoshop CS4 Macintosh | | - Tag 'x:xmpmeta/rdf:RDF/rdf:Description/xmpMM:History/rdf:Seq/rdf:li 10/xmpMM:softwareAgent' | | HistoryWhen = 2011-03-30T14:11:25+02:00 | | - Tag 'x:xmpmeta/rdf:RDF/rdf:Description/xmpMM:History/rdf:Seq/rdf:li 10/xmpMM:when' | | HistoryAction = produced | | - Tag 'x:xmpmeta/rdf:RDF/rdf:Description/xmpMM:History/rdf:Seq/rdf:li 11/xmpMM:action' | | HistorySoftwareAgent = Affinity Photo 1.10.1 | | - Tag 'x:xmpmeta/rdf:RDF/rdf:Description/xmpMM:History/rdf:Seq/rdf:li 11/xmpMM:softwareAgent' | | HistoryWhen = 2021-11-08T14:43:02+01:00 | | - Tag 'x:xmpmeta/rdf:RDF/rdf:Description/xmpMM:History/rdf:Seq/rdf:li 11/xmpMM:when' | | HistoryAction = produced | | - Tag 'x:xmpmeta/rdf:RDF/rdf:Description/xmpMM:History/rdf:Seq/rdf:li 12/stEvt:action' | | HistorySoftwareAgent = Affinity Photo 1.10.1 | | - Tag 'x:xmpmeta/rdf:RDF/rdf:Description/xmpMM:History/rdf:Seq/rdf:li 12/stEvt:softwareAgent' | | HistoryWhen = 2021-11-12T10:46:02+01:00 | | - Tag 'x:xmpmeta/rdf:RDF/rdf:Description/xmpMM:History/rdf:Seq/rdf:li 12/stEvt:when' | 18) PhotoshopSettings (SubDirectory) --> | - Tag 0x8649 (28 bytes, undef[28]) | + [Photoshop directory, 28 bytes] | | IPTCDigest = .............B~ | | - Tag 0x0425 (16 bytes) | 19) ExifOffset (SubDirectory) --> | - Tag 0x8769 (4 bytes, int32u[1]) | + [ExifIFD directory with 3 entries] | | 0) ColorSpace = 1 | | - Tag 0xa001 (2 bytes, int16u[1]) | | 1) ExifImageWidth = 4000 | | - Tag 0xa002 (2 bytes, int16u[1]) | | 2) ExifImageHeight = 4000 | | - Tag 0xa003 (2 bytes, int16u[1]) | 20) ICC_Profile (SubDirectory) --> | - Tag 0x8773 (596 bytes, undef[596]) | + [ICC_Profile directory with 11 entries, 596 bytes] | | ProfileHeader (SubDirectory) --> | | + [BinaryData directory, 128 bytes] | | | ProfileCMMType = lcms | | | - Tag 0x0004 (4 bytes, string[4]) | | | ProfileVersion = 1072 | | | - Tag 0x0008 (2 bytes, int16s[1]) | | | ProfileClass = mntr | | | - Tag 0x000c (4 bytes, string[4]) | | | ColorSpaceData = RGB | | | - Tag 0x0010 (4 bytes, string[4]) | | | ProfileConnectionSpace = XYZ | | | - Tag 0x0014 (4 bytes, string[4]) | | | ProfileDateTime = 2021 11 12 9 44 25 | | | - Tag 0x0018 (12 bytes, int16u[6]) | | | ProfileFileSignature = acsp | | | - Tag 0x0024 (4 bytes, string[4]) | | | PrimaryPlatform = MSFT | | | - Tag 0x0028 (4 bytes, string[4]) | | | CMMFlags = 0 | | | - Tag 0x002c (4 bytes, int32u[1]) | | | DeviceManufacturer = | | | - Tag 0x0030 (4 bytes, string[4]) | | | DeviceModel = | | | - Tag 0x0034 (4 bytes, string[4]) | | | DeviceAttributes = 0 0 | | | - Tag 0x0038 (8 bytes, int32u[2]) | | | RenderingIntent = 0 | | | - Tag 0x0040 (4 bytes, int32u[1]) | | | ConnectionSpaceIlluminant = 0.9642 1 0.82491 | | | - Tag 0x0044 (12 bytes, fixed32s[3]) | | | ProfileCreator = lcms | | | - Tag 0x0050 (4 bytes, string[4]) | | | ProfileID = 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 | | | - Tag 0x0054 (16 bytes, int8u[16]) | | 0) ProfileDescription = sRGB IEC61966-2.1 | | - Tag 'desc' (34 bytes, type 'mluc') | | 1) ProfileCopyright = No copyright, use freely | | - Tag 'cprt' (48 bytes, type 'mluc') | | 2) MediaWhitePoint = 0.9642 1 0.82491 | | - Tag 'wtpt' (20 bytes, type 'XYZ ') | | 3) ChromaticAdaptation = 1.04788 0.02292 -0.05022 0.02959 0.99048 -0.01707 -0.00[snip] | | - Tag 'chad' (44 bytes, type 'sf32') | | 4) RedMatrixColumn = 0.43604 0.22249 0.01392 | | - Tag 'rXYZ' (20 bytes, type 'XYZ ') | | 5) BlueMatrixColumn = 0.14305 0.06061 0.71391 | | - Tag 'bXYZ' (20 bytes, type 'XYZ ') | | 6) GreenMatrixColumn = 0.38512 0.7169 0.09706 | | - Tag 'gXYZ' (20 bytes, type 'XYZ ') | | 7) RedTRC = para..ff...Y...[ | | - Tag 'rTRC' (32 bytes, type 'para') | | 8) GreenTRC = para..ff...Y...[ | | - Tag 'gTRC' (32 bytes, type 'para') | | 9) BlueTRC = para..ff...Y...[ | | - Tag 'bTRC' (32 bytes, type 'para') | | 10) Chromaticity (SubDirectory) --> | | - Tag 'chrm' (36 bytes, type 'chrm') | | + [BinaryData directory, 36 bytes] | | | ChromaticityChannels = 3 | | | - Tag 0x0008 (2 bytes, int16u[1]) | | | ChromaticityColorant = 0 | | | - Tag 0x000a (2 bytes, int16u[1]) | | | ChromaticityChannel1 = 0.64 0.33 | | | - Tag 0x000c (8 bytes, fixed32u[2]) | | | ChromaticityChannel2 = 0.3 0.60001 | | | - Tag 0x0014 (8 bytes, fixed32u[2]) | | | ChromaticityChannel3 = 0.14999 0.06 | | | - Tag 0x001c (8 bytes, fixed32u[2]) | 21) Exif_0xc7e0 = 0 255 75 83 2 0 112 79 120 69 1 0 9 0 0 0 49 115 116 112 79 1 0 0[snip] | - Tag 0xc7e0 (110 bytes, int8u[110]) ``` But this runs on a different machine... I also tried with Python 3.11: ``` sys.version='3.11.10 (main, Oct 16 2024, 04:23:21) [Clang 18.1.8 ]' PIL.__version__='11.0.0' im.size=(4000, 4000) ``` Strange. Any idea? If you're asking how Django could have manipulated the image before passing it to Pillow, then that sounds like a Django question more than a Pillow question. If you're asking how to debug this further, 1. I would suggest modifying either Django or Pillow locally to write the image data to disk at the exact point that it is passed to Pillow. 2. If that then gives you an image that causes a problem without Django, then I suggest checking if that image opens in other software. If it doesn't, then it sounds like the image is corrupt, and not necessarily something we need to be opening successfully. 3. If it does, then I suggest modifying Pillow to print `xsize` and `ysize` just before the `ValueError` is raised. I can not say what's happening here... But i can say that's the combination between Django v4.2.16 and pillow '10.4.0' vs. '11.0.0' ```pytb >>> import django >>> django.__version__ '4.2.16' >>> Image.open((x.thumbnail.open('rb'))).width 4000 >>> import PIL >>> PIL.__version__ '11.0.0' >>> x.thumbnail.width /root/.local/share/virtualenvs/foobar/lib/python3.11/site-packages/PIL/TiffImagePlugin.py:935: UserWarning: Corrupt EXIF data. Expecting to read 2 bytes but only got 0. warnings.warn(str(msg)) Traceback (most recent call last): File "<console>", line 1, in <module> File "/root/.local/share/virtualenvs/foobar/lib/python3.11/site-packages/django/core/files/images.py", line 20, in width return self._get_image_dimensions()[0] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/root/.local/share/virtualenvs/foobar/lib/python3.11/site-packages/django/core/files/images.py", line 30, in _get_image_dimensions self._dimensions_cache = get_image_dimensions(self, close=close) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/root/.local/share/virtualenvs/foobar/lib/python3.11/site-packages/django/core/files/images.py", line 63, in get_image_dimensions p.feed(data) File "/root/.local/share/virtualenvs/foobar/lib/python3.11/site-packages/PIL/ImageFile.py", line 471, in feed im = Image.open(fp) ^^^^^^^^^^^^^^ File "/root/.local/share/virtualenvs/foobar/lib/python3.11/site-packages/PIL/Image.py", line 3515, in open im = _open_core(fp, filename, prefix, formats) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/root/.local/share/virtualenvs/foobar/lib/python3.11/site-packages/PIL/Image.py", line 3503, in _open_core im = factory(fp, filename) ^^^^^^^^^^^^^^^^^^^^^ File "/root/.local/share/virtualenvs/foobar/lib/python3.11/site-packages/PIL/TiffImagePlugin.py", line 1153, in __init__ super().__init__(fp, filename) File "/root/.local/share/virtualenvs/foobar/lib/python3.11/site-packages/PIL/ImageFile.py", line 144, in __init__ self._open() File "/root/.local/share/virtualenvs/foobar/lib/python3.11/site-packages/PIL/TiffImagePlugin.py", line 1177, in _open self._seek(0) File "/root/.local/share/virtualenvs/foobar/lib/python3.11/site-packages/PIL/TiffImagePlugin.py", line 1248, in _seek self._setup() File "/root/.local/share/virtualenvs/foobar/lib/python3.11/site-packages/PIL/TiffImagePlugin.py", line 1426, in _setup raise ValueError(msg) ValueError: Invalid dimensions >>> ``` Think it's related to the way how Django tries to get the image size: https://github.com/django/django/blob/968397228fe03968bb855856532569586c8a8a1c/django/core/files/images.py#L35-L89 Yes, it's the combination of how Django tries to get the image size via `django.core.files.images.get_image_dimensions()` here: https://github.com/django/django/blob/968397228fe03968bb855856532569586c8a8a1c/django/core/files/images.py#L35-L89 and this change: https://github.com/python-pillow/Pillow/commit/e6e5ef5c5fbd83ac5dd63301e4d7d6860a7b2d09#diff-6ad43f85f1a075181d4d8cfcd97ae27bba1eccf5c3db5a3457160f98218eba6eR1404 that added the `raise ValueError`: ```python xsize = self.tag_v2.get(IMAGEWIDTH) ysize = self.tag_v2.get(IMAGELENGTH) if not isinstance(xsize, int) or not isinstance(ysize, int): msg = "Invalid dimensions" raise ValueError(msg) ``` I created https://code.djangoproject.com/ticket/35884 and https://github.com/django/django/pull/18764 Hello :wave: Django Fellow here In Django we are using Pillow as documented to parse an image: https://pillow.readthedocs.io/en/stable/reference/ImageFile.html#example-parse-an-image Using this this file [python-logo.tiff](https://github.com/matthiask/django-imagefield/blob/main/tests/testapp/media/python-logo.tiff) and following the example ```python from PIL import ImageFile fp = open("python-logo.tiff", "rb") p = ImageFile.Parser() while 1: s = fp.read(1024) if not s: break p.feed(s) im = p.close() im.save("copy.tiff") ``` This raises the `ValueError: Invalid dimensions` error on Pillow 11 ``` Traceback (most recent call last): File "/project-path/./main.py", line 11, in <module> p.feed(s) File "/project-path/.venv/lib/python3.10/site-packages/PIL/ImageFile.py", line 471, in feed im = Image.open(fp) File "/project-path/.venv/lib/python3.10/site-packages/PIL/Image.py", line 3520, in open im = _open_core( File "/project-path/.venv/lib/python3.10/site-packages/PIL/Image.py", line 3503, in _open_core im = factory(fp, filename) File "/project-path/.venv/lib/python3.10/site-packages/PIL/TiffImagePlugin.py", line 1153, in __init__ super().__init__(fp, filename) File "/project-path/.venv/lib/python3.10/site-packages/PIL/ImageFile.py", line 144, in __init__ self._open() File "/project-path/.venv/lib/python3.10/site-packages/PIL/TiffImagePlugin.py", line 1177, in _open self._seek(0) File "/project-path/.venv/lib/python3.10/site-packages/PIL/TiffImagePlugin.py", line 1248, in _seek self._setup() File "/project-path/.venv/lib/python3.10/site-packages/PIL/TiffImagePlugin.py", line 1426, in _setup raise ValueError(msg) ValueError: Invalid dimensions ``` No error is raised on Pillow 10.4.0 We can add new error handling in Django but before doing so, I would like to confirm that this is not an issue in Pillow 11 and that the documented example is missing error handling also
2024-11-05T09:29:52Z
11
python-pillow/Pillow
8,602
python-pillow__Pillow-8602
[ "8594" ]
6e45e710524293c5c7929899355cc7ec84600b87
diff --git a/src/PIL/BmpImagePlugin.py b/src/PIL/BmpImagePlugin.py --- a/src/PIL/BmpImagePlugin.py +++ b/src/PIL/BmpImagePlugin.py @@ -48,6 +48,8 @@ 32: ("RGB", "BGRX"), } +USE_RAW_ALPHA = False + def _accept(prefix: bytes) -> bool: return prefix[:2] == b"BM" @@ -242,7 +244,9 @@ def _bitmap(self, header: int = 0, offset: int = 0) -> None: msg = "Unsupported BMP bitfields layout" raise OSError(msg) elif file_info["compression"] == self.COMPRESSIONS["RAW"]: - if file_info["bits"] == 32 and header == 22: # 32-bit .cur offset + if file_info["bits"] == 32 and ( + header == 22 or USE_RAW_ALPHA # 32-bit .cur offset + ): raw_mode, self._mode = "BGRA", "RGBA" elif file_info["compression"] in ( self.COMPRESSIONS["RLE8"],
diff --git a/Tests/test_file_bmp.py b/Tests/test_file_bmp.py --- a/Tests/test_file_bmp.py +++ b/Tests/test_file_bmp.py @@ -230,3 +230,13 @@ def test_offset() -> None: # to exclude the palette size from the pixel data offset with Image.open("Tests/images/pal8_offset.bmp") as im: assert_image_equal_tofile(im, "Tests/images/bmp/g/pal8.bmp") + + +def test_use_raw_alpha(monkeypatch: pytest.MonkeyPatch) -> None: + with Image.open("Tests/images/bmp/g/rgb32.bmp") as im: + assert im.info["compression"] == BmpImagePlugin.BmpImageFile.COMPRESSIONS["RAW"] + assert im.mode == "RGB" + + monkeypatch.setattr(BmpImagePlugin, "USE_RAW_ALPHA", True) + with Image.open("Tests/images/bmp/g/rgb32.bmp") as im: + assert im.mode == "RGBA"
BmpImagePlugin - Unsupported 32bpp DIBs with Alpha ### What did you do? Attempted to read the attached 32bpp DIB with `Image.open()` (I've plopped it in a ZIP because GitHub doesn't like me just chucking the DIB itself in here) [sampledib.zip](https://github.com/user-attachments/files/18119317/sampledib.zip) ### What did you expect to happen? The image reads as `RGBA` ### What actually happened? The image reads as `RGB` ### What are your OS, Python and Pillow versions? Locally built Pillow from https://github.com/python-pillow/Pillow/commit/d66c51a35663247357bf6b625ef093df7ea12a45 * OS: Debian 12 * Python: Pillow 11.1.0.dev0 * Pillow: Python 3.11.2 (main, Sep 14 2024, 03:00:30) [GCC 12.2.0] ```text -------------------------------------------------------------------- Pillow 11.1.0.dev0 Python 3.11.2 (main, Sep 14 2024, 03:00:30) [GCC 12.2.0] -------------------------------------------------------------------- Python executable is /home/rory/source/repos/xfce-winxp-tc/tools/theme/.venv/bin/python3 Environment Python files loaded from /home/rory/source/repos/xfce-winxp-tc/tools/theme/.venv System Python files loaded from /usr -------------------------------------------------------------------- Python Pillow modules loaded from /home/rory/source/repos/xfce-winxp-tc/tools/theme/.venv/lib/python3.11/site-packages/PIL Binary Pillow modules loaded from /home/rory/source/repos/xfce-winxp-tc/tools/theme/.venv/lib/python3.11/site-packages/PIL -------------------------------------------------------------------- --- PIL CORE support ok, compiled for 11.1.0.dev0 --- TKINTER support ok, loaded 8.6 --- FREETYPE2 support ok, loaded 2.12.1 --- LITTLECMS2 support ok, loaded 2.14 --- WEBP support ok, loaded 1.2.4 --- JPEG support ok, compiled for libjpeg-turbo 2.1.5 --- OPENJPEG (JPEG2000) support ok, loaded 2.5.0 --- ZLIB (PNG/ZIP) support ok, loaded 1.2.13 --- LIBTIFF support ok, loaded 4.5.0 *** RAQM (Bidirectional Text) support not installed *** LIBIMAGEQUANT (Quantization method) support not installed --- XCB (X protocol) support ok -------------------------------------------------------------------- ```
Sorry to bother you all with such a niche problem. :sweat_smile: For context, the attached bitmap (DIB) comes from one of the themes in Windows XP - I am trying to look into writing a general tool for converting .MSSTYLES based themes to various Linux toolkits. I pinpointed this line of interest in `BmpImagePlugin`: https://github.com/python-pillow/Pillow/blob/main/src/PIL/BmpImagePlugin.py#L245 Removing this check for 22 byte header does resolve the issue for me, however it breaks the 32bpp bitmap test case. Unfortunately it seems like the alpha channel behaviour is undocumented, at least I cannot find anything. Both images use the 40-byte BITMAPINFOHEADER, and the only real difference is `biSizeImage` being set to 0 in the broken bitmap. Not something I think can be relied on to change how the data should be interpreted. I don't think this is something easily solvable via parsing the format alone, so I have a fork of Pillow to include `BMPA` and `DIBA` as additional formats for explicitly hinting that the alpha channel is to be read. I'll submit a corresponding PR, though my solution might be rubbish - I don't use Python all that much. :stuck_out_tongue_closed_eyes: For context, https://github.com/python-pillow/Pillow/pull/1125 is the PR that introduced that line of code. Can I ask - how do you know the image should be RGBA? Googling, I found https://jumpshare.com/viewer/bmp, and it showed no transparency when given the file. I found https://learn.microsoft.com/en-us/windows/win32/wmdm/-bitmapinfoheader, which describes 32 bitcount as > The bitmap has a maximum of 2^32 colors. If the biCompression member is BI_RGB, the bmiColors member is NULL. Each DWORD in the bitmap array represents the relative intensities of blue, green, and red, respectively, for a pixel. The high byte in each DWORD is not used. So it sounds like RGB is the intention. > Can I ask - how do you know the image should be RGBA? Googling, I found https://jumpshare.com/viewer/bmp, and it showed no transparency when given the file. Because this DIB comes directly from the resource file `luna.msstyles` - the theme engine does actually use the alpha channel (they moved to using PNGs in Windows Vista). All themes on Windows XP make use of RGBA bitmaps in the same way. Here's a comparison between the current read and what is intended: ![BLUE_RADIOBUTTON25_BMP](https://github.com/user-attachments/assets/f7ca1609-1e58-4b8e-b9f2-14729e1e3b57) ![BLUE_RADIOBUTTON25_BMP](https://github.com/user-attachments/assets/5be21cf1-2040-48ac-ab84-fa9d92d758c2) I know the documentation does not say anything about it, I'm not sure if it was ever formally documented or whether it's just modern MSDN missing stuff. From searching around there's old forum posts and pages on CodeProject (RIP) about these 32bpp bitmaps. I think potentially it is possible to create them in Photoshop, but I'm not sure if that's still the case in newer versions. The question I was trying to ask is - what program are you using to view this file that shows transparency? Should I understand your response to mean that you're not viewing them in a program, and your expectation is based on the fact that Windows loads this data and then you see the result in the OS? Not just the transparent corners, but also a transparent inside under some circumstances? You caught me just before I finished writing this update. :stuck_out_tongue: In that post I compared between `DIB` in Pillow, and `DIBA` in my branch - so it was based off the expectation of how Windows handles the data. I have just had a look out of curiosity to see if what I read about Photoshop is true, and it does appear to be the case that Photoshop (CS2 here) also recognises the alpha channel: ![image](https://github.com/user-attachments/assets/90a07221-43ba-4a12-9487-22ac9f1518a5) Hmm. I'm concerned about interpreting data that the documentation says to ignore, because that's what third-party software would follow when creating images, and it's possible that what they write to this fourth channel may not actually work as an alpha channel. So it might fix your image, but it might also break others. What do you think of this code, that will work with Pillow as-is to read your image as RGBA? ```python from PIL import Image, _binary, BmpImagePlugin filename = "BLUE_RADIOBUTTON25_BMP.bmp" im = Image.open(filename) if im.format == "DIB" and im.info["compression"] == BmpImagePlugin.BmpImageFile.COMPRESSIONS["RAW"]: bits = None with open(filename, "rb") as fp: header_size = _binary.i32le(fp.read(4)) if header_size == 40: header_data = fp.read(header_size - 4) bits = _binary.i16le(header_data, 10) if bits == 32: im._mode = "RGBA" args = list(im.tile[0].args) args[0] = "BGRA" im.tile = [im.tile[0]._replace(args=tuple(args))] im.save("out.png") ``` > Hmm. I'm concerned about interpreting data that the documentation says to ignore, because that's what third-party software would follow when creating images, and it's possible that what they write to this fourth channel may not actually work as an alpha channel. So it might fix your image, but it might also break others. This was why I opted to add the extra formats to act as 'hints', rather than trying to guess what the interpretation should be - so it cannot break existing images: https://github.com/rozniak/Pillow/commit/79683d3a79223f9c891c7a06967576bb776f0f7b > What do you think of this code, that will work with Pillow as-is to read your image as RGBA? It works perfectly. :smile: I mean it's up to you really, I suppose it might not be a very common type of bitmap for people to read so I don't mind working with this snippet in my own project. I did try to keep the change minimal and to avoid breaking any existing images according to spec, depends whether you think it's worth having or not. I suppose there is always this issue thread for future reference otherwise. :stuck_out_tongue:
2024-12-16T06:09:33Z
11
python-pillow/Pillow
8,635
python-pillow__Pillow-8635
[ "8634" ]
1a79d1025ce46b6e4ddf58e540bba8abea8fc5f6
diff --git a/src/PIL/Image.py b/src/PIL/Image.py --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -4023,6 +4023,9 @@ def tobytes(self, offset: int = 8) -> bytes: head = self._get_head() ifd = TiffImagePlugin.ImageFileDirectory_v2(ifh=head) + for tag, ifd_dict in self._ifds.items(): + if tag not in self: + ifd[tag] = ifd_dict for tag, value in self.items(): if tag in [ ExifTags.IFD.Exif,
diff --git a/Tests/test_image.py b/Tests/test_image.py --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -793,6 +793,10 @@ def test_empty_get_ifd(self) -> None: ifd[36864] = b"0220" assert exif.get_ifd(0x8769) == {36864: b"0220"} + reloaded_exif = Image.Exif() + reloaded_exif.load(exif.tobytes()) + assert reloaded_exif.get_ifd(0x8769) == {36864: b"0220"} + @mark_if_feature_version( pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing" )
Loss of Exif IFD attributes when saving new JPEG image <!-- Thank you for reporting an issue. Follow these guidelines to ensure your issue is handled properly. If you have a ... 1. General question: consider asking the question on Stack Overflow with the python-imaging-library tag: * https://stackoverflow.com/questions/tagged/python-imaging-library Do not ask a question in both places. If you think you have found a bug or have an unexplained exception then file a bug report here. 2. Bug report: include a self-contained, copy-pastable example that generates the issue if possible. Be concise with code posted. Guidelines on how to provide a good bug report: * https://stackoverflow.com/help/mcve Bug reports which follow these guidelines are easier to diagnose, and are often handled much more quickly. 3. Feature request: do a quick search of existing issues to make sure this has not been asked before. We know asking good questions takes effort, and we appreciate your time. Thank you. --> ### What did you do? create a new jpeg image with IFD0 and ExifIFD tags ### What did you expect to happen? retreive all tags ### What actually happened? i retreive only the IFD0 tags ### What are your OS, Python and Pillow versions? * OS: windows 10 * Python: 3.12.1 * Pillow: 11.0.0 ```text -------------------------------------------------------------------- Pillow 11.0.0 Python 3.12.1 (tags/v3.12.1:2305ca5, Dec 7 2023, 22:03:25) [MSC v.1937 64 bit (AMD64)] -------------------------------------------------------------------- Python executable is C:\Python\python.exe System Python files loaded from C:\Python -------------------------------------------------------------------- Python Pillow modules loaded from C:\Python\Lib\site-packages\PIL Binary Pillow modules loaded from C:\Python\Lib\site-packages\PIL -------------------------------------------------------------------- --- PIL CORE support ok, compiled for 11.0.0 --- TKINTER support ok, loaded 8.6 --- FREETYPE2 support ok, loaded 2.13.3 --- LITTLECMS2 support ok, loaded 2.16 --- WEBP support ok, loaded 1.4.0 --- JPEG support ok, compiled for libjpeg-turbo 3.0.4 --- OPENJPEG (JPEG2000) support ok, loaded 2.5.2 --- ZLIB (PNG/ZIP) support ok, loaded 1.3.1 --- LIBTIFF support ok, loaded 4.6.0 *** RAQM (Bidirectional Text) support not installed *** LIBIMAGEQUANT (Quantization method) support not installed *** XCB (X protocol) support not installed -------------------------------------------------------------------- ``` <!-- Please include **code** that reproduces the issue and whenever possible, an **image** that demonstrates the issue. Please upload images to GitHub, not to third-party file hosting sites. If necessary, add the image to a zip or tar archive. The best reproductions are self-contained scripts with minimal dependencies. If you are using a framework such as Plone, Django, or Buildout, try to replicate the issue just using Pillow. --> ```python from PIL import Image, ExifTags if __name__ == '__main__': newim = Image.new('RGB', [400,500]) exif = newim.getexif() # IFD0 exif[0x010E] = 'my description' # ImageDescription exif[0x013B] = "the artist" # Artist exif[0x0132] = "2020:02:02 00:00:00" # DateTime # ExifIFD exif.get_ifd(ExifTags.IFD.Exif)[0x9003] = "2020:02:02 00:00:01" # DateTimeOriginal exif.get_ifd(ExifTags.IFD.Exif)[0x9004] = "2020:02:02 00:00:02" # DateTimeDigitized newim.save('newimage.jpeg', exif=exif) newim.close() im = Image.open('newimage.jpeg') exf = im.getexif() print('IFD0', exf) # IFD0 {306: '2020:02:02 00:00:00', 315: 'the artist', 270: 'my description'} print('ExifIFD', exf.get_ifd(ExifTags.IFD.Exif)) # ExifIFD {} ```
I've created #8635 to fix this.
2024-12-28T20:37:59Z
11
python-pillow/Pillow
8,476
python-pillow__Pillow-8476
[ "8472" ]
11c654c187ffbede40c54e6344ddec49f495d4a7
diff --git a/src/PIL/Image.py b/src/PIL/Image.py --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -763,7 +763,7 @@ def __getstate__(self) -> list[Any]: def __setstate__(self, state: list[Any]) -> None: Image.__init__(self) - info, mode, size, palette, data = state + info, mode, size, palette, data = state[:5] self.info = info self._mode = mode self._size = size diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -395,6 +395,13 @@ def __getattr__(self, name: str) -> Any: return getattr(self, "_" + name) raise AttributeError(name) + def __getstate__(self) -> list[Any]: + return super().__getstate__() + [self.layers, self.layer] + + def __setstate__(self, state: list[Any]) -> None: + super().__setstate__(state) + self.layers, self.layer = state[5:] + def load_read(self, read_bytes: int) -> bytes: """ internal: read more image data
diff --git a/Tests/test_pickle.py b/Tests/test_pickle.py --- a/Tests/test_pickle.py +++ b/Tests/test_pickle.py @@ -74,6 +74,17 @@ def test_pickle_image( helper_pickle_file(tmp_path, protocol, test_file, test_mode) +def test_pickle_jpeg() -> None: + # Arrange + with Image.open("Tests/images/hopper.jpg") as image: + # Act: roundtrip + unpickled_image = pickle.loads(pickle.dumps(image)) + + # Assert + assert len(unpickled_image.layer) == 3 + assert unpickled_image.layers == 3 + + def test_pickle_la_mode_with_palette(tmp_path: Path) -> None: # Arrange filename = str(tmp_path / "temp.pkl")
Change in behavior with JPEG Images in 11.0.0 The following code that worked in Pillow 10.4 no longer works with Pillow 11.0. ```python import pickle from io import BytesIO from PIL import Image im = Image.open("books.jpg") p = pickle.dumps(im) im = pickle.loads(p) # Fails in 11.0, works in 10.4 output = BytesIO() im.save(output, format=im.format, quality="keep") ``` Error stack. ```pytb Traceback (most recent call last): File "test.py", line 15, in <module> im.save(output, format=im.format, quality="keep") File "python3.9/site-packages/PIL/Image.py", line 2605, in save save_handler(self, fp, filename) File "python3.9/site-packages/PIL/JpegImagePlugin.py", line 700, in _save subsampling = get_sampling(im) File "python3.9/site-packages/PIL/JpegImagePlugin.py", line 643, in get_sampling if not isinstance(im, JpegImageFile) or im.layers in (1, 4): File "python3.9/site-packages/PIL/JpegImagePlugin.py", line 396, in __getattr__ raise AttributeError(name) AttributeError: layers ``` This has been traced to the following change in src/PIL/JpegImagePlugin.py # Pillow 10.4.0 [Code](https://github.com/python-pillow/Pillow/blob/10.4.0/src/PIL/JpegImagePlugin.py#L627) ```python def get_sampling(im): ... if not hasattr(im, "layers") or im.layers in (1, 4): return -1 ... ``` # Pillow 11.0.0 [Code](https://github.com/python-pillow/Pillow/blob/11.0.0/src/PIL/JpegImagePlugin.py#L643) ```python def get_sampling(im: Image.Image) -> int: ... if not isinstance(im, JpegImageFile) or im.layers in (1, 4): return -1 ... ``` # Suggested fix ```python def get_sampling(im: Image.Image) -> int: ... if not isinstance(im, JpegImageFile) or not hasattr(im, "layers") or im.layers in (1, 4): return -1 ... ``` Note that the following hack does workaround the issue in 11.0. ```python im.layers = 1 im.save(output, format=im.format, quality="keep") ```
Is this a bug or feature? It looks like Pillow got more strict in verifying that `im` was a `JpegImageFile` ? That is a good question. Serializing an image and reloading it changes how it looks. I wasn't sure if this check for the `layers` attribute was at one point intentional for this use case or just coincidental. Is there a reason you want to pickle the `ImageFile` instead of just opening the image again? The serialization is happening in a different part of the code. This example is for simplicity in reproducing.
2024-10-17T01:46:23Z
11
python-pillow/Pillow
8,422
python-pillow__Pillow-8422
[ "8333" ]
7e6e08ea6aa8e05aa20425a6d9c07d4146241909
diff --git a/src/PIL/Image.py b/src/PIL/Image.py --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -2278,8 +2278,8 @@ def resize( :py:data:`Resampling.BILINEAR`, :py:data:`Resampling.HAMMING`, :py:data:`Resampling.BICUBIC` or :py:data:`Resampling.LANCZOS`. If the image has mode "1" or "P", it is always set to - :py:data:`Resampling.NEAREST`. If the image mode specifies a number - of bits, such as "I;16", then the default filter is + :py:data:`Resampling.NEAREST`. If the image mode is "BGR;15", + "BGR;16" or "BGR;24", then the default filter is :py:data:`Resampling.NEAREST`. Otherwise, the default filter is :py:data:`Resampling.BICUBIC`. See: :ref:`concept-filters`. :param box: An optional 4-tuple of floats providing @@ -2302,8 +2302,8 @@ def resize( """ if resample is None: - type_special = ";" in self.mode - resample = Resampling.NEAREST if type_special else Resampling.BICUBIC + bgr = self.mode.startswith("BGR;") + resample = Resampling.NEAREST if bgr else Resampling.BICUBIC elif resample not in ( Resampling.NEAREST, Resampling.BILINEAR,
diff --git a/Tests/test_image_resize.py b/Tests/test_image_resize.py --- a/Tests/test_image_resize.py +++ b/Tests/test_image_resize.py @@ -44,9 +44,19 @@ def test_convolution_modes(self) -> None: self.resize(hopper("1"), (15, 12), Image.Resampling.BILINEAR) with pytest.raises(ValueError): self.resize(hopper("P"), (15, 12), Image.Resampling.BILINEAR) - with pytest.raises(ValueError): - self.resize(hopper("I;16"), (15, 12), Image.Resampling.BILINEAR) - for mode in ["L", "I", "F", "RGB", "RGBA", "CMYK", "YCbCr"]: + for mode in [ + "L", + "I", + "I;16", + "I;16L", + "I;16B", + "I;16N", + "F", + "RGB", + "RGBA", + "CMYK", + "YCbCr", + ]: im = hopper(mode) r = self.resize(im, (15, 12), Image.Resampling.BILINEAR) assert r.mode == mode @@ -305,14 +315,14 @@ def test_transposed(self) -> None: im = im.resize((64, 64)) assert im.size == (64, 64) - @pytest.mark.parametrize("mode", ("L", "RGB", "I", "F")) + @pytest.mark.parametrize( + "mode", ("L", "RGB", "I", "I;16", "I;16L", "I;16B", "I;16N", "F") + ) def test_default_filter_bicubic(self, mode: str) -> None: im = hopper(mode) assert im.resize((20, 20), Image.Resampling.BICUBIC) == im.resize((20, 20)) - @pytest.mark.parametrize( - "mode", ("1", "P", "I;16", "I;16L", "I;16B", "BGR;15", "BGR;16") - ) + @pytest.mark.parametrize("mode", ("1", "P", "BGR;15", "BGR;16")) def test_default_filter_nearest(self, mode: str) -> None: im = hopper(mode) assert im.resize((20, 20), Image.Resampling.NEAREST) == im.resize((20, 20))
Resize not allowing filter parameter on 16 bit image When attempting to resize a 16 bit image as shown below, a value error appears and crashes the program: "ValueError: image has wrong mode" The image type is "I;16" The primary problem is that this worked without error in early July and hasn't been touched in a month. When I opened the code today it gave the error even when reverting to a previously stable version. Below is the relevant code inside a custom cropping method. The coord_tup variable is just a tuple that is working as expected ```python new_im = im.crop(coord_tup) newSize = (640, 480) new_im = new_im.resize(newSize, resample=Image.Resampling.LANCZOS) npImg = np.asarray(new_im) return npImg ``` As stated this code used to work fine but when opened this week I get a value error on the line with the resize method, though it will technically work if I change the following ```python new_im = new_im.resize(newSize, resample=Image.Resampling.LANCZOS) ``` -> ```python new_im = new_im.resize(newSize) ``` I understand through the API documentation that this should default to NEAREST but I could not find anything stating that LANCZOS would not work with 16 bit imaging * OS: macOS Sonoma 14.6.1 (23G93 * Python: 3.12.3 * Pillow: 10.4.0
Just to provide a self-contained code example, I agree that ```python from PIL import Image im = Image.new("I;16", (1, 1)) new_im = im.resize((640, 480), resample=Image.Resampling.LANCZOS) ``` is hitting https://github.com/python-pillow/Pillow/blob/56e3147403d1785141b25f1d822a93e86c1deb98/src/libImaging/Resample.c#L567-L577 > The primary problem is that this worked without error in early July Considering our last release was on July 1, this doesn't make much sense to me. I tested with 10.3.0, the release before that, and the same error occurs. This was reported downstream as https://github.com/wagtail/Willow/issues/154 I tested a few Pillow versions and can report this started happening with Pillow 10.3.0. Pillow 10.2.0 is not affected and resizes without error. Digging further, it appears that in Pillow 10.2.0 the sample image from https://github.com/wagtail/Willow/issues/154 has `mode='I'`. In 10.3.0 and later, it is opened as `I;16` Looking at the changelog, https://github.com/python-pillow/Pillow/pull/7849 appears to be responsible for that change. Is this considered a bug / regression? Or should we as end-users do something as a workaround? (use a different resample filter for example) This is still an open issue, so it is something to be worked on. The original post here doesn't mention PNGs, so you might be talking about a slightly different scenario. If your problem is #7849, then the simplest workaround would be to convert the image to I mode after opening - `im = im.convert("I")`. Thanks for the response! I realize the original post doesn't mention PNGs, but assuming the original posters' code used to work before I'd say it is likely a similar scenario. Given `I;16` mode support is limited according to the [documentation](https://pillow.readthedocs.io/en/latest/handbook/concepts.html), would you suggest always converting to `I` mode before performing image manipulation operations or is support going to be improved in the near future? Trying to gauge what the Willow maintainers should do here - perform the conversion workaround or wait for a new Pillow release.
2024-09-28T04:41:59Z
10.4
python-pillow/Pillow
8,231
python-pillow__Pillow-8231
[ "8226" ]
6a9acfa5ca2b3ba462b086e4af776993bbd94a72
diff --git a/src/PIL/PpmImagePlugin.py b/src/PIL/PpmImagePlugin.py --- a/src/PIL/PpmImagePlugin.py +++ b/src/PIL/PpmImagePlugin.py @@ -333,7 +333,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: rawmode, head = "1;I", b"P4" elif im.mode == "L": rawmode, head = "L", b"P5" - elif im.mode == "I": + elif im.mode in ("I", "I;16"): rawmode, head = "I;16B", b"P5" elif im.mode in ("RGB", "RGBA"): rawmode, head = "RGB", b"P6"
diff --git a/Tests/test_file_ppm.py b/Tests/test_file_ppm.py --- a/Tests/test_file_ppm.py +++ b/Tests/test_file_ppm.py @@ -95,7 +95,9 @@ def test_16bit_pgm_write(tmp_path: Path) -> None: with Image.open("Tests/images/16_bit_binary.pgm") as im: filename = str(tmp_path / "temp.pgm") im.save(filename, "PPM") + assert_image_equal_tofile(im, filename) + im.convert("I;16").save(filename, "PPM") assert_image_equal_tofile(im, filename)
Save 16-bit PGM Image? I am attempting to convert an image in PNG format to a 16-bit PGM format and save it using Python's [PIL](https://python-pillow.org/) library. I'm using Python 3.12.4 in all examples shown. --- Using the following `test.png` image: ![test](https://github.com/python-pillow/Pillow/assets/95188575/96526c49-5b98-4c49-a7c3-f32135da8405) Attempting a simple script like this with the [Image.save()](https://pillow.readthedocs.io/en/stable/reference/Image.html#PIL.Image.Image.save) function: ```python from PIL import Image image = Image.open("test.png") image.save("test.pgm") ``` Can save resave the image as PGM, however it's always saved as an 8-bit image, as shown by GIMP: ![gimp](https://github.com/python-pillow/Pillow/assets/95188575/6b09a48b-3dfc-4598-8a52-5f876081d892) --- Attempting to specify the amount of pixel bits via the optional `bits` argument as such: ```python from PIL import Image image = Image.open("test.png") image.save("test.pgm", bits = 16) ``` Also results in an 8-bit PGM image being saved. --- Attempting to manually create a numpy array of the `np.uint16` type & then creating an image from it using the [Image.fromarray()](https://pillow.readthedocs.io/en/stable/reference/Image.html#PIL.Image.fromarray) function as such: ```python from PIL import Image import numpy as np image = Image.open("test.png") imageData = np.array(image.getdata(), dtype = np.uint16) newImage = Image.fromarray(imageData) newImage.save("test.pgm", bits = 16) ``` Results in: ``` OSError: cannot write mode I;16 as PPM ``` I also noticed that this appears to break the image, as saving with `np.uint32` saves a blank image with a very narrow horizontal size and a very large vertical size. --- What is the proper way to save 16-bit PGM images using the Python `PIL` library? Thanks for reading my post, any guidance is appreciated.
2024-07-13T03:08:19Z
10.4
python-pillow/Pillow
8,366
python-pillow__Pillow-8366
[ "8222" ]
22c333289e3009f8dd5f345e3328220daf11d929
diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py --- a/src/PIL/GifImagePlugin.py +++ b/src/PIL/GifImagePlugin.py @@ -553,7 +553,9 @@ def _normalize_palette( if im.mode == "P": if not source_palette: - source_palette = im.im.getpalette("RGB")[:768] + im_palette = im.getpalette(None) + assert im_palette is not None + source_palette = bytearray(im_palette) else: # L-mode if not source_palette: source_palette = bytearray(i // 3 for i in range(768)) @@ -629,7 +631,10 @@ def _write_single_frame( def _getbbox( base_im: Image.Image, im_frame: Image.Image ) -> tuple[Image.Image, tuple[int, int, int, int] | None]: - if _get_palette_bytes(im_frame) != _get_palette_bytes(base_im): + palette_bytes = [ + bytes(im.palette.palette) if im.palette else b"" for im in (base_im, im_frame) + ] + if palette_bytes[0] != palette_bytes[1]: im_frame = im_frame.convert("RGBA") base_im = base_im.convert("RGBA") delta = ImageChops.subtract_modulo(im_frame, base_im) @@ -984,7 +989,13 @@ def _get_palette_bytes(im: Image.Image) -> bytes: :param im: Image object :returns: Bytes, len<=768 suitable for inclusion in gif header """ - return bytes(im.palette.palette) if im.palette else b"" + if not im.palette: + return b"" + + palette = bytes(im.palette.palette) + if im.palette.mode == "RGBA": + palette = b"".join(palette[i * 4 : i * 4 + 3] for i in range(len(palette) // 3)) + return palette def _get_background( diff --git a/src/PIL/Image.py b/src/PIL/Image.py --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -1066,7 +1066,7 @@ def convert_transparency( trns_im = new(self.mode, (1, 1)) if self.mode == "P": assert self.palette is not None - trns_im.putpalette(self.palette) + trns_im.putpalette(self.palette, self.palette.mode) if isinstance(t, tuple): err = "Couldn't allocate a palette color for transparency" assert trns_im.palette is not None @@ -2182,6 +2182,9 @@ def remap_palette( source_palette = self.im.getpalette(palette_mode, palette_mode) else: # L-mode source_palette = bytearray(i // 3 for i in range(768)) + elif len(source_palette) > 768: + bands = 4 + palette_mode = "RGBA" palette_bytes = b"" new_positions = [0] * 256
diff --git a/Tests/test_file_gif.py b/Tests/test_file_gif.py --- a/Tests/test_file_gif.py +++ b/Tests/test_file_gif.py @@ -1429,3 +1429,21 @@ def test_saving_rgba(tmp_path: Path) -> None: with Image.open(out) as reloaded: reloaded_rgba = reloaded.convert("RGBA") assert reloaded_rgba.load()[0, 0][3] == 0 + + +def test_optimizing_p_rgba(tmp_path: Path) -> None: + out = str(tmp_path / "temp.gif") + + im1 = Image.new("P", (100, 100)) + d = ImageDraw.Draw(im1) + d.ellipse([(40, 40), (60, 60)], fill=1) + data = [0, 0, 0, 0, 0, 0, 0, 255] + [0, 0, 0, 0] * 254 + im1.putpalette(data, "RGBA") + + im2 = Image.new("P", (100, 100)) + im2.putpalette(data, "RGBA") + + im1.save(out, save_all=True, append_images=[im2]) + + with Image.open(out) as reloaded: + assert reloaded.n_frames == 2
GIF optimizer acts wrongly with black pixels when `disposal=2` ### What did you do? - Create a GIF with these two identically sized (250x217) frames: `green.png` and `red.png` ![green](https://github.com/python-pillow/Pillow/assets/2065805/b1cccecf-e003-47d9-adf4-3cd03d8fc1db) ![red](https://github.com/python-pillow/Pillow/assets/2065805/d1dd583d-d60c-4c52-854c-4a30691fd830) ```python from PIL import Image green = Image.open("green.png") red = Image.open("red.png") green.save("opt.gif", save_all=True, append_images=[red], disposal=2, loop=0, duration=500) ``` ### What did you expect to happen? Pillow should create this GIF: ![no_opt](https://github.com/python-pillow/Pillow/assets/2065805/0d36e643-e289-4b26-902e-05ad45368dda) ### What actually happened? Pillow actually creates this GIF, with the second frame "missing" two pixels in height, which get shown as transparent: ![opt](https://github.com/python-pillow/Pillow/assets/2065805/ee761adb-86a2-4398-9991-4ad7cbd6ddfc) ```sh > identify opt.gif opt.gif[0] GIF 250x217 250x217+0+0 8-bit sRGB 32c 0.000u 0:00.000 opt.gif[1] GIF 250x215 250x217+0+0 8-bit sRGB 64c 5237B 0.000u 0:00.000 ``` What I discovered so far: - If the black color gets changed to a black-ish color (e.g., rgb(2, 0, 0)), the issue disappears - If the `disposal` method is not `2`, the issue disappears - If `optimize=False`, the issue disappears (see the `no_opt.gif` created above in the "expect to happen" section) This problem seems related, but not identical, to #8003. ### What are your OS, Python and Pillow versions? * OS: macOS 14.5 * Python: 3.12.3 * Pillow: 10.4.0 ```sh -------------------------------------------------------------------- Pillow 10.4.0 Python 3.12.3 (main, Apr 9 2024, 08:09:14) [Clang 15.0.0 (clang-1500.3.9.4)] -------------------------------------------------------------------- Python executable is /Users/lucach/Library/Caches/pypoetry/virtualenvs/pytamaro-5GgIxOWM-py3.12/bin/python Environment Python files loaded from /Users/lucach/Library/Caches/pypoetry/virtualenvs/pytamaro-5GgIxOWM-py3.12 System Python files loaded from /opt/homebrew/opt/python@3.12/Frameworks/Python.framework/Versions/3.12 -------------------------------------------------------------------- Python Pillow modules loaded from /Users/lucach/Library/Caches/pypoetry/virtualenvs/pytamaro-5GgIxOWM-py3.12/lib/python3.12/site-packages/PIL Binary Pillow modules loaded from /Users/lucach/Library/Caches/pypoetry/virtualenvs/pytamaro-5GgIxOWM-py3.12/lib/python3.12/site-packages/PIL -------------------------------------------------------------------- --- PIL CORE support ok, compiled for 10.4.0 *** TKINTER support not installed --- FREETYPE2 support ok, loaded 2.13.2 --- LITTLECMS2 support ok, loaded 2.16 --- WEBP support ok, loaded 1.4.0 --- WEBP Transparency support ok --- WEBPMUX support ok --- WEBP Animation support ok --- JPEG support ok, compiled for libjpeg-turbo 3.0.3 --- OPENJPEG (JPEG2000) support ok, loaded 2.5.2 --- ZLIB (PNG/ZIP) support ok, loaded 1.3.1 --- LIBTIFF support ok, loaded 4.6.0 --- RAQM (Bidirectional Text) support ok, loaded 0.10.1, fribidi 1.0.14, harfbuzz 8.5.0 *** LIBIMAGEQUANT (Quantization method) support not installed --- XCB (X protocol) support ok -------------------------------------------------------------------- ```
2024-09-10T09:10:13Z
10.4
python-pillow/Pillow
8,056
python-pillow__Pillow-8056
[ "8052" ]
d879f397112d1cb50af7d27f16eaf2c7bb221043
diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -843,6 +843,10 @@ def jpeg_factory(fp=None, filename=None): try: mpheader = im._getmp() if mpheader[45057] > 1: + for segment, content in im.applist: + if segment == "APP1" and b' hdrgm:Version="' in content: + # Ultra HDR images are not yet supported + return im # It's actually an MPO from .MpoImagePlugin import MpoImageFile
diff --git a/Tests/images/ultrahdr.jpg b/Tests/images/ultrahdr.jpg new file mode 100644 Binary files /dev/null and b/Tests/images/ultrahdr.jpg differ diff --git a/Tests/test_file_mpo.py b/Tests/test_file_mpo.py --- a/Tests/test_file_mpo.py +++ b/Tests/test_file_mpo.py @@ -226,6 +226,11 @@ def test_eoferror() -> None: im.seek(n_frames - 1) +def test_ultra_hdr() -> None: + with Image.open("Tests/images/ultrahdr.jpg") as im: + assert im.format == "JPEG" + + @pytest.mark.parametrize("test_file", test_files) def test_image_grab(test_file: str) -> None: with Image.open(test_file) as im:
Is this MPO file decoded correctly? ### What did you do? ```python3 from PIL import Image im = Image.open("328384445-d4972d5b-3409-4d5f-a107-ccb8c5dc0177.jpg") # MPO file im.show() ``` ### What did you expect to happen? Correctly decode second image <img width="766" alt="image" src="https://github.com/python-pillow/Pillow/assets/13381981/ae732d38-ec2c-4408-b53e-14fed3b2f766"> ### What actually happened? <img width="738" alt="image" src="https://github.com/python-pillow/Pillow/assets/13381981/f7728e4d-5697-482b-ab6b-8badf9ea1765"> ### What are your OS, Python and Pillow versions? * OS: macOS/Linux * Python: 3.10/3.11 * Pillow: 10.2.0 (edited) (was 10.3.0, my mistake) Test image can be found here: https://github.com/comfyanonymous/ComfyUI/issues/3416#issuecomment-2097406107
Sorry my bad, I tested it on Pillow 10.2 on Pillow 10.3 there is no error when decoding, just second image looks wrong. Updated issue to reflect this. Sorry for mess. Hi, @bigcat88 , 10.3.0 correctly extract the second frame with a different resolution. However, the second frame is not actually a frame, it's a `gain map` according to this [UltraHDR format](https://developer.android.com/media/platform/hdr-image-format). A JPG file should only have one frame. And people naturally expect the second frame would in the same resolution as the first one. That's the problem we have in https://github.com/comfyanonymous/ComfyUI/issues/3416#issuecomment-2097406107 So, supporting UltraHDR is a good way to go, I guess. #8036 > 10.3.0 correctly extract the second frame with a different resolution No it does not, imho. Pillow should either reject a `gain map` and show only primary image, or it should decode second frame correctly, even with lower resolution. btw, the tomato photo I provided eariler is not very representitive, since the `gain map` is all 1.0s (completely white). I didn't understand this was related to the UltraHDR format earlier. Here is another photo I took that has something in the `gain map`: ![1000014283](https://github.com/python-pillow/Pillow/assets/14249458/d2130eca-50de-49cf-867c-6fc2dc525bca) we can see the `gain map` is smaller comparing to the original photo. ![image](https://github.com/python-pillow/Pillow/assets/14249458/b5812955-75dd-4904-b6e6-a8bc6c8be813) > btw, the tomato photo I provided eariler is not very representitive, since the `gain map` is all 1.0s (completely white). please look at my first message. It is not white. perhaps gain maps need their own type returned from .get_bands() or some way to explicitly exclude them from ImageSequence.Iterator Are there any images with a small file size that could be added to our test suite and distributed under the Pillow license? > Are there any images with a small file size that could be added to our test suite and distributed under the Pillow license? I, as the author of the tomato photo and the trees photo, agree to add these to the Pillow test suite and to adhere to its licensing terms. I don't have smaller ones, since this is already the 'medium resolution'; the other option is 'full resolution.'
2024-05-13T11:52:16Z
10.3
python-pillow/Pillow
8,063
python-pillow__Pillow-8063
[ "7993" ]
d879f397112d1cb50af7d27f16eaf2c7bb221043
diff --git a/src/PIL/Image.py b/src/PIL/Image.py --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -76,6 +76,8 @@ class DecompressionBombError(Exception): pass +WARN_POSSIBLE_FORMATS: bool = False + # Limit to around a quarter gigabyte for a 24-bit (3 bpp) image MAX_IMAGE_PIXELS: int | None = int(1024 * 1024 * 1024 // 4 // 3) @@ -3344,7 +3346,7 @@ def open( preinit() - accept_warnings: list[str] = [] + warning_messages: list[str] = [] def _open_core( fp: IO[bytes], @@ -3360,17 +3362,15 @@ def _open_core( factory, accept = OPEN[i] result = not accept or accept(prefix) if isinstance(result, str): - accept_warnings.append(result) + warning_messages.append(result) elif result: fp.seek(0) im = factory(fp, filename) _decompression_bomb_check(im.size) return im - except (SyntaxError, IndexError, TypeError, struct.error): - # Leave disabled by default, spams the logs with image - # opening failures that are entirely expected. - # logger.debug("", exc_info=True) - continue + except (SyntaxError, IndexError, TypeError, struct.error) as e: + if WARN_POSSIBLE_FORMATS: + warning_messages.append(i + " opening failed. " + str(e)) except BaseException: if exclusive_fp: fp.close() @@ -3395,7 +3395,7 @@ def _open_core( if exclusive_fp: fp.close() - for message in accept_warnings: + for message in warning_messages: warnings.warn(message) msg = "cannot identify image file %r" % (filename if filename else fp) raise UnidentifiedImageError(msg)
diff --git a/Tests/test_image.py b/Tests/test_image.py --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -116,6 +116,15 @@ def test_open_formats(self) -> None: assert im.mode == "RGB" assert im.size == (128, 128) + def test_open_verbose_failure(self, monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.setattr(Image, "WARN_POSSIBLE_FORMATS", True) + + im = io.BytesIO(b"") + with pytest.warns(UserWarning): + with pytest.raises(UnidentifiedImageError): + with Image.open(im): + pass + def test_width_height(self) -> None: im = Image.new("RGB", (1, 2)) assert im.width == 1
cannot identify image file (PNG file from scanner) <!-- Thank you for reporting an issue. Follow these guidelines to ensure your issue is handled properly. If you have a ... 1. General question: consider asking the question on Stack Overflow with the python-imaging-library tag: * https://stackoverflow.com/questions/tagged/python-imaging-library Do not ask a question in both places. If you think you have found a bug or have an unexplained exception then file a bug report here. 2. Bug report: include a self-contained, copy-pastable example that generates the issue if possible. Be concise with code posted. Guidelines on how to provide a good bug report: * https://stackoverflow.com/help/mcve Bug reports which follow these guidelines are easier to diagnose, and are often handled much more quickly. 3. Feature request: do a quick search of existing issues to make sure this has not been asked before. We know asking good questions takes effort, and we appreciate your time. Thank you. --> ### What did you do? `img = Image.open(path) # I open a file in a script` ### What did you expect to happen? script open file with script will continue execution ### What actually happened? an error occurs: ``` File "/usr/local/lib/python3.9/dist-packages/PIL/Image.py", line 3339, in open raise UnidentifiedImageError(msg) PIL.UnidentifiedImageError: cannot identify image file '/var/www/python_for_site/bug.png' ``` ### What are your OS, Python and Pillow versions? * OS: Debian 11 * Python: Python 3.9.2 * Pillow: 10.3.0 ```text Please paste here the output of running: > python3 -m PIL.report -------------------------------------------------------------------- Pillow 10.3.0 Python 3.9.2 (default, Feb 28 2021, 17:03:44) [GCC 10.2.1 20210110] -------------------------------------------------------------------- Python executable is /usr/bin/python3 System Python files loaded from /usr -------------------------------------------------------------------- Python Pillow modules loaded from /usr/local/lib/python3.9/dist-packages/PIL Binary Pillow modules loaded from /usr/local/lib/python3.9/dist-packages/PIL -------------------------------------------------------------------- --- PIL CORE support ok, compiled for 10.3.0 *** TKINTER support not installed --- FREETYPE2 support ok, loaded 2.13.2 --- LITTLECMS2 support ok, loaded 2.16 --- WEBP support ok, loaded 1.3.2 --- WEBP Transparency support ok --- WEBPMUX support ok --- WEBP Animation support ok --- JPEG support ok, compiled for libjpeg-turbo 3.0.2 --- OPENJPEG (JPEG2000) support ok, loaded 2.5.2 --- ZLIB (PNG/ZIP) support ok, loaded 1.2.11 --- LIBTIFF support ok, loaded 4.6.0 --- RAQM (Bidirectional Text) support ok, loaded 0.10.1, fribidi 1.0.8, harfbuzz 8.4.0 *** LIBIMAGEQUANT (Quantization method) support not installed --- XCB (X protocol) support ok -------------------------------------------------------------------- ``` My Code: ```python from PIL import Image image_path = "bug.png" image = Image.open(image_path) width, height = image.size print("width:", width, "px") print("height:", height, "px") ``` I worked a lot with files, but I can’t open this file even though it’s normal. I can’t open a single file that I scan on a scanner in PNG format. [cannot_identify_image_file.zip](https://github.com/python-pillow/Pillow/files/15040644/cannot_identify_image_file.zip)
If I run [pngcheck](http://www.libpng.org/pub/png/apps/pngcheck.html) over your image, I get > CRC error in chunk pHYs (computed eee74573, expected c76fa864) To skip the check in Pillow, use ```python from PIL import Image, ImageFile ImageFile.LOAD_TRUNCATED_IMAGES = True image_path = "bug.png" image = Image.open(image_path) ``` Same issue with `convert`, although macOS Preview opens it. ``` % convert bug.png bug.png convert: pHYs: CRC error `bug.png' @ warning/png.c/MagickPNGWarningHandler/1526. ``` Actually, `convert` fixes it: ``` % convert bug.png bug.png convert: pHYs: CRC error `bug.png' @ warning/png.c/MagickPNGWarningHandler/1526. % pngcheck bug.png OK: bug.png (579x864, 24-bit RGB, non-interlaced, 57.7%). % convert bug.png bug.png % ``` `ImageFile.LOAD_TRUNCATED_IMAGES = True` This code helps solve the issue, but it's crucial to ensure there won't be any issues when processing the image further. Could this code affect the functionality, potentially causing problems down the line? Apart from skipping some checks with PNGs, the other behaviour of `LOAD_TRUNCATED_IMAGES` is to try and load images that end prematurely. The internal Pillow data will not be in a corrupted state, no, all operations on the loaded image will be as valid as they ever were. This is just ignoring the fact that the pixels being read from the image are perhaps not what they are supposed to be. Okay, thanks for the help. The problem in the scanner that cannot correctly calculate the control amount for the file. You can make changes to the code so that there is no error and the message was shown - the file is damaged and has not the right CRC? If there is a message about the CRC problem, and not the error will be better and more understandable then. You're requesting that we only raise a warning in this situation? If the image is corrupted or ends prematurely, I think we both agree that users should know there is something wrong. Whether the user would want to continue using a flawed image anyway is [a matter of personal preference](https://github.com/python-pillow/Pillow/pull/1428#issue-106627384), and so there is a setting for it. I'd like there to be a stronger argument before changing Pillow's default setting. The meaning behind `UnidentifiedImageError` is documented, specifically mentioning this PNG behaviour - https://pillow.readthedocs.io/en/stable/PIL.html#PIL.UnidentifiedImageError As some background, the error behaviour has been here since the fork from PIL. It was only #1991 that allowed `LOAD_TRUNCATED_IMAGES` to workaround it. You might be interested to know that ```python from PIL import PngImagePlugin PngImagePlugin.PngImageFile("bug.png") ``` will show you the SyntaxError directly. ```pytb Traceback (most recent call last): File "demo.py", line 6, in <module> PngImagePlugin.PngImageFile("bug.png") File "PIL/ImageFile.py", line 137, in __init__ self._open() File "PIL/PngImagePlugin.py", line 733, in _open self.png.crc(cid, s) File "PIL/PngImagePlugin.py", line 209, in crc raise SyntaxError(msg) SyntaxError: broken PNG file (bad header checksum in b'pHYs') ``` Agree this is an error and we're not going to change to warning. Also super-interesting that the `PngImagePlugin` raises `SyntaxError` and reveals the bad checksum. The only change I'd consider making here is to add an option similar to `LOAD_TRUNCATED_IMAGES` to enable more verbose output from Pillow when the image plugin [fails to return an open image to `ImagePlugin._open`](https://github.com/python-pillow/Pillow/issues/1888#issue-153265584). Not sure what that would look like or if there are any existing verbose options in Pillow, but something like `--show-me-what-really-happened`. Okay, let it show an error, but not just “**_cannot identify image file_**”. Let there be a more detailed and understandable error, just change only the text of the error message to: “**_cannot identify image file, the file is damaged, the file has an incorrect CRC signature_**” That's not as easy as it sounds. By default, Pillow [checks your image](https://github.com/python-pillow/Pillow/blob/eee633cb217b201cf143d0b813e31c6ae9b08284/src/PIL/Image.py#L3322-L3340) against multiple formats. Some formats can be easily rejected because your image data does not start with the [required identifier](https://en.wikipedia.org/wiki/Magic_number_(programming)#In_files), but not all. So if I adjust Pillow to print out the errors raised by any formats against your image ```diff diff --git a/src/PIL/Image.py b/src/PIL/Image.py index c65cf3850..ab41f525f 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -3333,10 +3333,11 @@ def open( im = factory(fp, filename) _decompression_bomb_check(im.size) return im - except (SyntaxError, IndexError, TypeError, struct.error): + except (SyntaxError, IndexError, TypeError, struct.error) as e: # Leave disabled by default, spams the logs with image # opening failures that are entirely expected. # logger.debug("", exc_info=True) + print(i+": "+str(e)) continue except BaseException: if exclusive_fp: ``` I get ``` PNG: broken PNG file (bad header checksum in b'pHYs') IM: Syntax error in IM header: �PNG IMT: not identified by this driver IPTC: invalid IPTC/NAA file MPEG: not an MPEG file PCD: not a PCD file SPIDER: not a valid Spider file TGA: not a TGA file ``` I imagine you don't want to see all of that. > I imagine you don't want to see all of that. This is how it became clearer, let there be more messages to understand where the error is and how to fix it. Those messages would show even if the image opened successfully, because all of the other attempted formats would print their failures. > I imagine you don't want to see all of that. I think I'd like to be able to say `Image.verbose = True` and see all that, but I expect that also may not be as easy as it sounds to implement. It looks like warnings are added to a list that gets shown at the end if the image can't be opened. Exception messages could probably be treated similarly. I've created https://github.com/python-pillow/Pillow/pull/8033 to allow `Image.open("bug.png", warn_possible_formats=True)` to show the various exceptions as warnings, but only if the image is not able to be opened successfully. See what you think. I'm not sure about the scalability of adding Boolean flags here and there. How about adding it to a logger? I feel the concern about scalability, but as for a logger, as @nulano [pointed out](https://github.com/python-pillow/Pillow/pull/8033#discussion_r1584243182), this is something that previously existed, but was removed in #1423. https://github.com/python-pillow/Pillow/blob/ddbf08fa78a1aeac83c8295b071f15c722615326/src/PIL/Image.py#L3343-L3347 I am cautious about making decisions and then undoing them. @wiredfool, as the author of #1423, do you have any thoughts on this? This is a "nice to have" so I wouldn't add anything for logging or to increase verbose output unless "no other way forward". In this case, it's unfortunate to not get the appropriate information right away, but certainly not critical for us to fix it. While I'm not sure we should do either of these, I have thought of two options: * Add a global setting (similar to MAX_IMAGE_PIXELS) - I agree that a new function parameter for debugging is not very scalable, but a global setting (perhaps even reused from other functions) would not complicate the interface too much. * Append all detected issues to the raised UnidentifiedImageError, e.g.: ``` File "/usr/local/lib/python3.9/dist-packages/PIL/Image.py", line 3339, in open raise UnidentifiedImageError(msg) PIL.UnidentifiedImageError: cannot identify image file '/var/www/python_for_site/bug.png' The following warnings were raised while attempting to open the file: PNG: broken PNG file (bad header checksum in b'pHYs') IM: Syntax error in IM header: �PNG IMT: not identified by this driver IPTC: invalid IPTC/NAA file MPEG: not an MPEG file PCD: not a PCD file SPIDER: not a valid Spider file TGA: not a TGA file ``` > * Add a global setting (similar to MAX_IMAGE_PIXELS) - I agree that a new function parameter for debugging is not very scalable, but a global setting (perhaps even reused from other functions) would not complicate the interface too much. Right, global setting is what I suggested [here](https://github.com/python-pillow/Pillow/issues/7993#issuecomment-2067655321) too. > Append all detected issues to the raised UnidentifiedImageError If you append based on the global setting, probably OK. If not, probably not.
2024-05-16T07:51:54Z
10.3
python-pillow/Pillow
7,948
python-pillow__Pillow-7948
[ "7940" ]
f8ec9f7974361c835405daf8a7c5acdf1ff98a8c
diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1653,6 +1653,16 @@ def _save(im, fp, filename): except Exception: pass # might not be an IFD. Might not have populated type + legacy_ifd = {} + if hasattr(im, "tag"): + legacy_ifd = im.tag.to_v2() + + supplied_tags = {**legacy_ifd, **getattr(im, "tag_v2", {})} + if SAMPLEFORMAT in supplied_tags: + # SAMPLEFORMAT is determined by the image format and should not be copied + # from legacy_ifd. + del supplied_tags[SAMPLEFORMAT] + # additions written by Greg Couch, gregc@cgl.ucsf.edu # inspired by image-sig posting from Kevin Cazabon, kcazabon@home.com if hasattr(im, "tag_v2"): @@ -1666,8 +1676,14 @@ def _save(im, fp, filename): XMP, ): if key in im.tag_v2: - ifd[key] = im.tag_v2[key] - ifd.tagtype[key] = im.tag_v2.tagtype[key] + if key == IPTC_NAA_CHUNK and im.tag_v2.tagtype[key] not in ( + TiffTags.BYTE, + TiffTags.UNDEFINED, + ): + del supplied_tags[key] + else: + ifd[key] = im.tag_v2[key] + ifd.tagtype[key] = im.tag_v2.tagtype[key] # preserve ICC profile (should also work when saving other formats # which support profiles as TIFF) -- 2008-06-06 Florian Hoech @@ -1807,16 +1823,6 @@ def _save(im, fp, filename): # Merge the ones that we have with (optional) more bits from # the original file, e.g x,y resolution so that we can # save(load('')) == original file. - legacy_ifd = {} - if hasattr(im, "tag"): - legacy_ifd = im.tag.to_v2() - - # SAMPLEFORMAT is determined by the image format and should not be copied - # from legacy_ifd. - supplied_tags = {**getattr(im, "tag_v2", {}), **legacy_ifd} - if SAMPLEFORMAT in supplied_tags: - del supplied_tags[SAMPLEFORMAT] - for tag, value in itertools.chain(ifd.items(), supplied_tags.items()): # Libtiff can only process certain core items without adding # them to the custom dictionary.
diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py --- a/Tests/test_file_tiff.py +++ b/Tests/test_file_tiff.py @@ -621,6 +621,19 @@ def test_roundtrip_tiff_uint16(self, tmp_path: Path) -> None: assert_image_equal_tofile(im, tmpfile) + def test_iptc(self, tmp_path: Path) -> None: + # Do not preserve IPTC_NAA_CHUNK by default if type is LONG + outfile = str(tmp_path / "temp.tif") + im = hopper() + ifd = TiffImagePlugin.ImageFileDirectory_v2() + ifd[33723] = 1 + ifd.tagtype[33723] = 4 + im.tag_v2 = ifd + im.save(outfile) + + with Image.open(outfile) as im: + assert 33723 not in im.tag_v2 + def test_rowsperstrip(self, tmp_path: Path) -> None: outfile = str(tmp_path / "temp.tif") im = hopper()
Saving tiff triggers segfault ### What did you do? I used the following simple script: ```python from PIL import Image img = Image.open("Image00386.tiff") img.save("toto2.tiff", compression="tiff_deflate") ``` on the file contained in this zip: https://eroux.fr/Image00386.zip (too big to upload on the issue, sorry for that) ### What did you expect to happen? I expected no crash ### What actually happened? ```sh $ ../pvenv/bin/python3 convert-tiff.py /home/admin/pvenv/lib/python3.11/site-packages/PIL/TiffImagePlugin.py:652: UserWarning: Metadata Warning, tag 33723 had too many entries: 9, expected 1 warnings.warn( Segmentation fault ``` ### What are your OS, Python and Pillow versions? * OS: Debian 12 * Python: 3.11.2 * Pillow: 10.2.0 ```text -------------------------------------------------------------------- Pillow 10.2.0 Python 3.11.2 (main, Mar 13 2023, 12:18:29) [GCC 12.2.0] -------------------------------------------------------------------- Python modules loaded from /home/admin/pvenv/lib/python3.11/site-packages/PIL Binary modules loaded from /home/admin/pvenv/lib/python3.11/site-packages/PIL -------------------------------------------------------------------- --- PIL CORE support ok, compiled for 10.2.0 *** TKINTER support not installed --- FREETYPE2 support ok, loaded 2.13.2 --- LITTLECMS2 support ok, loaded 2.16 --- WEBP support ok, loaded 1.3.2 --- WEBP Transparency support ok --- WEBPMUX support ok --- WEBP Animation support ok --- JPEG support ok, compiled for libjpeg-turbo 3.0.1 --- OPENJPEG (JPEG2000) support ok, loaded 2.5.0 --- ZLIB (PNG/ZIP) support ok, loaded 1.2.13 --- LIBTIFF support ok, loaded 4.6.0 --- RAQM (Bidirectional Text) support ok, loaded 0.10.1, fribidi 1.0.8, harfbuzz 8.3.0 *** LIBIMAGEQUANT (Quantization method) support not installed --- XCB (X protocol) support ok -------------------------------------------------------------------- BLP Extensions: .blp Features: open, save, encode -------------------------------------------------------------------- BMP image/bmp Extensions: .bmp Features: open, save -------------------------------------------------------------------- BUFR Extensions: .bufr Features: open, save -------------------------------------------------------------------- CUR Extensions: .cur Features: open -------------------------------------------------------------------- DCX Extensions: .dcx Features: open -------------------------------------------------------------------- DDS Extensions: .dds Features: open, save -------------------------------------------------------------------- DIB image/bmp Extensions: .dib Features: open, save -------------------------------------------------------------------- EPS application/postscript Extensions: .eps, .ps Features: open, save -------------------------------------------------------------------- FITS Extensions: .fit, .fits Features: open -------------------------------------------------------------------- FLI Extensions: .flc, .fli Features: open -------------------------------------------------------------------- FTEX Extensions: .ftc, .ftu Features: open -------------------------------------------------------------------- GBR Extensions: .gbr Features: open -------------------------------------------------------------------- GIF image/gif Extensions: .gif Features: open, save, save_all -------------------------------------------------------------------- GRIB Extensions: .grib Features: open, save -------------------------------------------------------------------- HDF5 Extensions: .h5, .hdf Features: open, save -------------------------------------------------------------------- ICNS image/icns Extensions: .icns Features: open, save -------------------------------------------------------------------- ICO image/x-icon Extensions: .ico Features: open, save -------------------------------------------------------------------- IM Extensions: .im Features: open, save -------------------------------------------------------------------- IMT Features: open -------------------------------------------------------------------- IPTC Extensions: .iim Features: open -------------------------------------------------------------------- JPEG image/jpeg Extensions: .jfif, .jpe, .jpeg, .jpg Features: open, save -------------------------------------------------------------------- JPEG2000 image/jp2 Extensions: .j2c, .j2k, .jp2, .jpc, .jpf, .jpx Features: open, save -------------------------------------------------------------------- MCIDAS Features: open -------------------------------------------------------------------- MPEG video/mpeg Extensions: .mpeg, .mpg Features: open -------------------------------------------------------------------- MSP Extensions: .msp Features: open, save, decode -------------------------------------------------------------------- PCD Extensions: .pcd Features: open -------------------------------------------------------------------- PCX image/x-pcx Extensions: .pcx Features: open, save -------------------------------------------------------------------- PIXAR Extensions: .pxr Features: open -------------------------------------------------------------------- PNG image/png Extensions: .apng, .png Features: open, save, save_all -------------------------------------------------------------------- PPM image/x-portable-anymap Extensions: .pbm, .pgm, .pnm, .ppm Features: open, save -------------------------------------------------------------------- PSD image/vnd.adobe.photoshop Extensions: .psd Features: open -------------------------------------------------------------------- QOI Extensions: .qoi Features: open -------------------------------------------------------------------- SGI image/sgi Extensions: .bw, .rgb, .rgba, .sgi Features: open, save -------------------------------------------------------------------- SPIDER Features: open, save -------------------------------------------------------------------- SUN Extensions: .ras Features: open -------------------------------------------------------------------- TGA image/x-tga Extensions: .icb, .tga, .vda, .vst Features: open, save -------------------------------------------------------------------- TIFF image/tiff Extensions: .tif, .tiff Features: open, save, save_all -------------------------------------------------------------------- WEBP image/webp Extensions: .webp Features: open, save, save_all -------------------------------------------------------------------- WMF Extensions: .emf, .wmf Features: open, save -------------------------------------------------------------------- XBM image/xbm Extensions: .xbm Features: open, save -------------------------------------------------------------------- XPM image/xpm Extensions: .xpm Features: open -------------------------------------------------------------------- XVTHUMB Features: open -------------------------------------------------------------------- ``` Note that there is no segfault and a good output with the following setting: ```text -------------------------------------------------------------------- Pillow 9.5.0 Python 3.7.3 (default, Dec 20 2019, 18:57:59) [GCC 8.3.0] -------------------------------------------------------------------- Python modules loaded from /home/eroux/.local/lib/python3.7/site-packages/PIL Binary modules loaded from /home/eroux/.local/lib/python3.7/site-packages/PIL -------------------------------------------------------------------- --- PIL CORE support ok, compiled for 9.5.0 --- TKINTER support ok, loaded 8.6 --- FREETYPE2 support ok, loaded 2.13.0 --- LITTLECMS2 support ok, loaded 2.15 --- WEBP support ok, loaded 1.3.0 --- WEBP Transparency support ok --- WEBPMUX support ok --- WEBP Animation support ok --- JPEG support ok, compiled for libjpeg-turbo 2.1.5.1 --- OPENJPEG (JPEG2000) support ok, loaded 2.5.0 --- ZLIB (PNG/ZIP) support ok, loaded 1.2.11 --- LIBTIFF support ok, loaded 4.5.0 --- RAQM (Bidirectional Text) support ok, loaded 0.10.0, fribidi 1.0.5, harfbuzz 7.1.0 *** LIBIMAGEQUANT (Quantization method) support not installed --- XCB (X protocol) support ok -------------------------------------------------------------------- BLP Extensions: .blp Features: open, save, encode -------------------------------------------------------------------- BMP image/bmp Extensions: .bmp Features: open, save -------------------------------------------------------------------- BUFR Extensions: .bufr Features: open, save -------------------------------------------------------------------- CUR Extensions: .cur Features: open -------------------------------------------------------------------- DCX Extensions: .dcx Features: open -------------------------------------------------------------------- DDS Extensions: .dds Features: open, save -------------------------------------------------------------------- DIB image/bmp Extensions: .dib Features: open, save -------------------------------------------------------------------- EPS application/postscript Extensions: .eps, .ps Features: open, save -------------------------------------------------------------------- FITS Extensions: .fit, .fits Features: open, save -------------------------------------------------------------------- FLI Extensions: .flc, .fli Features: open -------------------------------------------------------------------- FPX Extensions: .fpx Features: open -------------------------------------------------------------------- FTEX Extensions: .ftc, .ftu Features: open -------------------------------------------------------------------- GBR Extensions: .gbr Features: open -------------------------------------------------------------------- GIF image/gif Extensions: .gif Features: open, save, save_all -------------------------------------------------------------------- GRIB Extensions: .grib Features: open, save -------------------------------------------------------------------- HDF5 Extensions: .h5, .hdf Features: open, save -------------------------------------------------------------------- ICNS image/icns Extensions: .icns Features: open, save -------------------------------------------------------------------- ICO image/x-icon Extensions: .ico Features: open, save -------------------------------------------------------------------- IM Extensions: .im Features: open, save -------------------------------------------------------------------- IMT Features: open -------------------------------------------------------------------- IPTC Extensions: .iim Features: open -------------------------------------------------------------------- JPEG image/jpeg Extensions: .jfif, .jpe, .jpeg, .jpg Features: open, save -------------------------------------------------------------------- JPEG2000 image/jp2 Extensions: .j2c, .j2k, .jp2, .jpc, .jpf, .jpx Features: open, save -------------------------------------------------------------------- MCIDAS Features: open -------------------------------------------------------------------- MIC Extensions: .mic Features: open -------------------------------------------------------------------- MPEG video/mpeg Extensions: .mpeg, .mpg Features: open -------------------------------------------------------------------- MSP Extensions: .msp Features: open, save, decode -------------------------------------------------------------------- PCD Extensions: .pcd Features: open -------------------------------------------------------------------- PCX image/x-pcx Extensions: .pcx Features: open, save -------------------------------------------------------------------- PIXAR Extensions: .pxr Features: open -------------------------------------------------------------------- PNG image/png Extensions: .apng, .png Features: open, save, save_all -------------------------------------------------------------------- PPM image/x-portable-anymap Extensions: .pbm, .pgm, .pnm, .ppm Features: open, save -------------------------------------------------------------------- PSD image/vnd.adobe.photoshop Extensions: .psd Features: open -------------------------------------------------------------------- QOI Extensions: .qoi Features: open -------------------------------------------------------------------- SGI image/sgi Extensions: .bw, .rgb, .rgba, .sgi Features: open, save -------------------------------------------------------------------- SPIDER Features: open, save -------------------------------------------------------------------- SUN Extensions: .ras Features: open -------------------------------------------------------------------- TGA image/x-tga Extensions: .icb, .tga, .vda, .vst Features: open, save -------------------------------------------------------------------- TIFF image/tiff Extensions: .tif, .tiff Features: open, save, save_all -------------------------------------------------------------------- WEBP image/webp Extensions: .webp Features: open, save, save_all -------------------------------------------------------------------- WMF Extensions: .emf, .wmf Features: open, save -------------------------------------------------------------------- XBM image/xbm Extensions: .xbm Features: open, save -------------------------------------------------------------------- XPM image/xpm Extensions: .xpm Features: open -------------------------------------------------------------------- XVTHUMB Features: open -------------------------------------------------------------------- ```
The problem is tag 33723. It is specified as LONG in the image, when it should be BYTE or UNDEFINED according to https://www.awaresystems.be/imaging/tiff/tifftags/iptc.html If I adjust Pillow to not preserve LONG tag 33723 by default, then it starts raising a `RuntimeError` instead. Is it just the segfault you are concerned about, or do you think the image should save without any error? Thanks! Ideally it should save without error (it does with the older setting) What do you mean by 'older setting'? Oh, you mean Pillow 9.5.0. yes, Pillow 9.5.0 / libtiff 4.5.0
2024-04-06T08:30:14Z
10.3