From 39fdbc593b7a86e80aeb18c668d4a1022c72bda5 Mon Sep 17 00:00:00 2001 From: Isaac Clayton Date: Wed, 6 Jul 2022 20:08:18 +0200 Subject: [PATCH] Fix most warnings --- crates/editor/src/editor.rs | 2 +- crates/editor/src/test.rs | 4 +--- crates/project/src/project.rs | 7 +++---- crates/zed/src/languages/json.rs | 2 +- crates/zed/src/languages/language_plugin.rs | 11 +++++------ crates/zed/src/languages/python.rs | 2 +- crates/zed/src/languages/typescript.rs | 2 +- 7 files changed, 13 insertions(+), 17 deletions(-) diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs index 90f152fc9b9ae6d673fc6ef9445dfdd9aa0b3ba5..a0e1ac8c3df842fa1d90736e6f9315cbcfeb159b 100644 --- a/crates/editor/src/editor.rs +++ b/crates/editor/src/editor.rs @@ -6233,7 +6233,7 @@ mod tests { platform::{WindowBounds, WindowOptions}, }; use indoc::indoc; - use language::{FakeLspAdapter, FakeLspAdapterInner, LanguageConfig}; + use language::{FakeLspAdapterInner, LanguageConfig}; use lsp::FakeLanguageServer; use project::FakeFs; use settings::LanguageSettings; diff --git a/crates/editor/src/test.rs b/crates/editor/src/test.rs index a2efc8724985c04ab02d808db2139deb3f10bfce..0b1190e7c83ac7fba3404f14d13fa1a560b03960 100644 --- a/crates/editor/src/test.rs +++ b/crates/editor/src/test.rs @@ -9,9 +9,7 @@ use indoc::indoc; use collections::BTreeMap; use gpui::{json, keymap::Keystroke, AppContext, ModelHandle, ViewContext, ViewHandle}; -use language::{ - point_to_lsp, FakeLspAdapter, FakeLspAdapterInner, Language, LanguageConfig, Selection, -}; +use language::{point_to_lsp, FakeLspAdapterInner, Language, LanguageConfig, Selection}; use project::Project; use settings::Settings; use util::{ diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs index 7d75da44437ef877086699e8812ddfaf745b8595..9f020e240baf305c33891ca5b94034daf26be684 100644 --- a/crates/project/src/project.rs +++ b/crates/project/src/project.rs @@ -1771,13 +1771,11 @@ impl Project { ))?, } cx.subscribe(buffer, |this, buffer, event, cx| { - // TODO(isaac): should this be done in the background? this.on_buffer_event(buffer, event, cx); }) .detach(); self.assign_language_to_buffer(buffer, cx); - // TODO(isaac): should this be done in the background self.register_buffer_with_language_server(buffer, cx); cx.observe_release(buffer, |this, buffer, cx| { if let Some(file) = File::from_dyn(buffer.file()) { @@ -2091,9 +2089,10 @@ impl Project { move |params, mut cx| { if let Some(this) = this.upgrade(&cx) { this.update(&mut cx, |this, cx| { - this.on_lsp_diagnostics_published( + // TODO(isaac): remove block on + smol::block_on(this.on_lsp_diagnostics_published( server_id, params, &adapter, cx, - ) + )) }); } } diff --git a/crates/zed/src/languages/json.rs b/crates/zed/src/languages/json.rs index 28294d26e15982d6bbdc3285caecd1b5840c9a3c..ab6f03a06f2cd1a7aabda27566f2ffbde0031cee 100644 --- a/crates/zed/src/languages/json.rs +++ b/crates/zed/src/languages/json.rs @@ -3,7 +3,7 @@ use anyhow::{anyhow, Context, Result}; use async_trait::async_trait; use client::http::HttpClient; use futures::StreamExt; -use language::{LanguageServerName, LspAdapter, LspAdapterTrait}; +use language::{LanguageServerName, LspAdapterTrait}; use serde_json::json; use smol::fs; use std::{any::Any, path::PathBuf, sync::Arc}; diff --git a/crates/zed/src/languages/language_plugin.rs b/crates/zed/src/languages/language_plugin.rs index 4dfe7478abb38456ba22a345195651157629ecc5..6c07fc7042a1a3aa22d1e803a972e4add27c7b86 100644 --- a/crates/zed/src/languages/language_plugin.rs +++ b/crates/zed/src/languages/language_plugin.rs @@ -2,9 +2,8 @@ use anyhow::{anyhow, Result}; use async_trait::async_trait; use client::http::HttpClient; use futures::lock::Mutex; -use futures::Future; use gpui::executor::Background; -use language::{LanguageServerName, LspAdapter, LspAdapterTrait}; +use language::{LanguageServerName, LspAdapterTrait}; use plugin_runtime::{Plugin, PluginBuilder, WasiFn}; use std::{any::Any, path::PathBuf, sync::Arc}; use util::ResultExt; @@ -55,10 +54,10 @@ impl PluginLspAdapter { } } -struct Versions { - language_version: String, - server_version: String, -} +// struct Versions { +// language_version: String, +// server_version: String, +// } // TODO: is this the root cause? // sketch: diff --git a/crates/zed/src/languages/python.rs b/crates/zed/src/languages/python.rs index c5508ac3379f9558b64ce0a04e8967b2bb49622a..00b8ec8e0828ff863db58214548eba58dd836203 100644 --- a/crates/zed/src/languages/python.rs +++ b/crates/zed/src/languages/python.rs @@ -3,7 +3,7 @@ use anyhow::{anyhow, Context, Result}; use async_trait::async_trait; use client::http::HttpClient; use futures::StreamExt; -use language::{LanguageServerName, LspAdapter, LspAdapterTrait}; +use language::{LanguageServerName, LspAdapterTrait}; use smol::fs; use std::{any::Any, path::PathBuf, sync::Arc}; use util::ResultExt; diff --git a/crates/zed/src/languages/typescript.rs b/crates/zed/src/languages/typescript.rs index 8f262d4e7080c5091b8e9142d287b7270bb92f16..786e00f248b6f4c33116ad589a1a9792cbaf5a16 100644 --- a/crates/zed/src/languages/typescript.rs +++ b/crates/zed/src/languages/typescript.rs @@ -3,7 +3,7 @@ use anyhow::{anyhow, Context, Result}; use async_trait::async_trait; use client::http::HttpClient; use futures::StreamExt; -use language::{LanguageServerName, LspAdapter, LspAdapterTrait}; +use language::{LanguageServerName, LspAdapterTrait}; use serde_json::json; use smol::fs; use std::{any::Any, path::PathBuf, sync::Arc};