Merge pull request #2392 from zed-industries/eslint-multiple-language-server-adapters-rebased

Allow buffers to use multiple language servers
2023-04-20 09:40:23 -07:00
parent ad71020990 21bb13d309
commit b414d43ee3
38 changed files with 1589 additions and 772 deletions
@@ -14,7 +14,7 @@ use language::{
    ToPointUtf16,
 };
 use log::{debug, error};
-use lsp::LanguageServer;
+use lsp::{LanguageServer, LanguageServerId};
 use node_runtime::NodeRuntime;
 use request::{LogMessage, StatusNotification};
 use settings::Settings;
@@ -370,7 +370,7 @@ impl Copilot {
                let node_path = node_runtime.binary_path().await?;
                let arguments: &[OsString] = &[server_path.into(), "--stdio".into()];
                let server = LanguageServer::new(
-                    0,
+                    LanguageServerId(0),
                    &node_path,
                    arguments,
                    Path::new("/"),