Merge pull request #1486 from nyaruka/claude/stupefied-buck

Scope error variables into if statements where possible

Author: rowanseymour

cmd/docgen/docs/base.go

@@ -55,8 +55,7 @@ func Generate(baseDir, outputDir, localeDir string) error {
 
 	// generate docs in each supported locale
 	for _, language := range locales.Locales() {
-		err := generateForLang(baseDir, outputDir, taggedItems, locales, language, msgUsed)
-		if err != nil {
+		if err := generateForLang(baseDir, outputDir, taggedItems, locales, language, msgUsed); err != nil {
 			return err
 		}
 	}

contactql/parser.go

@@ -261,8 +261,7 @@ func NewBoolCombination(op BoolOperator, children ...QueryNode) *BoolCombination
 // Validate validates this node
 func (b *BoolCombination) validate(env envs.Environment, resolver Resolver) error {
 	for _, child := range b.children {
-		err := child.validate(env, resolver)
-		if err != nil {
+		if err := child.validate(env, resolver); err != nil {
 			return err
 		}
 	}
@@ -370,8 +369,7 @@ func ParseQuery(env envs.Environment, text string, resolver Resolver) (*ContactQ
 	tree := p.Parse()
 
 	// if we ran into errors parsing, bail
-	err := errListener.Error()
-	if err != nil {
+	if err := errListener.Error(); err != nil {
 		return nil, err
 	}
 

excellent/base.go

@@ -131,8 +131,7 @@ func VisitTemplate(template string, allowedTopLevels []string, unescapeBody bool
 	errors := NewTemplateErrors()
 
 	for tokenType, token := scanner.Scan(); tokenType != EOF; tokenType, token = scanner.Scan() {
-		err := callback(tokenType, token)
-		if err != nil {
+		if err := callback(tokenType, token); err != nil {
 			var repr string
 			if tokenType == IDENTIFIER {
 				repr = "@" + token

flows/definition/legacy/definition.go

@@ -323,8 +323,7 @@ func migrateAction(baseLanguage i18n.Language, a Action, localization migratedLo
 
 	case "email":
 		var msg string
-		err := jsonx.Unmarshal(a.Msg, &msg)
-		if err != nil {
+		if err := jsonx.Unmarshal(a.Msg, &msg); err != nil {
 			return nil, err
 		}
 
@@ -378,16 +377,14 @@ func migrateAction(baseLanguage i18n.Language, a Action, localization migratedLo
 		}
 
 		if a.Media != nil {
-			err := jsonx.Unmarshal(a.Media, &media)
-			if err != nil {
+			if err := jsonx.Unmarshal(a.Media, &media); err != nil {
 				return nil, err
 			}
 		}
 		if a.QuickReplies != nil {
 			legacyQuickReplies := make([]Translations, 0)
 
-			err := jsonx.Unmarshal(a.QuickReplies, &legacyQuickReplies)
-			if err != nil {
+			if err := jsonx.Unmarshal(a.QuickReplies, &legacyQuickReplies); err != nil {
 				return nil, err
 			}
 
@@ -527,8 +524,7 @@ func migrateRuleSet(lang i18n.Language, r RuleSet, validDests map[uuids.UUID]boo
 	// load the config for this ruleset
 	var config RulesetConfig
 	if r.Config != nil {
-		err := jsonx.Unmarshal(r.Config, &config)
-		if err != nil {
+		if err := jsonx.Unmarshal(r.Config, &config); err != nil {
 			return nil, "", nil, err
 		}
 	}

flows/inputs/msg.go

@@ -112,8 +112,7 @@ type msgEnvelope struct {
 
 func readMsg(sa flows.SessionAssets, data []byte, missing assets.MissingCallback) (flows.Input, error) {
 	e := &msgEnvelope{}
-	err := utils.UnmarshalAndValidate(data, e)
-	if err != nil {
+	if err := utils.UnmarshalAndValidate(data, e); err != nil {
 		return nil, err
 	}
 

utils/validator.go

@@ -147,8 +147,7 @@ func Validate(obj any) error {
 
 // UnmarshalAndValidate is a convenience function to unmarshal an object and validate it
 func UnmarshalAndValidate(data []byte, obj any) error {
-	err := jsonx.Unmarshal(data, obj)
-	if err != nil {
+	if err := jsonx.Unmarshal(data, obj); err != nil {
 		return err
 	}