From 4d62cfccbb8281f33b6f894df07e7316a9d45bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adolfo=20Ochagav=C3=ADa?= Date: Sun, 7 Oct 2018 22:59:02 +0200 Subject: Apply tslint suggestions, round one --- editors/code/src/commands/runnables.ts | 76 +++++++++++++++++----------------- 1 file changed, 38 insertions(+), 38 deletions(-) (limited to 'editors/code/src/commands/runnables.ts') diff --git a/editors/code/src/commands/runnables.ts b/editors/code/src/commands/runnables.ts index 45c16497d..37db6ea10 100644 --- a/editors/code/src/commands/runnables.ts +++ b/editors/code/src/commands/runnables.ts @@ -1,10 +1,10 @@ import * as vscode from 'vscode'; -import * as lc from 'vscode-languageclient' +import * as lc from 'vscode-languageclient'; import { Server } from '../server'; interface RunnablesParams { - textDocument: lc.TextDocumentIdentifier, - position?: lc.Position, + textDocument: lc.TextDocumentIdentifier; + position?: lc.Position; } interface Runnable { @@ -12,17 +12,17 @@ interface Runnable { label: string; bin: string; args: string[]; - env: { [index: string]: string }, + env: { [index: string]: string }; } class RunnableQuickPick implements vscode.QuickPickItem { - label: string; - description?: string | undefined; - detail?: string | undefined; - picked?: boolean | undefined; + public label: string; + public description?: string | undefined; + public detail?: string | undefined; + public picked?: boolean | undefined; constructor(public runnable: Runnable) { - this.label = runnable.label + this.label = runnable.label; } } @@ -30,59 +30,59 @@ interface CargoTaskDefinition extends vscode.TaskDefinition { type: 'cargo'; label: string; command: string; - args: Array; + args: string[]; env?: { [key: string]: string }; } function createTask(spec: Runnable): vscode.Task { const TASK_SOURCE = 'Rust'; - let definition: CargoTaskDefinition = { + const definition: CargoTaskDefinition = { type: 'cargo', label: 'cargo', command: spec.bin, args: spec.args, - env: spec.env - } + env: spec.env, + }; - let execCmd = `${definition.command} ${definition.args.join(' ')}`; - let execOption: vscode.ShellExecutionOptions = { + const execCmd = `${definition.command} ${definition.args.join(' ')}`; + const execOption: vscode.ShellExecutionOptions = { cwd: '.', env: definition.env, }; - let exec = new vscode.ShellExecution(`clear; ${execCmd}`, execOption); + const exec = new vscode.ShellExecution(`clear; ${execCmd}`, execOption); - let f = vscode.workspace.workspaceFolders![0] - let t = new vscode.Task(definition, f, definition.label, TASK_SOURCE, exec, ['$rustc']); + const f = vscode.workspace.workspaceFolders![0]; + const t = new vscode.Task(definition, f, definition.label, TASK_SOURCE, exec, ['$rustc']); return t; } -let prevRunnable: RunnableQuickPick | undefined = undefined +let prevRunnable: RunnableQuickPick | undefined; export async function handle() { - let editor = vscode.window.activeTextEditor - if (editor == null || editor.document.languageId != "rust") return - let textDocument: lc.TextDocumentIdentifier = { - uri: editor.document.uri.toString() - } - let params: RunnablesParams = { + const editor = vscode.window.activeTextEditor; + if (editor == null || editor.document.languageId != 'rust') { return; } + const textDocument: lc.TextDocumentIdentifier = { + uri: editor.document.uri.toString(), + }; + const params: RunnablesParams = { textDocument, - position: Server.client.code2ProtocolConverter.asPosition(editor.selection.active) - } - let runnables = await Server.client.sendRequest('m/runnables', params) - let items: RunnableQuickPick[] = [] + position: Server.client.code2ProtocolConverter.asPosition(editor.selection.active), + }; + const runnables = await Server.client.sendRequest('m/runnables', params); + const items: RunnableQuickPick[] = []; if (prevRunnable) { - items.push(prevRunnable) + items.push(prevRunnable); } - for (let r of runnables) { + for (const r of runnables) { if (prevRunnable && JSON.stringify(prevRunnable.runnable) == JSON.stringify(r)) { - continue + continue; } - items.push(new RunnableQuickPick(r)) + items.push(new RunnableQuickPick(r)); } - let item = await vscode.window.showQuickPick(items) + const item = await vscode.window.showQuickPick(items); if (item) { - item.detail = "rerun" - prevRunnable = item - let task = createTask(item.runnable) - return await vscode.tasks.executeTask(task) + item.detail = 'rerun'; + prevRunnable = item; + const task = createTask(item.runnable); + return await vscode.tasks.executeTask(task); } } -- cgit v1.2.3