From 794babeb2cfcba6d1589f9b8efed0082eec9db57 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Wed, 28 Apr 2021 10:14:12 +0200
Subject: [PATCH] LSP: Add Range::contains(Range)

Change-Id: I762f5582cd00e6ee00a0c345a1b9ba4de8231538
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/libs/languageserverprotocol/lsptypes.cpp |  9 +++++++++
 src/libs/languageserverprotocol/lsptypes.h   | 15 +++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/libs/languageserverprotocol/lsptypes.cpp b/src/libs/languageserverprotocol/lsptypes.cpp
index d6867590459..bbc8271dce3 100644
--- a/src/libs/languageserverprotocol/lsptypes.cpp
+++ b/src/libs/languageserverprotocol/lsptypes.cpp
@@ -312,6 +312,15 @@ Range::Range(const QTextCursor &cursor)
     setEnd(Position(line - 1, character - 1));
 }
 
+bool Range::contains(const Range &other) const
+{
+    if (start() > other.start())
+        return false;
+    if (end() < other.end())
+        return false;
+    return true;
+}
+
 bool Range::overlaps(const Range &range) const
 {
     return contains(range.start()) || contains(range.end());
diff --git a/src/libs/languageserverprotocol/lsptypes.h b/src/libs/languageserverprotocol/lsptypes.h
index 100fd2b80c9..1c6820a4aa9 100644
--- a/src/libs/languageserverprotocol/lsptypes.h
+++ b/src/libs/languageserverprotocol/lsptypes.h
@@ -90,10 +90,20 @@ public:
     QTextCursor toTextCursor(QTextDocument *doc) const;
 };
 
-static bool operator<=(const Position &first, const Position &second)
+inline bool operator<(const Position &first, const Position &second)
 {
     return first.line() < second.line()
-            || (first.line() == second.line() && first.character() <= second.character());
+            || (first.line() == second.line() && first.character() < second.character());
+}
+
+inline bool operator>(const Position &first, const Position &second)
+{
+    return second < first;
+}
+
+inline bool operator<=(const Position &first, const Position &second)
+{
+    return !(first > second);
 }
 
 class LANGUAGESERVERPROTOCOL_EXPORT Range : public JsonObject
@@ -113,6 +123,7 @@ public:
     void setEnd(const Position &end) { insert(endKey, end); }
 
     bool contains(const Position &pos) const { return start() <= pos && pos <= end(); }
+    bool contains(const Range &other) const;
     bool overlaps(const Range &range) const;
 
     bool isValid() const override