From 5e114ca5f0486a336cdff9697b0910c16f5689c5 Mon Sep 17 00:00:00 2001 From: tvanderlippe Date: Wed, 27 Mar 2019 10:17:56 -0700 Subject: [PATCH] Do not crash when encountering double semi-colon after package statement MOE_MIGRATED_REVID=240588095 --- .../google/googlejavaformat/java/JavaInputAstVisitor.java | 1 + .../google/googlejavaformat/java/testdata/CL240367479.input | 6 ++++++ .../googlejavaformat/java/testdata/CL240367479.output | 6 ++++++ 3 files changed, 13 insertions(+) create mode 100644 core/src/test/resources/com/google/googlejavaformat/java/testdata/CL240367479.input create mode 100644 core/src/test/resources/com/google/googlejavaformat/java/testdata/CL240367479.output diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java index 59f7cffbb..81b37e16b 100644 --- a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java +++ b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java @@ -347,6 +347,7 @@ public Void visitCompilationUnit(CompilationUnitTree node, Void unused) { builder.forcedBreak(); first = false; } + dropEmptyDeclarations(); if (!node.getImports().isEmpty()) { if (!first) { builder.blankLineWanted(BlankLineWanted.YES); diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/CL240367479.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/CL240367479.input new file mode 100644 index 000000000..be76390d7 --- /dev/null +++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/CL240367479.input @@ -0,0 +1,6 @@ +package foo;; + +import com.google.second.Foo; +import com.google.first.Bar; + +public class Blim {} diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/CL240367479.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/CL240367479.output new file mode 100644 index 000000000..025d2370e --- /dev/null +++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/CL240367479.output @@ -0,0 +1,6 @@ +package foo; +; +import com.google.second.Foo; +import com.google.first.Bar; + +public class Blim {}