Prevent sticky scroll being set at workspace level

Tyriar · Tyriar · commit 8bf7ff4d9322 · 2023-11-29T10:13:00.000-08:00
fixes microsoft#197734
diff --git a/.vscode/settings.json b/.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
+	]
 }
diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/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."),

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,5 @@`
`164`	`164`	`"vscode-notebook-renderer",`
`165`	`165`	`"src/vs/workbench/workbench.web.main.ts",`
`166`	`166`	`"src/vs/workbench/api/common/extHostTypes.ts"`
`167`		`- ],`
`168`		`- // Temporarily enabled for self-hosting`
`169`		`- "terminal.integrated.stickyScroll.enabled": true`
	`167`	`+ ]`
`170`	`168`	`}`