table: do not merge content cells with empty ones (#280)

jedib0t · Oct 27, 2023 · 64ffc58 · 64ffc58
1 parent 17050b7
commit 64ffc58
Show file tree

Hide file tree

Showing 17 changed files with 971 additions and 868 deletions.
diff --git a/list/render.go b/list/render.go
@@ -6,15 +6,15 @@ import (
 )
 
 // Render renders the List in a human-readable "pretty" format. Example:
-//  * Game Of Thrones
-//    * Winter
-//    * Is
-//    * Coming
-//      * This
-//      * Is
-//      * Known
-//  * The Dark Tower
-//    * The Gunslinger
+// | * Game Of Thrones
+// |   * Winter
+// |   * Is
+// |   * Coming
+// |     * This
+// |     * Is
+// |     * Known
+// | * The Dark Tower
+// |   * The Gunslinger
 func (l *List) Render() string {
 	l.initForRender()
 

diff --git a/list/render_html.go b/list/render_html.go
@@ -7,23 +7,24 @@ import (
 )
 
 // RenderHTML renders the List in the HTML format. Example:
-//  <ul class="go-pretty-table">
-//    <li>Game Of Thrones</li>
-//    <ul class="go-pretty-table-1">
-//      <li>Winter</li>
-//      <li>Is</li>
-//      <li>Coming</li>
-//      <ul class="go-pretty-table-2">
-//        <li>This</li>
-//        <li>Is</li>
-//        <li>Known</li>
-//      </ul>
-//    </ul>
-//    <li>The Dark Tower</li>
-//    <ul class="go-pretty-table-1">
-//      <li>The Gunslinger</li>
-//    </ul>
-//  </ul>
+//
+//	<ul class="go-pretty-table">
+//	  <li>Game Of Thrones</li>
+//	  <ul class="go-pretty-table-1">
+//	    <li>Winter</li>
+//	    <li>Is</li>
+//	    <li>Coming</li>
+//	    <ul class="go-pretty-table-2">
+//	      <li>This</li>
+//	      <li>Is</li>
+//	      <li>Known</li>
+//	    </ul>
+//	  </ul>
+//	  <li>The Dark Tower</li>
+//	  <ul class="go-pretty-table-1">
+//	    <li>The Gunslinger</li>
+//	  </ul>
+//	</ul>
 func (l *List) RenderHTML() string {
 	l.initForRender()
 

diff --git a/list/render_markdown.go b/list/render_markdown.go
@@ -1,15 +1,15 @@
 package list
 
 // RenderMarkdown renders the List in the Markdown format. Example:
-//    * Game Of Thrones
-//      * Winter
-//      * Is
-//      * Coming
-//        * This
-//        * Is
-//        * Known
-//    * The Dark Tower
-//      * The Gunslinger
+// | * Game Of Thrones
+// |    * Winter
+// |    * Is
+// |    * Coming
+// |      * This
+// |      * Is
+// |      * Known
+// |  * The Dark Tower
+// |    * The Gunslinger
 func (l *List) RenderMarkdown() string {
 	// make a copy of the original style and ensure it is restored on exit
 	originalStyle := l.style

diff --git a/progress/tracker_sort.go b/progress/tracker_sort.go
@@ -56,8 +56,8 @@ func (sb sortByMessage) Less(i, j int) bool { return sb[i].message() < sb[j].mes
 
 type sortByPercent []*Tracker
 
-func (sb sortByPercent) Len() int           { return len(sb) }
-func (sb sortByPercent) Swap(i, j int)      { sb[i], sb[j] = sb[j], sb[i] }
+func (sb sortByPercent) Len() int      { return len(sb) }
+func (sb sortByPercent) Swap(i, j int) { sb[i], sb[j] = sb[j], sb[i] }
 func (sb sortByPercent) Less(i, j int) bool {
 	if sb[i].PercentDone() == sb[j].PercentDone() {
 		return sb[i].timeStart.Before(sb[j].timeStart)
@@ -67,8 +67,8 @@ func (sb sortByPercent) Less(i, j int) bool {
 
 type sortByValue []*Tracker
 
-func (sb sortByValue) Len() int           { return len(sb) }
-func (sb sortByValue) Swap(i, j int)      { sb[i], sb[j] = sb[j], sb[i] }
+func (sb sortByValue) Len() int      { return len(sb) }
+func (sb sortByValue) Swap(i, j int) { sb[i], sb[j] = sb[j], sb[i] }
 func (sb sortByValue) Less(i, j int) bool {
 	if sb[i].value == sb[j].value {
 		return sb[i].timeStart.Before(sb[j].timeStart)

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -0,0 +1,9 @@
+# Define the root directory for sources and tests
+sonar.sources = ./
+sonar.tests = ./
+
+# Include test files in test scope
+sonar.test.inclusions = **/*_test.go
+
+# Exclude test files from source scope
+sonar.exclusions = **/*_test.go
diff --git a/table/render.go b/table/render.go
@@ -9,15 +9,16 @@ import (
 )
 
 // Render renders the Table in a human-readable "pretty" format. Example:
-//  ┌─────┬────────────┬───────────┬────────┬─────────────────────────────┐
-//  │   # │ FIRST NAME │ LAST NAME │ SALARY │                             │
-//  ├─────┼────────────┼───────────┼────────┼─────────────────────────────┤
-//  │   1 │ Arya       │ Stark     │   3000 │                             │
-//  │  20 │ Jon        │ Snow      │   2000 │ You know nothing, Jon Snow! │
-//  │ 300 │ Tyrion     │ Lannister │   5000 │                             │
-//  ├─────┼────────────┼───────────┼────────┼─────────────────────────────┤
-//  │     │            │ TOTAL     │  10000 │                             │
-//  └─────┴────────────┴───────────┴────────┴─────────────────────────────┘
+//
+//	┌─────┬────────────┬───────────┬────────┬─────────────────────────────┐
+//	│   # │ FIRST NAME │ LAST NAME │ SALARY │                             │
+//	├─────┼────────────┼───────────┼────────┼─────────────────────────────┤
+//	│   1 │ Arya       │ Stark     │   3000 │                             │
+//	│  20 │ Jon        │ Snow      │   2000 │ You know nothing, Jon Snow! │
+//	│ 300 │ Tyrion     │ Lannister │   5000 │                             │
+//	├─────┼────────────┼───────────┼────────┼─────────────────────────────┤
+//	│     │            │ TOTAL     │  10000 │                             │
+//	└─────┴────────────┴───────────┴────────┴─────────────────────────────┘
 func (t *Table) Render() string {
 	t.initForRender()