Skip to content

Commit 7ea57f9

Browse files
maxbeizerCopilot
maxbeizer
and
Copilot
committed
Add --editor flag to gh issue edit and gh pr edit
Add a -e/--editor flag to both `gh issue edit` and `gh pr edit` that opens the system editor pre-filled with the current title and body. The first line is the title and the remaining text is the body, matching the UX of `gh issue create --editor` and `gh pr create --editor`. This flag: - Skips the interactive field-selection prompts and metadata fetch - Is mutually exclusive with --body and --body-file - Respects GH_EDITOR, config editor, and prefer_editor_prompt settings - Does not support multiple issues (same restriction as interactive mode) - When enabled via prefer_editor_prompt config, silently yields to explicit flags (--body, --add-label, etc.) so scripted usage works Closes #11108 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent a32d004 commit 7ea57f9

4 files changed

Lines changed: 302 additions & 43 deletions

File tree

‎pkg/cmd/issue/edit/edit.go‎

Lines changed: 53 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@ type EditOptions struct {
3131
FieldsToEditSurvey func(prShared.EditPrompter, *prShared.Editable) error
3232
EditFieldsSurvey func(prShared.EditPrompter, *prShared.Editable, string) error
3333
FetchOptions func(*api.Client, ghrepo.Interface, *prShared.Editable, gh.ProjectsV1Support) error
34+
TitledEditSurvey func(string, string) (string, string, error)
3435

3536
IssueNumbers []int
3637
Interactive bool
38+
EditorMode bool
3739

3840
prShared.Editable
3941
}
@@ -47,6 +49,7 @@ func NewCmdEdit(f *cmdutil.Factory, runF func(*EditOptions) error) *cobra.Comman
4749
EditFieldsSurvey: prShared.EditFieldsSurvey,
4850
FetchOptions: prShared.FetchOptions,
4951
Prompter: f.Prompter,
52+
TitledEditSurvey: prShared.TitledEditSurvey(&prShared.UserEditor{Config: f.Config, IO: f.IOStreams}),
5053
}
5154

