aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorZufu Liu <unknown>2019-05-24 12:23:46 +1000
committerZufu Liu <unknown>2019-05-24 12:23:46 +1000
commit810edc4827347f3e0c1bc4d835c6f7a58e8bd66c (patch)
treedf070afc99f8df4f29e39621a3f873bb0470886f
parenta9d3f1a45955191536f8ac282acb3a889d066bc0 (diff)
downloadscintilla-mirror-810edc4827347f3e0c1bc4d835c6f7a58e8bd66c.tar.gz
Backport: Optimize SCI_GETCURLINE by avoiding per-character calls.
Backport of changeset 7504:b46332260eee.
-rw-r--r--src/Editor.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/Editor.cxx b/src/Editor.cxx
index e024804bd..ffbf4e0ef 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -6434,11 +6434,9 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
}
PLATFORM_ASSERT(wParam > 0);
char *ptr = CharPtrFromSPtr(lParam);
- unsigned int iPlace = 0;
- for (Sci::Position iChar = lineStart; iChar < lineEnd && iPlace < wParam - 1; iChar++) {
- ptr[iPlace++] = pdoc->CharAt(iChar);
- }
- ptr[iPlace] = '\0';
+ const Sci::Position len = std::min<uptr_t>(lineEnd - lineStart, wParam - 1);
+ pdoc->GetCharRange(ptr, lineStart, len);
+ ptr[len] = '\0';
return sel.MainCaret() - lineStart;
}