git.iko.soy/crush
on main help sign in
chore: task fmt (#1098)
feb184dAmolith
internal/config/load.go+7−7
compare with main
unifiedsplit
@@ -381,7 +381,7 @@ func (c *Config) applyLSPDefaults() {
381func (c *Config) defaultModelSelection(knownProviders []catwalk.Provider) (largeModel SelectedModel, smallModel SelectedModel, err error) {
381func (c *Config) defaultModelSelection(knownProviders []catwalk.Provider) (largeModel SelectedModel, smallModel SelectedModel, err error) {
382 if len(knownProviders) == 0 && c.Providers.Len() == 0 {
382 if len(knownProviders) == 0 && c.Providers.Len() == 0 {
383 err = fmt.Errorf("no providers configured, please configure at least one provider")
383 err = fmt.Errorf("no providers configured, please configure at least one provider")
384− return
384+ return largeModel, smallModel, err
385 }
385 }
386
386
387 // Use the first provider enabled based on the known providers order
387 // Use the first provider enabled based on the known providers order
@@ -394,7 +394,7 @@ func (c *Config) defaultModelSelection(knownProviders []catwalk.Provider) (large
394 defaultLargeModel := c.GetModel(string(p.ID), p.DefaultLargeModelID)
394 defaultLargeModel := c.GetModel(string(p.ID), p.DefaultLargeModelID)
395 if defaultLargeModel == nil {
395 if defaultLargeModel == nil {
396 err = fmt.Errorf("default large model %s not found for provider %s", p.DefaultLargeModelID, p.ID)
396 err = fmt.Errorf("default large model %s not found for provider %s", p.DefaultLargeModelID, p.ID)
397− return
397+ return largeModel, smallModel, err
398 }
398 }
399 largeModel = SelectedModel{
399 largeModel = SelectedModel{
400 Provider: string(p.ID),
400 Provider: string(p.ID),
@@ -406,7 +406,7 @@ func (c *Config) defaultModelSelection(knownProviders []catwalk.Provider) (large
406 defaultSmallModel := c.GetModel(string(p.ID), p.DefaultSmallModelID)
406 defaultSmallModel := c.GetModel(string(p.ID), p.DefaultSmallModelID)
407 if defaultSmallModel == nil {
407 if defaultSmallModel == nil {
408 err = fmt.Errorf("default small model %s not found for provider %s", p.DefaultSmallModelID, p.ID)
408 err = fmt.Errorf("default small model %s not found for provider %s", p.DefaultSmallModelID, p.ID)
409− return
409+ return largeModel, smallModel, err
410 }
410 }
411 smallModel = SelectedModel{
411 smallModel = SelectedModel{
412 Provider: string(p.ID),
412 Provider: string(p.ID),
@@ -414,7 +414,7 @@ func (c *Config) defaultModelSelection(knownProviders []catwalk.Provider) (large
414 MaxTokens: defaultSmallModel.DefaultMaxTokens,
414 MaxTokens: defaultSmallModel.DefaultMaxTokens,
415 ReasoningEffort: defaultSmallModel.DefaultReasoningEffort,
415 ReasoningEffort: defaultSmallModel.DefaultReasoningEffort,
416 }
416 }
417− return
417+ return largeModel, smallModel, err
418 }
418 }
419
419
420 enabledProviders := c.EnabledProviders()
420 enabledProviders := c.EnabledProviders()
@@ -424,13 +424,13 @@ func (c *Config) defaultModelSelection(knownProviders []catwalk.Provider) (large
424
424
425 if len(enabledProviders) == 0 {
425 if len(enabledProviders) == 0 {
426 err = fmt.Errorf("no providers configured, please configure at least one provider")
426 err = fmt.Errorf("no providers configured, please configure at least one provider")
427− return
427+ return largeModel, smallModel, err
428 }
428 }
429
429
430 providerConfig := enabledProviders[0]
430 providerConfig := enabledProviders[0]
431 if len(providerConfig.Models) == 0 {
431 if len(providerConfig.Models) == 0 {
432 err = fmt.Errorf("provider %s has no models configured", providerConfig.ID)
432 err = fmt.Errorf("provider %s has no models configured", providerConfig.ID)
433− return
433+ return largeModel, smallModel, err
434 }
434 }
435 defaultLargeModel := c.GetModel(providerConfig.ID, providerConfig.Models[0].ID)
435 defaultLargeModel := c.GetModel(providerConfig.ID, providerConfig.Models[0].ID)
436 largeModel = SelectedModel{
436 largeModel = SelectedModel{
@@ -444,7 +444,7 @@ func (c *Config) defaultModelSelection(knownProviders []catwalk.Provider) (large
444 Model: defaultSmallModel.ID,
444 Model: defaultSmallModel.ID,
445 MaxTokens: defaultSmallModel.DefaultMaxTokens,
445 MaxTokens: defaultSmallModel.DefaultMaxTokens,
446 }
446 }
447− return
447+ return largeModel, smallModel, err
448}
448}
449
449
450func (c *Config) configureSelectedModels(knownProviders []catwalk.Provider) error {
450func (c *Config) configureSelectedModels(knownProviders []catwalk.Provider) error {
internal/llm/provider/anthropic.go+1−1
@@ -175,7 +175,7 @@ func (a *anthropicClient) convertMessages(messages []message.Message) (anthropic
175 anthropicMessages = append(anthropicMessages, anthropic.NewUserMessage(results...))
175 anthropicMessages = append(anthropicMessages, anthropic.NewUserMessage(results...))
176 }
176 }
177 }
177 }
178− return
178+ return anthropicMessages
179}
179}
180
180
181func (a *anthropicClient) convertTools(tools []tools.BaseTool) []anthropic.ToolUnionParam {
181func (a *anthropicClient) convertTools(tools []tools.BaseTool) []anthropic.ToolUnionParam {
internal/llm/provider/openai.go+1−1
@@ -178,7 +178,7 @@ func (o *openaiClient) convertMessages(messages []message.Message) (openaiMessag
178 }
178 }
179 }
179 }
180
180
181− return
181+ return openaiMessages
182}
182}
183
183
184func (o *openaiClient) convertTools(tools []tools.BaseTool) []openai.ChatCompletionToolParam {
184func (o *openaiClient) convertTools(tools []tools.BaseTool) []openai.ChatCompletionToolParam {
internal/llm/provider/provider.go+1−1
@@ -98,7 +98,7 @@ func (p *baseProvider[C]) cleanMessages(messages []message.Message) (cleaned []m
98 }
98 }
99 cleaned = append(cleaned, msg)
99 cleaned = append(cleaned, msg)
100 }
100 }
101− return
101+ return cleaned
102}
102}
103
103
104func (p *baseProvider[C]) SendMessages(ctx context.Context, messages []message.Message, tools []tools.BaseTool) (*ProviderResponse, error) {
104func (p *baseProvider[C]) SendMessages(ctx context.Context, messages []message.Message, tools []tools.BaseTool) (*ProviderResponse, error) {
internal/shell/shell.go+1−1
@@ -207,7 +207,7 @@ func splitArgsFlags(parts []string) (args []string, flags []string) {
207 args = append(args, part)
207 args = append(args, part)
208 }
208 }
209 }
209 }
210− return
210+ return args, flags
211}
211}
212
212
213func (s *Shell) blockHandler() func(next interp.ExecHandlerFunc) interp.ExecHandlerFunc {
213func (s *Shell) blockHandler() func(next interp.ExecHandlerFunc) interp.ExecHandlerFunc {
internal/tui/exp/diffview/diffview.go+3−3
@@ -408,7 +408,7 @@ func (dv *DiffView) renderUnified() string {
408 content = ansi.GraphemeWidth.Cut(content, dv.xOffset, len(content))
408 content = ansi.GraphemeWidth.Cut(content, dv.xOffset, len(content))
409 content = ansi.Truncate(content, dv.codeWidth, "…")
409 content = ansi.Truncate(content, dv.codeWidth, "…")
410 leadingEllipsis = dv.xOffset > 0 && strings.TrimSpace(content) != ""
410 leadingEllipsis = dv.xOffset > 0 && strings.TrimSpace(content) != ""
411− return
411+ return content, leadingEllipsis
412 }
412 }
413
413
414outer:
414outer:
@@ -531,7 +531,7 @@ func (dv *DiffView) renderSplit() string {
531 content = ansi.GraphemeWidth.Cut(content, dv.xOffset, len(content))
531 content = ansi.GraphemeWidth.Cut(content, dv.xOffset, len(content))
532 content = ansi.Truncate(content, dv.codeWidth, "…")
532 content = ansi.Truncate(content, dv.codeWidth, "…")
533 leadingEllipsis = dv.xOffset > 0 && strings.TrimSpace(content) != ""
533 leadingEllipsis = dv.xOffset > 0 && strings.TrimSpace(content) != ""
534− return
534+ return content, leadingEllipsis
535 }
535 }
536
536
537outer:
537outer:
@@ -716,7 +716,7 @@ func (dv *DiffView) hunkShownLines(h *udiff.Hunk) (before, after int) {
716 before++
716 before++
717 }
717 }
718 }
718 }
719− return
719+ return before, after
720}
720}
721
721
722func (dv *DiffView) lineStyleForType(t udiff.OpKind) LineStyle {
722func (dv *DiffView) lineStyleForType(t udiff.OpKind) LineStyle {
internal/tui/exp/diffview/split.go+1−1
@@ -69,5 +69,5 @@ func hunkToSplit(h *udiff.Hunk) (sh splitHunk) {
69 sh.lines = append(sh.lines, &sl)
69 sh.lines = append(sh.lines, &sl)
70 }
70 }
71
71
72− return
72+ return sh
73}
73}
internal/tui/exp/list/list.go+1−1
@@ -1372,7 +1372,7 @@ func (l *list[T]) findWordBoundaries(col, line int) (startCol, endCol int) {
1372 if startCol == -1 {
1372 if startCol == -1 {
1373 return 0, 0
1373 return 0, 0
1374 }
1374 }
1375− return
1375+ return startCol, endCol
1376}
1376}
1377
1377
1378func (l *list[T]) findParagraphBoundaries(line int) (startLine, endLine int, found bool) {
1378func (l *list[T]) findParagraphBoundaries(line int) (startLine, endLine int, found bool) {