Skip to content

Commit 80c212f

Browse files
stefanhallerstefanhaller
authored
Avoid blank line at end of view (#4152)
- **PR Description** This updates gocui to include jesseduffield/gocui#68 and jesseduffield/gocui#69, which changes views to not have an extra blank line at the end when content ending in a newline character is written to them. This makes text views more consistent with list views, which don't have a blank line after the last list entry either.
2 parents 13829d8 + ae53059 commit 80c212f

File tree

10 files changed

+84
-57
lines changed

10 files changed

+84
-57
lines changed

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/integrii/flaggy v1.4.0
1717
github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68
1818
github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d
19-
github.com/jesseduffield/gocui v0.3.1-0.20241223111608-9967d0e928a0
19+
github.com/jesseduffield/gocui v0.3.1-0.20250106080306-164661a92088
2020
github.com/jesseduffield/kill v0.0.0-20250101124109-e216ddbe133a
2121
github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5
2222
github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e
@@ -75,8 +75,8 @@ require (
7575
github.com/xanzy/ssh-agent v0.2.1 // indirect
7676
golang.org/x/crypto v0.31.0 // indirect
7777
golang.org/x/net v0.33.0 // indirect
78-
golang.org/x/sys v0.28.0 // indirect
79-
golang.org/x/term v0.27.0 // indirect
78+
golang.org/x/sys v0.29.0 // indirect
79+
golang.org/x/term v0.28.0 // indirect
8080
golang.org/x/text v0.21.0 // indirect
8181
gopkg.in/warnings.v0 v0.1.2 // indirect
8282
)

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68 h1:EQP2Tv8T
188188
github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68/go.mod h1:+LLj9/WUPAP8LqCchs7P+7X0R98HiFujVFANdNaxhGk=
189189
github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d h1:bO+OmbreIv91rCe8NmscRwhFSqkDJtzWCPV4Y+SQuXE=
190190
github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d/go.mod h1:nGNEErzf+NRznT+N2SWqmHnDnF9aLgANB1CUNEan09o=
191-
github.com/jesseduffield/gocui v0.3.1-0.20241223111608-9967d0e928a0 h1:R29+E15wHqTDBfZxmzCLu0x34j5ljsXWT/DhR+2YiOU=
192-
github.com/jesseduffield/gocui v0.3.1-0.20241223111608-9967d0e928a0/go.mod h1:XtEbqCbn45keRXEu+OMZkjN5gw6AEob59afsgHjokZ8=
191+
github.com/jesseduffield/gocui v0.3.1-0.20250106080306-164661a92088 h1:yAJ+yFWcv1WRsbgoc4BrGxZVqdLiGVMkz+hEQ1ktgb0=
192+
github.com/jesseduffield/gocui v0.3.1-0.20250106080306-164661a92088/go.mod h1:XtEbqCbn45keRXEu+OMZkjN5gw6AEob59afsgHjokZ8=
193193
github.com/jesseduffield/kill v0.0.0-20250101124109-e216ddbe133a h1:UDeJ3EBk04bXDLOPvuqM3on8HvyJfISw0+UMqW+0a4g=
194194
github.com/jesseduffield/kill v0.0.0-20250101124109-e216ddbe133a/go.mod h1:FSWDLKT0NQpntbDd1H3lbz51fhCVlMzy/J0S6nM727Q=
195195
github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5 h1:CDuQmfOjAtb1Gms6a1p5L2P8RhbLUq5t8aL7PiQd2uY=
@@ -476,14 +476,14 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
476476
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
477477
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
478478
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
479-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
480-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
479+
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
480+
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
481481
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
482482
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
483483
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
484484
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
485-
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
486-
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
485+
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
486+
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
487487
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
488488
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
489489
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

‎pkg/integration/tests/patch_building/move_to_index_part_of_adjacent_added_lines.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ var MoveToIndexPartOfAdjacentAddedLines = NewIntegrationTest(NewIntegrationTestA
6464
)
6565

6666
t.Views().Main().
67-
Content(Contains("+1st line\n 2nd line\n"))
67+
Content(Contains("+1st line\n 2nd line"))
6868
},
6969
})

