Skip to content

Commit b1491ac

Browse files
committed
style: refactor codebase for enhanced readability and formatting
- Add golines formatter to the golangci-lint configuration - Reformat flag registrations to use multi-line style for readability and consistency - Apply multi-line wrapping to function calls with long arguments and string formatting - Improve error message construction by wrapping them in multi-line statements - Increase code clarity around user confirmations and conditional checks - Update test error reporting to use multi-line formatting for arguments - No changes to program logic; only code readability, style, and formatting were improved Signed-off-by: appleboy <[email protected]>
1 parent f8335d0 commit b1491ac

File tree

9 files changed

+56
-23
lines changed

9 files changed

+56
-23
lines changed

.golangci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ formatters:
4040
- gofmt
4141
- gofumpt
4242
- goimports
43+
- golines
4344
exclusions:
4445
generated: lax
4546
paths:

cmd/cmd.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@ const (
3434
func init() {
3535
cobra.OnInitialize(initConfig)
3636

37-
rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.config/codegpt/.codegpt.yaml)")
38-
rootCmd.PersistentFlags().StringVar(&promptFolder, "prompt_folder", "", "prompt folder (default is $HOME/.config/codegpt/prompt)")
37+
rootCmd.PersistentFlags().
38+
StringVar(&cfgFile, "config", "", "config file (default is $HOME/.config/codegpt/.codegpt.yaml)")
39+
rootCmd.PersistentFlags().
40+
StringVar(&promptFolder, "prompt_folder", "", "prompt folder (default is $HOME/.config/codegpt/prompt)")
3941
rootCmd.AddCommand(versionCmd)
4042
rootCmd.AddCommand(configCmd)
4143
rootCmd.AddCommand(commitCmd)

cmd/commit.go

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,30 @@ var (
4545

4646
func init() {
4747
commitCmd.PersistentFlags().StringP("file", "f", "", "specify output file for commit message")
48-
commitCmd.PersistentFlags().BoolVar(&preview, "preview", false, "preview commit message before committing")
48+
commitCmd.PersistentFlags().
49+
BoolVar(&preview, "preview", false, "preview commit message before committing")
4950
commitCmd.PersistentFlags().IntVar(&diffUnified, "diff_unified", 3,
5051
"generate diffs with <n> lines of context (default: 3)")
51-
commitCmd.PersistentFlags().StringVar(&commitModel, "model", "gpt-4o", "specify which OpenAI model to use for generation")
52-
commitCmd.PersistentFlags().StringVar(&commitLang, "lang", "en", "set output language for the commit message (default: English)")
52+
commitCmd.PersistentFlags().
53+
StringVar(&commitModel, "model", "gpt-4o", "specify which OpenAI model to use for generation")
54+
commitCmd.PersistentFlags().
55+
StringVar(&commitLang, "lang", "en", "set output language for the commit message (default: English)")
5356
commitCmd.PersistentFlags().StringSliceVar(&excludeList, "exclude_list", []string{},
5457
"specify files to exclude from git diff")
5558
commitCmd.PersistentFlags().StringVar(&httpsProxy, "proxy", "", "set HTTP proxy URL")
5659
commitCmd.PersistentFlags().StringVar(&socksProxy, "socks", "", "set SOCKS proxy URL")
57-
commitCmd.PersistentFlags().StringVar(&templateFile, "template_file", "", "provide template file for commit message format")
58-
commitCmd.PersistentFlags().StringVar(&templateString, "template_string", "", "provide inline template string for commit message format")
59-
commitCmd.PersistentFlags().StringSliceVar(&templateVars, "template_vars", []string{}, "define custom variables for templates")
60-
commitCmd.PersistentFlags().StringVar(&templateVarsFile, "template_vars_file", "", "specify file containing template variables")
60+
commitCmd.PersistentFlags().
61+
StringVar(&templateFile, "template_file", "", "provide template file for commit message format")
62+
commitCmd.PersistentFlags().
63+
StringVar(&templateString, "template_string", "", "provide inline template string for commit message format")
64+
commitCmd.PersistentFlags().
65+
StringSliceVar(&templateVars, "template_vars", []string{}, "define custom variables for templates")
66+
commitCmd.PersistentFlags().
67+
StringVar(&templateVarsFile, "template_vars_file", "", "specify file containing template variables")
6168
commitCmd.PersistentFlags().BoolVar(&commitAmend, "amend", false,
6269
"amend the previous commit instead of creating a new one")
63-
commitCmd.PersistentFlags().DurationVarP(&timeout, "timeout", "t", defaultTimeout, "set API request timeout duration")
70+
commitCmd.PersistentFlags().
71+
DurationVarP(&timeout, "timeout", "t", defaultTimeout, "set API request timeout duration")
6472
commitCmd.PersistentFlags().BoolVar(&promptOnly, "prompt_only", false,
6573
"display the prompt without sending to OpenAI")
6674
commitCmd.PersistentFlags().BoolVar(&noConfirm, "no_confirm", false,
@@ -196,7 +204,10 @@ var commitCmd = &cobra.Command{
196204
}
197205

198206
// Lowercase the first character of first word of the commit message and remove the trailing period
199-
summarizeTitle = strings.TrimRight(strings.ToLower(string(summarizeTitle[0]))+summarizeTitle[1:], ".")
207+
summarizeTitle = strings.TrimRight(
208+
strings.ToLower(string(summarizeTitle[0]))+summarizeTitle[1:],
209+
".",
210+
)
200211
data[prompt.SummarizeTitleKey] = strings.TrimSpace(summarizeTitle)
201212
}
202213

@@ -268,7 +279,11 @@ var commitCmd = &cobra.Command{
268279
}
269280

270281
// Translate git commit message
271-
color.Cyan("Translating git commit message to " + prompt.GetLanguage(viper.GetString("output.lang")))
282+
color.Cyan(
283+
"Translating git commit message to " + prompt.GetLanguage(
284+
viper.GetString("output.lang"),
285+
),
286+
)
272287
resp, err := client.Completion(cmd.Context(), out)
273288
if err != nil {
274289
return err
@@ -306,7 +321,8 @@ var commitCmd = &cobra.Command{
306321
if noConfirm {
307322
return nil
308323
}
309-
if ready, err := confirmation.New("Commit this preview summary?", confirmation.Yes).RunPrompt(); err != nil || !ready {
324+
if ready, err := confirmation.New("Commit this preview summary?", confirmation.Yes).RunPrompt(); err != nil ||
325+
!ready {
310326
if err != nil {
311327
return err
312328
}

cmd/config_set.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@ func init() {
2626
configSetCmd.Flags().IntP("max_tokens", "", 300, availableKeys["openai.max_tokens"])
2727
configSetCmd.Flags().Float32P("temperature", "", 1.0, availableKeys["openai.temperature"])
2828
configSetCmd.Flags().Float32P("top_p", "", 1.0, availableKeys["openai.top_p"])
29-
configSetCmd.Flags().Float32P("frequency_penalty", "", 0.0, availableKeys["openai.frequency_penalty"])
30-
configSetCmd.Flags().Float32P("presence_penalty", "", 0.0, availableKeys["openai.presence_penalty"])
29+
configSetCmd.Flags().
30+
Float32P("frequency_penalty", "", 0.0, availableKeys["openai.frequency_penalty"])
31+
configSetCmd.Flags().
32+
Float32P("presence_penalty", "", 0.0, availableKeys["openai.presence_penalty"])
3133
configSetCmd.Flags().StringP("provider", "", "openai", availableKeys["openai.provider"])
3234
configSetCmd.Flags().BoolP("skip_verify", "", false, availableKeys["openai.skip_verify"])
3335
configSetCmd.Flags().StringP("headers", "", "", availableKeys["openai.headers"])
@@ -36,7 +38,8 @@ func init() {
3638
// Gemini flags
3739
configSetCmd.Flags().String("gemini.project_id", "", availableKeys["gemini.project_id"])
3840
configSetCmd.Flags().String("gemini.location", "", availableKeys["gemini.location"])
39-
configSetCmd.Flags().String("gemini.backend", "BackendGeminiAPI", availableKeys["gemini.backend"])
41+
configSetCmd.Flags().
42+
String("gemini.backend", "BackendGeminiAPI", availableKeys["gemini.backend"])
4043
configSetCmd.Flags().String("gemini.api_key", "", availableKeys["gemini.api_key"])
4144

4245
_ = viper.BindPFlag("openai.base_url", configSetCmd.Flags().Lookup("base_url"))
@@ -76,7 +79,9 @@ var configSetCmd = &cobra.Command{
7679
RunE: func(cmd *cobra.Command, args []string) error {
7780
// Check if key is available
7881
if _, ok := availableKeys[args[0]]; !ok {
79-
return errors.New("config key is not available, please use `codegpt config list` to see the available keys")
82+
return errors.New(
83+
"config key is not available, please use `codegpt config list` to see the available keys",
84+
)
8085
}
8186

8287
// Set config value in viper

cmd/hepler.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ import (
1616
func check(ctx context.Context) error {
1717
// Check if the Git command is available on the system's PATH
1818
if !util.IsCommandAvailable("git") {
19-
return errors.New("git command not found in your system's PATH. Please install Git and try again")
19+
return errors.New(
20+
"git command not found in your system's PATH. Please install Git and try again",
21+
)
2022
}
2123

2224
// Check if the current directory is a git repository and can execute git diff

cmd/prompt.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ When executed with the --load flag, it will copy all standard templates to your
5959
folder := viper.GetString("prompt.folder")
6060

6161
color.Yellow("Prompt folder: %s", folder)
62-
confirm, err := confirmation.New("Do you want to load the default prompt data? This will overwrite your existing data.", confirmation.No).RunPrompt()
62+
confirm, err := confirmation.New("Do you want to load the default prompt data? This will overwrite your existing data.", confirmation.No).
63+
RunPrompt()
6364
if err != nil || !confirm {
6465
return err
6566
}

cmd/review.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ func init() {
2323
reviewCmd.PersistentFlags().IntVar(&maxTokens, "max_tokens", 300,
2424
"Maximum number of tokens to generate in the chat completion")
2525
reviewCmd.PersistentFlags().StringVar(&commitModel, "model", "gpt-4o", "OpenAI model to use")
26-
reviewCmd.PersistentFlags().StringVar(&commitLang, "lang", "en", "Language for summarization (default: English)")
27-
reviewCmd.PersistentFlags().StringSliceVar(&excludeList, "exclude_list", []string{}, "Files to exclude from git diff")
26+
reviewCmd.PersistentFlags().
27+
StringVar(&commitLang, "lang", "en", "Language for summarization (default: English)")
28+
reviewCmd.PersistentFlags().
29+
StringSliceVar(&excludeList, "exclude_list", []string{}, "Files to exclude from git diff")
2830
reviewCmd.PersistentFlags().BoolVar(&commitAmend, "amend", false,
2931
"Replace the tip of the current branch by creating a new commit")
3032
reviewCmd.PersistentFlags().BoolVar(&promptOnly, "prompt_only", false,

git/git_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,10 @@ func TestCanExecuteGitDiff(t *testing.T) {
8282

8383
err = cmd.CanExecuteGitDiff(ctx)
8484
if err != nil {
85-
t.Errorf("CanExecuteGitDiff() should succeed in a git repository subdirectory, got error: %v", err)
85+
t.Errorf(
86+
"CanExecuteGitDiff() should succeed in a git repository subdirectory, got error: %v",
87+
err,
88+
)
8689
}
8790
})
8891
}

provider/openai/openai.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ func (c *Client) Completion(ctx context.Context, content string) (*core.Response
5858
func (c *Client) GetSummaryPrefix(ctx context.Context, content string) (*core.Response, error) {
5959
var resp openai.ChatCompletionResponse
6060
var err error
61-
if checkOSeriesModels.MatchString(c.model) || strings.Contains(strings.ToLower(c.model), "deepseek") {
61+
if checkOSeriesModels.MatchString(c.model) ||
62+
strings.Contains(strings.ToLower(c.model), "deepseek") {
6263
resp, err = c.CreateChatCompletion(ctx, content)
6364
if err != nil || len(resp.Choices) != 1 {
6465
return nil, err

0 commit comments

Comments
 (0)