foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-01-21 21:50:00 -05:00
Code Issues Packages 1 Wiki Activity

fix(lsp): percent-encode host in deno: specifiers (#20811)

Browse source
This commit is contained in:
Nayeem Rahman 2023-10-06 14:46:43 +01:00 • committed by GitHub
parent f0608a5b91
commit 677a591e56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
cli/lsp/urls.rs
View file

@ -171,16 +171,16 @@ impl LspUrlMap {
extension
)
} else {
let mut path =
specifier[..Position::BeforePath].replacen("://", "/", 1);
let parts: Vec<String> = specifier[Position::BeforePath..]
.split('/')
.map(|p| {
percent_encoding::utf8_percent_encode(p, COMPONENT).to_string()
})
.collect();
path.push_str(&parts.join("/"));
format!("deno:/{path}")
let mut str = String::with_capacity(specifier.as_str().len() + 6);
str.push_str("deno:/");
str.push_str(specifier.scheme());
for p in specifier[Position::BeforeHost..].split('/') {
str.push('/');
str.push_str(
&percent_encoding::utf8_percent_encode(p, COMPONENT).to_string(),
);
}
str
};
let url = LspClientUrl(Url::parse(&specifier_str)?);
inner.put(specifier.clone(), url.clone());
@ -292,6 +292,22 @@ mod tests {
assert_eq!(actual_specifier, fixture);
}
#[test]
fn test_lsp_url_map_host_with_port() {
let map = LspUrlMap::default();
let fixture = resolve_url("http://localhost:8000/mod.ts").unwrap();
let actual_url = map
.normalize_specifier(&fixture)
.expect("could not handle specifier");
let expected_url =
Url::parse("deno:/http/localhost%3A8000/mod.ts").unwrap();
assert_eq!(actual_url.as_url(), &expected_url);
let actual_specifier =
map.normalize_url(actual_url.as_url(), LspUrlKind::File);
assert_eq!(actual_specifier, fixture);
}
#[cfg(windows)]
#[test]
fn test_normalize_windows_path() {