luke/qedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix cursor position bug in UTF-8 lines in TextEdit

Browse Source
This commit is contained in:
Luke I. Wilson 2021-03-11 20:50:24 -06:00
parent f91da3dd7e
commit 314a50c385
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/textedit.go
View File

@ -170,8 +170,6 @@ func (t *TextEdit) Insert(contents string) {
} }
fallthrough // Append the \t character fallthrough // Append the \t character
default: default:
// TODO: this operation is not efficient by any means. OPTIMIZE
// Insert character into line // Insert character into line
lineRunes := []rune(t.buffer[t.cury]) lineRunes := []rune(t.buffer[t.cury])
lineRunes = append(lineRunes, ch) // Extend the length of the string lineRunes = append(lineRunes, ch) // Extend the length of the string
@ -219,17 +217,19 @@ func (t *TextEdit) SetLineCol(line, col int) {
line = len - 1 // Change that line to be the end of the buffer, instead line = len - 1 // Change that line to be the end of the buffer, instead
} }
lineRunes := []rune(t.buffer[line])
// Clamp the column input // Clamp the column input
if col < 0 { if col < 0 {
col = 0 col = 0
} else if len := len(t.buffer[line]); col > len { } else if len := len(lineRunes); col > len {
col = len col = len
} }
// Handle hard tabs // Handle hard tabs
tabOffset := 0 // Offset for the current column (temporary; purely visual) tabOffset := 0 // Offset for the current column (temporary; purely visual)
if t.UseHardTabs { // If the file is encoded as tabs, not spaces... if t.UseHardTabs { // If the file is encoded as tabs, not spaces...
tabOffset = (t.TabSize - 1) * strings.Count(t.buffer[line][0:col], "\t") // Shift the cursor for tabs (they are rendered as spaces) tabOffset = (t.TabSize - 1) * strings.Count(string(lineRunes[0:col]), "\t") // Shift the cursor for tabs (they are rendered as spaces)
} }
// Scroll the screen when going to lines out of view // Scroll the screen when going to lines out of view
@ -274,7 +274,7 @@ func (t *TextEdit) CursorLeft() {
func (t *TextEdit) CursorRight() { func (t *TextEdit) CursorRight() {
// If we are at the end of the current line, // If we are at the end of the current line,
// and not at the last line... // and not at the last line...
if t.curx >= len(t.buffer[t.cury]) && t.cury < len(t.buffer)-1 { if t.curx >= len([]rune(t.buffer[t.cury])) && t.cury < len(t.buffer)-1 {
t.SetLineCol(t.cury+1, 0) // Go to beginning of line below t.SetLineCol(t.cury+1, 0) // Go to beginning of line below
} else { } else {
t.SetLineCol(t.cury, t.curx+1) t.SetLineCol(t.cury, t.curx+1)