Skip to content

Absolutize typeshed path #1741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
connernilsen wants to merge 1 commit into from
Closed

Absolutize typeshed path #1741

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions crates/pyrefly_config/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,6 +1133,9 @@ impl ConfigFile {
if let Some(import_root) = &self.import_root {
self.import_root = Some(import_root.absolutize_from(config_root));
}
if let Some(typeshed_path) = &self.typeshed_path {
self.typeshed_path = Some(typeshed_path.absolutize_from(config_root));
}
self.python_environment
.site_package_path
.iter_mut()
Expand Down Expand Up @@ -1600,6 +1603,7 @@ mod tests {
fn with_sep(s: &str) -> String {
s.replace("/", path::MAIN_SEPARATOR_STR)
}
let typeshed = "path/to/typeshed";
let mut python_environment = PythonEnvironment {
site_package_path: Some(vec![PathBuf::from("venv/lib/python1.2.3/site-packages")]),
..PythonEnvironment::default()
Expand Down Expand Up @@ -1634,7 +1638,7 @@ mod tests {
settings: Default::default(),
}],
ignore_missing_source: false,
typeshed_path: None,
typeshed_path: Some(PathBuf::from(typeshed)),
skip_lsp_config_indexing: false,
};

Expand All @@ -1653,6 +1657,7 @@ mod tests {
.into_owned(),
];
let search_path = vec![test_path.parent().unwrap().parent().unwrap().to_path_buf()];
let expected_typeshed = test_path.join(typeshed);
python_environment.site_package_path =
Some(vec![test_path.join("venv/lib/python1.2.3/site-packages")]);

Expand Down Expand Up @@ -1692,7 +1697,7 @@ mod tests {
settings: Default::default(),
}],
ignore_missing_source: false,
typeshed_path: None,
typeshed_path: Some(expected_typeshed),
skip_lsp_config_indexing: false,
};
assert_eq!(config, expected_config);
Expand Down