From de54e2c4df98f725e9ef9f4885cf2fe136ef2956 Mon Sep 17 00:00:00 2001 From: Russell Gallop Date: Fri, 12 Jul 2019 13:35:58 +0000 Subject: Revert "[clangd] Implement typeHierarchy/resolve for subtypes" Causing test failure on Windows bot This reverts commit 5b9484e559d44bd923fc290e335891b1dd2e17c4. llvm-svn: 365899 --- clang-tools-extra/clangd/Protocol.cpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'clang-tools-extra/clangd/Protocol.cpp') diff --git a/clang-tools-extra/clangd/Protocol.cpp b/clang-tools-extra/clangd/Protocol.cpp index 600896b1eee..7c70afb567d 100644 --- a/clang-tools-extra/clangd/Protocol.cpp +++ b/clang-tools-extra/clangd/Protocol.cpp @@ -422,7 +422,8 @@ bool fromJSON(const llvm::json::Value &Params, bool fromJSON(const llvm::json::Value &Params, DocumentRangeFormattingParams &R) { llvm::json::ObjectMapper O(Params); - return O && O.map("textDocument", R.textDocument) && O.map("range", R.range); + return O && O.map("textDocument", R.textDocument) && + O.map("range", R.range); } bool fromJSON(const llvm::json::Value &Params, @@ -444,8 +445,8 @@ bool fromJSON(const llvm::json::Value &Params, DocumentSymbolParams &R) { llvm::json::Value toJSON(const DiagnosticRelatedInformation &DRI) { return llvm::json::Object{ - {"location", DRI.location}, - {"message", DRI.message}, + {"location", DRI.location}, + {"message", DRI.message}, }; } @@ -977,8 +978,6 @@ llvm::json::Value toJSON(const TypeHierarchyItem &I) { Result["parents"] = I.parents; if (I.children) Result["children"] = I.children; - if (I.data) - Result["data"] = I.data; return std::move(Result); } @@ -997,18 +996,10 @@ bool fromJSON(const llvm::json::Value &Params, TypeHierarchyItem &I) { O.map("deprecated", I.deprecated); O.map("parents", I.parents); O.map("children", I.children); - O.map("data", I.data); return true; } -bool fromJSON(const llvm::json::Value &Params, - ResolveTypeHierarchyItemParams &P) { - llvm::json::ObjectMapper O(Params); - return O && O.map("item", P.item) && O.map("resolve", P.resolve) && - O.map("direction", P.direction); -} - bool fromJSON(const llvm::json::Value &Params, ReferenceParams &R) { TextDocumentPositionParams &Base = R; return fromJSON(Params, Base); -- cgit v1.2.3