Move tasks setting under terminal (#73562)

Fixes #73555
microsoft · May 10, 2019 · 522eb0a · 522eb0a
1 parent fa77b52
commit 522eb0a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 23 deletions.
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
@@ -150,11 +150,6 @@ export const tocData: ITOCEntry = {
 					label: localize('terminal', "Terminal"),
 					settings: ['terminal.*']
 				},
-				{
-					id: 'features/tasks',
-					label: localize('tasks', "Tasks"),
-					settings: ['tasks.*']
-				},
 				{
 					id: 'features/problems',
 					label: localize('problems', "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
@@ -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
@@ -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
@@ -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
 		}
 	}
 });