waalge
/
aiken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix diagnostics and formatting on windows vscode

This commit is contained in:
Olof Blomqvist 2023-08-04 19:45:50 +02:00 committed by Lucas
parent 266b6bbb7d
commit 17eef195a9
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crates/aiken-lsp/src/server.rs
View File

@ -163,7 +163,21 @@ impl Server {
aiken_lang::format::pretty(&mut new_text, module, extra, src); aiken_lang::format::pretty(&mut new_text, module, extra, src);
} }
None => { None => {
let src = fs::read_to_string(path).map_err(ProjectError::from)?;
let src = {
#[cfg(not(target_os = "windows"))] {
fs::read_to_string(path).map_err(ProjectError::from)?
}
#[cfg(target_os = "windows")] {
let temp = match urlencoding::decode(path) {
Ok(decoded) => decoded.to_string(),
Err(_) => path.to_owned()
};
fs::read_to_string(temp.trim_start_matches("/")).map_err(ProjectError::from)?
}
};
let (module, extra) = parser::module(&src, ModuleKind::Lib).map_err(|errs| { let (module, extra) = parser::module(&src, ModuleKind::Lib).map_err(|errs| {
aiken_project::error::Error::from_parse_errors(errs, Path::new(path), &src) aiken_project::error::Error::from_parse_errors(errs, Path::new(path), &src)
@ -620,6 +634,10 @@ impl Server {
data: None, data: None,
}; };
#[cfg(target_os = "windows")]
let path = path;
#[cfg(not(target_os = "windows"))]
let path = path.canonicalize()?; let path = path.canonicalize()?;
self.push_diagnostic(path.clone(), lsp_diagnostic.clone()); self.push_diagnostic(path.clone(), lsp_diagnostic.clone());