From 960a2bc589a7f88ce28e1ee5cb63bfccb04870de Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 19 Apr 2023 18:13:50 -0700 Subject: [PATCH] Don't use ESLint for now --- crates/zed/src/languages.rs | 21 +++++++++------------ crates/zed/src/languages/typescript.rs | 9 +-------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs index 4d9e0ae36a..9ab6e1d778 100644 --- a/crates/zed/src/languages.rs +++ b/crates/zed/src/languages.rs @@ -89,26 +89,23 @@ pub fn init( ( "tsx", tree_sitter_typescript::language_tsx(), - vec![ - adapter_arc(typescript::TypeScriptLspAdapter::new(node_runtime.clone())), - adapter_arc(typescript::EsLintLspAdapter::new(node_runtime.clone())), - ], + vec![adapter_arc(typescript::TypeScriptLspAdapter::new( + node_runtime.clone(), + ))], ), ( "typescript", tree_sitter_typescript::language_typescript(), - vec![ - adapter_arc(typescript::TypeScriptLspAdapter::new(node_runtime.clone())), - adapter_arc(typescript::EsLintLspAdapter::new(node_runtime.clone())), - ], + vec![adapter_arc(typescript::TypeScriptLspAdapter::new( + node_runtime.clone(), + ))], ), ( "javascript", tree_sitter_typescript::language_tsx(), - vec![ - adapter_arc(typescript::TypeScriptLspAdapter::new(node_runtime.clone())), - // adapter_arc(typescript::EsLintLspAdapter::new(node_runtime.clone())), - ], + vec![adapter_arc(typescript::TypeScriptLspAdapter::new( + node_runtime.clone(), + ))], ), ( "html", diff --git a/crates/zed/src/languages/typescript.rs b/crates/zed/src/languages/typescript.rs index b422e99926..bfd6c11a27 100644 --- a/crates/zed/src/languages/typescript.rs +++ b/crates/zed/src/languages/typescript.rs @@ -175,19 +175,12 @@ impl EsLintLspAdapter { const SERVER_PATH: &'static str = "node_modules/vscode-langservers-extracted/lib/eslint-language-server/eslintServer.js"; + #[allow(unused)] pub fn new(node: Arc) -> Self { EsLintLspAdapter { node } } } -// "workspaceFolder": { -// "name": "testing_ts", -// "uri": "file:///Users/julia/Stuff/testing_ts" -// }, -// "workingDirectory": "file:///Users/julia/Stuff/testing_ts", -// "nodePath": "/opt/homebrew/opt/node@18/bin/node", -// "experimental": {}, - #[async_trait] impl LspAdapter for EsLintLspAdapter { fn workspace_configuration(&self, _: &mut AppContext) -> Option> {