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