diff options
| author | bors <bors@rust-lang.org> | 2022-11-29 07:42:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-11-29 07:42:35 +0000 |
| commit | 3769cc35fa3fc28f6d6d5ecb40ba72bb16f63e0c (patch) | |
| tree | 3a9c85d4e39d6665b3e59f114a7f691b2847749f | |
| parent | 6d61be8e65ac0fd45eaf178e1f7a1ec6b582de1f (diff) | |
| parent | 9914d30450ffbd64c2acbfa44d22add033df2a5a (diff) | |
| download | rust-3769cc35fa3fc28f6d6d5ecb40ba72bb16f63e0c.tar.gz rust-3769cc35fa3fc28f6d6d5ecb40ba72bb16f63e0c.zip | |
Auto merge of #13686 - MariaSolOs:test-lenses, r=Veykril
Don't show runnable code lenses in libraries outside of the workspace Addresses #13664. For now I'm just disabling runnable code lenses since the ones that display the number of references and implementations do work correctly with external code. Also made a tiny TypeScript change to use the typed `sendNotification` overload.
| -rw-r--r-- | crates/rust-analyzer/src/to_proto.rs | 5 | ||||
| -rw-r--r-- | editors/code/src/main.ts | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs index 81cc1952ba5..d1f805af1d4 100644 --- a/crates/rust-analyzer/src/to_proto.rs +++ b/crates/rust-analyzer/src/to_proto.rs @@ -1164,7 +1164,10 @@ pub(crate) fn code_lens( let r = runnable(snap, run)?; let lens_config = snap.config.lens(); - if lens_config.run && client_commands_config.run_single { + if lens_config.run + && client_commands_config.run_single + && r.args.workspace_root.is_some() + { let command = command::run_single(&r, &title); acc.push(lsp_types::CodeLens { range: annotation_range, diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts index 25f1e83d109..01a1a2db7fd 100644 --- a/editors/code/src/main.ts +++ b/editors/code/src/main.ts @@ -79,7 +79,7 @@ async function activateServer(ctx: Ctx): Promise<RustAnalyzerExtensionApi> { ); vscode.workspace.onDidChangeConfiguration( async (_) => { - await ctx.client?.sendNotification("workspace/didChangeConfiguration", { + await ctx.client?.sendNotification(lc.DidChangeConfigurationNotification.type, { settings: "", }); }, |