Fix remaining linter issues

internal/openai/plugin.go

@@ -16,9 +16,7 @@ const (
 
 type ClientLoadFn func(opts ...client.Option) client.Client
 
-var DefaultClientLoader ClientLoadFn = func(opts ...client.Option) client.Client {
-	return client.New(opts...)
-}
+var DefaultClientLoader ClientLoadFn = client.New
 
 func Plugin(version string, loader ClientLoadFn) *plugin.Schema {
 	if loader == nil {

parser/definitions/title.go

@@ -29,9 +29,7 @@ func (t *TitleInvocation) GetBody() *hclsyntax.Body {
 }
 
 // SetBody implements evaluation.Invocation.
-func (*TitleInvocation) SetBody(*hclsyntax.Body) {
-	return
-}
+func (*TitleInvocation) SetBody(*hclsyntax.Body) {}
 
 var _ evaluation.Invocation = (*TitleInvocation)(nil)
 

parser/evaluator.go

@@ -104,11 +104,11 @@ func (e *Evaluator) EvaluateDocument(d *definitions.Document) (results []string,
 
 	results = make([]string, 0, len(e.contentCalls))
 	for _, call := range e.contentCalls {
-		context, diag := e.evaluateQuery(call)
-		if diags.Extend(diag) {
-			// query failed, but context is always valid
-			// TODO: #28 #29
-		}
+		context, _ := e.evaluateQuery(call)
+		// if diags.Extend(diag) {
+		// query failed, but context is always valid
+		// TODO: #28 #29
+		// }
 		result, diag := e.caller.CallContent(call.PluginName, call.Config, call.Invocation, context)
 		if diags.Extend(diag) {
 			// XXX: What to do if we have errors while executing content blocks?
@@ -249,5 +249,4 @@ func (e *Evaluator) evaluateSection(s *definitions.ParsedSection) {
 			panic("must be exhaustive")
 		}
 	}
-	return
 }

parser/parseSectionBlock.go

@@ -126,6 +126,7 @@ func (db *DefinedBlocks) parseSection(section *definitions.Section) (parsed *def
 				continue
 			}
 			circularRefDetector.Add(section, block.DefRange().Ptr())
+			//nolint:gocritic
 			defer circularRefDetector.Remove(section, &diags)
 			parsedSubSection, diag := db.ParseSection(subSection)
 			if diags.Extend(diag) {

pkg/cirularRefDetector/circularRefs.go

@@ -75,6 +75,6 @@ func (d *circularRefDetector) remove(ptr unsafe.Pointer, diags *diagnostics.Diag
 			diag.Detail, rng.Filename, rng.Start.Line, rng.Start.Column,
 		)
 	} else {
-		diag.Detail = diag.Detail + "\n  at <missing location info>"
+		diag.Detail += "\n  at <missing location info>"
 	}
 }

pkg/diagnostics/diagnostics.go

@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/hcl/v2"
 )
 
-type Diag hcl.Diagnostics //nolint:errname // Diagnostics does implement error interface, but not, itself, an error.
+type Diag hcl.Diagnostics // Diagnostics does implement error interface, but not, itself, an error.
 
 type repeatedError struct{}
 

pkg/jsontools/jsontools.go

@@ -70,5 +70,5 @@ func UnmarshalBytes(bytes, value any) error {
 	if !ok {
 		return ErrUnmarshalBytes
 	}
-	return json.Unmarshal(data, value) //nolint: wrapcheck
+	return json.Unmarshal(data, value)
 }

pkg/parexec/limiter.go

@@ -9,7 +9,7 @@ import (
 var NoLimit = (*Limiter)(nil)
 
 // DiskIOLimiter is a shared limiter for all Disk IO tasks.
-var DiskIOLimiter = NewLimiter(4) //nolint: gomnd
+var DiskIOLimiter = NewLimiter(4)
 
 // CPULimiter is a shared limiter for all CPU-bound tasks.
 var CPULimiter = NewLimiter(2 * runtime.NumCPU())