Merge pull request #2146 from Ryooooooga/fix-initial-origin-editor

jesseduffield · Sep 7, 2022 · 46b08e7 · 46b08e7
2 parents 448ff80 + eb9fbb0
commit 46b08e7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/pkg/gui/confirmation_panel.go b/pkg/gui/confirmation_panel.go
@@ -181,6 +181,7 @@ func (gui *Gui) createPopupPanel(opts types.CreatePopupPanelOpts) error {
 		textArea := confirmationView.TextArea
 		textArea.Clear()
 		textArea.TypeString(opts.Prompt)
+		gui.resizeConfirmationPanel()
 		confirmationView.RenderTextArea()
 	} else {
 		if err := gui.renderString(confirmationView, style.AttrBold.Sprint(opts.Prompt)); err != nil {

diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go
@@ -87,7 +87,11 @@ func (gui *Gui) resizeConfirmationPanel() {
 	}
 	panelWidth := gui.getConfirmationPanelWidth()
 	prompt := gui.Views.Confirmation.Buffer()
-	wrap := !gui.Views.Confirmation.Editable
+	wrap := true
+	if gui.Views.Confirmation.Editable {
+		prompt = gui.Views.Confirmation.TextArea.GetContent()
+		wrap = false
+	}
 	panelHeight := gui.getMessageHeight(wrap, prompt, panelWidth) + suggestionsViewHeight
 	x0, y0, x1, y1 := gui.getConfirmationPanelDimensionsAux(panelWidth, panelHeight)
 	confirmationViewBottom := y1 - suggestionsViewHeight