Merge pull request #427 from bjab/dumb-color-fix

Properly register dumb-color terminal caps file, fixes #328
jline · Sep 3, 2019 · f3bea60 · f3bea60
2 parents 13708e2 + 742b0cb
commit f3bea60
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 8 deletions.
diff --git a/terminal/src/main/java/org/jline/utils/InfoCmp.java b/terminal/src/main/java/org/jline/utils/InfoCmp.java
@@ -511,7 +511,7 @@ public static Capability byName(String name) {
             return getCapabilitiesByName().get(name);
         }
     }
-    
+
     public static Map<String, Capability> getCapabilitiesByName() {
         Map<String, Capability> capabilities = new LinkedHashMap<>();
         try (InputStream is = InfoCmp.class.getResourceAsStream("capabilities.txt");
@@ -550,7 +550,7 @@ public static String getInfoCmp(
         }
         return caps;
     }
-    
+
     public static String getLoadedInfoCmp(String terminal) {
         Object caps = CAPS.get(terminal);
         if (caps instanceof Supplier) {
@@ -615,9 +615,9 @@ static String loadDefaultInfoCmp(String name) {
     }
 
     static {
-        for (String s : Arrays.asList("dumb", "ansi", "xterm", "xterm-256color",
-                                      "windows", "windows-256color", "windows-conemu", "windows-vtp",
-                                      "screen", "screen-256color")) {
+        for (String s : Arrays.asList("dumb", "dumb-color", "ansi", "xterm", "xterm-256color",
+                "windows", "windows-256color", "windows-conemu", "windows-vtp",
+                "screen", "screen-256color")) {
             setDefaultInfoCmp(s, () -> loadDefaultInfoCmp(s));
         }
     }

diff --git a/...esources/org/jline/utils/dumb-colors.caps → ...resources/org/jline/utils/dumb-color.caps b/...esources/org/jline/utils/dumb-colors.caps → ...resources/org/jline/utils/dumb-color.caps
diff --git a/terminal/src/test/java/org/jline/utils/InfoCmpTest.java b/terminal/src/test/java/org/jline/utils/InfoCmpTest.java
@@ -8,15 +8,31 @@
  */
 package org.jline.utils;
 
+import org.jline.utils.InfoCmp.Capability;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.PathMatcher;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
-import org.jline.utils.InfoCmp.Capability;
-import org.junit.Test;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -60,4 +76,30 @@ public void testClrEos() {
         InfoCmp.parseInfoCmp(infocmp, bools, ints, strings);
         assertEquals("\\E[J", strings.get(Capability.clr_eos));
     }
+
+    @Test
+    public void testAllCapsFile() throws IOException {
+        String packagePath = InfoCmp.class.getPackage().getName().replace(".", "/");
+        ArrayList<URL> packageLocations = Collections.list(Thread.currentThread().getContextClassLoader().getResources(packagePath));
+        List<String> allCaps = packageLocations.stream().map(url -> {
+            try {
+                Path capsLocation = Paths.get(url.toURI());
+                PathMatcher pathMatcher = FileSystems.getDefault().getPathMatcher("glob:**.caps");
+                List<String> s = Files.walk(capsLocation)
+                        .filter(pathMatcher::matches)
+                        .map(Path::getFileName)
+                        .map(Path::toString)
+                        .map(fileName -> fileName.split("\\.")[0])
+                        .collect(Collectors.toList());
+                return s.stream();
+            } catch (URISyntaxException | IOException e) {
+                throw new RuntimeException(e);
+            }
+        }).flatMap(Function.identity())
+                .collect(Collectors.toList());
+
+        allCaps.forEach(
+                (capsName) -> assertNotNull(String.format("%s.caps was not registered in InfoCmp class", capsName), InfoCmp.getLoadedInfoCmp(capsName))
+        );
+    }
 }