globs: fix ampersand outside glob

terrastruct · Nov 27, 2023 · 1816587 · 1816587
1 parent 5faa0ad
commit 1816587
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/d2ir/compile.go b/d2ir/compile.go
@@ -394,6 +394,9 @@ func (c *compiler) ampersandFilterMap(dst *Map, ast, scopeAST *d2ast.Map) bool {
 				ScopeAST: scopeAST,
 			})
 			if !ok {
+				if len(c.mapRefContextStack) == 0 {
+					return false
+				}
 				// Unapply glob if appropriate.
 				gctx := c.getGlobContext(c.mapRefContextStack[len(c.mapRefContextStack)-1])
 				if gctx == nil {

diff --git a/d2ir/filter_test.go b/d2ir/filter_test.go
@@ -233,6 +233,18 @@ classes: {
 TestCompile/filters/errors/bad-syntax.d2:9:1: unexpected map termination character } in file map`)
 				},
 			},
+			{
+				name: "outside-glob",
+				run: func(t testing.TB) {
+					_, err := compile(t, `jacob.style: {
+	fill: red
+	multiple: true
+}
+&a
+`)
+					assert.ErrorString(t, err, `TestCompile/filters/errors/outside-glob.d2:5:1: glob filters cannot be used outside globs`)
+				},
+			},
 			{
 				name: "no-glob",
 				run: func(t testing.TB) {

diff --git a/testdata/d2ir/TestCompile/filters/outside-glob.exp.json b/testdata/d2ir/TestCompile/filters/outside-glob.exp.json