From 17eef195a93532b71a5831966e47e6cc7b6f15ad Mon Sep 17 00:00:00 2001 From: Olof Blomqvist Date: Fri, 4 Aug 2023 19:45:50 +0200 Subject: [PATCH] fix diagnostics and formatting on windows vscode --- crates/aiken-lsp/src/server.rs | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/crates/aiken-lsp/src/server.rs b/crates/aiken-lsp/src/server.rs index d760eb29..a414b512 100644 --- a/crates/aiken-lsp/src/server.rs +++ b/crates/aiken-lsp/src/server.rs @@ -163,7 +163,21 @@ impl Server { aiken_lang::format::pretty(&mut new_text, module, extra, src); } 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| { aiken_project::error::Error::from_parse_errors(errs, Path::new(path), &src) @@ -620,6 +634,10 @@ impl Server { data: None, }; + #[cfg(target_os = "windows")] + let path = path; + + #[cfg(not(target_os = "windows"))] let path = path.canonicalize()?; self.push_diagnostic(path.clone(), lsp_diagnostic.clone());