Copy gocui files into lazygit repo under pkg/gocui

I copied all files except dot files (.github and .gitignore), the _examples
folder, and go.mod/go.sum.

At some point we may want to copy the files back to the gocui repo when other
clients (e.g. lazydocker) want to use the newer versions of them.

go.mod

@@ -18,7 +18,6 @@ require (
 	github.com/gookit/color v1.6.0
 	github.com/integrii/flaggy v1.8.0
 	github.com/jesseduffield/generics v0.0.0-20250517122708-b0b4a53a6f5c
-	github.com/jesseduffield/gocui v0.3.1-0.20260327132312-944dab3bc980
 	github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
 	github.com/karimkhaleel/jsonschema v0.0.0-20231001195015-d933f0d94ea3

go.sum

@@ -50,8 +50,6 @@ github.com/invopop/jsonschema v0.10.0 h1:c1ktzNLBun3LyQQhyty5WE3lulbOdIIyOVlkmDL
 github.com/invopop/jsonschema v0.10.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0=
 github.com/jesseduffield/generics v0.0.0-20250517122708-b0b4a53a6f5c h1:tC2PaiisXAC5sOjDPfMArSnbswDObtCssx+xn28edX4=
 github.com/jesseduffield/generics v0.0.0-20250517122708-b0b4a53a6f5c/go.mod h1:F2fEBk0ddf6ixrBrJjY7phfQ3hL9rXG0uSjvwYe50bE=
-github.com/jesseduffield/gocui v0.3.1-0.20260327132312-944dab3bc980 h1:LEZwOrBm9S+4lRlXpoz+RSzSvhOVE+6v/Rk+A7Kg00Q=
-github.com/jesseduffield/gocui v0.3.1-0.20260327132312-944dab3bc980/go.mod h1:lQCd2TvvNXVKFBowy4A7xxZbUp+1KEiGs4j0Q5Zt9gQ=
 github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5 h1:CDuQmfOjAtb1Gms6a1p5L2P8RhbLUq5t8aL7PiQd2uY=
 github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5/go.mod h1:qxN4mHOAyeIDLP7IK7defgPClM/z1Kze8VVQiaEjzsQ=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=

pkg/commands/git_commands/remote.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/samber/lo"
 )
 

