Fix most warnings

Isaac Clayton created 3 years ago

Change summary

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(-)

Detailed changes

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;

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::{

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,
-                                            )
+                                            ))
                                         });
                                     }
                                 }

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};

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:

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;

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};