diff options
| author | Ryan Dahl <ry@tinyclouds.org> | 2021-02-17 13:47:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-17 13:47:18 -0500 |
| commit | c7dabc99eed50fa20cdcafd7c0175ab615da3d50 (patch) | |
| tree | ec2c611c627827bbdd61d3e27400ae1b9a50d459 /cli/lsp/analysis.rs | |
| parent | f6d6b24506410816833d802e1a8d9cd704f73289 (diff) | |
Make ModuleSpecifier a type alias, not wrapper struct (#9531)
Diffstat (limited to 'cli/lsp/analysis.rs')
| -rw-r--r-- | cli/lsp/analysis.rs | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/cli/lsp/analysis.rs b/cli/lsp/analysis.rs index 1824e5298..8a1c56537 100644 --- a/cli/lsp/analysis.rs +++ b/cli/lsp/analysis.rs @@ -211,7 +211,7 @@ pub fn resolve_import( let specifier = if let Some(remapped) = maybe_mapped { remapped } else { - match ModuleSpecifier::resolve_import(specifier, referrer.as_str()) { + match deno_core::resolve_import(specifier, referrer.as_str()) { Ok(resolved) => resolved, Err(err) => { return ResolvedDependency::Err( @@ -220,8 +220,8 @@ pub fn resolve_import( } } }; - let referrer_scheme = referrer.as_url().scheme(); - let specifier_scheme = specifier.as_url().scheme(); + let referrer_scheme = referrer.scheme(); + let specifier_scheme = specifier.scheme(); if referrer_scheme == "https" && specifier_scheme == "http" { return ResolvedDependency::Err(ResolvedDependencyErr::InvalidDowngrade); } @@ -647,6 +647,7 @@ impl CodeActionCollection { #[cfg(test)] mod tests { use super::*; + use deno_core::resolve_url; #[test] fn test_as_lsp_range() { @@ -680,8 +681,7 @@ mod tests { #[test] fn test_analyze_dependencies() { - let specifier = - ModuleSpecifier::resolve_url("file:///a.ts").expect("bad specifier"); + let specifier = resolve_url("file:///a.ts").expect("bad specifier"); let source = r#"import { Application, Context, @@ -703,14 +703,10 @@ mod tests { Some(Dependency { is_dynamic: false, maybe_code: Some(ResolvedDependency::Resolved( - ModuleSpecifier::resolve_url("https://cdn.skypack.dev/react") - .unwrap() + resolve_url("https://cdn.skypack.dev/react").unwrap() )), maybe_type: Some(ResolvedDependency::Resolved( - ModuleSpecifier::resolve_url( - "https://deno.land/x/types/react/index.d.ts" - ) - .unwrap() + resolve_url("https://deno.land/x/types/react/index.d.ts").unwrap() )), maybe_code_specifier_range: Some(Range { start: Position { @@ -729,8 +725,7 @@ mod tests { Some(Dependency { is_dynamic: false, maybe_code: Some(ResolvedDependency::Resolved( - ModuleSpecifier::resolve_url("https://deno.land/x/oak@v6.3.2/mod.ts") - .unwrap() + resolve_url("https://deno.land/x/oak@v6.3.2/mod.ts").unwrap() )), maybe_type: None, maybe_code_specifier_range: Some(Range { |