utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-10 07:36:27 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge 7195e1fc5a into d0ede21e9c

Browse source
This commit is contained in:
Tatsuya Kyushima 2026-09-10 01:00:31 +00:00 committed by GitHub
parent d0ede21e9c 7195e1fc5a
commit a4165a076d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 135 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkg/gocui/text_area.go
View file

@ -315,6 +315,10 @@ func (self *TextArea) MoveCursorRight() {
self.cursor += len(s)
}
func isASCIIChar(ch string) bool {
return len(ch) == 1 && ch[0] <= 127
}
func (self *TextArea) newCursorForMoveLeftWord() int {
if self.cursor == 0 {
return 0
@ -333,8 +337,14 @@ func (self *TextArea) newCursorForMoveLeftWord() int {
separators = true
}
if !separators {
for cellCursor > 0 && self.cells[cellCursor-1].char != "\n" && !strings.Contains(WHITESPACES+WORD_SEPARATORS, self.cells[cellCursor-1].char) {
if cellCursor > 0 && self.cells[cellCursor-1].char != "\n" && !strings.Contains(WHITESPACES+WORD_SEPARATORS, self.cells[cellCursor-1].char) {
isASCII := isASCIIChar(self.cells[cellCursor-1].char)
// skip the first char regardless of isAscii.
cellCursor--
for cellCursor > 0 && self.cells[cellCursor-1].char != "\n" && !strings.Contains(WHITESPACES+WORD_SEPARATORS, self.cells[cellCursor-1].char) && isASCIIChar(self.cells[cellCursor-1].char) == isASCII {
// skip consecutive characters of the same kind (ASCII or non-ASCII) as the first character.
cellCursor--
}
}
}
@ -363,8 +373,14 @@ func (self *TextArea) newCursorForMoveRightWord() int {
separators = true
}
if !separators {
for cellCursor < len(self.cells) && self.cells[cellCursor].char != "\n" && !strings.Contains(WHITESPACES+WORD_SEPARATORS, self.cells[cellCursor].char) {
if cellCursor < len(self.cells) && self.cells[cellCursor].char != "\n" && !strings.Contains(WHITESPACES+WORD_SEPARATORS, self.cells[cellCursor].char) {
isASCII := isASCIIChar(self.cells[cellCursor].char)
// skip the first char regardless of isAscii.
cellCursor++
for cellCursor < len(self.cells) && self.cells[cellCursor].char != "\n" && !strings.Contains(WHITESPACES+WORD_SEPARATORS, self.cells[cellCursor].char) && isASCIIChar(self.cells[cellCursor].char) == isASCII {
// skip consecutive characters of the same kind (ASCII or non-ASCII) as the first character.
cellCursor++
}
}
}

117
pkg/gocui/text_area_test.go
View file

@ -642,6 +642,123 @@ func TestTextArea(t *testing.T) {
expectedCursor: 0,
expectedClipboard: "",
},
{
actions: func(textarea *TextArea) {
textarea.TypeString("字abc")
textarea.BackSpaceWord()
},
expectedContent: "字",
expectedCursor: 3,
expectedClipboard: "abc",
},
{
actions: func(textarea *TextArea) {
textarea.TypeString("abc字")
textarea.BackSpaceWord()
},
expectedContent: "abc",
expectedCursor: 3,
expectedClipboard: "字",
},
{
actions: func(textarea *TextArea) {
textarea.TypeString("字abc")
textarea.BackSpaceWord()
textarea.BackSpaceWord()
},
expectedContent: "",
expectedCursor: 0,
expectedClipboard: "字",
},
{
actions: func(textarea *TextArea) {
textarea.TypeString("abc 字abc")
textarea.BackSpaceWord()
},
expectedContent: "abc 字",
expectedCursor: 7,
expectedClipboard: "abc",
},
{
actions: func(textarea *TextArea) {
textarea.TypeString("字abc")
textarea.MoveLeftWord()
},
expectedContent: "字abc",
expectedCursor: 3,
expectedClipboard: "",
},
{
actions: func(textarea *TextArea) {
textarea.TypeString("abc字")
textarea.MoveLeftWord()
},
expectedContent: "abc字",
expectedCursor: 3,
expectedClipboard: "",
},
//
{
actions: func(textarea *TextArea) {
textarea.TypeString("字abc")
textarea.GoToStartOfLine()
textarea.ForwardDeleteWord()
},
expectedContent: "abc",
expectedCursor: 0,
expectedClipboard: "字",
},
{
actions: func(textarea *TextArea) {
textarea.TypeString("abc字")
textarea.GoToStartOfLine()
textarea.ForwardDeleteWord()
},
expectedContent: "字",
expectedCursor: 0,
expectedClipboard: "abc",
},
{
actions: func(textarea *TextArea) {
textarea.TypeString("字abc")
textarea.GoToStartOfLine()
textarea.ForwardDeleteWord()
textarea.ForwardDeleteWord()
},
expectedContent: "",
expectedCursor: 0,
expectedClipboard: "abc",
},
{
actions: func(textarea *TextArea) {
textarea.TypeString("abc 字abc")
textarea.GoToStartOfLine()
textarea.ForwardDeleteWord()
},
expectedContent: " 字abc",
expectedCursor: 0,
expectedClipboard: "abc",
},
{
actions: func(textarea *TextArea) {
textarea.TypeString("字abc")
textarea.GoToStartOfLine()
textarea.MoveRightWord()
},
expectedContent: "字abc",
expectedCursor: 3,
expectedClipboard: "",
},
{
actions: func(textarea *TextArea) {
textarea.TypeString("abc字")
textarea.GoToStartOfLine()
textarea.MoveRightWord()
},
expectedContent: "abc字",
expectedCursor: 3,
expectedClipboard: "",
},
{
actions: func(textarea *TextArea) {
textarea.TypeString(`abc`)