Clean function to edit issue and merge request

Author: lighttiger2505

commands/internal/internal.go

@@ -1,10 +1,12 @@
 package internal
 
 import (
+	"fmt"
 	"regexp"
 	"strconv"
 	"strings"
 
+	"github.com/lighttiger2505/lab/git"
 	"github.com/lighttiger2505/lab/internal/browse"
 	"github.com/lighttiger2505/lab/internal/clipboard"
 )
@@ -76,3 +78,30 @@ func ParceRepositoryFullName(webURL string) string {
 
 	return strings.Join(splitURL[:subPageIndex], "/")
 }
+
+func EditContents(title, description string) string {
+	message := `%s
+
+%s
+`
+	message = fmt.Sprintf(message, title, description)
+	return message
+}
+
+func EditTitleAndDesc(prefix, template string, editFunc func(program, file string) error) (string, string, error) {
+	editor, err := git.NewEditor(prefix, template, editFunc)
+	if err != nil {
+		return "", "", err
+	}
+
+	title, description, err := editor.EditTitleAndDescription()
+	if err != nil {
+		return "", "", err
+	}
+
+	if editor != nil {
+		defer editor.DeleteFile()
+	}
+
+	return title, description, nil
+}

commands/issue/create.go

@@ -3,6 +3,7 @@ package issue
 import (
 	"fmt"
 
+	"github.com/lighttiger2505/lab/commands/internal"
 	"github.com/lighttiger2505/lab/internal/api"
 	gitlab "github.com/xanzy/go-gitlab"
 )
@@ -78,8 +79,11 @@ func (m *createOnEditorMethod) Process() (string, error) {
 		message = m.opt.Message
 	}
 
-	content := editIssueMessage(title, message)
-	title, message, err := editIssueTitleAndDesc(content, m.editFunc)
+	title, message, err := internal.EditTitleAndDesc(
+		"ISSUE",
+		internal.EditContents(title, message),
+		m.editFunc,
+	)
 	if err != nil {
 		return "", err
 	}

commands/issue/issue.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/lighttiger2505/lab/git"
 	"github.com/lighttiger2505/lab/internal/api"
 	"github.com/lighttiger2505/lab/internal/gitutil"
 	"github.com/lighttiger2505/lab/internal/ui"
@@ -90,30 +89,3 @@ func validIssueIID(args []string) (int, error) {
 	}
 	return iid, nil
 }
-
-func editIssueMessage(title, description string) string {
-	message := `%s
-
-%s
-`
-	message = fmt.Sprintf(message, title, description)
-	return message
-}
-
-func editIssueTitleAndDesc(template string, editFunc func(program, file string) error) (string, string, error) {
-	editor, err := git.NewEditor("ISSUE", "issue", template, editFunc)
-	if err != nil {
-		return "", "", err
-	}
-
-	title, description, err := editor.EditTitleAndDescription()
-	if err != nil {
-		return "", "", err
-	}
-
-	if editor != nil {
-		defer editor.DeleteFile()
-	}
-
-	return title, description, nil
-}

commands/issue/update.go

@@ -74,8 +74,11 @@ func (m *updateOnEditorMethod) Process() (string, error) {
 	updatedTitle, updatedMessage := getUpdatedTitleAndMessage(issue, m.opt.Title, m.opt.Message)
 
 	// Starting editor for edit title and description
-	content := editIssueMessage(updatedTitle, updatedMessage)
-	title, message, err := editIssueTitleAndDesc(content, m.editFunc)
+	title, message, err := internal.EditTitleAndDesc(
+		"ISSUE",
+		internal.EditContents(updatedTitle, updatedMessage),
+		m.editFunc,
+	)
 	if err != nil {
 		return "", err
 	}

commands/mr/create.go

@@ -74,8 +74,11 @@ func (m *createOnEditorMethod) Process() (string, error) {
 		message = m.opt.Message
 	}
 
-	content := editMergeRequestTemplate(title, message)
-	title, message, err := editIssueTitleAndDesc(content, m.editFunc)
+	title, message, err := internal.EditTitleAndDesc(
+		"MERGE_REQUEST",
+		internal.EditContents(title, message),
+		m.editFunc,
+	)
 	if err != nil {
 		return "", err
 	}

commands/mr/mr.go

@@ -178,30 +178,3 @@ func validMergeRequestIID(args []string) (int, error) {
 	}
 	return iid, nil
 }
-
-func editMergeRequestTemplate(title, description string) string {
-	message := `%s
-
-%s
-`
-	message = fmt.Sprintf(message, title, description)
-	return message
-}
-
-func editIssueTitleAndDesc(template string, editFunc func(program, file string) error) (string, string, error) {
-	editor, err := git.NewEditor("ISSUE", "issue", template, editFunc)
-	if err != nil {
-		return "", "", err
-	}
-
-	title, description, err := editor.EditTitleAndDescription()
-	if err != nil {
-		return "", "", err
-	}
-
-	if editor != nil {
-		defer editor.DeleteFile()
-	}
-
-	return title, description, nil
-}

commands/mr/update.go

@@ -62,8 +62,11 @@ func (m *updateOnEditorMethod) Process() (string, error) {
 	}
 
 	// Starting editor for edit title and description
-	template := editMergeRequestTemplate(mergeRequest.Title, mergeRequest.Description)
-	title, message, err := editIssueTitleAndDesc(template, m.editFunc)
+	title, message, err := internal.EditTitleAndDesc(
+		"MERGE_REQUEST",
+		internal.EditContents(mergeRequest.Title, mergeRequest.Description),
+		m.editFunc,
+	)
 	if err != nil {
 		return "", nil
 	}

git/editor.go

@@ -16,14 +16,13 @@ import (
 
 type Editor struct {
 	Program    string
-	Topic      string
 	File       string
 	Message    string
 	CS         string
 	openEditor func(program, file string) error
 }
 
-func NewEditor(filePrefix, topic, message string, editFunc func(program, file string) error) (editor *Editor, err error) {
+func NewEditor(filePrefix, message string, editFunc func(program, file string) error) (editor *Editor, err error) {
 	messageFile, err := getMessageFile(filePrefix)
 	if err != nil {
 		return
@@ -42,7 +41,6 @@ func NewEditor(filePrefix, topic, message string, editFunc func(program, file st
 
 	editor = &Editor{
 		Program:    program,
-		Topic:      topic,
 		File:       messageFile,
 		Message:    message,
 		CS:         cs,
@@ -81,7 +79,7 @@ func (e *Editor) openAndEdit() (content []byte, err error) {
 
 	err = e.openEditor(e.Program, e.File)
 	if err != nil {
-		err = fmt.Errorf("error using text editor for %s message", e.Topic)
+		err = fmt.Errorf("error using text editor")
 		defer e.DeleteFile()
 		return
 	}