aboutsummaryrefslogtreecommitdiff
path: root/editors/code/src/commands
diff options
context:
space:
mode:
Diffstat (limited to 'editors/code/src/commands')
-rw-r--r--editors/code/src/commands/index.ts4
-rw-r--r--editors/code/src/commands/on_enter.ts17
2 files changed, 15 insertions, 6 deletions
diff --git a/editors/code/src/commands/index.ts b/editors/code/src/commands/index.ts
index d78a64c3e..33e2b34a2 100644
--- a/editors/code/src/commands/index.ts
+++ b/editors/code/src/commands/index.ts
@@ -2,7 +2,7 @@ import * as applySourceChange from './apply_source_change';
2import * as extendSelection from './extend_selection'; 2import * as extendSelection from './extend_selection';
3import * as joinLines from './join_lines'; 3import * as joinLines from './join_lines';
4import * as matchingBrace from './matching_brace'; 4import * as matchingBrace from './matching_brace';
5import * as on_enter from './on_enter'; 5import * as onEnter from './on_enter';
6import * as parentModule from './parent_module'; 6import * as parentModule from './parent_module';
7import * as runnables from './runnables'; 7import * as runnables from './runnables';
8import * as syntaxTree from './syntaxTree'; 8import * as syntaxTree from './syntaxTree';
@@ -15,5 +15,5 @@ export {
15 parentModule, 15 parentModule,
16 runnables, 16 runnables,
17 syntaxTree, 17 syntaxTree,
18 on_enter, 18 onEnter
19}; 19};
diff --git a/editors/code/src/commands/on_enter.ts b/editors/code/src/commands/on_enter.ts
index 2666797fe..fe6aca63d 100644
--- a/editors/code/src/commands/on_enter.ts
+++ b/editors/code/src/commands/on_enter.ts
@@ -1,7 +1,10 @@
1import * as vscode from 'vscode'; 1import * as vscode from 'vscode';
2import * as lc from 'vscode-languageclient'; 2import * as lc from 'vscode-languageclient';
3import { Server } from '../server'; 3import { Server } from '../server';
4import { handle as applySourceChange, SourceChange } from './apply_source_change'; 4import {
5 handle as applySourceChange,
6 SourceChange
7} from './apply_source_change';
5 8
6interface OnEnterParams { 9interface OnEnterParams {
7 textDocument: lc.TextDocumentIdentifier; 10 textDocument: lc.TextDocumentIdentifier;
@@ -10,12 +13,18 @@ interface OnEnterParams {
10 13
11export async function handle(event: { text: string }): Promise<boolean> { 14export async function handle(event: { text: string }): Promise<boolean> {
12 const editor = vscode.window.activeTextEditor; 15 const editor = vscode.window.activeTextEditor;
13 if (editor == null || editor.document.languageId !== 'rust' || event.text !== '\n') { 16 if (
17 editor == null ||
18 editor.document.languageId !== 'rust' ||
19 event.text !== '\n'
20 ) {
14 return false; 21 return false;
15 } 22 }
16 const request: OnEnterParams = { 23 const request: OnEnterParams = {
17 textDocument: { uri: editor.document.uri.toString() }, 24 textDocument: { uri: editor.document.uri.toString() },
18 position: Server.client.code2ProtocolConverter.asPosition(editor.selection.active), 25 position: Server.client.code2ProtocolConverter.asPosition(
26 editor.selection.active
27 )
19 }; 28 };
20 const change = await Server.client.sendRequest<undefined | SourceChange>( 29 const change = await Server.client.sendRequest<undefined | SourceChange>(
21 'm/onEnter', 30 'm/onEnter',
@@ -25,5 +34,5 @@ export async function handle(event: { text: string }): Promise<boolean> {
25 return false; 34 return false;
26 } 35 }
27 await applySourceChange(change); 36 await applySourceChange(change);
28 return true 37 return true;
29} 38}