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

Eric Liu · Eric Liu · commit 51fed1834258 · 2018-02-22T18:40:39.000Z
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 llvm-svn: 325813
diff --git a/clang-tools-extra/clangd/ClangdLSPServer.cpp b/clang-tools-extra/clangd/ClangdLSPServer.cpp
@@ -149,9 +149,13 @@ void ClangdLSPServer::onDocumentDidChange(DidChangeTextDocumentParams &Params) {
   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) {
diff --git a/clang-tools-extra/clangd/Protocol.cpp b/clang-tools-extra/clangd/Protocol.cpp
@@ -221,7 +221,8 @@ bool fromJSON(const json::Expr &Params, DidCloseTextDocumentParams &R) {
 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) {
diff --git a/clang-tools-extra/clangd/Protocol.h b/clang-tools-extra/clangd/Protocol.h
@@ -297,6 +297,12 @@ struct DidChangeTextDocumentParams {
 
   /// 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 &);
 

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,8 @@ bool fromJSON(const json::Expr &Params, DidCloseTextDocumentParams &R) {`
`221`	`221`	`bool fromJSON(const json::Expr &Params, DidChangeTextDocumentParams &R) {`
`222`	`222`	`json::ObjectMapper O(Params);`
`223`	`223`	`return O && O.map("textDocument", R.textDocument) &&`
`224`		`- O.map("contentChanges", R.contentChanges);`
	`224`	`+ O.map("contentChanges", R.contentChanges) &&`
	`225`	`+ O.map("wantDiagnostics", R.wantDiagnostics);`
`225`	`226`	`}`
`226`	`227`
`227`	`228`	`bool fromJSON(const json::Expr &E, FileChangeType &Out) {`