Solve the problem that the icons are colored even after using the '--…

…no-colors' option
anas-stuff · Jun 10, 2022 · 7907325 · 7907325
1 parent f67e122
commit 7907325
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/main/java/com/anas/javautils/jls/output/FileInfo.java b/src/main/java/com/anas/javautils/jls/output/FileInfo.java
@@ -140,7 +140,7 @@ public String getCreationTime(final boolean withColor) {
         return withColor ? str.toString() : str.getNormalString();
     }
 
-    public Icon getIcon(final boolean withColor) {
+    public Icon getIcon() {
         Icon icon = Icon.getCorrectIcon(getName());
 
         if (icon != null) return icon;

diff --git a/src/main/java/com/anas/javautils/jls/output/Icon.java b/src/main/java/com/anas/javautils/jls/output/Icon.java
@@ -317,4 +317,8 @@ public String toString() {
                 new String(color.getForegroundSGRSequence(), StandardCharsets.UTF_8) + "m" +
                 icon + "\033[0m";
     }
+
+    public String getNoColoredIcon() {
+        return icon + "";
+    }
 }
diff --git a/src/main/java/com/anas/javautils/jls/output/ListOfFiles.java b/src/main/java/com/anas/javautils/jls/output/ListOfFiles.java
@@ -119,7 +119,8 @@ private String getShortFormat(
                         (withSize ? "  %s" : "%s");
 
         return String.format(format,
-                IS_NO_ICONS ? "" : fileInfo.getIcon(IS_WITH_NO_COLORS),
+                IS_NO_ICONS ? "" : (IS_WITH_NO_COLORS ?
+                        fileInfo.getIcon().toString() : fileInfo.getIcon().getNoColoredIcon()),
                 fileInfo.getName(IS_WITH_NO_COLORS),
                 fileInfo.isSymlink() ? fileInfo.getSymlinkTarget(IS_WITH_NO_COLORS) : "",
                 withSize ? fileInfo.getSize(IS_HUMAN_READABLE, IS_WITH_NO_COLORS) : ""