‎pkg/integration/tests/stash/stash_staged_partial_file.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ var StashStagedPartialFile = NewIntegrationTest(NewIntegrationTestArgs{
2323

2424
t.Views().Staging().
2525
Content(
26-
Contains(" line1\n-line2\n+line2 mod\n line3\n-line4\n+line4 mod\n"),
26+
Contains(" line1\n-line2\n+line2 mod\n line3\n-line4\n+line4 mod"),
2727
).
2828
PressPrimaryAction().
2929
PressPrimaryAction().
3030
Content(
31-
Contains(" line1\n line2 mod\n line3\n-line4\n+line4 mod\n"),
31+
Contains(" line1\n line2 mod\n line3\n-line4\n+line4 mod"),
3232
).
3333
PressEscape()
3434

@@ -54,7 +54,7 @@ var StashStagedPartialFile = NewIntegrationTest(NewIntegrationTestArgs{
5454
)
5555
t.Views().Main().
5656
Content(
57-
Contains(" line1\n-line2\n+line2 mod\n line3\n line4\n"),
57+
Contains(" line1\n-line2\n+line2 mod\n line3\n line4"),
5858
)
5959

6060
t.Views().Files().
@@ -64,7 +64,7 @@ var StashStagedPartialFile = NewIntegrationTest(NewIntegrationTestArgs{
6464

6565
t.Views().Staging().
6666
Content(
67-
Contains(" line1\n line2\n line3\n-line4\n+line4 mod\n"),
67+
Contains(" line1\n line2\n line3\n-line4\n+line4 mod"),
6868
)
6969
},
7070
})

‎pkg/utils/lines.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ func ScanLinesAndTruncateWhenLongerThanBuffer(maxBufferSize int) func(data []byt
110110
// If wrap is false, the text is returned as is.
111111
// This code needs to behave the same as `gocui.lineWrap` does.
112112
func WrapViewLinesToWidth(wrap bool, text string, width int) ([]string, []int, []int) {
113+
text = strings.TrimSuffix(text, "\n")
113114
lines := strings.Split(text, "\n")
114115
if !wrap {
115116
indices := make([]int, len(lines))

‎pkg/utils/lines_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,10 +374,9 @@ func TestWrapViewLinesToWidth(t *testing.T) {
374374
"longer.",
375375
"Third",
376376
"paragraph",
377-
"",
378377
},
379-
expectedWrappedLinesIndices: []int{0, 2, 6, 8},
380-
expectedOriginalLinesIndices: []int{0, 0, 1, 1, 1, 1, 2, 2, 3},
378+
expectedWrappedLinesIndices: []int{0, 2, 6},
379+
expectedOriginalLinesIndices: []int{0, 0, 1, 1, 1, 1, 2, 2},
381380
},
382381
}
383382
for _, tt := range tests {

‎vendor/github.com/jesseduffield/gocui/view.go‎

Lines changed: 47 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/golang.org/x/sys/unix/syscall_dragonfly.go‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/golang.org/x/sys/windows/dll_windows.go‎

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ github.com/jesseduffield/go-git/v5/utils/merkletrie/filesystem
172172
github.com/jesseduffield/go-git/v5/utils/merkletrie/index
173173
github.com/jesseduffield/go-git/v5/utils/merkletrie/internal/frame
174174
github.com/jesseduffield/go-git/v5/utils/merkletrie/noder
175-
# github.com/jesseduffield/gocui v0.3.1-0.20241223111608-9967d0e928a0
175+
# github.com/jesseduffield/gocui v0.3.1-0.20250106080306-164661a92088
176176
## explicit; go 1.12
177177
github.com/jesseduffield/gocui
178178
# github.com/jesseduffield/kill v0.0.0-20250101124109-e216ddbe133a
@@ -314,13 +314,13 @@ golang.org/x/net/proxy
314314
# golang.org/x/sync v0.10.0
315315
## explicit; go 1.18
316316
golang.org/x/sync/errgroup
317-
# golang.org/x/sys v0.28.0
317+
# golang.org/x/sys v0.29.0
318318
## explicit; go 1.18
319319
golang.org/x/sys/cpu
320320
golang.org/x/sys/plan9
321321
golang.org/x/sys/unix
322322
golang.org/x/sys/windows
323-
# golang.org/x/term v0.27.0
323+
# golang.org/x/term v0.28.0
324324
## explicit; go 1.18
325325
golang.org/x/term
326326
# golang.org/x/text v0.21.0

0 commit comments

Comments
 (0)