commit 4b65d0583cb8e84532d9058434d70c3bec0f0b52
author Eric Liu <ioeric@google.com> Thu Feb 22 18:40:39 2018
committer Eric Liu <ioeric@google.com> Thu Feb 22 18:40:39 2018
tree d77e029d1ce49c2998f1e080e43ea25fe581f049
parent 864eda4e39a977a77de2b6f9d72e3f5438a2704b

[clangd] Extend textDocument/didChange to specify whether diagnostics should be generated.

Summary:
This would allow us to disable diagnostics when didChange is called but
diagnostics are not wanted (e.g. code completion).

Reviewers: sammccall

Subscribers: klimek, ilya-biryukov, jkorous-apple, cfe-commits

Differential Revision: https://reviews.llvm.org/D43634

git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@325813 91177308-0d34-0410-b5e6-96231b3b80d8

clangd/ClangdLSPServer.cpp

diff --git a/clangd/ClangdLSPServer.cpp b/clangd/ClangdLSPServer.cpp
index 587aee7..f2c46dc 100644
--- a/clangd/ClangdLSPServer.cpp
+++ b/clangd/ClangdLSPServer.cpp
@@ -149,9 +149,13 @@
   if (Params.contentChanges.size() != 1)
     return replyError(ErrorCode::InvalidParams,
                       "can only apply one change at a time");
+  auto WantDiags = WantDiagnostics::Auto;
+  if (Params.wantDiagnostics.hasValue())
+    WantDiags = Params.wantDiagnostics.getValue() ? WantDiagnostics::Yes
+                                                  : WantDiagnostics::No;
   // We only support full syncing right now.
   Server.addDocument(Params.textDocument.uri.file(),
-                     Params.contentChanges[0].text, WantDiagnostics::Auto);
+                     Params.contentChanges[0].text, WantDiags);
 }
 
 void ClangdLSPServer::onFileEvent(DidChangeWatchedFilesParams &Params) {

clangd/Protocol.cpp

diff --git a/clangd/Protocol.cpp b/clangd/Protocol.cpp
index 8992599..799b2a1 100644
--- a/clangd/Protocol.cpp
+++ b/clangd/Protocol.cpp
@@ -221,7 +221,8 @@
 bool fromJSON(const json::Expr &Params, DidChangeTextDocumentParams &R) {
   json::ObjectMapper O(Params);
   return O && O.map("textDocument", R.textDocument) &&
-         O.map("contentChanges", R.contentChanges);
+         O.map("contentChanges", R.contentChanges) &&
+         O.map("wantDiagnostics", R.wantDiagnostics);
 }
 
 bool fromJSON(const json::Expr &E, FileChangeType &Out) {

clangd/Protocol.h

diff --git a/clangd/Protocol.h b/clangd/Protocol.h
index 40ccfaf..2db30e7 100644
--- a/clangd/Protocol.h
+++ b/clangd/Protocol.h
@@ -297,6 +297,12 @@
 
   /// The actual content changes.
   std::vector<TextDocumentContentChangeEvent> contentChanges;
+
+  /// Forces diagnostics to be generated, or to not be generated, for this
+  /// version of the file. If not set, diagnostics are eventually consistent:
+  /// either they will be provided for this version or some subsequent one.
+  /// This is a clangd extension.
+  llvm::Optional<bool> wantDiagnostics;
 };
 bool fromJSON(const json::Expr &, DidChangeTextDocumentParams &);