language-servers/tinymist
1
0
Fork 0
mirror of https://github.com/Myriad-Dreamin/tinymist.git synced 2025-08-04 10:18:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix: correct impl WorldProvider::entry for CompileOnceArgs (#1230)

Browse source
This commit is contained in:
Myriad-Dreamin 2025-01-30 00:26:12 +08:00 • committed by GitHub
parent 0451a1089d
commit 8d588c1057
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

43
crates/tinymist-project/src/world.rs
View file

@ -76,40 +76,47 @@ impl WorldProvider for CompileOnceArgs {
}
fn entry(&self) -> Result<EntryOpts> {
let input = self.input.as_ref().context("entry file must be provided")?;
let input = Path::new(&input);
let entry = if input.is_absolute() {
input.to_owned()
} else {
std::env::current_dir().unwrap().join(input)
let mut cwd = None;
let mut cwd = move || {
cwd.get_or_insert_with(|| {
std::env::current_dir().context("failed to get current directory")
})
.clone()
};
let main = {
let input = self.input.as_ref().context("entry file must be provided")?;
let input = Path::new(&input);
if input.is_absolute() {
input.to_owned()
} else {
cwd()?.join(input)
}
};
let root = if let Some(root) = &self.root {
if root.is_absolute() {
root.clone()
} else {
std::env::current_dir().unwrap().join(root)
cwd()?.join(root)
}
} else {
std::env::current_dir().unwrap()
main.parent()
.context("entry file don't have a valid parent as root")?
.to_owned()
};
if !entry.starts_with(&root) {
log::error!("entry file must be in the root directory");
std::process::exit(1);
}
let relative_entry = match entry.strip_prefix(&root) {
Ok(relative_entry) => relative_entry,
let relative_main = match main.strip_prefix(&root) {
Ok(relative_main) => relative_main,
Err(_) => {
log::error!("entry path must be inside the root: {}", entry.display());
std::process::exit(1);
log::error!("entry file must be inside the root, file: {main:?}, root: {root:?}");
bail!("entry file must be inside the root, file: {main:?}, root: {root:?}");
}
};
Ok(EntryOpts::new_rooted(
root.clone(),
Some(relative_entry.to_owned()),
Some(relative_main.to_owned()),
))
}
}