diff --git a/src/vs/workbench/contrib/tasks/browser/task.contribution.ts b/src/vs/workbench/contrib/tasks/browser/task.contribution.ts index 13662e26c6a78..e5032fab2817d 100644 --- a/src/vs/workbench/contrib/tasks/browser/task.contribution.ts +++ b/src/vs/workbench/contrib/tasks/browser/task.contribution.ts @@ -505,11 +505,6 @@ configurationRegistry.registerConfiguration({ default: 'on', restricted: true }, - [TaskSettingId.ShowDecorations]: { - type: 'boolean', - markdownDescription: nls.localize('task.showDecorations', "Shows decorations at points of interest in the terminal buffer such as the first problem found via a watch task. Note that this will only take effect for future tasks. {0} will take precedence over this setting", '`#terminal.integrated.shellIntegration.decorationsEnabled#`'), - default: true - }, [TaskSettingId.Reconnection]: { type: 'boolean', description: nls.localize('task.reconnection', "On window reload, reconnect to tasks that have problem matchers."), diff --git a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts index 3f97445abc5fa..5034f8a807e50 100644 --- a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts +++ b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts @@ -38,7 +38,7 @@ import { IViewDescriptorService, IViewsService, ViewContainerLocation } from 'vs import { TaskTerminalStatus } from 'vs/workbench/contrib/tasks/browser/taskTerminalStatus'; import { ProblemCollectorEventKind, ProblemHandlingStrategy, StartStopProblemCollector, WatchingProblemCollector } from 'vs/workbench/contrib/tasks/common/problemCollectors'; import { GroupKind } from 'vs/workbench/contrib/tasks/common/taskConfiguration'; -import { CommandOptions, CommandString, ContributedTask, CustomTask, DependsOrder, ICommandConfiguration, IConfigurationProperties, IExtensionTaskSource, InMemoryTask, IPresentationOptions, IShellConfiguration, IShellQuotingOptions, ITaskEvent, PanelKind, RevealKind, RevealProblemKind, RuntimeType, ShellQuoting, Task, TaskEvent, TaskEventKind, TaskScope, TaskSettingId, TaskSourceKind } from 'vs/workbench/contrib/tasks/common/tasks'; +import { CommandOptions, CommandString, ContributedTask, CustomTask, DependsOrder, ICommandConfiguration, IConfigurationProperties, IExtensionTaskSource, InMemoryTask, IPresentationOptions, IShellConfiguration, IShellQuotingOptions, ITaskEvent, PanelKind, RevealKind, RevealProblemKind, RuntimeType, ShellQuoting, Task, TaskEvent, TaskEventKind, TaskScope, TaskSourceKind } from 'vs/workbench/contrib/tasks/common/tasks'; import { ITaskService } from 'vs/workbench/contrib/tasks/common/taskService'; import { IResolvedVariables, IResolveSet, ITaskExecuteResult, ITaskResolver, ITaskSummary, ITaskSystem, ITaskSystemInfo, ITaskSystemInfoResolver, ITaskTerminateResponse, TaskError, TaskErrors, TaskExecuteKind, Triggers } from 'vs/workbench/contrib/tasks/common/taskSystem'; import { ITerminalGroupService, ITerminalInstance, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal'; @@ -215,9 +215,6 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem { private _reconnectedTerminals: ITerminalInstance[] | undefined; taskShellIntegrationStartSequence(cwd: string | URI | undefined): string { - if (!this._configurationService.getValue(TaskSettingId.ShowDecorations)) { - return ''; - } return ( VSCodeSequence(VSCodeOscPt.PromptStart) + VSCodeSequence(VSCodeOscPt.Property, `${VSCodeOscProperty.Task}=True`) + @@ -229,9 +226,6 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem { ); } get taskShellIntegrationOutputSequence(): string { - if (!this._configurationService.getValue(TaskSettingId.ShowDecorations)) { - return ''; - } return VSCodeSequence(VSCodeOscPt.CommandExecuted); } diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts b/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts index 6f432d65c43a3..bb8d82f88ab12 100644 --- a/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts +++ b/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts @@ -20,7 +20,6 @@ import { CommandInvalidationReason, ICommandDetectionCapability, IMarkProperties import { TerminalSettingId } from 'vs/platform/terminal/common/terminal'; import { IColorTheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService'; import { ThemeIcon } from 'vs/base/common/themables'; -import { TaskSettingId } from 'vs/workbench/contrib/tasks/common/tasks'; import { terminalDecorationError, terminalDecorationIncomplete, terminalDecorationMark, terminalDecorationSuccess } from 'vs/workbench/contrib/terminal/browser/terminalIcons'; import { DecorationSelector, TerminalDecorationHoverManager, updateLayout } from 'vs/workbench/contrib/terminal/browser/xterm/decorationStyles'; import { ITerminalCommand } from 'vs/workbench/contrib/terminal/common/terminal'; @@ -64,8 +63,6 @@ export class DecorationAddon extends Disposable implements ITerminalAddon { } else if (e.affectsConfiguration(TerminalSettingId.ShellIntegrationDecorationsEnabled)) { this._removeCapabilityDisposables(TerminalCapability.CommandDetection); this._updateDecorationVisibility(); - } else if (e.affectsConfiguration(TaskSettingId.ShowDecorations)) { - this._updateDecorationVisibility(); } })); this._register(this._themeService.onDidColorThemeChange(() => this._refreshStyles(true)));