cue/format: fix simplification bug

Closes Issue #294 Change-Id: If7ac761d9cea5745f273f5c4ced11509d08efd80 Reviewed-on: https://cue-review.googlesource.com/c/cue/+/5061 Reviewed-by: Marcel van Lohuizen <mpvl@golang.org>
cuelang · Feb 24, 2020 · d05ea95 · d05ea95
1 parent 6ad04b3
commit d05ea95
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/cue/format/simplify.go b/cue/format/simplify.go
@@ -95,7 +95,7 @@ func (s *labelSimplifier) markStrings(n ast.Node) bool {
 	case *ast.Ident:
 		s.scope[x.Name] = true
 
-	case *ast.ListLit:
+	case *ast.ListLit, *ast.Interpolation:
 		return false
 	}
 	return true

diff --git a/cue/format/testdata/simplify.golden b/cue/format/testdata/simplify.golden
@@ -27,6 +27,9 @@ quux: 5
 // TODO(legacy): Don't simplify "hidden" fields for now.
 "_foo": 3
 
+// Issue #294
+"\("x")": "x"
+
 x: {
 	@tag0(foo)
 	r1: baz1

diff --git a/cue/format/testdata/simplify.input b/cue/format/testdata/simplify.input
@@ -29,6 +29,9 @@ a:
 // TODO(legacy): Don't simplify "hidden" fields for now.
 "_foo": 3
 
+// Issue #294
+"\("x")": "x"
+
 x: {
 @tag0(foo)
     r1: baz1