language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-09-28 04:09:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: minor bugs

Browse source
This commit is contained in:
Shunsuke Shibayama 2023-09-10 00:40:52 +09:00
parent abb025afd4
commit 6f036dca5c
4 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/erg_common/python_util.rs
View file

@ -858,14 +858,20 @@ pub fn _eval_pyc<S: Into<String>>(file: S, py_command: Option<&str>) -> String {
String::from_utf8_lossy(&out.stdout).to_string()
}
pub fn exec_py(file: impl AsRef<Path>) -> std::io::Result<ExitStatus> {
pub fn exec_py(file: impl AsRef<Path>, args: &[&str]) -> std::io::Result<ExitStatus> {
let mut child = if cfg!(windows) {
Command::new(which_python())
.arg(file.as_ref())
.args(args)
.spawn()
.expect("cannot execute python")
} else {
let exec_command = format!("{} {}", which_python(), file.as_ref().display());
let exec_command = format!(
"{} {} {}",
which_python(),
file.as_ref().display(),
args.join(" ")
);
Command::new("sh")
.arg("-c")
.arg(exec_command)
@ -955,3 +961,15 @@ pub fn exec_py_code_with_output(
remove_file(tmp_file)?;
res
}
pub fn exec_py_code(code: &str, args: &[&str]) -> std::io::Result<ExitStatus> {
let tmp_dir = temp_dir();
let tmp_file = tmp_dir.join(format!("{}.py", random()));
File::create(&tmp_file)
.unwrap()
.write_all(code.as_bytes())
.unwrap();
let res = exec_py(&tmp_file, args);
remove_file(tmp_file)?;
res
}