From 38d6b96ac86618d1c4ccdce56b6476b09862d085 Mon Sep 17 00:00:00 2001
From: kaustubh <dxtkastb@gmail.com>
Date: Sun, 12 Apr 2020 19:01:57 +0530
Subject: [PATCH] Issue #7873: Resolve Pitest Issues - ImportOrderCheck (2)

---
 .ci/pitest.sh                                                   | 1 -
 .../tools/checkstyle/checks/imports/ImportOrderCheck.java       | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.ci/pitest.sh b/.ci/pitest.sh
index 333f01ccead..b07e901ad2b 100755
--- a/.ci/pitest.sh
+++ b/.ci/pitest.sh
@@ -73,7 +73,6 @@ pitest-imports)
   "IllegalImportCheck.java.html:<td class='covered'><pre><span  class='survived'>        if (!result) {</span></pre></td></tr>"
   "ImportControlLoader.java.html:<td class='covered'><pre><span  class='survived'>        else if (ALLOW_ELEMENT_NAME.equals(qName) || &#34;disallow&#34;.equals(qName)) {</span></pre></td></tr>"
   "ImportOrderCheck.java.html:<td class='covered'><pre><span  class='survived'>                else if (matcher.start() == bestPos &#38;&#38; matcher.end() &#62; bestEnd) {</span></pre></td></tr>"
-  "ImportOrderCheck.java.html:<td class='covered'><pre><span  class='survived'>        final boolean separatorBetween = isStatic != lastImportStatic</span></pre></td></tr>"
   "ImportOrderCheck.java.html:<td class='covered'><pre><span  class='survived'>                if (!CommonUtil.endsWithChar(pkg, &#39;.&#39;)) {</span></pre></td></tr>"
   "ImportOrderCheck.java.html:<td class='covered'><pre><span  class='survived'>        if (isStatic) {</span></pre></td></tr>"
   "ImportOrderCheck.java.html:<td class='covered'><pre><span  class='survived'>        return !beforeFirstImport &#38;&#38; line - lastImportLine &#62; 1;</span></pre></td></tr>"
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java
index 13a5febcc65..4cc073c2d38 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java
@@ -701,7 +701,7 @@ private boolean needSeparator(boolean isStatic) {
             staticImportSeparator = isStatic && separated;
         }
         final boolean separatorBetween = isStatic != lastImportStatic
-            && (separated || separatedStaticGroups) && staticImportsApart;
+            && (separated || separatedStaticGroups);
 
         return typeImportSeparator || staticImportSeparator || separatorBetween;
     }