5255
var bodyFile string
@@ -76,6 +79,7 @@ func NewCmdEdit(f *cmdutil.Factory, runF func(*EditOptions) error) *cobra.Comman
7679
$ gh issue edit 23 --remove-milestone
7780
$ gh issue edit 23 --body-file body.txt
7881
$ gh issue edit 23 34 --add-label "help wanted"
82+
$ gh issue edit 23 --editor
7983
`),
8084
Args: cobra.MinimumNArgs(1),
8185
RunE: func(cmd *cobra.Command, args []string) error {
@@ -148,7 +152,24 @@ func NewCmdEdit(f *cmdutil.Factory, runF func(*EditOptions) error) *cobra.Comman
148152
// see the `Editable.MilestoneId` method.
149153
}
150154

151-
if !opts.Editable.Dirty() {
155+
opts.EditorMode, err = prShared.InitEditorMode(f, opts.EditorMode, false, opts.IO.CanPrompt())
156+
if err != nil {
157+
return err
158+
}
159+
160+
// When editor mode was enabled via config (prefer_editor_prompt)
161+
// rather than the --editor flag, silently disable it if the user
162+
// provided flags that conflict, so scripted usage isn't broken.
163+
editorFlagExplicit := flags.Changed("editor")
164+
if opts.EditorMode && !editorFlagExplicit && (opts.Editable.Dirty() || len(opts.IssueNumbers) > 1) {
165+
opts.EditorMode = false
166+
}
167+
168+
if opts.EditorMode && (bodyProvided || bodyFileProvided) {
169+
return cmdutil.FlagErrorf("specify only one of `--body`, `--body-file`, or `--editor`")
170+
}
171+
172+
if !opts.Editable.Dirty() && !opts.EditorMode {
152173
opts.Interactive = true
153174
}
154175

@@ -160,6 +181,10 @@ func NewCmdEdit(f *cmdutil.Factory, runF func(*EditOptions) error) *cobra.Comman
160181
return cmdutil.FlagErrorf("multiple issues cannot be edited interactively")
161182
}
162183

184+
if opts.EditorMode && len(opts.IssueNumbers) > 1 {
185+
return cmdutil.FlagErrorf("multiple issues cannot be edited with --editor")
186+
}
187+
163188
if runF != nil {
164189
return runF(opts)
165190
}
@@ -179,6 +204,7 @@ func NewCmdEdit(f *cmdutil.Factory, runF func(*EditOptions) error) *cobra.Comman
179204
cmd.Flags().StringSliceVar(&opts.Editable.Projects.Remove, "remove-project", nil, "Remove the issue from projects by `title`")
180205
cmd.Flags().StringVarP(&opts.Editable.Milestone.Value, "milestone", "m", "", "Edit the milestone the issue belongs to by `name`")
181206
cmd.Flags().BoolVar(&removeMilestone, "remove-milestone", false, "Remove the milestone association from the issue")
207+
cmd.Flags().BoolVarP(&opts.EditorMode, "editor", "e", false, "Skip prompts and open the text editor to write the title and body in.\nThe first line is the title and the remaining text is the body.")
182208

183209
return cmd
184210
}
@@ -202,6 +228,10 @@ func editRun(opts *EditOptions) error {
202228
return err
203229
}
204230
}
231+
if opts.EditorMode {
232+
editable.Title.Edited = true
233+
editable.Body.Edited = true
234+
}
205235

206236
if opts.Detector == nil {
207237
cachedClient := api.NewCachedHTTPClient(httpClient, time.Hour*24)
@@ -247,19 +277,22 @@ func editRun(opts *EditOptions) error {
247277
}
248278

249279
// Fetch editable shared fields once for all issues.
250-
apiClient := api.NewClientFromHTTP(httpClient)
251-
252-
// Wire up search function for assignees when ApiActorsSupported is available.
253-
// Interactive mode only supports a single issue, so we use its ID for the search query.
254-
if issueFeatures.ApiActorsSupported && opts.Interactive && len(issues) == 1 {
255-
editable.AssigneeSearchFunc = prShared.AssigneeSearchFunc(apiClient, baseRepo, issues[0].ID)
256-
}
280+
// Skip when in editor mode since we only need title and body.
281+
if !opts.EditorMode {
282+
apiClient := api.NewClientFromHTTP(httpClient)
283+
284+
// Wire up search function for assignees when ApiActorsSupported is available.
285+
// Interactive mode only supports a single issue, so we use its ID for the search query.
286+
if issueFeatures.ApiActorsSupported && opts.Interactive && len(issues) == 1 {
287+
editable.AssigneeSearchFunc = prShared.AssigneeSearchFunc(apiClient, baseRepo, issues[0].ID)
288+
}
257289

258-
opts.IO.StartProgressIndicatorWithLabel("Fetching repository information")
259-
err = opts.FetchOptions(apiClient, baseRepo, &editable, opts.Detector.ProjectsV1())
260-
opts.IO.StopProgressIndicator()
261-
if err != nil {
262-
return err
290+
opts.IO.StartProgressIndicatorWithLabel("Fetching repository information")
291+
err = opts.FetchOptions(apiClient, baseRepo, &editable, opts.Detector.ProjectsV1())
292+
opts.IO.StopProgressIndicator()
293+
if err != nil {
294+
return err
295+
}
263296
}
264297

265298
// Update all issues in parallel.
@@ -268,7 +301,7 @@ func editRun(opts *EditOptions) error {
268301
g := sync.WaitGroup{}
269302

270303
// Only show progress if we will not prompt below or the survey will break up the progress indicator.
271-
if !opts.Interactive {
304+
if !opts.Interactive && !opts.EditorMode {
272305
opts.IO.StartProgressIndicatorWithLabel(fmt.Sprintf("Updating %d issues", len(issues)))
273306
}
274307

@@ -299,7 +332,12 @@ func editRun(opts *EditOptions) error {
299332
}
300333

301334
// Allow interactive prompts for one issue; failed earlier if multiple issues specified.
302-
if opts.Interactive {
335+
if opts.EditorMode {
336+
editable.Title.Value, editable.Body.Value, err = opts.TitledEditSurvey(issue.Title, issue.Body)
337+
if err != nil {
338+
return err
339+
}
340+
} else if opts.Interactive {
303341
editorCommand, err := opts.DetermineEditor()
304342
if err != nil {
305343
return err

‎pkg/cmd/issue/edit/edit_test.go‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ import (
1010

1111
"github.com/MakeNowJust/heredoc"
1212
"github.com/cli/cli/v2/api"
13+
"github.com/cli/cli/v2/internal/config"
1314
fd "github.com/cli/cli/v2/internal/featuredetection"
15+
"github.com/cli/cli/v2/internal/gh"
1416
"github.com/cli/cli/v2/internal/ghrepo"
1517
"github.com/cli/cli/v2/internal/run"
1618
prShared "github.com/cli/cli/v2/pkg/cmd/pr/shared"
@@ -34,6 +36,7 @@ func TestNewCmdEdit(t *testing.T) {
3436
output EditOptions
3537
expectedBaseRepo ghrepo.Interface
3638
wantsErr bool
39+
config func() (gh.Config, error)
3740
}{
3841
{
3942
name: "no argument",
@@ -281,6 +284,66 @@ func TestNewCmdEdit(t *testing.T) {
281284
input: "23 34",
282285
wantsErr: true,
283286
},
287+
{
288+
name: "editor flag",
289+
input: "23 --editor",
290+
output: EditOptions{
291+
IssueNumbers: []int{23},
292+
EditorMode: true,
293+
},
294+
wantsErr: false,
295+
},
296+
{
297+
name: "editor flag with body flag",
298+
input: "23 --editor --body test",
299+
wantsErr: true,
300+
},
301+
{
302+
name: "editor flag with body-file flag",
303+
input: fmt.Sprintf("23 --editor --body-file '%s'", tmpFile),
304+
wantsErr: true,
305+
},
306+
{
307+
name: "editor flag with multiple issues",
308+
input: "23 34 --editor",
309+
wantsErr: true,
310+
},
311+
{
312+
name: "prefer_editor_prompt config with body flag",
313+
input: "23 --body test",
314+
config: func() (gh.Config, error) {
315+
return config.NewFromString("prefer_editor_prompt: enabled"), nil
316+
},
317+
output: EditOptions{
318+
IssueNumbers: []int{23},
319+
EditorMode: false,
320+
Editable: prShared.Editable{
321+
Body: prShared.EditableString{
322+
Value: "test",
323+
Edited: true,
324+
},
325+
},
326+
},
327+
wantsErr: false,
328+
},
329+
{
330+
name: "prefer_editor_prompt config with multiple issues and label",
331+
input: "23 34 --add-label bug",
332+
config: func() (gh.Config, error) {
333+
return config.NewFromString("prefer_editor_prompt: enabled"), nil
334+
},
335+
output: EditOptions{
336+
IssueNumbers: []int{23, 34},
337+
EditorMode: false,
338+
Editable: prShared.Editable{
339+
Labels: prShared.EditableSlice{
340+
Add: []string{"bug"},
341+
Edited: true,
342+
},
343+
},
344+
},
345+
wantsErr: false,
346+
},
284347
}
285348
for _, tt := range tests {
286349
t.Run(tt.name, func(t *testing.T) {
@@ -293,8 +356,16 @@ func TestNewCmdEdit(t *testing.T) {
293356
_, _ = stdin.WriteString(tt.stdin)
294357
}
295358

359+
cfgFunc := tt.config
360+
if cfgFunc == nil {
361+
cfgFunc = func() (gh.Config, error) {
362+
return config.NewBlankConfig(), nil
363+
}
364+
}
365+
296366
f := &cmdutil.Factory{
297367
IOStreams: ios,
368+
Config: cfgFunc,
298369
}
299370

300371
argv, err := shlex.Split(tt.input)
@@ -321,6 +392,7 @@ func TestNewCmdEdit(t *testing.T) {
321392
require.NoError(t, err)
322393
assert.Equal(t, tt.output.IssueNumbers, gotOpts.IssueNumbers)
323394
assert.Equal(t, tt.output.Interactive, gotOpts.Interactive)
395+
assert.Equal(t, tt.output.EditorMode, gotOpts.EditorMode)
324396
assert.Equal(t, tt.output.Editable, gotOpts.Editable)
325397
if tt.expectedBaseRepo != nil {
326398
baseRepo, err := gotOpts.BaseRepo()
@@ -614,6 +686,41 @@ func Test_editRun(t *testing.T) {
614686
},
615687
stdout: "https://github.com/OWNER/REPO/issue/123\n",
616688
},
689+
{
690+
name: "editor mode",
691+
input: &EditOptions{
692+
Detector: &fd.EnabledDetectorMock{},
693+
IssueNumbers: []int{123},
694+
EditorMode: true,
695+
TitledEditSurvey: func(title, body string) (string, string, error) {
696+
return "edited title", "edited body", nil
697+
},
698+
FieldsToEditSurvey: func(p prShared.EditPrompter, eo *prShared.Editable) error {
699+
t.Fatal("FieldsToEditSurvey should not be called in editor mode")
700+
return nil
701+
},
702+
EditFieldsSurvey: func(p prShared.EditPrompter, eo *prShared.Editable, _ string) error {
703+
t.Fatal("EditFieldsSurvey should not be called in editor mode")
704+
return nil
705+
},
706+
FetchOptions: func(client *api.Client, repo ghrepo.Interface, editable *prShared.Editable, v1 gh.ProjectsV1Support) error {
707+
return nil
708+
},
709+
},
710+
httpStubs: func(t *testing.T, reg *httpmock.Registry) {
711+
mockIssueGet(t, reg)
712+
reg.Register(
713+
httpmock.GraphQL(`mutation IssueUpdate\b`),
714+
httpmock.GraphQLMutation(`
715+
{ "data": { "updateIssue": { "__typename": "" } } }`,
716+
func(inputs map[string]interface{}) {
717+
assert.Equal(t, "edited title", inputs["title"])
718+
assert.Equal(t, "edited body", inputs["body"])
719+
}),
720+
)
721+
},
722+
stdout: "https://github.com/OWNER/REPO/issue/123\n",
723+
},
617724
{
618725
name: "interactive prompts with actor assignee display names when actors available",
619726
input: &EditOptions{

0 commit comments

Comments
 (0)