Completion of Design 1:

- Till now only the Table's root node was detected and marked by our logic.
- Rows were printed based on whether "tabWriter" is ON/OFF.
- This makes the logic brittle.
- Add code to detect the children of Table root which act as the rows of the table.
- Marking them gives us a flexible design - that can be extended to [ [ ] ]/( [] ) etc

build/print.go

@@ -618,7 +618,7 @@ func (p *printer) expr(v Expr, outerPrec int) {
 		p.seq("()", &v.Load, &args, &v.Rparen, modeLoad, v.ForceCompact, false, false)
 
 	case *ListExpr:
-		p.seq("[]", &v.Start, &v.List, &v.End, modeList, false, v.ForceMultiLine, v.ForceTabular)
+		p.seq("[]", &v.Start, &v.List, &v.End, modeList, false, v.ForceMultiLine, v.FormatAsTable)
 
 	case *SetExpr:
 		p.seq("{}", &v.Start, &v.List, &v.End, modeList, false, v.ForceMultiLine, false)
@@ -629,10 +629,10 @@ func (p *printer) expr(v Expr, outerPrec int) {
 			mode = modeSeq
 		}
 
-		if !p.tabWriterOn {
-			p.seq("()", &v.Start, &v.List, &v.End, mode, v.ForceCompact, v.ForceMultiLine, false)
-		} else {
+		if v.FormatAsTableRow {
 			p.tabbedSeq("()", &v.Start, &v.List, &v.End)
+		} else {
+			p.seq("()", &v.Start, &v.List, &v.End, mode, v.ForceCompact, v.ForceMultiLine, false)
 		}
 
 	case *DictExpr:

build/rewrite.go

@@ -405,16 +405,28 @@ func (x namedArgs) Less(i, j int) bool {
 	return p.index < q.index
 }
 
-// Detects if a data is marked as tablular based on the tag `buildifier: table`
-// and sets the correct flags on the expression to indentify those nodes in the AST.
+// Detects if a data is marked as tablular based on the tag
+// `buildifier: table` and sets the correct flags on the expression to
+// identify those nodes in the AST.
 func formatTables(f *File) {
+
+	// Function that sets a bit on the child nodes of type (list) to indicate
+	// that they are a part of a row
+	markTableRowNodes := func(x Expr, stk2 []Expr) Expr {
+		if x, ok := x.(*TupleExpr); ok {
+			x.FormatAsTableRow = true
+		}
+		return x
+	}
+
 	markTableNodes := func(v Expr, stk []Expr) {
 		switch v := v.(type) {
 		// Tabular formatting is currently supported only for lists
 		case *ListExpr:
 			// Handle when "#buildifier: table" tag is set
 			if len(v.List) > 0 && tableFormat(v.List[0]) {
-				v.ForceTabular = true
+				v.FormatAsTable = true
+				EditChildren(v, markTableRowNodes)
 				sortTableRows(v)
 			}
 		}

build/syntax.go

@@ -445,7 +445,7 @@ type ListExpr struct {
 	List  []Expr
 	End
 	ForceMultiLine bool // force multiline form when printing
-	ForceTabular   bool // force tabular formatting when printing
+	FormatAsTable  bool // flag to indicate that this list needs to print tabular data.
 }
 
 // Span returns the start and end positions of the node
@@ -486,8 +486,9 @@ type TupleExpr struct {
 	Start      Position
 	List       []Expr
 	End
-	ForceCompact   bool // force compact (non-multiline) form when printing
-	ForceMultiLine bool // force multiline form when printing
+	ForceCompact     bool // force compact (non-multiline) form when printing
+	ForceMultiLine   bool // force multiline form when printing
+	FormatAsTableRow bool // flag that indicates that this tuple will be printed as a row of a table
 }
 
 // Span returns the start and end positions of the node