Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix most warnings

Browse source
This commit is contained in:
Isaac Clayton 2022-07-06 20:08:18 +02:00
parent d009e10a46
commit 39fdbc593b
7 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/editor/src/editor.rs
View file

@ -6233,7 +6233,7 @@ mod tests {
platform::{WindowBounds, WindowOptions}, platform::{WindowBounds, WindowOptions},
}; };
use indoc::indoc; use indoc::indoc;
use language::{FakeLspAdapter, FakeLspAdapterInner, LanguageConfig}; use language::{FakeLspAdapterInner, LanguageConfig};
use lsp::FakeLanguageServer; use lsp::FakeLanguageServer;
use project::FakeFs; use project::FakeFs;
use settings::LanguageSettings; use settings::LanguageSettings;

4
crates/editor/src/test.rs
View file

@ -9,9 +9,7 @@ use indoc::indoc;
use collections::BTreeMap; use collections::BTreeMap;
use gpui::{json, keymap::Keystroke, AppContext, ModelHandle, ViewContext, ViewHandle}; use gpui::{json, keymap::Keystroke, AppContext, ModelHandle, ViewContext, ViewHandle};
use language::{ use language::{point_to_lsp, FakeLspAdapterInner, Language, LanguageConfig, Selection};
point_to_lsp, FakeLspAdapter, FakeLspAdapterInner, Language, LanguageConfig, Selection,
};
use project::Project; use project::Project;
use settings::Settings; use settings::Settings;
use util::{ use util::{

7
crates/project/src/project.rs
View file

@ -1771,13 +1771,11 @@ impl Project {
))?, ))?,
} }
cx.subscribe(buffer, |this, buffer, event, cx| { cx.subscribe(buffer, |this, buffer, event, cx| {
// TODO(isaac): should this be done in the background?
this.on_buffer_event(buffer, event, cx); this.on_buffer_event(buffer, event, cx);
}) })
.detach(); .detach();
self.assign_language_to_buffer(buffer, cx); self.assign_language_to_buffer(buffer, cx);
// TODO(isaac): should this be done in the background
self.register_buffer_with_language_server(buffer, cx); self.register_buffer_with_language_server(buffer, cx);
cx.observe_release(buffer, |this, buffer, cx| { cx.observe_release(buffer, |this, buffer, cx| {
if let Some(file) = File::from_dyn(buffer.file()) { if let Some(file) = File::from_dyn(buffer.file()) {
@ -2091,9 +2089,10 @@ impl Project {
move |params, mut cx| { move |params, mut cx| {
if let Some(this) = this.upgrade(&cx) { if let Some(this) = this.upgrade(&cx) {
this.update(&mut cx, |this, 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, server_id, params, &adapter, cx,
) ))
}); });
} }
} }

2
crates/zed/src/languages/json.rs
View file

@ -3,7 +3,7 @@ use anyhow::{anyhow, Context, Result};
use async_trait::async_trait; use async_trait::async_trait;
use client::http::HttpClient; use client::http::HttpClient;
use futures::StreamExt; use futures::StreamExt;
use language::{LanguageServerName, LspAdapter, LspAdapterTrait}; use language::{LanguageServerName, LspAdapterTrait};
use serde_json::json; use serde_json::json;
use smol::fs; use smol::fs;
use std::{any::Any, path::PathBuf, sync::Arc}; use std::{any::Any, path::PathBuf, sync::Arc};

11
crates/zed/src/languages/language_plugin.rs
View file

@ -2,9 +2,8 @@ use anyhow::{anyhow, Result};
use async_trait::async_trait; use async_trait::async_trait;
use client::http::HttpClient; use client::http::HttpClient;
use futures::lock::Mutex; use futures::lock::Mutex;
use futures::Future;
use gpui::executor::Background; use gpui::executor::Background;
use language::{LanguageServerName, LspAdapter, LspAdapterTrait}; use language::{LanguageServerName, LspAdapterTrait};
use plugin_runtime::{Plugin, PluginBuilder, WasiFn}; use plugin_runtime::{Plugin, PluginBuilder, WasiFn};
use std::{any::Any, path::PathBuf, sync::Arc}; use std::{any::Any, path::PathBuf, sync::Arc};
use util::ResultExt; use util::ResultExt;
@ -55,10 +54,10 @@ impl PluginLspAdapter {
} }
} }
struct Versions { // struct Versions {
language_version: String, // language_version: String,
server_version: String, // server_version: String,
} // }
// TODO: is this the root cause? // TODO: is this the root cause?
// sketch: // sketch:

2
crates/zed/src/languages/python.rs
View file

@ -3,7 +3,7 @@ use anyhow::{anyhow, Context, Result};
use async_trait::async_trait; use async_trait::async_trait;
use client::http::HttpClient; use client::http::HttpClient;
use futures::StreamExt; use futures::StreamExt;
use language::{LanguageServerName, LspAdapter, LspAdapterTrait}; use language::{LanguageServerName, LspAdapterTrait};
use smol::fs; use smol::fs;
use std::{any::Any, path::PathBuf, sync::Arc}; use std::{any::Any, path::PathBuf, sync::Arc};
use util::ResultExt; use util::ResultExt;

2
crates/zed/src/languages/typescript.rs
View file

@ -3,7 +3,7 @@ use anyhow::{anyhow, Context, Result};
use async_trait::async_trait; use async_trait::async_trait;
use client::http::HttpClient; use client::http::HttpClient;
use futures::StreamExt; use futures::StreamExt;
use language::{LanguageServerName, LspAdapter, LspAdapterTrait}; use language::{LanguageServerName, LspAdapterTrait};
use serde_json::json; use serde_json::json;
use smol::fs; use smol::fs;
use std::{any::Any, path::PathBuf, sync::Arc}; use std::{any::Any, path::PathBuf, sync::Arc};