Enable editing comments in the term ui

Luke Adams created 7 years ago

Change summary

termui/show_bug.go | 32 ++++++++++++++++++++++++++++++++
termui/termui.go   | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 68 insertions(+)

Detailed changes

termui/show_bug.go

@@ -184,6 +184,12 @@ func (sb *showBug) keybindings(g *gocui.Gui) error {
 		return err
 	}
 
+	// Edit
+	if err := g.SetKeybinding(showBugView, 'e', gocui.ModNone,
+		sb.edit); err != nil {
+		return err
+	}
+
 	// Labels
 	if err := g.SetKeybinding(showBugView, 'a', gocui.ModNone,
 		sb.addLabel); err != nil {
@@ -621,6 +627,32 @@ func (sb *showBug) toggleOpenClose(g *gocui.Gui, v *gocui.View) error {
 	}
 }
 
+func (sb *showBug) edit(g *gocui.Gui, v *gocui.View) error {
+	if sb.isOnSide {
+		ui.msgPopup.Activate(msgPopupErrorTitle, "Selected field is not editable.")
+		return nil
+	}
+
+	snap := sb.bug.Snapshot()
+
+	op, err := snap.SearchTimelineItem(git.Hash(sb.selected))
+	if err != nil {
+		return err
+	}
+
+	switch op.(type) {
+	case *bug.AddCommentTimelineItem:
+		message := op.(*bug.AddCommentTimelineItem).Message
+		return editCommentWithEditor(sb.bug, op.Hash(), message)
+	case *bug.CreateTimelineItem:
+		preMessage := op.(*bug.CreateTimelineItem).Message
+		return editCommentWithEditor(sb.bug, op.Hash(), preMessage)
+	}
+
+	ui.msgPopup.Activate(msgPopupErrorTitle, "Selected field is not editable.")
+	return nil
+}
+
 func (sb *showBug) addLabel(g *gocui.Gui, v *gocui.View) error {
 	c := ui.inputPopup.Activate("Add labels")
 

termui/termui.go

@@ -4,6 +4,7 @@ package termui
 import (
 	"github.com/MichaelMure/git-bug/cache"
 	"github.com/MichaelMure/git-bug/input"
+	"github.com/MichaelMure/git-bug/util/git"
 	"github.com/jroimartin/gocui"
 	"github.com/pkg/errors"
 )
@@ -230,6 +231,41 @@ func addCommentWithEditor(bug *cache.BugCache) error {
 	return errTerminateMainloop
 }
 
+func editCommentWithEditor(bug *cache.BugCache, target git.Hash, preMessage string) error {
+	// This is somewhat hacky.
+	// As there is no way to pause gocui, run the editor and restart gocui,
+	// we have to stop it entirely and start a new one later.
+	//
+	// - an error channel is used to route the returned error of this new
+	// 		instance into the original launch function
+	// - a custom error (errTerminateMainloop) is used to terminate the original
+	//		instance's mainLoop. This error is then filtered.
+
+	ui.g.Close()
+	ui.g = nil
+
+	message, err := input.BugCommentEditorInput(ui.cache, preMessage)
+	if err != nil && err != input.ErrEmptyMessage {
+		return err
+	}
+
+	if err == input.ErrEmptyMessage {
+		// TODO: Allow comments to be deleted?
+		ui.msgPopup.Activate(msgPopupErrorTitle, "Empty message, aborting.")
+	} else if message == preMessage {
+		ui.msgPopup.Activate(msgPopupErrorTitle, "No changes found, aborting.")
+	} else {
+		err := bug.EditComment(target, message)
+		if err != nil {
+			return err
+		}
+	}
+
+	initGui(nil)
+
+	return errTerminateMainloop
+}
+
 func setTitleWithEditor(bug *cache.BugCache) error {
 	// This is somewhat hacky.
 	// As there is no way to pause gocui, run the editor and restart gocui,