From ef7aa9f20e58392bec993aba1dad2f985158c442 Mon Sep 17 00:00:00 2001 From: Alex Ross Date: Tue, 23 Oct 2018 15:16:51 +0200 Subject: [PATCH] Rename task presenation clearBeforeExecuting to clear --- src/vs/vscode.proposed.d.ts | 2 +- .../workbench/api/electron-browser/mainThreadTask.ts | 2 +- src/vs/workbench/api/node/extHostTask.ts | 4 ++-- src/vs/workbench/api/shared/tasks.ts | 2 +- src/vs/workbench/parts/tasks/common/tasks.ts | 2 +- .../parts/tasks/electron-browser/jsonSchema_v2.ts | 6 +++--- .../tasks/electron-browser/terminalTaskSystem.ts | 2 +- .../workbench/parts/tasks/node/taskConfiguration.ts | 12 ++++++------ .../test/electron-browser/configuration.test.ts | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index 583c7d70e99..b8a8da107c0 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -1182,7 +1182,7 @@ declare module 'vscode' { /** * Controls whether the terminal is cleared before executing the task. */ - clearBeforeExecuting?: boolean; + clear?: boolean; } //#endregion diff --git a/src/vs/workbench/api/electron-browser/mainThreadTask.ts b/src/vs/workbench/api/electron-browser/mainThreadTask.ts index 8688acb054c..ca910c482ff 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadTask.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadTask.ts @@ -91,7 +91,7 @@ namespace TaskPresentationOptionsDTO { } export function to(value: TaskPresentationOptionsDTO): PresentationOptions { if (value === void 0 || value === null) { - return { reveal: RevealKind.Always, echo: true, focus: false, panel: PanelKind.Shared, showReuseMessage: true, clearBeforeExecuting: false }; + return { reveal: RevealKind.Always, echo: true, focus: false, panel: PanelKind.Shared, showReuseMessage: true, clear: false }; } return Objects.assign(Object.create(null), value); } diff --git a/src/vs/workbench/api/node/extHostTask.ts b/src/vs/workbench/api/node/extHostTask.ts index 1db26956670..ba2442e423a 100644 --- a/src/vs/workbench/api/node/extHostTask.ts +++ b/src/vs/workbench/api/node/extHostTask.ts @@ -231,7 +231,7 @@ namespace TaskPanelKind { namespace PresentationOptions { export function from(value: vscode.TaskPresentationOptions): tasks.PresentationOptions { if (value === void 0 || value === null) { - return { reveal: tasks.RevealKind.Always, echo: true, focus: false, panel: tasks.PanelKind.Shared, showReuseMessage: true, clearBeforeExecuting: false }; + return { reveal: tasks.RevealKind.Always, echo: true, focus: false, panel: tasks.PanelKind.Shared, showReuseMessage: true, clear: false }; } return { reveal: TaskRevealKind.from(value.reveal), @@ -239,7 +239,7 @@ namespace PresentationOptions { focus: !!value.focus, panel: TaskPanelKind.from(value.panel), showReuseMessage: value.showReuseMessage === void 0 ? true : !!value.showReuseMessage, - clearBeforeExecuting: value.clearBeforeExecuting === void 0 ? false : !!value.clearBeforeExecuting, + clear: value.clear === void 0 ? false : !!value.clear, }; } } diff --git a/src/vs/workbench/api/shared/tasks.ts b/src/vs/workbench/api/shared/tasks.ts index b9c250c2026..4710c201e2a 100644 --- a/src/vs/workbench/api/shared/tasks.ts +++ b/src/vs/workbench/api/shared/tasks.ts @@ -16,7 +16,7 @@ export interface TaskPresentationOptionsDTO { focus?: boolean; panel?: number; showReuseMessage?: boolean; - clearBeforeExecuting?: boolean; + clear?: boolean; } export interface ExecutionOptionsDTO { diff --git a/src/vs/workbench/parts/tasks/common/tasks.ts b/src/vs/workbench/parts/tasks/common/tasks.ts index e29cc900723..1a7dad5909b 100644 --- a/src/vs/workbench/parts/tasks/common/tasks.ts +++ b/src/vs/workbench/parts/tasks/common/tasks.ts @@ -207,7 +207,7 @@ export interface PresentationOptions { /** * Controls whether to clear the terminal before executing the task. */ - clearBeforeExecuting: boolean; + clear: boolean; } export enum RuntimeType { diff --git a/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts b/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts index 209d96eddcd..bef22d20af1 100644 --- a/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts +++ b/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts @@ -83,7 +83,7 @@ const presentation: IJSONSchema = { focus: false, panel: 'shared', showReuseMessage: true, - clearBeforeExecuting: false, + clear: false, }, description: nls.localize('JsonSchema.tasks.presentation', 'Configures the panel that is used to present the task\'s ouput and reads its input.'), additionalProperties: false, @@ -120,10 +120,10 @@ const presentation: IJSONSchema = { default: true, description: nls.localize('JsonSchema.tasks.presentation.showReuseMessage', 'Controls whether to show the `Terminal will be reused by tasks, press any key to close it` message.') }, - clearBeforeExecuting: { + clear: { type: 'boolean', default: false, - description: nls.localize('JsonSchema.tasks.presentation.clearBeforeExecuting', 'Controls whether the terminal is cleared before executing the task.') + description: nls.localize('JsonSchema.tasks.presentation.clear', 'Controls whether the terminal is cleared before executing the task.') } } }; diff --git a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts index f7e8fa823f9..88e457e8324 100644 --- a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts +++ b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts @@ -683,7 +683,7 @@ export class TerminalTaskSystem implements ITaskSystem { } if (terminalToReuse) { terminalToReuse.terminal.reuseTerminal(shellLaunchConfig); - if (task.command.presentation.clearBeforeExecuting) { + if (task.command.presentation.clear) { terminalToReuse.terminal.clear(); } return [terminalToReuse.terminal, commandExecutable, undefined]; diff --git a/src/vs/workbench/parts/tasks/node/taskConfiguration.ts b/src/vs/workbench/parts/tasks/node/taskConfiguration.ts index 640fbb53778..4c964af70c2 100644 --- a/src/vs/workbench/parts/tasks/node/taskConfiguration.ts +++ b/src/vs/workbench/parts/tasks/node/taskConfiguration.ts @@ -116,7 +116,7 @@ export interface PresentationOptions { /** * Controls whether the terminal should be cleared before running the task. */ - clearBeforeExecuting?: boolean; + clear?: boolean; } export interface TaskIdentifier { @@ -759,7 +759,7 @@ namespace CommandConfiguration { let focus: boolean; let panel: Tasks.PanelKind; let showReuseMessage: boolean; - let clearBeforeExecuting: boolean; + let clear: boolean; if (Types.isBoolean(config.echoCommand)) { echo = config.echoCommand; } @@ -783,14 +783,14 @@ namespace CommandConfiguration { if (Types.isBoolean(presentation.showReuseMessage)) { showReuseMessage = presentation.showReuseMessage; } - if (Types.isBoolean(presentation.clearBeforeExecuting)) { - clearBeforeExecuting = presentation.clearBeforeExecuting; + if (Types.isBoolean(presentation.clear)) { + clear = presentation.clear; } } if (echo === void 0 && reveal === void 0 && focus === void 0 && panel === void 0 && showReuseMessage === void 0) { return undefined; } - return { echo, reveal, focus, panel, showReuseMessage, clearBeforeExecuting }; + return { echo, reveal, focus, panel, showReuseMessage, clear }; } export function assignProperties(target: Tasks.PresentationOptions, source: Tasks.PresentationOptions): Tasks.PresentationOptions { @@ -803,7 +803,7 @@ namespace CommandConfiguration { export function fillDefaults(value: Tasks.PresentationOptions, context: ParseContext): Tasks.PresentationOptions { let defaultEcho = context.engine === Tasks.ExecutionEngine.Terminal ? true : false; - return _fillDefaults(value, { echo: defaultEcho, reveal: Tasks.RevealKind.Always, focus: false, panel: Tasks.PanelKind.Shared, showReuseMessage: true, clearBeforeExecuting: false }, properties, context); + return _fillDefaults(value, { echo: defaultEcho, reveal: Tasks.RevealKind.Always, focus: false, panel: Tasks.PanelKind.Shared, showReuseMessage: true, clear: false }, properties, context); } export function freeze(value: Tasks.PresentationOptions): Readonly { diff --git a/src/vs/workbench/parts/tasks/test/electron-browser/configuration.test.ts b/src/vs/workbench/parts/tasks/test/electron-browser/configuration.test.ts index 3985a074129..88ad98e7cb6 100644 --- a/src/vs/workbench/parts/tasks/test/electron-browser/configuration.test.ts +++ b/src/vs/workbench/parts/tasks/test/electron-browser/configuration.test.ts @@ -83,7 +83,7 @@ class PresentationBuilder { public result: Tasks.PresentationOptions; constructor(public parent: CommandConfigurationBuilder) { - this.result = { echo: false, reveal: Tasks.RevealKind.Always, focus: false, panel: Tasks.PanelKind.Shared, showReuseMessage: true, clearBeforeExecuting: false }; + this.result = { echo: false, reveal: Tasks.RevealKind.Always, focus: false, panel: Tasks.PanelKind.Shared, showReuseMessage: true, clear: false }; } public echo(value: boolean): PresentationBuilder { -- GitLab