Skip to content

Commit

Permalink
pylsp: Tweak default user settings (#21025)
Browse files Browse the repository at this point in the history
I've also looked into not creating temp dirs in project directories and
succeeded at that for Mypy; no dice for rope though, I'll have to send a
patch to pylsp to fix that.
Closes #20646

Release Notes:

- Python: tweaked default pylsp settings to be less noisy (mypy and
pycodestyle are no longer enabled by default).
  • Loading branch information
osiewicz authored Nov 21, 2024
1 parent 9d95da5 commit 0663bf2
Showing 1 changed file with 15 additions and 12 deletions.
27 changes: 15 additions & 12 deletions crates/languages/src/python.rs
Original file line number Diff line number Diff line change
Expand Up @@ -917,13 +917,17 @@ impl LspAdapter for PyLspAdapter {
.unwrap_or_else(|| {
json!({
"plugins": {
"rope_autoimport": {"enabled": true},
"mypy": {"enabled": true}
}
"pycodestyle": {"enabled": false},
"rope_autoimport": {"enabled": true, "memory": true},
"mypy": {"enabled": false}
},
"rope": {
"ropeFolder": null
},
})
});

// If python.pythonPath is not set in user config, do so using our toolchain picker.
// If user did not explicitly modify their python venv, use one from picker.
if let Some(toolchain) = toolchain {
if user_settings.is_null() {
user_settings = Value::Object(serde_json::Map::default());
Expand All @@ -939,23 +943,22 @@ impl LspAdapter for PyLspAdapter {
.or_insert(Value::Object(serde_json::Map::default()))
.as_object_mut()
{
jedi.insert(
"environment".to_string(),
Value::String(toolchain.path.clone().into()),
);
jedi.entry("environment".to_string())
.or_insert_with(|| Value::String(toolchain.path.clone().into()));
}
if let Some(pylint) = python
.entry("mypy")
.or_insert(Value::Object(serde_json::Map::default()))
.as_object_mut()
{
pylint.insert(
"overrides".to_string(),
pylint.entry("overrides".to_string()).or_insert_with(|| {
Value::Array(vec![
Value::String("--python-executable".into()),
Value::String(toolchain.path.into()),
]),
);
Value::String("--cache-dir=/dev/null".into()),
Value::Bool(true),
])
});
}
}
}
Expand Down

0 comments on commit 0663bf2

Please sign in to comment.