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