From dbbf1dc6715c91488deed32c23d018d9270f0f7b Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Sun, 17 Dec 2023 16:20:47 +0100
Subject: [PATCH] SCM - update settings to be consistent with other settings
 (#201078)

---
 src/vs/workbench/contrib/scm/browser/scm.contribution.ts | 4 ++--
 src/vs/workbench/contrib/scm/browser/scmViewPane.ts      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
index 58a66dda8a0..2cdc8781436 100644
--- a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
+++ b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
@@ -255,14 +255,14 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
 			markdownDescription: localize('inputFontSize', "Controls the font size for the input message in pixels."),
 			default: 13
 		},
-		'scm.inputMaxLines': {
+		'scm.inputMaxLineCount': {
 			type: 'number',
 			markdownDescription: localize('inputMaxLines', "Controls the maximum number of lines that the input will auto-grow to."),
 			minimum: 1,
 			maximum: 50,
 			default: 10
 		},
-		'scm.inputMinLines': {
+		'scm.inputMinLineCount': {
 			type: 'number',
 			markdownDescription: localize('inputMinLines', "Controls the minimum number of lines that the input will auto-grow from."),
 			minimum: 1,
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index 4e41923d3ae..9517f3c04c4 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -2267,11 +2267,11 @@ class SCMInputWidget {
 		const lineHeight = this.computeLineHeight(fontSize);
 		const { top, bottom } = this.inputEditor.getOption(EditorOption.padding);
 
-		const inputMinLinesConfig = this.configurationService.getValue('scm.inputMinLines');
+		const inputMinLinesConfig = this.configurationService.getValue('scm.inputMinLineCount');
 		const inputMinLines = typeof inputMinLinesConfig === 'number' ? clamp(inputMinLinesConfig, 1, 50) : 1;
 		const editorMinHeight = inputMinLines * lineHeight + top + bottom;
 
-		const inputMaxLinesConfig = this.configurationService.getValue('scm.inputMaxLines');
+		const inputMaxLinesConfig = this.configurationService.getValue('scm.inputMaxLineCount');
 		const inputMaxLines = typeof inputMaxLinesConfig === 'number' ? clamp(inputMaxLinesConfig, 1, 50) : 10;
 		const editorMaxHeight = inputMaxLines * lineHeight + top + bottom;
 
@@ -2648,8 +2648,8 @@ export class SCMViewPane extends ViewPane {
 						e.affectsConfiguration('scm.alwaysShowRepositories') ||
 						e.affectsConfiguration('scm.showIncomingChanges') ||
 						e.affectsConfiguration('scm.showOutgoingChanges') ||
-						e.affectsConfiguration('scm.inputMinLines') ||
-						e.affectsConfiguration('scm.inputMaxLines')) {
+						e.affectsConfiguration('scm.inputMinLineCount') ||
+						e.affectsConfiguration('scm.inputMaxLineCount')) {
 						this._showActionButton = this.configurationService.getValue<boolean>('scm.showActionButton');
 						this._alwaysShowRepositories = this.configurationService.getValue<boolean>('scm.alwaysShowRepositories');
 						this._showIncomingChanges = this.configurationService.getValue<ShowChangesSetting>('scm.showIncomingChanges');