Prefer Sci::invalidPosition to INVALID_POSITION as Scintilla.h will eventually

not be visible to most code.

5 files changed, 32 insertions, 32 deletions

diff --git a/src/CellBuffer.cxx b/src/CellBuffer.cxx
index 6d760cdb5..84c2c27a7 100644
--- a/src/CellBuffer.cxx
+++ b/src/CellBuffer.cxx
@@ -1129,7 +1129,7 @@ void CellBuffer::BasicDeleteChars(Sci::Position position, Sci::Position deleteLe
 	if (deleteLength == 0)
 		return;
 
-	Sci::Line lineRecalculateStart = INVALID_POSITION;
+	Sci::Line lineRecalculateStart = Sci::invalidPosition;
 
 	if ((position == 0) && (deleteLength == substance.Length())) {
 		// If whole buffer is being deleted, faster to reinitialise lines data
diff --git a/src/Document.cxx b/src/Document.cxx
index fbe407515..c8f474eaa 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -945,14 +945,14 @@ Sci_Position SCI_METHOD Document::GetRelativePosition(Sci_Position positionStart
 		while (characterOffset != 0) {
 			const Sci::Position posNext = NextPosition(pos, increment);
 			if (posNext == pos)
-				return INVALID_POSITION;
+				return Sci::invalidPosition;
 			pos = posNext;
 			characterOffset -= increment;
 		}
 	} else {
 		pos = positionStart + characterOffset;
 		if ((pos < 0) || (pos > Length()))
-			return INVALID_POSITION;
+			return Sci::invalidPosition;
 	}
 	return pos;
 }
@@ -964,7 +964,7 @@ Sci::Position Document::GetRelativePositionUTF16(Sci::Position positionStart, Sc
 		while (characterOffset != 0) {
 			const Sci::Position posNext = NextPosition(pos, increment);
 			if (posNext == pos)
-				return INVALID_POSITION;
+				return Sci::invalidPosition;
 			if (std::abs(pos-posNext) > 3)	// 4 byte character = 2*UTF16.
 				characterOffset -= increment;
 			pos = posNext;
@@ -973,7 +973,7 @@ Sci::Position Document::GetRelativePositionUTF16(Sci::Position positionStart, Sc
 	} else {
 		pos = positionStart + characterOffset;
 		if ((pos < 0) || (pos > LengthNoExcept()))
-			return INVALID_POSITION;
+			return Sci::invalidPosition;
 	}
 	return pos;
 }
diff --git a/src/EditView.cxx b/src/EditView.cxx
index b4eaa577f..c9343b0cd 100644
--- a/src/EditView.cxx
+++ b/src/EditView.cxx
@@ -626,7 +626,7 @@ void EditView::UpdateBidiData(const EditModel &model, const ViewStyle &vstyle, L
 Point EditView::LocationFromPosition(Surface *surface, const EditModel &model, SelectionPosition pos, Sci::Line topLine,
 				     const ViewStyle &vs, PointEnd pe, const PRectangle rcClient) {
 	Point pt;
-	if (pos.Position() == INVALID_POSITION)
+	if (pos.Position() == Sci::invalidPosition)
 		return pt;
 	Sci::Line lineDoc = model.pdoc->SciLineFromPosition(pos.Position());
 	Sci::Position posLineStart = model.pdoc->LineStart(lineDoc);
@@ -702,9 +702,9 @@ SelectionPosition EditView::SPositionFromLocation(Surface *surface, const EditMo
 		visibleLine = 0;
 	const Sci::Line lineDoc = model.pcs->DocFromDisplay(visibleLine);
 	if (canReturnInvalid && (lineDoc < 0))
-		return SelectionPosition(INVALID_POSITION);
+		return SelectionPosition(Sci::invalidPosition);
 	if (lineDoc >= model.pdoc->LinesTotal())
-		return SelectionPosition(canReturnInvalid ? INVALID_POSITION :
+		return SelectionPosition(canReturnInvalid ? Sci::invalidPosition :
 			model.pdoc->Length());
 	const Sci::Position posLineStart = model.pdoc->LineStart(lineDoc);
 	std::shared_ptr<LineLayout> ll = RetrieveLineLayout(lineDoc, model);
@@ -749,7 +749,7 @@ SelectionPosition EditView::SPositionFromLocation(Surface *surface, const EditMo
 		if (!canReturnInvalid)
 			return SelectionPosition(ll->numCharsInLine + posLineStart);
 	}
-	return SelectionPosition(canReturnInvalid ? INVALID_POSITION : posLineStart);
+	return SelectionPosition(canReturnInvalid ? Sci::invalidPosition : posLineStart);
 }
 
 /**
@@ -797,7 +797,7 @@ Sci::Line EditView::DisplayFromPosition(Surface *surface, const EditModel &model
 Sci::Position EditView::StartEndDisplayLine(Surface *surface, const EditModel &model, Sci::Position pos, bool start, const ViewStyle &vs) {
 	const Sci::Line line = model.pdoc->SciLineFromPosition(pos);
 	std::shared_ptr<LineLayout> ll = RetrieveLineLayout(line, model);
-	Sci::Position posRet = INVALID_POSITION;
+	Sci::Position posRet = Sci::invalidPosition;
 	if (surface && ll) {
 		const Sci::Position posLineStart = model.pdoc->LineStart(line);
 		LayoutLine(model, surface, vs, ll.get(), model.wrapWidth);
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 0ff165595..edcf946cc 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -136,7 +136,7 @@ Editor::Editor() : durationWrapOneByte(0.000001, 0.0000001, 0.00001) {
 	inDragDrop = DragDrop::none;
 	dropWentOutside = false;
 	posDrop = SelectionPosition(Sci::invalidPosition);
-	hotSpotClickPos = INVALID_POSITION;
+	hotSpotClickPos = Sci::invalidPosition;
 	selectionUnit = TextUnit::character;
 
 	lastXChosen = 0;
@@ -403,11 +403,11 @@ SelectionPosition Editor::SPositionFromLocation(Point pt, bool canReturnInvalid,
 
 	if (canReturnInvalid) {
 		if (!rcClient.Contains(pt))
-			return SelectionPosition(INVALID_POSITION);
+			return SelectionPosition(Sci::invalidPosition);
 		if (pt.x < vs.textStart)
-			return SelectionPosition(INVALID_POSITION);
+			return SelectionPosition(Sci::invalidPosition);
 		if (pt.y < 0)
-			return SelectionPosition(INVALID_POSITION);
+			return SelectionPosition(Sci::invalidPosition);
 	}
 	const PointDocument ptdoc = DocumentPointFromView(pt);
 	return view.SPositionFromLocation(surface, *this, ptdoc, canReturnInvalid,
@@ -872,7 +872,7 @@ void Editor::MovedCaret(SelectionPosition newPos, SelectionPosition previousPos,
 
 void Editor::MovePositionTo(SelectionPosition newPos, Selection::SelTypes selt, bool ensureVisible) {
 	const SelectionPosition spCaret = ((sel.Count() == 1) && sel.Empty()) ?
-		sel.Last() : SelectionPosition(INVALID_POSITION);
+		sel.Last() : SelectionPosition(Sci::invalidPosition);
 
 	const Sci::Position delta = newPos.Position() - sel.MainCaret();
 	newPos = ClampPositionIntoDocument(newPos);
@@ -3259,7 +3259,7 @@ Sci::Position Editor::StartEndDisplayLine(Sci::Position pos, bool start) {
 	RefreshStyleData();
 	AutoSurface surface(this);
 	const Sci::Position posRet = view.StartEndDisplayLine(surface, *this, pos, start, vs);
-	if (posRet == INVALID_POSITION) {
+	if (posRet == Sci::invalidPosition) {
 		return pos;
 	} else {
 		return posRet;
@@ -3625,7 +3625,7 @@ int Editor::HorizontalMove(unsigned int iMessage) {
 
 	sel.RemoveDuplicates();
 
-	MovedCaret(sel.RangeMain().caret, SelectionPosition(INVALID_POSITION), true, caretPolicies);
+	MovedCaret(sel.RangeMain().caret, SelectionPosition(Sci::invalidPosition), true, caretPolicies);
 
 	// Invalidate the new state of the selection
 	InvalidateWholeSelection();
@@ -3696,7 +3696,7 @@ int Editor::DelWordOrLine(unsigned int iMessage) {
 	// May need something stronger here: can selections overlap at this point?
 	sel.RemoveDuplicates();
 
-	MovedCaret(sel.RangeMain().caret, SelectionPosition(INVALID_POSITION), true, caretPolicies);
+	MovedCaret(sel.RangeMain().caret, SelectionPosition(Sci::invalidPosition), true, caretPolicies);
 
 	// Invalidate the new state of the selection
 	InvalidateWholeSelection();
@@ -4129,7 +4129,7 @@ Sci::Position Editor::SearchText(
     sptr_t lParam) {			///< The text to search for.
 
 	const char *txt = CharPtrFromSPtr(lParam);
-	Sci::Position pos = INVALID_POSITION;
+	Sci::Position pos = Sci::invalidPosition;
 	Sci::Position lengthFound = strlen(txt);
 	if (!pdoc->HasCaseFolder())
 		pdoc->SetCaseFolder(CaseFolderForEncoding());
@@ -4145,9 +4145,9 @@ Sci::Position Editor::SearchText(
 		}
 	} catch (RegexError &) {
 		errorStatus = SC_STATUS_WARN_REGEX;
-		return INVALID_POSITION;
+		return Sci::invalidPosition;
 	}
-	if (pos != INVALID_POSITION) {
+	if (pos != Sci::invalidPosition) {
 		SetSelection(pos, pos + lengthFound);
 	}
 
@@ -4725,17 +4725,17 @@ bool Editor::PositionIsHotspot(Sci::Position position) const {
 
 bool Editor::PointIsHotspot(Point pt) {
 	const Sci::Position pos = PositionFromLocation(pt, true, true);
-	if (pos == INVALID_POSITION)
+	if (pos == Sci::invalidPosition)
 		return false;
 	return PositionIsHotspot(pos);
 }
 
 void Editor::SetHoverIndicatorPosition(Sci::Position position) {
 	const Sci::Position hoverIndicatorPosPrev = hoverIndicatorPos;
-	hoverIndicatorPos = INVALID_POSITION;
+	hoverIndicatorPos = Sci::invalidPosition;
 	if (!vs.indicatorsDynamic)
 		return;
-	if (position != INVALID_POSITION) {
+	if (position != Sci::invalidPosition) {
 		for (const IDecoration *deco : pdoc->decorations->View()) {
 			if (vs.indicators[deco->Indicator()].IsDynamic()) {
 				if (pdoc->decorations->ValueAt(deco->Indicator(), position)) {
@@ -4751,7 +4751,7 @@ void Editor::SetHoverIndicatorPosition(Sci::Position position) {
 
 void Editor::SetHoverIndicatorPoint(Point pt) {
 	if (!vs.indicatorsDynamic) {
-		SetHoverIndicatorPosition(INVALID_POSITION);
+		SetHoverIndicatorPosition(Sci::invalidPosition);
 	} else {
 		SetHoverIndicatorPosition(PositionFromLocation(pt, true, true));
 	}
@@ -4879,11 +4879,11 @@ void Editor::ButtonMoveWithModifiers(Point pt, unsigned int, int modifiers) {
 		if (hotspot.Valid() && !PointIsHotspot(pt))
 			SetHotSpotRange(nullptr);
 
-		if (hotSpotClickPos != INVALID_POSITION && PositionFromLocation(pt, true, true) != hotSpotClickPos) {
+		if (hotSpotClickPos != Sci::invalidPosition && PositionFromLocation(pt, true, true) != hotSpotClickPos) {
 			if (inDragDrop == DragDrop::none) {
 				DisplayCursor(Window::Cursor::text);
 			}
-			hotSpotClickPos = INVALID_POSITION;
+			hotSpotClickPos = Sci::invalidPosition;
 		}
 
 	} else {
@@ -4919,7 +4919,7 @@ void Editor::ButtonUpWithModifiers(Point pt, unsigned int curTime, int modifiers
 	//Platform::DebugPrintf("ButtonUp %d %d\n", HaveMouseCapture(), inDragDrop);
 	SelectionPosition newPos = SPositionFromLocation(pt, false, false,
 		AllowVirtualSpace(virtualSpaceOptions, sel.IsRectangular()));
-	if (hoverIndicatorPos != INVALID_POSITION)
+	if (hoverIndicatorPos != Sci::invalidPosition)
 		InvalidateRange(newPos.Position(), newPos.Position() + 1);
 	newPos = MovePositionOutsideChar(newPos, sel.MainCaret() - newPos.Position());
 	if (inDragDrop == DragDrop::initial) {
@@ -4928,8 +4928,8 @@ void Editor::ButtonUpWithModifiers(Point pt, unsigned int curTime, int modifiers
 		selectionUnit = TextUnit::character;
 		originalAnchorPos = sel.MainCaret();
 	}
-	if (hotSpotClickPos != INVALID_POSITION && PointIsHotspot(pt)) {
-		hotSpotClickPos = INVALID_POSITION;
+	if (hotSpotClickPos != Sci::invalidPosition && PointIsHotspot(pt)) {
+		hotSpotClickPos = Sci::invalidPosition;
 		SelectionPosition newCharPos = SPositionFromLocation(pt, false, true, false);
 		newCharPos = MovePositionOutsideChar(newCharPos, -1);
 		NotifyHotSpotReleaseClick(newCharPos.Position(), modifiers & SCI_CTRL);
@@ -8022,7 +8022,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 					return (iMessage == SCI_GETLINESELSTARTPOSITION) ? portion.start.Position() : portion.end.Position();
 				}
 			}
-			return INVALID_POSITION;
+			return Sci::invalidPosition;
 		}
 
 	case SCI_SETOVERTYPE:
diff --git a/src/Selection.h b/src/Selection.h
index c8daa3932..5cd3e6ae8 100644
--- a/src/Selection.h
+++ b/src/Selection.h
@@ -14,7 +14,7 @@ class SelectionPosition {
 	Sci::Position position;
 	Sci::Position virtualSpace;
 public:
-	explicit SelectionPosition(Sci::Position position_=INVALID_POSITION, Sci::Position virtualSpace_=0) noexcept : position(position_), virtualSpace(virtualSpace_) {
+	explicit SelectionPosition(Sci::Position position_= Sci::invalidPosition, Sci::Position virtualSpace_=0) noexcept : position(position_), virtualSpace(virtualSpace_) {
 		PLATFORM_ASSERT(virtualSpace < 800000);
 		if (virtualSpace < 0)
 			virtualSpace = 0;