diff options
author | Alex Ross <alros@microsoft.com> | 2019-05-10 11:48:19 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-10 11:48:19 +0300 |
commit | 57b550c559b945eb9d871dbf2b2e4cb9e31e2551 (patch) | |
tree | a302d0422c815be3256720004d143306e0bf5158 | |
parent | d6aa8eaf30c71df32d4543290675808440def630 (diff) |
Move tasks setting under terminal (#73562) (#73566)
Fixes #73555
4 files changed, 6 insertions, 23 deletions
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts index 0a0ccc5b731..3a0f28506c6 100644 --- a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts +++ b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts @@ -151,11 +151,6 @@ export const tocData: ITOCEntry = { settings: ['terminal.*'] }, { - id: 'features/tasks', - label: localize('tasks', "Tasks"), - settings: ['tasks.*'] - }, - { id: 'features/problems', label: localize('problems', "Problems"), settings: ['problems.*'] diff --git a/src/vs/workbench/contrib/tasks/electron-browser/task.contribution.ts b/src/vs/workbench/contrib/tasks/electron-browser/task.contribution.ts index 1b8b96c9e12..ce85cf8c619 100644 --- a/src/vs/workbench/contrib/tasks/electron-browser/task.contribution.ts +++ b/src/vs/workbench/contrib/tasks/electron-browser/task.contribution.ts @@ -2737,7 +2737,6 @@ let schema: IJSONSchema = { import schemaVersion1 from '../common/jsonSchema_v1'; import schemaVersion2, { updateProblemMatchers } from '../common/jsonSchema_v2'; -import { IConfigurationRegistry, Extensions } from 'vs/platform/configuration/common/configurationRegistry'; schema.definitions = { ...schemaVersion1.definitions, ...schemaVersion2.definitions, @@ -2751,19 +2750,3 @@ ProblemMatcherRegistry.onMatcherChanged(() => { updateProblemMatchers(); jsonRegistry.notifySchemaChanged(schemaId); }); - -const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration); -configurationRegistry.registerConfiguration({ - id: 'Tasks', - order: 100, - title: nls.localize('tasksConfigurationTitle', "Tasks"), - type: 'object', - properties: { - 'tasks.terminal.windowsAllowConpty': { - markdownDescription: nls.localize('tasks.terminal.windowsAllowConpty', "Works in conjunction with the `#terminal.integrated.windowsEnableConpty#` setting. Both must be enabled for tasks to use conpty. Defaults to `false`."), - type: 'boolean', - default: false - } - } -}); - diff --git a/src/vs/workbench/contrib/tasks/electron-browser/terminalTaskSystem.ts b/src/vs/workbench/contrib/tasks/electron-browser/terminalTaskSystem.ts index 738b10c6f47..7e9f8a7db67 100644 --- a/src/vs/workbench/contrib/tasks/electron-browser/terminalTaskSystem.ts +++ b/src/vs/workbench/contrib/tasks/electron-browser/terminalTaskSystem.ts @@ -881,7 +881,7 @@ export class TerminalTaskSystem implements ITaskSystem { } // Conpty doesn't do linefeeds in an expected way. Force winpty unless the user has requested otherwise. - shellLaunchConfig.forceWinpty = !this.configurationService.getValue('tasks.terminal.windowsAllowConpty'); + shellLaunchConfig.forceWinpty = !this.configurationService.getValue('terminal.integrated.windowsAllowConptyTasks'); return shellLaunchConfig; } diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts index d467ac1b6b3..eb7a270b494 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts @@ -273,6 +273,11 @@ configurationRegistry.registerConfiguration({ description: nls.localize('terminal.integrated.experimentalRefreshOnResume', "An experimental setting that will refresh the terminal renderer when the system is resumed."), type: 'boolean', default: false + }, + 'terminal.integrated.windowsAllowConptyTasks': { + markdownDescription: nls.localize('terminal.integrated.windowsAllowConptyTasks', "Works in conjunction with the `#terminal.integrated.windowsEnableConpty#` setting. Both must be enabled for tasks to use conpty. Defaults to `false`."), + type: 'boolean', + default: false } } }); |