From 9ec5dc184d3095ea6c091ecd326e459c7caf2ca7 Mon Sep 17 00:00:00 2001
From: mitchell <70453897+667e-11@users.noreply.github.com>
Date: Wed, 9 Sep 2020 23:41:24 -0400
Subject: Backport: Feature [feature-requests:1350]. Add
 SCI_GETMULTIEDGECOLUMN.

Backport of changeset 8507:e72e8cf58ea7.
---
 src/Editor.cxx | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/Editor.cxx b/src/Editor.cxx
index 4256bb817..8453118b3 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -7690,16 +7690,33 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 		InvalidateStyleRedraw();
 		break;
 
-	case SCI_MULTIEDGEADDLINE:
-		vs.theMultiEdge.push_back(EdgeProperties(wParam, lParam));
-		InvalidateStyleRedraw();
-		break;
+	case SCI_MULTIEDGEADDLINE: {
+			// Insert new edge in sorted order.
+			const int column = static_cast<int>(wParam);
+			vs.theMultiEdge.insert(
+				std::upper_bound(vs.theMultiEdge.begin(), vs.theMultiEdge.end(), column,
+					[](const EdgeProperties &a, const EdgeProperties &b) {
+						return a.column < b.column;
+					}),
+				EdgeProperties(wParam, lParam));
+			InvalidateStyleRedraw();
+			break;
+		}
 
 	case SCI_MULTIEDGECLEARALL:
 		std::vector<EdgeProperties>().swap(vs.theMultiEdge); // Free vector and memory, C++03 compatible
 		InvalidateStyleRedraw();
 		break;
 
+	case SCI_GETMULTIEDGECOLUMN: {
+			const size_t which = wParam;
+			// size_t is unsigned so this also handles negative inputs.
+			if (which >= vs.theMultiEdge.size()) {
+				return -1;
+			}
+			return vs.theMultiEdge[which].column;
+		}
+
 	case SCI_GETACCESSIBILITY:
 		return SC_ACCESSIBILITY_DISABLED;
 
-- 
cgit v1.2.3