d2ir: Make globs case insensitive to match the rest of the language

note: I personally wish to change the language and make it case sensitive.
nhooyr · Jul 29, 2023 · 1c8ecd3 · 1c8ecd3
1 parent 137b909
commit 1c8ecd3
Show file tree

Hide file tree

Showing 3 changed files with 172 additions and 1 deletion.
diff --git a/d2ir/pattern.go b/d2ir/pattern.go
@@ -44,7 +44,7 @@ func matchPattern(s string, pattern []string) bool {
 				i++
 			}
 		} else {
-			if !strings.HasPrefix(s, pattern[i]) {
+			if !strings.HasPrefix(strings.ToLower(s), strings.ToLower(pattern[i])) {
 				return false
 			}
 			s = s[len(pattern[i]):]

diff --git a/d2ir/pattern_test.go b/d2ir/pattern_test.go
@@ -35,6 +35,18 @@ a*: globbed`)
 				assertQuery(t, m, 0, 0, "globbed", "action")
 			},
 		},
+		{
+			name: "case",
+			run: func(t testing.TB) {
+				m, err := compile(t, `animal: meow
+action: yes
+A*: globbed`)
+				assert.Success(t, err)
+				assertQuery(t, m, 2, 0, nil, "")
+				assertQuery(t, m, 0, 0, "globbed", "animal")
+				assertQuery(t, m, 0, 0, "globbed", "action")
+			},
+		},
 		{
 			name: "suffix",
 			run: func(t testing.TB) {

diff --git a/testdata/d2ir/TestCompile/patterns/case.exp.json b/testdata/d2ir/TestCompile/patterns/case.exp.json