Use ElementStyle as a value instead of pointer, so we can drop all the annoying nil checks

This commit is contained in:
Christian Muehlhaeuser
2019-12-05 18:05:29 +01:00
parent 556c490ac4
commit 78e36a02d0
11 changed files with 147 additions and 176 deletions
+3 -3
View File
@@ -21,7 +21,7 @@ type TermRenderer struct {
BaseURL string
WordWrap int
style map[StyleType]*ElementStyle
style map[StyleType]ElementStyle
blockStack BlockStack
table TableElement
}
@@ -56,13 +56,13 @@ func NewTermRenderer(stylePath string) (*TermRenderer, error) {
}
func NewTermRendererFromBytes(b []byte) (*TermRenderer, error) {
e := make(map[string]*ElementStyle)
e := make(map[string]ElementStyle)
err := json.Unmarshal(b, &e)
if err != nil {
return nil, err
}
tr := &TermRenderer{}
tr.style = make(map[StyleType]*ElementStyle)
tr.style = make(map[StyleType]ElementStyle)
for k, v := range e {
t, err := keyToType(k)