internal/diff: fix printing and top-level diffs
Print concrete values: before %-v was used, which would
print conjuncts, not evaluated expressions.
Top-level diffs were awkward, as it would not return an edit
script and the user would have to do their own printing.
This fixes that.
TODO: modify the API to not return the kind, only the
EditScript.
Change-Id: I7c9d0322fb5e6dac0f4668f14de8ae76bb614823
Reviewed-on: https://cue-review.googlesource.com/c/cue/+/9342
Reviewed-by: CUE cueckoo <cueckoo@gmail.com>
Reviewed-by: Paul Jolly <paul@myitcv.org.uk>
diff --git a/internal/diff/print.go b/internal/diff/print.go
index a87832e..251d13f 100644
--- a/internal/diff/print.go
+++ b/internal/diff/print.go
@@ -98,7 +98,8 @@
case cue.ListKind:
p.printList(e)
default:
- p.printf("BadExpr")
+ p.printElem("-", e.x)
+ p.printElem("+", e.y)
}
}
@@ -194,7 +195,7 @@
func (p *printer) printValue(v cue.Value) {
// TODO: have indent option.
- s := fmt.Sprintf("%-v", v)
+ s := fmt.Sprintf("%+v", v)
io.WriteString(p, s)
}
