@codingame/monaco-vscode-scm-service-override 23.0.2 → 23.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +13 -13
- package/vscode/src/vs/workbench/contrib/scm/browser/activity.js +5 -5
- package/vscode/src/vs/workbench/contrib/scm/browser/menus.js +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffDecorator.js +3 -3
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffWidget.js +13 -13
- package/vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js +88 -88
- package/vscode/src/vs/workbench/contrib/scm/browser/scmAccessibilityHelp.js +23 -23
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.js +27 -27
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.js +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.js +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js +24 -24
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-scm-service-override",
|
|
3
|
-
"version": "23.0.
|
|
3
|
+
"version": "23.0.4",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "VSCode public API plugged on the monaco editor - scm service-override",
|
|
6
6
|
"keywords": [],
|
|
@@ -15,18 +15,18 @@
|
|
|
15
15
|
},
|
|
16
16
|
"type": "module",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@codingame/monaco-vscode-05c09f77-cd1d-5960-b387-e7023df3160b-common": "23.0.
|
|
19
|
-
"@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common": "23.0.
|
|
20
|
-
"@codingame/monaco-vscode-262ed59d-4f76-57cd-9e9f-1877f26ae049-common": "23.0.
|
|
21
|
-
"@codingame/monaco-vscode-27663a0b-1249-58ba-9085-e52d706b50bc-common": "23.0.
|
|
22
|
-
"@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common": "23.0.
|
|
23
|
-
"@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "23.0.
|
|
24
|
-
"@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "23.0.
|
|
25
|
-
"@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "23.0.
|
|
26
|
-
"@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common": "23.0.
|
|
27
|
-
"@codingame/monaco-vscode-api": "23.0.
|
|
28
|
-
"@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common": "23.0.
|
|
29
|
-
"@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common": "23.0.
|
|
18
|
+
"@codingame/monaco-vscode-05c09f77-cd1d-5960-b387-e7023df3160b-common": "23.0.4",
|
|
19
|
+
"@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common": "23.0.4",
|
|
20
|
+
"@codingame/monaco-vscode-262ed59d-4f76-57cd-9e9f-1877f26ae049-common": "23.0.4",
|
|
21
|
+
"@codingame/monaco-vscode-27663a0b-1249-58ba-9085-e52d706b50bc-common": "23.0.4",
|
|
22
|
+
"@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common": "23.0.4",
|
|
23
|
+
"@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "23.0.4",
|
|
24
|
+
"@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "23.0.4",
|
|
25
|
+
"@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "23.0.4",
|
|
26
|
+
"@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common": "23.0.4",
|
|
27
|
+
"@codingame/monaco-vscode-api": "23.0.4",
|
|
28
|
+
"@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common": "23.0.4",
|
|
29
|
+
"@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common": "23.0.4"
|
|
30
30
|
},
|
|
31
31
|
"main": "index.js",
|
|
32
32
|
"module": "index.js",
|
|
@@ -103,7 +103,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
|
|
|
103
103
|
if (count === 0) {
|
|
104
104
|
return;
|
|
105
105
|
}
|
|
106
|
-
const badge = ( new NumberBadge(count, num => ( localize(
|
|
106
|
+
const badge = ( new NumberBadge(count, num => ( localize(10252, '{0} pending changes', num))));
|
|
107
107
|
store.add(this.activityService.showViewActivity(VIEW_PANE_ID, { badge }));
|
|
108
108
|
}
|
|
109
109
|
_updateStatusBar(activeRepository, commands, store) {
|
|
@@ -118,7 +118,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
|
|
|
118
118
|
const tooltip = `${label}${command.tooltip ? ` - ${command.tooltip}` : ''}`;
|
|
119
119
|
const genericCommandName = getStatusBarCommandGenericName(command);
|
|
120
120
|
const statusbarEntry = {
|
|
121
|
-
name: ( localize(
|
|
121
|
+
name: ( localize(10253, "Source Control")) + (genericCommandName ? ` ${genericCommandName}` : ''),
|
|
122
122
|
text: command.title,
|
|
123
123
|
ariaLabel: tooltip,
|
|
124
124
|
tooltip,
|
|
@@ -131,7 +131,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
|
|
|
131
131
|
if (this.scmService.repositoryCount > 1) {
|
|
132
132
|
const icon = getSCMRepositoryIcon(activeRepository, activeRepository.repository);
|
|
133
133
|
const repositoryStatusbarEntry = {
|
|
134
|
-
name: ( localize(
|
|
134
|
+
name: ( localize(10254, "Source Control Provider")),
|
|
135
135
|
text: `$(${icon.id}) ${activeRepository.repository.provider.name}`,
|
|
136
136
|
ariaLabel: label,
|
|
137
137
|
tooltip: label,
|
|
@@ -160,8 +160,8 @@ let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyCon
|
|
|
160
160
|
this.scmService = scmService;
|
|
161
161
|
this.uriIdentityService = uriIdentityService;
|
|
162
162
|
this._onDidRepositoryChange = ( new Emitter());
|
|
163
|
-
const activeResourceHasChangesContextKey = ( new RawContextKey('scmActiveResourceHasChanges', false, ( localize(
|
|
164
|
-
const activeResourceRepositoryContextKey = ( new RawContextKey('scmActiveResourceRepository', undefined, ( localize(
|
|
163
|
+
const activeResourceHasChangesContextKey = ( new RawContextKey('scmActiveResourceHasChanges', false, ( localize(10255, "Whether the active resource has changes"))));
|
|
164
|
+
const activeResourceRepositoryContextKey = ( new RawContextKey('scmActiveResourceRepository', undefined, ( localize(10256, "The active resource's repository"))));
|
|
165
165
|
this._repositories = observableFromEvent(this, Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository), () => this.scmService.repositories);
|
|
166
166
|
this._register(autorun((reader) => {
|
|
167
167
|
for (const repository of this._repositories.read(reader)) {
|
|
@@ -305,7 +305,7 @@ SCMMenus = ( __decorate([
|
|
|
305
305
|
( __param(1, IInstantiationService))
|
|
306
306
|
], SCMMenus));
|
|
307
307
|
MenuRegistry.appendMenuItem(MenuId.SCMResourceContext, {
|
|
308
|
-
title: ( localize(
|
|
308
|
+
title: ( localize(10257, "Share")),
|
|
309
309
|
submenu: MenuId.SCMResourceContextShare,
|
|
310
310
|
group: '45_share',
|
|
311
311
|
order: 3,
|
|
@@ -61,7 +61,7 @@ let QuickDiffDecorator = QuickDiffDecorator_1 = class QuickDiffDecorator extends
|
|
|
61
61
|
const gutter = decorations === 'all' || decorations === 'gutter';
|
|
62
62
|
const overview = decorations === 'all' || decorations === 'overview';
|
|
63
63
|
const minimap = decorations === 'all' || decorations === 'minimap';
|
|
64
|
-
const diffAdded = ( localize(
|
|
64
|
+
const diffAdded = ( localize(10258, 'Added lines'));
|
|
65
65
|
const diffAddedOptions = {
|
|
66
66
|
gutter,
|
|
67
67
|
overview: { active: overview, color: overviewRulerAddedForeground },
|
|
@@ -72,7 +72,7 @@ let QuickDiffDecorator = QuickDiffDecorator_1 = class QuickDiffDecorator extends
|
|
|
72
72
|
this.addedPatternOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-added primary pattern', diffAdded, diffAddedOptions);
|
|
73
73
|
this.addedSecondaryOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-added secondary', diffAdded, diffAddedOptions);
|
|
74
74
|
this.addedSecondaryPatternOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-added secondary pattern', diffAdded, diffAddedOptions);
|
|
75
|
-
const diffModified = ( localize(
|
|
75
|
+
const diffModified = ( localize(10259, 'Changed lines'));
|
|
76
76
|
const diffModifiedOptions = {
|
|
77
77
|
gutter,
|
|
78
78
|
overview: { active: overview, color: overviewRulerModifiedForeground },
|
|
@@ -83,7 +83,7 @@ let QuickDiffDecorator = QuickDiffDecorator_1 = class QuickDiffDecorator extends
|
|
|
83
83
|
this.modifiedPatternOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-modified primary pattern', diffModified, diffModifiedOptions);
|
|
84
84
|
this.modifiedSecondaryOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-modified secondary', diffModified, diffModifiedOptions);
|
|
85
85
|
this.modifiedSecondaryPatternOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-modified secondary pattern', diffModified, diffModifiedOptions);
|
|
86
|
-
const diffDeleted = ( localize(
|
|
86
|
+
const diffDeleted = ( localize(10260, 'Removed lines'));
|
|
87
87
|
const diffDeletedOptions = {
|
|
88
88
|
gutter,
|
|
89
89
|
overview: { active: overview, color: overviewRulerDeletedForeground },
|
|
@@ -68,7 +68,7 @@ let QuickDiffPickerViewItem = class QuickDiffPickerViewItem extends SelectAction
|
|
|
68
68
|
const peekTitleColor = theme.getColor(peekViewTitleBackground);
|
|
69
69
|
const opaqueTitleColor = peekTitleColor?.makeOpaque(editorBackgroundColor) ?? editorBackgroundColor;
|
|
70
70
|
styles.selectBackground = ( ( opaqueTitleColor.lighten(.6)).toString());
|
|
71
|
-
super(null, action, [], 0, contextViewService, styles, { ariaLabel: ( localize(
|
|
71
|
+
super(null, action, [], 0, contextViewService, styles, { ariaLabel: ( localize(10261, 'Switch quick diff base')), useCustomDrawn: !hasNativeContextMenu(configurationService) });
|
|
72
72
|
this.optionsItems = [];
|
|
73
73
|
}
|
|
74
74
|
setSelection(quickDiffs, providerId) {
|
|
@@ -91,7 +91,7 @@ QuickDiffPickerViewItem = ( __decorate([
|
|
|
91
91
|
], QuickDiffPickerViewItem));
|
|
92
92
|
class QuickDiffPickerBaseAction extends Action {
|
|
93
93
|
static { this.ID = 'quickDiff.base.switch'; }
|
|
94
|
-
static { this.LABEL = ( localize(
|
|
94
|
+
static { this.LABEL = ( localize(10262, "Switch Quick Diff Base")); }
|
|
95
95
|
constructor(callback) {
|
|
96
96
|
super(QuickDiffPickerBaseAction.ID, QuickDiffPickerBaseAction.LABEL, undefined, undefined);
|
|
97
97
|
this.callback = callback;
|
|
@@ -218,14 +218,14 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
|
|
|
218
218
|
.find(quickDiff => quickDiff.id === this._providerId)?.label ?? '';
|
|
219
219
|
detail = this.model.changes.length > 1
|
|
220
220
|
? ( localize(
|
|
221
|
-
|
|
221
|
+
10263,
|
|
222
222
|
"{0} - {1} of {2} changes",
|
|
223
223
|
label,
|
|
224
224
|
providerIndex + 1,
|
|
225
225
|
providerChanges.length
|
|
226
226
|
))
|
|
227
227
|
: ( localize(
|
|
228
|
-
|
|
228
|
+
10264,
|
|
229
229
|
"{0} - {1} of {2} change",
|
|
230
230
|
label,
|
|
231
231
|
providerIndex + 1,
|
|
@@ -235,8 +235,8 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
|
|
|
235
235
|
}
|
|
236
236
|
else {
|
|
237
237
|
detail = this.model.changes.length > 1
|
|
238
|
-
? ( localize(
|
|
239
|
-
: ( localize(
|
|
238
|
+
? ( localize(10265, "{0} of {1} changes", providerIndex + 1, providerChanges.length))
|
|
239
|
+
: ( localize(10266, "{0} of {1} change", providerIndex + 1, providerChanges.length));
|
|
240
240
|
this.dropdownContainer.style.display = 'inherit';
|
|
241
241
|
}
|
|
242
242
|
this.setTitle(this.title, detail);
|
|
@@ -285,7 +285,7 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
|
|
|
285
285
|
this._actionbarWidget.clear();
|
|
286
286
|
this._actionbarWidget.push(actions.reverse(), { label: false, icon: true });
|
|
287
287
|
this._actionbarWidget.push([next, previous], { label: false, icon: true });
|
|
288
|
-
this._actionbarWidget.push(this._disposables.add(( new Action('peekview.close', ( localize(
|
|
288
|
+
this._actionbarWidget.push(this._disposables.add(( new Action('peekview.close', ( localize(10267, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), { label: false, icon: true });
|
|
289
289
|
}
|
|
290
290
|
updateDropdown() {
|
|
291
291
|
const quickDiffs = this.getQuickDiffsContainingChange();
|
|
@@ -636,7 +636,7 @@ class ShowPreviousChangeAction extends EditorAction {
|
|
|
636
636
|
constructor(outerEditor) {
|
|
637
637
|
super({
|
|
638
638
|
id: 'editor.action.dirtydiff.previous',
|
|
639
|
-
label: ( localize2(
|
|
639
|
+
label: ( localize2(10268, "Show Previous Change")),
|
|
640
640
|
precondition: ( TextCompareEditorActiveContext.toNegated()),
|
|
641
641
|
kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
|
|
642
642
|
});
|
|
@@ -662,7 +662,7 @@ class ShowNextChangeAction extends EditorAction {
|
|
|
662
662
|
constructor(outerEditor) {
|
|
663
663
|
super({
|
|
664
664
|
id: 'editor.action.dirtydiff.next',
|
|
665
|
-
label: ( localize2(
|
|
665
|
+
label: ( localize2(10269, "Show Next Change")),
|
|
666
666
|
precondition: ( TextCompareEditorActiveContext.toNegated()),
|
|
667
667
|
kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
|
|
668
668
|
});
|
|
@@ -688,7 +688,7 @@ class GotoPreviousChangeAction extends EditorAction {
|
|
|
688
688
|
constructor() {
|
|
689
689
|
super({
|
|
690
690
|
id: 'workbench.action.editor.previousChange',
|
|
691
|
-
label: ( localize2(
|
|
691
|
+
label: ( localize2(10270, "Go to Previous Change")),
|
|
692
692
|
precondition: ( ContextKeyExpr.and(( TextCompareEditorActiveContext.toNegated()), ( quickDiffDecorationCount.notEqualsTo(0)))),
|
|
693
693
|
kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
|
|
694
694
|
});
|
|
@@ -723,7 +723,7 @@ class GotoNextChangeAction extends EditorAction {
|
|
|
723
723
|
constructor() {
|
|
724
724
|
super({
|
|
725
725
|
id: 'workbench.action.editor.nextChange',
|
|
726
|
-
label: ( localize2(
|
|
726
|
+
label: ( localize2(10271, "Go to Next Change")),
|
|
727
727
|
precondition: ( ContextKeyExpr.and(( TextCompareEditorActiveContext.toNegated()), ( quickDiffDecorationCount.notEqualsTo(0)))),
|
|
728
728
|
kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
|
|
729
729
|
});
|
|
@@ -758,7 +758,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
|
|
|
758
758
|
group: '7_change_nav',
|
|
759
759
|
command: {
|
|
760
760
|
id: 'editor.action.dirtydiff.next',
|
|
761
|
-
title: ( localize(
|
|
761
|
+
title: ( localize(10272, "Next &&Change"))
|
|
762
762
|
},
|
|
763
763
|
order: 1
|
|
764
764
|
});
|
|
@@ -766,7 +766,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
|
|
|
766
766
|
group: '7_change_nav',
|
|
767
767
|
command: {
|
|
768
768
|
id: 'editor.action.dirtydiff.previous',
|
|
769
|
-
title: ( localize(
|
|
769
|
+
title: ( localize(10273, "Previous &&Change"))
|
|
770
770
|
},
|
|
771
771
|
order: 2
|
|
772
772
|
});
|
|
@@ -58,10 +58,10 @@ ModesRegistry.registerLanguage({
|
|
|
58
58
|
( Registry.as(Extensions.Workbench))
|
|
59
59
|
.registerWorkbenchContribution(QuickDiffWorkbenchController, LifecyclePhase.Restored);
|
|
60
60
|
registerEditorContribution(QuickDiffEditorController.ID, QuickDiffEditorController, EditorContributionInstantiation.AfterFirstRender);
|
|
61
|
-
const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localize(
|
|
61
|
+
const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localize(10274, 'View icon of the Source Control view.')));
|
|
62
62
|
const viewContainer = ( Registry.as(Extensions$1.ViewContainersRegistry)).registerViewContainer({
|
|
63
63
|
id: VIEWLET_ID,
|
|
64
|
-
title: ( localize2(
|
|
64
|
+
title: ( localize2(10275, 'Source Control')),
|
|
65
65
|
ctorDescriptor: ( new SyncDescriptor(SCMViewPaneContainer)),
|
|
66
66
|
storageId: 'workbench.scm.views.state',
|
|
67
67
|
icon: sourceControlViewIcon,
|
|
@@ -70,25 +70,25 @@ const viewContainer = ( Registry.as(Extensions$1.ViewContainersRegistry)).regist
|
|
|
70
70
|
hideIfEmpty: true,
|
|
71
71
|
}, ViewContainerLocation.Sidebar, { doNotRegisterOpenCommand: true });
|
|
72
72
|
const viewsRegistry = ( Registry.as(Extensions$1.ViewsRegistry));
|
|
73
|
-
const containerTitle = ( localize(
|
|
73
|
+
const containerTitle = ( localize(10276, "Source Control"));
|
|
74
74
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
75
|
-
content: ( localize(
|
|
75
|
+
content: ( localize(10277, "No source control providers registered.")),
|
|
76
76
|
when: 'default'
|
|
77
77
|
});
|
|
78
78
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
79
79
|
content: ( localize(
|
|
80
|
-
|
|
80
|
+
10278,
|
|
81
81
|
"None of the registered source control providers work in Restricted Mode."
|
|
82
82
|
)),
|
|
83
83
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('scm.providerCount', 0)), WorkspaceTrustContext.IsEnabled, ( WorkspaceTrustContext.IsTrusted.toNegated())))
|
|
84
84
|
});
|
|
85
85
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
86
|
-
content: `[${( localize(
|
|
86
|
+
content: `[${( localize(10279, "Manage Workspace Trust"))}](command:${MANAGE_TRUST_COMMAND_ID})`,
|
|
87
87
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('scm.providerCount', 0)), WorkspaceTrustContext.IsEnabled, ( WorkspaceTrustContext.IsTrusted.toNegated())))
|
|
88
88
|
});
|
|
89
89
|
viewsRegistry.registerViewWelcomeContent(HISTORY_VIEW_PANE_ID, {
|
|
90
90
|
content: ( localize(
|
|
91
|
-
|
|
91
|
+
10280,
|
|
92
92
|
"The selected source control provider does not have any source control history items."
|
|
93
93
|
)),
|
|
94
94
|
when: ( ContextKeys.SCMHistoryItemCount.isEqualTo(0))
|
|
@@ -96,8 +96,8 @@ viewsRegistry.registerViewWelcomeContent(HISTORY_VIEW_PANE_ID, {
|
|
|
96
96
|
viewsRegistry.registerViews([{
|
|
97
97
|
id: REPOSITORIES_VIEW_PANE_ID,
|
|
98
98
|
containerTitle,
|
|
99
|
-
name: ( localize2(
|
|
100
|
-
singleViewPaneContainerTitle: ( localize(
|
|
99
|
+
name: ( localize2(10281, "Repositories")),
|
|
100
|
+
singleViewPaneContainerTitle: ( localize(10282, "Source Control Repositories")),
|
|
101
101
|
ctorDescriptor: ( new SyncDescriptor(SCMRepositoriesViewPane)),
|
|
102
102
|
canToggleVisibility: true,
|
|
103
103
|
hideByDefault: true,
|
|
@@ -110,7 +110,7 @@ viewsRegistry.registerViews([{
|
|
|
110
110
|
viewsRegistry.registerViews([{
|
|
111
111
|
id: VIEW_PANE_ID,
|
|
112
112
|
containerTitle,
|
|
113
|
-
name: ( localize2(
|
|
113
|
+
name: ( localize2(10283, 'Changes')),
|
|
114
114
|
singleViewPaneContainerTitle: containerTitle,
|
|
115
115
|
ctorDescriptor: ( new SyncDescriptor(SCMViewPane)),
|
|
116
116
|
canToggleVisibility: true,
|
|
@@ -120,7 +120,7 @@ viewsRegistry.registerViews([{
|
|
|
120
120
|
containerIcon: sourceControlViewIcon,
|
|
121
121
|
openCommandActionDescriptor: {
|
|
122
122
|
id: viewContainer.id,
|
|
123
|
-
mnemonicTitle: ( localize(
|
|
123
|
+
mnemonicTitle: ( localize(10284, "Source &&Control")),
|
|
124
124
|
keybindings: {
|
|
125
125
|
primary: 0,
|
|
126
126
|
win: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG },
|
|
@@ -133,8 +133,8 @@ viewsRegistry.registerViews([{
|
|
|
133
133
|
viewsRegistry.registerViews([{
|
|
134
134
|
id: HISTORY_VIEW_PANE_ID,
|
|
135
135
|
containerTitle,
|
|
136
|
-
name: ( localize2(
|
|
137
|
-
singleViewPaneContainerTitle: ( localize(
|
|
136
|
+
name: ( localize2(10285, "Graph")),
|
|
137
|
+
singleViewPaneContainerTitle: ( localize(10286, "Source Control Graph")),
|
|
138
138
|
ctorDescriptor: ( new SyncDescriptor(SCMHistoryViewPane)),
|
|
139
139
|
canToggleVisibility: true,
|
|
140
140
|
canMoveView: true,
|
|
@@ -152,7 +152,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
152
152
|
( Registry.as(Extensions$2.Configuration)).registerConfiguration({
|
|
153
153
|
id: 'scm',
|
|
154
154
|
order: 5,
|
|
155
|
-
title: ( localize(
|
|
155
|
+
title: ( localize(10287, "Source Control")),
|
|
156
156
|
type: 'object',
|
|
157
157
|
scope: ConfigurationScope.RESOURCE,
|
|
158
158
|
properties: {
|
|
@@ -160,21 +160,21 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
160
160
|
type: 'string',
|
|
161
161
|
enum: ['all', 'gutter', 'overview', 'minimap', 'none'],
|
|
162
162
|
enumDescriptions: [
|
|
163
|
-
( localize(
|
|
164
|
-
( localize(
|
|
165
|
-
( localize(
|
|
166
|
-
( localize(
|
|
167
|
-
( localize(
|
|
163
|
+
( localize(10288, "Show the diff decorations in all available locations.")),
|
|
164
|
+
( localize(10289, "Show the diff decorations only in the editor gutter.")),
|
|
165
|
+
( localize(10290, "Show the diff decorations only in the overview ruler.")),
|
|
166
|
+
( localize(10291, "Show the diff decorations only in the minimap.")),
|
|
167
|
+
( localize(10292, "Do not show the diff decorations."))
|
|
168
168
|
],
|
|
169
169
|
default: 'all',
|
|
170
|
-
description: ( localize(
|
|
170
|
+
description: ( localize(10293, "Controls diff decorations in the editor."))
|
|
171
171
|
},
|
|
172
172
|
'scm.diffDecorationsGutterWidth': {
|
|
173
173
|
type: 'number',
|
|
174
174
|
enum: [1, 2, 3, 4, 5],
|
|
175
175
|
default: 3,
|
|
176
176
|
description: ( localize(
|
|
177
|
-
|
|
177
|
+
10294,
|
|
178
178
|
"Controls the width(px) of diff decorations in gutter (added & modified)."
|
|
179
179
|
))
|
|
180
180
|
},
|
|
@@ -182,11 +182,11 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
182
182
|
type: 'string',
|
|
183
183
|
enum: ['always', 'hover'],
|
|
184
184
|
enumDescriptions: [
|
|
185
|
-
( localize(
|
|
186
|
-
( localize(
|
|
185
|
+
( localize(10295, "Show the diff decorator in the gutter at all times.")),
|
|
186
|
+
( localize(10296, "Show the diff decorator in the gutter only on hover."))
|
|
187
187
|
],
|
|
188
188
|
description: ( localize(
|
|
189
|
-
|
|
189
|
+
10297,
|
|
190
190
|
"Controls the visibility of the Source Control diff decorator in the gutter."
|
|
191
191
|
)),
|
|
192
192
|
default: 'always'
|
|
@@ -195,28 +195,28 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
195
195
|
type: 'string',
|
|
196
196
|
enum: ['diff', 'none'],
|
|
197
197
|
enumDescriptions: [
|
|
198
|
-
( localize(
|
|
199
|
-
( localize(
|
|
198
|
+
( localize(10298, "Show the inline diff Peek view on click.")),
|
|
199
|
+
( localize(10299, "Do nothing."))
|
|
200
200
|
],
|
|
201
|
-
description: ( localize(
|
|
201
|
+
description: ( localize(10300, "Controls the behavior of Source Control diff gutter decorations.")),
|
|
202
202
|
default: 'diff'
|
|
203
203
|
},
|
|
204
204
|
'scm.diffDecorationsGutterPattern': {
|
|
205
205
|
type: 'object',
|
|
206
206
|
description: ( localize(
|
|
207
|
-
|
|
207
|
+
10301,
|
|
208
208
|
"Controls whether a pattern is used for the diff decorations in gutter."
|
|
209
209
|
)),
|
|
210
210
|
additionalProperties: false,
|
|
211
211
|
properties: {
|
|
212
212
|
'added': {
|
|
213
213
|
type: 'boolean',
|
|
214
|
-
description: ( localize(
|
|
214
|
+
description: ( localize(10302, "Use pattern for the diff decorations in gutter for added lines.")),
|
|
215
215
|
},
|
|
216
216
|
'modified': {
|
|
217
217
|
type: 'boolean',
|
|
218
218
|
description: ( localize(
|
|
219
|
-
|
|
219
|
+
10303,
|
|
220
220
|
"Use pattern for the diff decorations in gutter for modified lines."
|
|
221
221
|
)),
|
|
222
222
|
},
|
|
@@ -230,12 +230,12 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
230
230
|
type: 'string',
|
|
231
231
|
enum: ['true', 'false', 'inherit'],
|
|
232
232
|
enumDescriptions: [
|
|
233
|
-
( localize(
|
|
234
|
-
( localize(
|
|
235
|
-
( localize(
|
|
233
|
+
( localize(10304, "Ignore leading and trailing whitespace.")),
|
|
234
|
+
( localize(10305, "Do not ignore leading and trailing whitespace.")),
|
|
235
|
+
( localize(10306, "Inherit from `diffEditor.ignoreTrimWhitespace`."))
|
|
236
236
|
],
|
|
237
237
|
description: ( localize(
|
|
238
|
-
|
|
238
|
+
10307,
|
|
239
239
|
"Controls whether leading and trailing whitespace is ignored in Source Control diff gutter decorations."
|
|
240
240
|
)),
|
|
241
241
|
default: 'false'
|
|
@@ -243,7 +243,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
243
243
|
'scm.alwaysShowActions': {
|
|
244
244
|
type: 'boolean',
|
|
245
245
|
description: ( localize(
|
|
246
|
-
|
|
246
|
+
10308,
|
|
247
247
|
"Controls whether inline actions are always visible in the Source Control view."
|
|
248
248
|
)),
|
|
249
249
|
default: false
|
|
@@ -252,12 +252,12 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
252
252
|
type: 'string',
|
|
253
253
|
enum: ['all', 'focused', 'off'],
|
|
254
254
|
enumDescriptions: [
|
|
255
|
-
( localize(
|
|
256
|
-
( localize(
|
|
257
|
-
( localize(
|
|
255
|
+
( localize(10309, "Show the sum of all Source Control Provider count badges.")),
|
|
256
|
+
( localize(10310, "Show the count badge of the focused Source Control Provider.")),
|
|
257
|
+
( localize(10311, "Disable the Source Control count badge."))
|
|
258
258
|
],
|
|
259
259
|
description: ( localize(
|
|
260
|
-
|
|
260
|
+
10312,
|
|
261
261
|
"Controls the count badge on the Source Control icon on the Activity Bar."
|
|
262
262
|
)),
|
|
263
263
|
default: 'all'
|
|
@@ -266,12 +266,12 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
266
266
|
type: 'string',
|
|
267
267
|
enum: ['hidden', 'auto', 'visible'],
|
|
268
268
|
enumDescriptions: [
|
|
269
|
-
( localize(
|
|
270
|
-
( localize(
|
|
271
|
-
( localize(
|
|
269
|
+
( localize(10313, "Hide Source Control Provider count badges.")),
|
|
270
|
+
( localize(10314, "Only show count badge for Source Control Provider when non-zero.")),
|
|
271
|
+
( localize(10315, "Show Source Control Provider count badges."))
|
|
272
272
|
],
|
|
273
273
|
markdownDescription: ( localize(
|
|
274
|
-
|
|
274
|
+
10316,
|
|
275
275
|
"Controls the count badges on Source Control Provider headers. These headers appear in the Source Control view when there is more than one provider or when the {0} setting is enabled, and in the Source Control Repositories view.",
|
|
276
276
|
'\`#scm.alwaysShowRepositories#\`'
|
|
277
277
|
)),
|
|
@@ -281,22 +281,22 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
281
281
|
type: 'string',
|
|
282
282
|
enum: ['tree', 'list'],
|
|
283
283
|
enumDescriptions: [
|
|
284
|
-
( localize(
|
|
285
|
-
( localize(
|
|
284
|
+
( localize(10317, "Show the repository changes as a tree.")),
|
|
285
|
+
( localize(10318, "Show the repository changes as a list."))
|
|
286
286
|
],
|
|
287
|
-
description: ( localize(
|
|
287
|
+
description: ( localize(10319, "Controls the default Source Control repository view mode.")),
|
|
288
288
|
default: 'list'
|
|
289
289
|
},
|
|
290
290
|
'scm.defaultViewSortKey': {
|
|
291
291
|
type: 'string',
|
|
292
292
|
enum: ['name', 'path', 'status'],
|
|
293
293
|
enumDescriptions: [
|
|
294
|
-
( localize(
|
|
295
|
-
( localize(
|
|
296
|
-
( localize(
|
|
294
|
+
( localize(10320, "Sort the repository changes by file name.")),
|
|
295
|
+
( localize(10321, "Sort the repository changes by path.")),
|
|
296
|
+
( localize(10322, "Sort the repository changes by Source Control status."))
|
|
297
297
|
],
|
|
298
298
|
description: ( localize(
|
|
299
|
-
|
|
299
|
+
10323,
|
|
300
300
|
"Controls the default Source Control repository changes sort order when viewed as a list."
|
|
301
301
|
)),
|
|
302
302
|
default: 'path'
|
|
@@ -304,7 +304,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
304
304
|
'scm.autoReveal': {
|
|
305
305
|
type: 'boolean',
|
|
306
306
|
description: ( localize(
|
|
307
|
-
|
|
307
|
+
10324,
|
|
308
308
|
"Controls whether the Source Control view should automatically reveal and select files when opening them."
|
|
309
309
|
)),
|
|
310
310
|
default: true
|
|
@@ -312,20 +312,20 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
312
312
|
'scm.inputFontFamily': {
|
|
313
313
|
type: 'string',
|
|
314
314
|
markdownDescription: ( localize(
|
|
315
|
-
|
|
315
|
+
10325,
|
|
316
316
|
"Controls the font for the input message. Use `default` for the workbench user interface font family, `editor` for the `#editor.fontFamily#`'s value, or a custom font family."
|
|
317
317
|
)),
|
|
318
318
|
default: 'default'
|
|
319
319
|
},
|
|
320
320
|
'scm.inputFontSize': {
|
|
321
321
|
type: 'number',
|
|
322
|
-
markdownDescription: ( localize(
|
|
322
|
+
markdownDescription: ( localize(10326, "Controls the font size for the input message in pixels.")),
|
|
323
323
|
default: 13
|
|
324
324
|
},
|
|
325
325
|
'scm.inputMaxLineCount': {
|
|
326
326
|
type: 'number',
|
|
327
327
|
markdownDescription: ( localize(
|
|
328
|
-
|
|
328
|
+
10327,
|
|
329
329
|
"Controls the maximum number of lines that the input will auto-grow to."
|
|
330
330
|
)),
|
|
331
331
|
minimum: 1,
|
|
@@ -335,7 +335,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
335
335
|
'scm.inputMinLineCount': {
|
|
336
336
|
type: 'number',
|
|
337
337
|
markdownDescription: ( localize(
|
|
338
|
-
|
|
338
|
+
10328,
|
|
339
339
|
"Controls the minimum number of lines that the input will auto-grow from."
|
|
340
340
|
)),
|
|
341
341
|
minimum: 1,
|
|
@@ -345,7 +345,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
345
345
|
'scm.alwaysShowRepositories': {
|
|
346
346
|
type: 'boolean',
|
|
347
347
|
markdownDescription: ( localize(
|
|
348
|
-
|
|
348
|
+
10329,
|
|
349
349
|
"Controls whether repositories should always be visible in the Source Control view."
|
|
350
350
|
)),
|
|
351
351
|
default: false
|
|
@@ -355,20 +355,20 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
355
355
|
enum: ['discovery time', 'name', 'path'],
|
|
356
356
|
enumDescriptions: [
|
|
357
357
|
( localize(
|
|
358
|
-
|
|
358
|
+
10330,
|
|
359
359
|
"Repositories in the Source Control Repositories view are sorted by discovery time. Repositories in the Source Control view are sorted in the order that they were selected."
|
|
360
360
|
)),
|
|
361
361
|
( localize(
|
|
362
|
-
|
|
362
|
+
10331,
|
|
363
363
|
"Repositories in the Source Control Repositories and Source Control views are sorted by repository name."
|
|
364
364
|
)),
|
|
365
365
|
( localize(
|
|
366
|
-
|
|
366
|
+
10332,
|
|
367
367
|
"Repositories in the Source Control Repositories and Source Control views are sorted by repository path."
|
|
368
368
|
))
|
|
369
369
|
],
|
|
370
370
|
description: ( localize(
|
|
371
|
-
|
|
371
|
+
10333,
|
|
372
372
|
"Controls the sort order of the repositories in the source control repositories view."
|
|
373
373
|
)),
|
|
374
374
|
default: 'discovery time'
|
|
@@ -376,7 +376,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
376
376
|
'scm.repositories.visible': {
|
|
377
377
|
type: 'number',
|
|
378
378
|
description: ( localize(
|
|
379
|
-
|
|
379
|
+
10334,
|
|
380
380
|
"Controls how many repositories are visible in the Source Control Repositories section. Set to 0, to be able to manually resize the view."
|
|
381
381
|
)),
|
|
382
382
|
default: 10
|
|
@@ -385,11 +385,11 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
385
385
|
type: 'string',
|
|
386
386
|
enum: ['multiple', 'single'],
|
|
387
387
|
enumDescriptions: [
|
|
388
|
-
( localize(
|
|
389
|
-
( localize(
|
|
388
|
+
( localize(10335, "Multiple repositories can be selected at the same time.")),
|
|
389
|
+
( localize(10336, "Only one repository can be selected at a time."))
|
|
390
390
|
],
|
|
391
391
|
description: ( localize(
|
|
392
|
-
|
|
392
|
+
10337,
|
|
393
393
|
"Controls the selection mode of the repositories in the Source Control Repositories view."
|
|
394
394
|
)),
|
|
395
395
|
default: 'multiple'
|
|
@@ -397,7 +397,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
397
397
|
'scm.repositories.explorer': {
|
|
398
398
|
type: 'boolean',
|
|
399
399
|
markdownDescription: ( localize(
|
|
400
|
-
|
|
400
|
+
10338,
|
|
401
401
|
"Controls whether to show repository artifacts in the Source Control Repositories view. This feature is experimental and only works when {0} is set to `{1}`.",
|
|
402
402
|
'\`#scm.repositories.selectionMode#\`',
|
|
403
403
|
'single'
|
|
@@ -408,7 +408,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
408
408
|
'scm.showActionButton': {
|
|
409
409
|
type: 'boolean',
|
|
410
410
|
markdownDescription: ( localize(
|
|
411
|
-
|
|
411
|
+
10339,
|
|
412
412
|
"Controls whether an action button can be shown in the Source Control view."
|
|
413
413
|
)),
|
|
414
414
|
default: true
|
|
@@ -416,7 +416,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
416
416
|
'scm.showInputActionButton': {
|
|
417
417
|
type: 'boolean',
|
|
418
418
|
markdownDescription: ( localize(
|
|
419
|
-
|
|
419
|
+
10340,
|
|
420
420
|
"Controls whether an action button can be shown in the Source Control input."
|
|
421
421
|
)),
|
|
422
422
|
default: true
|
|
@@ -424,7 +424,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
424
424
|
'scm.workingSets.enabled': {
|
|
425
425
|
type: 'boolean',
|
|
426
426
|
description: ( localize(
|
|
427
|
-
|
|
427
|
+
10341,
|
|
428
428
|
"Controls whether to store editor working sets when switching between source control history item groups."
|
|
429
429
|
)),
|
|
430
430
|
default: false
|
|
@@ -434,16 +434,16 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
434
434
|
enum: ['empty', 'current'],
|
|
435
435
|
enumDescriptions: [
|
|
436
436
|
( localize(
|
|
437
|
-
|
|
437
|
+
10342,
|
|
438
438
|
"Use an empty working set when switching to a source control history item group that does not have a working set."
|
|
439
439
|
)),
|
|
440
440
|
( localize(
|
|
441
|
-
|
|
441
|
+
10343,
|
|
442
442
|
"Use the current working set when switching to a source control history item group that does not have a working set."
|
|
443
443
|
))
|
|
444
444
|
],
|
|
445
445
|
description: ( localize(
|
|
446
|
-
|
|
446
|
+
10344,
|
|
447
447
|
"Controls the default working set to use when switching to a source control history item group that does not have a working set."
|
|
448
448
|
)),
|
|
449
449
|
default: 'current'
|
|
@@ -451,7 +451,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
451
451
|
'scm.compactFolders': {
|
|
452
452
|
type: 'boolean',
|
|
453
453
|
description: ( localize(
|
|
454
|
-
|
|
454
|
+
10345,
|
|
455
455
|
"Controls whether the Source Control view should render folders in a compact form. In such a form, single child folders will be compressed in a combined tree element."
|
|
456
456
|
)),
|
|
457
457
|
default: true
|
|
@@ -459,7 +459,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
459
459
|
'scm.graph.pageOnScroll': {
|
|
460
460
|
type: 'boolean',
|
|
461
461
|
description: ( localize(
|
|
462
|
-
|
|
462
|
+
10346,
|
|
463
463
|
"Controls whether the Source Control Graph view will load the next page of items when you scroll to the end of the list."
|
|
464
464
|
)),
|
|
465
465
|
default: true
|
|
@@ -467,7 +467,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
467
467
|
'scm.graph.pageSize': {
|
|
468
468
|
type: 'number',
|
|
469
469
|
description: ( localize(
|
|
470
|
-
|
|
470
|
+
10347,
|
|
471
471
|
"The number of items to show in the Source Control Graph view by default and when loading more items."
|
|
472
472
|
)),
|
|
473
473
|
minimum: 1,
|
|
@@ -479,16 +479,16 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
479
479
|
enum: ['all', 'filter'],
|
|
480
480
|
enumDescriptions: [
|
|
481
481
|
( localize(
|
|
482
|
-
|
|
482
|
+
10348,
|
|
483
483
|
"Show badges of all history item groups in the Source Control Graph view."
|
|
484
484
|
)),
|
|
485
485
|
( localize(
|
|
486
|
-
|
|
486
|
+
10349,
|
|
487
487
|
"Show only the badges of history item groups used as a filter in the Source Control Graph view."
|
|
488
488
|
))
|
|
489
489
|
],
|
|
490
490
|
description: ( localize(
|
|
491
|
-
|
|
491
|
+
10350,
|
|
492
492
|
"Controls which badges are shown in the Source Control Graph view. The badges are shown on the right side of the graph indicating the names of history item groups."
|
|
493
493
|
)),
|
|
494
494
|
default: 'filter'
|
|
@@ -496,7 +496,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
496
496
|
'scm.graph.showIncomingChanges': {
|
|
497
497
|
type: 'boolean',
|
|
498
498
|
description: ( localize(
|
|
499
|
-
|
|
499
|
+
10351,
|
|
500
500
|
"Controls whether to show incoming changes in the Source Control Graph view."
|
|
501
501
|
)),
|
|
502
502
|
default: true
|
|
@@ -504,7 +504,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
504
504
|
'scm.graph.showOutgoingChanges': {
|
|
505
505
|
type: 'boolean',
|
|
506
506
|
description: ( localize(
|
|
507
|
-
|
|
507
|
+
10352,
|
|
508
508
|
"Controls whether to show outgoing changes in the Source Control Graph view."
|
|
509
509
|
)),
|
|
510
510
|
default: true
|
|
@@ -513,7 +513,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
513
513
|
});
|
|
514
514
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
515
515
|
id: 'scm.acceptInput',
|
|
516
|
-
metadata: { description: ( localize(
|
|
516
|
+
metadata: { description: ( localize(10353, "Source Control: Accept Input")), args: [] },
|
|
517
517
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
518
518
|
when: ( ContextKeyExpr.has('scmRepository')),
|
|
519
519
|
primary: KeyMod.CtrlCmd | KeyCode.Enter,
|
|
@@ -550,7 +550,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
550
550
|
}
|
|
551
551
|
});
|
|
552
552
|
const viewNextCommitCommand = {
|
|
553
|
-
description: { description: ( localize(
|
|
553
|
+
description: { description: ( localize(10354, "Source Control: View Next Commit")), args: [] },
|
|
554
554
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
555
555
|
handler: (accessor) => {
|
|
556
556
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
@@ -562,7 +562,7 @@ const viewNextCommitCommand = {
|
|
|
562
562
|
}
|
|
563
563
|
};
|
|
564
564
|
const viewPreviousCommitCommand = {
|
|
565
|
-
description: { description: ( localize(
|
|
565
|
+
description: { description: ( localize(10355, "Source Control: View Previous Commit")), args: [] },
|
|
566
566
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
567
567
|
handler: (accessor) => {
|
|
568
568
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
@@ -630,8 +630,8 @@ CommandsRegistry.registerCommand('scm.openInTerminal', async (accessor, provider
|
|
|
630
630
|
CommandsRegistry.registerCommand('scm.setActiveProvider', async (accessor) => {
|
|
631
631
|
const instantiationService = accessor.get(IInstantiationService);
|
|
632
632
|
const scmViewService = accessor.get(ISCMViewService);
|
|
633
|
-
const placeHolder = ( localize(
|
|
634
|
-
const autoQuickItemDescription = ( localize(
|
|
633
|
+
const placeHolder = ( localize(10356, "Select the active repository, type to filter all repositories"));
|
|
634
|
+
const autoQuickItemDescription = ( localize(10357, "The active repository is updated based on active editor"));
|
|
635
635
|
const repositoryPicker = instantiationService.createInstance(RepositoryPicker, placeHolder, autoQuickItemDescription);
|
|
636
636
|
const result = await repositoryPicker.pickRepository();
|
|
637
637
|
if (result?.repository) {
|
|
@@ -643,7 +643,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
|
|
|
643
643
|
group: '99_terminal',
|
|
644
644
|
command: {
|
|
645
645
|
id: 'scm.openInTerminal',
|
|
646
|
-
title: ( localize(
|
|
646
|
+
title: ( localize(10358, "Open in External Terminal"))
|
|
647
647
|
},
|
|
648
648
|
when: ( ContextKeyExpr.and(( RemoteNameContext.isEqualTo('')), ( ContextKeyExpr.equals('scmProviderHasRootUri', true)), ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'external')), ( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both'))))))
|
|
649
649
|
});
|
|
@@ -651,7 +651,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
|
|
|
651
651
|
group: '99_terminal',
|
|
652
652
|
command: {
|
|
653
653
|
id: 'scm.openInIntegratedTerminal',
|
|
654
|
-
title: ( localize(
|
|
654
|
+
title: ( localize(10359, "Open in Integrated Terminal"))
|
|
655
655
|
},
|
|
656
656
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('scmProviderHasRootUri', true)), ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'integrated')), ( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both'))))))
|
|
657
657
|
});
|
|
@@ -702,7 +702,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
702
702
|
}
|
|
703
703
|
});
|
|
704
704
|
MenuRegistry.appendMenuItem(MenuId.EditorLineNumberContext, {
|
|
705
|
-
title: ( localize(
|
|
705
|
+
title: ( localize(10360, "Diff Decorations")),
|
|
706
706
|
submenu: MenuId.SCMQuickDiffDecorations,
|
|
707
707
|
when: ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.scm.diffDecorations', 'all')), ( ContextKeyExpr.equals('config.scm.diffDecorations', 'gutter')))),
|
|
708
708
|
group: '9_quickDiffDecorations'
|
|
@@ -711,7 +711,7 @@ registerAction2(class extends Action2 {
|
|
|
711
711
|
constructor() {
|
|
712
712
|
super({
|
|
713
713
|
id: 'scm.editor.triggerSetup',
|
|
714
|
-
title: ( localize(
|
|
714
|
+
title: ( localize(10361, "Resolve Conflicts with AI")),
|
|
715
715
|
icon: Codicon.chatSparkle,
|
|
716
716
|
f1: false,
|
|
717
717
|
menu: {
|
|
@@ -55,75 +55,75 @@ let SCMAccessibilityHelpContentProvider = class SCMAccessibilityHelpContentProvi
|
|
|
55
55
|
const content = [];
|
|
56
56
|
if (this._scmViewService.visibleRepositories.length > 1) {
|
|
57
57
|
const repositoryList = ( this._scmViewService.visibleRepositories.map(r => r.provider.name)).join(', ');
|
|
58
|
-
content.push(( localize(
|
|
58
|
+
content.push(( localize(10362, "Visible repositories: {0}", repositoryList)));
|
|
59
59
|
}
|
|
60
60
|
const focusedRepository = this._scmViewService.focusedRepository;
|
|
61
61
|
if (focusedRepository) {
|
|
62
|
-
content.push(( localize(
|
|
62
|
+
content.push(( localize(10363, "Repository: {0}", focusedRepository.provider.name)));
|
|
63
63
|
const currentHistoryItemRef = focusedRepository.provider.historyProvider.get()?.historyItemRef.get();
|
|
64
64
|
if (currentHistoryItemRef) {
|
|
65
|
-
content.push(( localize(
|
|
65
|
+
content.push(( localize(10364, "History item reference: {0}", currentHistoryItemRef.name)));
|
|
66
66
|
}
|
|
67
67
|
if (focusedRepository.input.visible && focusedRepository.input.enabled && focusedRepository.input.value !== '') {
|
|
68
|
-
content.push(( localize(
|
|
68
|
+
content.push(( localize(10365, "Commit message: {0}", focusedRepository.input.value)));
|
|
69
69
|
}
|
|
70
70
|
const actionButton = focusedRepository.provider.actionButton.get();
|
|
71
71
|
if (actionButton) {
|
|
72
72
|
const label = actionButton.command.tooltip ?? actionButton.command.title;
|
|
73
|
-
const enablementLabel = actionButton.enabled ? ( localize(
|
|
74
|
-
content.push(( localize(
|
|
73
|
+
const enablementLabel = actionButton.enabled ? ( localize(10366, "enabled")) : ( localize(10367, "disabled"));
|
|
74
|
+
content.push(( localize(10368, "Action button: {0}, {1}", label, enablementLabel)));
|
|
75
75
|
}
|
|
76
76
|
const resourceGroups = [];
|
|
77
77
|
for (const resourceGroup of focusedRepository.provider.groups) {
|
|
78
78
|
resourceGroups.push(`${resourceGroup.label} (${resourceGroup.resources.length} resource(s))`);
|
|
79
79
|
}
|
|
80
80
|
( focusedRepository.provider.groups.map(g => g.label)).join(', ');
|
|
81
|
-
content.push(( localize(
|
|
81
|
+
content.push(( localize(10369, "Resource groups: {0}", resourceGroups.join(', '))));
|
|
82
82
|
}
|
|
83
83
|
content.push(( localize(
|
|
84
|
-
|
|
84
|
+
10370,
|
|
85
85
|
"Use the \"Source Control: Focus on Source Control Repositories View\" command to open the Source Control Repositories view."
|
|
86
86
|
)));
|
|
87
87
|
content.push(( localize(
|
|
88
|
-
|
|
88
|
+
10371,
|
|
89
89
|
"The Source Control Repositories view lists all repositories from the workspace and is only shown when the workspace contains more than one repository."
|
|
90
90
|
)));
|
|
91
|
-
content.push(( localize(
|
|
91
|
+
content.push(( localize(10372, "Once the Source Control Repositories view is opened you can:")));
|
|
92
92
|
content.push(( localize(
|
|
93
|
-
|
|
93
|
+
10373,
|
|
94
94
|
" - Use the up/down arrow keys to navigate the list of repositories."
|
|
95
95
|
)));
|
|
96
|
-
content.push(( localize(
|
|
97
|
-
content.push(( localize(
|
|
96
|
+
content.push(( localize(10374, " - Use the Enter or Space keys to select a repository.")));
|
|
97
|
+
content.push(( localize(10375, " - Use Shift + up/down keys to select multiple repositories.")));
|
|
98
98
|
content.push(( localize(
|
|
99
|
-
|
|
99
|
+
10376,
|
|
100
100
|
"Use the \"Source Control: Focus on Source Control View\" command to open the Source Control view."
|
|
101
101
|
)));
|
|
102
102
|
content.push(( localize(
|
|
103
|
-
|
|
103
|
+
10377,
|
|
104
104
|
"The Source Control view displays the resource groups and resources of the repository. If the workspace contains more than one repository it will list the resource groups and resources of the repositories selected in the Source Control Repositories view."
|
|
105
105
|
)));
|
|
106
|
-
content.push(( localize(
|
|
106
|
+
content.push(( localize(10378, "Once the Source Control view is opened you can:")));
|
|
107
107
|
content.push(( localize(
|
|
108
|
-
|
|
108
|
+
10379,
|
|
109
109
|
" - Use the up/down arrow keys to navigate the list of repositories, resource groups and resources."
|
|
110
110
|
)));
|
|
111
|
-
content.push(( localize(
|
|
111
|
+
content.push(( localize(10380, " - Use the Space key to expand or collapse a resource group.")));
|
|
112
112
|
content.push(( localize(
|
|
113
|
-
|
|
113
|
+
10381,
|
|
114
114
|
"Use the \"Source Control: Focus on Source Control Graph View\" command to open the Source Control Graph view."
|
|
115
115
|
)));
|
|
116
116
|
content.push(( localize(
|
|
117
|
-
|
|
117
|
+
10382,
|
|
118
118
|
"The Source Control Graph view displays a graph history items of the repository. If the workspace contains more than one repository it will list the history items of the active repository."
|
|
119
119
|
)));
|
|
120
|
-
content.push(( localize(
|
|
120
|
+
content.push(( localize(10383, "Once the Source Control Graph view is opened you can:")));
|
|
121
121
|
content.push(( localize(
|
|
122
|
-
|
|
122
|
+
10384,
|
|
123
123
|
" - Use the up/down arrow keys to navigate the list of history items."
|
|
124
124
|
)));
|
|
125
125
|
content.push(( localize(
|
|
126
|
-
|
|
126
|
+
10385,
|
|
127
127
|
" - Use the Space key to open the history item details in the multi-file diff editor."
|
|
128
128
|
)));
|
|
129
129
|
return content.join('\n');
|
|
@@ -125,23 +125,23 @@ class SCMHistoryItemRefsActionViewItem extends ActionViewItem {
|
|
|
125
125
|
icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.gitBranch));
|
|
126
126
|
const name = $('.name');
|
|
127
127
|
if (this._historyItemsFilter === 'all') {
|
|
128
|
-
name.textContent = ( localize(
|
|
128
|
+
name.textContent = ( localize(10406, "All"));
|
|
129
129
|
}
|
|
130
130
|
else if (this._historyItemsFilter === 'auto') {
|
|
131
|
-
name.textContent = ( localize(
|
|
131
|
+
name.textContent = ( localize(10407, "Auto"));
|
|
132
132
|
}
|
|
133
133
|
else if (this._historyItemsFilter.length === 1) {
|
|
134
134
|
name.textContent = this._historyItemsFilter[0].name;
|
|
135
135
|
}
|
|
136
136
|
else {
|
|
137
|
-
name.textContent = ( localize(
|
|
137
|
+
name.textContent = ( localize(10408, "{0} Items", this._historyItemsFilter.length));
|
|
138
138
|
}
|
|
139
139
|
reset(this.label, icon, name);
|
|
140
140
|
}
|
|
141
141
|
}
|
|
142
142
|
getTooltip() {
|
|
143
143
|
if (this._historyItemsFilter === 'all') {
|
|
144
|
-
return localize(
|
|
144
|
+
return localize(10409, "All history item references");
|
|
145
145
|
}
|
|
146
146
|
else if (this._historyItemsFilter === 'auto') {
|
|
147
147
|
const historyProvider = this._repository.provider.historyProvider.get();
|
|
@@ -163,7 +163,7 @@ registerAction2(class extends ViewAction {
|
|
|
163
163
|
constructor() {
|
|
164
164
|
super({
|
|
165
165
|
id: PICK_REPOSITORY_ACTION_ID,
|
|
166
|
-
title: ( localize(
|
|
166
|
+
title: ( localize(10410, "Repository Picker")),
|
|
167
167
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
168
168
|
f1: false,
|
|
169
169
|
menu: {
|
|
@@ -182,7 +182,7 @@ registerAction2(class extends ViewAction {
|
|
|
182
182
|
constructor() {
|
|
183
183
|
super({
|
|
184
184
|
id: PICK_HISTORY_ITEM_REFS_ACTION_ID,
|
|
185
|
-
title: ( localize(
|
|
185
|
+
title: ( localize(10411, "History Item Reference Picker")),
|
|
186
186
|
icon: Codicon.gitBranch,
|
|
187
187
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
188
188
|
precondition: ( ContextKeys.SCMHistoryItemCount.notEqualsTo(0)),
|
|
@@ -202,7 +202,7 @@ registerAction2(class extends ViewAction {
|
|
|
202
202
|
constructor() {
|
|
203
203
|
super({
|
|
204
204
|
id: 'workbench.scm.action.graph.revealCurrentHistoryItem',
|
|
205
|
-
title: ( localize(
|
|
205
|
+
title: ( localize(10412, "Go to Current History Item")),
|
|
206
206
|
icon: Codicon.target,
|
|
207
207
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
208
208
|
precondition: ( ContextKeyExpr.and(( ContextKeys.SCMHistoryItemCount.notEqualsTo(0)), ( ContextKeys.SCMCurrentHistoryItemRefInFilter.isEqualTo(true)))),
|
|
@@ -222,7 +222,7 @@ registerAction2(class extends ViewAction {
|
|
|
222
222
|
constructor() {
|
|
223
223
|
super({
|
|
224
224
|
id: 'workbench.scm.action.graph.refresh',
|
|
225
|
-
title: ( localize(
|
|
225
|
+
title: ( localize(10413, "Refresh")),
|
|
226
226
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
227
227
|
f1: false,
|
|
228
228
|
icon: Codicon.refresh,
|
|
@@ -241,7 +241,7 @@ registerAction2(class extends ViewAction {
|
|
|
241
241
|
constructor() {
|
|
242
242
|
super({
|
|
243
243
|
id: 'workbench.scm.action.graph.setListViewMode',
|
|
244
|
-
title: ( localize(
|
|
244
|
+
title: ( localize(10414, "View as List")),
|
|
245
245
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
246
246
|
toggled: ( ContextKeys.SCMHistoryViewMode.isEqualTo(ViewMode.List)),
|
|
247
247
|
menu: { id: MenuId.SCMHistoryTitle, group: '9_viewmode', order: 1 },
|
|
@@ -256,7 +256,7 @@ registerAction2(class extends ViewAction {
|
|
|
256
256
|
constructor() {
|
|
257
257
|
super({
|
|
258
258
|
id: 'workbench.scm.action.graph.setTreeViewMode',
|
|
259
|
-
title: ( localize(
|
|
259
|
+
title: ( localize(10415, "View as Tree")),
|
|
260
260
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
261
261
|
toggled: ( ContextKeys.SCMHistoryViewMode.isEqualTo(ViewMode.Tree)),
|
|
262
262
|
menu: { id: MenuId.SCMHistoryTitle, group: '9_viewmode', order: 2 },
|
|
@@ -271,7 +271,7 @@ registerAction2(class extends Action2 {
|
|
|
271
271
|
constructor() {
|
|
272
272
|
super({
|
|
273
273
|
id: 'workbench.scm.action.graph.viewChanges',
|
|
274
|
-
title: ( localize(
|
|
274
|
+
title: ( localize(10416, "Open Changes")),
|
|
275
275
|
icon: Codicon.diffMultiple,
|
|
276
276
|
f1: false,
|
|
277
277
|
menu: [
|
|
@@ -330,7 +330,7 @@ registerAction2(class extends Action2 {
|
|
|
330
330
|
constructor() {
|
|
331
331
|
super({
|
|
332
332
|
id: 'workbench.scm.action.graph.openFile',
|
|
333
|
-
title: ( localize(
|
|
333
|
+
title: ( localize(10417, "Open File")),
|
|
334
334
|
icon: Codicon.goToFile,
|
|
335
335
|
f1: false,
|
|
336
336
|
menu: [
|
|
@@ -354,10 +354,10 @@ registerAction2(class extends Action2 {
|
|
|
354
354
|
}
|
|
355
355
|
let version;
|
|
356
356
|
if (historyItem.id === SCMIncomingHistoryItemId) {
|
|
357
|
-
version = ( localize(
|
|
357
|
+
version = ( localize(10418, "Incoming Changes"));
|
|
358
358
|
}
|
|
359
359
|
else if (historyItem.id === SCMOutgoingHistoryItemId) {
|
|
360
|
-
version = ( localize(
|
|
360
|
+
version = ( localize(10419, "Outgoing Changes"));
|
|
361
361
|
}
|
|
362
362
|
else {
|
|
363
363
|
version = historyItem.displayId ?? historyItem.id;
|
|
@@ -655,7 +655,7 @@ let HistoryItemLoadMoreRenderer = class HistoryItemLoadMoreRenderer {
|
|
|
655
655
|
templateData.elementDisposables.add(autorun(reader => {
|
|
656
656
|
const isLoadingMore = this._isLoadingMore.read(reader);
|
|
657
657
|
const icon = `$(${isLoadingMore ? 'loading~spin' : 'fold-down'})`;
|
|
658
|
-
templateData.historyItemPlaceholderLabel.setLabel(( localize(
|
|
658
|
+
templateData.historyItemPlaceholderLabel.setLabel(( localize(10420, "{0} Load More...", icon)));
|
|
659
659
|
}));
|
|
660
660
|
}
|
|
661
661
|
}
|
|
@@ -715,7 +715,7 @@ SCMHistoryViewPaneActionRunner = ( __decorate([
|
|
|
715
715
|
], SCMHistoryViewPaneActionRunner));
|
|
716
716
|
class SCMHistoryTreeAccessibilityProvider {
|
|
717
717
|
getWidgetAriaLabel() {
|
|
718
|
-
return localize(
|
|
718
|
+
return localize(10421, "Source Control History");
|
|
719
719
|
}
|
|
720
720
|
getAriaLabel(element) {
|
|
721
721
|
if (isSCMRepository(element)) {
|
|
@@ -1191,8 +1191,8 @@ let RepositoryPicker = class RepositoryPicker {
|
|
|
1191
1191
|
this._quickInputService = _quickInputService;
|
|
1192
1192
|
this._scmViewService = _scmViewService;
|
|
1193
1193
|
this._autoQuickPickItem = {
|
|
1194
|
-
label: ( localize(
|
|
1195
|
-
description: ( localize(
|
|
1194
|
+
label: ( localize(10407, "Auto")),
|
|
1195
|
+
description: ( localize(10422, "Show the source control graph for the active repository")),
|
|
1196
1196
|
repository: 'auto'
|
|
1197
1197
|
};
|
|
1198
1198
|
}
|
|
@@ -1210,7 +1210,7 @@ let RepositoryPicker = class RepositoryPicker {
|
|
|
1210
1210
|
repository: r
|
|
1211
1211
|
}))));
|
|
1212
1212
|
return this._quickInputService.pick(picks, {
|
|
1213
|
-
placeHolder: ( localize(
|
|
1213
|
+
placeHolder: ( localize(10423, "Select the repository to view, type to filter all repositories"))
|
|
1214
1214
|
});
|
|
1215
1215
|
}
|
|
1216
1216
|
};
|
|
@@ -1226,21 +1226,21 @@ let HistoryItemRefPicker = class HistoryItemRefPicker extends Disposable {
|
|
|
1226
1226
|
this._quickInputService = _quickInputService;
|
|
1227
1227
|
this._allQuickPickItem = {
|
|
1228
1228
|
id: 'all',
|
|
1229
|
-
label: ( localize(
|
|
1230
|
-
description: ( localize(
|
|
1229
|
+
label: ( localize(10406, "All")),
|
|
1230
|
+
description: ( localize(10409, "All history item references")),
|
|
1231
1231
|
historyItemRef: 'all'
|
|
1232
1232
|
};
|
|
1233
1233
|
this._autoQuickPickItem = {
|
|
1234
1234
|
id: 'auto',
|
|
1235
|
-
label: ( localize(
|
|
1236
|
-
description: ( localize(
|
|
1235
|
+
label: ( localize(10407, "Auto")),
|
|
1236
|
+
description: ( localize(10424, "Current history item reference(s)")),
|
|
1237
1237
|
historyItemRef: 'auto'
|
|
1238
1238
|
};
|
|
1239
1239
|
}
|
|
1240
1240
|
async pickHistoryItemRef() {
|
|
1241
1241
|
const quickPick = this._quickInputService.createQuickPick({ useSeparators: true });
|
|
1242
1242
|
this._store.add(quickPick);
|
|
1243
|
-
quickPick.placeholder = ( localize(
|
|
1243
|
+
quickPick.placeholder = ( localize(10425, "Select one/more history item references to view, type to filter"));
|
|
1244
1244
|
quickPick.canSelectMany = true;
|
|
1245
1245
|
quickPick.hideCheckAll = true;
|
|
1246
1246
|
quickPick.busy = true;
|
|
@@ -1374,7 +1374,7 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
|
|
|
1374
1374
|
container.appendChild(element.root);
|
|
1375
1375
|
this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), element.root, {
|
|
1376
1376
|
markdown: {
|
|
1377
|
-
value: ( localize(
|
|
1377
|
+
value: ( localize(10426, "Please refresh the graph using the refresh action ($(refresh)).")),
|
|
1378
1378
|
supportThemeIcons: true
|
|
1379
1379
|
},
|
|
1380
1380
|
markdownNotSupportedFallback: undefined
|
|
@@ -1617,9 +1617,9 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
|
|
|
1617
1617
|
const historyItemChange = e.element.historyItemChange;
|
|
1618
1618
|
const historyItem = e.element.historyItemViewModel.historyItem;
|
|
1619
1619
|
const historyItemDisplayId = historyItem.id === SCMIncomingHistoryItemId
|
|
1620
|
-
? ( localize(
|
|
1620
|
+
? ( localize(10418, "Incoming Changes"))
|
|
1621
1621
|
: historyItem.id === SCMOutgoingHistoryItemId
|
|
1622
|
-
? ( localize(
|
|
1622
|
+
? ( localize(10419, "Outgoing Changes"))
|
|
1623
1623
|
: historyItem.displayId ?? historyItem.id;
|
|
1624
1624
|
const historyItemParentId = historyItem.parentIds.length > 0 ? historyItem.parentIds[0] : undefined;
|
|
1625
1625
|
const historyItemParentDisplayId = historyItemParentId && historyItem.displayId
|
|
@@ -451,7 +451,7 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
|
|
|
451
451
|
}
|
|
452
452
|
},
|
|
453
453
|
getWidgetAriaLabel() {
|
|
454
|
-
return localize(
|
|
454
|
+
return localize(10427, "Source Control Repositories");
|
|
455
455
|
}
|
|
456
456
|
}
|
|
457
457
|
});
|
|
@@ -163,7 +163,7 @@ let RepositoryRenderer = class RepositoryRenderer {
|
|
|
163
163
|
menuPrimaryActions = primary;
|
|
164
164
|
menuSecondaryActions = secondary;
|
|
165
165
|
updateToolbar();
|
|
166
|
-
}, 'inline'));
|
|
166
|
+
}, this.toolbarMenuId === MenuId.SCMTitle ? 'navigation' : 'inline'));
|
|
167
167
|
}));
|
|
168
168
|
templateData.toolBar.context = repository.provider;
|
|
169
169
|
}
|
|
@@ -761,7 +761,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
|
|
|
761
761
|
this.labelService = labelService;
|
|
762
762
|
}
|
|
763
763
|
getWidgetAriaLabel() {
|
|
764
|
-
return localize(
|
|
764
|
+
return localize(10428, "Source Control Management");
|
|
765
765
|
}
|
|
766
766
|
getAriaLabel(element) {
|
|
767
767
|
if (ResourceTree.isResourceNode(element)) {
|
|
@@ -773,17 +773,17 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
|
|
|
773
773
|
else if (isSCMInput(element)) {
|
|
774
774
|
const verbosity = this.configurationService.getValue(AccessibilityVerbositySettingId.SourceControl) === true;
|
|
775
775
|
if (!verbosity || !this.accessibilityService.isScreenReaderOptimized()) {
|
|
776
|
-
return localize(
|
|
776
|
+
return localize(10429, "Source Control Input");
|
|
777
777
|
}
|
|
778
778
|
const kbLabel = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
|
|
779
779
|
return kbLabel
|
|
780
780
|
? ( localize(
|
|
781
|
-
|
|
781
|
+
10430,
|
|
782
782
|
"Source Control Input, Use {0} to open Source Control Accessibility Help.",
|
|
783
783
|
kbLabel
|
|
784
784
|
))
|
|
785
785
|
: ( localize(
|
|
786
|
-
|
|
786
|
+
10431,
|
|
787
787
|
"Source Control Input, Run the Open Accessibility Help command for more information."
|
|
788
788
|
));
|
|
789
789
|
}
|
|
@@ -842,14 +842,14 @@ const ContextKeys = {
|
|
|
842
842
|
}
|
|
843
843
|
};
|
|
844
844
|
MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
|
|
845
|
-
title: ( localize(
|
|
845
|
+
title: ( localize(10432, "View & Sort")),
|
|
846
846
|
submenu: Menus.ViewSort,
|
|
847
847
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_PANE_ID)), ( ContextKeys.RepositoryCount.notEqualsTo(0)))),
|
|
848
848
|
group: '0_view&sort',
|
|
849
849
|
order: 1
|
|
850
850
|
});
|
|
851
851
|
MenuRegistry.appendMenuItem(Menus.ViewSort, {
|
|
852
|
-
title: ( localize(
|
|
852
|
+
title: ( localize(10433, "Repositories")),
|
|
853
853
|
submenu: Menus.Repositories,
|
|
854
854
|
when: ContextKeyExpr.greater(ContextKeys.RepositoryCount.key, 1),
|
|
855
855
|
group: '0_repositories'
|
|
@@ -939,7 +939,7 @@ class SetListViewModeAction extends ViewAction {
|
|
|
939
939
|
constructor() {
|
|
940
940
|
super({
|
|
941
941
|
id: 'workbench.scm.action.setListViewMode',
|
|
942
|
-
title: ( localize(
|
|
942
|
+
title: ( localize(10434, "View as List")),
|
|
943
943
|
viewId: VIEW_PANE_ID,
|
|
944
944
|
f1: false,
|
|
945
945
|
icon: Codicon.listTree,
|
|
@@ -955,7 +955,7 @@ class SetTreeViewModeAction extends ViewAction {
|
|
|
955
955
|
constructor() {
|
|
956
956
|
super({
|
|
957
957
|
id: 'workbench.scm.action.setTreeViewMode',
|
|
958
|
-
title: ( localize(
|
|
958
|
+
title: ( localize(10435, "View as Tree")),
|
|
959
959
|
viewId: VIEW_PANE_ID,
|
|
960
960
|
f1: false,
|
|
961
961
|
icon: Codicon.listFlat,
|
|
@@ -995,17 +995,17 @@ class RepositorySortAction extends Action2 {
|
|
|
995
995
|
}
|
|
996
996
|
class RepositorySortByDiscoveryTimeAction extends RepositorySortAction {
|
|
997
997
|
constructor() {
|
|
998
|
-
super(ISCMRepositorySortKey.DiscoveryTime, ( localize(
|
|
998
|
+
super(ISCMRepositorySortKey.DiscoveryTime, ( localize(10436, "Sort by Discovery Time")));
|
|
999
999
|
}
|
|
1000
1000
|
}
|
|
1001
1001
|
class RepositorySortByNameAction extends RepositorySortAction {
|
|
1002
1002
|
constructor() {
|
|
1003
|
-
super(ISCMRepositorySortKey.Name, ( localize(
|
|
1003
|
+
super(ISCMRepositorySortKey.Name, ( localize(10437, "Sort by Name")));
|
|
1004
1004
|
}
|
|
1005
1005
|
}
|
|
1006
1006
|
class RepositorySortByPathAction extends RepositorySortAction {
|
|
1007
1007
|
constructor() {
|
|
1008
|
-
super(ISCMRepositorySortKey.Path, ( localize(
|
|
1008
|
+
super(ISCMRepositorySortKey.Path, ( localize(10438, "Sort by Path")));
|
|
1009
1009
|
}
|
|
1010
1010
|
}
|
|
1011
1011
|
registerAction2(RepositorySortByDiscoveryTimeAction);
|
|
@@ -1041,12 +1041,12 @@ class RepositorySelectionModeAction extends Action2 {
|
|
|
1041
1041
|
}
|
|
1042
1042
|
class RepositorySingleSelectionModeAction extends RepositorySelectionModeAction {
|
|
1043
1043
|
constructor() {
|
|
1044
|
-
super(ISCMRepositorySelectionMode.Single, ( localize(
|
|
1044
|
+
super(ISCMRepositorySelectionMode.Single, ( localize(10439, "Select Single Repository")), 1);
|
|
1045
1045
|
}
|
|
1046
1046
|
}
|
|
1047
1047
|
class RepositoryMultiSelectionModeAction extends RepositorySelectionModeAction {
|
|
1048
1048
|
constructor() {
|
|
1049
|
-
super(ISCMRepositorySelectionMode.Multiple, ( localize(
|
|
1049
|
+
super(ISCMRepositorySelectionMode.Multiple, ( localize(10440, "Select Multiple Repositories")), 2);
|
|
1050
1050
|
}
|
|
1051
1051
|
}
|
|
1052
1052
|
registerAction2(RepositorySingleSelectionModeAction);
|
|
@@ -1070,17 +1070,17 @@ class SetSortKeyAction extends ViewAction {
|
|
|
1070
1070
|
}
|
|
1071
1071
|
class SetSortByNameAction extends SetSortKeyAction {
|
|
1072
1072
|
constructor() {
|
|
1073
|
-
super(ViewSortKey.Name, ( localize(
|
|
1073
|
+
super(ViewSortKey.Name, ( localize(10441, "Sort Changes by Name")));
|
|
1074
1074
|
}
|
|
1075
1075
|
}
|
|
1076
1076
|
class SetSortByPathAction extends SetSortKeyAction {
|
|
1077
1077
|
constructor() {
|
|
1078
|
-
super(ViewSortKey.Path, ( localize(
|
|
1078
|
+
super(ViewSortKey.Path, ( localize(10442, "Sort Changes by Path")));
|
|
1079
1079
|
}
|
|
1080
1080
|
}
|
|
1081
1081
|
class SetSortByStatusAction extends SetSortKeyAction {
|
|
1082
1082
|
constructor() {
|
|
1083
|
-
super(ViewSortKey.Status, ( localize(
|
|
1083
|
+
super(ViewSortKey.Status, ( localize(10443, "Sort Changes by Status")));
|
|
1084
1084
|
}
|
|
1085
1085
|
}
|
|
1086
1086
|
registerAction2(SetSortByNameAction);
|
|
@@ -1090,7 +1090,7 @@ class CollapseAllRepositoriesAction extends ViewAction {
|
|
|
1090
1090
|
constructor() {
|
|
1091
1091
|
super({
|
|
1092
1092
|
id: `workbench.scm.action.collapseAllRepositories`,
|
|
1093
|
-
title: ( localize(
|
|
1093
|
+
title: ( localize(10444, "Collapse All Repositories")),
|
|
1094
1094
|
viewId: VIEW_PANE_ID,
|
|
1095
1095
|
f1: false,
|
|
1096
1096
|
icon: Codicon.collapseAll,
|
|
@@ -1109,7 +1109,7 @@ class ExpandAllRepositoriesAction extends ViewAction {
|
|
|
1109
1109
|
constructor() {
|
|
1110
1110
|
super({
|
|
1111
1111
|
id: `workbench.scm.action.expandAllRepositories`,
|
|
1112
|
-
title: ( localize(
|
|
1112
|
+
title: ( localize(10445, "Expand All Repositories")),
|
|
1113
1113
|
viewId: VIEW_PANE_ID,
|
|
1114
1114
|
f1: false,
|
|
1115
1115
|
icon: Codicon.expandAll,
|
|
@@ -1139,7 +1139,7 @@ registerAction2(class extends Action2 {
|
|
|
1139
1139
|
constructor() {
|
|
1140
1140
|
super({
|
|
1141
1141
|
id: SCMInputWidgetCommandId.SetupAction,
|
|
1142
|
-
title: ( localize(
|
|
1142
|
+
title: ( localize(10446, "Generate Commit Message")),
|
|
1143
1143
|
icon: Codicon.sparkle,
|
|
1144
1144
|
f1: false,
|
|
1145
1145
|
menu: {
|
|
@@ -1214,10 +1214,10 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
|
|
|
1214
1214
|
this._onDidChange = ( new Emitter());
|
|
1215
1215
|
this.onDidChange = this._onDidChange.event;
|
|
1216
1216
|
this._disposables = this._register(( new MutableDisposable()));
|
|
1217
|
-
this._dropdownAction = ( new Action('scmInputMoreActions', ( localize(
|
|
1217
|
+
this._dropdownAction = ( new Action('scmInputMoreActions', ( localize(10447, "More Actions...")), 'codicon-chevron-down'));
|
|
1218
1218
|
this._cancelAction = ( new MenuItemAction({
|
|
1219
1219
|
id: SCMInputWidgetCommandId.CancelAction,
|
|
1220
|
-
title: ( localize(
|
|
1220
|
+
title: ( localize(10448, "Cancel")),
|
|
1221
1221
|
icon: Codicon.stopCircle,
|
|
1222
1222
|
}, undefined, undefined, undefined, undefined, contextKeyService, commandService));
|
|
1223
1223
|
}
|
|
@@ -1433,13 +1433,13 @@ let SCMInputWidget = class SCMInputWidget {
|
|
|
1433
1433
|
const kbLabel = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
|
|
1434
1434
|
return kbLabel
|
|
1435
1435
|
? ( localize(
|
|
1436
|
-
|
|
1436
|
+
10449,
|
|
1437
1437
|
"{0}, Use {1} to open Source Control Accessibility Help.",
|
|
1438
1438
|
placeholder,
|
|
1439
1439
|
kbLabel
|
|
1440
1440
|
))
|
|
1441
1441
|
: ( localize(
|
|
1442
|
-
|
|
1442
|
+
10450,
|
|
1443
1443
|
"{0}, Run the Open Accessibility Help command for more information.",
|
|
1444
1444
|
placeholder
|
|
1445
1445
|
));
|
|
@@ -1695,7 +1695,7 @@ let SCMInputWidget = class SCMInputWidget {
|
|
|
1695
1695
|
}
|
|
1696
1696
|
const actionsContainer = append(validationContainer, $('.scm-editor-validation-actions'));
|
|
1697
1697
|
const actionbar = ( new ActionBar(actionsContainer));
|
|
1698
|
-
const action = ( new Action('scmInputWidget.validationMessage.close', ( localize(
|
|
1698
|
+
const action = ( new Action('scmInputWidget.validationMessage.close', ( localize(10451, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
|
|
1699
1699
|
this.contextViewService.hideContextView();
|
|
1700
1700
|
this.element.style.borderBottomLeftRadius = '2px';
|
|
1701
1701
|
this.element.style.borderBottomRightRadius = '2px';
|
|
@@ -55,7 +55,7 @@ let RepositoryPicker = class RepositoryPicker {
|
|
|
55
55
|
this._quickInputService = _quickInputService;
|
|
56
56
|
this._scmViewService = _scmViewService;
|
|
57
57
|
this._autoQuickPickItem = {
|
|
58
|
-
label: ( localize(
|
|
58
|
+
label: ( localize(10452, "Auto")),
|
|
59
59
|
description: this._autoQuickItemDescription,
|
|
60
60
|
repository: 'auto'
|
|
61
61
|
};
|