Merge #2710

2710: Fix NPEs r=matklad a=matklad



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

1 files changed, 6 insertions, 6 deletions

diff --git a/editors/code/src/commands/matching_brace.ts b/editors/code/src/commands/matching_brace.ts
index 59c253f88..7c58bb7e7 100644
--- a/editors/code/src/commands/matching_brace.ts
+++ b/editors/code/src/commands/matching_brace.ts
@@ -6,21 +6,21 @@ import { Ctx, Cmd } from '../ctx';
 export function matchingBrace(ctx: Ctx): Cmd {
     return async () => {
         const editor = ctx.activeRustEditor;
-        if (!editor) {
-            return;
-        }
+        const client = ctx.client;
+        if (!editor || !client) return;
+
         const request: FindMatchingBraceParams = {
             textDocument: { uri: editor.document.uri.toString() },
             offsets: editor.selections.map(s =>
-                ctx.client.code2ProtocolConverter.asPosition(s.active),
+                client.code2ProtocolConverter.asPosition(s.active),
             ),
         };
-        const response = await ctx.client.sendRequest<lc.Position[]>(
+        const response = await client.sendRequest<lc.Position[]>(
             'rust-analyzer/findMatchingBrace',
             request,
         );
         editor.selections = editor.selections.map((sel, idx) => {
-            const active = ctx.client.protocol2CodeConverter.asPosition(
+            const active = client.protocol2CodeConverter.asPosition(
                 response[idx],
             );
             const anchor = sel.isEmpty ? active : sel.anchor;