Merge pull request microsoft#199582 from microsoft/tyriar/197734

Prevent sticky scroll being set at workspace level

Author: Tyriar

.vscode/settings.json

@@ -164,7 +164,5 @@
 		"vscode-notebook-renderer",
 		"src/vs/workbench/workbench.web.main.ts",
 		"src/vs/workbench/api/common/extHostTypes.ts"
-	],
-	// Temporarily enabled for self-hosting
-	"terminal.integrated.stickyScroll.enabled": true
+	]
 }

src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts

@@ -629,8 +629,7 @@ const terminalConfiguration: IConfigurationNode = {
 			markdownDescription: localize('terminal.integrated.stickyScroll.enabled', "Experimental: Shows the current command at the top of the terminal."),
 			type: 'boolean',
 			default: false,
-			// TODO: Prevent setting at folder level after it becomes stable,
-			// scope: ConfigurationScope.APPLICATION
+			scope: ConfigurationScope.APPLICATION
 		},
 		[TerminalSettingId.StickyScrollMaxLineCount]: {
 			markdownDescription: localize('terminal.integrated.stickyScroll.maxLineCount', "Defines the maximum number of sticky lines to show. Sticky scroll lines will never exceed 40% of the viewport regardless of this setting."),