Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove task setting #171879

Merged
merged 1 commit into from Jan 20, 2023
Merged

remove task setting #171879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/vs/workbench/contrib/tasks/browser/task.contribution.ts
View file
Open in desktop
Expand Up @@ -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."),
Expand Down
8 changes: 1 addition & 7 deletions src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
View file
Open in desktop
Expand Up @@ -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';
Expand Down Expand Up @@ -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`) +
Expand All @@ -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);
}

Expand Down
3 changes: 0 additions & 3 deletions src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts
View file
Open in desktop
Expand Up @@ -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';
Expand Down Expand Up @@ -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)));
Expand Down