8000 SCM - remove experimental from the showHistoryGraph setting name (#22… · githubnext/vscode@6707276 · GitHub
[go: up one dir, main page]
10000
Skip to content

Commit 6707276

Browse files
lszomorulszomoru
authored
SCM - remove experimental from the showHistoryGraph setting name (microsoft#222263)
* SCM - remove experimental from the showHistoryGraph setting name * Fix compilation error * Fix setting description
1 parent 095b6cd commit 6707276

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
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
@@ -350,9 +350,9 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
350350
description: localize('scm.workingSets.default', "Controls the default working set to use when switching to a source control history item group that does not have a working set."),
351351
default: 'current'
352352
},
353-
'scm.experimental.showHistoryGraph': {
353+
'scm.showHistoryGraph': {
354354
type: 'boolean',
355-
description: localize('scm.experimental.showHistoryGraph', "Controls whether to show the history graph instead of incoming/outgoing changes in the Source Control view."),
355+
description: localize('scm.showHistoryGraph', "Controls whether to render incoming/outgoing changes using a graph in the Source Control view."),
356356
default: true
357357
}
358358
}

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

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,7 +1295,6 @@ class SeparatorRenderer implements ICompressibleTreeRenderer<SCMViewSeparatorEle
12951295
@IContextKeyService private readonly contextKeyService: IContextKeyService,
12961296
@IContextMenuService private readonly contextMenuService: IContextMenuService,
12971297
@IKeybindingService private readonly keybindingService: IKeybindingService,
1298-
@IConfigurationService private readonly configurationService: IConfigurationService,
12991298
@ICommandService private readonly commandService: ICommandService,
13001299
@IMenuService private readonly menuService: IMenuService,
13011300
@ITelemetryService private readonly telemetryService: ITelemetryService
@@ -1314,8 +1313,7 @@ class SeparatorRenderer implements ICompressibleTreeRenderer<SCMViewSeparatorEle
13141313
append(element, $('.separator'));
13151314
templateDisposables.add(label);
13161315

1317-
const options = { moreIcon: this.configurationService.getValue<boolean>('scm.experimental.showHistoryGraph') === true ? Codicon.more : Codicon.gear } satisfies IMenuWorkbenchToolBarOptions;
1318-
const toolBar = new WorkbenchToolBar(append(element, $('.actions')), options, this.menuService, this.contextKeyService, this.contextMenuService, this.keybindingService, this.commandService, this.telemetryService);
1316+
const toolBar = new WorkbenchToolBar(append(element, $('.actions')), undefined, this.menuService, this.contextKeyService, this.contextMenuService, this.keybindingService, this.commandService, this.telemetryService);
13191317
templateDisposables.add(toolBar);
13201318

13211319
return { label, toolBar, elementDisposables: new DisposableStore(), templateDisposables };
@@ -1739,7 +1737,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
17391737
MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
17401738
title: localize('scmChanges', "Incoming & Outgoing"),
17411739
submenu: Menus.ChangesSettings,
1742-
when: ContextKeyExpr.and(ContextKeyExpr.equals('view', VIEW_PANE_ID), ContextKeys.RepositoryCount.notEqualsTo(0), ContextKeyExpr.equals('config.scm.experimental.showHistoryGraph', true).negate()),
1740+
when: ContextKeyExpr.and(ContextKeyExpr.equals('view', VIEW_PANE_ID), ContextKeys.RepositoryCount.notEqualsTo(0), ContextKeyExpr.equals('config.scm.showHistoryGraph', true).negate()),
17431741
group: '0_view&sort',
17441742
order: 2
17451743
});
@@ -1774,15 +1772,15 @@ MenuRegistry.appendMenuItem(MenuId.SCMChangesSeparator, {
17741772
submenu: MenuId.SCMIncomingChangesSetting,
17751773
group: '1_incoming&outgoing',
17761774
order: 1,
1777-
when: ContextKeyExpr.equals('config.scm.experimental.showHistoryGraph', false)
1775+
when: ContextKeyExpr.equals('config.scm.showHistoryGraph', false)
17781776
});
17791777

17801778
MenuRegistry.appendMenuItem(Menus.ChangesSettings, {
17811779
title: localize('incomingChanges', "Show Incoming Changes"),
17821780
submenu: MenuId.SCMIncomingChangesSetting,
17831781
group: '1_incoming&outgoing',
17841782
order: 1,
1785-
when: ContextKeyExpr.equals('config.scm.experimental.showHistoryGraph', false)
1783+
when: ContextKeyExpr.equals('config.scm.showHistoryGraph', false)
17861784
});
17871785

17881786
registerAction2(class extends SCMChangesSettingAction {
@@ -1827,15 +1825,15 @@ MenuRegistry.appendMenuItem(MenuId.SCMChangesSeparator, {
18271825
submenu: MenuId.SCMOutgoingChangesSetting,
18281826
group: '1_incoming&outgoing',
18291827
order: 2,
1830-
when: ContextKeyExpr.equals('config.scm.experimental.showHistoryGraph', false)
1828+
when: ContextKeyExpr.equals('config.scm.showHistoryGraph', false)
18311829
});
18321830

18331831
MenuRegistry.appendMenuItem(Menus.ChangesSettings, {
18341832
title: localize('outgoingChanges', "Show Outgoing Changes"),
18351833
submenu: MenuId.SCMOutgoingChangesSetting,
18361834
group: '1_incoming&outgoing',
18371835
order: 2,
1838-
when: ContextKeyExpr.equals('config.scm.experimental.showHistoryGraph', false)
1836+
when: ContextKeyExpr.equals('config.scm.showHistoryGraph', false)
18391837
});
18401838

18411839
registerAction2(class extends SCMChangesSettingAction {
@@ -1889,12 +1887,12 @@ registerAction2(class extends Action2 {
18891887
{
18901888
id: MenuId.SCMChangesSeparator,
18911889
order: 3,
1892-
when: ContextKeyExpr.equals('config.scm.experimental.showHistoryGraph', false)
1890+
when: ContextKeyExpr.equals('config.scm.showHistoryGraph', false)
18931891
},
18941892
{
18951893
id: Menus.ChangesSettings,
18961894
order: 3,
1897-
when: ContextKeyExpr.equals('config.scm.experimental.showHistoryGraph', false)
1895+
when: ContextKeyExpr.equals('config.scm.showHistoryGraph', false)
18981896
},
18991897
]
19001898
});
@@ -3143,7 +3141,7 @@ export class SCMViewPane extends ViewPane {
31433141
e.affectsConfiguration('scm.showActionButton') ||
31443142
e.affectsConfiguration('scm.showIncomingChanges') ||
31453143
e.affectsConfiguration('scm.showOutgoingChanges') ||
3146-
e.affectsConfiguration('scm.experimental.showHistoryGraph'),
3144+
e.affectsConfiguration('scm.showHistoryGraph'),
31473145
this.visibilityDisposables)
31483146
(() => this.updateChildren(), this, this.visibilityDisposables);
31493147

@@ -4176,7 +4174,7 @@ class SCMTreeHistoryProviderDataSource extends Disposable {
41764174
showChangesSummary: this.configurationService.getValue<boolean>('scm.showChangesSummary'),
41774175
showIncomingChanges: this.configurationService.getValue<ShowChangesSetting>('scm.showIncomingChanges'),
41784176
showOutgoingChanges: this.configurationService.getValue<ShowChangesSetting>('scm.showOutgoingChanges'),
4179-
showHistoryGraph: this.configurationService.getValue<boolean>('scm.experimental.showHistoryGraph')
4177+
showHistoryGraph: this.configurationService.getValue<boolean>('scm.showHistoryGraph')
41804178
};
41814179
}
41824180
}

0 commit comments

Comments
 (0)
0