@codingame/monaco-vscode-scm-service-override 37.2.0 → 37.3.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/common.d.ts +2 -0
- package/common.js +25 -0
- package/index.d.ts +2 -2
- package/index.js +1 -24
- package/package.json +10 -2
- package/session.d.ts +2 -0
- package/session.js +2 -0
- package/vscode/src/vs/workbench/contrib/scm/browser/activity.js +9 -9
- package/vscode/src/vs/workbench/contrib/scm/browser/menus.js +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiff.contribution.js +14 -14
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffDecorator.js +5 -5
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffModel.js +11 -11
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffWidget.js +24 -18
- package/vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js +71 -71
- package/vscode/src/vs/workbench/contrib/scm/browser/scmAccessibilityHelp.js +25 -25
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.js +41 -41
- package/vscode/src/vs/workbench/contrib/scm/browser/scmInput.js +9 -9
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.js +12 -12
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.js +8 -6
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js +39 -39
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.js +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.js +12 -12
|
@@ -50,10 +50,10 @@ ModesRegistry.registerLanguage({
|
|
|
50
50
|
aliases: [],
|
|
51
51
|
mimetypes: ["text/x-scm-input"]
|
|
52
52
|
});
|
|
53
|
-
const sourceControlViewIcon = registerIcon("source-control-view-icon", Codicon.sourceControl, ( localize(
|
|
53
|
+
const sourceControlViewIcon = registerIcon("source-control-view-icon", Codicon.sourceControl, ( localize(17805, "View icon of the Source Control view.")));
|
|
54
54
|
const viewContainer = ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
|
|
55
55
|
id: VIEWLET_ID,
|
|
56
|
-
title: ( localize2(
|
|
56
|
+
title: ( localize2(17806, "Source Control")),
|
|
57
57
|
ctorDescriptor: ( new SyncDescriptor(SCMViewPaneContainer)),
|
|
58
58
|
storageId: "workbench.scm.views.state",
|
|
59
59
|
icon: sourceControlViewIcon,
|
|
@@ -64,25 +64,25 @@ const viewContainer = ( Registry.as(Extensions.ViewContainersRegistry)).register
|
|
|
64
64
|
doNotRegisterOpenCommand: true
|
|
65
65
|
});
|
|
66
66
|
const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
|
|
67
|
-
const containerTitle = ( localize(
|
|
67
|
+
const containerTitle = ( localize(17807, "Source Control"));
|
|
68
68
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
69
|
-
content: ( localize(
|
|
69
|
+
content: ( localize(17808, "No source control providers registered.")),
|
|
70
70
|
when: "default"
|
|
71
71
|
});
|
|
72
72
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
73
73
|
content: ( localize(
|
|
74
|
-
|
|
74
|
+
17809,
|
|
75
75
|
"None of the registered source control providers work in Restricted Mode."
|
|
76
76
|
)),
|
|
77
77
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("scm.providerCount", 0)), WorkspaceTrustContext.IsEnabled, ( WorkspaceTrustContext.IsTrusted.toNegated())))
|
|
78
78
|
});
|
|
79
79
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
80
|
-
content: `[${( localize(
|
|
80
|
+
content: `[${( localize(17810, "Manage Workspace Trust"))}](command:${MANAGE_TRUST_COMMAND_ID})`,
|
|
81
81
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("scm.providerCount", 0)), WorkspaceTrustContext.IsEnabled, ( WorkspaceTrustContext.IsTrusted.toNegated())))
|
|
82
82
|
});
|
|
83
83
|
viewsRegistry.registerViewWelcomeContent(HISTORY_VIEW_PANE_ID, {
|
|
84
84
|
content: ( localize(
|
|
85
|
-
|
|
85
|
+
17811,
|
|
86
86
|
"The selected source control provider does not have any source control history items."
|
|
87
87
|
)),
|
|
88
88
|
when: ( ContextKeys.SCMHistoryItemCount.isEqualTo(0))
|
|
@@ -90,8 +90,8 @@ viewsRegistry.registerViewWelcomeContent(HISTORY_VIEW_PANE_ID, {
|
|
|
90
90
|
viewsRegistry.registerViews([{
|
|
91
91
|
id: REPOSITORIES_VIEW_PANE_ID,
|
|
92
92
|
containerTitle,
|
|
93
|
-
name: ( localize2(
|
|
94
|
-
singleViewPaneContainerTitle: ( localize(
|
|
93
|
+
name: ( localize2(17812, "Repositories")),
|
|
94
|
+
singleViewPaneContainerTitle: ( localize(17813, "Source Control Repositories")),
|
|
95
95
|
ctorDescriptor: ( new SyncDescriptor(SCMRepositoriesViewPane)),
|
|
96
96
|
canToggleVisibility: true,
|
|
97
97
|
hideByDefault: true,
|
|
@@ -104,7 +104,7 @@ viewsRegistry.registerViews([{
|
|
|
104
104
|
viewsRegistry.registerViews([{
|
|
105
105
|
id: VIEW_PANE_ID,
|
|
106
106
|
containerTitle,
|
|
107
|
-
name: ( localize2(
|
|
107
|
+
name: ( localize2(17814, "Changes")),
|
|
108
108
|
singleViewPaneContainerTitle: containerTitle,
|
|
109
109
|
ctorDescriptor: ( new SyncDescriptor(SCMViewPane)),
|
|
110
110
|
canToggleVisibility: true,
|
|
@@ -114,7 +114,7 @@ viewsRegistry.registerViews([{
|
|
|
114
114
|
containerIcon: sourceControlViewIcon,
|
|
115
115
|
openCommandActionDescriptor: {
|
|
116
116
|
id: viewContainer.id,
|
|
117
|
-
mnemonicTitle: ( localize(
|
|
117
|
+
mnemonicTitle: ( localize(17815, "Source &&Control")),
|
|
118
118
|
keybindings: {
|
|
119
119
|
primary: 0,
|
|
120
120
|
win: {
|
|
@@ -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(17816, "Graph")),
|
|
137
|
+
singleViewPaneContainerTitle: ( localize(17817, "Source Control Graph")),
|
|
138
138
|
ctorDescriptor: ( new SyncDescriptor(SCMHistoryViewPane)),
|
|
139
139
|
canToggleVisibility: true,
|
|
140
140
|
canMoveView: true,
|
|
@@ -158,32 +158,32 @@ registerWorkbenchContribution2(
|
|
|
158
158
|
( Registry.as(Extensions$2.Configuration)).registerConfiguration({
|
|
159
159
|
id: "scm",
|
|
160
160
|
order: 5,
|
|
161
|
-
title: ( localize(
|
|
161
|
+
title: ( localize(17818, "Source Control")),
|
|
162
162
|
type: "object",
|
|
163
163
|
scope: ConfigurationScope.RESOURCE,
|
|
164
164
|
properties: {
|
|
165
165
|
"scm.diffDecorations": {
|
|
166
166
|
type: "string",
|
|
167
167
|
enum: ["all", "gutter", "overview", "minimap", "none"],
|
|
168
|
-
enumDescriptions: [( localize(
|
|
168
|
+
enumDescriptions: [( localize(17819, "Show the diff decorations in all available locations.")), ( localize(17820, "Show the diff decorations only in the editor gutter.")), ( localize(17821, "Show the diff decorations only in the overview ruler.")), ( localize(17822, "Show the diff decorations only in the minimap.")), ( localize(17823, "Do not show the diff decorations."))],
|
|
169
169
|
default: "all",
|
|
170
|
-
description: ( localize(
|
|
170
|
+
description: ( localize(17824, "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
|
+
17825,
|
|
178
178
|
"Controls the width(px) of diff decorations in gutter (added & modified)."
|
|
179
179
|
))
|
|
180
180
|
},
|
|
181
181
|
"scm.diffDecorationsGutterVisibility": {
|
|
182
182
|
type: "string",
|
|
183
183
|
enum: ["always", "hover"],
|
|
184
|
-
enumDescriptions: [( localize(
|
|
184
|
+
enumDescriptions: [( localize(17826, "Show the diff decorator in the gutter at all times.")), ( localize(17827, "Show the diff decorator in the gutter only on hover."))],
|
|
185
185
|
description: ( localize(
|
|
186
|
-
|
|
186
|
+
17828,
|
|
187
187
|
"Controls the visibility of the Source Control diff decorator in the gutter."
|
|
188
188
|
)),
|
|
189
189
|
default: "always"
|
|
@@ -191,26 +191,26 @@ registerWorkbenchContribution2(
|
|
|
191
191
|
"scm.diffDecorationsGutterAction": {
|
|
192
192
|
type: "string",
|
|
193
193
|
enum: ["diff", "none"],
|
|
194
|
-
enumDescriptions: [( localize(
|
|
195
|
-
description: ( localize(
|
|
194
|
+
enumDescriptions: [( localize(17829, "Show the inline diff Peek view on click.")), ( localize(17830, "Do nothing."))],
|
|
195
|
+
description: ( localize(17831, "Controls the behavior of Source Control diff gutter decorations.")),
|
|
196
196
|
default: "diff"
|
|
197
197
|
},
|
|
198
198
|
"scm.diffDecorationsGutterPattern": {
|
|
199
199
|
type: "object",
|
|
200
200
|
description: ( localize(
|
|
201
|
-
|
|
201
|
+
17832,
|
|
202
202
|
"Controls whether a pattern is used for the diff decorations in gutter."
|
|
203
203
|
)),
|
|
204
204
|
additionalProperties: false,
|
|
205
205
|
properties: {
|
|
206
206
|
"added": {
|
|
207
207
|
type: "boolean",
|
|
208
|
-
description: ( localize(
|
|
208
|
+
description: ( localize(17833, "Use pattern for the diff decorations in gutter for added lines."))
|
|
209
209
|
},
|
|
210
210
|
"modified": {
|
|
211
211
|
type: "boolean",
|
|
212
212
|
description: ( localize(
|
|
213
|
-
|
|
213
|
+
17834,
|
|
214
214
|
"Use pattern for the diff decorations in gutter for modified lines."
|
|
215
215
|
))
|
|
216
216
|
}
|
|
@@ -223,9 +223,9 @@ registerWorkbenchContribution2(
|
|
|
223
223
|
"scm.diffDecorationsIgnoreTrimWhitespace": {
|
|
224
224
|
type: "string",
|
|
225
225
|
enum: ["true", "false", "inherit"],
|
|
226
|
-
enumDescriptions: [( localize(
|
|
226
|
+
enumDescriptions: [( localize(17835, "Ignore leading and trailing whitespace.")), ( localize(17836, "Do not ignore leading and trailing whitespace.")), ( localize(17837, "Inherit from `diffEditor.ignoreTrimWhitespace`."))],
|
|
227
227
|
description: ( localize(
|
|
228
|
-
|
|
228
|
+
17838,
|
|
229
229
|
"Controls whether leading and trailing whitespace is ignored in Source Control diff gutter decorations."
|
|
230
230
|
)),
|
|
231
231
|
default: "false"
|
|
@@ -233,7 +233,7 @@ registerWorkbenchContribution2(
|
|
|
233
233
|
"scm.alwaysShowActions": {
|
|
234
234
|
type: "boolean",
|
|
235
235
|
description: ( localize(
|
|
236
|
-
|
|
236
|
+
17839,
|
|
237
237
|
"Controls whether inline actions are always visible in the Source Control view."
|
|
238
238
|
)),
|
|
239
239
|
default: false
|
|
@@ -241,9 +241,9 @@ registerWorkbenchContribution2(
|
|
|
241
241
|
"scm.countBadge": {
|
|
242
242
|
type: "string",
|
|
243
243
|
enum: ["all", "focused", "off"],
|
|
244
|
-
enumDescriptions: [( localize(
|
|
244
|
+
enumDescriptions: [( localize(17840, "Show the sum of all Source Control Provider count badges.")), ( localize(17841, "Show the count badge of the focused Source Control Provider.")), ( localize(17842, "Disable the Source Control count badge."))],
|
|
245
245
|
description: ( localize(
|
|
246
|
-
|
|
246
|
+
17843,
|
|
247
247
|
"Controls the count badge on the Source Control icon on the Activity Bar."
|
|
248
248
|
)),
|
|
249
249
|
default: "all"
|
|
@@ -251,9 +251,9 @@ registerWorkbenchContribution2(
|
|
|
251
251
|
"scm.providerCountBadge": {
|
|
252
252
|
type: "string",
|
|
253
253
|
enum: ["hidden", "auto", "visible"],
|
|
254
|
-
enumDescriptions: [( localize(
|
|
254
|
+
enumDescriptions: [( localize(17844, "Hide Source Control Provider count badges.")), ( localize(17845, "Only show count badge for Source Control Provider when non-zero.")), ( localize(17846, "Show Source Control Provider count badges."))],
|
|
255
255
|
markdownDescription: ( localize(
|
|
256
|
-
|
|
256
|
+
17847,
|
|
257
257
|
"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.",
|
|
258
258
|
"`#scm.alwaysShowRepositories#`"
|
|
259
259
|
)),
|
|
@@ -262,16 +262,16 @@ registerWorkbenchContribution2(
|
|
|
262
262
|
"scm.defaultViewMode": {
|
|
263
263
|
type: "string",
|
|
264
264
|
enum: ["tree", "list"],
|
|
265
|
-
enumDescriptions: [( localize(
|
|
266
|
-
description: ( localize(
|
|
265
|
+
enumDescriptions: [( localize(17848, "Show the repository changes as a tree.")), ( localize(17849, "Show the repository changes as a list."))],
|
|
266
|
+
description: ( localize(17850, "Controls the default Source Control repository view mode.")),
|
|
267
267
|
default: "list"
|
|
268
268
|
},
|
|
269
269
|
"scm.defaultViewSortKey": {
|
|
270
270
|
type: "string",
|
|
271
271
|
enum: ["name", "path", "status"],
|
|
272
|
-
enumDescriptions: [( localize(
|
|
272
|
+
enumDescriptions: [( localize(17851, "Sort the repository changes by file name.")), ( localize(17852, "Sort the repository changes by path.")), ( localize(17853, "Sort the repository changes by Source Control status."))],
|
|
273
273
|
description: ( localize(
|
|
274
|
-
|
|
274
|
+
17854,
|
|
275
275
|
"Controls the default Source Control repository changes sort order when viewed as a list."
|
|
276
276
|
)),
|
|
277
277
|
default: "path"
|
|
@@ -279,7 +279,7 @@ registerWorkbenchContribution2(
|
|
|
279
279
|
"scm.autoReveal": {
|
|
280
280
|
type: "boolean",
|
|
281
281
|
description: ( localize(
|
|
282
|
-
|
|
282
|
+
17855,
|
|
283
283
|
"Controls whether the Source Control view should automatically reveal and select files when opening them."
|
|
284
284
|
)),
|
|
285
285
|
default: true
|
|
@@ -287,20 +287,20 @@ registerWorkbenchContribution2(
|
|
|
287
287
|
"scm.inputFontFamily": {
|
|
288
288
|
type: "string",
|
|
289
289
|
markdownDescription: ( localize(
|
|
290
|
-
|
|
290
|
+
17856,
|
|
291
291
|
"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."
|
|
292
292
|
)),
|
|
293
293
|
default: "default"
|
|
294
294
|
},
|
|
295
295
|
"scm.inputFontSize": {
|
|
296
296
|
type: "number",
|
|
297
|
-
markdownDescription: ( localize(
|
|
297
|
+
markdownDescription: ( localize(17857, "Controls the font size for the input message in pixels.")),
|
|
298
298
|
default: 13
|
|
299
299
|
},
|
|
300
300
|
"scm.inputMaxLineCount": {
|
|
301
301
|
type: "number",
|
|
302
302
|
markdownDescription: ( localize(
|
|
303
|
-
|
|
303
|
+
17858,
|
|
304
304
|
"Controls the maximum number of lines that the input will auto-grow to."
|
|
305
305
|
)),
|
|
306
306
|
minimum: 1,
|
|
@@ -310,7 +310,7 @@ registerWorkbenchContribution2(
|
|
|
310
310
|
"scm.inputMinLineCount": {
|
|
311
311
|
type: "number",
|
|
312
312
|
markdownDescription: ( localize(
|
|
313
|
-
|
|
313
|
+
17859,
|
|
314
314
|
"Controls the minimum number of lines that the input will auto-grow from."
|
|
315
315
|
)),
|
|
316
316
|
minimum: 1,
|
|
@@ -320,7 +320,7 @@ registerWorkbenchContribution2(
|
|
|
320
320
|
"scm.alwaysShowRepositories": {
|
|
321
321
|
type: "boolean",
|
|
322
322
|
markdownDescription: ( localize(
|
|
323
|
-
|
|
323
|
+
17860,
|
|
324
324
|
"Controls whether repositories should always be visible in the Source Control view."
|
|
325
325
|
)),
|
|
326
326
|
default: false
|
|
@@ -329,17 +329,17 @@ registerWorkbenchContribution2(
|
|
|
329
329
|
type: "string",
|
|
330
330
|
enum: ["discovery time", "name", "path"],
|
|
331
331
|
enumDescriptions: [( localize(
|
|
332
|
-
|
|
332
|
+
17861,
|
|
333
333
|
"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."
|
|
334
334
|
)), ( localize(
|
|
335
|
-
|
|
335
|
+
17862,
|
|
336
336
|
"Repositories in the Source Control Repositories and Source Control views are sorted by repository name."
|
|
337
337
|
)), ( localize(
|
|
338
|
-
|
|
338
|
+
17863,
|
|
339
339
|
"Repositories in the Source Control Repositories and Source Control views are sorted by repository path."
|
|
340
340
|
))],
|
|
341
341
|
description: ( localize(
|
|
342
|
-
|
|
342
|
+
17864,
|
|
343
343
|
"Controls the sort order of the repositories in the source control repositories view."
|
|
344
344
|
)),
|
|
345
345
|
default: "discovery time"
|
|
@@ -347,7 +347,7 @@ registerWorkbenchContribution2(
|
|
|
347
347
|
"scm.repositories.visible": {
|
|
348
348
|
type: "number",
|
|
349
349
|
description: ( localize(
|
|
350
|
-
|
|
350
|
+
17865,
|
|
351
351
|
"Controls how many repositories are visible in the Source Control Repositories section. Set to 0, to be able to manually resize the view."
|
|
352
352
|
)),
|
|
353
353
|
default: 10
|
|
@@ -355,9 +355,9 @@ registerWorkbenchContribution2(
|
|
|
355
355
|
"scm.repositories.selectionMode": {
|
|
356
356
|
type: "string",
|
|
357
357
|
enum: ["multiple", "single"],
|
|
358
|
-
enumDescriptions: [( localize(
|
|
358
|
+
enumDescriptions: [( localize(17866, "Multiple repositories can be selected at the same time.")), ( localize(17867, "Only one repository can be selected at a time."))],
|
|
359
359
|
description: ( localize(
|
|
360
|
-
|
|
360
|
+
17868,
|
|
361
361
|
"Controls the selection mode of the repositories in the Source Control Repositories view."
|
|
362
362
|
)),
|
|
363
363
|
default: "multiple"
|
|
@@ -365,7 +365,7 @@ registerWorkbenchContribution2(
|
|
|
365
365
|
"scm.repositories.explorer": {
|
|
366
366
|
type: "boolean",
|
|
367
367
|
markdownDescription: ( localize(
|
|
368
|
-
|
|
368
|
+
17869,
|
|
369
369
|
"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}`.",
|
|
370
370
|
"`#scm.repositories.selectionMode#`",
|
|
371
371
|
"single"
|
|
@@ -376,7 +376,7 @@ registerWorkbenchContribution2(
|
|
|
376
376
|
"scm.showActionButton": {
|
|
377
377
|
type: "boolean",
|
|
378
378
|
markdownDescription: ( localize(
|
|
379
|
-
|
|
379
|
+
17870,
|
|
380
380
|
"Controls whether an action button can be shown in the Source Control view."
|
|
381
381
|
)),
|
|
382
382
|
default: true
|
|
@@ -384,7 +384,7 @@ registerWorkbenchContribution2(
|
|
|
384
384
|
"scm.showInputActionButton": {
|
|
385
385
|
type: "boolean",
|
|
386
386
|
markdownDescription: ( localize(
|
|
387
|
-
|
|
387
|
+
17871,
|
|
388
388
|
"Controls whether an action button can be shown in the Source Control input."
|
|
389
389
|
)),
|
|
390
390
|
default: true
|
|
@@ -392,7 +392,7 @@ registerWorkbenchContribution2(
|
|
|
392
392
|
"scm.workingSets.enabled": {
|
|
393
393
|
type: "boolean",
|
|
394
394
|
description: ( localize(
|
|
395
|
-
|
|
395
|
+
17872,
|
|
396
396
|
"Controls whether to store editor working sets when switching between source control history item groups."
|
|
397
397
|
)),
|
|
398
398
|
default: false
|
|
@@ -401,14 +401,14 @@ registerWorkbenchContribution2(
|
|
|
401
401
|
type: "string",
|
|
402
402
|
enum: ["empty", "current"],
|
|
403
403
|
enumDescriptions: [( localize(
|
|
404
|
-
|
|
404
|
+
17873,
|
|
405
405
|
"Use an empty working set when switching to a source control history item group that does not have a working set."
|
|
406
406
|
)), ( localize(
|
|
407
|
-
|
|
407
|
+
17874,
|
|
408
408
|
"Use the current working set when switching to a source control history item group that does not have a working set."
|
|
409
409
|
))],
|
|
410
410
|
description: ( localize(
|
|
411
|
-
|
|
411
|
+
17875,
|
|
412
412
|
"Controls the default working set to use when switching to a source control history item group that does not have a working set."
|
|
413
413
|
)),
|
|
414
414
|
default: "current"
|
|
@@ -416,7 +416,7 @@ registerWorkbenchContribution2(
|
|
|
416
416
|
"scm.compactFolders": {
|
|
417
417
|
type: "boolean",
|
|
418
418
|
description: ( localize(
|
|
419
|
-
|
|
419
|
+
17876,
|
|
420
420
|
"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."
|
|
421
421
|
)),
|
|
422
422
|
default: true
|
|
@@ -424,7 +424,7 @@ registerWorkbenchContribution2(
|
|
|
424
424
|
"scm.graph.pageOnScroll": {
|
|
425
425
|
type: "boolean",
|
|
426
426
|
description: ( localize(
|
|
427
|
-
|
|
427
|
+
17877,
|
|
428
428
|
"Controls whether the Source Control Graph view will load the next page of items when you scroll to the end of the list."
|
|
429
429
|
)),
|
|
430
430
|
default: true
|
|
@@ -432,7 +432,7 @@ registerWorkbenchContribution2(
|
|
|
432
432
|
"scm.graph.pageSize": {
|
|
433
433
|
type: "number",
|
|
434
434
|
description: ( localize(
|
|
435
|
-
|
|
435
|
+
17878,
|
|
436
436
|
"The number of items to show in the Source Control Graph view by default and when loading more items."
|
|
437
437
|
)),
|
|
438
438
|
minimum: 1,
|
|
@@ -443,14 +443,14 @@ registerWorkbenchContribution2(
|
|
|
443
443
|
type: "string",
|
|
444
444
|
enum: ["all", "filter"],
|
|
445
445
|
enumDescriptions: [( localize(
|
|
446
|
-
|
|
446
|
+
17879,
|
|
447
447
|
"Show badges of all history item groups in the Source Control Graph view."
|
|
448
448
|
)), ( localize(
|
|
449
|
-
|
|
449
|
+
17880,
|
|
450
450
|
"Show only the badges of history item groups used as a filter in the Source Control Graph view."
|
|
451
451
|
))],
|
|
452
452
|
description: ( localize(
|
|
453
|
-
|
|
453
|
+
17881,
|
|
454
454
|
"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."
|
|
455
455
|
)),
|
|
456
456
|
default: "filter"
|
|
@@ -458,7 +458,7 @@ registerWorkbenchContribution2(
|
|
|
458
458
|
"scm.graph.showIncomingChanges": {
|
|
459
459
|
type: "boolean",
|
|
460
460
|
description: ( localize(
|
|
461
|
-
|
|
461
|
+
17882,
|
|
462
462
|
"Controls whether to show incoming changes in the Source Control Graph view."
|
|
463
463
|
)),
|
|
464
464
|
default: true
|
|
@@ -466,7 +466,7 @@ registerWorkbenchContribution2(
|
|
|
466
466
|
"scm.graph.showOutgoingChanges": {
|
|
467
467
|
type: "boolean",
|
|
468
468
|
description: ( localize(
|
|
469
|
-
|
|
469
|
+
17883,
|
|
470
470
|
"Controls whether to show outgoing changes in the Source Control Graph view."
|
|
471
471
|
)),
|
|
472
472
|
default: true
|
|
@@ -476,7 +476,7 @@ registerWorkbenchContribution2(
|
|
|
476
476
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
477
477
|
id: "scm.acceptInput",
|
|
478
478
|
metadata: {
|
|
479
|
-
description: ( localize(
|
|
479
|
+
description: ( localize(17884, "Source Control: Accept Input")),
|
|
480
480
|
args: []
|
|
481
481
|
},
|
|
482
482
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
@@ -526,7 +526,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
526
526
|
});
|
|
527
527
|
const viewNextCommitCommand = {
|
|
528
528
|
description: {
|
|
529
|
-
description: ( localize(
|
|
529
|
+
description: ( localize(17885, "Source Control: View Next Commit")),
|
|
530
530
|
args: []
|
|
531
531
|
},
|
|
532
532
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
@@ -541,7 +541,7 @@ const viewNextCommitCommand = {
|
|
|
541
541
|
};
|
|
542
542
|
const viewPreviousCommitCommand = {
|
|
543
543
|
description: {
|
|
544
|
-
description: ( localize(
|
|
544
|
+
description: ( localize(17886, "Source Control: View Previous Commit")),
|
|
545
545
|
args: []
|
|
546
546
|
},
|
|
547
547
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
@@ -611,8 +611,8 @@ CommandsRegistry.registerCommand("scm.openInTerminal", async (accessor, provider
|
|
|
611
611
|
CommandsRegistry.registerCommand("scm.setActiveProvider", async accessor => {
|
|
612
612
|
const instantiationService = accessor.get(IInstantiationService);
|
|
613
613
|
const scmViewService = accessor.get(ISCMViewService);
|
|
614
|
-
const placeHolder = ( localize(
|
|
615
|
-
const autoQuickItemDescription = ( localize(
|
|
614
|
+
const placeHolder = ( localize(17887, "Select the active repository, type to filter all repositories"));
|
|
615
|
+
const autoQuickItemDescription = ( localize(17888, "The active repository is updated based on active editor"));
|
|
616
616
|
const repositoryPicker = instantiationService.createInstance(RepositoryPicker, placeHolder, autoQuickItemDescription);
|
|
617
617
|
const result = await repositoryPicker.pickRepository();
|
|
618
618
|
if (result?.repository) {
|
|
@@ -624,7 +624,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
|
|
|
624
624
|
group: "99_terminal",
|
|
625
625
|
command: {
|
|
626
626
|
id: "scm.openInTerminal",
|
|
627
|
-
title: ( localize(
|
|
627
|
+
title: ( localize(17889, "Open in External Terminal"))
|
|
628
628
|
},
|
|
629
629
|
when: ( ContextKeyExpr.and(( RemoteNameContext.isEqualTo("")), ( ContextKeyExpr.equals("scmProviderHasRootUri", true)), ( ContextKeyExpr.or(( ContextKeyExpr.equals("config.terminal.sourceControlRepositoriesKind", "external")), ( ContextKeyExpr.equals("config.terminal.sourceControlRepositoriesKind", "both"))))))
|
|
630
630
|
});
|
|
@@ -632,7 +632,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
|
|
|
632
632
|
group: "99_terminal",
|
|
633
633
|
command: {
|
|
634
634
|
id: "scm.openInIntegratedTerminal",
|
|
635
|
-
title: ( localize(
|
|
635
|
+
title: ( localize(17890, "Open in Integrated Terminal"))
|
|
636
636
|
},
|
|
637
637
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("scmProviderHasRootUri", true)), ( ContextKeyExpr.or(( ContextKeyExpr.equals("config.terminal.sourceControlRepositoriesKind", "integrated")), ( ContextKeyExpr.equals("config.terminal.sourceControlRepositoriesKind", "both"))))))
|
|
638
638
|
});
|
|
@@ -686,7 +686,7 @@ registerAction2(class extends Action2 {
|
|
|
686
686
|
constructor() {
|
|
687
687
|
super({
|
|
688
688
|
id: "scm.editor.triggerSetup",
|
|
689
|
-
title: ( localize(
|
|
689
|
+
title: ( localize(17891, "Resolve Conflicts with AI")),
|
|
690
690
|
icon: Codicon.chatSparkle,
|
|
691
691
|
f1: false,
|
|
692
692
|
menu: {
|
|
@@ -56,76 +56,76 @@ let SCMAccessibilityHelpContentProvider = class SCMAccessibilityHelpContentProvi
|
|
|
56
56
|
provideContent() {
|
|
57
57
|
const content = [];
|
|
58
58
|
if (this._scmViewService.visibleRepositories.length > 1) {
|
|
59
|
-
const repositoryList =
|
|
60
|
-
content.push(( localize(
|
|
59
|
+
const repositoryList = this._scmViewService.visibleRepositories.map(r => r.provider.name).join(", ");
|
|
60
|
+
content.push(( localize(17892, "Visible repositories: {0}", repositoryList)));
|
|
61
61
|
}
|
|
62
62
|
const focusedRepository = this._scmViewService.focusedRepository;
|
|
63
63
|
if (focusedRepository) {
|
|
64
|
-
content.push(( localize(
|
|
64
|
+
content.push(( localize(17893, "Repository: {0}", focusedRepository.provider.name)));
|
|
65
65
|
const currentHistoryItemRef = focusedRepository.provider.historyProvider.get()?.historyItemRef.get();
|
|
66
66
|
if (currentHistoryItemRef) {
|
|
67
|
-
content.push(( localize(
|
|
67
|
+
content.push(( localize(17894, "History item reference: {0}", currentHistoryItemRef.name)));
|
|
68
68
|
}
|
|
69
69
|
if (focusedRepository.input.visible && focusedRepository.input.enabled && focusedRepository.input.value !== "") {
|
|
70
|
-
content.push(( localize(
|
|
70
|
+
content.push(( localize(17895, "Commit message: {0}", focusedRepository.input.value)));
|
|
71
71
|
}
|
|
72
72
|
const actionButton = focusedRepository.provider.actionButton.get();
|
|
73
73
|
if (actionButton) {
|
|
74
74
|
const label = actionButton.command.tooltip ?? actionButton.command.title;
|
|
75
|
-
const enablementLabel = actionButton.enabled ? ( localize(
|
|
76
|
-
content.push(( localize(
|
|
75
|
+
const enablementLabel = actionButton.enabled ? ( localize(17896, "enabled")) : ( localize(17897, "disabled"));
|
|
76
|
+
content.push(( localize(17898, "Action button: {0}, {1}", label, enablementLabel)));
|
|
77
77
|
}
|
|
78
78
|
const resourceGroups = [];
|
|
79
79
|
for (const resourceGroup of focusedRepository.provider.groups) {
|
|
80
80
|
resourceGroups.push(`${resourceGroup.label} (${resourceGroup.resources.length} resource(s))`);
|
|
81
81
|
}
|
|
82
|
-
|
|
83
|
-
content.push(( localize(
|
|
82
|
+
focusedRepository.provider.groups.map(g => g.label).join(", ");
|
|
83
|
+
content.push(( localize(17899, "Resource groups: {0}", resourceGroups.join(", "))));
|
|
84
84
|
}
|
|
85
85
|
content.push(( localize(
|
|
86
|
-
|
|
86
|
+
17900,
|
|
87
87
|
"Use the \"Source Control: Focus on Source Control Repositories View\" command to open the Source Control Repositories view."
|
|
88
88
|
)));
|
|
89
89
|
content.push(( localize(
|
|
90
|
-
|
|
90
|
+
17901,
|
|
91
91
|
"The Source Control Repositories view lists all repositories from the workspace and is only shown when the workspace contains more than one repository."
|
|
92
92
|
)));
|
|
93
|
-
content.push(( localize(
|
|
93
|
+
content.push(( localize(17902, "Once the Source Control Repositories view is opened you can:")));
|
|
94
94
|
content.push(( localize(
|
|
95
|
-
|
|
95
|
+
17903,
|
|
96
96
|
" - Use the up/down arrow keys to navigate the list of repositories."
|
|
97
97
|
)));
|
|
98
|
-
content.push(( localize(
|
|
99
|
-
content.push(( localize(
|
|
98
|
+
content.push(( localize(17904, " - Use the Enter or Space keys to select a repository.")));
|
|
99
|
+
content.push(( localize(17905, " - Use Shift + up/down keys to select multiple repositories.")));
|
|
100
100
|
content.push(( localize(
|
|
101
|
-
|
|
101
|
+
17906,
|
|
102
102
|
"Use the \"Source Control: Focus on Source Control View\" command to open the Source Control view."
|
|
103
103
|
)));
|
|
104
104
|
content.push(( localize(
|
|
105
|
-
|
|
105
|
+
17907,
|
|
106
106
|
"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."
|
|
107
107
|
)));
|
|
108
|
-
content.push(( localize(
|
|
108
|
+
content.push(( localize(17908, "Once the Source Control view is opened you can:")));
|
|
109
109
|
content.push(( localize(
|
|
110
|
-
|
|
110
|
+
17909,
|
|
111
111
|
" - Use the up/down arrow keys to navigate the list of repositories, resource groups and resources."
|
|
112
112
|
)));
|
|
113
|
-
content.push(( localize(
|
|
113
|
+
content.push(( localize(17910, " - Use the Space key to expand or collapse a resource group.")));
|
|
114
114
|
content.push(( localize(
|
|
115
|
-
|
|
115
|
+
17911,
|
|
116
116
|
"Use the \"Source Control: Focus on Source Control Graph View\" command to open the Source Control Graph view."
|
|
117
117
|
)));
|
|
118
118
|
content.push(( localize(
|
|
119
|
-
|
|
119
|
+
17912,
|
|
120
120
|
"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."
|
|
121
121
|
)));
|
|
122
|
-
content.push(( localize(
|
|
122
|
+
content.push(( localize(17913, "Once the Source Control Graph view is opened you can:")));
|
|
123
123
|
content.push(( localize(
|
|
124
|
-
|
|
124
|
+
17914,
|
|
125
125
|
" - Use the up/down arrow keys to navigate the list of history items."
|
|
126
126
|
)));
|
|
127
127
|
content.push(( localize(
|
|
128
|
-
|
|
128
|
+
17915,
|
|
129
129
|
" - Use the Space key to open the history item details in the multi-file diff editor."
|
|
130
130
|
)));
|
|
131
131
|
return content.join("\n");
|