Merge #2709

2709: Work around synchrnonisation issue r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 4 insertions, 3 deletions

diff --git a/editors/code/src/commands/join_lines.ts b/editors/code/src/commands/join_lines.ts
index f4f902cf9..7b08c3255 100644
--- a/editors/code/src/commands/join_lines.ts
+++ b/editors/code/src/commands/join_lines.ts
@@ -6,13 +6,14 @@ import { applySourceChange, SourceChange } from '../source_change';
 export function joinLines(ctx: Ctx): Cmd {
     return async () => {
         const editor = ctx.activeRustEditor;
-        if (!editor) return;
+        const client = ctx.client;
+        if (!editor || !client) return;
 
         const request: JoinLinesParams = {
-            range: ctx.client.code2ProtocolConverter.asRange(editor.selection),
+            range: client.code2ProtocolConverter.asRange(editor.selection),
             textDocument: { uri: editor.document.uri.toString() },
         };
-        const change = await ctx.client.sendRequest<SourceChange>(
+        const change = await client.sendRequest<SourceChange>(
             'rust-analyzer/joinLines',
             request,
         );