language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 06:11:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move matching brace to new Ctx

Browse source
This commit is contained in:
Aleksey Kladov 2019-12-30 15:20:13 +01:00
parent 57df9bed70
commit 5dd9edaeaf
4 changed files with 35 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

53
editors/code/src/commands/matching_brace.ts
View file

@ -1,34 +1,33 @@
import * as vscode from 'vscode';
import { Position, TextDocumentIdentifier } from 'vscode-languageclient';
import { Server } from '../server';
import { Ctx, Cmd } from '../ctx';
export function matchingBrace(ctx: Ctx): Cmd {
return async () => {
const editor = ctx.activeRustEditor;
if (!editor) {
return;
}
const request: FindMatchingBraceParams = {
textDocument: { uri: editor.document.uri.toString() },
offsets: editor.selections.map(s => ctx.client.code2ProtocolConverter.asPosition(s.active)),
};
const response = await ctx.client.sendRequest<Position[]>(
'rust-analyzer/findMatchingBrace',
request,
);
editor.selections = editor.selections.map((sel, idx) => {
const active = ctx.client.protocol2CodeConverter.asPosition(
response[idx],
);
const anchor = sel.isEmpty ? active : sel.anchor;
return new vscode.Selection(anchor, active);
});
editor.revealRange(editor.selection);
}
}
interface FindMatchingBraceParams {
textDocument: TextDocumentIdentifier;
offsets: Position[];
}
export async function handle() {
const editor = vscode.window.activeTextEditor;
if (editor == null || editor.document.languageId !== 'rust') {
return;
}
const request: FindMatchingBraceParams = {
textDocument: { uri: editor.document.uri.toString() },
offsets: editor.selections.map(s => {
return Server.client.code2ProtocolConverter.asPosition(s.active);
}),
};
const response = await Server.client.sendRequest<Position[]>(
'rust-analyzer/findMatchingBrace',
request,
);
editor.selections = editor.selections.map((sel, idx) => {
const active = Server.client.protocol2CodeConverter.asPosition(
response[idx],
);
const anchor = sel.isEmpty ? active : sel.anchor;
return new vscode.Selection(anchor, active);
});
editor.revealRange(editor.selection);
}