TyleoDvDelaware3217/GoDoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2025-05-19 20:32:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: nil when printing error in edge cases

Browse source
This commit is contained in:
yusing 2025-05-13 19:40:04 +08:00
parent a1f2a84a16
commit 1e24765b17
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
internal/gperr/base.go
View file

@ -36,8 +36,11 @@ func (err *baseError) Subjectf(format string, args ...any) Error {
return err.Subject(format) return err.Subject(format)
} }
func (err baseError) With(extra error) Error { func (err *baseError) With(extra error) Error {
return &nestedError{&err, []error{extra}} if extra == nil {
return err
}
return &nestedError{&baseError{err.Err}, []error{extra}}
} }
func (err baseError) Withf(format string, args ...any) Error { func (err baseError) Withf(format string, args ...any) Error {

2
internal/gperr/hint.go
View file

@ -31,7 +31,7 @@ func (h *Hint) String() string {
return h.Error() return h.Error()
} }
func DoYouMean(s string) *Hint { func DoYouMean(s string) error {
if s == "" { if s == "" {
return nil return nil
} }

6
internal/gperr/nested_error.go
View file

@ -78,8 +78,10 @@ func (err *nestedError) fmtError(appendLine appendLineFunc) []byte {
} }
if err.Err != nil { if err.Err != nil {
buf := appendLine(nil, err.Err, 0) buf := appendLine(nil, err.Err, 0)
buf = append(buf, '\n') if len(err.Extras) > 0 {
buf = appendLines(buf, err.Extras, 1, appendLine) buf = append(buf, '\n')
buf = appendLines(buf, err.Extras, 1, appendLine)
}
return buf return buf
} }
return appendLines(nil, err.Extras, 0, appendLine) return appendLines(nil, err.Extras, 0, appendLine)

3
internal/gperr/utils.go
View file

@ -87,6 +87,9 @@ func Join(errors ...error) Error {
func JoinLines(main error, errors ...string) Error { func JoinLines(main error, errors ...string) Error {
errs := make([]error, len(errors)) errs := make([]error, len(errors))
for i, err := range errors { for i, err := range errors {
if err == "" {
continue
}
errs[i] = newError(err) errs[i] = newError(err)
} }
return &nestedError{Err: main, Extras: errs} return &nestedError{Err: main, Extras: errs}