copilot/infinipaint
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions 1

Make moving between words more aware of whitespaces

Browse source
This commit is contained in:
Yousef Khadadeh 2025-09-28 20:53:47 +03:00
parent f130d495c8
commit 5d87108b3d
1 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/CollabTextBox/CollabTextBox.cpp
View file

@ -409,10 +409,19 @@ TextPosition Editor::move(Movement move, TextPosition pos) const {
break;
case Movement::kWordLeft:
{
for(;;) {
TextPosition prevCharPos = this->move(Movement::kLeft, pos);
if(prevCharPos != TextPosition{0, 0} && std::isspace(fLines[prevCharPos.fParagraphIndex].fText[prevCharPos.fTextByteIndex]))
pos = prevCharPos;
else
break;
}
if (pos.fTextByteIndex == 0) {
pos = this->move(Movement::kLeft, pos);
break;
}
const std::vector<bool>& words = fLines[pos.fParagraphIndex].fWordBoundaries;
assert(words.size() == fLines[pos.fParagraphIndex].fText.size());
do {
@ -432,6 +441,14 @@ TextPosition Editor::move(Movement move, TextPosition pos) const {
do {
++pos.fTextByteIndex;
} while (pos.fTextByteIndex < text.size() && !words[pos.fTextByteIndex]);
for(;;) {
const std::string& text = fLines[pos.fParagraphIndex].fText;
if(pos.fTextByteIndex != text.size() && std::isspace(text[pos.fTextByteIndex]))
pos = this->move(Movement::kRight, pos);
else
break;
}
}
break;