@codingame/monaco-vscode-scm-service-override 18.1.3 → 18.2.1
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 +15 -15
- 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 +82 -82
- package/vscode/src/vs/workbench/contrib/scm/browser/scmAccessibilityHelp.js +23 -23
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistoryChatContext.js +5 -5
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.js +24 -24
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.js +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js +23 -23
- 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": "18.1
|
|
3
|
+
"version": "18.2.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "VSCode public API plugged on the monaco editor - scm service-override",
|
|
6
6
|
"keywords": [],
|
|
@@ -15,20 +15,20 @@
|
|
|
15
15
|
},
|
|
16
16
|
"type": "module",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@codingame/monaco-vscode-27663a0b-1249-58ba-9085-e52d706b50bc-common": "18.1
|
|
19
|
-
"@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common": "18.1
|
|
20
|
-
"@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "18.1
|
|
21
|
-
"@codingame/monaco-vscode-
|
|
22
|
-
"@codingame/monaco-vscode-
|
|
23
|
-
"@codingame/monaco-vscode-
|
|
24
|
-
"@codingame/monaco-vscode-937ecbdf-94c7-5b16-aefa-ad78ae557a93-common": "18.1
|
|
25
|
-
"@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "18.1
|
|
26
|
-
"@codingame/monaco-vscode-api": "18.1
|
|
27
|
-
"@codingame/monaco-vscode-f24b7f0a-ceeb-5877-9148-81eb98a4f5d7-common": "18.1
|
|
28
|
-
"@codingame/monaco-vscode-f338ac19-278c-5fe1-bec8-b588de04a788-common": "18.1
|
|
29
|
-
"@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common": "18.1
|
|
30
|
-
"@codingame/monaco-vscode-f99b74f5-fcb7-512f-8c6c-35f5a107577d-common": "18.1
|
|
31
|
-
"@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common": "18.1
|
|
18
|
+
"@codingame/monaco-vscode-27663a0b-1249-58ba-9085-e52d706b50bc-common": "18.2.1",
|
|
19
|
+
"@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common": "18.2.1",
|
|
20
|
+
"@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "18.2.1",
|
|
21
|
+
"@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "18.2.1",
|
|
22
|
+
"@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common": "18.2.1",
|
|
23
|
+
"@codingame/monaco-vscode-8d39d04c-3201-5bd6-be79-eed8d17a5ad0-common": "18.2.1",
|
|
24
|
+
"@codingame/monaco-vscode-937ecbdf-94c7-5b16-aefa-ad78ae557a93-common": "18.2.1",
|
|
25
|
+
"@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "18.2.1",
|
|
26
|
+
"@codingame/monaco-vscode-api": "18.2.1",
|
|
27
|
+
"@codingame/monaco-vscode-f24b7f0a-ceeb-5877-9148-81eb98a4f5d7-common": "18.2.1",
|
|
28
|
+
"@codingame/monaco-vscode-f338ac19-278c-5fe1-bec8-b588de04a788-common": "18.2.1",
|
|
29
|
+
"@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common": "18.2.1",
|
|
30
|
+
"@codingame/monaco-vscode-f99b74f5-fcb7-512f-8c6c-35f5a107577d-common": "18.2.1",
|
|
31
|
+
"@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common": "18.2.1"
|
|
32
32
|
},
|
|
33
33
|
"main": "index.js",
|
|
34
34
|
"module": "index.js",
|
|
@@ -104,7 +104,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
|
|
|
104
104
|
if (count === 0) {
|
|
105
105
|
return;
|
|
106
106
|
}
|
|
107
|
-
const badge = ( new NumberBadge(count, num => ( localize(
|
|
107
|
+
const badge = ( new NumberBadge(count, num => ( localize(9324, '{0} pending changes', num))));
|
|
108
108
|
store.add(this.activityService.showViewActivity(VIEW_PANE_ID, { badge }));
|
|
109
109
|
}
|
|
110
110
|
_updateStatusBar(repository, commands, store) {
|
|
@@ -130,7 +130,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
|
|
|
130
130
|
repoAgnosticActionName = '';
|
|
131
131
|
}
|
|
132
132
|
const statusbarEntry = {
|
|
133
|
-
name: ( localize(
|
|
133
|
+
name: ( localize(9325, "Source Control")) + (repoAgnosticActionName ? ` ${repoAgnosticActionName}` : ''),
|
|
134
134
|
text: command.title,
|
|
135
135
|
ariaLabel: tooltip,
|
|
136
136
|
tooltip,
|
|
@@ -142,7 +142,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
|
|
|
142
142
|
}
|
|
143
143
|
if (this.scmService.repositoryCount > 1) {
|
|
144
144
|
const repositoryStatusbarEntry = {
|
|
145
|
-
name: ( localize(
|
|
145
|
+
name: ( localize(9326, "Source Control Provider")),
|
|
146
146
|
text: `$(repo) ${repository.provider.name}`,
|
|
147
147
|
ariaLabel: label,
|
|
148
148
|
tooltip: label,
|
|
@@ -171,8 +171,8 @@ let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyCon
|
|
|
171
171
|
this.scmService = scmService;
|
|
172
172
|
this.uriIdentityService = uriIdentityService;
|
|
173
173
|
this._onDidRepositoryChange = ( new Emitter());
|
|
174
|
-
const activeResourceHasChangesContextKey = ( new RawContextKey('scmActiveResourceHasChanges', false, ( localize(
|
|
175
|
-
const activeResourceRepositoryContextKey = ( new RawContextKey('scmActiveResourceRepository', undefined, ( localize(
|
|
174
|
+
const activeResourceHasChangesContextKey = ( new RawContextKey('scmActiveResourceHasChanges', false, ( localize(9327, "Whether the active resource has changes"))));
|
|
175
|
+
const activeResourceRepositoryContextKey = ( new RawContextKey('scmActiveResourceRepository', undefined, ( localize(9328, "The active resource's repository"))));
|
|
176
176
|
this._repositories = observableFromEvent(this, Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository), () => this.scmService.repositories);
|
|
177
177
|
this._store.add(autorunWithStore((reader, store) => {
|
|
178
178
|
for (const repository of this._repositories.read(reader)) {
|
|
@@ -233,7 +233,7 @@ SCMMenus = ( __decorate([
|
|
|
233
233
|
( __param(1, IInstantiationService))
|
|
234
234
|
], SCMMenus));
|
|
235
235
|
MenuRegistry.appendMenuItem(MenuId.SCMResourceContext, {
|
|
236
|
-
title: ( localize(
|
|
236
|
+
title: ( localize(9329, "Share")),
|
|
237
237
|
submenu: MenuId.SCMResourceContextShare,
|
|
238
238
|
group: '45_share',
|
|
239
239
|
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(9330, '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(9331, '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(9332, '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(9333, '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(9334, "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
|
+
9335,
|
|
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
|
+
9336,
|
|
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(9337, "{0} of {1} changes", providerIndex + 1, providerChanges.length))
|
|
239
|
+
: ( localize(9338, "{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(9339, "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(9340, "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(9341, "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(9342, "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(9343, "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(9344, "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(9345, "Previous &&Change"))
|
|
770
770
|
},
|
|
771
771
|
order: 2
|
|
772
772
|
});
|
|
@@ -55,10 +55,10 @@ ModesRegistry.registerLanguage({
|
|
|
55
55
|
( Registry.as(Extensions.Workbench))
|
|
56
56
|
.registerWorkbenchContribution(QuickDiffWorkbenchController, LifecyclePhase.Restored);
|
|
57
57
|
registerEditorContribution(QuickDiffEditorController.ID, QuickDiffEditorController, EditorContributionInstantiation.AfterFirstRender);
|
|
58
|
-
const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localize(
|
|
58
|
+
const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localize(9346, 'View icon of the Source Control view.')));
|
|
59
59
|
const viewContainer = ( Registry.as(Extensions$1.ViewContainersRegistry)).registerViewContainer({
|
|
60
60
|
id: VIEWLET_ID,
|
|
61
|
-
title: ( localize2(
|
|
61
|
+
title: ( localize2(9347, 'Source Control')),
|
|
62
62
|
ctorDescriptor: ( new SyncDescriptor(SCMViewPaneContainer)),
|
|
63
63
|
storageId: 'workbench.scm.views.state',
|
|
64
64
|
icon: sourceControlViewIcon,
|
|
@@ -67,25 +67,25 @@ const viewContainer = ( Registry.as(Extensions$1.ViewContainersRegistry)).regist
|
|
|
67
67
|
hideIfEmpty: true,
|
|
68
68
|
}, ViewContainerLocation.Sidebar, { doNotRegisterOpenCommand: true });
|
|
69
69
|
const viewsRegistry = ( Registry.as(Extensions$1.ViewsRegistry));
|
|
70
|
-
const containerTitle = ( localize(
|
|
70
|
+
const containerTitle = ( localize(9348, "Source Control"));
|
|
71
71
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
72
|
-
content: ( localize(
|
|
72
|
+
content: ( localize(9349, "No source control providers registered.")),
|
|
73
73
|
when: 'default'
|
|
74
74
|
});
|
|
75
75
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
76
76
|
content: ( localize(
|
|
77
|
-
|
|
77
|
+
9350,
|
|
78
78
|
"None of the registered source control providers work in Restricted Mode."
|
|
79
79
|
)),
|
|
80
80
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('scm.providerCount', 0)), WorkspaceTrustContext.IsEnabled, ( WorkspaceTrustContext.IsTrusted.toNegated())))
|
|
81
81
|
});
|
|
82
82
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
83
|
-
content: `[${( localize(
|
|
83
|
+
content: `[${( localize(9351, "Manage Workspace Trust"))}](command:${MANAGE_TRUST_COMMAND_ID})`,
|
|
84
84
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('scm.providerCount', 0)), WorkspaceTrustContext.IsEnabled, ( WorkspaceTrustContext.IsTrusted.toNegated())))
|
|
85
85
|
});
|
|
86
86
|
viewsRegistry.registerViewWelcomeContent(HISTORY_VIEW_PANE_ID, {
|
|
87
87
|
content: ( localize(
|
|
88
|
-
|
|
88
|
+
9352,
|
|
89
89
|
"The selected source control provider does not have any source control history items."
|
|
90
90
|
)),
|
|
91
91
|
when: ( ContextKeys.SCMHistoryItemCount.isEqualTo(0))
|
|
@@ -93,8 +93,8 @@ viewsRegistry.registerViewWelcomeContent(HISTORY_VIEW_PANE_ID, {
|
|
|
93
93
|
viewsRegistry.registerViews([{
|
|
94
94
|
id: REPOSITORIES_VIEW_PANE_ID,
|
|
95
95
|
containerTitle,
|
|
96
|
-
name: ( localize2(
|
|
97
|
-
singleViewPaneContainerTitle: ( localize(
|
|
96
|
+
name: ( localize2(9353, "Repositories")),
|
|
97
|
+
singleViewPaneContainerTitle: ( localize(9354, "Source Control Repositories")),
|
|
98
98
|
ctorDescriptor: ( new SyncDescriptor(SCMRepositoriesViewPane)),
|
|
99
99
|
canToggleVisibility: true,
|
|
100
100
|
hideByDefault: true,
|
|
@@ -107,7 +107,7 @@ viewsRegistry.registerViews([{
|
|
|
107
107
|
viewsRegistry.registerViews([{
|
|
108
108
|
id: VIEW_PANE_ID,
|
|
109
109
|
containerTitle,
|
|
110
|
-
name: ( localize2(
|
|
110
|
+
name: ( localize2(9355, 'Changes')),
|
|
111
111
|
singleViewPaneContainerTitle: containerTitle,
|
|
112
112
|
ctorDescriptor: ( new SyncDescriptor(SCMViewPane)),
|
|
113
113
|
canToggleVisibility: true,
|
|
@@ -117,7 +117,7 @@ viewsRegistry.registerViews([{
|
|
|
117
117
|
containerIcon: sourceControlViewIcon,
|
|
118
118
|
openCommandActionDescriptor: {
|
|
119
119
|
id: viewContainer.id,
|
|
120
|
-
mnemonicTitle: ( localize(
|
|
120
|
+
mnemonicTitle: ( localize(9356, "Source &&Control")),
|
|
121
121
|
keybindings: {
|
|
122
122
|
primary: 0,
|
|
123
123
|
win: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG },
|
|
@@ -130,8 +130,8 @@ viewsRegistry.registerViews([{
|
|
|
130
130
|
viewsRegistry.registerViews([{
|
|
131
131
|
id: HISTORY_VIEW_PANE_ID,
|
|
132
132
|
containerTitle,
|
|
133
|
-
name: ( localize2(
|
|
134
|
-
singleViewPaneContainerTitle: ( localize(
|
|
133
|
+
name: ( localize2(9357, "Graph")),
|
|
134
|
+
singleViewPaneContainerTitle: ( localize(9358, "Source Control Graph")),
|
|
135
135
|
ctorDescriptor: ( new SyncDescriptor(SCMHistoryViewPane)),
|
|
136
136
|
canToggleVisibility: true,
|
|
137
137
|
canMoveView: true,
|
|
@@ -149,7 +149,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
149
149
|
( Registry.as(Extensions$2.Configuration)).registerConfiguration({
|
|
150
150
|
id: 'scm',
|
|
151
151
|
order: 5,
|
|
152
|
-
title: ( localize(
|
|
152
|
+
title: ( localize(9359, "Source Control")),
|
|
153
153
|
type: 'object',
|
|
154
154
|
scope: ConfigurationScope.RESOURCE,
|
|
155
155
|
properties: {
|
|
@@ -157,21 +157,21 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
157
157
|
type: 'string',
|
|
158
158
|
enum: ['all', 'gutter', 'overview', 'minimap', 'none'],
|
|
159
159
|
enumDescriptions: [
|
|
160
|
-
( localize(
|
|
161
|
-
( localize(
|
|
162
|
-
( localize(
|
|
163
|
-
( localize(
|
|
164
|
-
( localize(
|
|
160
|
+
( localize(9360, "Show the diff decorations in all available locations.")),
|
|
161
|
+
( localize(9361, "Show the diff decorations only in the editor gutter.")),
|
|
162
|
+
( localize(9362, "Show the diff decorations only in the overview ruler.")),
|
|
163
|
+
( localize(9363, "Show the diff decorations only in the minimap.")),
|
|
164
|
+
( localize(9364, "Do not show the diff decorations."))
|
|
165
165
|
],
|
|
166
166
|
default: 'all',
|
|
167
|
-
description: ( localize(
|
|
167
|
+
description: ( localize(9365, "Controls diff decorations in the editor."))
|
|
168
168
|
},
|
|
169
169
|
'scm.diffDecorationsGutterWidth': {
|
|
170
170
|
type: 'number',
|
|
171
171
|
enum: [1, 2, 3, 4, 5],
|
|
172
172
|
default: 3,
|
|
173
173
|
description: ( localize(
|
|
174
|
-
|
|
174
|
+
9366,
|
|
175
175
|
"Controls the width(px) of diff decorations in gutter (added & modified)."
|
|
176
176
|
))
|
|
177
177
|
},
|
|
@@ -179,11 +179,11 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
179
179
|
type: 'string',
|
|
180
180
|
enum: ['always', 'hover'],
|
|
181
181
|
enumDescriptions: [
|
|
182
|
-
( localize(
|
|
183
|
-
( localize(
|
|
182
|
+
( localize(9367, "Show the diff decorator in the gutter at all times.")),
|
|
183
|
+
( localize(9368, "Show the diff decorator in the gutter only on hover."))
|
|
184
184
|
],
|
|
185
185
|
description: ( localize(
|
|
186
|
-
|
|
186
|
+
9369,
|
|
187
187
|
"Controls the visibility of the Source Control diff decorator in the gutter."
|
|
188
188
|
)),
|
|
189
189
|
default: 'always'
|
|
@@ -192,27 +192,27 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
192
192
|
type: 'string',
|
|
193
193
|
enum: ['diff', 'none'],
|
|
194
194
|
enumDescriptions: [
|
|
195
|
-
( localize(
|
|
196
|
-
( localize(
|
|
195
|
+
( localize(9370, "Show the inline diff Peek view on click.")),
|
|
196
|
+
( localize(9371, "Do nothing."))
|
|
197
197
|
],
|
|
198
|
-
description: ( localize(
|
|
198
|
+
description: ( localize(9372, "Controls the behavior of Source Control diff gutter decorations.")),
|
|
199
199
|
default: 'diff'
|
|
200
200
|
},
|
|
201
201
|
'scm.diffDecorationsGutterPattern': {
|
|
202
202
|
type: 'object',
|
|
203
203
|
description: ( localize(
|
|
204
|
-
|
|
204
|
+
9373,
|
|
205
205
|
"Controls whether a pattern is used for the diff decorations in gutter."
|
|
206
206
|
)),
|
|
207
207
|
additionalProperties: false,
|
|
208
208
|
properties: {
|
|
209
209
|
'added': {
|
|
210
210
|
type: 'boolean',
|
|
211
|
-
description: ( localize(
|
|
211
|
+
description: ( localize(9374, "Use pattern for the diff decorations in gutter for added lines.")),
|
|
212
212
|
},
|
|
213
213
|
'modified': {
|
|
214
214
|
type: 'boolean',
|
|
215
|
-
description: ( localize(
|
|
215
|
+
description: ( localize(9375, "Use pattern for the diff decorations in gutter for modified lines.")),
|
|
216
216
|
},
|
|
217
217
|
},
|
|
218
218
|
default: {
|
|
@@ -224,12 +224,12 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
224
224
|
type: 'string',
|
|
225
225
|
enum: ['true', 'false', 'inherit'],
|
|
226
226
|
enumDescriptions: [
|
|
227
|
-
( localize(
|
|
228
|
-
( localize(
|
|
229
|
-
( localize(
|
|
227
|
+
( localize(9376, "Ignore leading and trailing whitespace.")),
|
|
228
|
+
( localize(9377, "Do not ignore leading and trailing whitespace.")),
|
|
229
|
+
( localize(9378, "Inherit from `diffEditor.ignoreTrimWhitespace`."))
|
|
230
230
|
],
|
|
231
231
|
description: ( localize(
|
|
232
|
-
|
|
232
|
+
9379,
|
|
233
233
|
"Controls whether leading and trailing whitespace is ignored in Source Control diff gutter decorations."
|
|
234
234
|
)),
|
|
235
235
|
default: 'false'
|
|
@@ -237,7 +237,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
237
237
|
'scm.alwaysShowActions': {
|
|
238
238
|
type: 'boolean',
|
|
239
239
|
description: ( localize(
|
|
240
|
-
|
|
240
|
+
9380,
|
|
241
241
|
"Controls whether inline actions are always visible in the Source Control view."
|
|
242
242
|
)),
|
|
243
243
|
default: false
|
|
@@ -246,12 +246,12 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
246
246
|
type: 'string',
|
|
247
247
|
enum: ['all', 'focused', 'off'],
|
|
248
248
|
enumDescriptions: [
|
|
249
|
-
( localize(
|
|
250
|
-
( localize(
|
|
251
|
-
( localize(
|
|
249
|
+
( localize(9381, "Show the sum of all Source Control Provider count badges.")),
|
|
250
|
+
( localize(9382, "Show the count badge of the focused Source Control Provider.")),
|
|
251
|
+
( localize(9383, "Disable the Source Control count badge."))
|
|
252
252
|
],
|
|
253
253
|
description: ( localize(
|
|
254
|
-
|
|
254
|
+
9384,
|
|
255
255
|
"Controls the count badge on the Source Control icon on the Activity Bar."
|
|
256
256
|
)),
|
|
257
257
|
default: 'all'
|
|
@@ -260,12 +260,12 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
260
260
|
type: 'string',
|
|
261
261
|
enum: ['hidden', 'auto', 'visible'],
|
|
262
262
|
enumDescriptions: [
|
|
263
|
-
( localize(
|
|
264
|
-
( localize(
|
|
265
|
-
( localize(
|
|
263
|
+
( localize(9385, "Hide Source Control Provider count badges.")),
|
|
264
|
+
( localize(9386, "Only show count badge for Source Control Provider when non-zero.")),
|
|
265
|
+
( localize(9387, "Show Source Control Provider count badges."))
|
|
266
266
|
],
|
|
267
267
|
markdownDescription: ( localize(
|
|
268
|
-
|
|
268
|
+
9388,
|
|
269
269
|
"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.",
|
|
270
270
|
'\`#scm.alwaysShowRepositories#\`'
|
|
271
271
|
)),
|
|
@@ -275,22 +275,22 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
275
275
|
type: 'string',
|
|
276
276
|
enum: ['tree', 'list'],
|
|
277
277
|
enumDescriptions: [
|
|
278
|
-
( localize(
|
|
279
|
-
( localize(
|
|
278
|
+
( localize(9389, "Show the repository changes as a tree.")),
|
|
279
|
+
( localize(9390, "Show the repository changes as a list."))
|
|
280
280
|
],
|
|
281
|
-
description: ( localize(
|
|
281
|
+
description: ( localize(9391, "Controls the default Source Control repository view mode.")),
|
|
282
282
|
default: 'list'
|
|
283
283
|
},
|
|
284
284
|
'scm.defaultViewSortKey': {
|
|
285
285
|
type: 'string',
|
|
286
286
|
enum: ['name', 'path', 'status'],
|
|
287
287
|
enumDescriptions: [
|
|
288
|
-
( localize(
|
|
289
|
-
( localize(
|
|
290
|
-
( localize(
|
|
288
|
+
( localize(9392, "Sort the repository changes by file name.")),
|
|
289
|
+
( localize(9393, "Sort the repository changes by path.")),
|
|
290
|
+
( localize(9394, "Sort the repository changes by Source Control status."))
|
|
291
291
|
],
|
|
292
292
|
description: ( localize(
|
|
293
|
-
|
|
293
|
+
9395,
|
|
294
294
|
"Controls the default Source Control repository changes sort order when viewed as a list."
|
|
295
295
|
)),
|
|
296
296
|
default: 'path'
|
|
@@ -298,7 +298,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
298
298
|
'scm.autoReveal': {
|
|
299
299
|
type: 'boolean',
|
|
300
300
|
description: ( localize(
|
|
301
|
-
|
|
301
|
+
9396,
|
|
302
302
|
"Controls whether the Source Control view should automatically reveal and select files when opening them."
|
|
303
303
|
)),
|
|
304
304
|
default: true
|
|
@@ -306,20 +306,20 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
306
306
|
'scm.inputFontFamily': {
|
|
307
307
|
type: 'string',
|
|
308
308
|
markdownDescription: ( localize(
|
|
309
|
-
|
|
309
|
+
9397,
|
|
310
310
|
"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."
|
|
311
311
|
)),
|
|
312
312
|
default: 'default'
|
|
313
313
|
},
|
|
314
314
|
'scm.inputFontSize': {
|
|
315
315
|
type: 'number',
|
|
316
|
-
markdownDescription: ( localize(
|
|
316
|
+
markdownDescription: ( localize(9398, "Controls the font size for the input message in pixels.")),
|
|
317
317
|
default: 13
|
|
318
318
|
},
|
|
319
319
|
'scm.inputMaxLineCount': {
|
|
320
320
|
type: 'number',
|
|
321
321
|
markdownDescription: ( localize(
|
|
322
|
-
|
|
322
|
+
9399,
|
|
323
323
|
"Controls the maximum number of lines that the input will auto-grow to."
|
|
324
324
|
)),
|
|
325
325
|
minimum: 1,
|
|
@@ -329,7 +329,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
329
329
|
'scm.inputMinLineCount': {
|
|
330
330
|
type: 'number',
|
|
331
331
|
markdownDescription: ( localize(
|
|
332
|
-
|
|
332
|
+
9400,
|
|
333
333
|
"Controls the minimum number of lines that the input will auto-grow from."
|
|
334
334
|
)),
|
|
335
335
|
minimum: 1,
|
|
@@ -339,7 +339,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
339
339
|
'scm.alwaysShowRepositories': {
|
|
340
340
|
type: 'boolean',
|
|
341
341
|
markdownDescription: ( localize(
|
|
342
|
-
|
|
342
|
+
9401,
|
|
343
343
|
"Controls whether repositories should always be visible in the Source Control view."
|
|
344
344
|
)),
|
|
345
345
|
default: false
|
|
@@ -349,20 +349,20 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
349
349
|
enum: ['discovery time', 'name', 'path'],
|
|
350
350
|
enumDescriptions: [
|
|
351
351
|
( localize(
|
|
352
|
-
|
|
352
|
+
9402,
|
|
353
353
|
"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."
|
|
354
354
|
)),
|
|
355
355
|
( localize(
|
|
356
|
-
|
|
356
|
+
9403,
|
|
357
357
|
"Repositories in the Source Control Repositories and Source Control views are sorted by repository name."
|
|
358
358
|
)),
|
|
359
359
|
( localize(
|
|
360
|
-
|
|
360
|
+
9404,
|
|
361
361
|
"Repositories in the Source Control Repositories and Source Control views are sorted by repository path."
|
|
362
362
|
))
|
|
363
363
|
],
|
|
364
364
|
description: ( localize(
|
|
365
|
-
|
|
365
|
+
9405,
|
|
366
366
|
"Controls the sort order of the repositories in the source control repositories view."
|
|
367
367
|
)),
|
|
368
368
|
default: 'discovery time'
|
|
@@ -370,7 +370,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
370
370
|
'scm.repositories.visible': {
|
|
371
371
|
type: 'number',
|
|
372
372
|
description: ( localize(
|
|
373
|
-
|
|
373
|
+
9406,
|
|
374
374
|
"Controls how many repositories are visible in the Source Control Repositories section. Set to 0, to be able to manually resize the view."
|
|
375
375
|
)),
|
|
376
376
|
default: 10
|
|
@@ -378,7 +378,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
378
378
|
'scm.showActionButton': {
|
|
379
379
|
type: 'boolean',
|
|
380
380
|
markdownDescription: ( localize(
|
|
381
|
-
|
|
381
|
+
9407,
|
|
382
382
|
"Controls whether an action button can be shown in the Source Control view."
|
|
383
383
|
)),
|
|
384
384
|
default: true
|
|
@@ -386,7 +386,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
386
386
|
'scm.showInputActionButton': {
|
|
387
387
|
type: 'boolean',
|
|
388
388
|
markdownDescription: ( localize(
|
|
389
|
-
|
|
389
|
+
9408,
|
|
390
390
|
"Controls whether an action button can be shown in the Source Control input."
|
|
391
391
|
)),
|
|
392
392
|
default: true
|
|
@@ -394,7 +394,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
394
394
|
'scm.workingSets.enabled': {
|
|
395
395
|
type: 'boolean',
|
|
396
396
|
description: ( localize(
|
|
397
|
-
|
|
397
|
+
9409,
|
|
398
398
|
"Controls whether to store editor working sets when switching between source control history item groups."
|
|
399
399
|
)),
|
|
400
400
|
default: false
|
|
@@ -404,16 +404,16 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
404
404
|
enum: ['empty', 'current'],
|
|
405
405
|
enumDescriptions: [
|
|
406
406
|
( localize(
|
|
407
|
-
|
|
407
|
+
9410,
|
|
408
408
|
"Use an empty working set when switching to a source control history item group that does not have a working set."
|
|
409
409
|
)),
|
|
410
410
|
( localize(
|
|
411
|
-
|
|
411
|
+
9411,
|
|
412
412
|
"Use the current working set when switching to a source control history item group that does not have a working set."
|
|
413
413
|
))
|
|
414
414
|
],
|
|
415
415
|
description: ( localize(
|
|
416
|
-
|
|
416
|
+
9412,
|
|
417
417
|
"Controls the default working set to use when switching to a source control history item group that does not have a working set."
|
|
418
418
|
)),
|
|
419
419
|
default: 'current'
|
|
@@ -421,7 +421,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
421
421
|
'scm.compactFolders': {
|
|
422
422
|
type: 'boolean',
|
|
423
423
|
description: ( localize(
|
|
424
|
-
|
|
424
|
+
9413,
|
|
425
425
|
"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."
|
|
426
426
|
)),
|
|
427
427
|
default: true
|
|
@@ -429,7 +429,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
429
429
|
'scm.graph.pageOnScroll': {
|
|
430
430
|
type: 'boolean',
|
|
431
431
|
description: ( localize(
|
|
432
|
-
|
|
432
|
+
9414,
|
|
433
433
|
"Controls whether the Source Control Graph view will load the next page of items when you scroll to the end of the list."
|
|
434
434
|
)),
|
|
435
435
|
default: true
|
|
@@ -437,7 +437,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
437
437
|
'scm.graph.pageSize': {
|
|
438
438
|
type: 'number',
|
|
439
439
|
description: ( localize(
|
|
440
|
-
|
|
440
|
+
9415,
|
|
441
441
|
"The number of items to show in the Source Control Graph view by default and when loading more items."
|
|
442
442
|
)),
|
|
443
443
|
minimum: 1,
|
|
@@ -449,16 +449,16 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
449
449
|
enum: ['all', 'filter'],
|
|
450
450
|
enumDescriptions: [
|
|
451
451
|
( localize(
|
|
452
|
-
|
|
452
|
+
9416,
|
|
453
453
|
"Show badges of all history item groups in the Source Control Graph view."
|
|
454
454
|
)),
|
|
455
455
|
( localize(
|
|
456
|
-
|
|
456
|
+
9417,
|
|
457
457
|
"Show only the badges of history item groups used as a filter in the Source Control Graph view."
|
|
458
458
|
))
|
|
459
459
|
],
|
|
460
460
|
description: ( localize(
|
|
461
|
-
|
|
461
|
+
9418,
|
|
462
462
|
"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."
|
|
463
463
|
)),
|
|
464
464
|
default: 'filter'
|
|
@@ -467,7 +467,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
467
467
|
});
|
|
468
468
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
469
469
|
id: 'scm.acceptInput',
|
|
470
|
-
metadata: { description: ( localize(
|
|
470
|
+
metadata: { description: ( localize(9419, "Source Control: Accept Input")), args: [] },
|
|
471
471
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
472
472
|
when: ( ContextKeyExpr.has('scmRepository')),
|
|
473
473
|
primary: KeyMod.CtrlCmd | KeyCode.Enter,
|
|
@@ -504,7 +504,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
504
504
|
}
|
|
505
505
|
});
|
|
506
506
|
const viewNextCommitCommand = {
|
|
507
|
-
description: { description: ( localize(
|
|
507
|
+
description: { description: ( localize(9420, "Source Control: View Next Commit")), args: [] },
|
|
508
508
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
509
509
|
handler: (accessor) => {
|
|
510
510
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
@@ -516,7 +516,7 @@ const viewNextCommitCommand = {
|
|
|
516
516
|
}
|
|
517
517
|
};
|
|
518
518
|
const viewPreviousCommitCommand = {
|
|
519
|
-
description: { description: ( localize(
|
|
519
|
+
description: { description: ( localize(9421, "Source Control: View Previous Commit")), args: [] },
|
|
520
520
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
521
521
|
handler: (accessor) => {
|
|
522
522
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
@@ -584,9 +584,9 @@ CommandsRegistry.registerCommand('scm.openInTerminal', async (accessor, provider
|
|
|
584
584
|
CommandsRegistry.registerCommand('scm.setActiveProvider', async (accessor) => {
|
|
585
585
|
const instantiationService = accessor.get(IInstantiationService);
|
|
586
586
|
const scmViewService = accessor.get(ISCMViewService);
|
|
587
|
-
const placeHolder = ( localize(
|
|
587
|
+
const placeHolder = ( localize(9422, "Select the active repository, type to filter all repositories"));
|
|
588
588
|
const autoQuickItemDescription = ( localize(
|
|
589
|
-
|
|
589
|
+
9423,
|
|
590
590
|
"The active repository is updated based on focused repository/active editor"
|
|
591
591
|
));
|
|
592
592
|
const repositoryPicker = instantiationService.createInstance(RepositoryPicker, placeHolder, autoQuickItemDescription);
|
|
@@ -600,7 +600,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
|
|
|
600
600
|
group: '100_end',
|
|
601
601
|
command: {
|
|
602
602
|
id: 'scm.openInTerminal',
|
|
603
|
-
title: ( localize(
|
|
603
|
+
title: ( localize(9424, "Open in External Terminal"))
|
|
604
604
|
},
|
|
605
605
|
when: ( ContextKeyExpr.and(( RemoteNameContext.isEqualTo('')), ( ContextKeyExpr.equals('scmProviderHasRootUri', true)), ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'external')), ( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both'))))))
|
|
606
606
|
});
|
|
@@ -608,7 +608,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
|
|
|
608
608
|
group: '100_end',
|
|
609
609
|
command: {
|
|
610
610
|
id: 'scm.openInIntegratedTerminal',
|
|
611
|
-
title: ( localize(
|
|
611
|
+
title: ( localize(9425, "Open in Integrated Terminal"))
|
|
612
612
|
},
|
|
613
613
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('scmProviderHasRootUri', true)), ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'integrated')), ( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both'))))))
|
|
614
614
|
});
|
|
@@ -659,13 +659,13 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
659
659
|
}
|
|
660
660
|
});
|
|
661
661
|
MenuRegistry.appendMenuItem(MenuId.EditorLineNumberContext, {
|
|
662
|
-
title: ( localize(
|
|
662
|
+
title: ( localize(9426, "Diff Decorations")),
|
|
663
663
|
submenu: MenuId.SCMQuickDiffDecorations,
|
|
664
664
|
when: ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.scm.diffDecorations', 'all')), ( ContextKeyExpr.equals('config.scm.diffDecorations', 'gutter')))),
|
|
665
665
|
group: '9_quickDiffDecorations'
|
|
666
666
|
});
|
|
667
667
|
MenuRegistry.appendMenuItem(MenuId.SCMHistoryItemContext, {
|
|
668
|
-
title: ( localize(
|
|
668
|
+
title: ( localize(9427, "Copilot")),
|
|
669
669
|
submenu: MenuId.SCMHistoryItemChatContext,
|
|
670
670
|
group: '8_chat'
|
|
671
671
|
});
|
|
@@ -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(9428, "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(9429, "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(9430, "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(9431, "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(9432, "enabled")) : ( localize(9433, "disabled"));
|
|
74
|
+
content.push(( localize(9434, "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(9435, "Resource groups: {0}", resourceGroups.join(', '))));
|
|
82
82
|
}
|
|
83
83
|
content.push(( localize(
|
|
84
|
-
|
|
84
|
+
9436,
|
|
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
|
+
9437,
|
|
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(9438, "Once the Source Control Repositories view is opened you can:")));
|
|
92
92
|
content.push(( localize(
|
|
93
|
-
|
|
93
|
+
9439,
|
|
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(9440, " - Use the Enter or Space keys to select a repository.")));
|
|
97
|
+
content.push(( localize(9441, " - Use Shift + up/down keys to select multiple repositories.")));
|
|
98
98
|
content.push(( localize(
|
|
99
|
-
|
|
99
|
+
9442,
|
|
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
|
+
9443,
|
|
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(9444, "Once the Source Control view is opened you can:")));
|
|
107
107
|
content.push(( localize(
|
|
108
|
-
|
|
108
|
+
9445,
|
|
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(9446, " - Use the Space key to expand or collapse a resource group.")));
|
|
112
112
|
content.push(( localize(
|
|
113
|
-
|
|
113
|
+
9447,
|
|
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
|
+
9448,
|
|
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(9449, "Once the Source Control Graph view is opened you can:")));
|
|
121
121
|
content.push(( localize(
|
|
122
|
-
|
|
122
|
+
9450,
|
|
123
123
|
" - Use the up/down arrow keys to navigate the list of history items."
|
|
124
124
|
)));
|
|
125
125
|
content.push(( localize(
|
|
126
|
-
|
|
126
|
+
9451,
|
|
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');
|
|
@@ -51,7 +51,7 @@ let SCMHistoryItemContext = SCMHistoryItemContext_1 = class SCMHistoryItemContex
|
|
|
51
51
|
constructor(_scmViewService) {
|
|
52
52
|
this._scmViewService = _scmViewService;
|
|
53
53
|
this.type = 'pickerPick';
|
|
54
|
-
this.label = ( localize(
|
|
54
|
+
this.label = ( localize(9465, 'Source Control...'));
|
|
55
55
|
this.icon = Codicon.gitCommit;
|
|
56
56
|
this._delayer = ( new ThrottledDelayer(200));
|
|
57
57
|
}
|
|
@@ -61,7 +61,7 @@ let SCMHistoryItemContext = SCMHistoryItemContext_1 = class SCMHistoryItemContex
|
|
|
61
61
|
}
|
|
62
62
|
asPicker(_widget) {
|
|
63
63
|
return {
|
|
64
|
-
placeholder: ( localize(
|
|
64
|
+
placeholder: ( localize(9466, 'Select a change')),
|
|
65
65
|
picks: picksWithPromiseFn((query, token) => {
|
|
66
66
|
const filterText = query.trim() !== '' ? query.trim() : undefined;
|
|
67
67
|
const activeRepository = this._scmViewService.activeRepository.get();
|
|
@@ -86,7 +86,7 @@ let SCMHistoryItemContext = SCMHistoryItemContext_1 = class SCMHistoryItemContex
|
|
|
86
86
|
details.push(historyItem.author);
|
|
87
87
|
}
|
|
88
88
|
if (historyItem.statistics) {
|
|
89
|
-
details.push(`${historyItem.statistics.files} ${( localize(
|
|
89
|
+
details.push(`${historyItem.statistics.files} ${( localize(9467, 'file(s)'))}`);
|
|
90
90
|
}
|
|
91
91
|
if (historyItem.timestamp) {
|
|
92
92
|
details.push(fromNow(historyItem.timestamp, true, true));
|
|
@@ -142,7 +142,7 @@ registerAction2(class extends Action2 {
|
|
|
142
142
|
constructor() {
|
|
143
143
|
super({
|
|
144
144
|
id: 'workbench.scm.action.graph.addHistoryItemToChat',
|
|
145
|
-
title: ( localize(
|
|
145
|
+
title: ( localize(9468, 'Add History Item to Chat')),
|
|
146
146
|
f1: false,
|
|
147
147
|
menu: {
|
|
148
148
|
id: MenuId.SCMHistoryItemChatContext,
|
|
@@ -163,7 +163,7 @@ registerAction2(class extends Action2 {
|
|
|
163
163
|
constructor() {
|
|
164
164
|
super({
|
|
165
165
|
id: 'workbench.scm.action.graph.summarizeHistoryItem',
|
|
166
|
-
title: ( localize(
|
|
166
|
+
title: ( localize(9469, 'Summarize History Item')),
|
|
167
167
|
f1: false,
|
|
168
168
|
menu: {
|
|
169
169
|
id: MenuId.SCMHistoryItemChatContext,
|
|
@@ -121,23 +121,23 @@ class SCMHistoryItemRefsActionViewItem extends ActionViewItem {
|
|
|
121
121
|
icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.gitBranch));
|
|
122
122
|
const name = $('.name');
|
|
123
123
|
if (this._historyItemsFilter === 'all') {
|
|
124
|
-
name.textContent = ( localize(
|
|
124
|
+
name.textContent = ( localize(9470, "All"));
|
|
125
125
|
}
|
|
126
126
|
else if (this._historyItemsFilter === 'auto') {
|
|
127
|
-
name.textContent = ( localize(
|
|
127
|
+
name.textContent = ( localize(9471, "Auto"));
|
|
128
128
|
}
|
|
129
129
|
else if (this._historyItemsFilter.length === 1) {
|
|
130
130
|
name.textContent = this._historyItemsFilter[0].name;
|
|
131
131
|
}
|
|
132
132
|
else {
|
|
133
|
-
name.textContent = ( localize(
|
|
133
|
+
name.textContent = ( localize(9472, "{0} Items", this._historyItemsFilter.length));
|
|
134
134
|
}
|
|
135
135
|
reset(this.label, icon, name);
|
|
136
136
|
}
|
|
137
137
|
}
|
|
138
138
|
getTooltip() {
|
|
139
139
|
if (this._historyItemsFilter === 'all') {
|
|
140
|
-
return localize(
|
|
140
|
+
return localize(9473, "All history item references");
|
|
141
141
|
}
|
|
142
142
|
else if (this._historyItemsFilter === 'auto') {
|
|
143
143
|
const historyProvider = this._repository.provider.historyProvider.get();
|
|
@@ -159,7 +159,7 @@ registerAction2(class extends ViewAction {
|
|
|
159
159
|
constructor() {
|
|
160
160
|
super({
|
|
161
161
|
id: PICK_REPOSITORY_ACTION_ID,
|
|
162
|
-
title: ( localize(
|
|
162
|
+
title: ( localize(9474, "Repository Picker")),
|
|
163
163
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
164
164
|
f1: false,
|
|
165
165
|
menu: {
|
|
@@ -178,7 +178,7 @@ registerAction2(class extends ViewAction {
|
|
|
178
178
|
constructor() {
|
|
179
179
|
super({
|
|
180
180
|
id: PICK_HISTORY_ITEM_REFS_ACTION_ID,
|
|
181
|
-
title: ( localize(
|
|
181
|
+
title: ( localize(9475, "History Item Reference Picker")),
|
|
182
182
|
icon: Codicon.gitBranch,
|
|
183
183
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
184
184
|
precondition: ( ContextKeys.SCMHistoryItemCount.notEqualsTo(0)),
|
|
@@ -198,7 +198,7 @@ registerAction2(class extends ViewAction {
|
|
|
198
198
|
constructor() {
|
|
199
199
|
super({
|
|
200
200
|
id: 'workbench.scm.action.graph.revealCurrentHistoryItem',
|
|
201
|
-
title: ( localize(
|
|
201
|
+
title: ( localize(9476, "Go to Current History Item")),
|
|
202
202
|
icon: Codicon.target,
|
|
203
203
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
204
204
|
precondition: ( ContextKeyExpr.and(( ContextKeys.SCMHistoryItemCount.notEqualsTo(0)), ( ContextKeys.SCMCurrentHistoryItemRefInFilter.isEqualTo(true)))),
|
|
@@ -218,7 +218,7 @@ registerAction2(class extends ViewAction {
|
|
|
218
218
|
constructor() {
|
|
219
219
|
super({
|
|
220
220
|
id: 'workbench.scm.action.graph.refresh',
|
|
221
|
-
title: ( localize(
|
|
221
|
+
title: ( localize(9477, "Refresh")),
|
|
222
222
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
223
223
|
f1: false,
|
|
224
224
|
icon: Codicon.refresh,
|
|
@@ -237,7 +237,7 @@ registerAction2(class extends ViewAction {
|
|
|
237
237
|
constructor() {
|
|
238
238
|
super({
|
|
239
239
|
id: 'workbench.scm.action.graph.setListViewMode',
|
|
240
|
-
title: ( localize(
|
|
240
|
+
title: ( localize(9478, "View as List")),
|
|
241
241
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
242
242
|
toggled: ( ContextKeys.SCMHistoryViewMode.isEqualTo(ViewMode.List)),
|
|
243
243
|
menu: { id: MenuId.SCMHistoryTitle, group: '9_viewmode', order: 1 },
|
|
@@ -252,7 +252,7 @@ registerAction2(class extends ViewAction {
|
|
|
252
252
|
constructor() {
|
|
253
253
|
super({
|
|
254
254
|
id: 'workbench.scm.action.graph.setTreeViewMode',
|
|
255
|
-
title: ( localize(
|
|
255
|
+
title: ( localize(9479, "View as Tree")),
|
|
256
256
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
257
257
|
toggled: ( ContextKeys.SCMHistoryViewMode.isEqualTo(ViewMode.Tree)),
|
|
258
258
|
menu: { id: MenuId.SCMHistoryTitle, group: '9_viewmode', order: 2 },
|
|
@@ -267,7 +267,7 @@ registerAction2(class extends Action2 {
|
|
|
267
267
|
constructor() {
|
|
268
268
|
super({
|
|
269
269
|
id: 'workbench.scm.action.graph.viewChanges',
|
|
270
|
-
title: ( localize(
|
|
270
|
+
title: ( localize(9480, "Open Changes")),
|
|
271
271
|
icon: Codicon.diffMultiple,
|
|
272
272
|
f1: false,
|
|
273
273
|
menu: [
|
|
@@ -303,7 +303,7 @@ registerAction2(class extends Action2 {
|
|
|
303
303
|
const title = historyItems.length === 1 ?
|
|
304
304
|
getHistoryItemEditorTitle(historyItem) :
|
|
305
305
|
( localize(
|
|
306
|
-
|
|
306
|
+
9481,
|
|
307
307
|
"All Changes ({0} ↔ {1})",
|
|
308
308
|
historyItemLast.displayId ?? historyItemLast.id,
|
|
309
309
|
historyItem.displayId ?? historyItem.id
|
|
@@ -316,7 +316,7 @@ registerAction2(class extends Action2 {
|
|
|
316
316
|
constructor() {
|
|
317
317
|
super({
|
|
318
318
|
id: 'workbench.scm.action.graph.openFile',
|
|
319
|
-
title: ( localize(
|
|
319
|
+
title: ( localize(9482, "Open File")),
|
|
320
320
|
icon: Codicon.goToFile,
|
|
321
321
|
f1: false,
|
|
322
322
|
menu: [
|
|
@@ -649,7 +649,7 @@ let HistoryItemLoadMoreRenderer = class HistoryItemLoadMoreRenderer {
|
|
|
649
649
|
templateData.elementDisposables.add(autorun(reader => {
|
|
650
650
|
const isLoadingMore = this._isLoadingMore.read(reader);
|
|
651
651
|
const icon = `$(${isLoadingMore ? 'loading~spin' : 'fold-down'})`;
|
|
652
|
-
templateData.historyItemPlaceholderLabel.setLabel(( localize(
|
|
652
|
+
templateData.historyItemPlaceholderLabel.setLabel(( localize(9483, "{0} Load More...", icon)));
|
|
653
653
|
}));
|
|
654
654
|
}
|
|
655
655
|
}
|
|
@@ -706,7 +706,7 @@ SCMHistoryViewPaneActionRunner = ( __decorate([
|
|
|
706
706
|
], SCMHistoryViewPaneActionRunner));
|
|
707
707
|
class SCMHistoryTreeAccessibilityProvider {
|
|
708
708
|
getWidgetAriaLabel() {
|
|
709
|
-
return localize(
|
|
709
|
+
return localize(9484, "Source Control History");
|
|
710
710
|
}
|
|
711
711
|
getAriaLabel(element) {
|
|
712
712
|
if (isSCMRepository(element)) {
|
|
@@ -1089,8 +1089,8 @@ let RepositoryPicker = class RepositoryPicker {
|
|
|
1089
1089
|
this._quickInputService = _quickInputService;
|
|
1090
1090
|
this._scmViewService = _scmViewService;
|
|
1091
1091
|
this._autoQuickPickItem = {
|
|
1092
|
-
label: ( localize(
|
|
1093
|
-
description: ( localize(
|
|
1092
|
+
label: ( localize(9471, "Auto")),
|
|
1093
|
+
description: ( localize(9485, "Show the source control graph for the active repository")),
|
|
1094
1094
|
repository: 'auto'
|
|
1095
1095
|
};
|
|
1096
1096
|
}
|
|
@@ -1106,7 +1106,7 @@ let RepositoryPicker = class RepositoryPicker {
|
|
|
1106
1106
|
repository: r
|
|
1107
1107
|
}))));
|
|
1108
1108
|
return this._quickInputService.pick(picks, {
|
|
1109
|
-
placeHolder: ( localize(
|
|
1109
|
+
placeHolder: ( localize(9486, "Select the repository to view, type to filter all repositories"))
|
|
1110
1110
|
});
|
|
1111
1111
|
}
|
|
1112
1112
|
};
|
|
@@ -1122,21 +1122,21 @@ let HistoryItemRefPicker = class HistoryItemRefPicker extends Disposable {
|
|
|
1122
1122
|
this._quickInputService = _quickInputService;
|
|
1123
1123
|
this._allQuickPickItem = {
|
|
1124
1124
|
id: 'all',
|
|
1125
|
-
label: ( localize(
|
|
1126
|
-
description: ( localize(
|
|
1125
|
+
label: ( localize(9470, "All")),
|
|
1126
|
+
description: ( localize(9473, "All history item references")),
|
|
1127
1127
|
historyItemRef: 'all'
|
|
1128
1128
|
};
|
|
1129
1129
|
this._autoQuickPickItem = {
|
|
1130
1130
|
id: 'auto',
|
|
1131
|
-
label: ( localize(
|
|
1132
|
-
description: ( localize(
|
|
1131
|
+
label: ( localize(9471, "Auto")),
|
|
1132
|
+
description: ( localize(9487, "Current history item reference(s)")),
|
|
1133
1133
|
historyItemRef: 'auto'
|
|
1134
1134
|
};
|
|
1135
1135
|
}
|
|
1136
1136
|
async pickHistoryItemRef() {
|
|
1137
1137
|
const quickPick = this._quickInputService.createQuickPick({ useSeparators: true });
|
|
1138
1138
|
this._store.add(quickPick);
|
|
1139
|
-
quickPick.placeholder = ( localize(
|
|
1139
|
+
quickPick.placeholder = ( localize(9488, "Select one/more history item references to view, type to filter"));
|
|
1140
1140
|
quickPick.canSelectMany = true;
|
|
1141
1141
|
quickPick.hideCheckAll = true;
|
|
1142
1142
|
quickPick.busy = true;
|
|
@@ -1266,7 +1266,7 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
|
|
|
1266
1266
|
container.appendChild(element.root);
|
|
1267
1267
|
this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), element.root, {
|
|
1268
1268
|
markdown: {
|
|
1269
|
-
value: ( localize(
|
|
1269
|
+
value: ( localize(9489, "Please refresh the graph using the refresh action ($(refresh)).")),
|
|
1270
1270
|
supportThemeIcons: true
|
|
1271
1271
|
},
|
|
1272
1272
|
markdownNotSupportedFallback: undefined
|
|
@@ -61,7 +61,7 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
|
|
|
61
61
|
return r.provider.label;
|
|
62
62
|
},
|
|
63
63
|
getWidgetAriaLabel() {
|
|
64
|
-
return localize(
|
|
64
|
+
return localize(9490, "Source Control Repositories");
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
67
|
});
|
|
@@ -78,7 +78,7 @@ import { defaultCountBadgeStyles, defaultButtonStyles } from '@codingame/monaco-
|
|
|
78
78
|
import { InlineCompletionsController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
|
|
79
79
|
import { CodeActionController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/codeAction/browser/codeActionController';
|
|
80
80
|
import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
|
|
81
|
-
import { fillEditorsDragData } from '@codingame/monaco-vscode-
|
|
81
|
+
import { fillEditorsDragData } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/dnd';
|
|
82
82
|
import { CodeDataTransfers } from '@codingame/monaco-vscode-api/vscode/vs/platform/dnd/browser/dnd';
|
|
83
83
|
import { FormatOnType } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/format/browser/formatActions';
|
|
84
84
|
import { EditorOptions, EditorOption } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/editorOptions';
|
|
@@ -759,7 +759,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
|
|
|
759
759
|
this.labelService = labelService;
|
|
760
760
|
}
|
|
761
761
|
getWidgetAriaLabel() {
|
|
762
|
-
return localize(
|
|
762
|
+
return localize(9491, "Source Control Management");
|
|
763
763
|
}
|
|
764
764
|
getAriaLabel(element) {
|
|
765
765
|
if (ResourceTree.isResourceNode(element)) {
|
|
@@ -771,17 +771,17 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
|
|
|
771
771
|
else if (isSCMInput(element)) {
|
|
772
772
|
const verbosity = this.configurationService.getValue(AccessibilityVerbositySettingId.SourceControl) === true;
|
|
773
773
|
if (!verbosity || !this.accessibilityService.isScreenReaderOptimized()) {
|
|
774
|
-
return localize(
|
|
774
|
+
return localize(9492, "Source Control Input");
|
|
775
775
|
}
|
|
776
776
|
const kbLabel = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
|
|
777
777
|
return kbLabel
|
|
778
778
|
? ( localize(
|
|
779
|
-
|
|
779
|
+
9493,
|
|
780
780
|
"Source Control Input, Use {0} to open Source Control Accessibility Help.",
|
|
781
781
|
kbLabel
|
|
782
782
|
))
|
|
783
783
|
: ( localize(
|
|
784
|
-
|
|
784
|
+
9494,
|
|
785
785
|
"Source Control Input, Run the Open Accessibility Help command for more information."
|
|
786
786
|
));
|
|
787
787
|
}
|
|
@@ -839,14 +839,14 @@ const ContextKeys = {
|
|
|
839
839
|
}
|
|
840
840
|
};
|
|
841
841
|
MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
|
|
842
|
-
title: ( localize(
|
|
842
|
+
title: ( localize(9495, "View & Sort")),
|
|
843
843
|
submenu: Menus.ViewSort,
|
|
844
844
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_PANE_ID)), ( ContextKeys.RepositoryCount.notEqualsTo(0)))),
|
|
845
845
|
group: '0_view&sort',
|
|
846
846
|
order: 1
|
|
847
847
|
});
|
|
848
848
|
MenuRegistry.appendMenuItem(Menus.ViewSort, {
|
|
849
|
-
title: ( localize(
|
|
849
|
+
title: ( localize(9496, "Repositories")),
|
|
850
850
|
submenu: Menus.Repositories,
|
|
851
851
|
when: ContextKeyExpr.greater(ContextKeys.RepositoryCount.key, 1),
|
|
852
852
|
group: '0_repositories'
|
|
@@ -936,7 +936,7 @@ class SetListViewModeAction extends ViewAction {
|
|
|
936
936
|
constructor(id = 'workbench.scm.action.setListViewMode', menu = {}) {
|
|
937
937
|
super({
|
|
938
938
|
id,
|
|
939
|
-
title: ( localize(
|
|
939
|
+
title: ( localize(9497, "View as List")),
|
|
940
940
|
viewId: VIEW_PANE_ID,
|
|
941
941
|
f1: false,
|
|
942
942
|
icon: Codicon.listTree,
|
|
@@ -962,7 +962,7 @@ class SetTreeViewModeAction extends ViewAction {
|
|
|
962
962
|
constructor(id = 'workbench.scm.action.setTreeViewMode', menu = {}) {
|
|
963
963
|
super({
|
|
964
964
|
id,
|
|
965
|
-
title: ( localize(
|
|
965
|
+
title: ( localize(9498, "View as Tree")),
|
|
966
966
|
viewId: VIEW_PANE_ID,
|
|
967
967
|
f1: false,
|
|
968
968
|
icon: Codicon.listFlat,
|
|
@@ -1015,17 +1015,17 @@ class RepositorySortAction extends ViewAction {
|
|
|
1015
1015
|
}
|
|
1016
1016
|
class RepositorySortByDiscoveryTimeAction extends RepositorySortAction {
|
|
1017
1017
|
constructor() {
|
|
1018
|
-
super(ISCMRepositorySortKey.DiscoveryTime, ( localize(
|
|
1018
|
+
super(ISCMRepositorySortKey.DiscoveryTime, ( localize(9499, "Sort by Discovery Time")));
|
|
1019
1019
|
}
|
|
1020
1020
|
}
|
|
1021
1021
|
class RepositorySortByNameAction extends RepositorySortAction {
|
|
1022
1022
|
constructor() {
|
|
1023
|
-
super(ISCMRepositorySortKey.Name, ( localize(
|
|
1023
|
+
super(ISCMRepositorySortKey.Name, ( localize(9500, "Sort by Name")));
|
|
1024
1024
|
}
|
|
1025
1025
|
}
|
|
1026
1026
|
class RepositorySortByPathAction extends RepositorySortAction {
|
|
1027
1027
|
constructor() {
|
|
1028
|
-
super(ISCMRepositorySortKey.Path, ( localize(
|
|
1028
|
+
super(ISCMRepositorySortKey.Path, ( localize(9501, "Sort by Path")));
|
|
1029
1029
|
}
|
|
1030
1030
|
}
|
|
1031
1031
|
registerAction2(RepositorySortByDiscoveryTimeAction);
|
|
@@ -1050,17 +1050,17 @@ class SetSortKeyAction extends ViewAction {
|
|
|
1050
1050
|
}
|
|
1051
1051
|
class SetSortByNameAction extends SetSortKeyAction {
|
|
1052
1052
|
constructor() {
|
|
1053
|
-
super(ViewSortKey.Name, ( localize(
|
|
1053
|
+
super(ViewSortKey.Name, ( localize(9502, "Sort Changes by Name")));
|
|
1054
1054
|
}
|
|
1055
1055
|
}
|
|
1056
1056
|
class SetSortByPathAction extends SetSortKeyAction {
|
|
1057
1057
|
constructor() {
|
|
1058
|
-
super(ViewSortKey.Path, ( localize(
|
|
1058
|
+
super(ViewSortKey.Path, ( localize(9503, "Sort Changes by Path")));
|
|
1059
1059
|
}
|
|
1060
1060
|
}
|
|
1061
1061
|
class SetSortByStatusAction extends SetSortKeyAction {
|
|
1062
1062
|
constructor() {
|
|
1063
|
-
super(ViewSortKey.Status, ( localize(
|
|
1063
|
+
super(ViewSortKey.Status, ( localize(9504, "Sort Changes by Status")));
|
|
1064
1064
|
}
|
|
1065
1065
|
}
|
|
1066
1066
|
registerAction2(SetSortByNameAction);
|
|
@@ -1070,7 +1070,7 @@ class CollapseAllRepositoriesAction extends ViewAction {
|
|
|
1070
1070
|
constructor() {
|
|
1071
1071
|
super({
|
|
1072
1072
|
id: `workbench.scm.action.collapseAllRepositories`,
|
|
1073
|
-
title: ( localize(
|
|
1073
|
+
title: ( localize(9505, "Collapse All Repositories")),
|
|
1074
1074
|
viewId: VIEW_PANE_ID,
|
|
1075
1075
|
f1: false,
|
|
1076
1076
|
icon: Codicon.collapseAll,
|
|
@@ -1089,7 +1089,7 @@ class ExpandAllRepositoriesAction extends ViewAction {
|
|
|
1089
1089
|
constructor() {
|
|
1090
1090
|
super({
|
|
1091
1091
|
id: `workbench.scm.action.expandAllRepositories`,
|
|
1092
|
-
title: ( localize(
|
|
1092
|
+
title: ( localize(9506, "Expand All Repositories")),
|
|
1093
1093
|
viewId: VIEW_PANE_ID,
|
|
1094
1094
|
f1: false,
|
|
1095
1095
|
icon: Codicon.expandAll,
|
|
@@ -1119,7 +1119,7 @@ registerAction2(class extends Action2 {
|
|
|
1119
1119
|
constructor() {
|
|
1120
1120
|
super({
|
|
1121
1121
|
id: SCMInputWidgetCommandId.SetupAction,
|
|
1122
|
-
title: ( localize(
|
|
1122
|
+
title: ( localize(9507, "Generate Commit Message with Copilot")),
|
|
1123
1123
|
icon: Codicon.sparkle,
|
|
1124
1124
|
f1: false,
|
|
1125
1125
|
menu: {
|
|
@@ -1196,10 +1196,10 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
|
|
|
1196
1196
|
this._onDidChange = ( new Emitter());
|
|
1197
1197
|
this.onDidChange = this._onDidChange.event;
|
|
1198
1198
|
this._disposables = this._register(( new MutableDisposable()));
|
|
1199
|
-
this._dropdownAction = ( new Action('scmInputMoreActions', ( localize(
|
|
1199
|
+
this._dropdownAction = ( new Action('scmInputMoreActions', ( localize(9508, "More Actions...")), 'codicon-chevron-down'));
|
|
1200
1200
|
this._cancelAction = ( new MenuItemAction({
|
|
1201
1201
|
id: SCMInputWidgetCommandId.CancelAction,
|
|
1202
|
-
title: ( localize(
|
|
1202
|
+
title: ( localize(9509, "Cancel")),
|
|
1203
1203
|
icon: Codicon.stopCircle,
|
|
1204
1204
|
}, undefined, undefined, undefined, undefined, contextKeyService, commandService));
|
|
1205
1205
|
}
|
|
@@ -1413,13 +1413,13 @@ let SCMInputWidget = class SCMInputWidget {
|
|
|
1413
1413
|
const kbLabel = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
|
|
1414
1414
|
return kbLabel
|
|
1415
1415
|
? ( localize(
|
|
1416
|
-
|
|
1416
|
+
9510,
|
|
1417
1417
|
"{0}, Use {1} to open Source Control Accessibility Help.",
|
|
1418
1418
|
placeholder,
|
|
1419
1419
|
kbLabel
|
|
1420
1420
|
))
|
|
1421
1421
|
: ( localize(
|
|
1422
|
-
|
|
1422
|
+
9511,
|
|
1423
1423
|
"{0}, Run the Open Accessibility Help command for more information.",
|
|
1424
1424
|
placeholder
|
|
1425
1425
|
));
|
|
@@ -1678,7 +1678,7 @@ let SCMInputWidget = class SCMInputWidget {
|
|
|
1678
1678
|
}
|
|
1679
1679
|
const actionsContainer = append(validationContainer, $('.scm-editor-validation-actions'));
|
|
1680
1680
|
const actionbar = ( new ActionBar(actionsContainer));
|
|
1681
|
-
const action = ( new Action('scmInputWidget.validationMessage.close', ( localize(
|
|
1681
|
+
const action = ( new Action('scmInputWidget.validationMessage.close', ( localize(9512, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
|
|
1682
1682
|
this.contextViewService.hideContextView();
|
|
1683
1683
|
this.element.style.borderBottomLeftRadius = '2px';
|
|
1684
1684
|
this.element.style.borderBottomRightRadius = '2px';
|
|
@@ -51,7 +51,7 @@ let RepositoryPicker = class RepositoryPicker {
|
|
|
51
51
|
this._quickInputService = _quickInputService;
|
|
52
52
|
this._scmViewService = _scmViewService;
|
|
53
53
|
this._autoQuickPickItem = {
|
|
54
|
-
label: ( localize(
|
|
54
|
+
label: ( localize(9513, "Auto")),
|
|
55
55
|
description: this._autoQuickItemDescription,
|
|
56
56
|
repository: 'auto'
|
|
57
57
|
};
|