From 82837cc7c169523505efc9c1dea1649c04f63d89 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 18 Dec 2019 23:04:46 +0100 Subject: [PATCH] Soft-wrap errors to indicate at which stage we failed --- gold.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gold.go b/gold.go index 09b3bc1..fd99f62 100644 --- a/gold.go +++ b/gold.go @@ -3,6 +3,7 @@ package gold import ( "bytes" "encoding/json" + "fmt" "io" "io/ioutil" "os" @@ -61,7 +62,8 @@ func NewTermRenderer(stylePath string, options ansi.Options) (*TermRenderer, err func NewTermRendererFromBytes(b []byte, options ansi.Options) (*TermRenderer, error) { err := json.Unmarshal(b, &options.Styles) if err != nil { - return nil, err + // FIXME: wrap error once we depend on Go 1.13 + return nil, fmt.Errorf("loading style: %v", err) } md := goldmark.New( @@ -117,9 +119,8 @@ func (tr *TermRenderer) RenderBytes(in []byte) ([]byte, error) { func loadStyle(f string) ([]byte, error) { var r io.ReadCloser - var err error - r, err = os.Open(f) + r, err := os.Open(f) if err != nil { statikFS, err := fs.New() if err != nil { @@ -128,7 +129,8 @@ func loadStyle(f string) ([]byte, error) { r, err = statikFS.Open("/" + f + ".json") if err != nil { - return nil, err + // FIXME: wrap error once we depend on Go 1.13 + return nil, fmt.Errorf("loading style %s: %v", f, err) } }