language-servers/SpacemanDMM
1
0
Fork 0
mirror of https://github.com/SpaceManiac/SpacemanDMM.git synced 2025-12-23 05:36:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid spamming errors on files outside workspace

Browse source
This commit is contained in:
Tad Hardesty 2020-05-23 15:22:32 -07:00
parent 78175f891f
commit 4c8171acec
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/langserver/main.rs
View file

@ -472,15 +472,16 @@ impl<'a> Engine<'a> {
// normal path, when we have a workspace root & an environment loaded
let path = url_to_path(url)?;
let root = url_to_path(root)?;
let stripped = match path.strip_prefix(&root) {
Ok(path) => path,
Err(_) => return Err(invalid_request(format!("outside workspace: {}", url))),
};
let defines = match self.defines {
Some(ref d) => d,
None => return Err(invalid_request("no preprocessor history")),
};
let stripped = match path.strip_prefix(&root) {
Ok(path) => path,
Err(_) => "<outside workspace>".as_ref(),
};
let (real_file_id, mut preprocessor) = match self.context.get_file(&stripped) {
Some(id) => (id, defines.branch_at_file(id, &self.context)),
None => (FileId::default(), defines.branch_at_end(&self.context)),