joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-07 02:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

widget: track rune positions for Editor carets

Browse Source 
Needed for efficient implementation of the upcoming IME interface.

Also introduce Editor.replace, seek methods for easier caret navigation
and editing.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2022-02-04 15:14:12 +01:00
parent 212c3cc126
commit d0869ef457
3 changed files with 78 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widget/editor_test.go
+9 -4
View File
@@ -153,11 +153,16 @@ func TestEditorCaretConsistency(t *testing.T) {
gotCoords := e.CaretCoords()
want, _ := e.offsetToScreenPos(e.caret.start.ofs)
wantCoords := f32.Pt(float32(want.x)/64, float32(want.y))
if want.lineCol.Y == gotLine && want.lineCol.X == gotCol && gotCoords == wantCoords {
return nil
if want.lineCol.Y != gotLine || want.lineCol.X != gotCol || gotCoords != wantCoords {
return fmt.Errorf("caret (%d,%d) pos %s, want (%d,%d) pos %s",
gotLine, gotCol, gotCoords, want.lineCol.Y, want.lineCol.X, wantCoords)
}
return fmt.Errorf("caret (%d,%d) pos %s, want (%d,%d) pos %s",
gotLine, gotCol, gotCoords, want.lineCol.Y, want.lineCol.X, wantCoords)
seekCaret := e.seek(combinedPos{}, e.caret.start.runes)
if seekCaret.runes != e.caret.start.runes || seekCaret.ofs != e.caret.start.ofs {
return fmt.Errorf("caret ofs %d, runes %d, expected ofs %d runes %d",
e.caret.start.ofs, e.caret.start.runes, seekCaret.ofs, seekCaret.runes)
}
return nil
}
if err := consistent(); err != nil {
t.Errorf("initial editor inconsistency (alignment %s): %v", a, err)