@codingame/monaco-vscode-scm-service-override 22.1.8 → 23.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 +31 -45
- package/vscode/src/vs/workbench/contrib/scm/browser/media/dirtydiffDecorator.css +6 -6
- package/vscode/src/vs/workbench/contrib/scm/browser/media/scm.css +103 -18
- package/vscode/src/vs/workbench/contrib/scm/browser/menus.d.ts +7 -4
- package/vscode/src/vs/workbench/contrib/scm/browser/menus.js +39 -12
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffDecorator.js +10 -10
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffModel.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffModel.js +5 -5
- 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 +126 -89
- package/vscode/src/vs/workbench/contrib/scm/browser/scmAccessibilityHelp.js +24 -24
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.d.ts +7 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.js +180 -115
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.d.ts +5 -0
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.js +457 -79
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.d.ts +8 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.js +66 -20
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.d.ts +3 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js +93 -74
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.js +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.d.ts +15 -5
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.js +88 -32
- package/vscode/src/vs/workbench/contrib/scm/browser/workingSet.js +5 -5
- package/vscode/src/vs/workbench/contrib/scm/common/scmService.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/scm/common/scmService.js +1 -1
|
@@ -3,7 +3,7 @@ import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls'
|
|
|
3
3
|
import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
|
|
4
4
|
import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
|
|
5
5
|
import { QuickDiffWorkbenchController } from './quickDiffDecorator.js';
|
|
6
|
-
import { VIEWLET_ID, VIEW_PANE_ID, HISTORY_VIEW_PANE_ID, REPOSITORIES_VIEW_PANE_ID } from '@codingame/monaco-vscode-
|
|
6
|
+
import { VIEWLET_ID, VIEW_PANE_ID, HISTORY_VIEW_PANE_ID, REPOSITORIES_VIEW_PANE_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm';
|
|
7
7
|
import { ISCMService, ISCMViewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
|
|
8
8
|
import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
|
|
9
9
|
import { MenuRegistry, MenuId, registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
|
|
@@ -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-bc6f260d-ec63-5c95-9446-1ca7d0872719-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,9 +44,9 @@ 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 '@codingame/monaco-vscode-
|
|
47
|
+
import { SCMHistoryItemContextContribution } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/scm/browser/scmHistoryChatContext';
|
|
48
48
|
import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
|
|
49
|
-
import { CHAT_SETUP_SUPPORT_ANONYMOUS_ACTION_ID } from '@codingame/monaco-vscode-
|
|
49
|
+
import { CHAT_SETUP_SUPPORT_ANONYMOUS_ACTION_ID } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
|
|
50
50
|
import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
|
|
51
51
|
|
|
52
52
|
ModesRegistry.registerLanguage({
|
|
@@ -58,10 +58,10 @@ ModesRegistry.registerLanguage({
|
|
|
58
58
|
( Registry.as(Extensions.Workbench))
|
|
59
59
|
.registerWorkbenchContribution(QuickDiffWorkbenchController, LifecyclePhase.Restored);
|
|
60
60
|
registerEditorContribution(QuickDiffEditorController.ID, QuickDiffEditorController, EditorContributionInstantiation.AfterFirstRender);
|
|
61
|
-
const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localize(
|
|
61
|
+
const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localize(10270, 'View icon of the Source Control view.')));
|
|
62
62
|
const viewContainer = ( Registry.as(Extensions$1.ViewContainersRegistry)).registerViewContainer({
|
|
63
63
|
id: VIEWLET_ID,
|
|
64
|
-
title: ( localize2(
|
|
64
|
+
title: ( localize2(10271, 'Source Control')),
|
|
65
65
|
ctorDescriptor: ( new SyncDescriptor(SCMViewPaneContainer)),
|
|
66
66
|
storageId: 'workbench.scm.views.state',
|
|
67
67
|
icon: sourceControlViewIcon,
|
|
@@ -70,25 +70,25 @@ const viewContainer = ( Registry.as(Extensions$1.ViewContainersRegistry)).regist
|
|
|
70
70
|
hideIfEmpty: true,
|
|
71
71
|
}, ViewContainerLocation.Sidebar, { doNotRegisterOpenCommand: true });
|
|
72
72
|
const viewsRegistry = ( Registry.as(Extensions$1.ViewsRegistry));
|
|
73
|
-
const containerTitle = ( localize(
|
|
73
|
+
const containerTitle = ( localize(10272, "Source Control"));
|
|
74
74
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
75
|
-
content: ( localize(
|
|
75
|
+
content: ( localize(10273, "No source control providers registered.")),
|
|
76
76
|
when: 'default'
|
|
77
77
|
});
|
|
78
78
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
79
79
|
content: ( localize(
|
|
80
|
-
|
|
80
|
+
10274,
|
|
81
81
|
"None of the registered source control providers work in Restricted Mode."
|
|
82
82
|
)),
|
|
83
83
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('scm.providerCount', 0)), WorkspaceTrustContext.IsEnabled, ( WorkspaceTrustContext.IsTrusted.toNegated())))
|
|
84
84
|
});
|
|
85
85
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
86
|
-
content: `[${( localize(
|
|
86
|
+
content: `[${( localize(10275, "Manage Workspace Trust"))}](command:${MANAGE_TRUST_COMMAND_ID})`,
|
|
87
87
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('scm.providerCount', 0)), WorkspaceTrustContext.IsEnabled, ( WorkspaceTrustContext.IsTrusted.toNegated())))
|
|
88
88
|
});
|
|
89
89
|
viewsRegistry.registerViewWelcomeContent(HISTORY_VIEW_PANE_ID, {
|
|
90
90
|
content: ( localize(
|
|
91
|
-
|
|
91
|
+
10276,
|
|
92
92
|
"The selected source control provider does not have any source control history items."
|
|
93
93
|
)),
|
|
94
94
|
when: ( ContextKeys.SCMHistoryItemCount.isEqualTo(0))
|
|
@@ -96,8 +96,8 @@ viewsRegistry.registerViewWelcomeContent(HISTORY_VIEW_PANE_ID, {
|
|
|
96
96
|
viewsRegistry.registerViews([{
|
|
97
97
|
id: REPOSITORIES_VIEW_PANE_ID,
|
|
98
98
|
containerTitle,
|
|
99
|
-
name: ( localize2(
|
|
100
|
-
singleViewPaneContainerTitle: ( localize(
|
|
99
|
+
name: ( localize2(10277, "Repositories")),
|
|
100
|
+
singleViewPaneContainerTitle: ( localize(10278, "Source Control Repositories")),
|
|
101
101
|
ctorDescriptor: ( new SyncDescriptor(SCMRepositoriesViewPane)),
|
|
102
102
|
canToggleVisibility: true,
|
|
103
103
|
hideByDefault: true,
|
|
@@ -110,7 +110,7 @@ viewsRegistry.registerViews([{
|
|
|
110
110
|
viewsRegistry.registerViews([{
|
|
111
111
|
id: VIEW_PANE_ID,
|
|
112
112
|
containerTitle,
|
|
113
|
-
name: ( localize2(
|
|
113
|
+
name: ( localize2(10279, 'Changes')),
|
|
114
114
|
singleViewPaneContainerTitle: containerTitle,
|
|
115
115
|
ctorDescriptor: ( new SyncDescriptor(SCMViewPane)),
|
|
116
116
|
canToggleVisibility: true,
|
|
@@ -120,7 +120,7 @@ viewsRegistry.registerViews([{
|
|
|
120
120
|
containerIcon: sourceControlViewIcon,
|
|
121
121
|
openCommandActionDescriptor: {
|
|
122
122
|
id: viewContainer.id,
|
|
123
|
-
mnemonicTitle: ( localize(
|
|
123
|
+
mnemonicTitle: ( localize(10280, "Source &&Control")),
|
|
124
124
|
keybindings: {
|
|
125
125
|
primary: 0,
|
|
126
126
|
win: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG },
|
|
@@ -133,8 +133,8 @@ viewsRegistry.registerViews([{
|
|
|
133
133
|
viewsRegistry.registerViews([{
|
|
134
134
|
id: HISTORY_VIEW_PANE_ID,
|
|
135
135
|
containerTitle,
|
|
136
|
-
name: ( localize2(
|
|
137
|
-
singleViewPaneContainerTitle: ( localize(
|
|
136
|
+
name: ( localize2(10281, "Graph")),
|
|
137
|
+
singleViewPaneContainerTitle: ( localize(10282, "Source Control Graph")),
|
|
138
138
|
ctorDescriptor: ( new SyncDescriptor(SCMHistoryViewPane)),
|
|
139
139
|
canToggleVisibility: true,
|
|
140
140
|
canMoveView: true,
|
|
@@ -152,7 +152,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
152
152
|
( Registry.as(Extensions$2.Configuration)).registerConfiguration({
|
|
153
153
|
id: 'scm',
|
|
154
154
|
order: 5,
|
|
155
|
-
title: ( localize(
|
|
155
|
+
title: ( localize(10283, "Source Control")),
|
|
156
156
|
type: 'object',
|
|
157
157
|
scope: ConfigurationScope.RESOURCE,
|
|
158
158
|
properties: {
|
|
@@ -160,21 +160,21 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
160
160
|
type: 'string',
|
|
161
161
|
enum: ['all', 'gutter', 'overview', 'minimap', 'none'],
|
|
162
162
|
enumDescriptions: [
|
|
163
|
-
( localize(
|
|
164
|
-
( localize(
|
|
165
|
-
( localize(
|
|
166
|
-
( localize(
|
|
167
|
-
( localize(
|
|
163
|
+
( localize(10284, "Show the diff decorations in all available locations.")),
|
|
164
|
+
( localize(10285, "Show the diff decorations only in the editor gutter.")),
|
|
165
|
+
( localize(10286, "Show the diff decorations only in the overview ruler.")),
|
|
166
|
+
( localize(10287, "Show the diff decorations only in the minimap.")),
|
|
167
|
+
( localize(10288, "Do not show the diff decorations."))
|
|
168
168
|
],
|
|
169
169
|
default: 'all',
|
|
170
|
-
description: ( localize(
|
|
170
|
+
description: ( localize(10289, "Controls diff decorations in the editor."))
|
|
171
171
|
},
|
|
172
172
|
'scm.diffDecorationsGutterWidth': {
|
|
173
173
|
type: 'number',
|
|
174
174
|
enum: [1, 2, 3, 4, 5],
|
|
175
175
|
default: 3,
|
|
176
176
|
description: ( localize(
|
|
177
|
-
|
|
177
|
+
10290,
|
|
178
178
|
"Controls the width(px) of diff decorations in gutter (added & modified)."
|
|
179
179
|
))
|
|
180
180
|
},
|
|
@@ -182,11 +182,11 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
182
182
|
type: 'string',
|
|
183
183
|
enum: ['always', 'hover'],
|
|
184
184
|
enumDescriptions: [
|
|
185
|
-
( localize(
|
|
186
|
-
( localize(
|
|
185
|
+
( localize(10291, "Show the diff decorator in the gutter at all times.")),
|
|
186
|
+
( localize(10292, "Show the diff decorator in the gutter only on hover."))
|
|
187
187
|
],
|
|
188
188
|
description: ( localize(
|
|
189
|
-
|
|
189
|
+
10293,
|
|
190
190
|
"Controls the visibility of the Source Control diff decorator in the gutter."
|
|
191
191
|
)),
|
|
192
192
|
default: 'always'
|
|
@@ -195,28 +195,28 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
195
195
|
type: 'string',
|
|
196
196
|
enum: ['diff', 'none'],
|
|
197
197
|
enumDescriptions: [
|
|
198
|
-
( localize(
|
|
199
|
-
( localize(
|
|
198
|
+
( localize(10294, "Show the inline diff Peek view on click.")),
|
|
199
|
+
( localize(10295, "Do nothing."))
|
|
200
200
|
],
|
|
201
|
-
description: ( localize(
|
|
201
|
+
description: ( localize(10296, "Controls the behavior of Source Control diff gutter decorations.")),
|
|
202
202
|
default: 'diff'
|
|
203
203
|
},
|
|
204
204
|
'scm.diffDecorationsGutterPattern': {
|
|
205
205
|
type: 'object',
|
|
206
206
|
description: ( localize(
|
|
207
|
-
|
|
207
|
+
10297,
|
|
208
208
|
"Controls whether a pattern is used for the diff decorations in gutter."
|
|
209
209
|
)),
|
|
210
210
|
additionalProperties: false,
|
|
211
211
|
properties: {
|
|
212
212
|
'added': {
|
|
213
213
|
type: 'boolean',
|
|
214
|
-
description: ( localize(
|
|
214
|
+
description: ( localize(10298, "Use pattern for the diff decorations in gutter for added lines.")),
|
|
215
215
|
},
|
|
216
216
|
'modified': {
|
|
217
217
|
type: 'boolean',
|
|
218
218
|
description: ( localize(
|
|
219
|
-
|
|
219
|
+
10299,
|
|
220
220
|
"Use pattern for the diff decorations in gutter for modified lines."
|
|
221
221
|
)),
|
|
222
222
|
},
|
|
@@ -230,12 +230,12 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
230
230
|
type: 'string',
|
|
231
231
|
enum: ['true', 'false', 'inherit'],
|
|
232
232
|
enumDescriptions: [
|
|
233
|
-
( localize(
|
|
234
|
-
( localize(
|
|
235
|
-
( localize(
|
|
233
|
+
( localize(10300, "Ignore leading and trailing whitespace.")),
|
|
234
|
+
( localize(10301, "Do not ignore leading and trailing whitespace.")),
|
|
235
|
+
( localize(10302, "Inherit from `diffEditor.ignoreTrimWhitespace`."))
|
|
236
236
|
],
|
|
237
237
|
description: ( localize(
|
|
238
|
-
|
|
238
|
+
10303,
|
|
239
239
|
"Controls whether leading and trailing whitespace is ignored in Source Control diff gutter decorations."
|
|
240
240
|
)),
|
|
241
241
|
default: 'false'
|
|
@@ -243,7 +243,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
243
243
|
'scm.alwaysShowActions': {
|
|
244
244
|
type: 'boolean',
|
|
245
245
|
description: ( localize(
|
|
246
|
-
|
|
246
|
+
10304,
|
|
247
247
|
"Controls whether inline actions are always visible in the Source Control view."
|
|
248
248
|
)),
|
|
249
249
|
default: false
|
|
@@ -252,12 +252,12 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
252
252
|
type: 'string',
|
|
253
253
|
enum: ['all', 'focused', 'off'],
|
|
254
254
|
enumDescriptions: [
|
|
255
|
-
( localize(
|
|
256
|
-
( localize(
|
|
257
|
-
( localize(
|
|
255
|
+
( localize(10305, "Show the sum of all Source Control Provider count badges.")),
|
|
256
|
+
( localize(10306, "Show the count badge of the focused Source Control Provider.")),
|
|
257
|
+
( localize(10307, "Disable the Source Control count badge."))
|
|
258
258
|
],
|
|
259
259
|
description: ( localize(
|
|
260
|
-
|
|
260
|
+
10308,
|
|
261
261
|
"Controls the count badge on the Source Control icon on the Activity Bar."
|
|
262
262
|
)),
|
|
263
263
|
default: 'all'
|
|
@@ -266,12 +266,12 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
266
266
|
type: 'string',
|
|
267
267
|
enum: ['hidden', 'auto', 'visible'],
|
|
268
268
|
enumDescriptions: [
|
|
269
|
-
( localize(
|
|
270
|
-
( localize(
|
|
271
|
-
( localize(
|
|
269
|
+
( localize(10309, "Hide Source Control Provider count badges.")),
|
|
270
|
+
( localize(10310, "Only show count badge for Source Control Provider when non-zero.")),
|
|
271
|
+
( localize(10311, "Show Source Control Provider count badges."))
|
|
272
272
|
],
|
|
273
273
|
markdownDescription: ( localize(
|
|
274
|
-
|
|
274
|
+
10312,
|
|
275
275
|
"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.",
|
|
276
276
|
'\`#scm.alwaysShowRepositories#\`'
|
|
277
277
|
)),
|
|
@@ -281,22 +281,22 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
281
281
|
type: 'string',
|
|
282
282
|
enum: ['tree', 'list'],
|
|
283
283
|
enumDescriptions: [
|
|
284
|
-
( localize(
|
|
285
|
-
( localize(
|
|
284
|
+
( localize(10313, "Show the repository changes as a tree.")),
|
|
285
|
+
( localize(10314, "Show the repository changes as a list."))
|
|
286
286
|
],
|
|
287
|
-
description: ( localize(
|
|
287
|
+
description: ( localize(10315, "Controls the default Source Control repository view mode.")),
|
|
288
288
|
default: 'list'
|
|
289
289
|
},
|
|
290
290
|
'scm.defaultViewSortKey': {
|
|
291
291
|
type: 'string',
|
|
292
292
|
enum: ['name', 'path', 'status'],
|
|
293
293
|
enumDescriptions: [
|
|
294
|
-
( localize(
|
|
295
|
-
( localize(
|
|
296
|
-
( localize(
|
|
294
|
+
( localize(10316, "Sort the repository changes by file name.")),
|
|
295
|
+
( localize(10317, "Sort the repository changes by path.")),
|
|
296
|
+
( localize(10318, "Sort the repository changes by Source Control status."))
|
|
297
297
|
],
|
|
298
298
|
description: ( localize(
|
|
299
|
-
|
|
299
|
+
10319,
|
|
300
300
|
"Controls the default Source Control repository changes sort order when viewed as a list."
|
|
301
301
|
)),
|
|
302
302
|
default: 'path'
|
|
@@ -304,7 +304,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
304
304
|
'scm.autoReveal': {
|
|
305
305
|
type: 'boolean',
|
|
306
306
|
description: ( localize(
|
|
307
|
-
|
|
307
|
+
10320,
|
|
308
308
|
"Controls whether the Source Control view should automatically reveal and select files when opening them."
|
|
309
309
|
)),
|
|
310
310
|
default: true
|
|
@@ -312,20 +312,20 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
312
312
|
'scm.inputFontFamily': {
|
|
313
313
|
type: 'string',
|
|
314
314
|
markdownDescription: ( localize(
|
|
315
|
-
|
|
315
|
+
10321,
|
|
316
316
|
"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."
|
|
317
317
|
)),
|
|
318
318
|
default: 'default'
|
|
319
319
|
},
|
|
320
320
|
'scm.inputFontSize': {
|
|
321
321
|
type: 'number',
|
|
322
|
-
markdownDescription: ( localize(
|
|
322
|
+
markdownDescription: ( localize(10322, "Controls the font size for the input message in pixels.")),
|
|
323
323
|
default: 13
|
|
324
324
|
},
|
|
325
325
|
'scm.inputMaxLineCount': {
|
|
326
326
|
type: 'number',
|
|
327
327
|
markdownDescription: ( localize(
|
|
328
|
-
|
|
328
|
+
10323,
|
|
329
329
|
"Controls the maximum number of lines that the input will auto-grow to."
|
|
330
330
|
)),
|
|
331
331
|
minimum: 1,
|
|
@@ -335,7 +335,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
335
335
|
'scm.inputMinLineCount': {
|
|
336
336
|
type: 'number',
|
|
337
337
|
markdownDescription: ( localize(
|
|
338
|
-
|
|
338
|
+
10324,
|
|
339
339
|
"Controls the minimum number of lines that the input will auto-grow from."
|
|
340
340
|
)),
|
|
341
341
|
minimum: 1,
|
|
@@ -345,7 +345,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
345
345
|
'scm.alwaysShowRepositories': {
|
|
346
346
|
type: 'boolean',
|
|
347
347
|
markdownDescription: ( localize(
|
|
348
|
-
|
|
348
|
+
10325,
|
|
349
349
|
"Controls whether repositories should always be visible in the Source Control view."
|
|
350
350
|
)),
|
|
351
351
|
default: false
|
|
@@ -355,20 +355,20 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
355
355
|
enum: ['discovery time', 'name', 'path'],
|
|
356
356
|
enumDescriptions: [
|
|
357
357
|
( localize(
|
|
358
|
-
|
|
358
|
+
10326,
|
|
359
359
|
"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."
|
|
360
360
|
)),
|
|
361
361
|
( localize(
|
|
362
|
-
|
|
362
|
+
10327,
|
|
363
363
|
"Repositories in the Source Control Repositories and Source Control views are sorted by repository name."
|
|
364
364
|
)),
|
|
365
365
|
( localize(
|
|
366
|
-
|
|
366
|
+
10328,
|
|
367
367
|
"Repositories in the Source Control Repositories and Source Control views are sorted by repository path."
|
|
368
368
|
))
|
|
369
369
|
],
|
|
370
370
|
description: ( localize(
|
|
371
|
-
|
|
371
|
+
10329,
|
|
372
372
|
"Controls the sort order of the repositories in the source control repositories view."
|
|
373
373
|
)),
|
|
374
374
|
default: 'discovery time'
|
|
@@ -376,15 +376,39 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
376
376
|
'scm.repositories.visible': {
|
|
377
377
|
type: 'number',
|
|
378
378
|
description: ( localize(
|
|
379
|
-
|
|
379
|
+
10330,
|
|
380
380
|
"Controls how many repositories are visible in the Source Control Repositories section. Set to 0, to be able to manually resize the view."
|
|
381
381
|
)),
|
|
382
382
|
default: 10
|
|
383
383
|
},
|
|
384
|
+
'scm.repositories.selectionMode': {
|
|
385
|
+
type: 'string',
|
|
386
|
+
enum: ['multiple', 'single'],
|
|
387
|
+
enumDescriptions: [
|
|
388
|
+
( localize(10331, "Multiple repositories can be selected at the same time.")),
|
|
389
|
+
( localize(10332, "Only one repository can be selected at a time."))
|
|
390
|
+
],
|
|
391
|
+
description: ( localize(
|
|
392
|
+
10333,
|
|
393
|
+
"Controls the selection mode of the repositories in the Source Control Repositories view."
|
|
394
|
+
)),
|
|
395
|
+
default: 'multiple'
|
|
396
|
+
},
|
|
397
|
+
'scm.repositories.explorer': {
|
|
398
|
+
type: 'boolean',
|
|
399
|
+
markdownDescription: ( localize(
|
|
400
|
+
10334,
|
|
401
|
+
"Controls whether to show repository artifacts in the Source Control Repositories view. This feature is experimental and only works when {0} is set to `{1}`.",
|
|
402
|
+
'\`#scm.repositories.selectionMode#\`',
|
|
403
|
+
'single'
|
|
404
|
+
)),
|
|
405
|
+
default: false,
|
|
406
|
+
tags: ['experimental']
|
|
407
|
+
},
|
|
384
408
|
'scm.showActionButton': {
|
|
385
409
|
type: 'boolean',
|
|
386
410
|
markdownDescription: ( localize(
|
|
387
|
-
|
|
411
|
+
10335,
|
|
388
412
|
"Controls whether an action button can be shown in the Source Control view."
|
|
389
413
|
)),
|
|
390
414
|
default: true
|
|
@@ -392,7 +416,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
392
416
|
'scm.showInputActionButton': {
|
|
393
417
|
type: 'boolean',
|
|
394
418
|
markdownDescription: ( localize(
|
|
395
|
-
|
|
419
|
+
10336,
|
|
396
420
|
"Controls whether an action button can be shown in the Source Control input."
|
|
397
421
|
)),
|
|
398
422
|
default: true
|
|
@@ -400,7 +424,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
400
424
|
'scm.workingSets.enabled': {
|
|
401
425
|
type: 'boolean',
|
|
402
426
|
description: ( localize(
|
|
403
|
-
|
|
427
|
+
10337,
|
|
404
428
|
"Controls whether to store editor working sets when switching between source control history item groups."
|
|
405
429
|
)),
|
|
406
430
|
default: false
|
|
@@ -410,16 +434,16 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
410
434
|
enum: ['empty', 'current'],
|
|
411
435
|
enumDescriptions: [
|
|
412
436
|
( localize(
|
|
413
|
-
|
|
437
|
+
10338,
|
|
414
438
|
"Use an empty working set when switching to a source control history item group that does not have a working set."
|
|
415
439
|
)),
|
|
416
440
|
( localize(
|
|
417
|
-
|
|
441
|
+
10339,
|
|
418
442
|
"Use the current working set when switching to a source control history item group that does not have a working set."
|
|
419
443
|
))
|
|
420
444
|
],
|
|
421
445
|
description: ( localize(
|
|
422
|
-
|
|
446
|
+
10340,
|
|
423
447
|
"Controls the default working set to use when switching to a source control history item group that does not have a working set."
|
|
424
448
|
)),
|
|
425
449
|
default: 'current'
|
|
@@ -427,7 +451,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
427
451
|
'scm.compactFolders': {
|
|
428
452
|
type: 'boolean',
|
|
429
453
|
description: ( localize(
|
|
430
|
-
|
|
454
|
+
10341,
|
|
431
455
|
"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."
|
|
432
456
|
)),
|
|
433
457
|
default: true
|
|
@@ -435,7 +459,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
435
459
|
'scm.graph.pageOnScroll': {
|
|
436
460
|
type: 'boolean',
|
|
437
461
|
description: ( localize(
|
|
438
|
-
|
|
462
|
+
10342,
|
|
439
463
|
"Controls whether the Source Control Graph view will load the next page of items when you scroll to the end of the list."
|
|
440
464
|
)),
|
|
441
465
|
default: true
|
|
@@ -443,7 +467,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
443
467
|
'scm.graph.pageSize': {
|
|
444
468
|
type: 'number',
|
|
445
469
|
description: ( localize(
|
|
446
|
-
|
|
470
|
+
10343,
|
|
447
471
|
"The number of items to show in the Source Control Graph view by default and when loading more items."
|
|
448
472
|
)),
|
|
449
473
|
minimum: 1,
|
|
@@ -455,25 +479,41 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
|
|
|
455
479
|
enum: ['all', 'filter'],
|
|
456
480
|
enumDescriptions: [
|
|
457
481
|
( localize(
|
|
458
|
-
|
|
482
|
+
10344,
|
|
459
483
|
"Show badges of all history item groups in the Source Control Graph view."
|
|
460
484
|
)),
|
|
461
485
|
( localize(
|
|
462
|
-
|
|
486
|
+
10345,
|
|
463
487
|
"Show only the badges of history item groups used as a filter in the Source Control Graph view."
|
|
464
488
|
))
|
|
465
489
|
],
|
|
466
490
|
description: ( localize(
|
|
467
|
-
|
|
491
|
+
10346,
|
|
468
492
|
"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."
|
|
469
493
|
)),
|
|
470
494
|
default: 'filter'
|
|
495
|
+
},
|
|
496
|
+
'scm.graph.showIncomingChanges': {
|
|
497
|
+
type: 'boolean',
|
|
498
|
+
description: ( localize(
|
|
499
|
+
10347,
|
|
500
|
+
"Controls whether to show incoming changes in the Source Control Graph view."
|
|
501
|
+
)),
|
|
502
|
+
default: true
|
|
503
|
+
},
|
|
504
|
+
'scm.graph.showOutgoingChanges': {
|
|
505
|
+
type: 'boolean',
|
|
506
|
+
description: ( localize(
|
|
507
|
+
10348,
|
|
508
|
+
"Controls whether to show outgoing changes in the Source Control Graph view."
|
|
509
|
+
)),
|
|
510
|
+
default: true
|
|
471
511
|
}
|
|
472
512
|
}
|
|
473
513
|
});
|
|
474
514
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
475
515
|
id: 'scm.acceptInput',
|
|
476
|
-
metadata: { description: ( localize(
|
|
516
|
+
metadata: { description: ( localize(10349, "Source Control: Accept Input")), args: [] },
|
|
477
517
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
478
518
|
when: ( ContextKeyExpr.has('scmRepository')),
|
|
479
519
|
primary: KeyMod.CtrlCmd | KeyCode.Enter,
|
|
@@ -510,7 +550,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
510
550
|
}
|
|
511
551
|
});
|
|
512
552
|
const viewNextCommitCommand = {
|
|
513
|
-
description: { description: ( localize(
|
|
553
|
+
description: { description: ( localize(10350, "Source Control: View Next Commit")), args: [] },
|
|
514
554
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
515
555
|
handler: (accessor) => {
|
|
516
556
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
@@ -522,7 +562,7 @@ const viewNextCommitCommand = {
|
|
|
522
562
|
}
|
|
523
563
|
};
|
|
524
564
|
const viewPreviousCommitCommand = {
|
|
525
|
-
description: { description: ( localize(
|
|
565
|
+
description: { description: ( localize(10351, "Source Control: View Previous Commit")), args: [] },
|
|
526
566
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
527
567
|
handler: (accessor) => {
|
|
528
568
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
@@ -590,11 +630,8 @@ CommandsRegistry.registerCommand('scm.openInTerminal', async (accessor, provider
|
|
|
590
630
|
CommandsRegistry.registerCommand('scm.setActiveProvider', async (accessor) => {
|
|
591
631
|
const instantiationService = accessor.get(IInstantiationService);
|
|
592
632
|
const scmViewService = accessor.get(ISCMViewService);
|
|
593
|
-
const placeHolder = ( localize(
|
|
594
|
-
const autoQuickItemDescription = ( localize(
|
|
595
|
-
10081,
|
|
596
|
-
"The active repository is updated based on focused repository/active editor"
|
|
597
|
-
));
|
|
633
|
+
const placeHolder = ( localize(10352, "Select the active repository, type to filter all repositories"));
|
|
634
|
+
const autoQuickItemDescription = ( localize(10353, "The active repository is updated based on active editor"));
|
|
598
635
|
const repositoryPicker = instantiationService.createInstance(RepositoryPicker, placeHolder, autoQuickItemDescription);
|
|
599
636
|
const result = await repositoryPicker.pickRepository();
|
|
600
637
|
if (result?.repository) {
|
|
@@ -606,7 +643,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
|
|
|
606
643
|
group: '99_terminal',
|
|
607
644
|
command: {
|
|
608
645
|
id: 'scm.openInTerminal',
|
|
609
|
-
title: ( localize(
|
|
646
|
+
title: ( localize(10354, "Open in External Terminal"))
|
|
610
647
|
},
|
|
611
648
|
when: ( ContextKeyExpr.and(( RemoteNameContext.isEqualTo('')), ( ContextKeyExpr.equals('scmProviderHasRootUri', true)), ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'external')), ( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both'))))))
|
|
612
649
|
});
|
|
@@ -614,7 +651,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
|
|
|
614
651
|
group: '99_terminal',
|
|
615
652
|
command: {
|
|
616
653
|
id: 'scm.openInIntegratedTerminal',
|
|
617
|
-
title: ( localize(
|
|
654
|
+
title: ( localize(10355, "Open in Integrated Terminal"))
|
|
618
655
|
},
|
|
619
656
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('scmProviderHasRootUri', true)), ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'integrated')), ( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both'))))))
|
|
620
657
|
});
|
|
@@ -665,7 +702,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
665
702
|
}
|
|
666
703
|
});
|
|
667
704
|
MenuRegistry.appendMenuItem(MenuId.EditorLineNumberContext, {
|
|
668
|
-
title: ( localize(
|
|
705
|
+
title: ( localize(10356, "Diff Decorations")),
|
|
669
706
|
submenu: MenuId.SCMQuickDiffDecorations,
|
|
670
707
|
when: ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.scm.diffDecorations', 'all')), ( ContextKeyExpr.equals('config.scm.diffDecorations', 'gutter')))),
|
|
671
708
|
group: '9_quickDiffDecorations'
|
|
@@ -674,7 +711,7 @@ registerAction2(class extends Action2 {
|
|
|
674
711
|
constructor() {
|
|
675
712
|
super({
|
|
676
713
|
id: 'scm.editor.triggerSetup',
|
|
677
|
-
title: ( localize(
|
|
714
|
+
title: ( localize(10357, "Resolve Conflicts with AI")),
|
|
678
715
|
icon: Codicon.chatSparkle,
|
|
679
716
|
f1: false,
|
|
680
717
|
menu: {
|