Fix bug in order imports related to star folding

openrewrite · Jun 16, 2020 · 58e64dd · 58e64dd
1 parent 9dfc098
commit 58e64dd
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/OrderImports.java b/rewrite-java/src/main/java/org/openrewrite/java/OrderImports.java
@@ -241,9 +241,6 @@ public List<J.Import> orderedImports() {
                     int consecutiveSamePackages = 0;
                     for (int i = 0; i < imports.size(); i++) {
                         consecutiveSamePackages++;
-                        if ("*".equals(imports.get(i).getQualid().getSimpleName())) {
-                            foundStar = true;
-                        }
                         if (i > 1 && !imports.get(i - 1).getPackageName().equals(imports.get(i).getPackageName())) {
                             int threshold = statik ? nameCountToUseStarImport : classCountToUseStarImport;
                             if (consecutiveSamePackages >= threshold || (consecutiveSamePackages > 1 && foundStar)) {
@@ -259,6 +256,9 @@ public List<J.Import> orderedImports() {
                             consecutiveSamePackages = 1;
                             foundStar = false;
                         }
+                        if ("*".equals(imports.get(i).getQualid().getSimpleName())) {
+                            foundStar = true;
+                        }
                     }
 
                     return imports;

diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/java/OrderImportTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/java/OrderImportTest.kt
@@ -248,4 +248,27 @@ interface OrderImportTest {
             public class A {}
         """.trimIndent())
     }
-}
+
+    @Test
+    fun twoImportsFollowedByStar(jp: JavaParser) {
+        val a = jp.parse("""
+            import java.io.IOException;
+            import java.io.UncheckedIOException;
+            import java.nio.files.*;
+            
+            public class A {}
+        """.trimIndent())
+
+        val fixed = a.refactor().visit(OrderImports.intellij().apply {
+            setRemoveUnused(false)
+        }).fix().fixed
+
+        assertRefactored(fixed, """
+            import java.io.IOException;
+            import java.io.UncheckedIOException;
+            import java.nio.files.*;
+            
+            public class A {}
+        """.trimIndent())
+    }
+}