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

languages: Allow complete override for ESLint settings (#31302)

Browse source 
Closes #17088

This PR allows users to override ESLint settings as they want instead of
depending on a few set of hardcoded keys.

Release Notes:

- Added support for configuring all ESLint server settings instead of
only a limited set of predefined options.
This commit is contained in:
smit 2025-05-24 00:30:35 +05:30 • committed by GitHub
parent 1683e2f144
commit 697c838455
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 45 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

115
crates/languages/src/typescript.rs
View file

@ -20,6 +20,7 @@ use std::{
};
use task::{TaskTemplate, TaskTemplates, VariableName};
use util::archive::extract_zip;
use util::merge_json_value_into;
use util::{ResultExt, fs::remove_matching, maybe};
pub(super) fn typescript_task_context() -> ContextProviderWithTasks {
@ -374,81 +375,55 @@ impl LspAdapter for EsLintLspAdapter {
cx: &mut AsyncApp,
) -> Result<Value> {
let workspace_root = delegate.worktree_root_path();
let eslint_user_settings = cx.update(|cx| {
language_server_settings(delegate.as_ref(), &Self::SERVER_NAME, cx)
.and_then(|s| s.settings.clone())
.unwrap_or_default()
})?;
let mut code_action_on_save = json!({
// We enable this, but without also configuring `code_actions_on_format`
// in the Zed configuration, it doesn't have an effect.
"enable": true,
});
if let Some(code_action_settings) = eslint_user_settings
.get("codeActionOnSave")
.and_then(|settings| settings.as_object())
{
if let Some(enable) = code_action_settings.get("enable") {
code_action_on_save["enable"] = enable.clone();
}
if let Some(mode) = code_action_settings.get("mode") {
code_action_on_save["mode"] = mode.clone();
}
if let Some(rules) = code_action_settings.get("rules") {
code_action_on_save["rules"] = rules.clone();
}
}
let working_directory = eslint_user_settings
.get("workingDirectory")
.cloned()
.unwrap_or_else(|| json!({"mode": "auto"}));
let problems = eslint_user_settings
.get("problems")
.cloned()
.unwrap_or_else(|| json!({}));
let rules_customizations = eslint_user_settings
.get("rulesCustomizations")
.cloned()
.unwrap_or_else(|| json!([]));
let node_path = eslint_user_settings.get("nodePath").unwrap_or(&Value::Null);
let use_flat_config = Self::FLAT_CONFIG_FILE_NAMES
.iter()
.any(|file| workspace_root.join(file).is_file());
let mut default_workspace_configuration = json!({
"validate": "on",
"rulesCustomizations": [],
"run": "onType",
"nodePath": null,
"workingDirectory": {
"mode": "auto"
},
"workspaceFolder": {
"uri": workspace_root,
"name": workspace_root.file_name()
.unwrap_or(workspace_root.as_os_str())
.to_string_lossy(),
},
"problems": {},
"codeActionOnSave": {
// We enable this, but without also configuring code_actions_on_format
// in the Zed configuration, it doesn't have an effect.
"enable": true,
},
"codeAction": {
"disableRuleComment": {
"enable": true,
"location": "separateLine",
},
"showDocumentation": {
"enable": true
}
},
"experimental": {
"useFlatConfig": use_flat_config,
},
});
let override_options = cx.update(|cx| {
language_server_settings(delegate.as_ref(), &Self::SERVER_NAME, cx)
.and_then(|s| s.settings.clone())
})?;
if let Some(override_options) = override_options {
merge_json_value_into(override_options, &mut default_workspace_configuration);
}
Ok(json!({
"": {
"validate": "on",
"rulesCustomizations": rules_customizations,
"run": "onType",
"nodePath": node_path,
"workingDirectory": working_directory,
"workspaceFolder": {
"uri": workspace_root,
"name": workspace_root.file_name()
.unwrap_or(workspace_root.as_os_str()),
},
"problems": problems,
"codeActionOnSave": code_action_on_save,
"codeAction": {
"disableRuleComment": {
"enable": true,
"location": "separateLine",
},
"showDocumentation": {
"enable": true
}
},
"experimental": {
"useFlatConfig": use_flat_config,
},
}
"": default_workspace_configuration
}))
}