SomeoneToIgnore
commented
2 months ago This is due to clangd using C++ by default: https://github.com/zed-industries/zed/issues/14411#issuecomment-2227324916
I'm very curious to know which initializationOptions json can we pass into the server to treat is a "generic C" (C11?) to have some reasonable default.
Then we'll able to do something like
diff --git a/crates/languages/src/c.rs b/crates/languages/src/c.rs
index ea11b4e0d0..b53e5bf9e6 100644
--- a/crates/languages/src/c.rs
+++ b/crates/languages/src/c.rs
@@ -6,19 +6,26 @@ use http_client::github::{latest_github_release, GitHubLspBinaryVersion};
pub use language::*;
use lsp::LanguageServerBinary;
use project::project_settings::{BinarySettings, ProjectSettings};
+use serde_json::json;
use settings::Settings;
use smol::fs::{self, File};
use std::{any::Any, env::consts, path::PathBuf, sync::Arc};
use util::{fs::remove_matching, maybe, ResultExt};
-pub struct CLspAdapter;
+pub struct ClangdArapter {
+ use_cpp: bool,
+}
-impl CLspAdapter {
+impl ClangdArapter {
const SERVER_NAME: &'static str = "clangd";
+
+ pub fn new(use_cpp: bool) -> Self {
+ Self { use_cpp }
+ }
}
#[async_trait(?Send)]
-impl super::LspAdapter for CLspAdapter {
+impl super::LspAdapter for ClangdArapter {
fn name(&self) -> LanguageServerName {
LanguageServerName(Self::SERVER_NAME.into())
}
@@ -299,6 +306,21 @@ impl super::LspAdapter for CLspAdapter {
filter_range,
})
}
+
+ async fn initialization_options(
+ self: Arc<Self>,
+ _: &Arc<dyn LspAdapterDelegate>,
+ ) -> Result<Option<serde_json::Value>> {
+ if self.use_cpp {
+ Ok(None)
+ } else {
+ Ok(Some(json!({
+ "configSettings": {
+ "clangd.arguments": ["-std=c++17"]
+ }
+ })))
+ }
+ }
}
async fn get_cached_server_binary(container_dir: PathBuf) -> Option<LanguageServerBinary> {
diff --git a/crates/languages/src/lib.rs b/crates/languages/src/lib.rs
index a499444c44..0e15192737 100644
--- a/crates/languages/src/lib.rs
+++ b/crates/languages/src/lib.rs
@@ -103,8 +103,11 @@ pub fn init(
};
}
language!("bash", Vec::new(), bash_task_context());
- language!("c", vec![Arc::new(c::CLspAdapter) as Arc<dyn LspAdapter>]);
- language!("cpp", vec![Arc::new(c::CLspAdapter)]);
+ language!(
+ "c",
+ vec![Arc::new(c::ClangdArapter::new(false)) as Arc<dyn LspAdapter>]
+ );
+ language!("cpp", vec![Arc::new(c::ClangdArapter::new(true))]);
language!(
"css",
vec![Arc::new(css::CssLspAdapter::new(node_runtime.clone())),]https://clang.llvm.org/extra/doxygen/structclang_1_1clangd_1_1InitializationOptions.html seems like a good start for this
Alternatively, instead of providing the initialization options, maybe one could go and alter binary arguments (seems that clangd prefers this way?) similar to https://zed.dev/docs/languages/cpp#arguments
One caveat here would be to understand how to apply the "use C" arguments so that it does not override custom user arguments + finding the right incarnation for the command arguments. Feels that we could use the "use C" approach when the argument list is empty, otherwise allow the user to have his overrides.
Enapiuz
Check for existing issues
Describe the bug / provide steps to reproduce it
When writing a C program, if you try to use a function that has an equivalent C++ header, and use code actions to try to auto-import the corresponding C header, it will import the C++ version instead.
Ex: instead of importing
errno.h, it will importcerrnoEnvironment
Zed: v0.147.2 (Zed) OS: Linux Wayland arch unknown Memory: 14.9 GiB Architecture: x86_64 GPU: AMD Radeon 610M (RADV RAPHAEL_MENDOCINO) || radv || Mesa 24.1.5-arch1.2
If applicable, add mockups / screenshots to help explain present your vision of the feature
No response
If applicable, attach your Zed.log file to this issue.
Zed.log