language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-08-04 02:48:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Make ModuleSpecifier a type alias, not wrapper struct (#9531)

Browse source
This commit is contained in:
Ryan Dahl 2021-02-17 13:47:18 -05:00 • committed by GitHub
parent f6d6b24506
commit c7dabc99ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 599 additions and 806 deletions
Download patch file Download diff file Expand all files Collapse all files

21
cli/lsp/analysis.rs
View file

@ -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 {