From 0a54f3bf0552c0f530a6d4990cc480c80ecc911e Mon Sep 17 00:00:00 2001 From: Vulpesx Date: Fri, 9 Aug 2024 20:34:50 +1000 Subject: [PATCH 1/8] removed unecissary css config --- src/languages/css/mod.rs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/languages/css/mod.rs b/src/languages/css/mod.rs index c16cd5f..48f9af2 100644 --- a/src/languages/css/mod.rs +++ b/src/languages/css/mod.rs @@ -13,14 +13,6 @@ pub fn add_css(helix_lang_conf: &PathBuf, npm_folder: &PathBuf) { let output_err = output.wait_with_output().unwrap(); if output_err.status.success() { println!("Instalación de `npm install -g vscode-langservers-extracted`"); - - let config_to_add = r#" -[[language]] -name = "css" -language-servers = [ "vscode-css-language-server"]"#; - if let Err(err) = read(helix_lang_conf, config_to_add) { - eprintln!("Error al leer el archivo: {err}"); - } } else { let stderr = String::from_utf8_lossy(&output_err.stdout); eprintln!("Error al ejecutar el comando:\n{stderr}"); From 28fe7238757d14b1e6c8045199df0999de405541 Mon Sep 17 00:00:00 2001 From: Vulpesx Date: Fri, 9 Aug 2024 20:36:44 +1000 Subject: [PATCH 2/8] remove unecissary go config --- src/languages/go/mod.rs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/languages/go/mod.rs b/src/languages/go/mod.rs index 94ac2f2..cb1a1c3 100644 --- a/src/languages/go/mod.rs +++ b/src/languages/go/mod.rs @@ -11,13 +11,6 @@ pub fn add_go(helix_lang_conf: &PathBuf) { if output.status.success() { println!("Instalación de 'go install golang.org/x/tools/gopls@latest' completa"); - - let config_to_add = r#" -[languages.go] -language-server = { command = "gopls" }"#; - if let Err(err) = read(helix_lang_conf, config_to_add) { - eprintln!("Error al leer el archivo: {err}"); - } } else { let stderr = String::from_utf8_lossy(&output.stderr); eprintln!("Error al ejecutar el comando:\n{stderr}") From effcc9a1373336d9b2770a66832261eefff973bb Mon Sep 17 00:00:00 2001 From: Vulpesx Date: Fri, 9 Aug 2024 20:38:34 +1000 Subject: [PATCH 3/8] removed unecissary javascript config --- src/languages/javascript/mod.rs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/languages/javascript/mod.rs b/src/languages/javascript/mod.rs index 6c18c6b..c49a50f 100644 --- a/src/languages/javascript/mod.rs +++ b/src/languages/javascript/mod.rs @@ -14,13 +14,6 @@ pub fn add_javascript(helix_lang_conf: &PathBuf, npm_folder: &PathBuf) { let output_err = output.wait_with_output().unwrap(); if output_err.status.success() { println!("Instalación de `npm install -g typescript typescript-language-server` completa"); - - let config_to_add = r#" -[languages.javascript] -language-server = { command = "typescript-language-server", args = "--stdio" }"#; - if let Err(err) = read(helix_lang_conf, config_to_add) { - eprintln!("Error al leer el archivo: {err}"); - } } else { let stderr = String::from_utf8_lossy(&output_err.stdout); eprintln!("Error al ejecutar el comando:\n{stderr}"); From 6ff5a0bc93255f07817f451348f26ea1859a0a64 Mon Sep 17 00:00:00 2001 From: Vulpesx Date: Fri, 9 Aug 2024 21:13:17 +1000 Subject: [PATCH 4/8] removed unecissary json config --- src/languages/json/mod.rs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/languages/json/mod.rs b/src/languages/json/mod.rs index aa1dcc9..3fc6632 100644 --- a/src/languages/json/mod.rs +++ b/src/languages/json/mod.rs @@ -13,13 +13,6 @@ pub fn add_json(helix_lang_conf: &PathBuf, npm_folder: &PathBuf) { let output_err = output.wait_with_output().unwrap(); if output_err.status.success() { println!("Instalación de `npm install -g vscode-langservers-extracted` completa"); - - let config_to_add = r#" -[languages.json] -language-server = { command = "json-languageserver", args = ["--stdio"] }"#; - if let Err(err) = read(helix_lang_conf, config_to_add) { - eprintln!("Error al leer el archivo: {err}"); - } } else { let stderr = String::from_utf8_lossy(&output_err.stdout); eprintln!("Error al ejecutar el comando:\n{stderr}"); From d0a2c960b827bd8bcda5f2df414a85b0d6379afc Mon Sep 17 00:00:00 2001 From: Vulpesx Date: Fri, 9 Aug 2024 21:13:44 +1000 Subject: [PATCH 5/8] removed unecissary python config --- src/languages/python/mod.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/languages/python/mod.rs b/src/languages/python/mod.rs index da1e6dc..0b46bcf 100644 --- a/src/languages/python/mod.rs +++ b/src/languages/python/mod.rs @@ -20,9 +20,6 @@ pub fn add_python(helix_lang_conf: &PathBuf) { exitosa." ); let config_to_add = r#" -[language.python] -language-servers = ['pylsp'] - [language-server.pylsp.config.pylsp] plugins.pyls_mypy.enabled = true plugins.pyls_mypy.live_mode = true"#; From 0c5e621c096840109a7784b438cea9b448864c48 Mon Sep 17 00:00:00 2001 From: Vulpesx Date: Fri, 9 Aug 2024 21:14:14 +1000 Subject: [PATCH 6/8] remove unecissary rust config --- src/languages/rust/mod.rs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/languages/rust/mod.rs b/src/languages/rust/mod.rs index 3b7a8e3..780e37e 100644 --- a/src/languages/rust/mod.rs +++ b/src/languages/rust/mod.rs @@ -18,15 +18,7 @@ pub fn add_rust(helix_lang_conf: &PathBuf) { name = "rust" [language-server.rust-analyzer.config.check] -command = "clippy" -scope = "source.rust" -injection-regex = "rust" -file-types = ["rs"] -roots = ["Cargo.toml", "Cargo.lock"] -auto-format = true -comment-token = "//" -language-server = { command = "rust-analyzer" } -indent = { tab-width = 4, unit = " " }"#; +command = "clippy""#; if let Err(err) = read(helix_lang_conf, config_to_add) { eprintln!("Error al leer el archivo: {err}"); } From 75a55cf004c0273cbde5ec81a9d046e1a17bd815 Mon Sep 17 00:00:00 2001 From: Vulpesx Date: Fri, 9 Aug 2024 21:15:00 +1000 Subject: [PATCH 7/8] removed unecissary typescript config --- src/languages/typescript/mod.rs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/languages/typescript/mod.rs b/src/languages/typescript/mod.rs index 495b1f5..4666570 100644 --- a/src/languages/typescript/mod.rs +++ b/src/languages/typescript/mod.rs @@ -14,15 +14,6 @@ pub fn add_typescript(helix_lang_conf: &PathBuf, npm_folder: &PathBuf) { let output_err = output.wait_with_output().unwrap(); if output_err.status.success() { println!("Instalación de `npm install -g typescript typescript-language-server` completa"); - - let config_to_add = r#" -[languages.typescript] -language-server = [ - { command = "typescript-language-server", args = "--stdio" } -]"#; - if let Err(err) = read(helix_lang_conf, config_to_add) { - eprintln!("Error al leer el archivo: {err}"); - } } else { let stderr = String::from_utf8_lossy(&output_err.stdout); eprintln!("Error al ejecutar el comando:\n{stderr}"); From af4f92386b22bef6489cb5d0879a6c2d9b6e7491 Mon Sep 17 00:00:00 2001 From: Vulpesx Date: Fri, 9 Aug 2024 21:15:27 +1000 Subject: [PATCH 8/8] chore: clippy lints --- src/languages/css/mod.rs | 3 +-- src/languages/go/mod.rs | 4 +--- src/languages/javascript/mod.rs | 3 +-- src/languages/json/mod.rs | 3 +-- src/languages/typescript/mod.rs | 3 +-- src/main.rs | 14 +++++--------- 6 files changed, 10 insertions(+), 20 deletions(-) diff --git a/src/languages/css/mod.rs b/src/languages/css/mod.rs index 48f9af2..5ee0361 100644 --- a/src/languages/css/mod.rs +++ b/src/languages/css/mod.rs @@ -1,8 +1,7 @@ -use crate::utilities::read; use std::path::PathBuf; use std::process::Command; -pub fn add_css(helix_lang_conf: &PathBuf, npm_folder: &PathBuf) { +pub fn add_css(npm_folder: &PathBuf) { let output = Command::new("npm") .arg("install") .arg("-g") diff --git a/src/languages/go/mod.rs b/src/languages/go/mod.rs index cb1a1c3..a3b4285 100644 --- a/src/languages/go/mod.rs +++ b/src/languages/go/mod.rs @@ -1,8 +1,6 @@ -use crate::utilities::read; -use std::path::PathBuf; use std::process::Command; -pub fn add_go(helix_lang_conf: &PathBuf) { +pub fn add_go() { let output = Command::new("go") .arg("install") .arg("golang.org/x/tools/gopls@latest") diff --git a/src/languages/javascript/mod.rs b/src/languages/javascript/mod.rs index c49a50f..cb1ecd2 100644 --- a/src/languages/javascript/mod.rs +++ b/src/languages/javascript/mod.rs @@ -1,8 +1,7 @@ -use crate::utilities::read; use std::path::PathBuf; use std::process::Command; -pub fn add_javascript(helix_lang_conf: &PathBuf, npm_folder: &PathBuf) { +pub fn add_javascript(npm_folder: &PathBuf) { let output = Command::new("npm") .arg("install") .arg("-g") diff --git a/src/languages/json/mod.rs b/src/languages/json/mod.rs index 3fc6632..38caa1c 100644 --- a/src/languages/json/mod.rs +++ b/src/languages/json/mod.rs @@ -1,8 +1,7 @@ -use crate::utilities::read; use std::path::PathBuf; use std::process::Command; -pub fn add_json(helix_lang_conf: &PathBuf, npm_folder: &PathBuf) { +pub fn add_json(npm_folder: &PathBuf) { let output = Command::new("npm") .arg("install") .arg("-g") diff --git a/src/languages/typescript/mod.rs b/src/languages/typescript/mod.rs index 4666570..f6905df 100644 --- a/src/languages/typescript/mod.rs +++ b/src/languages/typescript/mod.rs @@ -1,8 +1,7 @@ -use crate::utilities::read; use std::path::PathBuf; use std::process::Command; -pub fn add_typescript(helix_lang_conf: &PathBuf, npm_folder: &PathBuf) { +pub fn add_typescript(npm_folder: &PathBuf) { let output = Command::new("npm") .arg("install") .arg("-g") diff --git a/src/main.rs b/src/main.rs index 66368ce..1323b23 100644 --- a/src/main.rs +++ b/src/main.rs @@ -94,19 +94,15 @@ fn main() { match args.cmd { Comandos::Install { language } => match language { Language::Rust => languages::rust::add_rust(&args.config), - Language::Typescript => { - languages::typescript::add_typescript(&args.config, &args.npm_folder) - } - Language::Go => languages::go::add_go(&args.config), + Language::Typescript => languages::typescript::add_typescript(&args.npm_folder), + Language::Go => languages::go::add_go(), Language::Python => languages::python::add_python(&args.config), Language::Html => languages::html::add_html(&args.config, &args.npm_folder), - Language::Css => languages::css::add_css(&args.config, &args.npm_folder), - Language::Javascript => { - languages::javascript::add_javascript(&args.config, &args.npm_folder) - } + Language::Css => languages::css::add_css(&args.npm_folder), + Language::Javascript => languages::javascript::add_javascript(&args.npm_folder), Language::Jsx => languages::jsx::add_jsx(&args.config, &args.npm_folder), Language::Tsx => languages::tsx::add_tsx(&args.config, &args.npm_folder), - Language::Json => languages::json::add_json(&args.config, &args.npm_folder), + Language::Json => languages::json::add_json(&args.npm_folder), }, Comandos::Remove { .. } => { println!("Desinstalando... (WIP)")