chore: resolve more linter warnings

a-h · Mar 5, 2023 · f5ab816 · f5ab816
1 parent e7f68cb
commit f5ab816
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 18 deletions.
diff --git a/parser/v1/cssparser.go b/parser/v1/cssparser.go
@@ -34,7 +34,6 @@ func (p cssParser) Parse(pi parse.Input) parse.Result {
 	var from Position
 	for {
 		var pr parse.Result
-		from = NewPositionFromInput(pi)
 
 		// Try for an expression CSS declaration.
 		// background-color: {%= constants.BackgroundColor %};
@@ -176,7 +175,10 @@ func (p expressionCSSPropertyParser) Parse(pi parse.Input) parse.Result {
 	}
 	// Property name.
 	if pr = cssPropertyNameParser(pi); !pr.Success {
-		rewind(pi, start)
+		err := rewind(pi, start)
+		if err != nil {
+			return parse.Failure("failed to rewind reader", err)
+		}
 		return pr
 	}
 	r.Name = pr.Item.(string)
@@ -186,14 +188,20 @@ func (p expressionCSSPropertyParser) Parse(pi parse.Input) parse.Result {
 		parse.Rune(':'),
 		optionalWhitespaceParser)(pi)
 	if !pr.Success {
-		rewind(pi, start)
+		err := rewind(pi, start)
+		if err != nil {
+			return parse.Failure("failed to rewind reader", err)
+		}
 		return pr
 	}
 
 	// {%= string %}
 	pr = newStringExpressionParser().Parse(pi)
 	if !pr.Success {
-		rewind(pi, start)
+		err := rewind(pi, start)
+		if err != nil {
+			return parse.Failure("failed to rewind reader", err)
+		}
 		return pr
 	}
 	r.Value = pr.Item.(StringExpression)
@@ -231,7 +239,10 @@ func (p constantCSSPropertyParser) Parse(pi parse.Input) parse.Result {
 	}
 	// Property name.
 	if pr = cssPropertyNameParser(pi); !pr.Success {
-		rewind(pi, start)
+		err := rewind(pi, start)
+		if err != nil {
+			return parse.Failure("failed to rewind reader", err)
+		}
 		return pr
 	}
 	r.Name = pr.Item.(string)
@@ -241,7 +252,10 @@ func (p constantCSSPropertyParser) Parse(pi parse.Input) parse.Result {
 		parse.Rune(':'),
 		optionalWhitespaceParser)(pi)
 	if !pr.Success {
-		rewind(pi, start)
+		err := rewind(pi, start)
+		if err != nil {
+			return parse.Failure("failed to rewind reader", err)
+		}
 		return pr
 	}
 

diff --git a/parser/v1/elementparser.go b/parser/v1/elementparser.go
@@ -149,7 +149,6 @@ func (p boolExpressionAttributeParser) Parse(pi parse.Input) parse.Result {
 	var r BoolExpressionAttribute
 
 	start := pi.Index()
-	from := NewPositionFromInput(pi)
 	pr := whitespaceParser(pi)
 	if !pr.Success {
 		return pr
@@ -169,7 +168,7 @@ func (p boolExpressionAttributeParser) Parse(pi parse.Input) parse.Result {
 	}
 
 	// Once we've seen a expression prefix, read until the tag end.
-	from = NewPositionFromInput(pi)
+	from := NewPositionFromInput(pi)
 	pr = parse.StringUntil(expressionEnd)(pi)
 	if pr.Error != nil && pr.Error != io.EOF {
 		return parse.Failure("boolExpressionAttributeParser", fmt.Errorf("boolExpressionAttributeParser: failed to read until tag end: %w", pr.Error))
@@ -203,7 +202,6 @@ func (p expressionAttributeParser) Parse(pi parse.Input) parse.Result {
 	var r ExpressionAttribute
 
 	start := pi.Index()
-	from := NewPositionFromInput(pi)
 	pr := whitespaceParser(pi)
 	if !pr.Success {
 		return pr
@@ -222,7 +220,7 @@ func (p expressionAttributeParser) Parse(pi parse.Input) parse.Result {
 	}
 
 	// Once we've seen a expression prefix, read until the tag end.
-	from = NewPositionFromInput(pi)
+	from := NewPositionFromInput(pi)
 	pr = parse.StringUntil(expressionEnd)(pi)
 	if pr.Error != nil && pr.Error != io.EOF {
 		return parse.Failure("expressionAttributeParser", fmt.Errorf("expressionAttributeParser: failed to read until tag end: %w", pr.Error))

diff --git a/storybook/storybook.go b/storybook/storybook.go
@@ -90,7 +90,9 @@ func (sh *Storybook) AddComponent(name string, componentConstructor interface{},
 var storybookPreviewMatcher = pathvars.NewExtractor("/storybook_preview/{name}")
 
 func (sh *Storybook) Build(ctx context.Context) (err error) {
-	defer sh.Log.Sync()
+	defer func() {
+		_ = sh.Log.Sync()
+	}()
 	// Download Storybook to the directory required.
 	sh.Log.Info("Installing storybook.")
 	err = sh.installStorybook()
@@ -114,7 +116,10 @@ func (sh *Storybook) Build(ctx context.Context) (err error) {
 	// Execute a static build of storybook if the config has changed.
 	if configHasChanged {
 		sh.Log.Info("Config not present, or has changed, rebuilding storybook.")
-		sh.buildStorybook()
+		err = sh.buildStorybook()
+		if err != nil {
+			return
+		}
 	} else {
 		sh.Log.Info("Storybook is up-to-date, skipping build step.")
 	}
@@ -354,7 +359,10 @@ func ObjectArg(name string, value interface{}, valuePtr interface{}) Arg {
 		Value:   value,
 		Control: "object",
 		Get: func(q url.Values) interface{} {
-			json.Unmarshal([]byte(q.Get(name)), valuePtr)
+			err := json.Unmarshal([]byte(q.Get(name)), valuePtr)
+			if err != nil {
+				return err
+			}
 			return reflect.Indirect(reflect.ValueOf(valuePtr)).Interface()
 		},
 	}
@@ -459,18 +467,30 @@ func (sm *SortedMap) Add(key string, value interface{}) {
 	sm.internal[key] = value
 }
 
-func (sm *SortedMap) MarshalJSON() ([]byte, error) {
+func (sm *SortedMap) MarshalJSON() (output []byte, err error) {
 	sm.m.Lock()
 	defer sm.m.Unlock()
 	b := new(bytes.Buffer)
 	b.WriteRune('{')
 	enc := json.NewEncoder(b)
 	for i, k := range sm.keys {
-		enc.Encode(k)
-		b.WriteRune(':')
-		enc.Encode(sm.internal[k])
+		err = enc.Encode(k)
+		if err != nil {
+			return
+		}
+		_, err = b.WriteRune(':')
+		if err != nil {
+			return
+		}
+		err = enc.Encode(sm.internal[k])
+		if err != nil {
+			return
+		}
 		if i < len(sm.keys)-1 {
-			b.WriteRune(',')
+			_, err = b.WriteRune(',')
+			if err != nil {
+				return
+			}
 		}
 	}
 	b.WriteRune('}')