luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

values must be positive

Browse source
This commit is contained in:
Gavin Nishizawa 2023-04-03 11:52:12 -07:00
parent abe27cdc26
commit 06fb313d3e
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
4 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
d2compiler/compile.go
View file

@ -368,8 +368,8 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) {
c.errorf(scalar, "non-integer rows %#v: %s", scalar.ScalarString(), err) c.errorf(scalar, "non-integer rows %#v: %s", scalar.ScalarString(), err)
return return
} }
if v < 0 { if v <= 0 {
c.errorf(scalar, "rows must be a non-negative integer: %#v", scalar.ScalarString()) c.errorf(scalar, "rows must be a positive integer: %#v", scalar.ScalarString())
return return
} }
attrs.Rows = &d2graph.Scalar{} attrs.Rows = &d2graph.Scalar{}
@ -381,8 +381,8 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) {
c.errorf(scalar, "non-integer columns %#v: %s", scalar.ScalarString(), err) c.errorf(scalar, "non-integer columns %#v: %s", scalar.ScalarString(), err)
return return
} }
if v < 0 { if v <= 0 {
c.errorf(scalar, "columns must be a non-negative integer: %#v", scalar.ScalarString()) c.errorf(scalar, "columns must be a positive integer: %#v", scalar.ScalarString())
return return
} }
attrs.Columns = &d2graph.Scalar{} attrs.Columns = &d2graph.Scalar{}

2
d2compiler/compile_test.go
View file

@ -2286,7 +2286,7 @@ obj {
columns: -200 columns: -200
} }
`, `,
expErr: `d2/testdata/d2compiler/TestCompile/grid_negative.d2:3:11: columns must be a non-negative integer: "-200"`, expErr: `d2/testdata/d2compiler/TestCompile/grid_negative.d2:3:11: columns must be a positive integer: "-200"`,
}, },
} }

12
d2layouts/d2grid/grid.go
View file

@ -29,15 +29,9 @@ func newGrid(root *d2graph.Object) *grid {
// TODO consider making this based on node dimensions // TODO consider making this based on node dimensions
if g.rows == 0 { if g.rows == 0 {
// set rows based on number of columns // set rows based on number of columns
if g.columns == 0 { g.rows = len(g.nodes) / g.columns
// 0,0: put everything in one row if len(g.nodes)%g.columns != 0 {
g.rows = 1 g.rows++
g.columns = len(g.nodes)
} else {
g.rows = len(g.nodes) / g.columns
if len(g.nodes)%g.columns != 0 {
g.rows++
}
} }
} else if g.columns == 0 { } else if g.columns == 0 {
// set columns based on number of rows // set columns based on number of rows

2
testdata/d2compiler/TestCompile/grid_negative.exp.json generated vendored
View file

@ -5,7 +5,7 @@
"errs": [ "errs": [
{ {
"range": "d2/testdata/d2compiler/TestCompile/grid_negative.d2,2:10:28-2:14:32", "range": "d2/testdata/d2compiler/TestCompile/grid_negative.d2,2:10:28-2:14:32",
"errmsg": "d2/testdata/d2compiler/TestCompile/grid_negative.d2:3:11: columns must be a non-negative integer: \"-200\"" "errmsg": "d2/testdata/d2compiler/TestCompile/grid_negative.d2:3:11: columns must be a positive integer: \"-200\""
} }
] ]
} }