cue/format: tweaks to support embeddings

allow:

Def :: {{
    a: int
}}

Change-Id: I55dea1b45fb10515a9d358a4a40b021be420d86b
Reviewed-on: https://cue-review.googlesource.com/c/cue/+/3240
Reviewed-by: Marcel van Lohuizen <mpvl@golang.org>

cue/format/node.go

@@ -265,7 +265,7 @@ func (f *formatter) decl(decl ast.Decl) {
 			f.print(formfeed)
 		}
 		f.expr(n.Expr)
-		f.print(newline, newsection, nooverride) // force newline
+		f.print(newsection, noblank)
 
 	case *ast.Ellipsis:
 		f.ellipsis(n)
@@ -495,7 +495,10 @@ func (f *formatter) exprRaw(expr ast.Expr, prec1, depth int) {
 
 		ws = noblank
 		if f.lineout != l {
-			ws = newline | nooverride
+			ws |= newline
+			if f.lastTok != token.RBRACE && f.lastTok != token.RBRACK {
+				ws |= nooverride
+			}
 		}
 		f.print(ws, x.Rbrace, token.RBRACE)
 

cue/format/testdata/expressions.golden

@@ -155,15 +155,13 @@ package expressions
 	e: {for k, v in someObject if k > "a" {"\(k)": v}}
 	e: {for k, v in someObject if k > "a" {
 		"\(k)": v
-	}
-	}
+	}}
 
 	e: {
 		for k, v in someObject
 		if k > "a" {
 			"\(k)": v
-		}
-	}
+		}}
 
 	e: [{
 		a: 1, b: 2

doc/tutorial/kubernetes/README.md

@@ -500,7 +500,6 @@ for x in [deployment, daemonSet, statefulSet] for k, v in x {
         } for c in v.spec.template.spec.containers
             for p in c.ports
             if p._export ]
-
     }
 }
 EOF