Mark truncated values with a '…'

Author: fickludd

cypher-shell/src/main/java/org/neo4j/shell/prettyprint/OutputFormatter.java

@@ -163,7 +163,7 @@ static boolean isNotBlank(String string) {
     }
 
     @Nonnull static String rightPad(@Nonnull String str, int width) {
-        return rightPad(str,width,' ');
+        return rightPad(str, width, ' ');
     }
     @Nonnull static String rightPad(@Nonnull String str, int width, char c) {
         int actualSize = str.length();

cypher-shell/src/main/java/org/neo4j/shell/prettyprint/TableOutputFormatter.java

@@ -110,10 +110,18 @@ private String formatRow(StringBuilder sb, int[] columnSizes, String[] row) {
             String txt = row[i];
             if (txt != null) {
                 if (txt.length() > length) {
-                    row[i] = txt.substring(length);
-                    remainder = true;
-                } else row[i] = null;
-                sb.append(OutputFormatter.rightPad(txt, length));
+                    if (wrap) {
+                        sb.append(txt, 0, length);
+                        row[i] = txt.substring(length);
+                        remainder = true;
+                    } else {
+                        sb.append(txt, 0, length - 1);
+                        sb.append("…");
+                    }
+                } else {
+                    row[i] = null;
+                    sb.append(OutputFormatter.rightPad(txt, length));
+                }
             } else {
                 sb.append(OutputFormatter.repeat(' ', length));
             }

cypher-shell/src/test/java/org/neo4j/shell/prettyprint/TableOutputFormatterTest.java

@@ -306,7 +306,7 @@ public void wrapContent()
     }
 
     @Test
-    public void cutContent()
+    public void truncateContent()
     {
         // GIVEN
         StatementResult result = mockResult( asList( "c1"), "a", "bb","ccc","dddd","eeeee" );
@@ -321,9 +321,9 @@ public void cutContent()
                 "+------+\n" +
                 "| \"a\"  |\n" +
                 "| \"bb\" |\n" +
-                "| \"ccc |\n" +
-                "| \"ddd |\n" +
-                "| \"eee |\n" +
+                "| \"cc… |\n" +
+                "| \"dd… |\n" +
+                "| \"ee… |\n" +
                 "+------+\n"));
     }