Skip to content

Commit dbbf1dc

Browse files
authored
SCM - update settings to be consistent with other settings (#201078)
1 parent d696b40 commit dbbf1dc

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/vs/workbench/contrib/scm/browser/scm.contribution.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,14 +255,14 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
255255
markdownDescription: localize('inputFontSize', "Controls the font size for the input message in pixels."),
256256
default: 13
257257
},
258-
'scm.inputMaxLines': {
258+
'scm.inputMaxLineCount': {
259259
type: 'number',
260260
markdownDescription: localize('inputMaxLines', "Controls the maximum number of lines that the input will auto-grow to."),
261261
minimum: 1,
262262
maximum: 50,
263263
default: 10
264264
},
265-
'scm.inputMinLines': {
265+
'scm.inputMinLineCount': {
266266
type: 'number',
267267
markdownDescription: localize('inputMinLines', "Controls the minimum number of lines that the input will auto-grow from."),
268268
minimum: 1,

src/vs/workbench/contrib/scm/browser/scmViewPane.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2267,11 +2267,11 @@ class SCMInputWidget {
22672267
const lineHeight = this.computeLineHeight(fontSize);
22682268
const { top, bottom } = this.inputEditor.getOption(EditorOption.padding);
22692269

2270-
const inputMinLinesConfig = this.configurationService.getValue('scm.inputMinLines');
2270+
const inputMinLinesConfig = this.configurationService.getValue('scm.inputMinLineCount');
22712271
const inputMinLines = typeof inputMinLinesConfig === 'number' ? clamp(inputMinLinesConfig, 1, 50) : 1;
22722272
const editorMinHeight = inputMinLines * lineHeight + top + bottom;
22732273

2274-
const inputMaxLinesConfig = this.configurationService.getValue('scm.inputMaxLines');
2274+
const inputMaxLinesConfig = this.configurationService.getValue('scm.inputMaxLineCount');
22752275
const inputMaxLines = typeof inputMaxLinesConfig === 'number' ? clamp(inputMaxLinesConfig, 1, 50) : 10;
22762276
const editorMaxHeight = inputMaxLines * lineHeight + top + bottom;
22772277

@@ -2648,8 +2648,8 @@ export class SCMViewPane extends ViewPane {
26482648
e.affectsConfiguration('scm.alwaysShowRepositories') ||
26492649
e.affectsConfiguration('scm.showIncomingChanges') ||
26502650
e.affectsConfiguration('scm.showOutgoingChanges') ||
2651-
e.affectsConfiguration('scm.inputMinLines') ||
2652-
e.affectsConfiguration('scm.inputMaxLines')) {
2651+
e.affectsConfiguration('scm.inputMinLineCount') ||
2652+
e.affectsConfiguration('scm.inputMaxLineCount')) {
26532653
this._showActionButton = this.configurationService.getValue<boolean>('scm.showActionButton');
26542654
this._alwaysShowRepositories = this.configurationService.getValue<boolean>('scm.alwaysShowRepositories');
26552655
this._showIncomingChanges = this.configurationService.getValue<ShowChangesSetting>('scm.showIncomingChanges');

0 commit comments

Comments
 (0)