@codingame/monaco-vscode-scm-service-override 24.2.0 → 25.0.0
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 +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/activity.js +7 -7
- 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/quickDiffModel.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffModel.js +27 -36
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffWidget.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffWidget.js +49 -16
- package/vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js +89 -89
- package/vscode/src/vs/workbench/contrib/scm/browser/scmAccessibilityHelp.js +23 -23
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.js +27 -29
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.js +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js +36 -27
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.js +7 -4
|
@@ -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(10546, "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(10547, "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(10548, "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(10549, "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(10550, "enabled")) : ( localize(10551, "disabled"));
|
|
74
|
+
content.push(( localize(10552, "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(10553, "Resource groups: {0}", resourceGroups.join(', '))));
|
|
82
82
|
}
|
|
83
83
|
content.push(( localize(
|
|
84
|
-
|
|
84
|
+
10554,
|
|
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
|
+
10555,
|
|
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(10556, "Once the Source Control Repositories view is opened you can:")));
|
|
92
92
|
content.push(( localize(
|
|
93
|
-
|
|
93
|
+
10557,
|
|
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(10558, " - Use the Enter or Space keys to select a repository.")));
|
|
97
|
+
content.push(( localize(10559, " - Use Shift + up/down keys to select multiple repositories.")));
|
|
98
98
|
content.push(( localize(
|
|
99
|
-
|
|
99
|
+
10560,
|
|
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
|
+
10561,
|
|
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(10562, "Once the Source Control view is opened you can:")));
|
|
107
107
|
content.push(( localize(
|
|
108
|
-
|
|
108
|
+
10563,
|
|
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(10564, " - Use the Space key to expand or collapse a resource group.")));
|
|
112
112
|
content.push(( localize(
|
|
113
|
-
|
|
113
|
+
10565,
|
|
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
|
+
10566,
|
|
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(10567, "Once the Source Control Graph view is opened you can:")));
|
|
121
121
|
content.push(( localize(
|
|
122
|
-
|
|
122
|
+
10568,
|
|
123
123
|
" - Use the up/down arrow keys to navigate the list of history items."
|
|
124
124
|
)));
|
|
125
125
|
content.push(( localize(
|
|
126
|
-
|
|
126
|
+
10569,
|
|
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');
|
|
@@ -124,23 +124,23 @@ class SCMHistoryItemRefsActionViewItem extends ActionViewItem {
|
|
|
124
124
|
icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.gitBranch));
|
|
125
125
|
const name = $('.name');
|
|
126
126
|
if (this._historyItemsFilter === 'all') {
|
|
127
|
-
name.textContent = ( localize(
|
|
127
|
+
name.textContent = ( localize(10590, "All"));
|
|
128
128
|
}
|
|
129
129
|
else if (this._historyItemsFilter === 'auto') {
|
|
130
|
-
name.textContent = ( localize(
|
|
130
|
+
name.textContent = ( localize(10591, "Auto"));
|
|
131
131
|
}
|
|
132
132
|
else if (this._historyItemsFilter.length === 1) {
|
|
133
133
|
name.textContent = this._historyItemsFilter[0].name;
|
|
134
134
|
}
|
|
135
135
|
else {
|
|
136
|
-
name.textContent = ( localize(
|
|
136
|
+
name.textContent = ( localize(10592, "{0} Items", this._historyItemsFilter.length));
|
|
137
137
|
}
|
|
138
138
|
reset(this.label, icon, name);
|
|
139
139
|
}
|
|
140
140
|
}
|
|
141
141
|
getTooltip() {
|
|
142
142
|
if (this._historyItemsFilter === 'all') {
|
|
143
|
-
return localize(
|
|
143
|
+
return localize(10593, "All history item references");
|
|
144
144
|
}
|
|
145
145
|
else if (this._historyItemsFilter === 'auto') {
|
|
146
146
|
const historyProvider = this._repository.provider.historyProvider.get();
|
|
@@ -162,7 +162,7 @@ registerAction2(class extends ViewAction {
|
|
|
162
162
|
constructor() {
|
|
163
163
|
super({
|
|
164
164
|
id: PICK_REPOSITORY_ACTION_ID,
|
|
165
|
-
title: ( localize(
|
|
165
|
+
title: ( localize(10594, "Repository Picker")),
|
|
166
166
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
167
167
|
f1: false,
|
|
168
168
|
menu: {
|
|
@@ -181,7 +181,7 @@ registerAction2(class extends ViewAction {
|
|
|
181
181
|
constructor() {
|
|
182
182
|
super({
|
|
183
183
|
id: PICK_HISTORY_ITEM_REFS_ACTION_ID,
|
|
184
|
-
title: ( localize(
|
|
184
|
+
title: ( localize(10595, "History Item Reference Picker")),
|
|
185
185
|
icon: Codicon.gitBranch,
|
|
186
186
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
187
187
|
precondition: ( ContextKeys.SCMHistoryItemCount.notEqualsTo(0)),
|
|
@@ -201,7 +201,7 @@ registerAction2(class extends ViewAction {
|
|
|
201
201
|
constructor() {
|
|
202
202
|
super({
|
|
203
203
|
id: 'workbench.scm.action.graph.revealCurrentHistoryItem',
|
|
204
|
-
title: ( localize(
|
|
204
|
+
title: ( localize(10596, "Go to Current History Item")),
|
|
205
205
|
icon: Codicon.target,
|
|
206
206
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
207
207
|
precondition: ( ContextKeyExpr.and(( ContextKeys.SCMHistoryItemCount.notEqualsTo(0)), ( ContextKeys.SCMCurrentHistoryItemRefInFilter.isEqualTo(true)))),
|
|
@@ -221,7 +221,7 @@ registerAction2(class extends ViewAction {
|
|
|
221
221
|
constructor() {
|
|
222
222
|
super({
|
|
223
223
|
id: 'workbench.scm.action.graph.refresh',
|
|
224
|
-
title: ( localize(
|
|
224
|
+
title: ( localize(10597, "Refresh")),
|
|
225
225
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
226
226
|
f1: false,
|
|
227
227
|
icon: Codicon.refresh,
|
|
@@ -240,7 +240,7 @@ registerAction2(class extends ViewAction {
|
|
|
240
240
|
constructor() {
|
|
241
241
|
super({
|
|
242
242
|
id: 'workbench.scm.action.graph.setListViewMode',
|
|
243
|
-
title: ( localize(
|
|
243
|
+
title: ( localize(10598, "View as List")),
|
|
244
244
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
245
245
|
toggled: ( ContextKeys.SCMHistoryViewMode.isEqualTo(ViewMode.List)),
|
|
246
246
|
menu: { id: MenuId.SCMHistoryTitle, group: '9_viewmode', order: 1 },
|
|
@@ -255,7 +255,7 @@ registerAction2(class extends ViewAction {
|
|
|
255
255
|
constructor() {
|
|
256
256
|
super({
|
|
257
257
|
id: 'workbench.scm.action.graph.setTreeViewMode',
|
|
258
|
-
title: ( localize(
|
|
258
|
+
title: ( localize(10599, "View as Tree")),
|
|
259
259
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
260
260
|
toggled: ( ContextKeys.SCMHistoryViewMode.isEqualTo(ViewMode.Tree)),
|
|
261
261
|
menu: { id: MenuId.SCMHistoryTitle, group: '9_viewmode', order: 2 },
|
|
@@ -270,19 +270,17 @@ registerAction2(class extends Action2 {
|
|
|
270
270
|
constructor() {
|
|
271
271
|
super({
|
|
272
272
|
id: 'workbench.scm.action.graph.viewChanges',
|
|
273
|
-
title: ( localize(
|
|
273
|
+
title: ( localize(10600, "Open Changes")),
|
|
274
274
|
icon: Codicon.diffMultiple,
|
|
275
275
|
f1: false,
|
|
276
276
|
menu: [
|
|
277
277
|
{
|
|
278
278
|
id: MenuId.SCMHistoryItemContext,
|
|
279
|
-
when: ( ContextKeyExpr.equals('config.multiDiffEditor.experimental.enabled', true)),
|
|
280
279
|
group: 'inline',
|
|
281
280
|
order: 1
|
|
282
281
|
},
|
|
283
282
|
{
|
|
284
283
|
id: MenuId.SCMHistoryItemContext,
|
|
285
|
-
when: ( ContextKeyExpr.equals('config.multiDiffEditor.experimental.enabled', true)),
|
|
286
284
|
group: '0_view',
|
|
287
285
|
order: 1
|
|
288
286
|
}
|
|
@@ -341,7 +339,7 @@ registerAction2(class extends Action2 {
|
|
|
341
339
|
constructor() {
|
|
342
340
|
super({
|
|
343
341
|
id: 'workbench.scm.action.graph.openFile',
|
|
344
|
-
title: ( localize(
|
|
342
|
+
title: ( localize(10601, "Open File")),
|
|
345
343
|
icon: Codicon.goToFile,
|
|
346
344
|
f1: false,
|
|
347
345
|
menu: [
|
|
@@ -365,10 +363,10 @@ registerAction2(class extends Action2 {
|
|
|
365
363
|
}
|
|
366
364
|
let version;
|
|
367
365
|
if (historyItem.id === SCMIncomingHistoryItemId) {
|
|
368
|
-
version = ( localize(
|
|
366
|
+
version = ( localize(10602, "Incoming Changes"));
|
|
369
367
|
}
|
|
370
368
|
else if (historyItem.id === SCMOutgoingHistoryItemId) {
|
|
371
|
-
version = ( localize(
|
|
369
|
+
version = ( localize(10603, "Outgoing Changes"));
|
|
372
370
|
}
|
|
373
371
|
else {
|
|
374
372
|
version = historyItem.displayId ?? historyItem.id;
|
|
@@ -698,7 +696,7 @@ let HistoryItemLoadMoreRenderer = class HistoryItemLoadMoreRenderer {
|
|
|
698
696
|
templateData.elementDisposables.add(autorun(reader => {
|
|
699
697
|
const isLoadingMore = this._isLoadingMore.read(reader);
|
|
700
698
|
const icon = `$(${isLoadingMore ? 'loading~spin' : 'fold-down'})`;
|
|
701
|
-
templateData.historyItemPlaceholderLabel.setLabel(( localize(
|
|
699
|
+
templateData.historyItemPlaceholderLabel.setLabel(( localize(10604, "{0} Load More...", icon)));
|
|
702
700
|
}));
|
|
703
701
|
}
|
|
704
702
|
}
|
|
@@ -730,7 +728,7 @@ SCMHistoryViewPaneActionRunner = ( __decorate([
|
|
|
730
728
|
], SCMHistoryViewPaneActionRunner));
|
|
731
729
|
class SCMHistoryTreeAccessibilityProvider {
|
|
732
730
|
getWidgetAriaLabel() {
|
|
733
|
-
return localize(
|
|
731
|
+
return localize(10605, "Source Control History");
|
|
734
732
|
}
|
|
735
733
|
getAriaLabel(element) {
|
|
736
734
|
if (isSCMRepository(element)) {
|
|
@@ -1224,8 +1222,8 @@ let RepositoryPicker = class RepositoryPicker {
|
|
|
1224
1222
|
this._quickInputService = _quickInputService;
|
|
1225
1223
|
this._scmViewService = _scmViewService;
|
|
1226
1224
|
this._autoQuickPickItem = {
|
|
1227
|
-
label: ( localize(
|
|
1228
|
-
description: ( localize(
|
|
1225
|
+
label: ( localize(10591, "Auto")),
|
|
1226
|
+
description: ( localize(10606, "Show the source control graph for the active repository")),
|
|
1229
1227
|
repository: 'auto'
|
|
1230
1228
|
};
|
|
1231
1229
|
}
|
|
@@ -1243,7 +1241,7 @@ let RepositoryPicker = class RepositoryPicker {
|
|
|
1243
1241
|
repository: r
|
|
1244
1242
|
}))));
|
|
1245
1243
|
return this._quickInputService.pick(picks, {
|
|
1246
|
-
placeHolder: ( localize(
|
|
1244
|
+
placeHolder: ( localize(10607, "Select the repository to view, type to filter all repositories"))
|
|
1247
1245
|
});
|
|
1248
1246
|
}
|
|
1249
1247
|
};
|
|
@@ -1259,21 +1257,21 @@ let HistoryItemRefPicker = class HistoryItemRefPicker extends Disposable {
|
|
|
1259
1257
|
this._quickInputService = _quickInputService;
|
|
1260
1258
|
this._allQuickPickItem = {
|
|
1261
1259
|
id: 'all',
|
|
1262
|
-
label: ( localize(
|
|
1263
|
-
description: ( localize(
|
|
1260
|
+
label: ( localize(10590, "All")),
|
|
1261
|
+
description: ( localize(10593, "All history item references")),
|
|
1264
1262
|
historyItemRef: 'all'
|
|
1265
1263
|
};
|
|
1266
1264
|
this._autoQuickPickItem = {
|
|
1267
1265
|
id: 'auto',
|
|
1268
|
-
label: ( localize(
|
|
1269
|
-
description: ( localize(
|
|
1266
|
+
label: ( localize(10591, "Auto")),
|
|
1267
|
+
description: ( localize(10608, "Current history item reference(s)")),
|
|
1270
1268
|
historyItemRef: 'auto'
|
|
1271
1269
|
};
|
|
1272
1270
|
}
|
|
1273
1271
|
async pickHistoryItemRef() {
|
|
1274
1272
|
const quickPick = this._quickInputService.createQuickPick({ useSeparators: true });
|
|
1275
1273
|
this._store.add(quickPick);
|
|
1276
|
-
quickPick.placeholder = ( localize(
|
|
1274
|
+
quickPick.placeholder = ( localize(10609, "Select one/more history item references to view, type to filter"));
|
|
1277
1275
|
quickPick.canSelectMany = true;
|
|
1278
1276
|
quickPick.hideCheckAll = true;
|
|
1279
1277
|
quickPick.busy = true;
|
|
@@ -1414,7 +1412,7 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
|
|
|
1414
1412
|
compact: true,
|
|
1415
1413
|
showPointer: true
|
|
1416
1414
|
},
|
|
1417
|
-
content: ( new MarkdownString(( localize(
|
|
1415
|
+
content: ( new MarkdownString(( localize(10610, "Please refresh the graph using the refresh action ($(refresh)).")), { supportThemeIcons: true })),
|
|
1418
1416
|
position: {
|
|
1419
1417
|
hoverPosition: HoverPosition.BELOW
|
|
1420
1418
|
}
|
|
@@ -1658,9 +1656,9 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
|
|
|
1658
1656
|
const historyItemChange = e.element.historyItemChange;
|
|
1659
1657
|
const historyItem = e.element.historyItemViewModel.historyItem;
|
|
1660
1658
|
const historyItemDisplayId = historyItem.id === SCMIncomingHistoryItemId
|
|
1661
|
-
? ( localize(
|
|
1659
|
+
? ( localize(10602, "Incoming Changes"))
|
|
1662
1660
|
: historyItem.id === SCMOutgoingHistoryItemId
|
|
1663
|
-
? ( localize(
|
|
1661
|
+
? ( localize(10603, "Outgoing Changes"))
|
|
1664
1662
|
: historyItem.displayId ?? historyItem.id;
|
|
1665
1663
|
const historyItemParentId = historyItem.parentIds.length > 0 ? historyItem.parentIds[0] : undefined;
|
|
1666
1664
|
const historyItemParentDisplayId = historyItemParentId && historyItem.displayId
|
|
@@ -513,7 +513,7 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
|
|
|
513
513
|
}
|
|
514
514
|
},
|
|
515
515
|
getWidgetAriaLabel() {
|
|
516
|
-
return localize(
|
|
516
|
+
return localize(10611, "Source Control Repositories");
|
|
517
517
|
}
|
|
518
518
|
}
|
|
519
519
|
});
|
|
@@ -99,7 +99,7 @@ import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/pl
|
|
|
99
99
|
import { AccessibilityVerbositySettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
|
|
100
100
|
import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
|
|
101
101
|
import { AccessibilityCommandId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/common/accessibilityCommands';
|
|
102
|
-
import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
|
|
102
|
+
import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
|
|
103
103
|
import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
|
|
104
104
|
import { CHAT_SETUP_SUPPORT_ANONYMOUS_ACTION_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
|
|
105
105
|
import { runOnChange } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/runOnChange';
|
|
@@ -758,7 +758,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
|
|
|
758
758
|
this.labelService = labelService;
|
|
759
759
|
}
|
|
760
760
|
getWidgetAriaLabel() {
|
|
761
|
-
return localize(
|
|
761
|
+
return localize(10612, "Source Control Management");
|
|
762
762
|
}
|
|
763
763
|
getAriaLabel(element) {
|
|
764
764
|
if (ResourceTree.isResourceNode(element)) {
|
|
@@ -770,17 +770,17 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
|
|
|
770
770
|
else if (isSCMInput(element)) {
|
|
771
771
|
const verbosity = this.configurationService.getValue(AccessibilityVerbositySettingId.SourceControl) === true;
|
|
772
772
|
if (!verbosity || !this.accessibilityService.isScreenReaderOptimized()) {
|
|
773
|
-
return localize(
|
|
773
|
+
return localize(10613, "Source Control Input");
|
|
774
774
|
}
|
|
775
775
|
const kbLabel = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
|
|
776
776
|
return kbLabel
|
|
777
777
|
? ( localize(
|
|
778
|
-
|
|
778
|
+
10614,
|
|
779
779
|
"Source Control Input, Use {0} to open Source Control Accessibility Help.",
|
|
780
780
|
kbLabel
|
|
781
781
|
))
|
|
782
782
|
: ( localize(
|
|
783
|
-
|
|
783
|
+
10615,
|
|
784
784
|
"Source Control Input, Run the Open Accessibility Help command for more information."
|
|
785
785
|
));
|
|
786
786
|
}
|
|
@@ -839,14 +839,14 @@ const ContextKeys = {
|
|
|
839
839
|
}
|
|
840
840
|
};
|
|
841
841
|
MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
|
|
842
|
-
title: ( localize(
|
|
842
|
+
title: ( localize(10616, "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(10617, "Repositories")),
|
|
850
850
|
submenu: Menus.Repositories,
|
|
851
851
|
when: ContextKeyExpr.greater(ContextKeys.RepositoryCount.key, 1),
|
|
852
852
|
group: '0_repositories'
|
|
@@ -884,6 +884,9 @@ let RepositoryVisibilityActionController = class RepositoryVisibilityActionContr
|
|
|
884
884
|
}
|
|
885
885
|
}
|
|
886
886
|
onDidAddRepository(repository) {
|
|
887
|
+
if (repository.provider.isHidden) {
|
|
888
|
+
return;
|
|
889
|
+
}
|
|
887
890
|
const action = registerAction2(class extends RepositoryVisibilityAction {
|
|
888
891
|
constructor() {
|
|
889
892
|
super(repository);
|
|
@@ -936,7 +939,7 @@ class SetListViewModeAction extends ViewAction {
|
|
|
936
939
|
constructor(id = 'workbench.scm.action.setListViewMode', menu = {}) {
|
|
937
940
|
super({
|
|
938
941
|
id,
|
|
939
|
-
title: ( localize(
|
|
942
|
+
title: ( localize(10618, "View as List")),
|
|
940
943
|
viewId: VIEW_PANE_ID,
|
|
941
944
|
f1: false,
|
|
942
945
|
icon: Codicon.listTree,
|
|
@@ -963,7 +966,7 @@ class SetTreeViewModeAction extends ViewAction {
|
|
|
963
966
|
constructor(id = 'workbench.scm.action.setTreeViewMode', menu = {}) {
|
|
964
967
|
super({
|
|
965
968
|
id,
|
|
966
|
-
title: ( localize(
|
|
969
|
+
title: ( localize(10619, "View as Tree")),
|
|
967
970
|
viewId: VIEW_PANE_ID,
|
|
968
971
|
f1: false,
|
|
969
972
|
icon: Codicon.listFlat,
|
|
@@ -1016,17 +1019,17 @@ class RepositorySortAction extends Action2 {
|
|
|
1016
1019
|
}
|
|
1017
1020
|
class RepositorySortByDiscoveryTimeAction extends RepositorySortAction {
|
|
1018
1021
|
constructor() {
|
|
1019
|
-
super(ISCMRepositorySortKey.DiscoveryTime, ( localize(
|
|
1022
|
+
super(ISCMRepositorySortKey.DiscoveryTime, ( localize(10620, "Sort by Discovery Time")));
|
|
1020
1023
|
}
|
|
1021
1024
|
}
|
|
1022
1025
|
class RepositorySortByNameAction extends RepositorySortAction {
|
|
1023
1026
|
constructor() {
|
|
1024
|
-
super(ISCMRepositorySortKey.Name, ( localize(
|
|
1027
|
+
super(ISCMRepositorySortKey.Name, ( localize(10621, "Sort by Name")));
|
|
1025
1028
|
}
|
|
1026
1029
|
}
|
|
1027
1030
|
class RepositorySortByPathAction extends RepositorySortAction {
|
|
1028
1031
|
constructor() {
|
|
1029
|
-
super(ISCMRepositorySortKey.Path, ( localize(
|
|
1032
|
+
super(ISCMRepositorySortKey.Path, ( localize(10622, "Sort by Path")));
|
|
1030
1033
|
}
|
|
1031
1034
|
}
|
|
1032
1035
|
registerAction2(RepositorySortByDiscoveryTimeAction);
|
|
@@ -1042,13 +1045,13 @@ class RepositorySelectionModeAction extends Action2 {
|
|
|
1042
1045
|
menu: [
|
|
1043
1046
|
{
|
|
1044
1047
|
id: Menus.Repositories,
|
|
1045
|
-
when: ContextKeyExpr.
|
|
1048
|
+
when: ( ContextKeyExpr.and(( ContextKeyExpr.has('scm.providerCount')), ContextKeyExpr.greater('scm.providerCount', 1))),
|
|
1046
1049
|
group: '2_selectionMode',
|
|
1047
1050
|
order
|
|
1048
1051
|
},
|
|
1049
1052
|
{
|
|
1050
1053
|
id: MenuId.SCMSourceControlTitle,
|
|
1051
|
-
when: ContextKeyExpr.
|
|
1054
|
+
when: ( ContextKeyExpr.and(( ContextKeyExpr.has('scm.providerCount')), ContextKeyExpr.greater('scm.providerCount', 1))),
|
|
1052
1055
|
group: '2_selectionMode',
|
|
1053
1056
|
order
|
|
1054
1057
|
},
|
|
@@ -1062,12 +1065,12 @@ class RepositorySelectionModeAction extends Action2 {
|
|
|
1062
1065
|
}
|
|
1063
1066
|
class RepositorySingleSelectionModeAction extends RepositorySelectionModeAction {
|
|
1064
1067
|
constructor() {
|
|
1065
|
-
super(ISCMRepositorySelectionMode.Single, ( localize(
|
|
1068
|
+
super(ISCMRepositorySelectionMode.Single, ( localize(10623, "Select Single Repository")), 1);
|
|
1066
1069
|
}
|
|
1067
1070
|
}
|
|
1068
1071
|
class RepositoryMultiSelectionModeAction extends RepositorySelectionModeAction {
|
|
1069
1072
|
constructor() {
|
|
1070
|
-
super(ISCMRepositorySelectionMode.Multiple, ( localize(
|
|
1073
|
+
super(ISCMRepositorySelectionMode.Multiple, ( localize(10624, "Select Multiple Repositories")), 2);
|
|
1071
1074
|
}
|
|
1072
1075
|
}
|
|
1073
1076
|
registerAction2(RepositorySingleSelectionModeAction);
|
|
@@ -1091,17 +1094,17 @@ class SetSortKeyAction extends ViewAction {
|
|
|
1091
1094
|
}
|
|
1092
1095
|
class SetSortByNameAction extends SetSortKeyAction {
|
|
1093
1096
|
constructor() {
|
|
1094
|
-
super(ViewSortKey.Name, ( localize(
|
|
1097
|
+
super(ViewSortKey.Name, ( localize(10625, "Sort Changes by Name")));
|
|
1095
1098
|
}
|
|
1096
1099
|
}
|
|
1097
1100
|
class SetSortByPathAction extends SetSortKeyAction {
|
|
1098
1101
|
constructor() {
|
|
1099
|
-
super(ViewSortKey.Path, ( localize(
|
|
1102
|
+
super(ViewSortKey.Path, ( localize(10626, "Sort Changes by Path")));
|
|
1100
1103
|
}
|
|
1101
1104
|
}
|
|
1102
1105
|
class SetSortByStatusAction extends SetSortKeyAction {
|
|
1103
1106
|
constructor() {
|
|
1104
|
-
super(ViewSortKey.Status, ( localize(
|
|
1107
|
+
super(ViewSortKey.Status, ( localize(10627, "Sort Changes by Status")));
|
|
1105
1108
|
}
|
|
1106
1109
|
}
|
|
1107
1110
|
registerAction2(SetSortByNameAction);
|
|
@@ -1111,7 +1114,7 @@ class CollapseAllRepositoriesAction extends ViewAction {
|
|
|
1111
1114
|
constructor() {
|
|
1112
1115
|
super({
|
|
1113
1116
|
id: `workbench.scm.action.collapseAllRepositories`,
|
|
1114
|
-
title: ( localize(
|
|
1117
|
+
title: ( localize(10628, "Collapse All Repositories")),
|
|
1115
1118
|
viewId: VIEW_PANE_ID,
|
|
1116
1119
|
f1: false,
|
|
1117
1120
|
icon: Codicon.collapseAll,
|
|
@@ -1130,7 +1133,7 @@ class ExpandAllRepositoriesAction extends ViewAction {
|
|
|
1130
1133
|
constructor() {
|
|
1131
1134
|
super({
|
|
1132
1135
|
id: `workbench.scm.action.expandAllRepositories`,
|
|
1133
|
-
title: ( localize(
|
|
1136
|
+
title: ( localize(10629, "Expand All Repositories")),
|
|
1134
1137
|
viewId: VIEW_PANE_ID,
|
|
1135
1138
|
f1: false,
|
|
1136
1139
|
icon: Codicon.expandAll,
|
|
@@ -1160,7 +1163,7 @@ registerAction2(class extends Action2 {
|
|
|
1160
1163
|
constructor() {
|
|
1161
1164
|
super({
|
|
1162
1165
|
id: SCMInputWidgetCommandId.SetupAction,
|
|
1163
|
-
title: ( localize(
|
|
1166
|
+
title: ( localize(10630, "Generate Commit Message")),
|
|
1164
1167
|
icon: Codicon.sparkle,
|
|
1165
1168
|
f1: false,
|
|
1166
1169
|
menu: {
|
|
@@ -1235,10 +1238,10 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
|
|
|
1235
1238
|
this._onDidChange = ( new Emitter());
|
|
1236
1239
|
this.onDidChange = this._onDidChange.event;
|
|
1237
1240
|
this._disposables = this._register(( new MutableDisposable()));
|
|
1238
|
-
this._dropdownAction = ( new Action('scmInputMoreActions', ( localize(
|
|
1241
|
+
this._dropdownAction = ( new Action('scmInputMoreActions', ( localize(10631, "More Actions...")), 'codicon-chevron-down'));
|
|
1239
1242
|
this._cancelAction = ( new MenuItemAction({
|
|
1240
1243
|
id: SCMInputWidgetCommandId.CancelAction,
|
|
1241
|
-
title: ( localize(
|
|
1244
|
+
title: ( localize(10632, "Cancel")),
|
|
1242
1245
|
icon: Codicon.stopCircle,
|
|
1243
1246
|
}, undefined, undefined, undefined, undefined, contextKeyService, commandService));
|
|
1244
1247
|
}
|
|
@@ -1454,13 +1457,13 @@ let SCMInputWidget = class SCMInputWidget {
|
|
|
1454
1457
|
const kbLabel = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
|
|
1455
1458
|
return kbLabel
|
|
1456
1459
|
? ( localize(
|
|
1457
|
-
|
|
1460
|
+
10633,
|
|
1458
1461
|
"{0}, Use {1} to open Source Control Accessibility Help.",
|
|
1459
1462
|
placeholder,
|
|
1460
1463
|
kbLabel
|
|
1461
1464
|
))
|
|
1462
1465
|
: ( localize(
|
|
1463
|
-
|
|
1466
|
+
10634,
|
|
1464
1467
|
"{0}, Run the Open Accessibility Help command for more information.",
|
|
1465
1468
|
placeholder
|
|
1466
1469
|
));
|
|
@@ -1716,7 +1719,7 @@ let SCMInputWidget = class SCMInputWidget {
|
|
|
1716
1719
|
}
|
|
1717
1720
|
const actionsContainer = append(validationContainer, $('.scm-editor-validation-actions'));
|
|
1718
1721
|
const actionbar = ( new ActionBar(actionsContainer));
|
|
1719
|
-
const action = ( new Action('scmInputWidget.validationMessage.close', ( localize(
|
|
1722
|
+
const action = ( new Action('scmInputWidget.validationMessage.close', ( localize(10635, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
|
|
1720
1723
|
this.contextViewService.hideContextView();
|
|
1721
1724
|
this.element.style.borderBottomLeftRadius = '2px';
|
|
1722
1725
|
this.element.style.borderBottomRightRadius = '2px';
|
|
@@ -2493,6 +2496,9 @@ let SCMTreeDataSource = class SCMTreeDataSource extends Disposable {
|
|
|
2493
2496
|
else if (isSCMInput(element)) {
|
|
2494
2497
|
return element.repository;
|
|
2495
2498
|
}
|
|
2499
|
+
else if (isSCMActionButton(element)) {
|
|
2500
|
+
return element.repository;
|
|
2501
|
+
}
|
|
2496
2502
|
else if (isSCMResourceGroup(element)) {
|
|
2497
2503
|
const repository = this.scmViewService.visibleRepositories.find(r => r.provider === element.provider);
|
|
2498
2504
|
if (!repository) {
|
|
@@ -2500,6 +2506,9 @@ let SCMTreeDataSource = class SCMTreeDataSource extends Disposable {
|
|
|
2500
2506
|
}
|
|
2501
2507
|
return repository;
|
|
2502
2508
|
}
|
|
2509
|
+
else if (isSCMRepository(element)) {
|
|
2510
|
+
return this.scmViewService;
|
|
2511
|
+
}
|
|
2503
2512
|
else {
|
|
2504
2513
|
throw ( new Error('Unexpected call to getParent'));
|
|
2505
2514
|
}
|
|
@@ -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(10636, "Auto")),
|
|
59
59
|
description: this._autoQuickItemDescription,
|
|
60
60
|
repository: 'auto'
|
|
61
61
|
};
|
|
@@ -89,16 +89,19 @@ RepositoryPicker = ( __decorate([
|
|
|
89
89
|
], RepositoryPicker));
|
|
90
90
|
let SCMViewService = class SCMViewService {
|
|
91
91
|
get repositories() {
|
|
92
|
-
return ( this._repositories
|
|
92
|
+
return ( this._repositories
|
|
93
|
+
.filter(r => r.repository.provider.isHidden !== true)
|
|
94
|
+
.map(r => r.repository));
|
|
93
95
|
}
|
|
94
96
|
get visibleRepositories() {
|
|
95
97
|
if (this._repositoriesSortKey === ISCMRepositorySortKey.DiscoveryTime) {
|
|
96
|
-
return ( this._repositories
|
|
98
|
+
return ( this._repositories
|
|
99
|
+
.filter(r => r.repository.provider.isHidden !== true && r.selectionIndex !== -1)
|
|
97
100
|
.sort((r1, r2) => r1.selectionIndex - r2.selectionIndex)
|
|
98
101
|
.map(r => r.repository));
|
|
99
102
|
}
|
|
100
103
|
return ( this._repositories
|
|
101
|
-
.filter(r => r.selectionIndex !== -1)
|
|
104
|
+
.filter(r => r.repository.provider.isHidden !== true && r.selectionIndex !== -1)
|
|
102
105
|
.map(r => r.repository));
|
|
103
106
|
}
|
|
104
107
|
set visibleRepositories(visibleRepositories) {
|