From f5ea35a2710c78e77c81f491cc6f8abd40e33981 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 25 Jun 2020 17:50:47 +0200
Subject: Add NotificationDispatcher
---
crates/rust-analyzer/src/dispatch.rs | 39 ++++++++++++
crates/rust-analyzer/src/lsp_utils.rs | 13 +---
crates/rust-analyzer/src/main_loop.rs | 114 +++++++++++++---------------------
3 files changed, 85 insertions(+), 81 deletions(-)
(limited to 'crates')
diff --git a/crates/rust-analyzer/src/dispatch.rs b/crates/rust-analyzer/src/dispatch.rs
index 0a9b0428d..5fdbed8ef 100644
--- a/crates/rust-analyzer/src/dispatch.rs
+++ b/crates/rust-analyzer/src/dispatch.rs
@@ -1,3 +1,4 @@
+//! A visitor for downcasting arbitrary request (JSON) into a specific type.
use std::{panic, time::Instant};
use serde::{de::DeserializeOwned, Serialize};
@@ -135,3 +136,41 @@ where
};
Task::Respond(response)
}
+
+pub(crate) struct NotificationDispatcher<'a> {
+ pub(crate) not: Option<lsp_server::Notification>,
+ pub(crate) global_state: &'a mut GlobalState,
+}
+
+impl<'a> NotificationDispatcher<'a> {
+ pub(crate) fn on<N>(
+ &mut self,
+ f: fn(&mut GlobalState, N::Params) -> Result<()>,
+ ) -> Result<&mut Self>
+ where
+ N: lsp_types::notification::Notification + 'static,
+ N::Params: DeserializeOwned + Send + 'static,
+ {
+ let not = match self.not.take() {
+ Some(it) => it,
+ None => return Ok(self),
+ };
+ let params = match not.extract::<N::Params>(N::METHOD) {
+ Ok(it) => it,
+ Err(not) => {
+ self.not = Some(not);
+ return Ok(self);
+ }
+ };
+ f(self.global_state, params)?;
+ Ok(self)
+ }
+
+ pub(crate) fn finish(&mut self) {
+ if let Some(not) = &self.not {
+ if !not.method.starts_with("$/") {
+ log::error!("unhandled notification: {:?}", not);
+ }
+ }
+ }
+}
diff --git a/crates/rust-analyzer/src/lsp_utils.rs b/crates/rust-analyzer/src/lsp_utils.rs
index 14adb8ae7..35917030c 100644
--- a/crates/rust-analyzer/src/lsp_utils.rs
+++ b/crates/rust-analyzer/src/lsp_utils.rs
@@ -1,12 +1,13 @@
//! Utilities for LSP-related boilerplate code.
use std::{error::Error, ops::Range};
-use crate::from_proto;
use crossbeam_channel::Sender;
use lsp_server::{Message, Notification};
use ra_db::Canceled;
use ra_ide::LineIndex;
-use serde::{de::DeserializeOwned, Serialize};
+use serde::Serialize;
+
+use crate::from_proto;
pub fn show_message(
typ: lsp_types::MessageType,
@@ -29,14 +30,6 @@ pub(crate) fn notification_is<N: lsp_types::notification::Notification>(
notification.method == N::METHOD
}
-pub(crate) fn notification_cast<N>(notification: Notification) -> Result<N::Params, Notification>
-where
- N: lsp_types::notification::Notification,
- N::Params: DeserializeOwned,
-{
- notification.extract(N::METHOD)
-}
-
pub(crate) fn notification_new<N>(params: N::Params) -> Notification
where
N: lsp_types::notification::Notification,
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
index ebc232736..c2f43df1d 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs
@@ -6,8 +6,8 @@ use std::{
};
use crossbeam_channel::{never, select, Receiver};
-use lsp_server::{Connection, Notification, Request, RequestId, Response};
-use lsp_types::{notification::Notification as _, request::Request as _, NumberOrString};
+use lsp_server::{Connection, Notification, Request, Response};
+use lsp_types::{notification::Notification as _, request::Request as _};
use ra_db::VfsPath;
use ra_ide::{Canceled, FileId};
use ra_prof::profile;
@@ -16,13 +16,12 @@ use ra_project_model::{PackageRoot, ProjectWorkspace};
use crate::{
config::{Config, FilesWatcher, LinkedProject},
diagnostics::DiagnosticTask,
- dispatch::RequestDispatcher,
+ dispatch::{NotificationDispatcher, RequestDispatcher},
from_proto,
global_state::{file_id_to_url, GlobalState, Status},
handlers, lsp_ext,
lsp_utils::{
- apply_document_changes, is_canceled, notification_cast, notification_is, notification_new,
- show_message,
+ apply_document_changes, is_canceled, notification_is, notification_new, show_message,
},
request_metrics::RequestMetrics,
Result,
@@ -240,9 +239,7 @@ impl GlobalState {
}
fn on_request(&mut self, request_received: Instant, req: Request) -> Result<()> {
- let mut pool_dispatcher =
- RequestDispatcher { req: Some(req), global_state: self, request_received };
- pool_dispatcher
+ RequestDispatcher { req: Some(req), global_state: self, request_received }
.on_sync::<lsp_ext::CollectGarbage>(|s, ()| Ok(s.collect_garbage()))?
.on_sync::<lsp_ext::JoinLines>(|s, p| handlers::handle_join_lines(s.snapshot(), p))?
.on_sync::<lsp_ext::OnEnter>(|s, p| handlers::handle_on_enter(s.snapshot(), p))?
@@ -298,56 +295,47 @@ impl GlobalState {
Ok(())
}
fn on_notification(&mut self, not: Notification) -> Result<()> {
- let not = match notification_cast::<lsp_types::notification::Cancel>(not) {
- Ok(params) => {
- let id: RequestId = match params.id {
- NumberOrString::Number(id) => id.into(),
- NumberOrString::String(id) => id.into(),
+ NotificationDispatcher { not: Some(not), global_state: self }
+ .on::<lsp_types::notification::Cancel>(|this, params| {
+ let id: lsp_server::RequestId = match params.id {
+ lsp_types::NumberOrString::Number(id) => id.into(),
+ lsp_types::NumberOrString::String(id) => id.into(),
};
- if let Some(response) = self.req_queue.incoming.cancel(id) {
- self.send(response.into())
+ if let Some(response) = this.req_queue.incoming.cancel(id) {
+ this.send(response.into());
}
- return Ok(());
- }
- Err(not) => not,
- };
- let not = match notification_cast::<lsp_types::notification::DidOpenTextDocument>(not) {
- Ok(params) => {
+ Ok(())
+ })?
+ .on::<lsp_types::notification::DidOpenTextDocument>(|this, params| {
if let Ok(path) = from_proto::vfs_path(¶ms.text_document.uri) {
- if !self.mem_docs.insert(path.clone()) {
+ if !this.mem_docs.insert(path.clone()) {
log::error!("duplicate DidOpenTextDocument: {}", path)
}
- self.vfs
+ this.vfs
.write()
.0
.set_file_contents(path, Some(params.text_document.text.into_bytes()));
}
- return Ok(());
- }
- Err(not) => not,
- };
- let not = match notification_cast::<lsp_types::notification::DidChangeTextDocument>(not) {
- Ok(params) => {
+ Ok(())
+ })?
+ .on::<lsp_types::notification::DidChangeTextDocument>(|this, params| {
if let Ok(path) = from_proto::vfs_path(¶ms.text_document.uri) {
- assert!(self.mem_docs.contains(&path));
- let vfs = &mut self.vfs.write().0;
+ assert!(this.mem_docs.contains(&path));
+ let vfs = &mut this.vfs.write().0;
let file_id = vfs.file_id(&path).unwrap();
let mut text = String::from_utf8(vfs.file_contents(file_id).to_vec()).unwrap();
apply_document_changes(&mut text, params.content_changes);
vfs.set_file_contents(path, Some(text.into_bytes()))
}
- return Ok(());
- }
- Err(not) => not,
- };
- let not = match notification_cast::<lsp_types::notification::DidCloseTextDocument>(not) {
- Ok(params) => {
+ Ok(())
+ })?
+ .on::<lsp_types::notification::DidCloseTextDocument>(|this, params| {
if let Ok(path) = from_proto::vfs_path(¶ms.text_document.uri) {
- if !self.mem_docs.remove(&path) {
+ if !this.mem_docs.remove(&path) {
log::error!("orphan DidCloseTextDocument: {}", path)
}
if let Some(path) = path.as_path() {
- self.loader.invalidate(path.to_path_buf());
+ this.loader.invalidate(path.to_path_buf());
}
}
let params = lsp_types::PublishDiagnosticsParams {
@@ -356,25 +344,19 @@ impl GlobalState {
version: None,
};
let not = notification_new::<lsp_types::notification::PublishDiagnostics>(params);
- self.send(not.into());
- return Ok(());
- }
- Err(not) => not,
- };
- let not = match notification_cast::<lsp_types::notification::DidSaveTextDocument>(not) {
- Ok(_params) => {
- if let Some(flycheck) = &self.flycheck {
+ this.send(not.into());
+ Ok(())
+ })?
+ .on::<lsp_types::notification::DidSaveTextDocument>(|this, _params| {
+ if let Some(flycheck) = &this.flycheck {
flycheck.0.update();
}
- return Ok(());
- }
- Err(not) => not,
- };
- let not = match notification_cast::<lsp_types::notification::DidChangeConfiguration>(not) {
- Ok(_) => {
+ Ok(())
+ })?
+ .on::<lsp_types::notification::DidChangeConfiguration>(|this, _params| {
// As stated in https://github.com/microsoft/language-server-protocol/issues/676,
// this notification's parameters should be ignored and the actual config queried separately.
- let request = self.req_queue.outgoing.register(
+ let request = this.req_queue.outgoing.register(
lsp_types::request::WorkspaceConfiguration::METHOD.to_string(),
lsp_types::ConfigurationParams {
items: vec![lsp_types::ConfigurationItem {
@@ -403,30 +385,21 @@ impl GlobalState {
}
},
);
- self.send(request.into());
+ this.send(request.into());
return Ok(());
- }
- Err(not) => not,
- };
- let not = match notification_cast::<lsp_types::notification::DidChangeWatchedFiles>(not) {
- Ok(params) => {
+ })?
+ .on::<lsp_types::notification::DidChangeWatchedFiles>(|this, params| {
for change in params.changes {
if let Ok(path) = from_proto::abs_path(&change.uri) {
- self.loader.invalidate(path)
+ this.loader.invalidate(path);
}
}
- return Ok(());
- }
- Err(not) => not,
- };
- if not.method.starts_with("$/") {
- return Ok(());
- }
- log::error!("unhandled notification: {:?}", not);
+ Ok(())
+ })?
+ .finish();
Ok(())
}
- // TODO
pub(crate) fn on_task(&mut self, task: Task) {
match task {
Task::Respond(response) => {
@@ -481,7 +454,6 @@ impl GlobalState {
}
}
-// TODO
#[derive(Debug)]
pub(crate) enum Task {
Respond(Response),
--
cgit v1.2.3