From ce3d78335d5db2643e05caf91041f9e92577ecc3 Mon Sep 17 00:00:00 2001 From: Edwin Cheng Date: Sun, 7 Apr 2019 18:26:02 +0800 Subject: Remove checking file exists --- crates/ra_lsp_server/src/server_world.rs | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'crates/ra_lsp_server') diff --git a/crates/ra_lsp_server/src/server_world.rs b/crates/ra_lsp_server/src/server_world.rs index 6fe0d39df..4b1d592bb 100644 --- a/crates/ra_lsp_server/src/server_world.rs +++ b/crates/ra_lsp_server/src/server_world.rs @@ -11,7 +11,7 @@ use ra_ide_api::{ use ra_vfs::{Vfs, VfsChange, VfsFile, VfsRoot}; use relative_path::RelativePathBuf; use parking_lot::RwLock; -use failure::format_err; +use failure::{Error, format_err}; use gen_lsp_server::ErrorCode; use crate::{ @@ -155,18 +155,11 @@ impl ServerWorld { pub fn uri_to_file_id(&self, uri: &Url) -> Result { let path = uri.to_file_path().map_err(|()| format_err!("invalid uri: {}", uri))?; let file = self.vfs.read().path2file(&path).ok_or_else(|| { - // Check whether give path is exists, - // if so, maybe this file is outside out current workspace - if path.exists() { - LspError { - code: ErrorCode::InvalidRequest as i32, - message: "Rust file outside current workspace is not supported yet." - .to_string(), - } - .into() - } else { - format_err!("unknown file: {}", path.display()) - } + // Show warning as this file is outside current workspace + Error::from(LspError { + code: ErrorCode::InvalidRequest as i32, + message: "Rust file outside current workspace is not supported yet.".to_string(), + }) })?; Ok(FileId(file.0.into())) } -- cgit v1.2.3