Merge pull request #993 from S-Gaertner/master

#991 more robust terminal width detection for international Windows versions

Author: remkop

src/main/java/picocli/CommandLine.java

@@ -6697,7 +6697,9 @@ public void run() {
                                 txt += " " + line;
                             }
                             tracer.debug("getTerminalWidth() parsing output: %s%n", txt);
-                            Pattern pattern = Pattern.compile(".*olumns(:)?\\s+(\\d+)\\D.*", Pattern.DOTALL);
+                            Pattern pattern = (Help.Ansi.isWindows() && !Help.Ansi.isPseudoTTY())
+                                    ? Pattern.compile(".*?:\\s*(\\d+)\\D.*?:\\s*(\\d+)\\D.*", Pattern.DOTALL)
+                            		: Pattern.compile(".*olumns(:)?\\s+(\\d+)\\D.*", Pattern.DOTALL);
                             Matcher matcher = pattern.matcher(txt);
                             if (matcher.matches()) {
                                 size.set(Integer.parseInt(matcher.group(2)));
@@ -6715,7 +6717,7 @@ public void run() {
                 do {
                     if (size.intValue() >= 0) { break; }
                     try { Thread.sleep(25); } catch (InterruptedException ignored) {}
-                } while (System.currentTimeMillis() < now + 2000);
+                } while (System.currentTimeMillis() < now + 2000 && t.isAlive());
                 double duration = (System.nanoTime() - start) / 1000000.0;
                 tracer.debug("getTerminalWidth() returning: %s in %,.1fms%n", size, duration);
                 return size.intValue();

src/test/java/picocli/HelpTest.java

@@ -3619,7 +3619,24 @@ public void testGetTerminalWidthWindows() {
                 "    Keyboard delay: 1\n" +
                 "    Code page:      932\n" +
                 "\n";
-        Pattern pattern = Pattern.compile(".*olumns(:)?\\s+(\\d+)\\D.*", Pattern.DOTALL);
+        Pattern pattern = Pattern.compile(".*?:\\s*(\\d+)\\D.*?:\\s*(\\d+)\\D.*", Pattern.DOTALL);
+        Matcher matcher = pattern.matcher(sttyResult);
+        assertTrue(matcher.matches());
+        assertEquals(113, Integer.parseInt(matcher.group(2)));
+    }
+
+    @Test
+    public void testGetTerminalWidthWindowsInternational() {
+        String sttyResult = "\n" +
+                "Status von Gerät CON:\n" +
+                "---------------------\n" +
+                "    Zeilen:          9001\n" +
+                "    Spalten:         113\n" +
+                "    Wiederholrate:   31\n" +
+                "    Verzögerungszeit:1\n" +
+                "    Codepage:        850\n" +
+                "\n";
+        Pattern pattern = Pattern.compile(".*?:\\s*(\\d+)\\D.*?:\\s*(\\d+)\\D.*", Pattern.DOTALL);
         Matcher matcher = pattern.matcher(sttyResult);
         assertTrue(matcher.matches());
         assertEquals(113, Integer.parseInt(matcher.group(2)));