foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-21 15:04:11 -05:00
Code Issues Packages 1 Wiki Activity

fix(lsp): import-map-remap quickfix for type imports (#26454)

Browse source
This commit is contained in:
Nayeem Rahman 2024-10-21 22:16:39 +01:00 committed by GitHub
parent 49d9c02bfa
commit 9e25a4ebbf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 116 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cli/lsp/diagnostics.rs
View file

@ -1499,7 +1499,11 @@ fn diagnose_dependency(
.data_for_specifier(referrer_doc.file_referrer().unwrap_or(referrer))
.and_then(|d| d.resolver.maybe_import_map());
if let Some(import_map) = import_map {
if let Resolution::Ok(resolved) = &dependency.maybe_code {
let resolved = dependency
.maybe_code
.ok()
.or_else(|| dependency.maybe_type.ok());
if let Some(resolved) = resolved {
if let Some(to) = import_map.lookup(&resolved.specifier, referrer) {
if dependency_key != to {
diagnostics.push(

111
tests/integration/lsp_tests.rs
View file

@ -6777,6 +6777,117 @@ fn lsp_code_actions_imports_dts() {
client.shutdown();
}
#[test]
fn lsp_code_actions_import_map_remap() {
let context = TestContextBuilder::new().use_temp_cwd().build();
let temp_dir = context.temp_dir();
temp_dir.write(
"deno.json",
json!({
"imports": {
"foo": "./foo.ts",
"bar": "./bar.ts",
},
})
.to_string(),
);
temp_dir.write("foo.ts", "");
temp_dir.write("bar.ts", "");
let mut client = context.new_lsp_command().build();
client.initialize_default();
let diagnostics = client.did_open(json!({
"textDocument": {
"uri": temp_dir.url().join("file.ts").unwrap(),
"languageId": "typescript",
"version": 1,
"text": r#"
import "./foo.ts";
import type {} from "./bar.ts";
"#,
}
}));
let res = client.write_request(
"textDocument/codeAction",
json!({
"textDocument": { "uri": temp_dir.url().join("file.ts").unwrap() },
"range": {
"start": { "line": 0, "character": 0 },
"end": { "line": 3, "character": 0 },
},
"context": {
"diagnostics": diagnostics.all(),
"only": ["quickfix"],
},
}),
);
assert_eq!(
res,
json!([
{
"title": "Update \"./foo.ts\" to \"foo\" to use import map.",
"kind": "quickfix",
"diagnostics": [
{
"range": {
"start": { "line": 1, "character": 15 },
"end": { "line": 1, "character": 25 },
},
"severity": 4,
"code": "import-map-remap",
"source": "deno",
"message": "The import specifier can be remapped to \"foo\" which will resolve it via the active import map.",
"data": { "from": "./foo.ts", "to": "foo" },
},
],
"edit": {
"changes": {
temp_dir.url().join("file.ts").unwrap(): [
{
"range": {
"start": { "line": 1, "character": 15 },
"end": { "line": 1, "character": 25 },
},
"newText": "\"foo\"",
},
],
},
},
},
{
"title": "Update \"./bar.ts\" to \"bar\" to use import map.",
"kind": "quickfix",
"diagnostics": [
{
"range": {
"start": { "line": 2, "character": 28 },
"end": { "line": 2, "character": 38 },
},
"severity": 4,
"code": "import-map-remap",
"source": "deno",
"message": "The import specifier can be remapped to \"bar\" which will resolve it via the active import map.",
"data": { "from": "./bar.ts", "to": "bar" },
},
],
"edit": {
"changes": {
temp_dir.url().join("file.ts").unwrap(): [
{
"range": {
"start": { "line": 2, "character": 28 },
"end": { "line": 2, "character": 38 },
},
"newText": "\"bar\"",
},
],
},
},
},
]),
);
client.shutdown();
}
#[test]
fn lsp_code_actions_refactor() {
let context = TestContextBuilder::new().use_temp_cwd().build();