diff options
| -rw-r--r-- | clangd/ClangdLSPServer.h | 3 | ||||
| -rw-r--r-- | clangd/Protocol.h | 17 |
2 files changed, 11 insertions, 9 deletions
diff --git a/clangd/ClangdLSPServer.h b/clangd/ClangdLSPServer.h index ed055251..ca4b5724 100644 --- a/clangd/ClangdLSPServer.h +++ b/clangd/ClangdLSPServer.h @@ -88,7 +88,8 @@ private: bool IsDone = false; std::mutex FixItsMutex; - typedef std::map<clangd::Diagnostic, std::vector<TextEdit>> + typedef std::map<clangd::Diagnostic, std::vector<TextEdit>, + LSPDiagnosticCompare> DiagnosticToReplacementMap; /// Caches FixIts per file and diagnostics llvm::StringMap<DiagnosticToReplacementMap> FixItsMap; diff --git a/clangd/Protocol.h b/clangd/Protocol.h index 098df13c..f2ad0db0 100644 --- a/clangd/Protocol.h +++ b/clangd/Protocol.h @@ -322,14 +322,15 @@ struct Diagnostic { /// The diagnostic's message. std::string message; - - friend bool operator==(const Diagnostic &LHS, const Diagnostic &RHS) { - return std::tie(LHS.range, LHS.severity, LHS.message) == - std::tie(RHS.range, RHS.severity, RHS.message); - } - friend bool operator<(const Diagnostic &LHS, const Diagnostic &RHS) { - return std::tie(LHS.range, LHS.severity, LHS.message) < - std::tie(RHS.range, RHS.severity, RHS.message); +}; +/// A LSP-specific comparator used to find diagnostic in a container like +/// std:map. +/// We only use the required fields of Diagnostic to do the comparsion to avoid +/// any regression issues from LSP clients (e.g. VScode), see +/// https://git.io/vbr29 +struct LSPDiagnosticCompare { + bool operator()(const Diagnostic& LHS, const Diagnostic& RHS) const { + return std::tie(LHS.range, LHS.message) < std::tie(RHS.range, RHS.message); } }; bool fromJSON(const json::Expr &, Diagnostic &); |