diff options
Diffstat (limited to 'cli/lsp/sources.rs')
-rw-r--r-- | cli/lsp/sources.rs | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/cli/lsp/sources.rs b/cli/lsp/sources.rs index 37f8b6bce..1b7d6f3fa 100644 --- a/cli/lsp/sources.rs +++ b/cli/lsp/sources.rs @@ -19,6 +19,7 @@ use crate::text_encoding; use deno_core::error::anyhow; use deno_core::error::AnyError; +use deno_core::parking_lot::Mutex; use deno_core::serde_json; use deno_core::ModuleSpecifier; use deno_runtime::permissions::Permissions; @@ -27,7 +28,6 @@ use std::fs; use std::path::Path; use std::path::PathBuf; use std::sync::Arc; -use std::sync::Mutex; use std::time::SystemTime; use tsc::NavigationTree; @@ -174,57 +174,57 @@ impl Sources { } pub fn contains_key(&self, specifier: &ModuleSpecifier) -> bool { - self.0.lock().unwrap().contains_key(specifier) + self.0.lock().contains_key(specifier) } pub fn get_line_index( &self, specifier: &ModuleSpecifier, ) -> Option<LineIndex> { - self.0.lock().unwrap().get_line_index(specifier) + self.0.lock().get_line_index(specifier) } pub fn get_maybe_types( &self, specifier: &ModuleSpecifier, ) -> Option<analysis::ResolvedDependency> { - self.0.lock().unwrap().get_maybe_types(specifier) + self.0.lock().get_maybe_types(specifier) } pub fn get_maybe_warning( &self, specifier: &ModuleSpecifier, ) -> Option<String> { - self.0.lock().unwrap().get_maybe_warning(specifier) + self.0.lock().get_maybe_warning(specifier) } pub fn get_media_type( &self, specifier: &ModuleSpecifier, ) -> Option<MediaType> { - self.0.lock().unwrap().get_media_type(specifier) + self.0.lock().get_media_type(specifier) } pub fn get_navigation_tree( &self, specifier: &ModuleSpecifier, ) -> Option<tsc::NavigationTree> { - self.0.lock().unwrap().get_navigation_tree(specifier) + self.0.lock().get_navigation_tree(specifier) } pub fn get_script_version( &self, specifier: &ModuleSpecifier, ) -> Option<String> { - self.0.lock().unwrap().get_script_version(specifier) + self.0.lock().get_script_version(specifier) } pub fn get_source(&self, specifier: &ModuleSpecifier) -> Option<String> { - self.0.lock().unwrap().get_source(specifier) + self.0.lock().get_source(specifier) } pub fn len(&self) -> usize { - self.0.lock().unwrap().metadata.len() + self.0.lock().metadata.len() } pub fn resolve_import( @@ -232,11 +232,11 @@ impl Sources { specifier: &str, referrer: &ModuleSpecifier, ) -> Option<(ModuleSpecifier, MediaType)> { - self.0.lock().unwrap().resolve_import(specifier, referrer) + self.0.lock().resolve_import(specifier, referrer) } pub fn specifiers(&self) -> Vec<ModuleSpecifier> { - self.0.lock().unwrap().metadata.keys().cloned().collect() + self.0.lock().metadata.keys().cloned().collect() } pub fn set_navigation_tree( @@ -247,7 +247,6 @@ impl Sources { self .0 .lock() - .unwrap() .set_navigation_tree(specifier, navigation_tree) } } @@ -660,7 +659,7 @@ mod tests { let (sources, _) = setup(); let specifier = resolve_url("foo://a/b/c.ts").expect("could not create specifier"); - let sources = sources.0.lock().unwrap(); + let sources = sources.0.lock(); let mut redirects = sources.redirects.clone(); let http_cache = sources.http_cache.clone(); let actual = resolve_specifier(&specifier, &mut redirects, &http_cache); |