Merge pull request #1001 from MichaelMure/style/clean-up-linter-issues

Michael Muré created 2 years ago

style: clean up linter complaints

Change summary

commands/bug/bug_comment.go      | 2 +-
commands/bug/bug_comment_add.go  | 2 +-
commands/bug/bug_comment_test.go | 1 -
commands/bug/bug_label.go        | 2 +-
commands/bug/bug_label_new.go    | 4 ++--
commands/bug/bug_label_rm.go     | 4 ++--
commands/bug/bug_select.go       | 2 +-
commands/bug/bug_show.go         | 4 ++--
commands/bug/bug_status.go       | 2 +-
commands/bug/bug_status_close.go | 2 +-
commands/bug/bug_status_open.go  | 2 +-
commands/bug/bug_title.go        | 2 +-
commands/bug/bug_title_edit.go   | 2 +-
commands/bug/completion.go       | 4 ++--
14 files changed, 17 insertions(+), 18 deletions(-)

Detailed changes

commands/bug/bug_comment.go

@@ -26,7 +26,7 @@ func newBugCommentCommand(env *execenv.Env) *cobra.Command {
 }
 
 func runBugComment(env *execenv.Env, args []string) error {
-	b, args, err := ResolveSelected(env.Backend, args)
+	b, _, err := ResolveSelected(env.Backend, args)
 	if err != nil {
 		return err
 	}

commands/bug/bug_comment_add.go

@@ -41,7 +41,7 @@ func newBugCommentNewCommand(env *execenv.Env) *cobra.Command {
 }
 
 func runBugCommentNew(env *execenv.Env, opts bugCommentNewOptions, args []string) error {
-	b, args, err := ResolveSelected(env.Backend, args)
+	b, _, err := ResolveSelected(env.Backend, args)
 	if err != nil {
 		return err
 	}

commands/bug/bug_comment_test.go

@@ -140,7 +140,6 @@ func requireCommentsEqual(t *testing.T, golden string, env *execenv.Env) {
 	comments = normalizeParsedComments(t, comments)
 
 	if *cmdtest.Update {
-		t.Log("Got here")
 		for i, comment := range comments {
 			fileName := fmt.Sprintf(goldenFilePattern, golden, i)
 			require.NoError(t, os.WriteFile(fileName, []byte(comment.message), 0644))

commands/bug/bug_label.go

@@ -24,7 +24,7 @@ func newBugLabelCommand(env *execenv.Env) *cobra.Command {
 }
 
 func runBugLabel(env *execenv.Env, args []string) error {
-	b, args, err := ResolveSelected(env.Backend, args)
+	b, _, err := ResolveSelected(env.Backend, args)
 	if err != nil {
 		return err
 	}

commands/bug/bug_label_new.go

@@ -22,12 +22,12 @@ func newBugLabelNewCommand(env *execenv.Env) *cobra.Command {
 }
 
 func runBugLabelNew(env *execenv.Env, args []string) error {
-	b, args, err := ResolveSelected(env.Backend, args)
+	b, cleanArgs, err := ResolveSelected(env.Backend, args)
 	if err != nil {
 		return err
 	}
 
-	added := args
+	added := cleanArgs
 
 	changes, _, err := b.ChangeLabels(text.CleanupOneLineArray(added), nil)
 

commands/bug/bug_label_rm.go

@@ -22,12 +22,12 @@ func newBugLabelRmCommand(env *execenv.Env) *cobra.Command {
 }
 
 func runBugLabelRm(env *execenv.Env, args []string) error {
-	b, args, err := ResolveSelected(env.Backend, args)
+	b, cleanArgs, err := ResolveSelected(env.Backend, args)
 	if err != nil {
 		return err
 	}
 
-	removed := args
+	removed := cleanArgs
 
 	changes, _, err := b.ChangeLabels(nil, text.CleanupOneLineArray(removed))
 

commands/bug/bug_select.go

@@ -44,7 +44,7 @@ The complementary command is "git bug deselect" performing the opposite operatio
 
 func runBugSelect(env *execenv.Env, args []string) error {
 	if len(args) == 0 {
-		return errors.New("You must provide a bug id")
+		return errors.New("a bug id must be provided")
 	}
 
 	prefix := args[0]

commands/bug/bug_show.go

@@ -47,7 +47,7 @@ func newBugShowCommand(env *execenv.Env) *cobra.Command {
 }
 
 func runBugShow(env *execenv.Env, opts bugShowOptions, args []string) error {
-	b, args, err := ResolveSelected(env.Backend, args)
+	b, _, err := ResolveSelected(env.Backend, args)
 	if err != nil {
 		return err
 	}
@@ -91,7 +91,7 @@ func runBugShow(env *execenv.Env, opts bugShowOptions, args []string) error {
 		case "title":
 			env.Out.Printf("%s\n", snap.Title)
 		default:
-			return fmt.Errorf("\nUnsupported field: %s\n", opts.fields)
+			return fmt.Errorf("unsupported field: %s", opts.fields)
 		}
 
 		return nil

commands/bug/bug_status.go

@@ -24,7 +24,7 @@ func newBugStatusCommand(env *execenv.Env) *cobra.Command {
 }
 
 func runBugStatus(env *execenv.Env, args []string) error {
-	b, args, err := ResolveSelected(env.Backend, args)
+	b, _, err := ResolveSelected(env.Backend, args)
 	if err != nil {
 		return err
 	}

commands/bug/bug_status_close.go

@@ -21,7 +21,7 @@ func newBugStatusCloseCommand(env *execenv.Env) *cobra.Command {
 }
 
 func runBugStatusClose(env *execenv.Env, args []string) error {
-	b, args, err := ResolveSelected(env.Backend, args)
+	b, _, err := ResolveSelected(env.Backend, args)
 	if err != nil {
 		return err
 	}

commands/bug/bug_status_open.go

@@ -21,7 +21,7 @@ func newBugStatusOpenCommand(env *execenv.Env) *cobra.Command {
 }
 
 func runBugStatusOpen(env *execenv.Env, args []string) error {
-	b, args, err := ResolveSelected(env.Backend, args)
+	b, _, err := ResolveSelected(env.Backend, args)
 	if err != nil {
 		return err
 	}

commands/bug/bug_title.go

@@ -23,7 +23,7 @@ func newBugTitleCommand(env *execenv.Env) *cobra.Command {
 }
 
 func runBugTitle(env *execenv.Env, args []string) error {
-	b, args, err := ResolveSelected(env.Backend, args)
+	b, _, err := ResolveSelected(env.Backend, args)
 	if err != nil {
 		return err
 	}

commands/bug/bug_title_edit.go

@@ -38,7 +38,7 @@ func newBugTitleEditCommand(env *execenv.Env) *cobra.Command {
 }
 
 func runBugTitleEdit(env *execenv.Env, opts bugTitleEditOptions, args []string) error {
-	b, args, err := ResolveSelected(env.Backend, args)
+	b, _, err := ResolveSelected(env.Backend, args)
 	if err != nil {
 		return err
 	}

commands/bug/completion.go

@@ -50,7 +50,7 @@ func BugAndLabelsCompletion(env *execenv.Env, addOrRemove bool) completion.Valid
 			_ = env.Backend.Close()
 		}()
 
-		b, args, err := ResolveSelected(env.Backend, args)
+		b, cleanArgs, err := ResolveSelected(env.Backend, args)
 		if _select.IsErrNoValidId(err) {
 			// we need a bug first to complete labels
 			return bugWithBackend(env.Backend, toComplete)
@@ -62,7 +62,7 @@ func BugAndLabelsCompletion(env *execenv.Env, addOrRemove bool) completion.Valid
 		snap := b.Snapshot()
 
 		seenLabels := map[bug.Label]bool{}
-		for _, label := range args {
+		for _, label := range cleanArgs {
 			seenLabels[bug.Label(label)] = addOrRemove
 		}