From 2225e83da2d118678e3df1e2801af195166bc65a Mon Sep 17 00:00:00 2001 From: Kitson Kelly Date: Thu, 18 Feb 2021 15:37:05 +1100 Subject: fix(lsp): handle data URLs properly (#9522) Fixes #9514 Co-authored-by: Ryan Dahl --- cli/tests/lsp/code_lens_request_asset.json | 2 +- cli/tests/lsp/code_lens_resolve_request_asset.json | 12 ++++++------ cli/tests/lsp/definition_request_asset.json | 14 ++++++++++++++ cli/tests/lsp/did_open_notification_asset.json | 2 +- cli/tests/lsp/hover_request_asset.json | 14 ++++++++++++++ cli/tests/lsp/hover_request_asset_01.json | 14 -------------- cli/tests/lsp/hover_request_asset_02.json | 14 -------------- cli/tests/lsp/references_request_asset.json | 17 +++++++++++++++++ cli/tests/lsp/virtual_text_document_request.json | 4 ++-- 9 files changed, 55 insertions(+), 38 deletions(-) create mode 100644 cli/tests/lsp/definition_request_asset.json create mode 100644 cli/tests/lsp/hover_request_asset.json delete mode 100644 cli/tests/lsp/hover_request_asset_01.json delete mode 100644 cli/tests/lsp/hover_request_asset_02.json create mode 100644 cli/tests/lsp/references_request_asset.json (limited to 'cli/tests') diff --git a/cli/tests/lsp/code_lens_request_asset.json b/cli/tests/lsp/code_lens_request_asset.json index b9db86749..6aa246ce5 100644 --- a/cli/tests/lsp/code_lens_request_asset.json +++ b/cli/tests/lsp/code_lens_request_asset.json @@ -4,7 +4,7 @@ "method": "textDocument/codeLens", "params": { "textDocument": { - "uri": "deno:/asset//lib.es2015.symbol.wellknown.d.ts" + "uri": "deno:/asset//lib.deno.shared_globals.d.ts" } } } diff --git a/cli/tests/lsp/code_lens_resolve_request_asset.json b/cli/tests/lsp/code_lens_resolve_request_asset.json index c225a62e2..027af96b6 100644 --- a/cli/tests/lsp/code_lens_resolve_request_asset.json +++ b/cli/tests/lsp/code_lens_resolve_request_asset.json @@ -5,17 +5,17 @@ "params": { "range": { "start": { - "line": 93, - "character": 10 + "line": 416, + "character": 12 }, "end": { - "line": 93, - "character": 15 + "line": 416, + "character": 19 } }, "data": { - "specifier": "asset:///lib.es2015.symbol.wellknown.d.ts", - "source": "implementations" + "specifier": "asset:///lib.deno.shared_globals.d.ts", + "source": "references" } } } diff --git a/cli/tests/lsp/definition_request_asset.json b/cli/tests/lsp/definition_request_asset.json new file mode 100644 index 000000000..5e117cf14 --- /dev/null +++ b/cli/tests/lsp/definition_request_asset.json @@ -0,0 +1,14 @@ +{ + "jsonrpc": "2.0", + "id": 4, + "method": "textDocument/definition", + "params": { + "textDocument": { + "uri": "file:///a/file.ts" + }, + "position": { + "line": 0, + "character": 14 + } + } +} diff --git a/cli/tests/lsp/did_open_notification_asset.json b/cli/tests/lsp/did_open_notification_asset.json index 6288bbc53..413353f29 100644 --- a/cli/tests/lsp/did_open_notification_asset.json +++ b/cli/tests/lsp/did_open_notification_asset.json @@ -6,7 +6,7 @@ "uri": "file:///a/file.ts", "languageId": "typescript", "version": 1, - "text": "console.log(\"hello deno!\");\n" + "text": "console.log(Date.now());\n" } } } diff --git a/cli/tests/lsp/hover_request_asset.json b/cli/tests/lsp/hover_request_asset.json new file mode 100644 index 000000000..2ae96acd5 --- /dev/null +++ b/cli/tests/lsp/hover_request_asset.json @@ -0,0 +1,14 @@ +{ + "jsonrpc": "2.0", + "id": 5, + "method": "textDocument/hover", + "params": { + "textDocument": { + "uri": "deno:/asset//lib.es2015.symbol.wellknown.d.ts" + }, + "position": { + "line": 109, + "character": 13 + } + } +} diff --git a/cli/tests/lsp/hover_request_asset_01.json b/cli/tests/lsp/hover_request_asset_01.json deleted file mode 100644 index fb1c899a3..000000000 --- a/cli/tests/lsp/hover_request_asset_01.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "jsonrpc": "2.0", - "id": 4, - "method": "textDocument/hover", - "params": { - "textDocument": { - "uri": "file:///a/file.ts" - }, - "position": { - "line": 0, - "character": 12 - } - } -} diff --git a/cli/tests/lsp/hover_request_asset_02.json b/cli/tests/lsp/hover_request_asset_02.json deleted file mode 100644 index 30f404709..000000000 --- a/cli/tests/lsp/hover_request_asset_02.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "jsonrpc": "2.0", - "id": 4, - "method": "textDocument/hover", - "params": { - "textDocument": { - "uri": "deno:/asset//lib.es2015.symbol.wellknown.d.ts" - }, - "position": { - "line": 109, - "character": 13 - } - } -} diff --git a/cli/tests/lsp/references_request_asset.json b/cli/tests/lsp/references_request_asset.json new file mode 100644 index 000000000..6c2430e50 --- /dev/null +++ b/cli/tests/lsp/references_request_asset.json @@ -0,0 +1,17 @@ +{ + "jsonrpc": "2.0", + "id": 2, + "method": "textDocument/references", + "params": { + "textDocument": { + "uri": "file:///a/file.ts" + }, + "position": { + "line": 0, + "character": 3 + }, + "context": { + "includeDeclaration": true + } + } +} diff --git a/cli/tests/lsp/virtual_text_document_request.json b/cli/tests/lsp/virtual_text_document_request.json index 08ad7a3ca..6ffab4a35 100644 --- a/cli/tests/lsp/virtual_text_document_request.json +++ b/cli/tests/lsp/virtual_text_document_request.json @@ -1,10 +1,10 @@ { "jsonrpc": "2.0", - "id": 2, + "id": 4, "method": "deno/virtualTextDocument", "params": { "textDocument": { - "uri": "deno:/asset//lib.es2015.symbol.wellknown.d.ts" + "uri": "deno:/asset//lib.deno.shared_globals.d.ts" } } } -- cgit v1.2.3