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

Finish getting multiple diagnostics sources building and running

Browse source
This commit is contained in:
Julia 2023-04-19 15:28:09 -04:00 • committed by Max Brunsfeld
parent bb4de47b15
commit 6156dbced0
8 changed files with 34 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/zed/src/languages.rs
View file

@ -90,7 +90,7 @@ pub fn init(
"tsx",
tree_sitter_typescript::language_tsx(),
vec![
// adapter_arc(typescript::TypeScriptLspAdapter::new(node_runtime.clone())),
adapter_arc(typescript::TypeScriptLspAdapter::new(node_runtime.clone())),
adapter_arc(typescript::EsLintLspAdapter::new(node_runtime.clone())),
],
),
@ -98,7 +98,7 @@ pub fn init(
"typescript",
tree_sitter_typescript::language_typescript(),
vec![
// adapter_arc(typescript::TypeScriptLspAdapter::new(node_runtime.clone())),
adapter_arc(typescript::TypeScriptLspAdapter::new(node_runtime.clone())),
adapter_arc(typescript::EsLintLspAdapter::new(node_runtime.clone())),
],
),
@ -106,7 +106,7 @@ pub fn init(
"javascript",
tree_sitter_typescript::language_tsx(),
vec![
// adapter_arc(typescript::TypeScriptLspAdapter::new(node_runtime.clone())),
adapter_arc(typescript::TypeScriptLspAdapter::new(node_runtime.clone())),
adapter_arc(typescript::EsLintLspAdapter::new(node_runtime.clone())),
],
),

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

@ -73,7 +73,6 @@ impl LspAdapter for TypeScriptLspAdapter {
_: Arc<dyn HttpClient>,
container_dir: PathBuf,
) -> Result<LanguageServerBinary> {
dbg!();
let versions = versions.downcast::<TypeScriptVersions>().unwrap();
let server_path = container_dir.join(Self::NEW_SERVER_PATH);
@ -99,7 +98,6 @@ impl LspAdapter for TypeScriptLspAdapter {
}
async fn cached_server_binary(&self, container_dir: PathBuf) -> Option<LanguageServerBinary> {
dbg!();
(|| async move {
let old_server_path = container_dir.join(Self::OLD_SERVER_PATH);
let new_server_path = container_dir.join(Self::NEW_SERVER_PATH);