@codingame/monaco-vscode-scm-service-override 23.1.0 → 23.2.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 +14 -13
- package/vscode/src/vs/workbench/contrib/scm/browser/activity.js +5 -5
- package/vscode/src/vs/workbench/contrib/scm/browser/menus.js +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffDecorator.js +3 -3
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffWidget.js +13 -13
- package/vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js +88 -88
- package/vscode/src/vs/workbench/contrib/scm/browser/scmAccessibilityHelp.js +23 -23
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.js +27 -27
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.js +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js +26 -26
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.js +1 -1
|
@@ -58,10 +58,10 @@ ModesRegistry.registerLanguage({
|
|
|
58
58
|
( Registry.as(Extensions.Workbench))
|
|
59
59
|
.registerWorkbenchContribution(QuickDiffWorkbenchController, LifecyclePhase.Restored);
|
|
60
60
|
registerEditorContribution(QuickDiffEditorController.ID, QuickDiffEditorController, EditorContributionInstantiation.AfterFirstRender);
|
|
61
|
-
const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localize(
|
|
61
|
+
const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localize(10293, 'View icon of the Source Control view.')));
|
|
62
62
|
const viewContainer = ( Registry.as(Extensions$1.ViewContainersRegistry)).registerViewContainer({
|
|
63
63
|
id: VIEWLET_ID,
|
|
64
|
-
title: ( localize2(
|
|
64
|
+
title: ( localize2(10294, 'Source Control')),
|
|
65
65
|
ctorDescriptor: ( new SyncDescriptor(SCMViewPaneContainer)),
|
|
66
66
|
storageId: 'workbench.scm.views.state',
|
|
67
67
|
icon: sourceControlViewIcon,
|
|
@@ -70,25 +70,25 @@ const viewContainer = ( Registry.as(Extensions$1.ViewContainersRegistry)).regist
|
|
|
70
70
|
hideIfEmpty: true,
|
|
71
71
|
}, ViewContainerLocation.Sidebar, { doNotRegisterOpenCommand: true });
|
|
72
72
|
const viewsRegistry = ( Registry.as(Extensions$1.ViewsRegistry));
|
|
73
|
-
const containerTitle = ( localize(
|
|
73
|
+
const containerTitle = ( localize(10295, "Source Control"));
|
|
74
74
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
75
|
-
content: ( localize(
|
|
75
|
+
content: ( localize(10296, "No source control providers registered.")),
|
|
76
76
|
when: 'default'
|
|
77
77
|
});
|
|
78
78
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
79
79
|
content: ( localize(
|
|
80
|
-
|
|
80
|
+
10297,
|
|
81
81
|
"None of the registered source control providers work in Restricted Mode."
|
|
82
82
|
)),
|
|
83
83
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('scm.providerCount', 0)), WorkspaceTrustContext.IsEnabled, ( WorkspaceTrustContext.IsTrusted.toNegated())))
|
|
84
84
|
});
|
|
85
85
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
86
|
-
content: `[${( localize(
|
|
86
|
+
content: `[${( localize(10298, "Manage Workspace Trust"))}](command:${MANAGE_TRUST_COMMAND_ID})`,
|
|
87
87
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('scm.providerCount', 0)), WorkspaceTrustContext.IsEnabled, ( WorkspaceTrustContext.IsTrusted.toNegated())))
|
|
88
88
|
});
|
|
89
89
|
viewsRegistry.registerViewWelcomeContent(HISTORY_VIEW_PANE_ID, {
|
|
90
90
|
content: ( localize(
|
|
91
|
-
|
|
91
|
+
10299,
|
|
92
92
|
"The selected source control provider does not have any source control history items."
|
|
93
93
|
)),
|
|
94
94
|
when: ( ContextKeys.SCMHistoryItemCount.isEqualTo(0))
|
|
@@ -96,8 +96,8 @@ viewsRegistry.registerViewWelcomeContent(HISTORY_VIEW_PANE_ID, {
|
|
|
96
96
|
viewsRegistry.registerViews([{
|
|
97
97
|
id: REPOSITORIES_VIEW_PANE_ID,
|
|
98
98
|
containerTitle,
|
|
99
|
-
name: ( localize2(
|
|
100
|
-
singleViewPaneContainerTitle: ( localize(
|
|
99
|
+
name: ( localize2(10300, "Repositories")),
|
|
100
|
+
singleViewPaneContainerTitle: ( localize(10301, "Source Control Repositories")),
|
|
101
101
|
ctorDescriptor: ( new SyncDescriptor(SCMRepositoriesViewPane)),
|
|
102
102
|
canToggleVisibility: true,
|
|
103
103
|
hideByDefault: true,
|
|
@@ -110,7 +110,7 @@ viewsRegistry.registerViews([{
|
|
|
110
110
|
viewsRegistry.registerViews([{
|
|
111
111
|
id: VIEW_PANE_ID,
|
|
112
112
|
containerTitle,
|
|
113
|
-
name: ( localize2(
|
|
113
|
+
name: ( localize2(10302, 'Changes')),
|
|
114
114
|
singleViewPaneContainerTitle: containerTitle,
|
|
115
115
|
ctorDescriptor: ( new SyncDescriptor(SCMViewPane)),
|
|
116
116
|
canToggleVisibility: true,
|
|
@@ -120,7 +120,7 @@ viewsRegistry.registerViews([{
|
|
|
120
120
|
containerIcon: sourceControlViewIcon,
|
|
121
121
|
openCommandActionDescriptor: {
|
|
122
122
|
id: viewContainer.id,
|
|
123
|
-
mnemonicTitle: ( localize(
|
|
123
|
+
mnemonicTitle: ( localize(10303, "Source &&Control")),
|
|
124
124
|
keybindings: {
|
|
125
125
|
primary: 0,
|
|
126
126
|
win: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG },
|
|
@@ -133,8 +133,8 @@ viewsRegistry.registerViews([{
|
|
|
133
133
|
viewsRegistry.registerViews([{
|
|
134
134
|
id: HISTORY_VIEW_PANE_ID,
|
|
135
135
|
containerTitle,
|
|
136
|
-
name: ( localize2(
|
|
137
|
-
singleViewPaneContainerTitle: ( localize(
|
|
136
|
+
name: ( localize2(10304, "Graph")),
|
|
137
|
+
singleViewPaneContainerTitle: ( localize(10305, "Source Control Graph")),
|
|
138
138
|
ctorDescriptor: ( new SyncDescriptor(SCMHistoryViewPane)),
|
|
139
139
|
canToggleVisibility: true,
|
|
140
140
|
canMoveView: true,
|
|
@@ -152,7 +152,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
152
152
|
( Registry.as(Extensions$2.Configuration)).registerConfiguration({
|
|
153
153
|
id: 'scm',
|
|
154
154
|
order: 5,
|
|
155
|
-
title: ( localize(
|
|
155
|
+
title: ( localize(10306, "Source Control")),
|
|
156
156
|
type: 'object',
|
|
157
157
|
scope: ConfigurationScope.RESOURCE,
|
|
158
158
|
properties: {
|
|
@@ -160,21 +160,21 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
160
160
|
type: 'string',
|
|
161
161
|
enum: ['all', 'gutter', 'overview', 'minimap', 'none'],
|
|
162
162
|
enumDescriptions: [
|
|
163
|
-
( localize(
|
|
164
|
-
( localize(
|
|
165
|
-
( localize(
|
|
166
|
-
( localize(
|
|
167
|
-
( localize(
|
|
163
|
+
( localize(10307, "Show the diff decorations in all available locations.")),
|
|
164
|
+
( localize(10308, "Show the diff decorations only in the editor gutter.")),
|
|
165
|
+
( localize(10309, "Show the diff decorations only in the overview ruler.")),
|
|
166
|
+
( localize(10310, "Show the diff decorations only in the minimap.")),
|
|
167
|
+
( localize(10311, "Do not show the diff decorations."))
|
|
168
168
|
],
|
|
169
169
|
default: 'all',
|
|
170
|
-
description: ( localize(
|
|
170
|
+
description: ( localize(10312, "Controls diff decorations in the editor."))
|
|
171
171
|
},
|
|
172
172
|
'scm.diffDecorationsGutterWidth': {
|
|
173
173
|
type: 'number',
|
|
174
174
|
enum: [1, 2, 3, 4, 5],
|
|
175
175
|
default: 3,
|
|
176
176
|
description: ( localize(
|
|
177
|
-
|
|
177
|
+
10313,
|
|
178
178
|
"Controls the width(px) of diff decorations in gutter (added & modified)."
|
|
179
179
|
))
|
|
180
180
|
},
|
|
@@ -182,11 +182,11 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
182
182
|
type: 'string',
|
|
183
183
|
enum: ['always', 'hover'],
|
|
184
184
|
enumDescriptions: [
|
|
185
|
-
( localize(
|
|
186
|
-
( localize(
|
|
185
|
+
( localize(10314, "Show the diff decorator in the gutter at all times.")),
|
|
186
|
+
( localize(10315, "Show the diff decorator in the gutter only on hover."))
|
|
187
187
|
],
|
|
188
188
|
description: ( localize(
|
|
189
|
-
|
|
189
|
+
10316,
|
|
190
190
|
"Controls the visibility of the Source Control diff decorator in the gutter."
|
|
191
191
|
)),
|
|
192
192
|
default: 'always'
|
|
@@ -195,28 +195,28 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
195
195
|
type: 'string',
|
|
196
196
|
enum: ['diff', 'none'],
|
|
197
197
|
enumDescriptions: [
|
|
198
|
-
( localize(
|
|
199
|
-
( localize(
|
|
198
|
+
( localize(10317, "Show the inline diff Peek view on click.")),
|
|
199
|
+
( localize(10318, "Do nothing."))
|
|
200
200
|
],
|
|
201
|
-
description: ( localize(
|
|
201
|
+
description: ( localize(10319, "Controls the behavior of Source Control diff gutter decorations.")),
|
|
202
202
|
default: 'diff'
|
|
203
203
|
},
|
|
204
204
|
'scm.diffDecorationsGutterPattern': {
|
|
205
205
|
type: 'object',
|
|
206
206
|
description: ( localize(
|
|
207
|
-
|
|
207
|
+
10320,
|
|
208
208
|
"Controls whether a pattern is used for the diff decorations in gutter."
|
|
209
209
|
)),
|
|
210
210
|
additionalProperties: false,
|
|
211
211
|
properties: {
|
|
212
212
|
'added': {
|
|
213
213
|
type: 'boolean',
|
|
214
|
-
description: ( localize(
|
|
214
|
+
description: ( localize(10321, "Use pattern for the diff decorations in gutter for added lines.")),
|
|
215
215
|
},
|
|
216
216
|
'modified': {
|
|
217
217
|
type: 'boolean',
|
|
218
218
|
description: ( localize(
|
|
219
|
-
|
|
219
|
+
10322,
|
|
220
220
|
"Use pattern for the diff decorations in gutter for modified lines."
|
|
221
221
|
)),
|
|
222
222
|
},
|
|
@@ -230,12 +230,12 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
230
230
|
type: 'string',
|
|
231
231
|
enum: ['true', 'false', 'inherit'],
|
|
232
232
|
enumDescriptions: [
|
|
233
|
-
( localize(
|
|
234
|
-
( localize(
|
|
235
|
-
( localize(
|
|
233
|
+
( localize(10323, "Ignore leading and trailing whitespace.")),
|
|
234
|
+
( localize(10324, "Do not ignore leading and trailing whitespace.")),
|
|
235
|
+
( localize(10325, "Inherit from `diffEditor.ignoreTrimWhitespace`."))
|
|
236
236
|
],
|
|
237
237
|
description: ( localize(
|
|
238
|
-
|
|
238
|
+
10326,
|
|
239
239
|
"Controls whether leading and trailing whitespace is ignored in Source Control diff gutter decorations."
|
|
240
240
|
)),
|
|
241
241
|
default: 'false'
|
|
@@ -243,7 +243,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
243
243
|
'scm.alwaysShowActions': {
|
|
244
244
|
type: 'boolean',
|
|
245
245
|
description: ( localize(
|
|
246
|
-
|
|
246
|
+
10327,
|
|
247
247
|
"Controls whether inline actions are always visible in the Source Control view."
|
|
248
248
|
)),
|
|
249
249
|
default: false
|
|
@@ -252,12 +252,12 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
252
252
|
type: 'string',
|
|
253
253
|
enum: ['all', 'focused', 'off'],
|
|
254
254
|
enumDescriptions: [
|
|
255
|
-
( localize(
|
|
256
|
-
( localize(
|
|
257
|
-
( localize(
|
|
255
|
+
( localize(10328, "Show the sum of all Source Control Provider count badges.")),
|
|
256
|
+
( localize(10329, "Show the count badge of the focused Source Control Provider.")),
|
|
257
|
+
( localize(10330, "Disable the Source Control count badge."))
|
|
258
258
|
],
|
|
259
259
|
description: ( localize(
|
|
260
|
-
|
|
260
|
+
10331,
|
|
261
261
|
"Controls the count badge on the Source Control icon on the Activity Bar."
|
|
262
262
|
)),
|
|
263
263
|
default: 'all'
|
|
@@ -266,12 +266,12 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
266
266
|
type: 'string',
|
|
267
267
|
enum: ['hidden', 'auto', 'visible'],
|
|
268
268
|
enumDescriptions: [
|
|
269
|
-
( localize(
|
|
270
|
-
( localize(
|
|
271
|
-
( localize(
|
|
269
|
+
( localize(10332, "Hide Source Control Provider count badges.")),
|
|
270
|
+
( localize(10333, "Only show count badge for Source Control Provider when non-zero.")),
|
|
271
|
+
( localize(10334, "Show Source Control Provider count badges."))
|
|
272
272
|
],
|
|
273
273
|
markdownDescription: ( localize(
|
|
274
|
-
|
|
274
|
+
10335,
|
|
275
275
|
"Controls the count badges on Source Control Provider headers. These headers appear in the Source Control view when there is more than one provider or when the {0} setting is enabled, and in the Source Control Repositories view.",
|
|
276
276
|
'\`#scm.alwaysShowRepositories#\`'
|
|
277
277
|
)),
|
|
@@ -281,22 +281,22 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
281
281
|
type: 'string',
|
|
282
282
|
enum: ['tree', 'list'],
|
|
283
283
|
enumDescriptions: [
|
|
284
|
-
( localize(
|
|
285
|
-
( localize(
|
|
284
|
+
( localize(10336, "Show the repository changes as a tree.")),
|
|
285
|
+
( localize(10337, "Show the repository changes as a list."))
|
|
286
286
|
],
|
|
287
|
-
description: ( localize(
|
|
287
|
+
description: ( localize(10338, "Controls the default Source Control repository view mode.")),
|
|
288
288
|
default: 'list'
|
|
289
289
|
},
|
|
290
290
|
'scm.defaultViewSortKey': {
|
|
291
291
|
type: 'string',
|
|
292
292
|
enum: ['name', 'path', 'status'],
|
|
293
293
|
enumDescriptions: [
|
|
294
|
-
( localize(
|
|
295
|
-
( localize(
|
|
296
|
-
( localize(
|
|
294
|
+
( localize(10339, "Sort the repository changes by file name.")),
|
|
295
|
+
( localize(10340, "Sort the repository changes by path.")),
|
|
296
|
+
( localize(10341, "Sort the repository changes by Source Control status."))
|
|
297
297
|
],
|
|
298
298
|
description: ( localize(
|
|
299
|
-
|
|
299
|
+
10342,
|
|
300
300
|
"Controls the default Source Control repository changes sort order when viewed as a list."
|
|
301
301
|
)),
|
|
302
302
|
default: 'path'
|
|
@@ -304,7 +304,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
304
304
|
'scm.autoReveal': {
|
|
305
305
|
type: 'boolean',
|
|
306
306
|
description: ( localize(
|
|
307
|
-
|
|
307
|
+
10343,
|
|
308
308
|
"Controls whether the Source Control view should automatically reveal and select files when opening them."
|
|
309
309
|
)),
|
|
310
310
|
default: true
|
|
@@ -312,20 +312,20 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
312
312
|
'scm.inputFontFamily': {
|
|
313
313
|
type: 'string',
|
|
314
314
|
markdownDescription: ( localize(
|
|
315
|
-
|
|
315
|
+
10344,
|
|
316
316
|
"Controls the font for the input message. Use `default` for the workbench user interface font family, `editor` for the `#editor.fontFamily#`'s value, or a custom font family."
|
|
317
317
|
)),
|
|
318
318
|
default: 'default'
|
|
319
319
|
},
|
|
320
320
|
'scm.inputFontSize': {
|
|
321
321
|
type: 'number',
|
|
322
|
-
markdownDescription: ( localize(
|
|
322
|
+
markdownDescription: ( localize(10345, "Controls the font size for the input message in pixels.")),
|
|
323
323
|
default: 13
|
|
324
324
|
},
|
|
325
325
|
'scm.inputMaxLineCount': {
|
|
326
326
|
type: 'number',
|
|
327
327
|
markdownDescription: ( localize(
|
|
328
|
-
|
|
328
|
+
10346,
|
|
329
329
|
"Controls the maximum number of lines that the input will auto-grow to."
|
|
330
330
|
)),
|
|
331
331
|
minimum: 1,
|
|
@@ -335,7 +335,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
335
335
|
'scm.inputMinLineCount': {
|
|
336
336
|
type: 'number',
|
|
337
337
|
markdownDescription: ( localize(
|
|
338
|
-
|
|
338
|
+
10347,
|
|
339
339
|
"Controls the minimum number of lines that the input will auto-grow from."
|
|
340
340
|
)),
|
|
341
341
|
minimum: 1,
|
|
@@ -345,7 +345,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
345
345
|
'scm.alwaysShowRepositories': {
|
|
346
346
|
type: 'boolean',
|
|
347
347
|
markdownDescription: ( localize(
|
|
348
|
-
|
|
348
|
+
10348,
|
|
349
349
|
"Controls whether repositories should always be visible in the Source Control view."
|
|
350
350
|
)),
|
|
351
351
|
default: false
|
|
@@ -355,20 +355,20 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
355
355
|
enum: ['discovery time', 'name', 'path'],
|
|
356
356
|
enumDescriptions: [
|
|
357
357
|
( localize(
|
|
358
|
-
|
|
358
|
+
10349,
|
|
359
359
|
"Repositories in the Source Control Repositories view are sorted by discovery time. Repositories in the Source Control view are sorted in the order that they were selected."
|
|
360
360
|
)),
|
|
361
361
|
( localize(
|
|
362
|
-
|
|
362
|
+
10350,
|
|
363
363
|
"Repositories in the Source Control Repositories and Source Control views are sorted by repository name."
|
|
364
364
|
)),
|
|
365
365
|
( localize(
|
|
366
|
-
|
|
366
|
+
10351,
|
|
367
367
|
"Repositories in the Source Control Repositories and Source Control views are sorted by repository path."
|
|
368
368
|
))
|
|
369
369
|
],
|
|
370
370
|
description: ( localize(
|
|
371
|
-
|
|
371
|
+
10352,
|
|
372
372
|
"Controls the sort order of the repositories in the source control repositories view."
|
|
373
373
|
)),
|
|
374
374
|
default: 'discovery time'
|
|
@@ -376,7 +376,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
376
376
|
'scm.repositories.visible': {
|
|
377
377
|
type: 'number',
|
|
378
378
|
description: ( localize(
|
|
379
|
-
|
|
379
|
+
10353,
|
|
380
380
|
"Controls how many repositories are visible in the Source Control Repositories section. Set to 0, to be able to manually resize the view."
|
|
381
381
|
)),
|
|
382
382
|
default: 10
|
|
@@ -385,11 +385,11 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
385
385
|
type: 'string',
|
|
386
386
|
enum: ['multiple', 'single'],
|
|
387
387
|
enumDescriptions: [
|
|
388
|
-
( localize(
|
|
389
|
-
( localize(
|
|
388
|
+
( localize(10354, "Multiple repositories can be selected at the same time.")),
|
|
389
|
+
( localize(10355, "Only one repository can be selected at a time."))
|
|
390
390
|
],
|
|
391
391
|
description: ( localize(
|
|
392
|
-
|
|
392
|
+
10356,
|
|
393
393
|
"Controls the selection mode of the repositories in the Source Control Repositories view."
|
|
394
394
|
)),
|
|
395
395
|
default: 'multiple'
|
|
@@ -397,7 +397,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
397
397
|
'scm.repositories.explorer': {
|
|
398
398
|
type: 'boolean',
|
|
399
399
|
markdownDescription: ( localize(
|
|
400
|
-
|
|
400
|
+
10357,
|
|
401
401
|
"Controls whether to show repository artifacts in the Source Control Repositories view. This feature is experimental and only works when {0} is set to `{1}`.",
|
|
402
402
|
'\`#scm.repositories.selectionMode#\`',
|
|
403
403
|
'single'
|
|
@@ -408,7 +408,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
408
408
|
'scm.showActionButton': {
|
|
409
409
|
type: 'boolean',
|
|
410
410
|
markdownDescription: ( localize(
|
|
411
|
-
|
|
411
|
+
10358,
|
|
412
412
|
"Controls whether an action button can be shown in the Source Control view."
|
|
413
413
|
)),
|
|
414
414
|
default: true
|
|
@@ -416,7 +416,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
416
416
|
'scm.showInputActionButton': {
|
|
417
417
|
type: 'boolean',
|
|
418
418
|
markdownDescription: ( localize(
|
|
419
|
-
|
|
419
|
+
10359,
|
|
420
420
|
"Controls whether an action button can be shown in the Source Control input."
|
|
421
421
|
)),
|
|
422
422
|
default: true
|
|
@@ -424,7 +424,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
424
424
|
'scm.workingSets.enabled': {
|
|
425
425
|
type: 'boolean',
|
|
426
426
|
description: ( localize(
|
|
427
|
-
|
|
427
|
+
10360,
|
|
428
428
|
"Controls whether to store editor working sets when switching between source control history item groups."
|
|
429
429
|
)),
|
|
430
430
|
default: false
|
|
@@ -434,16 +434,16 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
434
434
|
enum: ['empty', 'current'],
|
|
435
435
|
enumDescriptions: [
|
|
436
436
|
( localize(
|
|
437
|
-
|
|
437
|
+
10361,
|
|
438
438
|
"Use an empty working set when switching to a source control history item group that does not have a working set."
|
|
439
439
|
)),
|
|
440
440
|
( localize(
|
|
441
|
-
|
|
441
|
+
10362,
|
|
442
442
|
"Use the current working set when switching to a source control history item group that does not have a working set."
|
|
443
443
|
))
|
|
444
444
|
],
|
|
445
445
|
description: ( localize(
|
|
446
|
-
|
|
446
|
+
10363,
|
|
447
447
|
"Controls the default working set to use when switching to a source control history item group that does not have a working set."
|
|
448
448
|
)),
|
|
449
449
|
default: 'current'
|
|
@@ -451,7 +451,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
451
451
|
'scm.compactFolders': {
|
|
452
452
|
type: 'boolean',
|
|
453
453
|
description: ( localize(
|
|
454
|
-
|
|
454
|
+
10364,
|
|
455
455
|
"Controls whether the Source Control view should render folders in a compact form. In such a form, single child folders will be compressed in a combined tree element."
|
|
456
456
|
)),
|
|
457
457
|
default: true
|
|
@@ -459,7 +459,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
459
459
|
'scm.graph.pageOnScroll': {
|
|
460
460
|
type: 'boolean',
|
|
461
461
|
description: ( localize(
|
|
462
|
-
|
|
462
|
+
10365,
|
|
463
463
|
"Controls whether the Source Control Graph view will load the next page of items when you scroll to the end of the list."
|
|
464
464
|
)),
|
|
465
465
|
default: true
|
|
@@ -467,7 +467,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
467
467
|
'scm.graph.pageSize': {
|
|
468
468
|
type: 'number',
|
|
469
469
|
description: ( localize(
|
|
470
|
-
|
|
470
|
+
10366,
|
|
471
471
|
"The number of items to show in the Source Control Graph view by default and when loading more items."
|
|
472
472
|
)),
|
|
473
473
|
minimum: 1,
|
|
@@ -479,16 +479,16 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
479
479
|
enum: ['all', 'filter'],
|
|
480
480
|
enumDescriptions: [
|
|
481
481
|
( localize(
|
|
482
|
-
|
|
482
|
+
10367,
|
|
483
483
|
"Show badges of all history item groups in the Source Control Graph view."
|
|
484
484
|
)),
|
|
485
485
|
( localize(
|
|
486
|
-
|
|
486
|
+
10368,
|
|
487
487
|
"Show only the badges of history item groups used as a filter in the Source Control Graph view."
|
|
488
488
|
))
|
|
489
489
|
],
|
|
490
490
|
description: ( localize(
|
|
491
|
-
|
|
491
|
+
10369,
|
|
492
492
|
"Controls which badges are shown in the Source Control Graph view. The badges are shown on the right side of the graph indicating the names of history item groups."
|
|
493
493
|
)),
|
|
494
494
|
default: 'filter'
|
|
@@ -496,7 +496,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
496
496
|
'scm.graph.showIncomingChanges': {
|
|
497
497
|
type: 'boolean',
|
|
498
498
|
description: ( localize(
|
|
499
|
-
|
|
499
|
+
10370,
|
|
500
500
|
"Controls whether to show incoming changes in the Source Control Graph view."
|
|
501
501
|
)),
|
|
502
502
|
default: true
|
|
@@ -504,7 +504,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
504
504
|
'scm.graph.showOutgoingChanges': {
|
|
505
505
|
type: 'boolean',
|
|
506
506
|
description: ( localize(
|
|
507
|
-
|
|
507
|
+
10371,
|
|
508
508
|
"Controls whether to show outgoing changes in the Source Control Graph view."
|
|
509
509
|
)),
|
|
510
510
|
default: true
|
|
@@ -513,7 +513,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
513
513
|
});
|
|
514
514
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
515
515
|
id: 'scm.acceptInput',
|
|
516
|
-
metadata: { description: ( localize(
|
|
516
|
+
metadata: { description: ( localize(10372, "Source Control: Accept Input")), args: [] },
|
|
517
517
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
518
518
|
when: ( ContextKeyExpr.has('scmRepository')),
|
|
519
519
|
primary: KeyMod.CtrlCmd | KeyCode.Enter,
|
|
@@ -550,7 +550,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
550
550
|
}
|
|
551
551
|
});
|
|
552
552
|
const viewNextCommitCommand = {
|
|
553
|
-
description: { description: ( localize(
|
|
553
|
+
description: { description: ( localize(10373, "Source Control: View Next Commit")), args: [] },
|
|
554
554
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
555
555
|
handler: (accessor) => {
|
|
556
556
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
@@ -562,7 +562,7 @@ const viewNextCommitCommand = {
|
|
|
562
562
|
}
|
|
563
563
|
};
|
|
564
564
|
const viewPreviousCommitCommand = {
|
|
565
|
-
description: { description: ( localize(
|
|
565
|
+
description: { description: ( localize(10374, "Source Control: View Previous Commit")), args: [] },
|
|
566
566
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
567
567
|
handler: (accessor) => {
|
|
568
568
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
@@ -630,8 +630,8 @@ CommandsRegistry.registerCommand('scm.openInTerminal', async (accessor, provider
|
|
|
630
630
|
CommandsRegistry.registerCommand('scm.setActiveProvider', async (accessor) => {
|
|
631
631
|
const instantiationService = accessor.get(IInstantiationService);
|
|
632
632
|
const scmViewService = accessor.get(ISCMViewService);
|
|
633
|
-
const placeHolder = ( localize(
|
|
634
|
-
const autoQuickItemDescription = ( localize(
|
|
633
|
+
const placeHolder = ( localize(10375, "Select the active repository, type to filter all repositories"));
|
|
634
|
+
const autoQuickItemDescription = ( localize(10376, "The active repository is updated based on active editor"));
|
|
635
635
|
const repositoryPicker = instantiationService.createInstance(RepositoryPicker, placeHolder, autoQuickItemDescription);
|
|
636
636
|
const result = await repositoryPicker.pickRepository();
|
|
637
637
|
if (result?.repository) {
|
|
@@ -643,7 +643,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
|
|
|
643
643
|
group: '99_terminal',
|
|
644
644
|
command: {
|
|
645
645
|
id: 'scm.openInTerminal',
|
|
646
|
-
title: ( localize(
|
|
646
|
+
title: ( localize(10377, "Open in External Terminal"))
|
|
647
647
|
},
|
|
648
648
|
when: ( ContextKeyExpr.and(( RemoteNameContext.isEqualTo('')), ( ContextKeyExpr.equals('scmProviderHasRootUri', true)), ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'external')), ( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both'))))))
|
|
649
649
|
});
|
|
@@ -651,7 +651,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
|
|
|
651
651
|
group: '99_terminal',
|
|
652
652
|
command: {
|
|
653
653
|
id: 'scm.openInIntegratedTerminal',
|
|
654
|
-
title: ( localize(
|
|
654
|
+
title: ( localize(10378, "Open in Integrated Terminal"))
|
|
655
655
|
},
|
|
656
656
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('scmProviderHasRootUri', true)), ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'integrated')), ( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both'))))))
|
|
657
657
|
});
|
|
@@ -702,7 +702,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
702
702
|
}
|
|
703
703
|
});
|
|
704
704
|
MenuRegistry.appendMenuItem(MenuId.EditorLineNumberContext, {
|
|
705
|
-
title: ( localize(
|
|
705
|
+
title: ( localize(10379, "Diff Decorations")),
|
|
706
706
|
submenu: MenuId.SCMQuickDiffDecorations,
|
|
707
707
|
when: ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.scm.diffDecorations', 'all')), ( ContextKeyExpr.equals('config.scm.diffDecorations', 'gutter')))),
|
|
708
708
|
group: '9_quickDiffDecorations'
|
|
@@ -711,7 +711,7 @@ registerAction2(class extends Action2 {
|
|
|
711
711
|
constructor() {
|
|
712
712
|
super({
|
|
713
713
|
id: 'scm.editor.triggerSetup',
|
|
714
|
-
title: ( localize(
|
|
714
|
+
title: ( localize(10380, "Resolve Conflicts with AI")),
|
|
715
715
|
icon: Codicon.chatSparkle,
|
|
716
716
|
f1: false,
|
|
717
717
|
menu: {
|
|
@@ -55,75 +55,75 @@ let SCMAccessibilityHelpContentProvider = class SCMAccessibilityHelpContentProvi
|
|
|
55
55
|
const content = [];
|
|
56
56
|
if (this._scmViewService.visibleRepositories.length > 1) {
|
|
57
57
|
const repositoryList = ( this._scmViewService.visibleRepositories.map(r => r.provider.name)).join(', ');
|
|
58
|
-
content.push(( localize(
|
|
58
|
+
content.push(( localize(10381, "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(10382, "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(10383, "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(10384, "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(10385, "enabled")) : ( localize(10386, "disabled"));
|
|
74
|
+
content.push(( localize(10387, "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(10388, "Resource groups: {0}", resourceGroups.join(', '))));
|
|
82
82
|
}
|
|
83
83
|
content.push(( localize(
|
|
84
|
-
|
|
84
|
+
10389,
|
|
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
|
+
10390,
|
|
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(10391, "Once the Source Control Repositories view is opened you can:")));
|
|
92
92
|
content.push(( localize(
|
|
93
|
-
|
|
93
|
+
10392,
|
|
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(10393, " - Use the Enter or Space keys to select a repository.")));
|
|
97
|
+
content.push(( localize(10394, " - Use Shift + up/down keys to select multiple repositories.")));
|
|
98
98
|
content.push(( localize(
|
|
99
|
-
|
|
99
|
+
10395,
|
|
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
|
+
10396,
|
|
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(10397, "Once the Source Control view is opened you can:")));
|
|
107
107
|
content.push(( localize(
|
|
108
|
-
|
|
108
|
+
10398,
|
|
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(10399, " - Use the Space key to expand or collapse a resource group.")));
|
|
112
112
|
content.push(( localize(
|
|
113
|
-
|
|
113
|
+
10400,
|
|
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
|
+
10401,
|
|
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(10402, "Once the Source Control Graph view is opened you can:")));
|
|
121
121
|
content.push(( localize(
|
|
122
|
-
|
|
122
|
+
10403,
|
|
123
123
|
" - Use the up/down arrow keys to navigate the list of history items."
|
|
124
124
|
)));
|
|
125
125
|
content.push(( localize(
|
|
126
|
-
|
|
126
|
+
10404,
|
|
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');
|