Improve output of TextReporter

packages/istanbul-reports/lib/text/index.js

@@ -23,10 +23,9 @@ function padding(num, ch) {
 }
 
 function fill(str, width, right, tabs) {
-    tabs = tabs || 0;
     str = String(str);
 
-    const leadingSpaces = tabs * TAB_SIZE;
+    const leadingSpaces = (tabs || 0) * TAB_SIZE;
     const remaining = width - leadingSpaces;
     const leader = padding(leadingSpaces);
     let fmtStr = '';
@@ -36,12 +35,30 @@ function fill(str, width, right, tabs) {
         let fillStr;
 
         if (remaining >= strlen) {
-            fillStr = padding(remaining - strlen);
+            fillStr = (right || tabs !== undefined)
+                ? padding(remaining - strlen)
+                : '';
         } else {
             fillStr = '...';
             const length = remaining - fillStr.length;
 
-            str = str.substring(strlen - length);
+            if (tabs !== undefined) {
+                str = str.substring(strlen - length);
+            } else {
+                const ranges = str.split(' ')
+                while(ranges.shift()) {
+                  str = ranges.join(' ');
+
+                  if (str.length < length) {
+                      break;
+                  }
+                }
+
+                if (str.length) {
+                    fillStr = fillStr + ' ';
+                }
+            }
+
             right = true;
         }
         fmtStr = right ? fillStr + str : str + fillStr;
@@ -58,6 +75,19 @@ function formatPct(pct, width) {
     return fill(pct, width || PCT_COLS, true, 0);
 }
 
+function splitlastRange(ranges) {
+    const {length} = ranges;
+    if (!length) return
+
+    const lastRange = ranges[length - 1];
+    if(lastRange.length !== 2) return
+
+    const [start, end] = lastRange;
+
+    ranges.pop();
+    ranges.push([start], [end]);
+}
+
 function nodeMissing(node) {
     if (node.isSummary()) {
         return '';
@@ -81,28 +111,34 @@ function nodeMissing(node) {
     }
 
     let newRange = true;
-    const ranges = coveredLines
+    let ranges = coveredLines
         .reduce((acum, [line, hit]) => {
-            if (hit) newRange = true;
-            else {
+            if (hit) {
+                splitlastRange(acum);
+                newRange = true;
+            } else {
                 line = parseInt(line);
                 if (newRange) {
                     acum.push([line]);
                     newRange = false;
-                } else acum[acum.length - 1][1] = line;
+                } else acum[acum.length - 1].push(line);
             }
 
             return acum;
         }, [])
+
+    splitlastRange(ranges);
+
+    ranges = ranges
         .map(range => {
             const { length } = range;
 
             if (length === 1) return range[0];
 
-            return `${range[0]}-${range[1]}`;
+            return `${range[0]}-${range[range.length - 1]}`;
         });
 
-    return [].concat(...ranges).join(',');
+    return [].concat(...ranges).join(' ');
 }
 
 function nodeName(node) {

packages/istanbul-reports/test/fixtures/specs/100-line-100-branch.json

@@ -4,7 +4,7 @@
         "maxCols": 80,
         "projectRoot": "/Users/benjamincoe/oss/"
     },
-    "textReportExpected": "----------|---------|----------|---------|---------|-------------------\nFile      | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s \n----------|---------|----------|---------|---------|-------------------\n\u001b[32;1mAll files\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m     100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[33;1m                 \u001b[0m \n\u001b[32;1m index.js\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m     100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[33;1m                 \u001b[0m \n----------|---------|----------|---------|---------|-------------------\n",
+    "textReportExpected": "----------|---------|----------|---------|---------|-------------------\nFile      | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s \n----------|---------|----------|---------|---------|-------------------\n\u001b[32;1mAll files\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m     100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[33;1m\u001b[0m \n\u001b[32;1m index.js\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m     100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[33;1m\u001b[0m \n----------|---------|----------|---------|---------|-------------------\n",
     "htmlSpaFiles": ["index.js.html", "index.html"],
     "htmlSpaCoverageData": {
         "file": "",

packages/istanbul-reports/test/fixtures/specs/100-line-missing-branch.json

@@ -1,6 +1,6 @@
 {
     "title": "100% line coverage, missing branch coverage",
-    "textReportExpected": "----------|---------|----------|---------|---------|-------------------\nFile      | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s \n----------|---------|----------|---------|---------|-------------------\n\u001b[32;1mAll files\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m   95.34\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[33;1m                 \u001b[0m \n\u001b[32;1m index.js\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m   95.34\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[33;1m21,29            \u001b[0m \n----------|---------|----------|---------|---------|-------------------\n",
+    "textReportExpected": "----------|---------|----------|---------|---------|-------------------\nFile      | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s \n----------|---------|----------|---------|---------|-------------------\n\u001b[32;1mAll files\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m   95.34\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[33;1m\u001b[0m \n\u001b[32;1m index.js\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m   95.34\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[33;1m21 29\u001b[0m \n----------|---------|----------|---------|---------|-------------------\n",
     "opts": {
         "maxCols": 80,
         "projectRoot": "/Users/benjamincoe/oss/"

packages/istanbul-reports/test/fixtures/specs/coalescence.json

@@ -4,7 +4,7 @@
         "maxCols": 80,
         "projectRoot": "/"
     },
-    "textReportExpected": "----------|---------|----------|---------|---------|----------------------\nFile      | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s    \n----------|---------|----------|---------|---------|----------------------\n\u001b[31;1mAll files\u001b[0m | \u001b[31;1m     30\u001b[0m | \u001b[32;1m     100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[31;1m  33.33\u001b[0m | \u001b[31;1m                    \u001b[0m \n\u001b[31;1m index.js\u001b[0m | \u001b[31;1m     30\u001b[0m | \u001b[32;1m     100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[31;1m  33.33\u001b[0m | \u001b[31;1m2,4,9,21-28,32,35-37\u001b[0m \n----------|---------|----------|---------|---------|----------------------\n",
+    "textReportExpected": "----------|---------|----------|---------|---------|----------------------\nFile      | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s \n----------|---------|----------|---------|---------|----------------------\n\u001b[31;1mAll files\u001b[0m | \u001b[31;1m     30\u001b[0m | \u001b[32;1m     100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[31;1m  33.33\u001b[0m | \u001b[31;1m\u001b[0m \n\u001b[31;1m index.js\u001b[0m | \u001b[31;1m     30\u001b[0m | \u001b[32;1m     100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[31;1m  33.33\u001b[0m | \u001b[31;1m2 4 9 21-28 32 35-37\u001b[0m \n----------|---------|----------|---------|---------|----------------------\n",
     "htmlSpaFiles": ["index.js.html", "index.html"],
     "htmlSpaCoverageData": {
         "file": "",

packages/istanbul-reports/test/fixtures/specs/different-path-files.json

@@ -4,7 +4,7 @@
       "maxCols": 80,
       "projectRoot": "/Users/jschmidle/oss/istanbuljs-test/"
     },
-    "textReportExpected": "-------------------|---------|----------|---------|---------|-------------------\nFile               | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s \n-------------------|---------|----------|---------|---------|-------------------\nAll files          |       0 |        0 |       0 |       0 | \u001b[31;1m                 \u001b[0m \n istanbuljs-test   |       0 |        0 |       0 |       0 | \u001b[31;1m                 \u001b[0m \n  rootfile.js      |       0 |        0 |       0 |       0 | \u001b[31;1m                 \u001b[0m \n ...-test/package1 |       0 |        0 |       0 |       0 | \u001b[31;1m                 \u001b[0m \n  package1file.js  |       0 |        0 |       0 |       0 | \u001b[31;1m                 \u001b[0m \n ...ge1/subpackage |       0 |        0 |       0 |       0 | \u001b[31;1m                 \u001b[0m \n  ...ackagefile.js |       0 |        0 |       0 |       0 | \u001b[31;1m                 \u001b[0m \n ...-test/package2 |       0 |        0 |       0 |       0 | \u001b[31;1m                 \u001b[0m \n  package2file.js  |       0 |        0 |       0 |       0 | \u001b[31;1m                 \u001b[0m \n-------------------|---------|----------|---------|---------|-------------------\n",
+    "textReportExpected": "-------------------|---------|----------|---------|---------|-------------------\nFile               | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s \n-------------------|---------|----------|---------|---------|-------------------\nAll files          |       0 |        0 |       0 |       0 | \u001b[31;1m\u001b[0m \n istanbuljs-test   |       0 |        0 |       0 |       0 | \u001b[31;1m\u001b[0m \n  rootfile.js      |       0 |        0 |       0 |       0 | \u001b[31;1m\u001b[0m \n ...-test/package1 |       0 |        0 |       0 |       0 | \u001b[31;1m\u001b[0m \n  package1file.js  |       0 |        0 |       0 |       0 | \u001b[31;1m\u001b[0m \n ...ge1/subpackage |       0 |        0 |       0 |       0 | \u001b[31;1m\u001b[0m \n  ...ackagefile.js |       0 |        0 |       0 |       0 | \u001b[31;1m\u001b[0m \n ...-test/package2 |       0 |        0 |       0 |       0 | \u001b[31;1m\u001b[0m \n  package2file.js  |       0 |        0 |       0 |       0 | \u001b[31;1m\u001b[0m \n-------------------|---------|----------|---------|---------|-------------------\n",
     "htmlSpaFiles": [
         ["package1","package1file.js.html"],
         ["package1","subpackage","subpackagefile.js.html"],

packages/istanbul-reports/test/fixtures/specs/empty-file.json

@@ -4,7 +4,7 @@
         "maxCols": 80,
         "projectRoot": "/dev/git/istanbuljs/packages/istanbul-reports"
     },
-    "textReportExpected": "----------|---------|----------|---------|---------|-------------------\nFile      | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s \n----------|---------|----------|---------|---------|-------------------\nAll files |       0 |        0 |       0 |       0 | \u001b[31;1m                 \u001b[0m \n empty.js |       0 |        0 |       0 |       0 | \u001b[31;1m                 \u001b[0m \n----------|---------|----------|---------|---------|-------------------\n",
+    "textReportExpected": "----------|---------|----------|---------|---------|-------------------\nFile      | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s \n----------|---------|----------|---------|---------|-------------------\nAll files |       0 |        0 |       0 |       0 | \u001b[31;1m\u001b[0m \n empty.js |       0 |        0 |       0 |       0 | \u001b[31;1m\u001b[0m \n----------|---------|----------|---------|---------|-------------------\n",
     "htmlSpaFiles": ["empty.js.html", "index.html"],
     "htmlSpaCoverageData": {
         "file": "",

packages/istanbul-reports/test/fixtures/specs/maxcols.json

@@ -4,7 +4,7 @@
         "maxCols": 80,
         "projectRoot": "/"
     },
-    "textReportExpected": "----------|---------|----------|---------|---------|----------------------------\nFile      | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s          \n----------|---------|----------|---------|---------|----------------------------\n\u001b[31;1mAll files\u001b[0m | \u001b[31;1m     40\u001b[0m | \u001b[32;1m     100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[31;1m     40\u001b[0m | \u001b[31;1m                          \u001b[0m \n\u001b[31;1m index.js\u001b[0m | \u001b[31;1m     40\u001b[0m | \u001b[32;1m     100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[31;1m     40\u001b[0m | \u001b[31;1m...11,15,19,23,27,31,35,39\u001b[0m \n----------|---------|----------|---------|---------|----------------------------\n",
+    "textReportExpected": "----------|---------|----------|---------|---------|----------------------------\nFile      | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s \n----------|---------|----------|---------|---------|----------------------------\n\u001b[31;1mAll files\u001b[0m | \u001b[31;1m     40\u001b[0m | \u001b[32;1m     100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[31;1m     40\u001b[0m | \u001b[31;1m\u001b[0m \n\u001b[31;1m index.js\u001b[0m | \u001b[31;1m     40\u001b[0m | \u001b[32;1m     100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[31;1m     40\u001b[0m | \u001b[31;1m... 15 19 23 27 31 35 39\u001b[0m \n----------|---------|----------|---------|---------|----------------------------\n",
     "htmlSpaFiles": ["index.js.html", "index.html"],
     "htmlSpaCoverageData": {
         "file": "",

packages/istanbul-reports/test/fixtures/specs/missing-decl.json

@@ -1,6 +1,6 @@
 {
     "title": "100% line coverage, missing branch coverage",
-    "textReportExpected": "----------|---------|----------|---------|---------|-------------------\nFile      | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s \n----------|---------|----------|---------|---------|-------------------\n\u001b[32;1mAll files\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m   95.34\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[33;1m                 \u001b[0m \n\u001b[32;1m index.js\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m   95.34\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[33;1m21,29            \u001b[0m \n----------|---------|----------|---------|---------|-------------------\n",
+    "textReportExpected": "----------|---------|----------|---------|---------|-------------------\nFile      | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s \n----------|---------|----------|---------|---------|-------------------\n\u001b[32;1mAll files\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m   95.34\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[33;1m\u001b[0m \n\u001b[32;1m index.js\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m   95.34\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[32;1m    100\u001b[0m | \u001b[33;1m21 29\u001b[0m \n----------|---------|----------|---------|---------|-------------------\n",
     "lcovonlyExpected": "TN:\nSF:\nFN:12,TestExclude\nFN:50,(anonymous_1)\nFN:52,(anonymous_2)\nFN:61,(anonymous_3)\nFN:71,(anonymous_4)\nFN:84,prepGlobPatterns\nFN:85,(anonymous_6)\nFN:100,(anonymous_7)\nFNF:8\nFNH:8\nFNDA:21,TestExclude\nFNDA:21,(anonymous_1)\nFNDA:95,(anonymous_2)\nFNDA:56,(anonymous_3)\nFNDA:7,(anonymous_4)\nFNDA:26,prepGlobPatterns\nFNDA:105,(anonymous_6)\nFNDA:21,(anonymous_7)\nDA:1,1\nDA:2,1\nDA:3,1\nDA:4,1\nDA:5,1\nDA:13,21\nDA:21,21\nDA:22,21\nDA:24,21\nDA:25,7\nDA:28,21\nDA:29,15\nDA:32,21\nDA:33,5\nDA:35,16\nDA:38,21\nDA:39,5\nDA:42,21\nDA:50,1\nDA:51,21\nDA:52,21\nDA:53,95\nDA:55,95\nDA:56,95\nDA:58,21\nDA:61,1\nDA:62,56\nDA:65,56\nDA:67,55\nDA:68,55\nDA:71,1\nDA:72,7\nDA:76,7\nDA:77,6\nDA:78,6\nDA:80,1\nDA:85,26\nDA:87,105\nDA:88,39\nDA:92,105\nDA:93,50\nDA:96,105\nDA:100,1\nDA:101,21\nDA:104,1\nDA:113,1\nLF:46\nLH:46\nBRDA:21,0,0,1\nBRDA:21,0,1,20\nBRDA:21,1,0,1\nBRDA:21,1,1,0\nBRDA:22,2,0,1\nBRDA:22,2,1,20\nBRDA:24,3,0,7\nBRDA:24,3,1,14\nBRDA:24,4,0,21\nBRDA:24,4,1,18\nBRDA:24,4,2,15\nBRDA:28,5,0,15\nBRDA:28,5,1,6\nBRDA:28,6,0,21\nBRDA:28,6,1,8\nBRDA:29,7,0,15\nBRDA:29,7,1,0\nBRDA:32,8,0,5\nBRDA:32,8,1,16\nBRDA:32,9,0,21\nBRDA:32,9,1,5\nBRDA:38,10,0,5\nBRDA:38,10,1,16\nBRDA:38,11,0,21\nBRDA:38,11,1,20\nBRDA:55,12,0,1\nBRDA:55,12,1,94\nBRDA:62,13,0,56\nBRDA:62,13,1,56\nBRDA:65,14,0,1\nBRDA:65,14,1,55\nBRDA:68,15,0,55\nBRDA:68,15,1,15\nBRDA:68,15,2,50\nBRDA:76,16,0,6\nBRDA:76,16,1,1\nBRDA:76,17,0,7\nBRDA:76,17,1,7\nBRDA:76,17,2,6\nBRDA:87,18,0,39\nBRDA:87,18,1,66\nBRDA:92,19,0,50\nBRDA:92,19,1,55\nBRF:43\nBRH:41\nend_of_record\n",
     "htmlSpaFiles": ["index.js.html", "index.html"],
     "htmlSpaCoverageData": {

packages/istanbul-reports/test/fixtures/specs/missing-line-missing-branch.json

@@ -1,6 +1,6 @@
 {
     "title": "missing line and branch coverage",
-    "textReportExpected": "----------|---------|----------|---------|---------|-------------------\nFile      | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s \n----------|---------|----------|---------|---------|-------------------\n\u001b[32;1mAll files\u001b[0m | \u001b[32;1m  98.03\u001b[0m | \u001b[32;1m   95.34\u001b[0m | \u001b[32;1m  88.88\u001b[0m | \u001b[32;1m  97.87\u001b[0m | \u001b[31;1m                 \u001b[0m \n\u001b[32;1m index.js\u001b[0m | \u001b[32;1m  98.03\u001b[0m | \u001b[32;1m   95.34\u001b[0m | \u001b[32;1m  88.88\u001b[0m | \u001b[32;1m  97.87\u001b[0m | \u001b[31;1m9                \u001b[0m \n----------|---------|----------|---------|---------|-------------------\n",
+    "textReportExpected": "----------|---------|----------|---------|---------|-------------------\nFile      | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s \n----------|---------|----------|---------|---------|-------------------\n\u001b[32;1mAll files\u001b[0m | \u001b[32;1m  98.03\u001b[0m | \u001b[32;1m   95.34\u001b[0m | \u001b[32;1m  88.88\u001b[0m | \u001b[32;1m  97.87\u001b[0m | \u001b[31;1m\u001b[0m \n\u001b[32;1m index.js\u001b[0m | \u001b[32;1m  98.03\u001b[0m | \u001b[32;1m   95.34\u001b[0m | \u001b[32;1m  88.88\u001b[0m | \u001b[32;1m  97.87\u001b[0m | \u001b[31;1m9\u001b[0m \n----------|---------|----------|---------|---------|-------------------\n",
     "opts": {
         "maxCols": 80,
         "projectRoot": "/Users/benjamincoe/oss"