Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LS: Properly handle client notifications in E2E tests #5531

Merged
merged 1 commit into from
May 9, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ use lsp_types::{lsp_notification, lsp_request};
use serde_json::Value;
use tokio::time::error::Elapsed;
use tokio::time::timeout;
use tower_lsp::jsonrpc::Id;
use tower_lsp::{lsp_types, ClientSocket, LanguageServer, LspService};
use tower_service::Service;

Expand Down Expand Up @@ -165,12 +164,12 @@ impl MockClient {
self.output.recv().await.unwrap_or_else(|_| panic!("timeout: {message:?}"))
{
match response_message {
Message::Request(res) if res.id().is_none() => {
// This looks like a notification, skip it.
}
Message::Request(req) => {
panic!("unexpected request: {:?}", req)
}
Message::Response(res) if res.id() == &Id::Null => {
// This looks like a notification, skip it.
}
Message::Response(res) => {
let (res_id, result) = res.into_parts();
assert_eq!(res_id, id);
Expand Down
Loading