pkg/cli: In the CodeArea widget, do not consult key binding when past…

…ing.

This fixes #890.

pkg/cli/codearea.go

@@ -153,10 +153,6 @@ func (w *codeArea) Render(width, height int) *term.Buffer {
 // Handle handles KeyEvent's of non-function keys, as well as PasteSetting
 // events.
 func (w *codeArea) Handle(event term.Event) bool {
-	if w.OverlayHandler.Handle(event) {
-		return true
-	}
-
 	switch event := event.(type) {
 	case term.PasteSetting:
 		return w.handlePasteSetting(bool(event))
@@ -211,6 +207,9 @@ func (w *codeArea) handleKeyEvent(key ui.Key) bool {
 		}
 		return true
 	}
+	if w.OverlayHandler.Handle(term.KeyEvent(key)) {
+		return true
+	}
 	// We only implement essential keybindings here. Other keybindings can be
 	// added via handler overlays.
 	switch key {

pkg/cli/codearea_test.go

@@ -303,6 +303,16 @@ var codeAreaHandleTests = []HandleTest{
 		Events:       []term.Event{term.K('a')},
 		WantNewState: CodeAreaState{Buffer: CodeBuffer{Content: "b", Dot: 1}},
 	},
+	{
+		// Regression test for #890.
+		Name: "overlay handler does not apply when pasting",
+		Given: codeAreaWithOverlay(CodeAreaSpec{}, func(w *codeArea) Handler {
+			return MapHandler{term.K('\n'): func() {}}
+		}),
+		Events: []term.Event{
+			term.PasteSetting(true), term.K('\n'), term.PasteSetting(false)},
+		WantNewState: CodeAreaState{Buffer: CodeBuffer{Content: "\n", Dot: 1}},
+	},
 }
 
 func TestCodeArea_Handle(t *testing.T) {