diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-05-24 15:05:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-24 15:05:20 +0000 |
| commit | fbb8b884a2dbc3ced720c84f4604466e223f6d69 (patch) | |
| tree | 358370ac7f84396ad19ce004097497bfcbae9d18 /editors/code | |
| parent | d959c913eaeae36b9e04c7b5ee8b341f6c5b678b (diff) | |
| parent | 5276bfff819520cd27703b5d33a95d9674649e1e (diff) | |
| download | rust-fbb8b884a2dbc3ced720c84f4604466e223f6d69.tar.gz rust-fbb8b884a2dbc3ced720c84f4604466e223f6d69.zip | |
Merge #4593
4593: Document some rust-analyzer specific protocol extensions r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Diffstat (limited to 'editors/code')
| -rw-r--r-- | editors/code/src/commands/matching_brace.ts | 4 | ||||
| -rw-r--r-- | editors/code/src/rust-analyzer-api.ts | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/editors/code/src/commands/matching_brace.ts b/editors/code/src/commands/matching_brace.ts index a60776e2d4d..9c418b887c2 100644 --- a/editors/code/src/commands/matching_brace.ts +++ b/editors/code/src/commands/matching_brace.ts @@ -9,9 +9,9 @@ export function matchingBrace(ctx: Ctx): Cmd { const client = ctx.client; if (!editor || !client) return; - const response = await client.sendRequest(ra.findMatchingBrace, { + const response = await client.sendRequest(ra.matchingBrace, { textDocument: { uri: editor.document.uri.toString() }, - offsets: editor.selections.map(s => + positions: editor.selections.map(s => client.code2ProtocolConverter.asPosition(s.active), ), }); diff --git a/editors/code/src/rust-analyzer-api.ts b/editors/code/src/rust-analyzer-api.ts index 73f36432f64..900c5cd5bce 100644 --- a/editors/code/src/rust-analyzer-api.ts +++ b/editors/code/src/rust-analyzer-api.ts @@ -40,12 +40,11 @@ export interface ExpandedMacro { export const expandMacro = request<ExpandMacroParams, Option<ExpandedMacro>>("expandMacro"); -export interface FindMatchingBraceParams { +export interface MatchingBraceParams { textDocument: lc.TextDocumentIdentifier; - offsets: Vec<lc.Position>; + positions: lc.Position[]; } -export const findMatchingBrace = request<FindMatchingBraceParams, Vec<lc.Position>>("findMatchingBrace"); - +export const matchingBrace = new lc.RequestType<MatchingBraceParams, lc.Position[], unknown>('experimental/matchingBrace'); export interface PublishDecorationsParams { uri: string; |
