GitHubMirror/glamour-temp-MUTN
1
0
Fork 0
mirror of https://github.com/rwinkhart/glamour-temp-MUTN.git synced 2026-09-06 00:47:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Soft-wrap errors to indicate at which stage we failed

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2019-12-18 23:04:46 +01:00
parent 7e190d9992
commit 82837cc7c1
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gold.go
+6 -4
View File
@@ -3,6 +3,7 @@ package gold
import ( import (
"bytes" "bytes"
"encoding/json" "encoding/json"
"fmt"
"io" "io"
"io/ioutil" "io/ioutil"
"os" "os"
@@ -61,7 +62,8 @@ func NewTermRenderer(stylePath string, options ansi.Options) (*TermRenderer, err
func NewTermRendererFromBytes(b []byte, options ansi.Options) (*TermRenderer, error) { func NewTermRendererFromBytes(b []byte, options ansi.Options) (*TermRenderer, error) {
err := json.Unmarshal(b, &options.Styles) err := json.Unmarshal(b, &options.Styles)
if err != nil { 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( md := goldmark.New(
@@ -117,9 +119,8 @@ func (tr *TermRenderer) RenderBytes(in []byte) ([]byte, error) {
func loadStyle(f string) ([]byte, error) { func loadStyle(f string) ([]byte, error) {
var r io.ReadCloser var r io.ReadCloser
var err error
r, err = os.Open(f) r, err := os.Open(f)
if err != nil { if err != nil {
statikFS, err := fs.New() statikFS, err := fs.New()
if err != nil { if err != nil {
@@ -128,7 +129,8 @@ func loadStyle(f string) ([]byte, error) {
r, err = statikFS.Open("/" + f + ".json") r, err = statikFS.Open("/" + f + ".json")
if err != nil { 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)
} }
} }