tests ok

rtmigo · Mar 20, 2021 · 33b7de5 · 33b7de5
1 parent 5a58d31
commit 33b7de5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -65,7 +65,7 @@ Winter | 12 | December  |   31 |   258
 ### Add border
 
 ``` dart
-tabular(data, outerBorder: false);
+tabular(data, outerBorder: true);
 ```
 
 ``` text

diff --git a/lib/src/inner.dart b/lib/src/inner.dart
@@ -286,7 +286,11 @@ String generateBar(int width, Side? align) {
 
 /// @param sorting Determines the sorting order.
 String tabular(List<List<dynamic>> rows,
-    {List<Side>? headerAlign, List<Side>? rowAlign, List<Sort>? sort, markdownAlign = false, outerBorder=false}) {
+    {List<Side>? headerAlign,
+    List<Side>? rowAlign,
+    List<Sort>? sort,
+    markdownAlign = false,
+    outerBorder = false}) {
   final matrix = CellsMatrix(rows);
 
   if (sort != null) {
@@ -302,49 +306,35 @@ String tabular(List<List<dynamic>> rows,
     matrix.sortBy(sortingIndexes);
   }
 
-  String bar='';
+  String bar = '';
   if (outerBorder) {
-    bar+='|';
+    bar += '|';
   }
-  for (int i=0; i<matrix.columns.length; ++i) {
+  for (int i = 0; i < matrix.columns.length; ++i) {
     final align = markdownAlign ? matrix.columns[i].guessAlign() : null;
     final width = matrix.columns[i].textWidth;
 
-
-    final bool isFirstColumn = i==0;
-    final bool isLastColumn = i==matrix.columns.length-1;
+    final bool isFirstColumn = i == 0;
+    final bool isLastColumn = i == matrix.columns.length - 1;
 
     int extra = ((isFirstColumn || isLastColumn) && !outerBorder) ? -1 : 0;
 
     switch (align) {
       case null:
       case Side.left:
-        bar+=('-' * (width + 2 + extra));
+        bar += ('-' * (width + 2 + extra));
         break;
       case Side.right:
-        bar+=('-' * (width + 1 + extra) + ':');
+        bar += ('-' * (width + 1 + extra) + ':');
         break;
       case Side.center:
-        bar+=(':' + '-' * width + ':');
+        bar += (':' + '-' * width + ':');
     }
 
     if (outerBorder || !isLastColumn) {
       bar += '|';
     }
   }
-  // if (outerBorder) {
-  //   bar+='|';
-  // }
-
-  //
-  // var bar2 = List.generate(
-  //         matrix.columnsCount,
-  //         (i) => generateBar(
-  //             matrix.columns[i].textWidth, markdownAlign ? matrix.columns[i].guessAlign() : null))
-  //     .join('|');
-  // if (outerBorder) {
-  //   bar2 = '|' + bar2 + '|';
-  // }
 
   final formattedRows = <String>[];
 
@@ -356,24 +346,20 @@ String tabular(List<List<dynamic>> rows,
       formattedRows.add(bar);
     }
 
-
     var formatted = '';
-    // if (outerBorder) {
-    //   formatted+='| ';
-    // }
+
     var iCol = -1;
 
     for (final me in enumerate(row)) {
       final cell = me.value;
-      if (me.index==0) {
+      if (me.index == 0) {
         if (outerBorder) {
-        formatted += '| '; }
+          formatted += '| ';
+        }
       } else {
         formatted += ' | ';
       }
 
-
-      //formatted += ' | ';
       iCol++;
 
       formatted += alignCell(