From cba3701a6c1a67b839ebe567992e004d1ac4d7f1 Mon Sep 17 00:00:00 2001
From: Zufu Liu <unknown>
Date: Tue, 7 Nov 2023 13:46:00 +1100
Subject: Feature [feature-requests:#1501] More use of LineStartPosition,
 LineEndPosition.

---
 src/Document.cxx      | 3 +--
 src/Editor.cxx        | 2 +-
 src/ScintillaBase.cxx | 5 +----
 3 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/Document.cxx b/src/Document.cxx
index 5d9e10c40..a35105669 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -2404,8 +2404,7 @@ void Document::EnsureStyledTo(Sci::Position pos) {
 	if ((enteredStyling == 0) && (pos > GetEndStyled())) {
 		IncrementStyleClock();
 		if (pli && !pli->UseContainerLexing()) {
-			const Sci::Line lineEndStyled = SciLineFromPosition(GetEndStyled());
-			const Sci::Position endStyledTo = LineStart(lineEndStyled);
+			const Sci::Position endStyledTo = LineStartPosition(GetEndStyled());
 			pli->Colourise(endStyledTo, pos);
 		} else {
 			// Ask the watchers to style, and stop as soon as one responds.
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 796279871..0b65041d2 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -3750,7 +3750,7 @@ int Editor::DelWordOrLine(Message iMessage) {
 		case Message::DelLineRight:
 			rangeDelete = Range(
 				sel.Range(r).caret.Position(),
-				pdoc->LineEnd(pdoc->LineFromPosition(sel.Range(r).caret.Position())));
+				pdoc->LineEndPosition(sel.Range(r).caret.Position()));
 			break;
 		default:
 			break;
diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx
index 9d0c79c06..a629cdd33 100644
--- a/src/ScintillaBase.cxx
+++ b/src/ScintillaBase.cxx
@@ -804,10 +804,7 @@ const char *LexState::DescriptionOfStyle(int style) {
 
 void ScintillaBase::NotifyStyleToNeeded(Sci::Position endStyleNeeded) {
 	if (!DocumentLexState()->UseContainerLexing()) {
-		const Sci::Line lineEndStyled =
-			pdoc->SciLineFromPosition(pdoc->GetEndStyled());
-		const Sci::Position endStyled =
-			pdoc->LineStart(lineEndStyled);
+		const Sci::Position endStyled = pdoc->LineStartPosition(pdoc->GetEndStyled());
 		DocumentLexState()->Colourise(endStyled, endStyleNeeded);
 		return;
 	}
-- 
cgit v1.2.3