From a4e79cf45cf1c2cdf6d598e475f22e4967029d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ryszard=20Wi=C5=9Bniewski?= Date: Sun, 10 Aug 2014 02:06:26 +0200 Subject: [PATCH] Added test and fix for the case if there is a semicolon between import statements. --- .../com/puppycrawl/tools/checkstyle/grammars/java.g | 1 + .../checkstyle/grammars/SemicolonBetweenImports.java | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/grammars/SemicolonBetweenImports.java diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/grammars/java.g b/src/main/resources/com/puppycrawl/tools/checkstyle/grammars/java.g index b7310a9bb..80ec2d488 100644 --- a/src/main/resources/com/puppycrawl/tools/checkstyle/grammars/java.g +++ b/src/main/resources/com/puppycrawl/tools/checkstyle/grammars/java.g @@ -215,6 +215,7 @@ packageDefinition importDefinition options {defaultErrorHandler = true;} : i:"import"^ {#i.setType(IMPORT);} ( "static" {#i.setType(STATIC_IMPORT);} )? identifierStar SEMI + | SEMI ; // A type definition in a file is either a class, interface, enum of annotation definition diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/SemicolonBetweenImports.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/SemicolonBetweenImports.java new file mode 100644 index 000000000..79a64e55b --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/SemicolonBetweenImports.java @@ -0,0 +1,9 @@ +package com.puppycrawl.tools.checkstyle.grammars; + +import java.util.Arrays; +; +import java.util.ArrayList; + +public class SemicolonBetweenImports +{ +}