Handle arrow keys

Author: chojs23

README.md

@@ -214,8 +214,8 @@ Keybindings are vim-like by default.
 
 - n / p: next and previous conflict
 - gg / G: jump to top / bottom
-- j / k: vertical scroll
-- H / L: horizontal scroll
+- j / k / up / down: vertical scroll
+- H / L / left / right: horizontal scroll
 
 ### Selection and apply
 

internal/tui/tui.go

@@ -34,6 +34,10 @@ const (
 	keyScrollRight        = "L"
 	keyScrollDown         = "j"
 	keyScrollUp           = "k"
+	keyArrowLeft          = "left"
+	keyArrowRight         = "right"
+	keyArrowDown          = "down"
+	keyArrowUp            = "up"
 	keyGoTop              = "g"
 	keyGoBottom           = "G"
 	keyApplyOurs          = "o"
@@ -61,8 +65,8 @@ var resolverKeyHelp = []keyHelpEntry{
 	{key: "n", description: "next"},
 	{key: "p", description: "prev"},
 	{key: "gg/G", description: "top/bottom"},
-	{key: "j/k", description: "scroll"},
-	{key: "H/L", description: "scroll"},
+	{key: "j/k/up/down", description: "scroll"},
+	{key: "H/L/left/right", description: "scroll"},
 	{key: "h", description: "ours"},
 	{key: "l", description: "theirs"},
 	{key: "a/<space>", description: "accept"},
@@ -89,6 +93,10 @@ var resolverKeyActions = map[string]keyAction{
 	keyScrollRight:    (*model).handleScrollRight,
 	keyScrollDown:     (*model).handleScrollDown,
 	keyScrollUp:       (*model).handleScrollUp,
+	keyArrowLeft:      (*model).handleScrollLeft,
+	keyArrowRight:     (*model).handleScrollRight,
+	keyArrowDown:      (*model).handleScrollDown,
+	keyArrowUp:        (*model).handleScrollUp,
 	keyApplyOurs:      (*model).handleApplyOurs,
 	keyApplyTheirs:    (*model).handleApplyTheirs,
 	keyApplyOursAll:   (*model).handleApplyOursAll,

internal/tui/tui_test.go

@@ -511,6 +511,18 @@ func TestUpdateScrollHorizontalKeys(t *testing.T) {
 	if got := result.viewportOurs.View(); got != "01234" {
 		t.Fatalf("View = %q, want 01234 after H", got)
 	}
+
+	updated, _ = result.Update(tea.KeyMsg{Type: tea.KeyRight})
+	result = updated.(model)
+	if got := result.viewportOurs.View(); got != "45678" {
+		t.Fatalf("View = %q, want 45678 after right", got)
+	}
+
+	updated, _ = result.Update(tea.KeyMsg{Type: tea.KeyLeft})
+	result = updated.(model)
+	if got := result.viewportOurs.View(); got != "01234" {
+		t.Fatalf("View = %q, want 01234 after left", got)
+	}
 }
 
 func TestUpdateKeySeqScroll(t *testing.T) {
@@ -597,6 +609,18 @@ func TestUpdateVerticalScrollKeys(t *testing.T) {
 	if result.viewportOurs.YOffset != 0 {
 		t.Fatalf("YOffset = %d, want 0 after k", result.viewportOurs.YOffset)
 	}
+
+	updated, _ = result.Update(tea.KeyMsg{Type: tea.KeyDown})
+	result = updated.(model)
+	if result.viewportOurs.YOffset != 1 {
+		t.Fatalf("YOffset = %d, want 1 after down", result.viewportOurs.YOffset)
+	}
+
+	updated, _ = result.Update(tea.KeyMsg{Type: tea.KeyUp})
+	result = updated.(model)
+	if result.viewportOurs.YOffset != 0 {
+		t.Fatalf("YOffset = %d, want 0 after up", result.viewportOurs.YOffset)
+	}
 }
 
 func TestUpdateWriteKey(t *testing.T) {