mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2025-02-02 05:41:10 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: recover crashing function

Browse source 
relates to #2038
This commit is contained in:
Jan De Dobbeleer 2022-04-07 07:25:17 +02:00 committed by Jan De Dobbeleer
parent f937f28545
commit e840e406c7
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/environment/shell.go
View file

@ -727,10 +727,21 @@ func (env *ShellEnvironment) TemplateCache() *TemplateCache {
return tmplCache return tmplCache
} }
func (env *ShellEnvironment) DirMatchesOneOf(dir string, regexes []string) bool { func (env *ShellEnvironment) DirMatchesOneOf(dir string, regexes []string) (match bool) {
// sometimes the function panics inside golang, we want to silence that error
// and assume that there's no match. Not perfect, but better than crashing
// for the time being until we figure out what the actual root cause is
defer func() {
if err := recover(); err != nil {
message := fmt.Sprintf("%s", err)
env.log(Error, "DirMatchesOneOf", message)
match = false
}
}()
env.lock.Lock() env.lock.Lock()
defer env.lock.Unlock() defer env.lock.Unlock()
return dirMatchesOneOf(dir, env.Home(), env.GOOS(), regexes) match = dirMatchesOneOf(dir, env.Home(), env.GOOS(), regexes)
return
} }
func dirMatchesOneOf(dir, home, goos string, regexes []string) bool { func dirMatchesOneOf(dir, home, goos string, regexes []string) bool {