[clangd] Check for editsNearCursor client capability under experimental capabilities

[HighCommander4]

This is done to support clients which only support adding custom (language-specific or server-specific) capabilities under 'experimental'.

Fixes clangd/clangd#2201

[llvmbot]

@llvm/pr-subscribers-clang-tools-extra

@llvm/pr-subscribers-clangd

Author: Nathan Ridge (HighCommander4)

Changes

This is done to support clients which only support adding custom (language-specific or server-specific) capabilities under 'experimental'.

Fixes clangd/clangd#2201

---

Full diff: https://github.com/llvm/llvm-project/pull/114699.diff

1 Files Affected:

• (modified) clang-tools-extra/clangd/Protocol.cpp (+10)

diff --git a/clang-tools-extra/clangd/Protocol.cpp b/clang-tools-extra/clangd/Protocol.cpp
index c08f80442eaa06..5a303123b5ce84 100644
--- a/clang-tools-extra/clangd/Protocol.cpp
+++ b/clang-tools-extra/clangd/Protocol.cpp
@@ -504,6 +504,16 @@ bool fromJSON(const llvm::json::Value &Params, ClientCapabilities &R,
                   P.field("offsetEncoding")))
       return false;
   }
+
+  if (auto *Experimental = O->getObject("experimental")) {
+    if (auto *TextDocument = Experimental->getObject("textDocument")) {
+      if (auto *Completion = TextDocument->getObject("completion")) {
+        if (auto EditsNearCursor = Completion->getBoolean("editsNearCursor"))
+          R.CompletionFixes |= *EditsNearCursor;
+      }
+    }
+  }
+
   return true;
 }
 

[hokein]

(No action required) – we have other extensions in clangd e.g. references.container offsetEncoding. Do we plan to do the same thing for them?

[HighCommander4]

(No action required) – we have other extensions in clangd e.g. references.container offsetEncoding. Do we plan to do the same thing for them?

Good question; I was initially thinking of doing it as needed / when someone asks for it. But maybe it would be better to add them all up front, so when a need for another one arises, the support is already in a clangd release. I can do that in a follow-up patch.

[rchl]

Personally I haven't yet looked if other custom capabilities are relevant for the editor I use (Sublime Text) but I also think it would makes sense to be with all of them (and follow the spec).

[HighCommander4]

(No action required) – we have other extensions in clangd e.g. references.container offsetEncoding. Do we plan to do the same thing for them?

Good question; I was initially thinking of doing it as needed / when someone asks for it. But maybe it would be better to add them all up front, so when a need for another one arises, the support is already in a clangd release. I can do that in a follow-up patch.

Sent out #116531 for this.