matching brace

2 files changed, 26 insertions, 0 deletions

diff --git a/code/package.json b/code/package.json
index 8563ba73c..fd3b8e423 100644
--- a/code/package.json
+++ b/code/package.json
@@ -36,6 +36,11 @@
       {
         "command": "libsyntax-rust.extendSelection",
         "title": "Rust Extend Selection"
+      },
+      {
+        "command": "libsyntax-rust.matchingBrace",
+        "key": "ctrl+shift+m",
+        "title": "Rust Matching Brace"
       }
     ],
     "keybindings": [
diff --git a/code/src/extension.ts b/code/src/extension.ts
index bb724539d..afcbccf63 100644
--- a/code/src/extension.ts
+++ b/code/src/extension.ts
@@ -35,6 +35,22 @@ export function activate(context: vscode.ExtensionContext) {
             return new vscode.Selection(r.start, r.end)
         })
     })
+    registerCommand('libsyntax-rust.matchingBrace', async () => {
+        let editor = vscode.window.activeTextEditor
+        if (editor == null || editor.document.languageId != "rust") return
+        let request: FindMatchingBraceParams = {
+            textDocument: { uri: editor.document.uri.toString() },
+            offsets: editor.selections.map((s) => {
+                return client.code2ProtocolConverter.asPosition(s.active)
+             })
+        }
+        let response = await client.sendRequest<lc.Position[]>("m/findMatchingBrace", request)
+        editor.selections = editor.selections.map((sel, idx) => {
+            let active = client.protocol2CodeConverter.asPosition(response[idx])
+            let anchor = sel.isEmpty ? active : sel.anchor
+            return new vscode.Selection(anchor, active)
+        })
+    })
 
     dispose(vscode.workspace.registerTextDocumentContentProvider(
         'libsyntax-rust',
@@ -184,6 +200,11 @@ interface ExtendSelectionResult {
     selections: lc.Range[];
 }
 
+interface FindMatchingBraceParams {
+    textDocument: lc.TextDocumentIdentifier;
+    offsets: lc.Position[];
+}
+
 interface PublishDecorationsParams {
     uri: string,
     decorations: Decoration[],