Disable clangd's inactiveRegions support (#26539)
Disables https://github.com/zed-industries/zed/pull/26146 until a better way to add diagnostics is found. Overall, the PR had made changes that are worth keeping instead of reverting, such as finally extracting out r-a's language server logic into an `_ext.rs` file. Release Notes: - N/A
This commit is contained in:
parent
6b56fee6b0
commit
690f26cf8b
2 changed files with 9 additions and 4 deletions
|
@ -273,15 +273,16 @@ impl super::LspAdapter for CLspAdapter {
|
||||||
&self,
|
&self,
|
||||||
mut original: InitializeParams,
|
mut original: InitializeParams,
|
||||||
) -> Result<InitializeParams> {
|
) -> Result<InitializeParams> {
|
||||||
// enable clangd's dot-to-arrow feature.
|
|
||||||
let experimental = json!({
|
let experimental = json!({
|
||||||
"textDocument": {
|
"textDocument": {
|
||||||
"completion" : {
|
"completion" : {
|
||||||
|
// enable clangd's dot-to-arrow feature.
|
||||||
"editsNearCursor": true
|
"editsNearCursor": true
|
||||||
},
|
},
|
||||||
"inactiveRegionsCapabilities": {
|
// TODO: inactiveRegions support needs an implementation in clangd_ext.rs
|
||||||
"inactiveRegions": true,
|
// "inactiveRegionsCapabilities": {
|
||||||
}
|
// "inactiveRegions": true,
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
if let Some(ref mut original_experimental) = original.capabilities.experimental {
|
if let Some(ref mut original_experimental) = original.capabilities.experimental {
|
||||||
|
|
|
@ -35,6 +35,10 @@ pub fn register_notifications(
|
||||||
}
|
}
|
||||||
let server_id = language_server.server_id();
|
let server_id = language_server.server_id();
|
||||||
|
|
||||||
|
// TODO: inactiveRegions support needs do add diagnostics, not replace them as `this.update_diagnostics` call below does
|
||||||
|
if true {
|
||||||
|
return;
|
||||||
|
}
|
||||||
language_server
|
language_server
|
||||||
.on_notification::<InactiveRegions, _>({
|
.on_notification::<InactiveRegions, _>({
|
||||||
let adapter = adapter.clone();
|
let adapter = adapter.clone();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue