development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 21:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

SCM - update settings to be consistent with other settings (#201078)

Browse source
This commit is contained in:
Ladislau Szomoru 2023-12-17 16:20:47 +01:00 committed by GitHub
parent d696b40313
commit dbbf1dc671
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/vs/workbench/contrib/scm/browser/scm.contribution.ts
View file

@ -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,

8
src/vs/workbench/contrib/scm/browser/scmViewPane.ts
View file

@ -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');