pkg/commands/git_commands/sync.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/go-errors/errors"
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 )
 
 type SyncCommands struct {

pkg/commands/git_commands/sync_test.go

@@ -3,8 +3,8 @@ package git_commands
 import (
 	"testing"
 
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/commands/git_commands/tag.go

@@ -3,8 +3,8 @@ package git_commands
 import (
 	"strings"
 
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 )
 
 type TagCommands struct {

pkg/commands/oscommands/cmd_obj.go

@@ -4,7 +4,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/samber/lo"
 	"github.com/sasha-s/go-deadlock"
 )

pkg/commands/oscommands/cmd_obj_runner_test.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
 

pkg/commands/oscommands/cmd_obj_test.go

@@ -4,7 +4,7 @@ import (
 	"os/exec"
 	"testing"
 
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 )
 
 func TestCmdObjToString(t *testing.T) {

pkg/config/keynames.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/samber/lo"
 )
 

pkg/gocui/escape_test.go

@@ -0,0 +1,159 @@
+package gocui
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestParseOne(t *testing.T) {
+	var ei *escapeInterpreter
+
+	ei = newEscapeInterpreter(OutputNormal)
+	isEscape, err := ei.parseOne([]byte{'a'})
+	assert.Equal(t, false, isEscape)
+	assert.NoError(t, err)
+
+	ei = newEscapeInterpreter(OutputNormal)
+	parseEscRunes(t, ei, "\x1b[0K")
+	_, ok := ei.instruction.(eraseInLineFromCursor)
+	assert.Equal(t, true, ok)
+
+	ei = newEscapeInterpreter(OutputNormal)
+	parseEscRunes(t, ei, "\x1b[K")
+	_, ok = ei.instruction.(eraseInLineFromCursor)
+	assert.Equal(t, true, ok)
+
+	ei = newEscapeInterpreter(OutputNormal)
+	parseEscRunes(t, ei, "\x1b[1K")
+	_, ok = ei.instruction.(noInstruction)
+	assert.Equal(t, true, ok)
+
+	ei = newEscapeInterpreter(OutputNormal)
+	parseEscRunes(t, ei, "\x1b(B")
+	_, ok = ei.instruction.(noInstruction)
+	assert.Equal(t, true, ok)
+
+	ei = newEscapeInterpreter(OutputNormal)
+	parseEscRunes(t, ei, "\x1b)0")
+	_, ok = ei.instruction.(noInstruction)
+	assert.Equal(t, true, ok)
+
+	ei = newEscapeInterpreter(OutputNormal)
+	parseEscRunes(t, ei, "\x1b*A")
+	_, ok = ei.instruction.(noInstruction)
+	assert.Equal(t, true, ok)
+
+	ei = newEscapeInterpreter(OutputNormal)
+	parseEscRunes(t, ei, "\x1b+K")
+	_, ok = ei.instruction.(noInstruction)
+	assert.Equal(t, true, ok)
+}
+
+func TestParseOneColours(t *testing.T) {
+	scenarios := []struct {
+		outputMode OutputMode
+		input      string
+		expectedFg Attribute
+		expectedBg Attribute
+	}{
+		{OutputNormal, "\x1b[30m", ColorBlack, ColorDefault},
+		{OutputNormal, "\x1b[31m", ColorRed, ColorDefault},
+		{OutputNormal, "\x1b[32m", ColorGreen, ColorDefault},
+		{OutputNormal, "\x1b[33m", ColorYellow, ColorDefault},
+		{OutputNormal, "\x1b[34m", ColorBlue, ColorDefault},
+		{OutputNormal, "\x1b[35m", ColorMagenta, ColorDefault},
+		{OutputNormal, "\x1b[36m", ColorCyan, ColorDefault},
+		{OutputNormal, "\x1b[37m", ColorWhite, ColorDefault},
+		{OutputNormal, "\x1b[40m", ColorDefault, ColorBlack},
+		{OutputNormal, "\x1b[41m", ColorDefault, ColorRed},
+		{OutputNormal, "\x1b[42m", ColorDefault, ColorGreen},
+		{OutputNormal, "\x1b[43m", ColorDefault, ColorYellow},
+		{OutputNormal, "\x1b[44m", ColorDefault, ColorBlue},
+		{OutputNormal, "\x1b[45m", ColorDefault, ColorMagenta},
+		{OutputNormal, "\x1b[46m", ColorDefault, ColorCyan},
+		{OutputNormal, "\x1b[47m", ColorDefault, ColorWhite},
+		{OutputNormal, "\x1b[47;31m", ColorRed, ColorWhite},
+		{OutputNormal, "\x1b[90m", Get256Color(8), ColorDefault},
+		{OutputNormal, "\x1b[91m", Get256Color(9), ColorDefault},
+		{OutputNormal, "\x1b[92m", Get256Color(10), ColorDefault},
+		{OutputNormal, "\x1b[93m", Get256Color(11), ColorDefault},
+		{OutputNormal, "\x1b[94m", Get256Color(12), ColorDefault},
+		{OutputNormal, "\x1b[95m", Get256Color(13), ColorDefault},
+		{OutputNormal, "\x1b[96m", Get256Color(14), ColorDefault},
+		{OutputNormal, "\x1b[97m", Get256Color(15), ColorDefault},
+		{OutputNormal, "\x1b[100m", ColorDefault, Get256Color(8)},
+		{OutputNormal, "\x1b[101m", ColorDefault, Get256Color(9)},
+		{OutputNormal, "\x1b[102m", ColorDefault, Get256Color(10)},
+		{OutputNormal, "\x1b[103m", ColorDefault, Get256Color(11)},
+		{OutputNormal, "\x1b[104m", ColorDefault, Get256Color(12)},
+		{OutputNormal, "\x1b[105m", ColorDefault, Get256Color(13)},
+		{OutputNormal, "\x1b[106m", ColorDefault, Get256Color(14)},
+		{OutputNormal, "\x1b[107m", ColorDefault, Get256Color(15)},
+		{Output256, "\x1b[38;5;32m", Get256Color(32), ColorDefault},
+		{OutputTrue, "\x1b[38;5;32m", Get256Color(32), ColorDefault},
+		{OutputTrue, "\x1b[38;2;50;103;205m", NewRGBColor(50, 103, 205), ColorDefault},
+		{Output256, "\x1b[48;5;32m", ColorDefault, Get256Color(32)},
+		{OutputTrue, "\x1b[48;5;32m", ColorDefault, Get256Color(32)},
+		{OutputTrue, "\x1b[48;2;50;103;205m", ColorDefault, NewRGBColor(50, 103, 205)},
+		{OutputTrue, "\x1b[1;95;48;2;255;224;224m", Get256Color(13), NewRGBColor(255, 224, 224)},
+	}
+
+	for _, scenario := range scenarios {
+		ei := newEscapeInterpreter(scenario.outputMode)
+		parseEscRunes(t, ei, scenario.input)
+		assert.Equal(t, scenario.expectedFg, ei.curFgColor&AttrColorBits)
+		assert.Equal(t, scenario.expectedBg, ei.curBgColor)
+	}
+
+	// resetting colours
+	scenarios = []struct {
+		outputMode OutputMode
+		input      string
+		expectedFg Attribute
+		expectedBg Attribute
+	}{
+		{OutputNormal, "\x1b[39m", ColorDefault, ColorRed},
+		{OutputNormal, "\x1b[49m", ColorRed, ColorDefault},
+		{OutputNormal, "\x1b[0m", ColorDefault, ColorDefault},
+	}
+
+	for _, scenario := range scenarios {
+		ei := newEscapeInterpreter(scenario.outputMode)
+		ei.curFgColor = ColorRed
+		ei.curBgColor = ColorRed
+		parseEscRunes(t, ei, scenario.input)
+		assert.Equal(t, scenario.expectedFg, ei.curFgColor)
+		assert.Equal(t, scenario.expectedBg, ei.curBgColor)
+	}
+
+	// setting attributes
+	attrScenarios := []struct {
+		outputMode   OutputMode
+		input        string
+		expectedAttr Attribute
+	}{
+		{OutputNormal, "\x1b[1m", AttrBold},
+		{OutputNormal, "\x1b[2m", AttrDim},
+		{OutputNormal, "\x1b[3m", AttrItalic},
+		{OutputNormal, "\x1b[4m", AttrUnderline},
+		{OutputNormal, "\x1b[5m", AttrBlink},
+		{OutputNormal, "\x1b[7m", AttrReverse},
+		{OutputNormal, "\x1b[9m", AttrStrikeThrough},
+	}
+
+	for _, scenario := range attrScenarios {
+		ei := newEscapeInterpreter(scenario.outputMode)
+		parseEscRunes(t, ei, scenario.input)
+		style := ei.curFgColor & AttrStyleBits
+		assert.Equal(t, scenario.expectedAttr, style)
+	}
+}
+
+func parseEscRunes(t *testing.T, ei *escapeInterpreter, runes string) {
+	for _, b := range []byte(runes) {
+		isEscape, err := ei.parseOne([]byte{b})
+		assert.Equal(t, true, isEscape)
+		assert.NoError(t, err)
+	}
+}

pkg/gocui/gui.go

@@ -8,7 +8,6 @@ import (
 	"context"
 	standardErrors "errors"
 	"runtime"
-	"slices"
 	"strings"
 	"sync"
 	"time"
@@ -25,15 +24,6 @@ type OutputMode int
 const DOUBLE_CLICK_THRESHOLD = 500 * time.Millisecond
 
 var (
-	// ErrAlreadyBlacklisted is returned when the keybinding is already blacklisted.
-	ErrAlreadyBlacklisted = standardErrors.New("keybind already blacklisted")
-
-	// ErrBlacklisted is returned when the keybinding being parsed / used is blacklisted.
-	ErrBlacklisted = standardErrors.New("keybind blacklisted")
-
-	// ErrNotBlacklisted is returned when a keybinding being whitelisted is not blacklisted.
-	ErrNotBlacklisted = standardErrors.New("keybind not blacklisted")
-
 	// ErrNoSuchKeybind is returned when the keybinding being parsed does not exist.
 	ErrNoSuchKeybind = standardErrors.New("no such keybind")
 
@@ -155,7 +145,6 @@ type Gui struct {
 	maxX, maxY               int
 	outputMode               OutputMode
 	stop                     chan struct{}
-	blacklist                []Key
 
 	// BgColor and FgColor allow to configure the background and foreground
 	// colors of the GUI.
@@ -573,10 +562,6 @@ func (g *Gui) SetKeybinding(viewname string, key any, mod Modifier, handler func
 		return err
 	}
 
-	if g.isBlacklisted(k) {
-		return ErrBlacklisted
-	}
-
 	kb = newKeybinding(viewname, k, ch, mod, handler)
 	g.keybindings = append(g.keybindings, kb)
 	return nil
@@ -632,26 +617,6 @@ func (g *Gui) SetViewClickBinding(binding *ViewMouseBinding) error {
 	return nil
 }
 
-// BlackListKeybinding adds a keybinding to the blacklist
-func (g *Gui) BlacklistKeybinding(k Key) error {
-	if slices.Contains(g.blacklist, k) {
-		return ErrAlreadyBlacklisted
-	}
-	g.blacklist = append(g.blacklist, k)
-	return nil
-}
-
-// WhiteListKeybinding removes a keybinding from the blacklist
-func (g *Gui) WhitelistKeybinding(k Key) error {
-	for i, j := range g.blacklist {
-		if j == k {
-			g.blacklist = append(g.blacklist[:i], g.blacklist[i+1:]...)
-			return nil
-		}
-	}
-	return ErrNotBlacklisted
-}
-
 func (g *Gui) SetFocusHandler(handler func(bool) error) {
 	g.focusHandler = handler
 }
@@ -1616,10 +1581,6 @@ func (g *Gui) execKeybindings(v *View, ev *GocuiEvent) error {
 
 // execKeybinding executes a given keybinding
 func (g *Gui) execKeybinding(v *View, kb *keybinding) error {
-	if g.isBlacklisted(kb.key) {
-		return nil
-	}
-
 	if err := kb.handler(g, v); err != nil {
 		return err
 	}
@@ -1665,11 +1626,6 @@ func (g *Gui) StartTicking(ctx context.Context) {
 	}()
 }
 
-// isBlacklisted reports whether the key is blacklisted
-func (g *Gui) isBlacklisted(k Key) bool {
-	return slices.Contains(g.blacklist, k)
-}
-
 func (g *Gui) Suspend() error {
 	g.suspendedMutex.Lock()
 	defer g.suspendedMutex.Unlock()

pkg/gocui/scrollbar_test.go

@@ -0,0 +1,114 @@
+package gocui
+
+import "testing"
+
+func TestCalcScrollbar(t *testing.T) {
+	tests := []struct {
+		testName       string
+		listSize       int
+		pageSize       int
+		position       int
+		scrollAreaSize int
+
+		expectedStart  int
+		expectedHeight int
+	}{
+		{
+			testName:       "page size greater than list size",
+			listSize:       5,
+			pageSize:       10,
+			position:       0,
+			scrollAreaSize: 20,
+
+			expectedStart:  0,
+			expectedHeight: 20,
+		},
+		{
+			testName:       "page size matches list size",
+			listSize:       10,
+			pageSize:       10,
+			position:       0,
+			scrollAreaSize: 20,
+
+			expectedStart:  0,
+			expectedHeight: 20,
+		},
+		{
+			testName:       "page size half of list size",
+			listSize:       10,
+			pageSize:       5,
+			position:       0,
+			scrollAreaSize: 20,
+
+			expectedStart:  0,
+			expectedHeight: 10,
+		},
+		{
+			testName:       "page size half of list size at scroll end",
+			listSize:       10,
+			pageSize:       5,
+			position:       5,
+			scrollAreaSize: 20,
+
+			expectedStart:  10,
+			expectedHeight: 10,
+		},
+		{
+			testName: "page size third of list size having scrolled half the way",
+			listSize: 15,
+			// Recall that my max position is listSize - pageSize i.e 15 - 5 i.e. 10.
+			// So if I've scrolled to position 5 that means I've done one page and I've got
+			// one page to go which means by scrollbar should take up a third of the available
+			// space and appear in the centre of the scrollbar area
+			pageSize:       5,
+			position:       5,
+			scrollAreaSize: 21,
+
+			expectedStart:  7,
+			expectedHeight: 7,
+		},
+		{
+			testName:       "page size third of list size having scrolled the full way",
+			listSize:       15,
+			pageSize:       5,
+			position:       10,
+			scrollAreaSize: 21,
+
+			expectedStart:  14,
+			expectedHeight: 7,
+		},
+		{
+			testName:       "page size third of list size having scrolled by one",
+			listSize:       15,
+			pageSize:       5,
+			position:       1,
+			scrollAreaSize: 21,
+
+			expectedStart:  2,
+			expectedHeight: 7,
+		},
+		{
+			testName:       "page size third of list size having scrolled up from the bottom by one",
+			listSize:       15,
+			pageSize:       5,
+			position:       9,
+			scrollAreaSize: 21,
+
+			expectedStart:  12,
+			expectedHeight: 7,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.testName, func(t *testing.T) {
+			start, height := calcScrollbar(test.listSize, test.pageSize, test.position, test.scrollAreaSize)
+			if start != test.expectedStart {
+				t.Errorf("expected start to be %d, got %d", test.expectedStart, start)
+			}
+
+			if height != test.expectedHeight {
+				t.Errorf("expected height to be %d, got %d", test.expectedHeight, height)
+			}
+		})
+	}
+}

pkg/gocui/view_test.go

@@ -0,0 +1,415 @@
+// Copyright 2014 The gocui Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package gocui
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/rivo/uniseg"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestWriteString(t *testing.T) {
+	tests := []struct {
+		existingLines  []string
+		stringsToWrite []string
+		expectedLines  [][]string
+	}{
+		{
+			[]string{},
+			[]string{""},
+			[][]string{{}},
+		},
+		{
+			[]string{},
+			[]string{"1\n"},
+			[][]string{{"1", ""}},
+		},
+		{
+			[]string{},
+			[]string{"1\n", "2\n"},
+			[][]string{{"1", ""}, {"2", ""}},
+		},
+		{
+			[]string{"a"},
+			[]string{"1\n"},
+			[][]string{{"1", ""}},
+		},
+		{
+			[]string{"a\x00"},
+			[]string{"1\n"},
+			[][]string{{"1", "\x00"}},
+		},
+		{
+			[]string{"ab"},
+			[]string{"1\n"},
+			[][]string{{"1", "b"}},
+		},
+		{
+			[]string{"abc"},
+			[]string{"1\n"},
+			[][]string{{"1", "b", "c"}},
+		},
+		{
+			[]string{},
+			[]string{"1\r"},
+			[][]string{{"1", ""}},
+		},
+		{
+			[]string{"a"},
+			[]string{"1\r"},
+			[][]string{{"1", ""}},
+		},
+		{
+			[]string{"a\x00"},
+			[]string{"1\r"},
+			[][]string{{"1", "\x00"}},
+		},
+		{
+			[]string{"ab"},
+			[]string{"1\r"},
+			[][]string{{"1", "b"}},
+		},
+		{
+			[]string{"abc"},
+			[]string{"1\r"},
+			[][]string{{"1", "b", "c"}},
+		},
+	}
+
+	for _, test := range tests {
+		v := NewView("name", 0, 0, 10, 10, OutputNormal)
+		for _, l := range test.existingLines {
+			v.lines = append(v.lines, stringToCells(l))
+		}
+		for _, s := range test.stringsToWrite {
+			v.writeString(s)
+		}
+		var resultingLines [][]string
+		for _, l := range v.lines {
+			resultingLines = append(resultingLines, cellsToStrings(l))
+		}
+		assert.Equal(t, test.expectedLines, resultingLines)
+	}
+}
+
+func TestUpdatedCursorAndOrigin(t *testing.T) {
+	tests := []struct {
+		prevOrigin     int
+		size           int
+		cursor         int
+		expectedCursor int
+		expectedOrigin int
+	}{
+		{0, 10, 0, 0, 0},
+		{0, 10, 9, 9, 0},
+		{0, 10, 10, 9, 1},
+		{0, 10, 19, 9, 10},
+		{0, 10, 20, 9, 11},
+		{20, 10, 19, 0, 19},
+		{20, 10, 25, 5, 20},
+	}
+
+	for _, test := range tests {
+		cursor, origin := updatedCursorAndOrigin(test.prevOrigin, test.size, test.cursor)
+		assert.EqualValues(t, test.expectedCursor, cursor, "Cursor is wrong")
+		assert.EqualValues(t, test.expectedOrigin, origin, "Origin in wrong")
+	}
+}
+
+func TestAutoRenderingHyperlinks(t *testing.T) {
+	v := NewView("name", 0, 0, 10, 10, OutputNormal)
+	v.AutoRenderHyperLinks = true
+
+	v.writeString("htt")
+	// No hyperlinks are generated for incomplete URLs
+	assert.Equal(t, "", v.lines[0][0].hyperlink)
+	// Writing more characters to the same line makes the link complete (even
+	// though we didn't see a newline yet)
+	v.writeString("ps://example.com")
+	assert.Equal(t, "https://example.com", v.lines[0][0].hyperlink)
+
+	v.Clear()
+	// Valid but incomplete URL
+	v.writeString("https://exa")
+	assert.Equal(t, "https://exa", v.lines[0][0].hyperlink)
+	// Writing more characters to the same fixes the link
+	v.writeString("mple.com")
+	assert.Equal(t, "https://example.com", v.lines[0][0].hyperlink)
+}
+
+func TestContainsColoredText(t *testing.T) {
+	hexColor := func(text string, hexStr string) []cell {
+		cells := make([]cell, len(text))
+		hex := GetColor(hexStr)
+		for i, chr := range text {
+			cells[i] = cell{fgColor: hex, chr: string(chr)}
+		}
+		return cells
+	}
+	red := "#ff0000"
+	green := "#00ff00"
+	redStr := func(text string) []cell { return hexColor(text, red) }
+	greenStr := func(text string) []cell { return hexColor(text, green) }
+
+	concat := func(lines ...[]cell) []cell {
+		var cells []cell
+		for _, line := range lines {
+			cells = append(cells, line...)
+		}
+		return cells
+	}
+
+	tests := []struct {
+		lines      [][]cell
+		fgColorStr string
+		text       string
+		expected   bool
+	}{
+		{
+			lines:      [][]cell{concat(redStr("a"))},
+			fgColorStr: red,
+			text:       "a",
+			expected:   true,
+		},
+		{
+			lines:      [][]cell{concat(redStr("a"))},
+			fgColorStr: red,
+			text:       "b",
+			expected:   false,
+		},
+		{
+			lines:      [][]cell{concat(redStr("a"))},
+			fgColorStr: green,
+			text:       "b",
+			expected:   false,
+		},
+		{
+			lines:      [][]cell{concat(redStr("hel"), greenStr("lo"), redStr(" World!"))},
+			fgColorStr: red,
+			text:       "hello",
+			expected:   false,
+		},
+		{
+			lines:      [][]cell{concat(redStr("hel"), greenStr("lo"), redStr(" World!"))},
+			fgColorStr: green,
+			text:       "lo",
+			expected:   true,
+		},
+		{
+			lines: [][]cell{
+				redStr("hel"),
+				redStr("lo"),
+			},
+			fgColorStr: red,
+			text:       "hello",
+			expected:   false,
+		},
+	}
+
+	for i, test := range tests {
+		v := &View{lines: test.lines}
+		assert.Equal(t, test.expected, v.ContainsColoredText(test.fgColorStr, test.text), "Test %d failed", i)
+	}
+}
+
+func stringToCells(s string) []cell {
+	var cells []cell
+	state := -1
+	for len(s) > 0 {
+		var c string
+		var w int
+		c, s, w, state = uniseg.FirstGraphemeClusterInString(s, state)
+		cells = append(cells, cell{chr: c, width: w})
+	}
+	return cells
+}
+
+func cellsToString(cells []cell) string {
+	var s strings.Builder
+	for _, c := range cells {
+		s.WriteString(c.chr)
+	}
+	return s.String()
+}
+
+func cellsToStrings(cells []cell) []string {
+	s := []string{}
+	for _, c := range cells {
+		s = append(s, c.chr)
+	}
+	return s
+}
+
+func TestLineWrap(t *testing.T) {
+	testCases := []struct {
+		name     string
+		line     string
+		columns  int
+		expected []string
+	}{
+		{
+			name:    "Wrap on space",
+			line:    "Hello World",
+			columns: 5,
+			expected: []string{
+				"Hello",
+				"World",
+			},
+		},
+		{
+			name:    "Wrap on hyphen",
+			line:    "Hello-World",
+			columns: 6,
+			expected: []string{
+				"Hello-",
+				"World",
+			},
+		},
+		{
+			name:    "Wrap on hyphen 2",
+			line:    "Blah Hello-World",
+			columns: 12,
+			expected: []string{
+				"Blah Hello-",
+				"World",
+			},
+		},
+		{
+			name:    "Wrap on hyphen 3",
+			line:    "Blah Hello-World",
+			columns: 11,
+			expected: []string{
+				"Blah Hello-",
+				"World",
+			},
+		},
+		{
+			name:    "Wrap on hyphen 4",
+			line:    "Blah Hello-World",
+			columns: 10,
+			expected: []string{
+				"Blah Hello",
+				"-World",
+			},
+		},
+		{
+			name:    "Wrap on space 2",
+			line:    "Blah Hello World",
+			columns: 10,
+			expected: []string{
+				"Blah Hello",
+				"World",
+			},
+		},
+		{
+			name:    "Wrap on space with more words",
+			line:    "Longer word here",
+			columns: 10,
+			expected: []string{
+				"Longer",
+				"word here",
+			},
+		},
+		{
+			name:    "Split word that's too long",
+			line:    "ThisWordIsWayTooLong",
+			columns: 10,
+			expected: []string{
+				"ThisWordIs",
+				"WayTooLong",
+			},
+		},
+		{
+			name:    "Split word that's too long over multiple lines",
+			line:    "ThisWordIsWayTooLong",
+			columns: 5,
+			expected: []string{
+				"ThisW",
+				"ordIs",
+				"WayTo",
+				"oLong",
+			},
+		},
+		{
+			name:    "Lots of hyphens",
+			line:    "one-two-three-four-five",
+			columns: 8,
+			expected: []string{
+				"one-two-",
+				"three-",
+				"four-",
+				"five",
+			},
+		},
+		{
+			name:    "Several lines using all the available width",
+			line:    "aaa bb cc ddd-ee ff",
+			columns: 5,
+			expected: []string{
+				"aaa",
+				"bb cc",
+				"ddd-",
+				"ee ff",
+			},
+		},
+		{
+			name:    "Multi-cell runes",
+			line:    "🐤🐤🐤 🐝🐝 🙉 🦊🦊🦊-🐬🐬 🦢🦢",
+			columns: 9,
+			expected: []string{
+				"🐤🐤🐤",
+				"🐝🐝 🙉",
+				"🦊🦊🦊-",
+				"🐬🐬 🦢🦢",
+			},
+		},
+		{
+			name:    "Space in last column",
+			line:    "hello world",
+			columns: 6,
+			expected: []string{
+				"hello",
+				"world",
+			},
+		},
+		{
+			name:    "Hyphen in last column",
+			line:    "hello-world",
+			columns: 6,
+			expected: []string{
+				"hello-",
+				"world",
+			},
+		},
+		{
+			name:    "English text",
+			line:    "+The sea reach of the Thames stretched before us like the bedinnind of an interminable waterway. In the offind the sea and the sky were welded todether without a joint, and in the luminous space the tanned sails of the bardes drifting blah blah",
+			columns: 81,
+			expected: []string{
+				"+The sea reach of the Thames stretched before us like the bedinnind of an",
+				"interminable waterway. In the offind the sea and the sky were welded todether",
+				"without a joint, and in the luminous space the tanned sails of the bardes",
+				"drifting blah blah",
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			lineCells := stringToCells(tc.line)
+
+			result := lineWrap(lineCells, tc.columns)
+
+			resultStrings := make([]string, len(result))
+			for i, line := range result {
+				resultStrings[i] = cellsToString(line)
+			}
+
+			assert.EqualValues(t, tc.expected, resultStrings)
+		})
+	}
+}

pkg/gui/background.go

@@ -5,7 +5,7 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )

pkg/gui/context/base_context.go

@@ -1,7 +1,7 @@
 package context
 
 import (
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 

pkg/gui/context/local_commits_context.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/presentation"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/samber/lo"

pkg/gui/context/main_context.go

@@ -1,7 +1,7 @@
 package context
 
 import (
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 

pkg/gui/context/patch_explorer_context.go

@@ -1,7 +1,7 @@
 package context
 
 import (
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/patch_exploring"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	deadlock "github.com/sasha-s/go-deadlock"

pkg/gui/context/simple_context.go

@@ -1,7 +1,7 @@
 package context
 
 import (
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 

pkg/gui/context/sub_commits_context.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/presentation"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/samber/lo"

pkg/gui/context/view_trait.go

@@ -1,7 +1,7 @@
 package context
 
 import (
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 

pkg/gui/controllers.go

@@ -1,8 +1,8 @@
 package gui
 
 import (
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/controllers"
 	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
 	"github.com/jesseduffield/lazygit/pkg/gui/services/custom_commands"

pkg/gui/controllers/base_controller.go

@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 

pkg/gui/controllers/branches_controller.go

@@ -6,9 +6,9 @@ import (
 	"strings"
 
 	"github.com/gookit/color"
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
 	"github.com/jesseduffield/lazygit/pkg/gui/presentation"

pkg/gui/controllers/commit_description_controller.go

@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/keybindings"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/utils"

pkg/gui/controllers/commit_message_controller.go

@@ -3,8 +3,8 @@ package controllers
 import (
 	"errors"
 
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"

pkg/gui/controllers/commits_files_controller.go

@@ -6,11 +6,11 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/patch"
 	"github.com/jesseduffield/lazygit/pkg/constants"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
 	"github.com/jesseduffield/lazygit/pkg/gui/filetree"

pkg/gui/controllers/custom_patch_options_menu_action.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/jesseduffield/generics/set"
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/utils"

pkg/gui/controllers/files_controller.go

@@ -7,9 +7,9 @@ import (
 	"strings"
 
 	"github.com/jesseduffield/generics/set"
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/filetree"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"

pkg/gui/controllers/global_controller.go

@@ -3,7 +3,7 @@ package controllers
 import (
 	"fmt"
 
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 

pkg/gui/controllers/helpers/app_status_helper.go

@@ -3,7 +3,7 @@ package helpers
 import (
 	"time"
 
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/status"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )

pkg/gui/controllers/helpers/branches_helper.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/utils"

pkg/gui/controllers/helpers/commits_helper.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/samber/lo"
 )

pkg/gui/controllers/helpers/gpg_helper.go

@@ -3,9 +3,9 @@ package helpers
 import (
 	"fmt"
 
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 

pkg/gui/controllers/helpers/inline_status_helper.go

@@ -3,7 +3,7 @@ package helpers
 import (
 	"time"
 
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/presentation"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/utils"

pkg/gui/controllers/helpers/merge_and_rebase_helper.go

@@ -7,9 +7,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/samber/lo"

pkg/gui/controllers/helpers/refresh_helper.go

@@ -7,10 +7,10 @@ import (
 	"time"
 
 	"github.com/jesseduffield/generics/set"
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/config"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/filetree"
 	"github.com/jesseduffield/lazygit/pkg/gui/mergeconflicts"

pkg/gui/controllers/helpers/refs_helper.go

@@ -5,9 +5,9 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/style"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"

pkg/gui/controllers/helpers/repos_helper.go

@@ -8,11 +8,11 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/jesseduffield/gocui"
 	appTypes "github.com/jesseduffield/lazygit/pkg/app/types"
 	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/env"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/presentation/icons"
 	"github.com/jesseduffield/lazygit/pkg/gui/style"

pkg/gui/controllers/helpers/search_helper.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/keybindings"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"

pkg/gui/controllers/helpers/suggestions_helper.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	"github.com/jesseduffield/generics/set"
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/presentation"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/utils"

pkg/gui/controllers/helpers/update_helper.go

@@ -3,7 +3,7 @@ package helpers
 import (
 	"errors"
 
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/updates"
 	"github.com/jesseduffield/lazygit/pkg/utils"

pkg/gui/controllers/helpers/window_helper.go

@@ -3,7 +3,7 @@ package helpers
 import (
 	"fmt"
 
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/samber/lo"

pkg/gui/controllers/helpers/worktree_helper.go

@@ -4,9 +4,9 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/utils"

pkg/gui/controllers/jump_to_side_window_controller.go

@@ -3,7 +3,7 @@ package controllers
 import (
 	"log"
 
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/samber/lo"
 )

pkg/gui/controllers/list_controller.go

@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 

pkg/gui/controllers/local_commits_controller.go

@@ -4,9 +4,9 @@ import (
 	"strings"
 
 	"github.com/go-errors/errors"
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/context/traits"
 	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"

pkg/gui/controllers/main_view_controller.go

@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )

pkg/gui/controllers/merge_conflicts_controller.go

@@ -3,7 +3,7 @@ package controllers
 import (
 	"os"
 
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/mergeconflicts"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"

pkg/gui/controllers/patch_building_controller.go

@@ -3,7 +3,7 @@ package controllers
 import (
 	"fmt"
 
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/keybindings"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/samber/lo"

pkg/gui/controllers/patch_explorer_controller.go

@@ -3,7 +3,7 @@ package controllers
 import (
 	"strings"
 
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/samber/lo"
 )

pkg/gui/controllers/prompt_controller.go

@@ -3,7 +3,7 @@ package controllers
 import (
 	"fmt"
 
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )

pkg/gui/controllers/quit_actions.go

@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )

pkg/gui/controllers/remotes_controller.go

@@ -7,8 +7,8 @@ import (
 	"slices"
 	"strings"
 
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/style"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"

pkg/gui/controllers/screen_mode_actions.go

@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 

pkg/gui/controllers/search_prompt_controller.go

@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 

pkg/gui/controllers/side_window_controller.go

@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 

pkg/gui/controllers/staging_controller.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/patch"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/keybindings"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )

pkg/gui/controllers/status_controller.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/constants"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/presentation"
 	"github.com/jesseduffield/lazygit/pkg/gui/style"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"

pkg/gui/controllers/submodules_controller.go

@@ -5,8 +5,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/keybindings"
 	"github.com/jesseduffield/lazygit/pkg/gui/style"

pkg/gui/controllers/suggestions_controller.go

@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )

pkg/gui/controllers/switch_to_focused_main_view_controller.go

@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 

pkg/gui/controllers/sync_controller.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/utils"

pkg/gui/controllers/tags_controller.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/style"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"

pkg/gui/controllers/undo_controller.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )

pkg/gui/controllers/vertical_scroll_controller.go

@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 

pkg/gui/controllers/view_selection_controller.go

@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 

pkg/gui/controllers/workspace_reset_controller.go

@@ -8,7 +8,7 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
 	"github.com/jesseduffield/lazygit/pkg/gui/style"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"

pkg/gui/editors.go

@@ -1,7 +1,7 @@
 package gui
 
 import (
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 )
 
 func (gui *Gui) handleEditorKeypress(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier, allowMultiline bool) bool {

pkg/gui/global_handlers.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/style"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/utils"

pkg/gui/gui.go

@@ -14,7 +14,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazycore/pkg/boxlayout"
 	appTypes "github.com/jesseduffield/lazygit/pkg/app/types"
 	"github.com/jesseduffield/lazygit/pkg/commands"
@@ -24,6 +23,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/jesseduffield/lazygit/pkg/config"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
 	"github.com/jesseduffield/lazygit/pkg/gui/keybindings"

pkg/gui/gui_common.go

@@ -1,10 +1,10 @@
 package gui
 
 import (
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/config"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/tasks"

pkg/gui/gui_driver.go

@@ -7,9 +7,9 @@ import (
 	"time"
 
 	"github.com/gdamore/tcell/v2"
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/config"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/keybindings"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	integrationTypes "github.com/jesseduffield/lazygit/pkg/integration/types"

pkg/gui/keybindings.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"log"
 
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
 	"github.com/jesseduffield/lazygit/pkg/gui/keybindings"

pkg/gui/keybindings/keybindings.go

@@ -6,9 +6,9 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/constants"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 

pkg/gui/layout.go

@@ -3,7 +3,7 @@ package gui
 import (
 	"errors"
 
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/samber/lo"
 )

pkg/gui/main_panels.go

@@ -1,7 +1,7 @@
 package gui
 
 import (
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 

pkg/gui/patch_exploring/state.go

@@ -4,8 +4,8 @@ import (
 	"strings"
 
 	"github.com/jesseduffield/generics/set"
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/patch"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/samber/lo"
 )