@codingame/monaco-vscode-scm-service-override 26.2.1 → 27.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/index.js +6 -2
- package/package.json +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/activity.js +5 -5
- package/vscode/src/vs/workbench/contrib/scm/browser/menus.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/menus.js +3 -3
- 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 +75 -74
- package/vscode/src/vs/workbench/contrib/scm/browser/scmAccessibilityHelp.js +23 -23
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.js +26 -26
- package/vscode/src/vs/workbench/contrib/scm/browser/scmInput.d.ts +62 -0
- package/vscode/src/vs/workbench/contrib/scm/browser/scmInput.js +828 -0
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.js +2 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.d.ts +1 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js +35 -814
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.js +2 -1
- package/vscode/src/vs/workbench/contrib/scm/common/scmService.js +10 -8
|
@@ -48,6 +48,7 @@ import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor
|
|
|
48
48
|
import { SCMHistoryItemContextContribution } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/scmHistoryChatContext';
|
|
49
49
|
import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
|
|
50
50
|
import { CHAT_SETUP_SUPPORT_ANONYMOUS_ACTION_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
|
|
51
|
+
import { SCMInputContextKeys } from './scmInput.js';
|
|
51
52
|
import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
|
|
52
53
|
|
|
53
54
|
ModesRegistry.registerLanguage({
|
|
@@ -62,10 +63,10 @@ registerEditorContribution(
|
|
|
62
63
|
QuickDiffEditorController,
|
|
63
64
|
EditorContributionInstantiation.AfterFirstRender
|
|
64
65
|
);
|
|
65
|
-
const sourceControlViewIcon = registerIcon("source-control-view-icon", Codicon.sourceControl, ( localize(
|
|
66
|
+
const sourceControlViewIcon = registerIcon("source-control-view-icon", Codicon.sourceControl, ( localize(11721, "View icon of the Source Control view.")));
|
|
66
67
|
const viewContainer = ( Registry.as(Extensions$1.ViewContainersRegistry)).registerViewContainer({
|
|
67
68
|
id: VIEWLET_ID,
|
|
68
|
-
title: ( localize2(
|
|
69
|
+
title: ( localize2(11722, "Source Control")),
|
|
69
70
|
ctorDescriptor: ( new SyncDescriptor(SCMViewPaneContainer)),
|
|
70
71
|
storageId: "workbench.scm.views.state",
|
|
71
72
|
icon: sourceControlViewIcon,
|
|
@@ -76,25 +77,25 @@ const viewContainer = ( Registry.as(Extensions$1.ViewContainersRegistry)).regist
|
|
|
76
77
|
doNotRegisterOpenCommand: true
|
|
77
78
|
});
|
|
78
79
|
const viewsRegistry = ( Registry.as(Extensions$1.ViewsRegistry));
|
|
79
|
-
const containerTitle = ( localize(
|
|
80
|
+
const containerTitle = ( localize(11723, "Source Control"));
|
|
80
81
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
81
|
-
content: ( localize(
|
|
82
|
+
content: ( localize(11724, "No source control providers registered.")),
|
|
82
83
|
when: "default"
|
|
83
84
|
});
|
|
84
85
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
85
86
|
content: ( localize(
|
|
86
|
-
|
|
87
|
+
11725,
|
|
87
88
|
"None of the registered source control providers work in Restricted Mode."
|
|
88
89
|
)),
|
|
89
90
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("scm.providerCount", 0)), WorkspaceTrustContext.IsEnabled, ( WorkspaceTrustContext.IsTrusted.toNegated())))
|
|
90
91
|
});
|
|
91
92
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
92
|
-
content: `[${( localize(
|
|
93
|
+
content: `[${( localize(11726, "Manage Workspace Trust"))}](command:${MANAGE_TRUST_COMMAND_ID})`,
|
|
93
94
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("scm.providerCount", 0)), WorkspaceTrustContext.IsEnabled, ( WorkspaceTrustContext.IsTrusted.toNegated())))
|
|
94
95
|
});
|
|
95
96
|
viewsRegistry.registerViewWelcomeContent(HISTORY_VIEW_PANE_ID, {
|
|
96
97
|
content: ( localize(
|
|
97
|
-
|
|
98
|
+
11727,
|
|
98
99
|
"The selected source control provider does not have any source control history items."
|
|
99
100
|
)),
|
|
100
101
|
when: ( ContextKeys.SCMHistoryItemCount.isEqualTo(0))
|
|
@@ -102,8 +103,8 @@ viewsRegistry.registerViewWelcomeContent(HISTORY_VIEW_PANE_ID, {
|
|
|
102
103
|
viewsRegistry.registerViews([{
|
|
103
104
|
id: REPOSITORIES_VIEW_PANE_ID,
|
|
104
105
|
containerTitle,
|
|
105
|
-
name: ( localize2(
|
|
106
|
-
singleViewPaneContainerTitle: ( localize(
|
|
106
|
+
name: ( localize2(11728, "Repositories")),
|
|
107
|
+
singleViewPaneContainerTitle: ( localize(11729, "Source Control Repositories")),
|
|
107
108
|
ctorDescriptor: ( new SyncDescriptor(SCMRepositoriesViewPane)),
|
|
108
109
|
canToggleVisibility: true,
|
|
109
110
|
hideByDefault: true,
|
|
@@ -116,7 +117,7 @@ viewsRegistry.registerViews([{
|
|
|
116
117
|
viewsRegistry.registerViews([{
|
|
117
118
|
id: VIEW_PANE_ID,
|
|
118
119
|
containerTitle,
|
|
119
|
-
name: ( localize2(
|
|
120
|
+
name: ( localize2(11730, "Changes")),
|
|
120
121
|
singleViewPaneContainerTitle: containerTitle,
|
|
121
122
|
ctorDescriptor: ( new SyncDescriptor(SCMViewPane)),
|
|
122
123
|
canToggleVisibility: true,
|
|
@@ -126,7 +127,7 @@ viewsRegistry.registerViews([{
|
|
|
126
127
|
containerIcon: sourceControlViewIcon,
|
|
127
128
|
openCommandActionDescriptor: {
|
|
128
129
|
id: viewContainer.id,
|
|
129
|
-
mnemonicTitle: ( localize(
|
|
130
|
+
mnemonicTitle: ( localize(11731, "Source &&Control")),
|
|
130
131
|
keybindings: {
|
|
131
132
|
primary: 0,
|
|
132
133
|
win: {
|
|
@@ -145,8 +146,8 @@ viewsRegistry.registerViews([{
|
|
|
145
146
|
viewsRegistry.registerViews([{
|
|
146
147
|
id: HISTORY_VIEW_PANE_ID,
|
|
147
148
|
containerTitle,
|
|
148
|
-
name: ( localize2(
|
|
149
|
-
singleViewPaneContainerTitle: ( localize(
|
|
149
|
+
name: ( localize2(11732, "Graph")),
|
|
150
|
+
singleViewPaneContainerTitle: ( localize(11733, "Source Control Graph")),
|
|
150
151
|
ctorDescriptor: ( new SyncDescriptor(SCMHistoryViewPane)),
|
|
151
152
|
canToggleVisibility: true,
|
|
152
153
|
canMoveView: true,
|
|
@@ -170,32 +171,32 @@ registerWorkbenchContribution2(
|
|
|
170
171
|
( Registry.as(Extensions$2.Configuration)).registerConfiguration({
|
|
171
172
|
id: "scm",
|
|
172
173
|
order: 5,
|
|
173
|
-
title: ( localize(
|
|
174
|
+
title: ( localize(11734, "Source Control")),
|
|
174
175
|
type: "object",
|
|
175
176
|
scope: ConfigurationScope.RESOURCE,
|
|
176
177
|
properties: {
|
|
177
178
|
"scm.diffDecorations": {
|
|
178
179
|
type: "string",
|
|
179
180
|
enum: ["all", "gutter", "overview", "minimap", "none"],
|
|
180
|
-
enumDescriptions: [( localize(
|
|
181
|
+
enumDescriptions: [( localize(11735, "Show the diff decorations in all available locations.")), ( localize(11736, "Show the diff decorations only in the editor gutter.")), ( localize(11737, "Show the diff decorations only in the overview ruler.")), ( localize(11738, "Show the diff decorations only in the minimap.")), ( localize(11739, "Do not show the diff decorations."))],
|
|
181
182
|
default: "all",
|
|
182
|
-
description: ( localize(
|
|
183
|
+
description: ( localize(11740, "Controls diff decorations in the editor."))
|
|
183
184
|
},
|
|
184
185
|
"scm.diffDecorationsGutterWidth": {
|
|
185
186
|
type: "number",
|
|
186
187
|
enum: [1, 2, 3, 4, 5],
|
|
187
188
|
default: 3,
|
|
188
189
|
description: ( localize(
|
|
189
|
-
|
|
190
|
+
11741,
|
|
190
191
|
"Controls the width(px) of diff decorations in gutter (added & modified)."
|
|
191
192
|
))
|
|
192
193
|
},
|
|
193
194
|
"scm.diffDecorationsGutterVisibility": {
|
|
194
195
|
type: "string",
|
|
195
196
|
enum: ["always", "hover"],
|
|
196
|
-
enumDescriptions: [( localize(
|
|
197
|
+
enumDescriptions: [( localize(11742, "Show the diff decorator in the gutter at all times.")), ( localize(11743, "Show the diff decorator in the gutter only on hover."))],
|
|
197
198
|
description: ( localize(
|
|
198
|
-
|
|
199
|
+
11744,
|
|
199
200
|
"Controls the visibility of the Source Control diff decorator in the gutter."
|
|
200
201
|
)),
|
|
201
202
|
default: "always"
|
|
@@ -203,26 +204,26 @@ registerWorkbenchContribution2(
|
|
|
203
204
|
"scm.diffDecorationsGutterAction": {
|
|
204
205
|
type: "string",
|
|
205
206
|
enum: ["diff", "none"],
|
|
206
|
-
enumDescriptions: [( localize(
|
|
207
|
-
description: ( localize(
|
|
207
|
+
enumDescriptions: [( localize(11745, "Show the inline diff Peek view on click.")), ( localize(11746, "Do nothing."))],
|
|
208
|
+
description: ( localize(11747, "Controls the behavior of Source Control diff gutter decorations.")),
|
|
208
209
|
default: "diff"
|
|
209
210
|
},
|
|
210
211
|
"scm.diffDecorationsGutterPattern": {
|
|
211
212
|
type: "object",
|
|
212
213
|
description: ( localize(
|
|
213
|
-
|
|
214
|
+
11748,
|
|
214
215
|
"Controls whether a pattern is used for the diff decorations in gutter."
|
|
215
216
|
)),
|
|
216
217
|
additionalProperties: false,
|
|
217
218
|
properties: {
|
|
218
219
|
"added": {
|
|
219
220
|
type: "boolean",
|
|
220
|
-
description: ( localize(
|
|
221
|
+
description: ( localize(11749, "Use pattern for the diff decorations in gutter for added lines."))
|
|
221
222
|
},
|
|
222
223
|
"modified": {
|
|
223
224
|
type: "boolean",
|
|
224
225
|
description: ( localize(
|
|
225
|
-
|
|
226
|
+
11750,
|
|
226
227
|
"Use pattern for the diff decorations in gutter for modified lines."
|
|
227
228
|
))
|
|
228
229
|
}
|
|
@@ -235,9 +236,9 @@ registerWorkbenchContribution2(
|
|
|
235
236
|
"scm.diffDecorationsIgnoreTrimWhitespace": {
|
|
236
237
|
type: "string",
|
|
237
238
|
enum: ["true", "false", "inherit"],
|
|
238
|
-
enumDescriptions: [( localize(
|
|
239
|
+
enumDescriptions: [( localize(11751, "Ignore leading and trailing whitespace.")), ( localize(11752, "Do not ignore leading and trailing whitespace.")), ( localize(11753, "Inherit from `diffEditor.ignoreTrimWhitespace`."))],
|
|
239
240
|
description: ( localize(
|
|
240
|
-
|
|
241
|
+
11754,
|
|
241
242
|
"Controls whether leading and trailing whitespace is ignored in Source Control diff gutter decorations."
|
|
242
243
|
)),
|
|
243
244
|
default: "false"
|
|
@@ -245,7 +246,7 @@ registerWorkbenchContribution2(
|
|
|
245
246
|
"scm.alwaysShowActions": {
|
|
246
247
|
type: "boolean",
|
|
247
248
|
description: ( localize(
|
|
248
|
-
|
|
249
|
+
11755,
|
|
249
250
|
"Controls whether inline actions are always visible in the Source Control view."
|
|
250
251
|
)),
|
|
251
252
|
default: false
|
|
@@ -253,9 +254,9 @@ registerWorkbenchContribution2(
|
|
|
253
254
|
"scm.countBadge": {
|
|
254
255
|
type: "string",
|
|
255
256
|
enum: ["all", "focused", "off"],
|
|
256
|
-
enumDescriptions: [( localize(
|
|
257
|
+
enumDescriptions: [( localize(11756, "Show the sum of all Source Control Provider count badges.")), ( localize(11757, "Show the count badge of the focused Source Control Provider.")), ( localize(11758, "Disable the Source Control count badge."))],
|
|
257
258
|
description: ( localize(
|
|
258
|
-
|
|
259
|
+
11759,
|
|
259
260
|
"Controls the count badge on the Source Control icon on the Activity Bar."
|
|
260
261
|
)),
|
|
261
262
|
default: "all"
|
|
@@ -263,9 +264,9 @@ registerWorkbenchContribution2(
|
|
|
263
264
|
"scm.providerCountBadge": {
|
|
264
265
|
type: "string",
|
|
265
266
|
enum: ["hidden", "auto", "visible"],
|
|
266
|
-
enumDescriptions: [( localize(
|
|
267
|
+
enumDescriptions: [( localize(11760, "Hide Source Control Provider count badges.")), ( localize(11761, "Only show count badge for Source Control Provider when non-zero.")), ( localize(11762, "Show Source Control Provider count badges."))],
|
|
267
268
|
markdownDescription: ( localize(
|
|
268
|
-
|
|
269
|
+
11763,
|
|
269
270
|
"Controls the count badges on Source Control Provider headers. These headers appear in the Source Control view when there is more than one provider or when the {0} setting is enabled, and in the Source Control Repositories view.",
|
|
270
271
|
"`#scm.alwaysShowRepositories#`"
|
|
271
272
|
)),
|
|
@@ -274,16 +275,16 @@ registerWorkbenchContribution2(
|
|
|
274
275
|
"scm.defaultViewMode": {
|
|
275
276
|
type: "string",
|
|
276
277
|
enum: ["tree", "list"],
|
|
277
|
-
enumDescriptions: [( localize(
|
|
278
|
-
description: ( localize(
|
|
278
|
+
enumDescriptions: [( localize(11764, "Show the repository changes as a tree.")), ( localize(11765, "Show the repository changes as a list."))],
|
|
279
|
+
description: ( localize(11766, "Controls the default Source Control repository view mode.")),
|
|
279
280
|
default: "list"
|
|
280
281
|
},
|
|
281
282
|
"scm.defaultViewSortKey": {
|
|
282
283
|
type: "string",
|
|
283
284
|
enum: ["name", "path", "status"],
|
|
284
|
-
enumDescriptions: [( localize(
|
|
285
|
+
enumDescriptions: [( localize(11767, "Sort the repository changes by file name.")), ( localize(11768, "Sort the repository changes by path.")), ( localize(11769, "Sort the repository changes by Source Control status."))],
|
|
285
286
|
description: ( localize(
|
|
286
|
-
|
|
287
|
+
11770,
|
|
287
288
|
"Controls the default Source Control repository changes sort order when viewed as a list."
|
|
288
289
|
)),
|
|
289
290
|
default: "path"
|
|
@@ -291,7 +292,7 @@ registerWorkbenchContribution2(
|
|
|
291
292
|
"scm.autoReveal": {
|
|
292
293
|
type: "boolean",
|
|
293
294
|
description: ( localize(
|
|
294
|
-
|
|
295
|
+
11771,
|
|
295
296
|
"Controls whether the Source Control view should automatically reveal and select files when opening them."
|
|
296
297
|
)),
|
|
297
298
|
default: true
|
|
@@ -299,20 +300,20 @@ registerWorkbenchContribution2(
|
|
|
299
300
|
"scm.inputFontFamily": {
|
|
300
301
|
type: "string",
|
|
301
302
|
markdownDescription: ( localize(
|
|
302
|
-
|
|
303
|
+
11772,
|
|
303
304
|
"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."
|
|
304
305
|
)),
|
|
305
306
|
default: "default"
|
|
306
307
|
},
|
|
307
308
|
"scm.inputFontSize": {
|
|
308
309
|
type: "number",
|
|
309
|
-
markdownDescription: ( localize(
|
|
310
|
+
markdownDescription: ( localize(11773, "Controls the font size for the input message in pixels.")),
|
|
310
311
|
default: 13
|
|
311
312
|
},
|
|
312
313
|
"scm.inputMaxLineCount": {
|
|
313
314
|
type: "number",
|
|
314
315
|
markdownDescription: ( localize(
|
|
315
|
-
|
|
316
|
+
11774,
|
|
316
317
|
"Controls the maximum number of lines that the input will auto-grow to."
|
|
317
318
|
)),
|
|
318
319
|
minimum: 1,
|
|
@@ -322,7 +323,7 @@ registerWorkbenchContribution2(
|
|
|
322
323
|
"scm.inputMinLineCount": {
|
|
323
324
|
type: "number",
|
|
324
325
|
markdownDescription: ( localize(
|
|
325
|
-
|
|
326
|
+
11775,
|
|
326
327
|
"Controls the minimum number of lines that the input will auto-grow from."
|
|
327
328
|
)),
|
|
328
329
|
minimum: 1,
|
|
@@ -332,7 +333,7 @@ registerWorkbenchContribution2(
|
|
|
332
333
|
"scm.alwaysShowRepositories": {
|
|
333
334
|
type: "boolean",
|
|
334
335
|
markdownDescription: ( localize(
|
|
335
|
-
|
|
336
|
+
11776,
|
|
336
337
|
"Controls whether repositories should always be visible in the Source Control view."
|
|
337
338
|
)),
|
|
338
339
|
default: false
|
|
@@ -341,17 +342,17 @@ registerWorkbenchContribution2(
|
|
|
341
342
|
type: "string",
|
|
342
343
|
enum: ["discovery time", "name", "path"],
|
|
343
344
|
enumDescriptions: [( localize(
|
|
344
|
-
|
|
345
|
+
11777,
|
|
345
346
|
"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."
|
|
346
347
|
)), ( localize(
|
|
347
|
-
|
|
348
|
+
11778,
|
|
348
349
|
"Repositories in the Source Control Repositories and Source Control views are sorted by repository name."
|
|
349
350
|
)), ( localize(
|
|
350
|
-
|
|
351
|
+
11779,
|
|
351
352
|
"Repositories in the Source Control Repositories and Source Control views are sorted by repository path."
|
|
352
353
|
))],
|
|
353
354
|
description: ( localize(
|
|
354
|
-
|
|
355
|
+
11780,
|
|
355
356
|
"Controls the sort order of the repositories in the source control repositories view."
|
|
356
357
|
)),
|
|
357
358
|
default: "discovery time"
|
|
@@ -359,7 +360,7 @@ registerWorkbenchContribution2(
|
|
|
359
360
|
"scm.repositories.visible": {
|
|
360
361
|
type: "number",
|
|
361
362
|
description: ( localize(
|
|
362
|
-
|
|
363
|
+
11781,
|
|
363
364
|
"Controls how many repositories are visible in the Source Control Repositories section. Set to 0, to be able to manually resize the view."
|
|
364
365
|
)),
|
|
365
366
|
default: 10
|
|
@@ -367,9 +368,9 @@ registerWorkbenchContribution2(
|
|
|
367
368
|
"scm.repositories.selectionMode": {
|
|
368
369
|
type: "string",
|
|
369
370
|
enum: ["multiple", "single"],
|
|
370
|
-
enumDescriptions: [( localize(
|
|
371
|
+
enumDescriptions: [( localize(11782, "Multiple repositories can be selected at the same time.")), ( localize(11783, "Only one repository can be selected at a time."))],
|
|
371
372
|
description: ( localize(
|
|
372
|
-
|
|
373
|
+
11784,
|
|
373
374
|
"Controls the selection mode of the repositories in the Source Control Repositories view."
|
|
374
375
|
)),
|
|
375
376
|
default: "multiple"
|
|
@@ -377,7 +378,7 @@ registerWorkbenchContribution2(
|
|
|
377
378
|
"scm.repositories.explorer": {
|
|
378
379
|
type: "boolean",
|
|
379
380
|
markdownDescription: ( localize(
|
|
380
|
-
|
|
381
|
+
11785,
|
|
381
382
|
"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}`.",
|
|
382
383
|
"`#scm.repositories.selectionMode#`",
|
|
383
384
|
"single"
|
|
@@ -388,7 +389,7 @@ registerWorkbenchContribution2(
|
|
|
388
389
|
"scm.showActionButton": {
|
|
389
390
|
type: "boolean",
|
|
390
391
|
markdownDescription: ( localize(
|
|
391
|
-
|
|
392
|
+
11786,
|
|
392
393
|
"Controls whether an action button can be shown in the Source Control view."
|
|
393
394
|
)),
|
|
394
395
|
default: true
|
|
@@ -396,7 +397,7 @@ registerWorkbenchContribution2(
|
|
|
396
397
|
"scm.showInputActionButton": {
|
|
397
398
|
type: "boolean",
|
|
398
399
|
markdownDescription: ( localize(
|
|
399
|
-
|
|
400
|
+
11787,
|
|
400
401
|
"Controls whether an action button can be shown in the Source Control input."
|
|
401
402
|
)),
|
|
402
403
|
default: true
|
|
@@ -404,7 +405,7 @@ registerWorkbenchContribution2(
|
|
|
404
405
|
"scm.workingSets.enabled": {
|
|
405
406
|
type: "boolean",
|
|
406
407
|
description: ( localize(
|
|
407
|
-
|
|
408
|
+
11788,
|
|
408
409
|
"Controls whether to store editor working sets when switching between source control history item groups."
|
|
409
410
|
)),
|
|
410
411
|
default: false
|
|
@@ -413,14 +414,14 @@ registerWorkbenchContribution2(
|
|
|
413
414
|
type: "string",
|
|
414
415
|
enum: ["empty", "current"],
|
|
415
416
|
enumDescriptions: [( localize(
|
|
416
|
-
|
|
417
|
+
11789,
|
|
417
418
|
"Use an empty working set when switching to a source control history item group that does not have a working set."
|
|
418
419
|
)), ( localize(
|
|
419
|
-
|
|
420
|
+
11790,
|
|
420
421
|
"Use the current working set when switching to a source control history item group that does not have a working set."
|
|
421
422
|
))],
|
|
422
423
|
description: ( localize(
|
|
423
|
-
|
|
424
|
+
11791,
|
|
424
425
|
"Controls the default working set to use when switching to a source control history item group that does not have a working set."
|
|
425
426
|
)),
|
|
426
427
|
default: "current"
|
|
@@ -428,7 +429,7 @@ registerWorkbenchContribution2(
|
|
|
428
429
|
"scm.compactFolders": {
|
|
429
430
|
type: "boolean",
|
|
430
431
|
description: ( localize(
|
|
431
|
-
|
|
432
|
+
11792,
|
|
432
433
|
"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."
|
|
433
434
|
)),
|
|
434
435
|
default: true
|
|
@@ -436,7 +437,7 @@ registerWorkbenchContribution2(
|
|
|
436
437
|
"scm.graph.pageOnScroll": {
|
|
437
438
|
type: "boolean",
|
|
438
439
|
description: ( localize(
|
|
439
|
-
|
|
440
|
+
11793,
|
|
440
441
|
"Controls whether the Source Control Graph view will load the next page of items when you scroll to the end of the list."
|
|
441
442
|
)),
|
|
442
443
|
default: true
|
|
@@ -444,7 +445,7 @@ registerWorkbenchContribution2(
|
|
|
444
445
|
"scm.graph.pageSize": {
|
|
445
446
|
type: "number",
|
|
446
447
|
description: ( localize(
|
|
447
|
-
|
|
448
|
+
11794,
|
|
448
449
|
"The number of items to show in the Source Control Graph view by default and when loading more items."
|
|
449
450
|
)),
|
|
450
451
|
minimum: 1,
|
|
@@ -455,14 +456,14 @@ registerWorkbenchContribution2(
|
|
|
455
456
|
type: "string",
|
|
456
457
|
enum: ["all", "filter"],
|
|
457
458
|
enumDescriptions: [( localize(
|
|
458
|
-
|
|
459
|
+
11795,
|
|
459
460
|
"Show badges of all history item groups in the Source Control Graph view."
|
|
460
461
|
)), ( localize(
|
|
461
|
-
|
|
462
|
+
11796,
|
|
462
463
|
"Show only the badges of history item groups used as a filter in the Source Control Graph view."
|
|
463
464
|
))],
|
|
464
465
|
description: ( localize(
|
|
465
|
-
|
|
466
|
+
11797,
|
|
466
467
|
"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."
|
|
467
468
|
)),
|
|
468
469
|
default: "filter"
|
|
@@ -470,7 +471,7 @@ registerWorkbenchContribution2(
|
|
|
470
471
|
"scm.graph.showIncomingChanges": {
|
|
471
472
|
type: "boolean",
|
|
472
473
|
description: ( localize(
|
|
473
|
-
|
|
474
|
+
11798,
|
|
474
475
|
"Controls whether to show incoming changes in the Source Control Graph view."
|
|
475
476
|
)),
|
|
476
477
|
default: true
|
|
@@ -478,7 +479,7 @@ registerWorkbenchContribution2(
|
|
|
478
479
|
"scm.graph.showOutgoingChanges": {
|
|
479
480
|
type: "boolean",
|
|
480
481
|
description: ( localize(
|
|
481
|
-
|
|
482
|
+
11799,
|
|
482
483
|
"Controls whether to show outgoing changes in the Source Control Graph view."
|
|
483
484
|
)),
|
|
484
485
|
default: true
|
|
@@ -488,7 +489,7 @@ registerWorkbenchContribution2(
|
|
|
488
489
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
489
490
|
id: "scm.acceptInput",
|
|
490
491
|
metadata: {
|
|
491
|
-
description: ( localize(
|
|
492
|
+
description: ( localize(11800, "Source Control: Accept Input")),
|
|
492
493
|
args: []
|
|
493
494
|
},
|
|
494
495
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
@@ -515,7 +516,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
515
516
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
516
517
|
id: "scm.clearValidation",
|
|
517
518
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
518
|
-
when: ( ContextKeyExpr.and(( ContextKeyExpr.has("scmRepository")),
|
|
519
|
+
when: ( ContextKeyExpr.and(( ContextKeyExpr.has("scmRepository")), SCMInputContextKeys.SCMInputHasValidationMessage)),
|
|
519
520
|
primary: KeyCode.Escape,
|
|
520
521
|
handler: async accessor => {
|
|
521
522
|
const scmViewService = accessor.get(ISCMViewService);
|
|
@@ -525,7 +526,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
525
526
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
526
527
|
id: "scm.clearInput",
|
|
527
528
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
528
|
-
when: ( ContextKeyExpr.and(( ContextKeyExpr.has("scmRepository")), ( Context.Visible.toNegated()), ( InlineCompletionContextKeys.inlineSuggestionVisible.toNegated()), (
|
|
529
|
+
when: ( ContextKeyExpr.and(( ContextKeyExpr.has("scmRepository")), ( Context.Visible.toNegated()), ( InlineCompletionContextKeys.inlineSuggestionVisible.toNegated()), ( SCMInputContextKeys.SCMInputHasValidationMessage.toNegated()), ( EditorContextKeys.hasNonEmptySelection.toNegated()))),
|
|
529
530
|
primary: KeyCode.Escape,
|
|
530
531
|
handler: async accessor => {
|
|
531
532
|
const scmService = accessor.get(ISCMService);
|
|
@@ -538,7 +539,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
538
539
|
});
|
|
539
540
|
const viewNextCommitCommand = {
|
|
540
541
|
description: {
|
|
541
|
-
description: ( localize(
|
|
542
|
+
description: ( localize(11801, "Source Control: View Next Commit")),
|
|
542
543
|
args: []
|
|
543
544
|
},
|
|
544
545
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
@@ -553,7 +554,7 @@ const viewNextCommitCommand = {
|
|
|
553
554
|
};
|
|
554
555
|
const viewPreviousCommitCommand = {
|
|
555
556
|
description: {
|
|
556
|
-
description: ( localize(
|
|
557
|
+
description: ( localize(11802, "Source Control: View Previous Commit")),
|
|
557
558
|
args: []
|
|
558
559
|
},
|
|
559
560
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
@@ -623,8 +624,8 @@ CommandsRegistry.registerCommand("scm.openInTerminal", async (accessor, provider
|
|
|
623
624
|
CommandsRegistry.registerCommand("scm.setActiveProvider", async accessor => {
|
|
624
625
|
const instantiationService = accessor.get(IInstantiationService);
|
|
625
626
|
const scmViewService = accessor.get(ISCMViewService);
|
|
626
|
-
const placeHolder = ( localize(
|
|
627
|
-
const autoQuickItemDescription = ( localize(
|
|
627
|
+
const placeHolder = ( localize(11803, "Select the active repository, type to filter all repositories"));
|
|
628
|
+
const autoQuickItemDescription = ( localize(11804, "The active repository is updated based on active editor"));
|
|
628
629
|
const repositoryPicker = instantiationService.createInstance(RepositoryPicker, placeHolder, autoQuickItemDescription);
|
|
629
630
|
const result = await repositoryPicker.pickRepository();
|
|
630
631
|
if (result?.repository) {
|
|
@@ -636,7 +637,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
|
|
|
636
637
|
group: "99_terminal",
|
|
637
638
|
command: {
|
|
638
639
|
id: "scm.openInTerminal",
|
|
639
|
-
title: ( localize(
|
|
640
|
+
title: ( localize(11805, "Open in External Terminal"))
|
|
640
641
|
},
|
|
641
642
|
when: ( ContextKeyExpr.and(( RemoteNameContext.isEqualTo("")), ( ContextKeyExpr.equals("scmProviderHasRootUri", true)), ( ContextKeyExpr.or(( ContextKeyExpr.equals("config.terminal.sourceControlRepositoriesKind", "external")), ( ContextKeyExpr.equals("config.terminal.sourceControlRepositoriesKind", "both"))))))
|
|
642
643
|
});
|
|
@@ -644,7 +645,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
|
|
|
644
645
|
group: "99_terminal",
|
|
645
646
|
command: {
|
|
646
647
|
id: "scm.openInIntegratedTerminal",
|
|
647
|
-
title: ( localize(
|
|
648
|
+
title: ( localize(11806, "Open in Integrated Terminal"))
|
|
648
649
|
},
|
|
649
650
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("scmProviderHasRootUri", true)), ( ContextKeyExpr.or(( ContextKeyExpr.equals("config.terminal.sourceControlRepositoriesKind", "integrated")), ( ContextKeyExpr.equals("config.terminal.sourceControlRepositoriesKind", "both"))))))
|
|
650
651
|
});
|
|
@@ -695,7 +696,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
695
696
|
}
|
|
696
697
|
});
|
|
697
698
|
MenuRegistry.appendMenuItem(MenuId.EditorLineNumberContext, {
|
|
698
|
-
title: ( localize(
|
|
699
|
+
title: ( localize(11807, "Diff Decorations")),
|
|
699
700
|
submenu: MenuId.SCMQuickDiffDecorations,
|
|
700
701
|
when: ( ContextKeyExpr.or(( ContextKeyExpr.equals("config.scm.diffDecorations", "all")), ( ContextKeyExpr.equals("config.scm.diffDecorations", "gutter")))),
|
|
701
702
|
group: "9_quickDiffDecorations"
|
|
@@ -704,7 +705,7 @@ registerAction2(class extends Action2 {
|
|
|
704
705
|
constructor() {
|
|
705
706
|
super({
|
|
706
707
|
id: "scm.editor.triggerSetup",
|
|
707
|
-
title: ( localize(
|
|
708
|
+
title: ( localize(11808, "Resolve Conflicts with AI")),
|
|
708
709
|
icon: Codicon.chatSparkle,
|
|
709
710
|
f1: false,
|
|
710
711
|
menu: {
|
|
@@ -57,75 +57,75 @@ let SCMAccessibilityHelpContentProvider = class SCMAccessibilityHelpContentProvi
|
|
|
57
57
|
const content = [];
|
|
58
58
|
if (this._scmViewService.visibleRepositories.length > 1) {
|
|
59
59
|
const repositoryList = ( this._scmViewService.visibleRepositories.map(r => r.provider.name)).join(", ");
|
|
60
|
-
content.push(( localize(
|
|
60
|
+
content.push(( localize(11809, "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(11810, "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(11811, "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(11812, "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(11813, "enabled")) : ( localize(11814, "disabled"));
|
|
76
|
+
content.push(( localize(11815, "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
82
|
( focusedRepository.provider.groups.map(g => g.label)).join(", ");
|
|
83
|
-
content.push(( localize(
|
|
83
|
+
content.push(( localize(11816, "Resource groups: {0}", resourceGroups.join(", "))));
|
|
84
84
|
}
|
|
85
85
|
content.push(( localize(
|
|
86
|
-
|
|
86
|
+
11817,
|
|
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
|
+
11818,
|
|
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(11819, "Once the Source Control Repositories view is opened you can:")));
|
|
94
94
|
content.push(( localize(
|
|
95
|
-
|
|
95
|
+
11820,
|
|
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(11821, " - Use the Enter or Space keys to select a repository.")));
|
|
99
|
+
content.push(( localize(11822, " - Use Shift + up/down keys to select multiple repositories.")));
|
|
100
100
|
content.push(( localize(
|
|
101
|
-
|
|
101
|
+
11823,
|
|
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
|
+
11824,
|
|
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(11825, "Once the Source Control view is opened you can:")));
|
|
109
109
|
content.push(( localize(
|
|
110
|
-
|
|
110
|
+
11826,
|
|
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(11827, " - Use the Space key to expand or collapse a resource group.")));
|
|
114
114
|
content.push(( localize(
|
|
115
|
-
|
|
115
|
+
11828,
|
|
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
|
+
11829,
|
|
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(11830, "Once the Source Control Graph view is opened you can:")));
|
|
123
123
|
content.push(( localize(
|
|
124
|
-
|
|
124
|
+
11831,
|
|
125
125
|
" - Use the up/down arrow keys to navigate the list of history items."
|
|
126
126
|
)));
|
|
127
127
|
content.push(( localize(
|
|
128
|
-
|
|
128
|
+
11832,
|
|
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");
|