fix(lsp): scope attribution for lazily loaded assets (#26699)

This commit is contained in:
Nayeem Rahman 2024-11-04 20:01:31 +00:00 committed by GitHub
parent d55e30f418
commit d67765b0b4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 50 additions and 6 deletions

View File

@ -801,13 +801,18 @@ delete Object.prototype.__proto__;
if (logDebug) {
debug(`host.getScriptSnapshot("${specifier}")`);
}
const sourceFile = sourceFileCache.get(specifier);
if (sourceFile) {
if (!assetScopes.has(specifier)) {
assetScopes.set(specifier, lastRequestScope);
if (specifier.startsWith(ASSETS_URL_PREFIX)) {
const sourceFile = this.getSourceFile(
specifier,
ts.ScriptTarget.ESNext,
);
if (sourceFile) {
if (!assetScopes.has(specifier)) {
assetScopes.set(specifier, lastRequestScope);
}
// This case only occurs for assets.
return ts.ScriptSnapshot.fromString(sourceFile.text);
}
// This case only occurs for assets.
return ts.ScriptSnapshot.fromString(sourceFile.text);
}
let sourceText = sourceTextCache.get(specifier);
if (sourceText == undefined) {

View File

@ -6396,6 +6396,45 @@ fn lsp_cache_on_save() {
client.shutdown();
}
// Regression test for https://github.com/denoland/deno/issues/25999.
#[test]
fn lsp_asset_document_dom_code_action() {
let context = TestContextBuilder::new().use_temp_cwd().build();
let temp_dir = context.temp_dir();
temp_dir.write(
"deno.json",
json!({
"compilerOptions": {
"lib": ["deno.window", "dom"],
},
})
.to_string(),
);
let mut client = context.new_lsp_command().build();
client.initialize_default();
client.did_open(json!({
"textDocument": {
"uri": temp_dir.url().join("file.ts").unwrap(),
"languageId": "typescript",
"version": 1,
"text": r#""#,
},
}));
let res = client.write_request(
"textDocument/codeAction",
json!({
"textDocument": { "uri": "asset:///lib.dom.d.ts" },
"range": {
"start": { "line": 0, "character": 0 },
"end": { "line": 0, "character": 0 },
},
"context": { "diagnostics": [], "only": ["quickfix"] },
}),
);
assert_eq!(res, json!(null));
client.shutdown();
}
// Regression test for https://github.com/denoland/deno/issues/22122.
#[test]
fn lsp_cache_then_definition() {