summaryrefslogtreecommitdiffstats
path: root/clang-tools-extra/clangd/Protocol.cpp
diff options
context:
space:
mode:
authorSam McCall <sam.mccall@gmail.com>2019-06-10 13:01:49 +0000
committerSam McCall <sam.mccall@gmail.com>2019-06-10 13:01:49 +0000
commit149786d5b7e1d1c270213c9c8e62fee8b7c2e9cc (patch)
treeabedd005322ba54ce93a864112439953fa2836e3 /clang-tools-extra/clangd/Protocol.cpp
parent47db08dbb19cc326e7002b0068237e1b92bd529e (diff)
downloadbcm5719-llvm-149786d5b7e1d1c270213c9c8e62fee8b7c2e9cc.tar.gz
bcm5719-llvm-149786d5b7e1d1c270213c9c8e62fee8b7c2e9cc.zip
[clangd] Stop marshalling/requiring FormattingOptions. We never did anything with them.
llvm-svn: 362934
Diffstat (limited to 'clang-tools-extra/clangd/Protocol.cpp')
-rw-r--r--clang-tools-extra/clangd/Protocol.cpp21
1 files changed, 3 insertions, 18 deletions
diff --git a/clang-tools-extra/clangd/Protocol.cpp b/clang-tools-extra/clangd/Protocol.cpp
index 4714c6c11da..bd8d0328a5b 100644
--- a/clang-tools-extra/clangd/Protocol.cpp
+++ b/clang-tools-extra/clangd/Protocol.cpp
@@ -402,38 +402,23 @@ bool fromJSON(const llvm::json::Value &Params,
O.map("text", R.text);
}
-bool fromJSON(const llvm::json::Value &Params, FormattingOptions &R) {
- llvm::json::ObjectMapper O(Params);
- return O && O.map("tabSize", R.tabSize) &&
- O.map("insertSpaces", R.insertSpaces);
-}
-
-llvm::json::Value toJSON(const FormattingOptions &P) {
- return llvm::json::Object{
- {"tabSize", P.tabSize},
- {"insertSpaces", P.insertSpaces},
- };
-}
-
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) && O.map("options", R.options);
+ O.map("range", R.range);
}
bool fromJSON(const llvm::json::Value &Params,
DocumentOnTypeFormattingParams &R) {
llvm::json::ObjectMapper O(Params);
return O && O.map("textDocument", R.textDocument) &&
- O.map("position", R.position) && O.map("ch", R.ch) &&
- O.map("options", R.options);
+ O.map("position", R.position) && O.map("ch", R.ch);
}
bool fromJSON(const llvm::json::Value &Params, DocumentFormattingParams &R) {
llvm::json::ObjectMapper O(Params);
- return O && O.map("textDocument", R.textDocument) &&
- O.map("options", R.options);
+ return O && O.map("textDocument", R.textDocument);
}
bool fromJSON(const llvm::json::Value &Params, DocumentSymbolParams &R) {
OpenPOWER on IntegriCloud