Issue #7878: Resolve Pitest Issues ImportOrderCheck (7)

checkstyle · Feb 11, 2021 · 7c7958a · 7c7958a
1 parent 77721c4
commit 7c7958a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.ci/pitest.sh b/.ci/pitest.sh
@@ -65,7 +65,6 @@ pitest-imports)
   declare -a ignoredItems=(
   "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'>        return !beforeFirstImport &#38;&#38; line - lastImportLine &#62; 1;</span></pre></td></tr>"
-  "ImportOrderCheck.java.html:<td class='covered'><pre><span  class='survived'>            staticImportSeparator = isStatic &#38;&#38; separated;</span></pre></td></tr>"
   "PkgImportControl.java.html:<td class='covered'><pre><span  class='survived'>        if (alreadyRegex) {</span></pre></td></tr>"
   "PkgImportControl.java.html:<td class='covered'><pre><span  class='survived'>        if (regex || parent.regex) {</span></pre></td></tr>"
   "PkgImportControl.java.html:<td class='covered'><pre><span  class='survived'>        if (regex) {</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
@@ -847,7 +847,7 @@ private boolean needSeparator(boolean isStatic) {
             staticImportSeparator = isStatic && separatedStaticGroups;
         }
         else {
-            staticImportSeparator = isStatic && separated;
+            staticImportSeparator = separated;
         }
         final boolean separatorBetween = isStatic != lastImportStatic
             && (separated || separatedStaticGroups);