Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Log unhandled notifications in LanguageServer

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
This commit is contained in:
Antonio Scandurra 2021-10-25 19:46:33 +02:00
parent 580bad2042
commit 2d6d10f920
1 changed files with 35 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

44
crates/lsp/src/lib.rs
View file

@ -3,7 +3,7 @@ use gpui::{executor, AppContext, Task};
use parking_lot::{Mutex, RwLock}; use parking_lot::{Mutex, RwLock};
use postage::{barrier, oneshot, prelude::Stream, sink::Sink}; use postage::{barrier, oneshot, prelude::Stream, sink::Sink};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json::{json, value::RawValue}; use serde_json::{json, value::RawValue, Value};
use smol::{ use smol::{
channel, channel,
io::{AsyncBufReadExt, AsyncReadExt, AsyncWriteExt, BufReader}, io::{AsyncBufReadExt, AsyncReadExt, AsyncWriteExt, BufReader},
@ -13,6 +13,7 @@ use std::{
collections::HashMap, collections::HashMap,
future::Future, future::Future,
io::Write, io::Write,
str::FromStr,
sync::{ sync::{
atomic::{AtomicUsize, Ordering::SeqCst}, atomic::{AtomicUsize, Ordering::SeqCst},
Arc, Arc,
@ -135,6 +136,15 @@ impl LanguageServer {
{ {
if let Some(handler) = notification_handlers.read().get(method) { if let Some(handler) = notification_handlers.read().get(method) {
handler(params.get()); handler(params.get());
} else {
log::info!(
"unhandled notification {}:\n{}",
method,
serde_json::to_string_pretty(
&Value::from_str(params.get()).unwrap()
)
.unwrap()
);
} }
} else if let Ok(Response { id, error, result }) = } else if let Ok(Response { id, error, result }) =
serde_json::from_slice(&buffer) serde_json::from_slice(&buffer)
@ -347,6 +357,12 @@ mod tests {
#[gpui::test] #[gpui::test]
async fn test_basic(cx: TestAppContext) { async fn test_basic(cx: TestAppContext) {
let lib_source = r#"
fn fun() {
let hello = "world";
}
"#
.unindent();
let root_dir = temp_tree(json!({ let root_dir = temp_tree(json!({
"Cargo.toml": r#" "Cargo.toml": r#"
[package] [package]
@ -355,23 +371,33 @@ mod tests {
edition = "2018" edition = "2018"
"#.unindent(), "#.unindent(),
"src": { "src": {
"lib.rs": r#" "lib.rs": &lib_source
fn fun() {
let hello = "world";
}
"#.unindent()
} }
})); }));
let lib_file_uri =
lsp_types::Url::from_file_path(root_dir.path().join("src/lib.rs")).unwrap();
let server = cx.read(|cx| LanguageServer::rust(root_dir.path(), cx).unwrap()); let server = cx.read(|cx| LanguageServer::rust(root_dir.path(), cx).unwrap());
server.next_idle_notification().await; server.next_idle_notification().await;
server
.notify::<lsp_types::notification::DidOpenTextDocument>(
lsp_types::DidOpenTextDocumentParams {
text_document: lsp_types::TextDocumentItem::new(
lib_file_uri.clone(),
"rust".to_string(),
0,
lib_source,
),
},
)
.await
.unwrap();
let hover = server let hover = server
.request::<lsp_types::request::HoverRequest>(lsp_types::HoverParams { .request::<lsp_types::request::HoverRequest>(lsp_types::HoverParams {
text_document_position_params: lsp_types::TextDocumentPositionParams { text_document_position_params: lsp_types::TextDocumentPositionParams {
text_document: lsp_types::TextDocumentIdentifier::new( text_document: lsp_types::TextDocumentIdentifier::new(lib_file_uri),
lsp_types::Url::from_file_path(root_dir.path().join("src/lib.rs")).unwrap(),
),
position: lsp_types::Position::new(1, 21), position: lsp_types::Position::new(1, 21),
}, },
work_done_progress_params: Default::default(), work_done_progress_params: Default::default(),