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

When determining Python task context, do not consider worktree-less files as an error (#27183)

Browse source 
Makes Python plugin to output


![image](https://github.com/user-attachments/assets/4960bc48-21b7-4392-82b9-18bfd1dd9cd0)

for standalone Python files now, instead of nothing as now.

Before the change, no task context was created for the standalone file
due to `VariableName::RelativeFile` lookup considered as an error.
Now, Zed continues and constructs whatever possible context instead.

That `pytest` task seems odd, as the logic fixed here needs a relative
path (hence, a worktree) to consider unit tests.
We do not have variables at the moment the associated tasks are queried
for:


14920ab910/crates/languages/src/python.rs (L359-L363)


14920ab910/crates/languages/src/python.rs (L417-L446)

so we cannot filter this the same way the PR does.
Maybe, we can use a `VariableName::RelativeFile` instead of
`VariableName::File` there?

Release Notes:

- Show tasks from Python plugin for standalone files
This commit is contained in:
Kirill Bulatov 2025-03-20 14:44:07 +02:00 • committed by GitHub
parent 23e8519057
commit 5bef32f3ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

51
crates/languages/src/python.rs
View file

@ -328,14 +328,9 @@ impl ContextProvider for PythonContextProvider {
toolchains: Arc<dyn LanguageToolchainStore>,
cx: &mut gpui::App,
) -> Task<Result<task::TaskVariables>> {
let test_target = {
let test_runner = selected_test_runner(location.buffer.read(cx).file(), cx);
let runner = match test_runner {
TestRunner::UNITTEST => self.build_unittest_target(variables),
TestRunner::PYTEST => self.build_pytest_target(variables),
};
runner
let test_target = match selected_test_runner(location.buffer.read(cx).file(), cx) {
TestRunner::UNITTEST => self.build_unittest_target(variables),
TestRunner::PYTEST => self.build_pytest_target(variables),
};
let worktree_id = location.buffer.read(cx).file().map(|f| f.worktree_id(cx));
@ -352,7 +347,9 @@ impl ContextProvider for PythonContextProvider {
String::from("python3")
};
let toolchain = (PYTHON_ACTIVE_TOOLCHAIN_PATH, active_toolchain);
Ok(task::TaskVariables::from_iter([test_target?, toolchain]))
Ok(task::TaskVariables::from_iter(
test_target.into_iter().chain([toolchain]),
))
})
}
@ -464,10 +461,9 @@ impl PythonContextProvider {
fn build_unittest_target(
&self,
variables: &task::TaskVariables,
) -> Result<(VariableName, String)> {
let python_module_name = python_module_name_from_relative_path(
variables.get(&VariableName::RelativeFile).unwrap_or(""),
);
) -> Option<(VariableName, String)> {
let python_module_name =
python_module_name_from_relative_path(variables.get(&VariableName::RelativeFile)?);
let unittest_class_name =
variables.get(&VariableName::Custom(Cow::Borrowed("_unittest_class_name")));
@ -478,28 +474,25 @@ impl PythonContextProvider {
let unittest_target_str = match (unittest_class_name, unittest_method_name) {
(Some(class_name), Some(method_name)) => {
format!("{}.{}.{}", python_module_name, class_name, method_name)
format!("{python_module_name}.{class_name}.{method_name}")
}
(Some(class_name), None) => format!("{}.{}", python_module_name, class_name),
(Some(class_name), None) => format!("{python_module_name}.{class_name}"),
(None, None) => python_module_name,
(None, Some(_)) => return Ok((VariableName::Custom(Cow::Borrowed("")), String::new())), // should never happen, a TestCase class is the unit of testing
// should never happen, a TestCase class is the unit of testing
(None, Some(_)) => return None,
};
let unittest_target = (
Some((
PYTHON_TEST_TARGET_TASK_VARIABLE.clone(),
unittest_target_str,
);
Ok(unittest_target)
))
}
fn build_pytest_target(
&self,
variables: &task::TaskVariables,
) -> Result<(VariableName, String)> {
let file_path = variables
.get(&VariableName::RelativeFile)
.ok_or_else(|| anyhow!("No file path given"))?;
) -> Option<(VariableName, String)> {
let file_path = variables.get(&VariableName::RelativeFile)?;
let pytest_class_name =
variables.get(&VariableName::Custom(Cow::Borrowed("_pytest_class_name")));
@ -509,20 +502,18 @@ impl PythonContextProvider {
let pytest_target_str = match (pytest_class_name, pytest_method_name) {
(Some(class_name), Some(method_name)) => {
format!("{}::{}::{}", file_path, class_name, method_name)
format!("{file_path}::{class_name}::{method_name}")
}
(Some(class_name), None) => {
format!("{}::{}", file_path, class_name)
format!("{file_path}::{class_name}")
}
(None, Some(method_name)) => {
format!("{}::{}", file_path, method_name)
format!("{file_path}::{method_name}")
}
(None, None) => file_path.to_string(),
};
let pytest_target = (PYTHON_TEST_TARGET_TASK_VARIABLE.clone(), pytest_target_str);
Ok(pytest_target)
Some((PYTHON_TEST_TARGET_TASK_VARIABLE.clone(), pytest_target_str))
}
}