@codingame/monaco-vscode-scm-service-override 4.5.0 → 4.5.2
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.d.ts +1 -1
- package/package.json +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/activity.js +38 -46
- package/vscode/src/vs/workbench/contrib/scm/browser/menus.js +35 -34
- package/vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js +155 -287
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.js +24 -27
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.js +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js +370 -501
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.js +15 -18
- package/vscode/src/vs/workbench/contrib/scm/common/scmService.js +1 -1
- package/scm.d.ts +0 -5
|
@@ -28,66 +28,55 @@ import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
|
28
28
|
import '../common/quickDiffService.js';
|
|
29
29
|
import { getActiveElement } from 'vscode/vscode/vs/base/browser/dom';
|
|
30
30
|
|
|
31
|
+
const _moduleId = "vs/workbench/contrib/scm/browser/scm.contribution";
|
|
31
32
|
ModesRegistry.registerLanguage({
|
|
32
33
|
id: 'scminput',
|
|
33
34
|
extensions: [],
|
|
34
35
|
aliases: [],
|
|
35
36
|
mimetypes: ['text/x-scm-input']
|
|
36
37
|
});
|
|
37
|
-
( Registry.as(Extensions.Workbench))
|
|
38
|
+
( (Registry.as(Extensions.Workbench)))
|
|
38
39
|
.registerWorkbenchContribution(DirtyDiffWorkbenchController, 3 );
|
|
39
|
-
const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localizeWithPath(
|
|
40
|
-
|
|
41
|
-
'sourceControlViewIcon',
|
|
42
|
-
'View icon of the Source Control view.'
|
|
43
|
-
)));
|
|
44
|
-
const viewContainer = ( Registry.as(Extensions$1.ViewContainersRegistry)).registerViewContainer({
|
|
40
|
+
const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localizeWithPath(_moduleId, 0, 'View icon of the Source Control view.')));
|
|
41
|
+
const viewContainer = ( (Registry.as(Extensions$1.ViewContainersRegistry))).registerViewContainer({
|
|
45
42
|
id: VIEWLET_ID,
|
|
46
|
-
title: ( localize2WithPath(
|
|
47
|
-
|
|
48
|
-
'source control',
|
|
49
|
-
'Source Control'
|
|
50
|
-
)),
|
|
51
|
-
ctorDescriptor: ( new SyncDescriptor(SCMViewPaneContainer)),
|
|
43
|
+
title: ( localize2WithPath(_moduleId, 1, 'Source Control')),
|
|
44
|
+
ctorDescriptor: ( (new SyncDescriptor(SCMViewPaneContainer))),
|
|
52
45
|
storageId: 'workbench.scm.views.state',
|
|
53
46
|
icon: sourceControlViewIcon,
|
|
54
47
|
alwaysUseContainerInfo: true,
|
|
55
48
|
order: 2,
|
|
56
49
|
hideIfEmpty: true,
|
|
57
50
|
}, 0 , { doNotRegisterOpenCommand: true });
|
|
58
|
-
const viewsRegistry = ( Registry.as(Extensions$1.ViewsRegistry));
|
|
51
|
+
const viewsRegistry = ( (Registry.as(Extensions$1.ViewsRegistry)));
|
|
59
52
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
60
|
-
content: ( localizeWithPath(
|
|
61
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
62
|
-
'no open repo',
|
|
63
|
-
"No source control providers registered."
|
|
64
|
-
)),
|
|
53
|
+
content: ( localizeWithPath(_moduleId, 2, "No source control providers registered.")),
|
|
65
54
|
when: 'default'
|
|
66
55
|
});
|
|
67
56
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
68
57
|
content: ( localizeWithPath(
|
|
69
|
-
|
|
70
|
-
|
|
58
|
+
_moduleId,
|
|
59
|
+
3,
|
|
71
60
|
"None of the registered source control providers work in Restricted Mode."
|
|
72
61
|
)),
|
|
73
|
-
when: ( ContextKeyExpr.and(
|
|
62
|
+
when: ( (ContextKeyExpr.and(
|
|
63
|
+
(ContextKeyExpr.equals('scm.providerCount', 0)),
|
|
64
|
+
WorkspaceTrustContext.IsEnabled,
|
|
65
|
+
(WorkspaceTrustContext.IsTrusted.toNegated())
|
|
66
|
+
)))
|
|
74
67
|
});
|
|
75
68
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
76
|
-
content: `[${( localizeWithPath(
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
69
|
+
content: `[${( localizeWithPath(_moduleId, 4, "Manage Workspace Trust"))}](command:${MANAGE_TRUST_COMMAND_ID})`,
|
|
70
|
+
when: ( (ContextKeyExpr.and(
|
|
71
|
+
(ContextKeyExpr.equals('scm.providerCount', 0)),
|
|
72
|
+
WorkspaceTrustContext.IsEnabled,
|
|
73
|
+
(WorkspaceTrustContext.IsTrusted.toNegated())
|
|
74
|
+
)))
|
|
82
75
|
});
|
|
83
76
|
viewsRegistry.registerViews([{
|
|
84
77
|
id: VIEW_PANE_ID,
|
|
85
|
-
name: ( localize2WithPath(
|
|
86
|
-
|
|
87
|
-
'source control',
|
|
88
|
-
'Source Control'
|
|
89
|
-
)),
|
|
90
|
-
ctorDescriptor: ( new SyncDescriptor(SCMViewPane)),
|
|
78
|
+
name: ( localize2WithPath(_moduleId, 1, 'Source Control')),
|
|
79
|
+
ctorDescriptor: ( (new SyncDescriptor(SCMViewPane))),
|
|
91
80
|
canToggleVisibility: true,
|
|
92
81
|
canMoveView: true,
|
|
93
82
|
weight: 80,
|
|
@@ -95,11 +84,7 @@ viewsRegistry.registerViews([{
|
|
|
95
84
|
containerIcon: sourceControlViewIcon,
|
|
96
85
|
openCommandActionDescriptor: {
|
|
97
86
|
id: viewContainer.id,
|
|
98
|
-
mnemonicTitle: ( localizeWithPath(
|
|
99
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
100
|
-
{ key: 'miViewSCM', comment: ['&& denotes a mnemonic'] },
|
|
101
|
-
"Source &&Control"
|
|
102
|
-
)),
|
|
87
|
+
mnemonicTitle: ( localizeWithPath(_moduleId, 5, "Source &&Control")),
|
|
103
88
|
keybindings: {
|
|
104
89
|
primary: 0,
|
|
105
90
|
win: { primary: 2048 | 1024 | 37 },
|
|
@@ -111,34 +96,29 @@ viewsRegistry.registerViews([{
|
|
|
111
96
|
}], viewContainer);
|
|
112
97
|
viewsRegistry.registerViews([{
|
|
113
98
|
id: REPOSITORIES_VIEW_PANE_ID,
|
|
114
|
-
name: ( localize2WithPath(
|
|
115
|
-
|
|
116
|
-
'source control repositories',
|
|
117
|
-
"Source Control Repositories"
|
|
118
|
-
)),
|
|
119
|
-
ctorDescriptor: ( new SyncDescriptor(SCMRepositoriesViewPane)),
|
|
99
|
+
name: ( localize2WithPath(_moduleId, 6, "Source Control Repositories")),
|
|
100
|
+
ctorDescriptor: ( (new SyncDescriptor(SCMRepositoriesViewPane))),
|
|
120
101
|
canToggleVisibility: true,
|
|
121
102
|
hideByDefault: true,
|
|
122
103
|
canMoveView: true,
|
|
123
104
|
weight: 20,
|
|
124
105
|
order: -1000,
|
|
125
|
-
when: ( ContextKeyExpr.and(
|
|
106
|
+
when: ( (ContextKeyExpr.and(
|
|
107
|
+
(ContextKeyExpr.has('scm.providerCount')),
|
|
108
|
+
(ContextKeyExpr.notEquals('scm.providerCount', 0))
|
|
109
|
+
))),
|
|
126
110
|
containerIcon: sourceControlViewIcon
|
|
127
111
|
}], viewContainer);
|
|
128
|
-
( Registry.as(Extensions.Workbench))
|
|
112
|
+
( (Registry.as(Extensions.Workbench)))
|
|
129
113
|
.registerWorkbenchContribution(SCMActiveResourceContextKeyController, 3 );
|
|
130
|
-
( Registry.as(Extensions.Workbench))
|
|
114
|
+
( (Registry.as(Extensions.Workbench)))
|
|
131
115
|
.registerWorkbenchContribution(SCMActiveRepositoryContextKeyController, 3 );
|
|
132
|
-
( Registry.as(Extensions.Workbench))
|
|
116
|
+
( (Registry.as(Extensions.Workbench)))
|
|
133
117
|
.registerWorkbenchContribution(SCMStatusController, 3 );
|
|
134
|
-
( Registry.as(Extensions$2.Configuration)).registerConfiguration({
|
|
118
|
+
( (Registry.as(Extensions$2.Configuration))).registerConfiguration({
|
|
135
119
|
id: 'scm',
|
|
136
120
|
order: 5,
|
|
137
|
-
title: ( localizeWithPath(
|
|
138
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
139
|
-
'scmConfigurationTitle',
|
|
140
|
-
"Source Control"
|
|
141
|
-
)),
|
|
121
|
+
title: ( localizeWithPath(_moduleId, 7, "Source Control")),
|
|
142
122
|
type: 'object',
|
|
143
123
|
scope: 4 ,
|
|
144
124
|
properties: {
|
|
@@ -146,46 +126,22 @@ viewsRegistry.registerViews([{
|
|
|
146
126
|
type: 'string',
|
|
147
127
|
enum: ['all', 'gutter', 'overview', 'minimap', 'none'],
|
|
148
128
|
enumDescriptions: [
|
|
149
|
-
( localizeWithPath(
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
))
|
|
154
|
-
( localizeWithPath(
|
|
155
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
156
|
-
'scm.diffDecorations.gutter',
|
|
157
|
-
"Show the diff decorations only in the editor gutter."
|
|
158
|
-
)),
|
|
159
|
-
( localizeWithPath(
|
|
160
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
161
|
-
'scm.diffDecorations.overviewRuler',
|
|
162
|
-
"Show the diff decorations only in the overview ruler."
|
|
163
|
-
)),
|
|
164
|
-
( localizeWithPath(
|
|
165
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
166
|
-
'scm.diffDecorations.minimap',
|
|
167
|
-
"Show the diff decorations only in the minimap."
|
|
168
|
-
)),
|
|
169
|
-
( localizeWithPath(
|
|
170
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
171
|
-
'scm.diffDecorations.none',
|
|
172
|
-
"Do not show the diff decorations."
|
|
173
|
-
))
|
|
129
|
+
( localizeWithPath(_moduleId, 8, "Show the diff decorations in all available locations.")),
|
|
130
|
+
( localizeWithPath(_moduleId, 9, "Show the diff decorations only in the editor gutter.")),
|
|
131
|
+
( localizeWithPath(_moduleId, 10, "Show the diff decorations only in the overview ruler.")),
|
|
132
|
+
( localizeWithPath(_moduleId, 11, "Show the diff decorations only in the minimap.")),
|
|
133
|
+
( localizeWithPath(_moduleId, 12, "Do not show the diff decorations."))
|
|
174
134
|
],
|
|
175
135
|
default: 'all',
|
|
176
|
-
description: ( localizeWithPath(
|
|
177
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
178
|
-
'diffDecorations',
|
|
179
|
-
"Controls diff decorations in the editor."
|
|
180
|
-
))
|
|
136
|
+
description: ( localizeWithPath(_moduleId, 13, "Controls diff decorations in the editor."))
|
|
181
137
|
},
|
|
182
138
|
'scm.diffDecorationsGutterWidth': {
|
|
183
139
|
type: 'number',
|
|
184
140
|
enum: [1, 2, 3, 4, 5],
|
|
185
141
|
default: 3,
|
|
186
142
|
description: ( localizeWithPath(
|
|
187
|
-
|
|
188
|
-
|
|
143
|
+
_moduleId,
|
|
144
|
+
14,
|
|
189
145
|
"Controls the width(px) of diff decorations in gutter (added & modified)."
|
|
190
146
|
))
|
|
191
147
|
},
|
|
@@ -193,20 +149,12 @@ viewsRegistry.registerViews([{
|
|
|
193
149
|
type: 'string',
|
|
194
150
|
enum: ['always', 'hover'],
|
|
195
151
|
enumDescriptions: [
|
|
196
|
-
( localizeWithPath(
|
|
197
|
-
|
|
198
|
-
'scm.diffDecorationsGutterVisibility.always',
|
|
199
|
-
"Show the diff decorator in the gutter at all times."
|
|
200
|
-
)),
|
|
201
|
-
( localizeWithPath(
|
|
202
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
203
|
-
'scm.diffDecorationsGutterVisibility.hover',
|
|
204
|
-
"Show the diff decorator in the gutter only on hover."
|
|
205
|
-
))
|
|
152
|
+
( localizeWithPath(_moduleId, 15, "Show the diff decorator in the gutter at all times.")),
|
|
153
|
+
( localizeWithPath(_moduleId, 16, "Show the diff decorator in the gutter only on hover."))
|
|
206
154
|
],
|
|
207
155
|
description: ( localizeWithPath(
|
|
208
|
-
|
|
209
|
-
|
|
156
|
+
_moduleId,
|
|
157
|
+
17,
|
|
210
158
|
"Controls the visibility of the Source Control diff decorator in the gutter."
|
|
211
159
|
)),
|
|
212
160
|
default: 'always'
|
|
@@ -215,20 +163,12 @@ viewsRegistry.registerViews([{
|
|
|
215
163
|
type: 'string',
|
|
216
164
|
enum: ['diff', 'none'],
|
|
217
165
|
enumDescriptions: [
|
|
218
|
-
( localizeWithPath(
|
|
219
|
-
|
|
220
|
-
'scm.diffDecorationsGutterAction.diff',
|
|
221
|
-
"Show the inline diff Peek view on click."
|
|
222
|
-
)),
|
|
223
|
-
( localizeWithPath(
|
|
224
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
225
|
-
'scm.diffDecorationsGutterAction.none',
|
|
226
|
-
"Do nothing."
|
|
227
|
-
))
|
|
166
|
+
( localizeWithPath(_moduleId, 18, "Show the inline diff Peek view on click.")),
|
|
167
|
+
( localizeWithPath(_moduleId, 19, "Do nothing."))
|
|
228
168
|
],
|
|
229
169
|
description: ( localizeWithPath(
|
|
230
|
-
|
|
231
|
-
|
|
170
|
+
_moduleId,
|
|
171
|
+
20,
|
|
232
172
|
"Controls the behavior of Source Control diff gutter decorations."
|
|
233
173
|
)),
|
|
234
174
|
default: 'diff'
|
|
@@ -236,8 +176,8 @@ viewsRegistry.registerViews([{
|
|
|
236
176
|
'scm.diffDecorationsGutterPattern': {
|
|
237
177
|
type: 'object',
|
|
238
178
|
description: ( localizeWithPath(
|
|
239
|
-
|
|
240
|
-
|
|
179
|
+
_moduleId,
|
|
180
|
+
21,
|
|
241
181
|
"Controls whether a pattern is used for the diff decorations in gutter."
|
|
242
182
|
)),
|
|
243
183
|
additionalProperties: false,
|
|
@@ -245,16 +185,16 @@ viewsRegistry.registerViews([{
|
|
|
245
185
|
'added': {
|
|
246
186
|
type: 'boolean',
|
|
247
187
|
description: ( localizeWithPath(
|
|
248
|
-
|
|
249
|
-
|
|
188
|
+
_moduleId,
|
|
189
|
+
22,
|
|
250
190
|
"Use pattern for the diff decorations in gutter for added lines."
|
|
251
191
|
)),
|
|
252
192
|
},
|
|
253
193
|
'modified': {
|
|
254
194
|
type: 'boolean',
|
|
255
195
|
description: ( localizeWithPath(
|
|
256
|
-
|
|
257
|
-
|
|
196
|
+
_moduleId,
|
|
197
|
+
23,
|
|
258
198
|
"Use pattern for the diff decorations in gutter for modified lines."
|
|
259
199
|
)),
|
|
260
200
|
},
|
|
@@ -268,25 +208,13 @@ viewsRegistry.registerViews([{
|
|
|
268
208
|
type: 'string',
|
|
269
209
|
enum: ['true', 'false', 'inherit'],
|
|
270
210
|
enumDescriptions: [
|
|
271
|
-
( localizeWithPath(
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
"Ignore leading and trailing whitespace."
|
|
275
|
-
)),
|
|
276
|
-
( localizeWithPath(
|
|
277
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
278
|
-
'scm.diffDecorationsIgnoreTrimWhitespace.false',
|
|
279
|
-
"Do not ignore leading and trailing whitespace."
|
|
280
|
-
)),
|
|
281
|
-
( localizeWithPath(
|
|
282
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
283
|
-
'scm.diffDecorationsIgnoreTrimWhitespace.inherit',
|
|
284
|
-
"Inherit from `diffEditor.ignoreTrimWhitespace`."
|
|
285
|
-
))
|
|
211
|
+
( localizeWithPath(_moduleId, 24, "Ignore leading and trailing whitespace.")),
|
|
212
|
+
( localizeWithPath(_moduleId, 25, "Do not ignore leading and trailing whitespace.")),
|
|
213
|
+
( localizeWithPath(_moduleId, 26, "Inherit from `diffEditor.ignoreTrimWhitespace`."))
|
|
286
214
|
],
|
|
287
215
|
description: ( localizeWithPath(
|
|
288
|
-
|
|
289
|
-
|
|
216
|
+
_moduleId,
|
|
217
|
+
27,
|
|
290
218
|
"Controls whether leading and trailing whitespace is ignored in Source Control diff gutter decorations."
|
|
291
219
|
)),
|
|
292
220
|
default: 'false'
|
|
@@ -294,8 +222,8 @@ viewsRegistry.registerViews([{
|
|
|
294
222
|
'scm.alwaysShowActions': {
|
|
295
223
|
type: 'boolean',
|
|
296
224
|
description: ( localizeWithPath(
|
|
297
|
-
|
|
298
|
-
|
|
225
|
+
_moduleId,
|
|
226
|
+
28,
|
|
299
227
|
"Controls whether inline actions are always visible in the Source Control view."
|
|
300
228
|
)),
|
|
301
229
|
default: false
|
|
@@ -304,25 +232,17 @@ viewsRegistry.registerViews([{
|
|
|
304
232
|
type: 'string',
|
|
305
233
|
enum: ['all', 'focused', 'off'],
|
|
306
234
|
enumDescriptions: [
|
|
235
|
+
( localizeWithPath(_moduleId, 29, "Show the sum of all Source Control Provider count badges.")),
|
|
307
236
|
( localizeWithPath(
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
"Show the sum of all Source Control Provider count badges."
|
|
311
|
-
)),
|
|
312
|
-
( localizeWithPath(
|
|
313
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
314
|
-
'scm.countBadge.focused',
|
|
237
|
+
_moduleId,
|
|
238
|
+
30,
|
|
315
239
|
"Show the count badge of the focused Source Control Provider."
|
|
316
240
|
)),
|
|
317
|
-
( localizeWithPath(
|
|
318
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
319
|
-
'scm.countBadge.off',
|
|
320
|
-
"Disable the Source Control count badge."
|
|
321
|
-
))
|
|
241
|
+
( localizeWithPath(_moduleId, 31, "Disable the Source Control count badge."))
|
|
322
242
|
],
|
|
323
243
|
description: ( localizeWithPath(
|
|
324
|
-
|
|
325
|
-
|
|
244
|
+
_moduleId,
|
|
245
|
+
32,
|
|
326
246
|
"Controls the count badge on the Source Control icon on the Activity Bar."
|
|
327
247
|
)),
|
|
328
248
|
default: 'all'
|
|
@@ -331,25 +251,17 @@ viewsRegistry.registerViews([{
|
|
|
331
251
|
type: 'string',
|
|
332
252
|
enum: ['hidden', 'auto', 'visible'],
|
|
333
253
|
enumDescriptions: [
|
|
254
|
+
( localizeWithPath(_moduleId, 33, "Hide Source Control Provider count badges.")),
|
|
334
255
|
( localizeWithPath(
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
"Hide Source Control Provider count badges."
|
|
338
|
-
)),
|
|
339
|
-
( localizeWithPath(
|
|
340
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
341
|
-
'scm.providerCountBadge.auto',
|
|
256
|
+
_moduleId,
|
|
257
|
+
34,
|
|
342
258
|
"Only show count badge for Source Control Provider when non-zero."
|
|
343
259
|
)),
|
|
344
|
-
( localizeWithPath(
|
|
345
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
346
|
-
'scm.providerCountBadge.visible',
|
|
347
|
-
"Show Source Control Provider count badges."
|
|
348
|
-
))
|
|
260
|
+
( localizeWithPath(_moduleId, 35, "Show Source Control Provider count badges."))
|
|
349
261
|
],
|
|
350
262
|
markdownDescription: ( localizeWithPath(
|
|
351
|
-
|
|
352
|
-
|
|
263
|
+
_moduleId,
|
|
264
|
+
36,
|
|
353
265
|
"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.",
|
|
354
266
|
'\`#scm.alwaysShowRepositories#\`'
|
|
355
267
|
)),
|
|
@@ -359,47 +271,23 @@ viewsRegistry.registerViews([{
|
|
|
359
271
|
type: 'string',
|
|
360
272
|
enum: ['tree', 'list'],
|
|
361
273
|
enumDescriptions: [
|
|
362
|
-
( localizeWithPath(
|
|
363
|
-
|
|
364
|
-
'scm.defaultViewMode.tree',
|
|
365
|
-
"Show the repository changes as a tree."
|
|
366
|
-
)),
|
|
367
|
-
( localizeWithPath(
|
|
368
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
369
|
-
'scm.defaultViewMode.list',
|
|
370
|
-
"Show the repository changes as a list."
|
|
371
|
-
))
|
|
274
|
+
( localizeWithPath(_moduleId, 37, "Show the repository changes as a tree.")),
|
|
275
|
+
( localizeWithPath(_moduleId, 38, "Show the repository changes as a list."))
|
|
372
276
|
],
|
|
373
|
-
description: ( localizeWithPath(
|
|
374
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
375
|
-
'scm.defaultViewMode',
|
|
376
|
-
"Controls the default Source Control repository view mode."
|
|
377
|
-
)),
|
|
277
|
+
description: ( localizeWithPath(_moduleId, 39, "Controls the default Source Control repository view mode.")),
|
|
378
278
|
default: 'list'
|
|
379
279
|
},
|
|
380
280
|
'scm.defaultViewSortKey': {
|
|
381
281
|
type: 'string',
|
|
382
282
|
enum: ['name', 'path', 'status'],
|
|
383
283
|
enumDescriptions: [
|
|
384
|
-
( localizeWithPath(
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
"Sort the repository changes by file name."
|
|
388
|
-
)),
|
|
389
|
-
( localizeWithPath(
|
|
390
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
391
|
-
'scm.defaultViewSortKey.path',
|
|
392
|
-
"Sort the repository changes by path."
|
|
393
|
-
)),
|
|
394
|
-
( localizeWithPath(
|
|
395
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
396
|
-
'scm.defaultViewSortKey.status',
|
|
397
|
-
"Sort the repository changes by Source Control status."
|
|
398
|
-
))
|
|
284
|
+
( localizeWithPath(_moduleId, 40, "Sort the repository changes by file name.")),
|
|
285
|
+
( localizeWithPath(_moduleId, 41, "Sort the repository changes by path.")),
|
|
286
|
+
( localizeWithPath(_moduleId, 42, "Sort the repository changes by Source Control status."))
|
|
399
287
|
],
|
|
400
288
|
description: ( localizeWithPath(
|
|
401
|
-
|
|
402
|
-
|
|
289
|
+
_moduleId,
|
|
290
|
+
43,
|
|
403
291
|
"Controls the default Source Control repository changes sort order when viewed as a list."
|
|
404
292
|
)),
|
|
405
293
|
default: 'path'
|
|
@@ -407,8 +295,8 @@ viewsRegistry.registerViews([{
|
|
|
407
295
|
'scm.autoReveal': {
|
|
408
296
|
type: 'boolean',
|
|
409
297
|
description: ( localizeWithPath(
|
|
410
|
-
|
|
411
|
-
|
|
298
|
+
_moduleId,
|
|
299
|
+
44,
|
|
412
300
|
"Controls whether the Source Control view should automatically reveal and select files when opening them."
|
|
413
301
|
)),
|
|
414
302
|
default: true
|
|
@@ -416,26 +304,22 @@ viewsRegistry.registerViews([{
|
|
|
416
304
|
'scm.inputFontFamily': {
|
|
417
305
|
type: 'string',
|
|
418
306
|
markdownDescription: ( localizeWithPath(
|
|
419
|
-
|
|
420
|
-
|
|
307
|
+
_moduleId,
|
|
308
|
+
45,
|
|
421
309
|
"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."
|
|
422
310
|
)),
|
|
423
311
|
default: 'default'
|
|
424
312
|
},
|
|
425
313
|
'scm.inputFontSize': {
|
|
426
314
|
type: 'number',
|
|
427
|
-
markdownDescription: ( localizeWithPath(
|
|
428
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
429
|
-
'inputFontSize',
|
|
430
|
-
"Controls the font size for the input message in pixels."
|
|
431
|
-
)),
|
|
315
|
+
markdownDescription: ( localizeWithPath(_moduleId, 46, "Controls the font size for the input message in pixels.")),
|
|
432
316
|
default: 13
|
|
433
317
|
},
|
|
434
318
|
'scm.inputMaxLineCount': {
|
|
435
319
|
type: 'number',
|
|
436
320
|
markdownDescription: ( localizeWithPath(
|
|
437
|
-
|
|
438
|
-
|
|
321
|
+
_moduleId,
|
|
322
|
+
47,
|
|
439
323
|
"Controls the maximum number of lines that the input will auto-grow to."
|
|
440
324
|
)),
|
|
441
325
|
minimum: 1,
|
|
@@ -445,8 +329,8 @@ viewsRegistry.registerViews([{
|
|
|
445
329
|
'scm.inputMinLineCount': {
|
|
446
330
|
type: 'number',
|
|
447
331
|
markdownDescription: ( localizeWithPath(
|
|
448
|
-
|
|
449
|
-
|
|
332
|
+
_moduleId,
|
|
333
|
+
48,
|
|
450
334
|
"Controls the minimum number of lines that the input will auto-grow from."
|
|
451
335
|
)),
|
|
452
336
|
minimum: 1,
|
|
@@ -456,8 +340,8 @@ viewsRegistry.registerViews([{
|
|
|
456
340
|
'scm.alwaysShowRepositories': {
|
|
457
341
|
type: 'boolean',
|
|
458
342
|
markdownDescription: ( localizeWithPath(
|
|
459
|
-
|
|
460
|
-
|
|
343
|
+
_moduleId,
|
|
344
|
+
49,
|
|
461
345
|
"Controls whether repositories should always be visible in the Source Control view."
|
|
462
346
|
)),
|
|
463
347
|
default: false
|
|
@@ -467,24 +351,24 @@ viewsRegistry.registerViews([{
|
|
|
467
351
|
enum: ['discovery time', 'name', 'path'],
|
|
468
352
|
enumDescriptions: [
|
|
469
353
|
( localizeWithPath(
|
|
470
|
-
|
|
471
|
-
|
|
354
|
+
_moduleId,
|
|
355
|
+
50,
|
|
472
356
|
"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."
|
|
473
357
|
)),
|
|
474
358
|
( localizeWithPath(
|
|
475
|
-
|
|
476
|
-
|
|
359
|
+
_moduleId,
|
|
360
|
+
51,
|
|
477
361
|
"Repositories in the Source Control Repositories and Source Control views are sorted by repository name."
|
|
478
362
|
)),
|
|
479
363
|
( localizeWithPath(
|
|
480
|
-
|
|
481
|
-
|
|
364
|
+
_moduleId,
|
|
365
|
+
52,
|
|
482
366
|
"Repositories in the Source Control Repositories and Source Control views are sorted by repository path."
|
|
483
367
|
))
|
|
484
368
|
],
|
|
485
369
|
description: ( localizeWithPath(
|
|
486
|
-
|
|
487
|
-
|
|
370
|
+
_moduleId,
|
|
371
|
+
53,
|
|
488
372
|
"Controls the sort order of the repositories in the source control repositories view."
|
|
489
373
|
)),
|
|
490
374
|
default: 'discovery time'
|
|
@@ -492,8 +376,8 @@ viewsRegistry.registerViews([{
|
|
|
492
376
|
'scm.repositories.visible': {
|
|
493
377
|
type: 'number',
|
|
494
378
|
description: ( localizeWithPath(
|
|
495
|
-
|
|
496
|
-
|
|
379
|
+
_moduleId,
|
|
380
|
+
54,
|
|
497
381
|
"Controls how many repositories are visible in the Source Control Repositories section. Set to 0, to be able to manually resize the view."
|
|
498
382
|
)),
|
|
499
383
|
default: 10
|
|
@@ -501,8 +385,8 @@ viewsRegistry.registerViews([{
|
|
|
501
385
|
'scm.showActionButton': {
|
|
502
386
|
type: 'boolean',
|
|
503
387
|
markdownDescription: ( localizeWithPath(
|
|
504
|
-
|
|
505
|
-
|
|
388
|
+
_moduleId,
|
|
389
|
+
55,
|
|
506
390
|
"Controls whether an action button can be shown in the Source Control view."
|
|
507
391
|
)),
|
|
508
392
|
default: true
|
|
@@ -510,8 +394,8 @@ viewsRegistry.registerViews([{
|
|
|
510
394
|
'scm.showInputActionButton': {
|
|
511
395
|
type: 'boolean',
|
|
512
396
|
markdownDescription: ( localizeWithPath(
|
|
513
|
-
|
|
514
|
-
|
|
397
|
+
_moduleId,
|
|
398
|
+
56,
|
|
515
399
|
"Controls whether an action button can be shown in the Source Control input."
|
|
516
400
|
)),
|
|
517
401
|
default: true
|
|
@@ -520,25 +404,17 @@ viewsRegistry.registerViews([{
|
|
|
520
404
|
type: 'string',
|
|
521
405
|
enum: ['always', 'never', 'auto'],
|
|
522
406
|
enumDescriptions: [
|
|
407
|
+
( localizeWithPath(_moduleId, 57, "Always show incoming changes in the Source Control view.")),
|
|
408
|
+
( localizeWithPath(_moduleId, 58, "Never show incoming changes in the Source Control view.")),
|
|
523
409
|
( localizeWithPath(
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
"Always show incoming changes in the Source Control view."
|
|
527
|
-
)),
|
|
528
|
-
( localizeWithPath(
|
|
529
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
530
|
-
'scm.showIncomingChanges.never',
|
|
531
|
-
"Never show incoming changes in the Source Control view."
|
|
532
|
-
)),
|
|
533
|
-
( localizeWithPath(
|
|
534
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
535
|
-
'scm.showIncomingChanges.auto',
|
|
410
|
+
_moduleId,
|
|
411
|
+
59,
|
|
536
412
|
"Only show incoming changes in the Source Control view when any exist."
|
|
537
413
|
)),
|
|
538
414
|
],
|
|
539
415
|
description: ( localizeWithPath(
|
|
540
|
-
|
|
541
|
-
|
|
416
|
+
_moduleId,
|
|
417
|
+
60,
|
|
542
418
|
"Controls whether incoming changes are shown in the Source Control view."
|
|
543
419
|
)),
|
|
544
420
|
default: 'auto'
|
|
@@ -547,25 +423,17 @@ viewsRegistry.registerViews([{
|
|
|
547
423
|
type: 'string',
|
|
548
424
|
enum: ['always', 'never', 'auto'],
|
|
549
425
|
enumDescriptions: [
|
|
426
|
+
( localizeWithPath(_moduleId, 61, "Always show outgoing changes in the Source Control view.")),
|
|
427
|
+
( localizeWithPath(_moduleId, 62, "Never show outgoing changes in the Source Control view.")),
|
|
550
428
|
( localizeWithPath(
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
"Always show outgoing changes in the Source Control view."
|
|
554
|
-
)),
|
|
555
|
-
( localizeWithPath(
|
|
556
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
557
|
-
'scm.showOutgoingChanges.never',
|
|
558
|
-
"Never show outgoing changes in the Source Control view."
|
|
559
|
-
)),
|
|
560
|
-
( localizeWithPath(
|
|
561
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
562
|
-
'scm.showOutgoingChanges.auto',
|
|
429
|
+
_moduleId,
|
|
430
|
+
63,
|
|
563
431
|
"Only show outgoing changes in the Source Control view when any exist."
|
|
564
432
|
)),
|
|
565
433
|
],
|
|
566
434
|
description: ( localizeWithPath(
|
|
567
|
-
|
|
568
|
-
|
|
435
|
+
_moduleId,
|
|
436
|
+
64,
|
|
569
437
|
"Controls whether outgoing changes are shown in the Source Control view."
|
|
570
438
|
)),
|
|
571
439
|
default: 'auto'
|
|
@@ -573,8 +441,8 @@ viewsRegistry.registerViews([{
|
|
|
573
441
|
'scm.showChangesSummary': {
|
|
574
442
|
type: 'boolean',
|
|
575
443
|
description: ( localizeWithPath(
|
|
576
|
-
|
|
577
|
-
|
|
444
|
+
_moduleId,
|
|
445
|
+
65,
|
|
578
446
|
"Controls whether the All Changes entry is shown for incoming/outgoing changes in the Source Control view."
|
|
579
447
|
)),
|
|
580
448
|
default: true
|
|
@@ -583,13 +451,9 @@ viewsRegistry.registerViews([{
|
|
|
583
451
|
});
|
|
584
452
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
585
453
|
id: 'scm.acceptInput',
|
|
586
|
-
metadata: { description: ( localizeWithPath(
|
|
587
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
588
|
-
'scm accept',
|
|
589
|
-
"Source Control: Accept Input"
|
|
590
|
-
)), args: [] },
|
|
454
|
+
metadata: { description: ( localizeWithPath(_moduleId, 66, "Source Control: Accept Input")), args: [] },
|
|
591
455
|
weight: 200 ,
|
|
592
|
-
when: ( ContextKeyExpr.has('scmRepository')),
|
|
456
|
+
when: ( (ContextKeyExpr.has('scmRepository'))),
|
|
593
457
|
primary: 2048 | 3 ,
|
|
594
458
|
handler: accessor => {
|
|
595
459
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
@@ -610,11 +474,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
610
474
|
}
|
|
611
475
|
});
|
|
612
476
|
const viewNextCommitCommand = {
|
|
613
|
-
description: { description: ( localizeWithPath(
|
|
614
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
615
|
-
'scm view next commit',
|
|
616
|
-
"Source Control: View Next Commit"
|
|
617
|
-
)), args: [] },
|
|
477
|
+
description: { description: ( localizeWithPath(_moduleId, 67, "Source Control: View Next Commit")), args: [] },
|
|
618
478
|
weight: 200 ,
|
|
619
479
|
handler: (accessor) => {
|
|
620
480
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
@@ -626,11 +486,7 @@ const viewNextCommitCommand = {
|
|
|
626
486
|
}
|
|
627
487
|
};
|
|
628
488
|
const viewPreviousCommitCommand = {
|
|
629
|
-
description: { description: ( localizeWithPath(
|
|
630
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
631
|
-
'scm view previous commit',
|
|
632
|
-
"Source Control: View Previous Commit"
|
|
633
|
-
)), args: [] },
|
|
489
|
+
description: { description: ( localizeWithPath(_moduleId, 68, "Source Control: View Previous Commit")), args: [] },
|
|
634
490
|
weight: 200 ,
|
|
635
491
|
handler: (accessor) => {
|
|
636
492
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
@@ -644,25 +500,33 @@ const viewPreviousCommitCommand = {
|
|
|
644
500
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
645
501
|
...viewNextCommitCommand,
|
|
646
502
|
id: 'scm.viewNextCommit',
|
|
647
|
-
when: ( ContextKeyExpr.and(
|
|
503
|
+
when: ( (ContextKeyExpr.and(
|
|
504
|
+
(ContextKeyExpr.has('scmRepository')),
|
|
505
|
+
(ContextKeyExpr.has('scmInputIsInLastPosition')),
|
|
506
|
+
(Context.Visible.toNegated())
|
|
507
|
+
))),
|
|
648
508
|
primary: 18
|
|
649
509
|
});
|
|
650
510
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
651
511
|
...viewPreviousCommitCommand,
|
|
652
512
|
id: 'scm.viewPreviousCommit',
|
|
653
|
-
when: ( ContextKeyExpr.and(
|
|
513
|
+
when: ( (ContextKeyExpr.and(
|
|
514
|
+
(ContextKeyExpr.has('scmRepository')),
|
|
515
|
+
(ContextKeyExpr.has('scmInputIsInFirstPosition')),
|
|
516
|
+
(Context.Visible.toNegated())
|
|
517
|
+
))),
|
|
654
518
|
primary: 16
|
|
655
519
|
});
|
|
656
520
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
657
521
|
...viewNextCommitCommand,
|
|
658
522
|
id: 'scm.forceViewNextCommit',
|
|
659
|
-
when: ( ContextKeyExpr.has('scmRepository')),
|
|
523
|
+
when: ( (ContextKeyExpr.has('scmRepository'))),
|
|
660
524
|
primary: 512 | 18
|
|
661
525
|
});
|
|
662
526
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
663
527
|
...viewPreviousCommitCommand,
|
|
664
528
|
id: 'scm.forceViewPreviousCommit',
|
|
665
|
-
when: ( ContextKeyExpr.has('scmRepository')),
|
|
529
|
+
when: ( (ContextKeyExpr.has('scmRepository'))),
|
|
666
530
|
primary: 512 | 16
|
|
667
531
|
});
|
|
668
532
|
CommandsRegistry.registerCommand('scm.openInIntegratedTerminal', async (accessor, provider) => {
|
|
@@ -683,23 +547,27 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
|
|
|
683
547
|
group: '100_end',
|
|
684
548
|
command: {
|
|
685
549
|
id: 'scm.openInTerminal',
|
|
686
|
-
title: ( localizeWithPath(
|
|
687
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
688
|
-
'open in external terminal',
|
|
689
|
-
"Open in External Terminal"
|
|
690
|
-
))
|
|
550
|
+
title: ( localizeWithPath(_moduleId, 69, "Open in External Terminal"))
|
|
691
551
|
},
|
|
692
|
-
when: ( ContextKeyExpr.and(
|
|
552
|
+
when: ( (ContextKeyExpr.and(
|
|
553
|
+
(ContextKeyExpr.equals('scmProviderHasRootUri', true)),
|
|
554
|
+
(ContextKeyExpr.or(
|
|
555
|
+
(ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'external')),
|
|
556
|
+
(ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both'))
|
|
557
|
+
))
|
|
558
|
+
)))
|
|
693
559
|
});
|
|
694
560
|
MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
|
|
695
561
|
group: '100_end',
|
|
696
562
|
command: {
|
|
697
563
|
id: 'scm.openInIntegratedTerminal',
|
|
698
|
-
title: ( localizeWithPath(
|
|
699
|
-
'vs/workbench/contrib/scm/browser/scm.contribution',
|
|
700
|
-
'open in integrated terminal',
|
|
701
|
-
"Open in Integrated Terminal"
|
|
702
|
-
))
|
|
564
|
+
title: ( localizeWithPath(_moduleId, 70, "Open in Integrated Terminal"))
|
|
703
565
|
},
|
|
704
|
-
when: ( ContextKeyExpr.and(
|
|
566
|
+
when: ( (ContextKeyExpr.and(
|
|
567
|
+
(ContextKeyExpr.equals('scmProviderHasRootUri', true)),
|
|
568
|
+
(ContextKeyExpr.or(
|
|
569
|
+
(ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'integrated')),
|
|
570
|
+
(ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both'))
|
|
571
|
+
))
|
|
572
|
+
)))
|
|
705
573
|
});
|