diff options
Diffstat (limited to 'editors')
-rw-r--r-- | editors/code/src/commands/apply_source_change.ts | 4 | ||||
-rw-r--r-- | editors/code/src/commands/on_enter.ts | 1 | ||||
-rw-r--r-- | editors/code/src/commands/runnables.ts | 14 | ||||
-rw-r--r-- | editors/code/src/extension.ts | 6 |
4 files changed, 16 insertions, 9 deletions
diff --git a/editors/code/src/commands/apply_source_change.ts b/editors/code/src/commands/apply_source_change.ts index d96ace979..675a534c8 100644 --- a/editors/code/src/commands/apply_source_change.ts +++ b/editors/code/src/commands/apply_source_change.ts | |||
@@ -10,7 +10,9 @@ export interface SourceChange { | |||
10 | } | 10 | } |
11 | 11 | ||
12 | export async function handle(change: SourceChange) { | 12 | export async function handle(change: SourceChange) { |
13 | const wsEdit = Server.client.protocol2CodeConverter.asWorkspaceEdit(change.workspaceEdit); | 13 | const wsEdit = Server.client.protocol2CodeConverter.asWorkspaceEdit( |
14 | change.workspaceEdit | ||
15 | ); | ||
14 | let created; | 16 | let created; |
15 | let moved; | 17 | let moved; |
16 | if (change.workspaceEdit.documentChanges) { | 18 | if (change.workspaceEdit.documentChanges) { |
diff --git a/editors/code/src/commands/on_enter.ts b/editors/code/src/commands/on_enter.ts index 64401b684..bb376e3cb 100644 --- a/editors/code/src/commands/on_enter.ts +++ b/editors/code/src/commands/on_enter.ts | |||
@@ -6,7 +6,6 @@ import { | |||
6 | SourceChange | 6 | SourceChange |
7 | } from './apply_source_change'; | 7 | } from './apply_source_change'; |
8 | 8 | ||
9 | |||
10 | export async function handle(event: { text: string }): Promise<boolean> { | 9 | export async function handle(event: { text: string }): Promise<boolean> { |
11 | const editor = vscode.window.activeTextEditor; | 10 | const editor = vscode.window.activeTextEditor; |
12 | if ( | 11 | if ( |
diff --git a/editors/code/src/commands/runnables.ts b/editors/code/src/commands/runnables.ts index f9a4e2fc9..aa5817c21 100644 --- a/editors/code/src/commands/runnables.ts +++ b/editors/code/src/commands/runnables.ts | |||
@@ -48,7 +48,11 @@ function createTask(spec: Runnable): vscode.Task { | |||
48 | cwd: '.', | 48 | cwd: '.', |
49 | env: definition.env | 49 | env: definition.env |
50 | }; | 50 | }; |
51 | const exec = new vscode.ShellExecution(definition.command, definition.args, execOption); | 51 | const exec = new vscode.ShellExecution( |
52 | definition.command, | ||
53 | definition.args, | ||
54 | execOption | ||
55 | ); | ||
52 | 56 | ||
53 | const f = vscode.workspace.workspaceFolders![0]; | 57 | const f = vscode.workspace.workspaceFolders![0]; |
54 | const t = new vscode.Task( | 58 | const t = new vscode.Task( |
@@ -59,7 +63,7 @@ function createTask(spec: Runnable): vscode.Task { | |||
59 | exec, | 63 | exec, |
60 | ['$rustc'] | 64 | ['$rustc'] |
61 | ); | 65 | ); |
62 | t.presentationOptions.clear = true | 66 | t.presentationOptions.clear = true; |
63 | return t; | 67 | return t; |
64 | } | 68 | } |
65 | 69 | ||
@@ -114,8 +118,8 @@ export async function handleSingle(runnable: Runnable) { | |||
114 | task.group = vscode.TaskGroup.Build; | 118 | task.group = vscode.TaskGroup.Build; |
115 | task.presentationOptions = { | 119 | task.presentationOptions = { |
116 | reveal: vscode.TaskRevealKind.Always, | 120 | reveal: vscode.TaskRevealKind.Always, |
117 | panel: vscode.TaskPanelKind.Dedicated, | 121 | panel: vscode.TaskPanelKind.Dedicated |
118 | }; | 122 | }; |
119 | 123 | ||
120 | return vscode.tasks.executeTask(task); | 124 | return vscode.tasks.executeTask(task); |
121 | } \ No newline at end of file | 125 | } |
diff --git a/editors/code/src/extension.ts b/editors/code/src/extension.ts index 9edfb13b5..0098c9454 100644 --- a/editors/code/src/extension.ts +++ b/editors/code/src/extension.ts | |||
@@ -37,8 +37,10 @@ export function activate(context: vscode.ExtensionContext) { | |||
37 | return await original(...args); | 37 | return await original(...args); |
38 | } | 38 | } |
39 | }); | 39 | }); |
40 | } catch(_) { | 40 | } catch (_) { |
41 | vscode.window.showWarningMessage('Enhanced typing feature is disabled because of incompatibility with VIM extension'); | 41 | vscode.window.showWarningMessage( |
42 | 'Enhanced typing feature is disabled because of incompatibility with VIM extension' | ||
43 | ); | ||
42 | } | 44 | } |
43 | } | 45 | } |
44 | 46 | ||