mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-26 00:19:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #1747 from zed-industries/fix-clangd-error

Browse source 
Fix error on clangd when `compile-commands.json` is present
This commit is contained in:
Antonio Scandurra 2022-10-13 10:16:10 +01:00 committed by GitHub
commit 26b03afa60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
crates/lsp/src/lsp.rs
View file

@ -56,7 +56,7 @@ pub struct Subscription {
#[derive(Serialize, Deserialize)]
struct Request<'a, T> {
jsonrpc: &'a str,
jsonrpc: &'static str,
id: usize,
method: &'a str,
params: T,
@ -73,6 +73,7 @@ struct AnyResponse<'a> {
#[derive(Serialize)]
struct Response<T> {
jsonrpc: &'static str,
id: usize,
result: Option<T>,
error: Option<Error>,
@ -80,8 +81,7 @@ struct Response<T> {
#[derive(Serialize, Deserialize)]
struct Notification<'a, T> {
#[serde(borrow)]
jsonrpc: &'a str,
jsonrpc: &'static str,
#[serde(borrow)]
method: &'a str,
params: T,
@ -453,11 +453,13 @@ impl LanguageServer {
async move {
let response = match response.await {
Ok(result) => Response {
jsonrpc: JSON_RPC_VERSION,
id,
result: Some(result),
error: None,
},
Err(error) => Response {
jsonrpc: JSON_RPC_VERSION,
id,
result: None,
error: Some(Error {