Fix microsoft#69480

sandy081 · sandy081 · commit 16faaa5d8161 · 2020-03-02T14:29:05.000+01:00
diff --git a/src/vs/workbench/contrib/output/browser/output.contribution.ts b/src/vs/workbench/contrib/output/browser/output.contribution.ts
@@ -23,6 +23,7 @@ import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiati
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { ViewContainer, IViewContainersRegistry, ViewContainerLocation, Extensions as ViewContainerExtensions, IViewsRegistry } from 'vs/workbench/common/views';
 import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 
 // Register Service
 registerSingleton(IOutputService, OutputService);
@@ -145,3 +146,19 @@ MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
 	},
 	order: 1
 });
+
+Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
+	id: 'output',
+	order: 30,
+	title: nls.localize('output', "Output"),
+	type: 'object',
+	properties: {
+		'output.smartScroll.enabled': {
+			type: 'boolean',
+			description: nls.localize('output.smartScroll.enabled', "Enable/disable the ability of smart scrolling in the output view. Smart scrolling allows you to lock scrolling automatically when you click in the output view and unlocks when you click in the last line."),
+			default: true,
+			scope: ConfigurationScope.APPLICATION,
+			tags: ['output']
+		}
+	}
+});
diff --git a/src/vs/workbench/contrib/output/browser/outputView.ts b/src/vs/workbench/contrib/output/browser/outputView.ts
@@ -90,6 +90,10 @@ export class OutputViewPane extends ViewPane {
 				return;
 			}
 
+			if (!this.configurationService.getValue('output.smartScroll.enabled')) {
+				return;
+			}
+
 			const model = codeEditor.getModel();
 			if (model && this.actions) {
 				const newPositionLine = e.position.lineNumber;
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
@@ -165,6 +165,11 @@ export const tocData: ITOCEntry = {
 					label: localize('problems', "Problems"),
 					settings: ['problems.*']
 				},
+				{
+					id: 'features/output',
+					label: localize('output', "Output"),
+					settings: ['output.*']
+				},
 				{
 					id: 'features/comments',
 					label: localize('comments', "Comments"),
