fix(wildcard): partial match ignoring consumed pattern (#1765)

* tests(wildcard): ?

* really?

* Franklin

* remember when regex was easy

* ==

* why not.

* I need an adult.

* Update match_test.go

* tests + readability

* back to basics
This commit is contained in:
Kyle Sanderson 2024-10-20 04:03:52 -07:00 committed by GitHub
parent 2386a9db31
commit 5df6e78d3b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 52 additions and 22 deletions

View file

@ -41,28 +41,7 @@ func match(pattern, name string, simple bool) (matched bool) {
((wildEnd && strings.Count(pattern, "*") == 1) || // egg?bert*
(len(pattern) == len(name) && !strings.Contains(pattern, "*"))) { // egg?bert?
base := 0
for base < len(name) {
i := strings.IndexRune(pattern[base:], '?')
if i == -1 {
if (wildEnd && !strings.HasPrefix(name[base:], pattern[base:len(pattern)-1])) || // egg*
(!wildEnd && name[base:] != pattern[base:]) { // egg
break
}
base = len(name)
continue
}
offset := base + i
if len(name) < offset || name[base:offset] != pattern[base:offset] {
break
}
base = offset + 1
}
return base == len(name)
return matchComplex(name, pattern, wildEnd)
} else if strings.HasPrefix(pattern, "*") && strings.HasSuffix(pattern, "*") && // *egg*
(simple || (!simple && !strings.Contains(pattern, "?"))) && // simple is fine, if not we need to check for ? and skip if so.
strings.Count(pattern, "*") == 2 { // make sure that we have no other wildcards.
@ -72,6 +51,35 @@ func match(pattern, name string, simple bool) (matched bool) {
return deepMatchRune(name, pattern, simple, pattern, false)
}
func matchComplex(name, pattern string, wildEnd bool) bool {
base := 0
consumedPattern := 0
for base < len(name) && consumedPattern < len(pattern) {
i := strings.IndexRune(pattern[base:], '?')
if i == -1 {
if (wildEnd && !strings.HasPrefix(name[base:], pattern[base:len(pattern)-1])) || // egg*
(!wildEnd && name[base:] != pattern[base:]) { // egg
break
}
base = len(name)
consumedPattern = len(pattern)
continue
}
offset := base + i
if len(name) < offset || name[base:offset] != pattern[base:offset] {
break
}
base = offset + 1
consumedPattern = base
}
return base == len(name) && consumedPattern == len(pattern)
}
func MatchSliceSimple(pattern []string, name string) (matched bool) {
return matchSlice(pattern, name, true)
}