514: npm fix run r=matklad a=kjeremy



Co-authored-by: Jeremy Kolb <kjeremy@gmail.com>
This commit is contained in:
bors[bot] 2019-01-13 07:53:39 +00:00
commit 883f1fc78a
4 changed files with 16 additions and 9 deletions

View File

@ -10,7 +10,9 @@ export interface SourceChange {
}
export async function handle(change: SourceChange) {
const wsEdit = Server.client.protocol2CodeConverter.asWorkspaceEdit(change.workspaceEdit);
const wsEdit = Server.client.protocol2CodeConverter.asWorkspaceEdit(
change.workspaceEdit
);
let created;
let moved;
if (change.workspaceEdit.documentChanges) {

View File

@ -6,7 +6,6 @@ import {
SourceChange
} from './apply_source_change';
export async function handle(event: { text: string }): Promise<boolean> {
const editor = vscode.window.activeTextEditor;
if (

View File

@ -48,7 +48,11 @@ function createTask(spec: Runnable): vscode.Task {
cwd: '.',
env: definition.env
};
const exec = new vscode.ShellExecution(definition.command, definition.args, execOption);
const exec = new vscode.ShellExecution(
definition.command,
definition.args,
execOption
);
const f = vscode.workspace.workspaceFolders![0];
const t = new vscode.Task(
@ -59,7 +63,7 @@ function createTask(spec: Runnable): vscode.Task {
exec,
['$rustc']
);
t.presentationOptions.clear = true
t.presentationOptions.clear = true;
return t;
}
@ -114,8 +118,8 @@ export async function handleSingle(runnable: Runnable) {
task.group = vscode.TaskGroup.Build;
task.presentationOptions = {
reveal: vscode.TaskRevealKind.Always,
panel: vscode.TaskPanelKind.Dedicated,
panel: vscode.TaskPanelKind.Dedicated
};
return vscode.tasks.executeTask(task);
}
}

View File

@ -37,8 +37,10 @@ export function activate(context: vscode.ExtensionContext) {
return await original(...args);
}
});
} catch(_) {
vscode.window.showWarningMessage('Enhanced typing feature is disabled because of incompatibility with VIM extension');
} catch (_) {
vscode.window.showWarningMessage(
'Enhanced typing feature is disabled because of incompatibility with VIM extension'
);
}
}