@codingame/monaco-vscode-scm-service-override 19.1.4 → 20.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +13 -15
- package/vscode/src/vs/workbench/contrib/scm/browser/activity.js +12 -8
- package/vscode/src/vs/workbench/contrib/scm/browser/media/scm.css +7 -10
- package/vscode/src/vs/workbench/contrib/scm/browser/menus.d.ts +7 -4
- package/vscode/src/vs/workbench/contrib/scm/browser/menus.js +57 -12
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffDecorator.js +4 -4
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffModel.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffModel.js +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffWidget.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffWidget.js +14 -14
- package/vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js +85 -90
- package/vscode/src/vs/workbench/contrib/scm/browser/scmAccessibilityHelp.js +23 -23
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.js +101 -32
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.d.ts +9 -3
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.js +117 -55
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.d.ts +3 -8
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.js +34 -28
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js +34 -31
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.js +5 -3
- package/vscode/src/vs/workbench/contrib/scm/browser/workingSet.js +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistoryChatContext.d.ts +0 -9
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistoryChatContext.js +0 -185
|
@@ -35,7 +35,7 @@ import { SCMWorkingSetController } from './workingSet.js';
|
|
|
35
35
|
import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
|
|
36
36
|
import { WorkbenchList } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService';
|
|
37
37
|
import { IListService } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService.service';
|
|
38
|
-
import { isSCMRepository } from '@codingame/monaco-vscode-
|
|
38
|
+
import { isSCMRepository } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/scm/browser/util';
|
|
39
39
|
import { SCMHistoryViewPane } from './scmHistoryViewPane.js';
|
|
40
40
|
import './quickDiffModel.js';
|
|
41
41
|
import { QuickDiffEditorController } from './quickDiffWidget.js';
|
|
@@ -44,7 +44,7 @@ import { RemoteNameContext } from '@codingame/monaco-vscode-api/vscode/vs/workbe
|
|
|
44
44
|
import { AccessibleViewRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
|
|
45
45
|
import { SCMAccessibilityHelp } from './scmAccessibilityHelp.js';
|
|
46
46
|
import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
|
|
47
|
-
import { SCMHistoryItemContextContribution } from '
|
|
47
|
+
import { SCMHistoryItemContextContribution } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/scm/browser/scmHistoryChatContext';
|
|
48
48
|
|
|
49
49
|
ModesRegistry.registerLanguage({
|
|
50
50
|
id: 'scminput',
|
|
@@ -55,10 +55,10 @@ ModesRegistry.registerLanguage({
|
|
|
55
55
|
( Registry.as(Extensions.Workbench))
|
|
56
56
|
.registerWorkbenchContribution(QuickDiffWorkbenchController, LifecyclePhase.Restored);
|
|
57
57
|
registerEditorContribution(QuickDiffEditorController.ID, QuickDiffEditorController, EditorContributionInstantiation.AfterFirstRender);
|
|
58
|
-
const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localize(
|
|
58
|
+
const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localize(9742, 'View icon of the Source Control view.')));
|
|
59
59
|
const viewContainer = ( Registry.as(Extensions$1.ViewContainersRegistry)).registerViewContainer({
|
|
60
60
|
id: VIEWLET_ID,
|
|
61
|
-
title: ( localize2(
|
|
61
|
+
title: ( localize2(9743, 'Source Control')),
|
|
62
62
|
ctorDescriptor: ( new SyncDescriptor(SCMViewPaneContainer)),
|
|
63
63
|
storageId: 'workbench.scm.views.state',
|
|
64
64
|
icon: sourceControlViewIcon,
|
|
@@ -67,25 +67,25 @@ const viewContainer = ( Registry.as(Extensions$1.ViewContainersRegistry)).regist
|
|
|
67
67
|
hideIfEmpty: true,
|
|
68
68
|
}, ViewContainerLocation.Sidebar, { doNotRegisterOpenCommand: true });
|
|
69
69
|
const viewsRegistry = ( Registry.as(Extensions$1.ViewsRegistry));
|
|
70
|
-
const containerTitle = ( localize(
|
|
70
|
+
const containerTitle = ( localize(9744, "Source Control"));
|
|
71
71
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
72
|
-
content: ( localize(
|
|
72
|
+
content: ( localize(9745, "No source control providers registered.")),
|
|
73
73
|
when: 'default'
|
|
74
74
|
});
|
|
75
75
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
76
76
|
content: ( localize(
|
|
77
|
-
|
|
77
|
+
9746,
|
|
78
78
|
"None of the registered source control providers work in Restricted Mode."
|
|
79
79
|
)),
|
|
80
80
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('scm.providerCount', 0)), WorkspaceTrustContext.IsEnabled, ( WorkspaceTrustContext.IsTrusted.toNegated())))
|
|
81
81
|
});
|
|
82
82
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
83
|
-
content: `[${( localize(
|
|
83
|
+
content: `[${( localize(9747, "Manage Workspace Trust"))}](command:${MANAGE_TRUST_COMMAND_ID})`,
|
|
84
84
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('scm.providerCount', 0)), WorkspaceTrustContext.IsEnabled, ( WorkspaceTrustContext.IsTrusted.toNegated())))
|
|
85
85
|
});
|
|
86
86
|
viewsRegistry.registerViewWelcomeContent(HISTORY_VIEW_PANE_ID, {
|
|
87
87
|
content: ( localize(
|
|
88
|
-
|
|
88
|
+
9748,
|
|
89
89
|
"The selected source control provider does not have any source control history items."
|
|
90
90
|
)),
|
|
91
91
|
when: ( ContextKeys.SCMHistoryItemCount.isEqualTo(0))
|
|
@@ -93,8 +93,8 @@ viewsRegistry.registerViewWelcomeContent(HISTORY_VIEW_PANE_ID, {
|
|
|
93
93
|
viewsRegistry.registerViews([{
|
|
94
94
|
id: REPOSITORIES_VIEW_PANE_ID,
|
|
95
95
|
containerTitle,
|
|
96
|
-
name: ( localize2(
|
|
97
|
-
singleViewPaneContainerTitle: ( localize(
|
|
96
|
+
name: ( localize2(9749, "Repositories")),
|
|
97
|
+
singleViewPaneContainerTitle: ( localize(9750, "Source Control Repositories")),
|
|
98
98
|
ctorDescriptor: ( new SyncDescriptor(SCMRepositoriesViewPane)),
|
|
99
99
|
canToggleVisibility: true,
|
|
100
100
|
hideByDefault: true,
|
|
@@ -107,7 +107,7 @@ viewsRegistry.registerViews([{
|
|
|
107
107
|
viewsRegistry.registerViews([{
|
|
108
108
|
id: VIEW_PANE_ID,
|
|
109
109
|
containerTitle,
|
|
110
|
-
name: ( localize2(
|
|
110
|
+
name: ( localize2(9751, 'Changes')),
|
|
111
111
|
singleViewPaneContainerTitle: containerTitle,
|
|
112
112
|
ctorDescriptor: ( new SyncDescriptor(SCMViewPane)),
|
|
113
113
|
canToggleVisibility: true,
|
|
@@ -117,7 +117,7 @@ viewsRegistry.registerViews([{
|
|
|
117
117
|
containerIcon: sourceControlViewIcon,
|
|
118
118
|
openCommandActionDescriptor: {
|
|
119
119
|
id: viewContainer.id,
|
|
120
|
-
mnemonicTitle: ( localize(
|
|
120
|
+
mnemonicTitle: ( localize(9752, "Source &&Control")),
|
|
121
121
|
keybindings: {
|
|
122
122
|
primary: 0,
|
|
123
123
|
win: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG },
|
|
@@ -130,8 +130,8 @@ viewsRegistry.registerViews([{
|
|
|
130
130
|
viewsRegistry.registerViews([{
|
|
131
131
|
id: HISTORY_VIEW_PANE_ID,
|
|
132
132
|
containerTitle,
|
|
133
|
-
name: ( localize2(
|
|
134
|
-
singleViewPaneContainerTitle: ( localize(
|
|
133
|
+
name: ( localize2(9753, "Graph")),
|
|
134
|
+
singleViewPaneContainerTitle: ( localize(9754, "Source Control Graph")),
|
|
135
135
|
ctorDescriptor: ( new SyncDescriptor(SCMHistoryViewPane)),
|
|
136
136
|
canToggleVisibility: true,
|
|
137
137
|
canMoveView: true,
|
|
@@ -149,7 +149,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
149
149
|
( Registry.as(Extensions$2.Configuration)).registerConfiguration({
|
|
150
150
|
id: 'scm',
|
|
151
151
|
order: 5,
|
|
152
|
-
title: ( localize(
|
|
152
|
+
title: ( localize(9755, "Source Control")),
|
|
153
153
|
type: 'object',
|
|
154
154
|
scope: ConfigurationScope.RESOURCE,
|
|
155
155
|
properties: {
|
|
@@ -157,21 +157,21 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
157
157
|
type: 'string',
|
|
158
158
|
enum: ['all', 'gutter', 'overview', 'minimap', 'none'],
|
|
159
159
|
enumDescriptions: [
|
|
160
|
-
( localize(
|
|
161
|
-
( localize(
|
|
162
|
-
( localize(
|
|
163
|
-
( localize(
|
|
164
|
-
( localize(
|
|
160
|
+
( localize(9756, "Show the diff decorations in all available locations.")),
|
|
161
|
+
( localize(9757, "Show the diff decorations only in the editor gutter.")),
|
|
162
|
+
( localize(9758, "Show the diff decorations only in the overview ruler.")),
|
|
163
|
+
( localize(9759, "Show the diff decorations only in the minimap.")),
|
|
164
|
+
( localize(9760, "Do not show the diff decorations."))
|
|
165
165
|
],
|
|
166
166
|
default: 'all',
|
|
167
|
-
description: ( localize(
|
|
167
|
+
description: ( localize(9761, "Controls diff decorations in the editor."))
|
|
168
168
|
},
|
|
169
169
|
'scm.diffDecorationsGutterWidth': {
|
|
170
170
|
type: 'number',
|
|
171
171
|
enum: [1, 2, 3, 4, 5],
|
|
172
172
|
default: 3,
|
|
173
173
|
description: ( localize(
|
|
174
|
-
|
|
174
|
+
9762,
|
|
175
175
|
"Controls the width(px) of diff decorations in gutter (added & modified)."
|
|
176
176
|
))
|
|
177
177
|
},
|
|
@@ -179,11 +179,11 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
179
179
|
type: 'string',
|
|
180
180
|
enum: ['always', 'hover'],
|
|
181
181
|
enumDescriptions: [
|
|
182
|
-
( localize(
|
|
183
|
-
( localize(
|
|
182
|
+
( localize(9763, "Show the diff decorator in the gutter at all times.")),
|
|
183
|
+
( localize(9764, "Show the diff decorator in the gutter only on hover."))
|
|
184
184
|
],
|
|
185
185
|
description: ( localize(
|
|
186
|
-
|
|
186
|
+
9765,
|
|
187
187
|
"Controls the visibility of the Source Control diff decorator in the gutter."
|
|
188
188
|
)),
|
|
189
189
|
default: 'always'
|
|
@@ -192,27 +192,27 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
192
192
|
type: 'string',
|
|
193
193
|
enum: ['diff', 'none'],
|
|
194
194
|
enumDescriptions: [
|
|
195
|
-
( localize(
|
|
196
|
-
( localize(
|
|
195
|
+
( localize(9766, "Show the inline diff Peek view on click.")),
|
|
196
|
+
( localize(9767, "Do nothing."))
|
|
197
197
|
],
|
|
198
|
-
description: ( localize(
|
|
198
|
+
description: ( localize(9768, "Controls the behavior of Source Control diff gutter decorations.")),
|
|
199
199
|
default: 'diff'
|
|
200
200
|
},
|
|
201
201
|
'scm.diffDecorationsGutterPattern': {
|
|
202
202
|
type: 'object',
|
|
203
203
|
description: ( localize(
|
|
204
|
-
|
|
204
|
+
9769,
|
|
205
205
|
"Controls whether a pattern is used for the diff decorations in gutter."
|
|
206
206
|
)),
|
|
207
207
|
additionalProperties: false,
|
|
208
208
|
properties: {
|
|
209
209
|
'added': {
|
|
210
210
|
type: 'boolean',
|
|
211
|
-
description: ( localize(
|
|
211
|
+
description: ( localize(9770, "Use pattern for the diff decorations in gutter for added lines.")),
|
|
212
212
|
},
|
|
213
213
|
'modified': {
|
|
214
214
|
type: 'boolean',
|
|
215
|
-
description: ( localize(
|
|
215
|
+
description: ( localize(9771, "Use pattern for the diff decorations in gutter for modified lines.")),
|
|
216
216
|
},
|
|
217
217
|
},
|
|
218
218
|
default: {
|
|
@@ -224,12 +224,12 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
224
224
|
type: 'string',
|
|
225
225
|
enum: ['true', 'false', 'inherit'],
|
|
226
226
|
enumDescriptions: [
|
|
227
|
-
( localize(
|
|
228
|
-
( localize(
|
|
229
|
-
( localize(
|
|
227
|
+
( localize(9772, "Ignore leading and trailing whitespace.")),
|
|
228
|
+
( localize(9773, "Do not ignore leading and trailing whitespace.")),
|
|
229
|
+
( localize(9774, "Inherit from `diffEditor.ignoreTrimWhitespace`."))
|
|
230
230
|
],
|
|
231
231
|
description: ( localize(
|
|
232
|
-
|
|
232
|
+
9775,
|
|
233
233
|
"Controls whether leading and trailing whitespace is ignored in Source Control diff gutter decorations."
|
|
234
234
|
)),
|
|
235
235
|
default: 'false'
|
|
@@ -237,7 +237,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
237
237
|
'scm.alwaysShowActions': {
|
|
238
238
|
type: 'boolean',
|
|
239
239
|
description: ( localize(
|
|
240
|
-
|
|
240
|
+
9776,
|
|
241
241
|
"Controls whether inline actions are always visible in the Source Control view."
|
|
242
242
|
)),
|
|
243
243
|
default: false
|
|
@@ -246,12 +246,12 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
246
246
|
type: 'string',
|
|
247
247
|
enum: ['all', 'focused', 'off'],
|
|
248
248
|
enumDescriptions: [
|
|
249
|
-
( localize(
|
|
250
|
-
( localize(
|
|
251
|
-
( localize(
|
|
249
|
+
( localize(9777, "Show the sum of all Source Control Provider count badges.")),
|
|
250
|
+
( localize(9778, "Show the count badge of the focused Source Control Provider.")),
|
|
251
|
+
( localize(9779, "Disable the Source Control count badge."))
|
|
252
252
|
],
|
|
253
253
|
description: ( localize(
|
|
254
|
-
|
|
254
|
+
9780,
|
|
255
255
|
"Controls the count badge on the Source Control icon on the Activity Bar."
|
|
256
256
|
)),
|
|
257
257
|
default: 'all'
|
|
@@ -260,12 +260,12 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
260
260
|
type: 'string',
|
|
261
261
|
enum: ['hidden', 'auto', 'visible'],
|
|
262
262
|
enumDescriptions: [
|
|
263
|
-
( localize(
|
|
264
|
-
( localize(
|
|
265
|
-
( localize(
|
|
263
|
+
( localize(9781, "Hide Source Control Provider count badges.")),
|
|
264
|
+
( localize(9782, "Only show count badge for Source Control Provider when non-zero.")),
|
|
265
|
+
( localize(9783, "Show Source Control Provider count badges."))
|
|
266
266
|
],
|
|
267
267
|
markdownDescription: ( localize(
|
|
268
|
-
|
|
268
|
+
9784,
|
|
269
269
|
"Controls the count badges on Source Control Provider headers. These headers appear in the Source Control view when there is more than one provider or when the {0} setting is enabled, and in the Source Control Repositories view.",
|
|
270
270
|
'\`#scm.alwaysShowRepositories#\`'
|
|
271
271
|
)),
|
|
@@ -275,22 +275,22 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
275
275
|
type: 'string',
|
|
276
276
|
enum: ['tree', 'list'],
|
|
277
277
|
enumDescriptions: [
|
|
278
|
-
( localize(
|
|
279
|
-
( localize(
|
|
278
|
+
( localize(9785, "Show the repository changes as a tree.")),
|
|
279
|
+
( localize(9786, "Show the repository changes as a list."))
|
|
280
280
|
],
|
|
281
|
-
description: ( localize(
|
|
281
|
+
description: ( localize(9787, "Controls the default Source Control repository view mode.")),
|
|
282
282
|
default: 'list'
|
|
283
283
|
},
|
|
284
284
|
'scm.defaultViewSortKey': {
|
|
285
285
|
type: 'string',
|
|
286
286
|
enum: ['name', 'path', 'status'],
|
|
287
287
|
enumDescriptions: [
|
|
288
|
-
( localize(
|
|
289
|
-
( localize(
|
|
290
|
-
( localize(
|
|
288
|
+
( localize(9788, "Sort the repository changes by file name.")),
|
|
289
|
+
( localize(9789, "Sort the repository changes by path.")),
|
|
290
|
+
( localize(9790, "Sort the repository changes by Source Control status."))
|
|
291
291
|
],
|
|
292
292
|
description: ( localize(
|
|
293
|
-
|
|
293
|
+
9791,
|
|
294
294
|
"Controls the default Source Control repository changes sort order when viewed as a list."
|
|
295
295
|
)),
|
|
296
296
|
default: 'path'
|
|
@@ -298,7 +298,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
298
298
|
'scm.autoReveal': {
|
|
299
299
|
type: 'boolean',
|
|
300
300
|
description: ( localize(
|
|
301
|
-
|
|
301
|
+
9792,
|
|
302
302
|
"Controls whether the Source Control view should automatically reveal and select files when opening them."
|
|
303
303
|
)),
|
|
304
304
|
default: true
|
|
@@ -306,20 +306,20 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
306
306
|
'scm.inputFontFamily': {
|
|
307
307
|
type: 'string',
|
|
308
308
|
markdownDescription: ( localize(
|
|
309
|
-
|
|
309
|
+
9793,
|
|
310
310
|
"Controls the font for the input message. Use `default` for the workbench user interface font family, `editor` for the `#editor.fontFamily#`'s value, or a custom font family."
|
|
311
311
|
)),
|
|
312
312
|
default: 'default'
|
|
313
313
|
},
|
|
314
314
|
'scm.inputFontSize': {
|
|
315
315
|
type: 'number',
|
|
316
|
-
markdownDescription: ( localize(
|
|
316
|
+
markdownDescription: ( localize(9794, "Controls the font size for the input message in pixels.")),
|
|
317
317
|
default: 13
|
|
318
318
|
},
|
|
319
319
|
'scm.inputMaxLineCount': {
|
|
320
320
|
type: 'number',
|
|
321
321
|
markdownDescription: ( localize(
|
|
322
|
-
|
|
322
|
+
9795,
|
|
323
323
|
"Controls the maximum number of lines that the input will auto-grow to."
|
|
324
324
|
)),
|
|
325
325
|
minimum: 1,
|
|
@@ -329,7 +329,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
329
329
|
'scm.inputMinLineCount': {
|
|
330
330
|
type: 'number',
|
|
331
331
|
markdownDescription: ( localize(
|
|
332
|
-
|
|
332
|
+
9796,
|
|
333
333
|
"Controls the minimum number of lines that the input will auto-grow from."
|
|
334
334
|
)),
|
|
335
335
|
minimum: 1,
|
|
@@ -339,7 +339,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
339
339
|
'scm.alwaysShowRepositories': {
|
|
340
340
|
type: 'boolean',
|
|
341
341
|
markdownDescription: ( localize(
|
|
342
|
-
|
|
342
|
+
9797,
|
|
343
343
|
"Controls whether repositories should always be visible in the Source Control view."
|
|
344
344
|
)),
|
|
345
345
|
default: false
|
|
@@ -349,20 +349,20 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
349
349
|
enum: ['discovery time', 'name', 'path'],
|
|
350
350
|
enumDescriptions: [
|
|
351
351
|
( localize(
|
|
352
|
-
|
|
352
|
+
9798,
|
|
353
353
|
"Repositories in the Source Control Repositories view are sorted by discovery time. Repositories in the Source Control view are sorted in the order that they were selected."
|
|
354
354
|
)),
|
|
355
355
|
( localize(
|
|
356
|
-
|
|
356
|
+
9799,
|
|
357
357
|
"Repositories in the Source Control Repositories and Source Control views are sorted by repository name."
|
|
358
358
|
)),
|
|
359
359
|
( localize(
|
|
360
|
-
|
|
360
|
+
9800,
|
|
361
361
|
"Repositories in the Source Control Repositories and Source Control views are sorted by repository path."
|
|
362
362
|
))
|
|
363
363
|
],
|
|
364
364
|
description: ( localize(
|
|
365
|
-
|
|
365
|
+
9801,
|
|
366
366
|
"Controls the sort order of the repositories in the source control repositories view."
|
|
367
367
|
)),
|
|
368
368
|
default: 'discovery time'
|
|
@@ -370,7 +370,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
370
370
|
'scm.repositories.visible': {
|
|
371
371
|
type: 'number',
|
|
372
372
|
description: ( localize(
|
|
373
|
-
|
|
373
|
+
9802,
|
|
374
374
|
"Controls how many repositories are visible in the Source Control Repositories section. Set to 0, to be able to manually resize the view."
|
|
375
375
|
)),
|
|
376
376
|
default: 10
|
|
@@ -378,7 +378,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
378
378
|
'scm.showActionButton': {
|
|
379
379
|
type: 'boolean',
|
|
380
380
|
markdownDescription: ( localize(
|
|
381
|
-
|
|
381
|
+
9803,
|
|
382
382
|
"Controls whether an action button can be shown in the Source Control view."
|
|
383
383
|
)),
|
|
384
384
|
default: true
|
|
@@ -386,7 +386,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
386
386
|
'scm.showInputActionButton': {
|
|
387
387
|
type: 'boolean',
|
|
388
388
|
markdownDescription: ( localize(
|
|
389
|
-
|
|
389
|
+
9804,
|
|
390
390
|
"Controls whether an action button can be shown in the Source Control input."
|
|
391
391
|
)),
|
|
392
392
|
default: true
|
|
@@ -394,7 +394,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
394
394
|
'scm.workingSets.enabled': {
|
|
395
395
|
type: 'boolean',
|
|
396
396
|
description: ( localize(
|
|
397
|
-
|
|
397
|
+
9805,
|
|
398
398
|
"Controls whether to store editor working sets when switching between source control history item groups."
|
|
399
399
|
)),
|
|
400
400
|
default: false
|
|
@@ -404,16 +404,16 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
404
404
|
enum: ['empty', 'current'],
|
|
405
405
|
enumDescriptions: [
|
|
406
406
|
( localize(
|
|
407
|
-
|
|
407
|
+
9806,
|
|
408
408
|
"Use an empty working set when switching to a source control history item group that does not have a working set."
|
|
409
409
|
)),
|
|
410
410
|
( localize(
|
|
411
|
-
|
|
411
|
+
9807,
|
|
412
412
|
"Use the current working set when switching to a source control history item group that does not have a working set."
|
|
413
413
|
))
|
|
414
414
|
],
|
|
415
415
|
description: ( localize(
|
|
416
|
-
|
|
416
|
+
9808,
|
|
417
417
|
"Controls the default working set to use when switching to a source control history item group that does not have a working set."
|
|
418
418
|
)),
|
|
419
419
|
default: 'current'
|
|
@@ -421,7 +421,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
421
421
|
'scm.compactFolders': {
|
|
422
422
|
type: 'boolean',
|
|
423
423
|
description: ( localize(
|
|
424
|
-
|
|
424
|
+
9809,
|
|
425
425
|
"Controls whether the Source Control view should render folders in a compact form. In such a form, single child folders will be compressed in a combined tree element."
|
|
426
426
|
)),
|
|
427
427
|
default: true
|
|
@@ -429,7 +429,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
429
429
|
'scm.graph.pageOnScroll': {
|
|
430
430
|
type: 'boolean',
|
|
431
431
|
description: ( localize(
|
|
432
|
-
|
|
432
|
+
9810,
|
|
433
433
|
"Controls whether the Source Control Graph view will load the next page of items when you scroll to the end of the list."
|
|
434
434
|
)),
|
|
435
435
|
default: true
|
|
@@ -437,7 +437,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
437
437
|
'scm.graph.pageSize': {
|
|
438
438
|
type: 'number',
|
|
439
439
|
description: ( localize(
|
|
440
|
-
|
|
440
|
+
9811,
|
|
441
441
|
"The number of items to show in the Source Control Graph view by default and when loading more items."
|
|
442
442
|
)),
|
|
443
443
|
minimum: 1,
|
|
@@ -449,16 +449,16 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
449
449
|
enum: ['all', 'filter'],
|
|
450
450
|
enumDescriptions: [
|
|
451
451
|
( localize(
|
|
452
|
-
|
|
452
|
+
9812,
|
|
453
453
|
"Show badges of all history item groups in the Source Control Graph view."
|
|
454
454
|
)),
|
|
455
455
|
( localize(
|
|
456
|
-
|
|
456
|
+
9813,
|
|
457
457
|
"Show only the badges of history item groups used as a filter in the Source Control Graph view."
|
|
458
458
|
))
|
|
459
459
|
],
|
|
460
460
|
description: ( localize(
|
|
461
|
-
|
|
461
|
+
9814,
|
|
462
462
|
"Controls which badges are shown in the Source Control Graph view. The badges are shown on the right side of the graph indicating the names of history item groups."
|
|
463
463
|
)),
|
|
464
464
|
default: 'filter'
|
|
@@ -467,7 +467,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
467
467
|
});
|
|
468
468
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
469
469
|
id: 'scm.acceptInput',
|
|
470
|
-
metadata: { description: ( localize(
|
|
470
|
+
metadata: { description: ( localize(9815, "Source Control: Accept Input")), args: [] },
|
|
471
471
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
472
472
|
when: ( ContextKeyExpr.has('scmRepository')),
|
|
473
473
|
primary: KeyMod.CtrlCmd | KeyCode.Enter,
|
|
@@ -504,7 +504,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
504
504
|
}
|
|
505
505
|
});
|
|
506
506
|
const viewNextCommitCommand = {
|
|
507
|
-
description: { description: ( localize(
|
|
507
|
+
description: { description: ( localize(9816, "Source Control: View Next Commit")), args: [] },
|
|
508
508
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
509
509
|
handler: (accessor) => {
|
|
510
510
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
@@ -516,7 +516,7 @@ const viewNextCommitCommand = {
|
|
|
516
516
|
}
|
|
517
517
|
};
|
|
518
518
|
const viewPreviousCommitCommand = {
|
|
519
|
-
description: { description: ( localize(
|
|
519
|
+
description: { description: ( localize(9817, "Source Control: View Previous Commit")), args: [] },
|
|
520
520
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
521
521
|
handler: (accessor) => {
|
|
522
522
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
@@ -584,9 +584,9 @@ CommandsRegistry.registerCommand('scm.openInTerminal', async (accessor, provider
|
|
|
584
584
|
CommandsRegistry.registerCommand('scm.setActiveProvider', async (accessor) => {
|
|
585
585
|
const instantiationService = accessor.get(IInstantiationService);
|
|
586
586
|
const scmViewService = accessor.get(ISCMViewService);
|
|
587
|
-
const placeHolder = ( localize(
|
|
587
|
+
const placeHolder = ( localize(9818, "Select the active repository, type to filter all repositories"));
|
|
588
588
|
const autoQuickItemDescription = ( localize(
|
|
589
|
-
|
|
589
|
+
9819,
|
|
590
590
|
"The active repository is updated based on focused repository/active editor"
|
|
591
591
|
));
|
|
592
592
|
const repositoryPicker = instantiationService.createInstance(RepositoryPicker, placeHolder, autoQuickItemDescription);
|
|
@@ -597,18 +597,18 @@ CommandsRegistry.registerCommand('scm.setActiveProvider', async (accessor) => {
|
|
|
597
597
|
}
|
|
598
598
|
});
|
|
599
599
|
MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
|
|
600
|
-
group: '
|
|
600
|
+
group: '99_terminal',
|
|
601
601
|
command: {
|
|
602
602
|
id: 'scm.openInTerminal',
|
|
603
|
-
title: ( localize(
|
|
603
|
+
title: ( localize(9820, "Open in External Terminal"))
|
|
604
604
|
},
|
|
605
605
|
when: ( ContextKeyExpr.and(( RemoteNameContext.isEqualTo('')), ( ContextKeyExpr.equals('scmProviderHasRootUri', true)), ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'external')), ( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both'))))))
|
|
606
606
|
});
|
|
607
607
|
MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
|
|
608
|
-
group: '
|
|
608
|
+
group: '99_terminal',
|
|
609
609
|
command: {
|
|
610
610
|
id: 'scm.openInIntegratedTerminal',
|
|
611
|
-
title: ( localize(
|
|
611
|
+
title: ( localize(9821, "Open in Integrated Terminal"))
|
|
612
612
|
},
|
|
613
613
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('scmProviderHasRootUri', true)), ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'integrated')), ( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both'))))))
|
|
614
614
|
});
|
|
@@ -659,14 +659,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
659
659
|
}
|
|
660
660
|
});
|
|
661
661
|
MenuRegistry.appendMenuItem(MenuId.EditorLineNumberContext, {
|
|
662
|
-
title: ( localize(
|
|
662
|
+
title: ( localize(9822, "Diff Decorations")),
|
|
663
663
|
submenu: MenuId.SCMQuickDiffDecorations,
|
|
664
664
|
when: ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.scm.diffDecorations', 'all')), ( ContextKeyExpr.equals('config.scm.diffDecorations', 'gutter')))),
|
|
665
665
|
group: '9_quickDiffDecorations'
|
|
666
666
|
});
|
|
667
|
-
MenuRegistry.appendMenuItem(MenuId.SCMHistoryItemContext, {
|
|
668
|
-
title: ( localize(9666, "Copilot")),
|
|
669
|
-
submenu: MenuId.SCMHistoryItemChatContext,
|
|
670
|
-
group: '8_chat'
|
|
671
|
-
});
|
|
672
667
|
AccessibleViewRegistry.register(( new SCMAccessibilityHelp()));
|
|
@@ -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(9823, "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(9824, "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(9825, "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(9826, "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(9827, "enabled")) : ( localize(9828, "disabled"));
|
|
74
|
+
content.push(( localize(9829, "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(9830, "Resource groups: {0}", resourceGroups.join(', '))));
|
|
82
82
|
}
|
|
83
83
|
content.push(( localize(
|
|
84
|
-
|
|
84
|
+
9831,
|
|
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
|
+
9832,
|
|
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(9833, "Once the Source Control Repositories view is opened you can:")));
|
|
92
92
|
content.push(( localize(
|
|
93
|
-
|
|
93
|
+
9834,
|
|
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(9835, " - Use the Enter or Space keys to select a repository.")));
|
|
97
|
+
content.push(( localize(9836, " - Use Shift + up/down keys to select multiple repositories.")));
|
|
98
98
|
content.push(( localize(
|
|
99
|
-
|
|
99
|
+
9837,
|
|
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
|
+
9838,
|
|
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(9839, "Once the Source Control view is opened you can:")));
|
|
107
107
|
content.push(( localize(
|
|
108
|
-
|
|
108
|
+
9840,
|
|
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(9841, " - Use the Space key to expand or collapse a resource group.")));
|
|
112
112
|
content.push(( localize(
|
|
113
|
-
|
|
113
|
+
9842,
|
|
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
|
+
9843,
|
|
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(9844, "Once the Source Control Graph view is opened you can:")));
|
|
121
121
|
content.push(( localize(
|
|
122
|
-
|
|
122
|
+
9845,
|
|
123
123
|
" - Use the up/down arrow keys to navigate the list of history items."
|
|
124
124
|
)));
|
|
125
125
|
content.push(( localize(
|
|
126
|
-
|
|
126
|
+
9846,
|
|
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');
|