TouchInstinct
/
checkstyle
307
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue #2729: types changed according to java spec

This commit is contained in:
Ilja Dubinin 2016-02-08 22:20:15 +00:00 committed by Roman Ivanov
parent 1b72b4905b
commit c7b82f41a9
5 changed files with 189 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/resources/com/puppycrawl/tools/checkstyle/grammars/java.g
View File

@ -260,7 +260,10 @@ typeSpec[boolean addImagNode]
// - generic type arguments after
classTypeSpec[boolean addImagNode]
: classOrInterfaceType[addImagNode]
(options{greedy=true;}: lb:LBRACK^ {#lb.setType(ARRAY_DECLARATOR);} RBRACK)*
(options{greedy=true; }:
({LA(1) == AT}? annotations
| )
lb:LBRACK^ {#lb.setType(ARRAY_DECLARATOR);} RBRACK)*
{
if ( addImagNode ) {
#classTypeSpec = #(#[TYPE,"TYPE"], #classTypeSpec);
@ -269,21 +272,26 @@ classTypeSpec[boolean addImagNode]
;
classOrInterfaceType[boolean addImagNode]
: ({LA(1) == AT}? annotations
| )
IDENT (options{warnWhenFollowAmbig=false;}: typeArguments[addImagNode])?
(options{greedy=true; }: // match as many as possible
DOT^
IDENT (options{warnWhenFollowAmbig=false;}: typeArguments[addImagNode])?
)*
;
: ({LA(1) == AT}? annotations
| )
IDENT
(options{warnWhenFollowAmbig=false;}: typeArguments[addImagNode])?
(options{greedy=true; }: // match as many as possible
DOT^
({LA(1) == AT}? annotations
| )
IDENT
(options{warnWhenFollowAmbig=false;}: typeArguments[addImagNode])?
)*
;
// A generic type argument is a class type, a possibly bounded wildcard type or a built-in type array
typeArgument[boolean addImagNode]
: ( ({LA(1) == AT}? annotations
| ) (
classTypeSpec[addImagNode]
| builtInTypeArraySpec[addImagNode]
| builtInTypeSpec[addImagNode]
| wildcardType[addImagNode])
)
{#typeArgument = #(#[TYPE_ARGUMENT,"TYPE_ARGUMENT"], #typeArgument);}
@ -356,21 +364,15 @@ typeArgumentBounds[boolean addImagNode]
(options{greedy=true;}: lb:LBRACK^ {#lb.setType(ARRAY_DECLARATOR);} RBRACK)*
;
// A builtin type array specification is a builtin type with brackets afterwards
builtInTypeArraySpec[boolean addImagNode]
: builtInType
(options{greedy=true;}: lb:LBRACK^ {#lb.setType(ARRAY_DECLARATOR);} RBRACK)+
{
if ( addImagNode ) {
#builtInTypeArraySpec = #(#[TYPE,"TYPE"], #builtInTypeArraySpec);
}
}
;
// A builtin type specification is a builtin type with possible brackets
// afterwards (which would make it an array type).
builtInTypeSpec[boolean addImagNode]
: builtInType (lb:LBRACK^ {#lb.setType(ARRAY_DECLARATOR);} RBRACK)*
: builtInType
(options{greedy=true; }:
({LA(1) == AT}? annotations
| )
lb:LBRACK^ {#lb.setType(ARRAY_DECLARATOR);} RBRACK)*
{
if ( addImagNode ) {
#builtInTypeSpec = #(#[TYPE,"TYPE"], #builtInTypeSpec);

50
src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/AnnotationsOnArrayTest.java Normal file
View File

@ -0,0 +1,50 @@
////////////////////////////////////////////////////////////////////////////////
// checkstyle: Checks Java source code for adherence to a set of rules.
// Copyright (C) 2001-2016 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.grammars.java8;
import java.io.File;
import java.io.IOException;
import org.apache.commons.lang3.ArrayUtils;
import org.junit.Test;
import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck;
public class AnnotationsOnArrayTest extends BaseCheckTestSupport {
@Override
protected String getNonCompilablePath(String filename) throws IOException {
return super.getNonCompilablePath("grammars" + File.separator
+ "java8" + File.separator + filename);
}
@Test
public void testCanParse()
throws Exception {
final DefaultConfiguration checkConfig =
createCheckConfig(MemberNameCheck.class);
final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
verify(checkConfig, getNonCompilablePath("InputAnnotationsOnArray.java"),
expected);
}
}

50
src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/TypeUseAnnotationsOnQualifiedTypesTest.java Normal file
View File

@ -0,0 +1,50 @@
////////////////////////////////////////////////////////////////////////////////
// checkstyle: Checks Java source code for adherence to a set of rules.
// Copyright (C) 2001-2016 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.grammars.java8;
import java.io.File;
import java.io.IOException;
import org.apache.commons.lang3.ArrayUtils;
import org.junit.Test;
import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck;
public class TypeUseAnnotationsOnQualifiedTypesTest extends BaseCheckTestSupport {
@Override
protected String getNonCompilablePath(String filename) throws IOException {
return super.getNonCompilablePath("grammars" + File.separator
+ "java8" + File.separator + filename);
}
@Test
public void testCanParse()
throws Exception {
final DefaultConfiguration checkConfig =
createCheckConfig(MemberNameCheck.class);
final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
verify(checkConfig, getNonCompilablePath("InputTypeUseAnnotationsOnQualifiedTypes.java"),
expected);
}
}

35
src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotationsOnArray.java Normal file
View File

@ -0,0 +1,35 @@
//Compilable with Java8
package com.puppycrawl.tools.checkstyle.grammars.java8;
import static java.lang.annotation.ElementType.TYPE_USE;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
public final class InputAnnotationsOnArray {
private InputAnnotationsOnArray() {
}
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;
}
}
@Retention(RetentionPolicy.CLASS)
@Target({ TYPE_USE })
@interface Nullable {
}

31
src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputTypeUseAnnotationsOnQualifiedTypes.java Normal file
View File

@ -0,0 +1,31 @@
//Compilable with Java8
package com.puppycrawl.tools.checkstyle.grammars.java8;
import java.awt.geom.Rectangle2D;
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
public class InputTypeUseAnnotationsOnQualifiedTypes {
/* 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 Ann {
}