mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-11-07 11:26:21 +03:00
f6f2a52dee
Original commit message of the gocui change:
This fixes View.Size, Width and Height to be the correct (outer) size of a view
including its frame, and InnerSize/InnerWidth/InnerHeight to be the usable
client area exluding the frame. Previously, Size was actually the InnerSize (and
a lot of client code used it as such, so these need to be changed to InnerSize).
InnerSize, on the other hand, was *one* less than Size (not two, as you would
have expected), and in many cases this was made up for at call sites by adding 1
(e.g. in calcRealScrollbarStartEnd, parseInput, and many other places in the
lazygit code).
There are still some weird things left that I didn't address here:
- a view's lower-right coordinates (x1/y1) are one less than you would expect.
For example, a view with a 2x2 client area like this:
╭──╮
│ab│
│cd│
╰──╯
in the top-left corner of the screen (x0 and y0 both zero) has x1/xy at 3, not
4 as would be more natural.
- a view without a frame has its coordinates extended by 1 on all sides; to
illustrate, the same 2x2 view as before but without a frame, sitting in the
top-left corder of the screen, has coordinates x0=-1, y0=-1, x1=2, y1=2. This
is highly confusing and unexpected.
I left these as they are because they would be even more of a breaking change,
and also because they don't have quite as much of an impact on general app code.
130 lines
3.2 KiB
Go
130 lines
3.2 KiB
Go
package patch_exploring
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestNewOrigin(t *testing.T) {
|
|
type scenario struct {
|
|
name string
|
|
origin int
|
|
bufferHeight int
|
|
numLines int
|
|
firstLineIdx int
|
|
lastLineIdx int
|
|
selectedLineIdx int
|
|
selectMode selectMode
|
|
expected int
|
|
}
|
|
|
|
scenarios := []scenario{
|
|
{
|
|
name: "selection above scroll window, enough room to put it in the middle",
|
|
origin: 250,
|
|
bufferHeight: 100,
|
|
numLines: 500,
|
|
firstLineIdx: 210,
|
|
lastLineIdx: 210,
|
|
selectedLineIdx: 210,
|
|
selectMode: LINE,
|
|
expected: 160,
|
|
},
|
|
{
|
|
name: "selection above scroll window, not enough room to put it in the middle",
|
|
origin: 50,
|
|
bufferHeight: 100,
|
|
numLines: 500,
|
|
firstLineIdx: 10,
|
|
lastLineIdx: 10,
|
|
selectedLineIdx: 10,
|
|
selectMode: LINE,
|
|
expected: 0,
|
|
},
|
|
{
|
|
name: "selection below scroll window, enough room to put it in the middle",
|
|
origin: 0,
|
|
bufferHeight: 100,
|
|
numLines: 500,
|
|
firstLineIdx: 150,
|
|
lastLineIdx: 150,
|
|
selectedLineIdx: 150,
|
|
selectMode: LINE,
|
|
expected: 100,
|
|
},
|
|
{
|
|
name: "selection below scroll window, not enough room to put it in the middle",
|
|
origin: 0,
|
|
bufferHeight: 100,
|
|
numLines: 200,
|
|
firstLineIdx: 199,
|
|
lastLineIdx: 199,
|
|
selectedLineIdx: 199,
|
|
selectMode: LINE,
|
|
expected: 100,
|
|
},
|
|
{
|
|
name: "selection within scroll window",
|
|
origin: 0,
|
|
bufferHeight: 100,
|
|
numLines: 500,
|
|
firstLineIdx: 50,
|
|
lastLineIdx: 50,
|
|
selectedLineIdx: 50,
|
|
selectMode: LINE,
|
|
expected: 0,
|
|
},
|
|
{
|
|
name: "range ending below scroll window with selection at end of range",
|
|
origin: 0,
|
|
bufferHeight: 100,
|
|
numLines: 500,
|
|
firstLineIdx: 40,
|
|
lastLineIdx: 150,
|
|
selectedLineIdx: 150,
|
|
selectMode: RANGE,
|
|
expected: 50,
|
|
},
|
|
{
|
|
name: "range ending below scroll window with selection at beginning of range",
|
|
origin: 0,
|
|
bufferHeight: 100,
|
|
numLines: 500,
|
|
firstLineIdx: 40,
|
|
lastLineIdx: 150,
|
|
selectedLineIdx: 40,
|
|
selectMode: RANGE,
|
|
expected: 40,
|
|
},
|
|
{
|
|
name: "range starting above scroll window with selection at beginning of range",
|
|
origin: 50,
|
|
bufferHeight: 100,
|
|
numLines: 500,
|
|
firstLineIdx: 40,
|
|
lastLineIdx: 150,
|
|
selectedLineIdx: 40,
|
|
selectMode: RANGE,
|
|
expected: 40,
|
|
},
|
|
{
|
|
name: "hunk extending beyond both bounds of scroll window",
|
|
origin: 50,
|
|
bufferHeight: 100,
|
|
numLines: 500,
|
|
firstLineIdx: 40,
|
|
lastLineIdx: 200,
|
|
selectedLineIdx: 70,
|
|
selectMode: HUNK,
|
|
expected: 40,
|
|
},
|
|
}
|
|
|
|
for _, s := range scenarios {
|
|
t.Run(s.name, func(t *testing.T) {
|
|
assert.EqualValues(t, s.expected, calculateOrigin(s.origin, s.bufferHeight, s.numLines, s.firstLineIdx, s.lastLineIdx, s.selectedLineIdx, s.selectMode))
|
|
})
|
|
}
|
|
}
|