Prepare gen_lsp_server for publishing

This commit is contained in:
Aleksey Kladov 2018-10-09 12:55:23 +03:00
parent c9798c0e6d
commit 239213a3db
4 changed files with 88 additions and 17 deletions

View file

@ -35,14 +35,14 @@ fn main_inner() -> Result<()> {
let cwd = ::std::env::current_dir()?;
run_server(
ra_lsp_server::server_capabilities(),
receiver,
sender,
|params, r, s| {
let root = params.root_uri
.and_then(|it| it.to_file_path().ok())
.unwrap_or(cwd);
ra_lsp_server::main_loop(false, root, r, s)
},
receiver,
sender,
)?;
info!("shutting down IO...");
threads.join()?;

View file

@ -35,8 +35,8 @@ enum Task {
pub fn main_loop(
internal_mode: bool,
root: PathBuf,
msg_receriver: &mut Receiver<RawMessage>,
msg_sender: &mut Sender<RawMessage>,
msg_receriver: &Receiver<RawMessage>,
msg_sender: &Sender<RawMessage>,
) -> Result<()> {
let pool = rayon::ThreadPoolBuilder::new()
.num_threads(4)
@ -88,8 +88,8 @@ fn main_loop_inner(
internal_mode: bool,
ws_root: PathBuf,
pool: &ThreadPool,
msg_sender: &mut Sender<RawMessage>,
msg_receiver: &mut Receiver<RawMessage>,
msg_sender: &Sender<RawMessage>,
msg_receiver: &Receiver<RawMessage>,
task_sender: Sender<Task>,
task_receiver: Receiver<Task>,
fs_worker: Worker<PathBuf, (PathBuf, Vec<FileEvent>)>,
@ -212,7 +212,7 @@ fn main_loop_inner(
fn on_task(
task: Task,
msg_sender: &mut Sender<RawMessage>,
msg_sender: &Sender<RawMessage>,
pending_requests: &mut HashMap<u64, JobHandle>,
) {
match task {
@ -266,7 +266,7 @@ fn on_request(
}
fn on_notification(
msg_sender: &mut Sender<RawMessage>,
msg_sender: &Sender<RawMessage>,
state: &mut ServerWorldState,
pending_requests: &mut HashMap<u64, JobHandle>,
subs: &mut Subscriptions,