@codingame/monaco-vscode-scm-service-override 20.4.1 → 21.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 +14 -13
- package/vscode/src/vs/workbench/contrib/scm/browser/activity.js +7 -8
- package/vscode/src/vs/workbench/contrib/scm/browser/media/scm.css +8 -0
- package/vscode/src/vs/workbench/contrib/scm/browser/menus.js +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffDecorator.js +3 -3
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffModel.js +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffWidget.js +13 -13
- package/vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js +81 -81
- package/vscode/src/vs/workbench/contrib/scm/browser/scmAccessibilityHelp.js +23 -23
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.js +28 -28
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.js +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js +32 -35
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.js +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.js +10 -4
|
@@ -31,7 +31,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/misc
|
|
|
31
31
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
|
|
32
32
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
|
|
33
33
|
import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
|
|
34
|
-
import { ViewAction, ViewPane, ViewPaneShowActions } from '@codingame/monaco-vscode-
|
|
34
|
+
import { ViewAction, ViewPane, ViewPaneShowActions } from '@codingame/monaco-vscode-4fad3647-b95d-5c19-bab1-bb9de627a5ec-common/vscode/vs/workbench/browser/parts/views/viewPane';
|
|
35
35
|
import { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
|
|
36
36
|
import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
|
|
37
37
|
import { renderSCMHistoryItemGraph, historyItemHoverDefaultLabelBackground, historyItemHoverLabelForeground, SWIMLANE_WIDTH, renderSCMHistoryGraphPlaceholder, getHistoryItemIndex, toISCMHistoryItemViewModelArray } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/scm/browser/scmHistory';
|
|
@@ -65,7 +65,7 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
|
|
|
65
65
|
import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
|
|
66
66
|
import { groupBy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/collections';
|
|
67
67
|
import { getActionBarActions, getFlatContextMenuActions } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
|
|
68
|
-
import { ResourceLabels } from '@codingame/monaco-vscode-
|
|
68
|
+
import { ResourceLabels } from '@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common/vscode/vs/workbench/browser/labels';
|
|
69
69
|
import { FileKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
|
|
70
70
|
import { WorkbenchToolBar } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
|
|
71
71
|
import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
|
|
@@ -78,13 +78,13 @@ import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/l
|
|
|
78
78
|
import { CodeDataTransfers } from '@codingame/monaco-vscode-api/vscode/vs/platform/dnd/browser/dnd';
|
|
79
79
|
import { autorun, autorunWithStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
|
|
80
80
|
import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
|
|
81
|
+
import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
|
|
81
82
|
import { waitForState } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/utilsCancellation';
|
|
83
|
+
import { runOnChange } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/runOnChange';
|
|
82
84
|
import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
|
|
83
85
|
import { observableSignal } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignal';
|
|
84
86
|
import { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
|
|
85
87
|
import { latestChangedValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/experimental/utils';
|
|
86
|
-
import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
|
|
87
|
-
import { runOnChange } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/runOnChange';
|
|
88
88
|
|
|
89
89
|
var HistoryItemRenderer_1, HistoryItemChangeRenderer_1, HistoryItemLoadMoreRenderer_1;
|
|
90
90
|
registerCss(scm);
|
|
@@ -125,23 +125,23 @@ class SCMHistoryItemRefsActionViewItem extends ActionViewItem {
|
|
|
125
125
|
icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.gitBranch));
|
|
126
126
|
const name = $('.name');
|
|
127
127
|
if (this._historyItemsFilter === 'all') {
|
|
128
|
-
name.textContent = ( localize(
|
|
128
|
+
name.textContent = ( localize(10030, "All"));
|
|
129
129
|
}
|
|
130
130
|
else if (this._historyItemsFilter === 'auto') {
|
|
131
|
-
name.textContent = ( localize(
|
|
131
|
+
name.textContent = ( localize(10031, "Auto"));
|
|
132
132
|
}
|
|
133
133
|
else if (this._historyItemsFilter.length === 1) {
|
|
134
134
|
name.textContent = this._historyItemsFilter[0].name;
|
|
135
135
|
}
|
|
136
136
|
else {
|
|
137
|
-
name.textContent = ( localize(
|
|
137
|
+
name.textContent = ( localize(10032, "{0} Items", this._historyItemsFilter.length));
|
|
138
138
|
}
|
|
139
139
|
reset(this.label, icon, name);
|
|
140
140
|
}
|
|
141
141
|
}
|
|
142
142
|
getTooltip() {
|
|
143
143
|
if (this._historyItemsFilter === 'all') {
|
|
144
|
-
return localize(
|
|
144
|
+
return localize(10033, "All history item references");
|
|
145
145
|
}
|
|
146
146
|
else if (this._historyItemsFilter === 'auto') {
|
|
147
147
|
const historyProvider = this._repository.provider.historyProvider.get();
|
|
@@ -163,7 +163,7 @@ registerAction2(class extends ViewAction {
|
|
|
163
163
|
constructor() {
|
|
164
164
|
super({
|
|
165
165
|
id: PICK_REPOSITORY_ACTION_ID,
|
|
166
|
-
title: ( localize(
|
|
166
|
+
title: ( localize(10034, "Repository Picker")),
|
|
167
167
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
168
168
|
f1: false,
|
|
169
169
|
menu: {
|
|
@@ -182,7 +182,7 @@ registerAction2(class extends ViewAction {
|
|
|
182
182
|
constructor() {
|
|
183
183
|
super({
|
|
184
184
|
id: PICK_HISTORY_ITEM_REFS_ACTION_ID,
|
|
185
|
-
title: ( localize(
|
|
185
|
+
title: ( localize(10035, "History Item Reference Picker")),
|
|
186
186
|
icon: Codicon.gitBranch,
|
|
187
187
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
188
188
|
precondition: ( ContextKeys.SCMHistoryItemCount.notEqualsTo(0)),
|
|
@@ -202,7 +202,7 @@ registerAction2(class extends ViewAction {
|
|
|
202
202
|
constructor() {
|
|
203
203
|
super({
|
|
204
204
|
id: 'workbench.scm.action.graph.revealCurrentHistoryItem',
|
|
205
|
-
title: ( localize(
|
|
205
|
+
title: ( localize(10036, "Go to Current History Item")),
|
|
206
206
|
icon: Codicon.target,
|
|
207
207
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
208
208
|
precondition: ( ContextKeyExpr.and(( ContextKeys.SCMHistoryItemCount.notEqualsTo(0)), ( ContextKeys.SCMCurrentHistoryItemRefInFilter.isEqualTo(true)))),
|
|
@@ -222,7 +222,7 @@ registerAction2(class extends ViewAction {
|
|
|
222
222
|
constructor() {
|
|
223
223
|
super({
|
|
224
224
|
id: 'workbench.scm.action.graph.refresh',
|
|
225
|
-
title: ( localize(
|
|
225
|
+
title: ( localize(10037, "Refresh")),
|
|
226
226
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
227
227
|
f1: false,
|
|
228
228
|
icon: Codicon.refresh,
|
|
@@ -241,7 +241,7 @@ registerAction2(class extends ViewAction {
|
|
|
241
241
|
constructor() {
|
|
242
242
|
super({
|
|
243
243
|
id: 'workbench.scm.action.graph.setListViewMode',
|
|
244
|
-
title: ( localize(
|
|
244
|
+
title: ( localize(10038, "View as List")),
|
|
245
245
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
246
246
|
toggled: ( ContextKeys.SCMHistoryViewMode.isEqualTo(ViewMode.List)),
|
|
247
247
|
menu: { id: MenuId.SCMHistoryTitle, group: '9_viewmode', order: 1 },
|
|
@@ -256,7 +256,7 @@ registerAction2(class extends ViewAction {
|
|
|
256
256
|
constructor() {
|
|
257
257
|
super({
|
|
258
258
|
id: 'workbench.scm.action.graph.setTreeViewMode',
|
|
259
|
-
title: ( localize(
|
|
259
|
+
title: ( localize(10039, "View as Tree")),
|
|
260
260
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
261
261
|
toggled: ( ContextKeys.SCMHistoryViewMode.isEqualTo(ViewMode.Tree)),
|
|
262
262
|
menu: { id: MenuId.SCMHistoryTitle, group: '9_viewmode', order: 2 },
|
|
@@ -271,7 +271,7 @@ registerAction2(class extends Action2 {
|
|
|
271
271
|
constructor() {
|
|
272
272
|
super({
|
|
273
273
|
id: 'workbench.scm.action.graph.viewChanges',
|
|
274
|
-
title: ( localize(
|
|
274
|
+
title: ( localize(10040, "Open Changes")),
|
|
275
275
|
icon: Codicon.diffMultiple,
|
|
276
276
|
f1: false,
|
|
277
277
|
menu: [
|
|
@@ -307,7 +307,7 @@ registerAction2(class extends Action2 {
|
|
|
307
307
|
const title = historyItems.length === 1 ?
|
|
308
308
|
getHistoryItemEditorTitle(historyItem) :
|
|
309
309
|
( localize(
|
|
310
|
-
|
|
310
|
+
10041,
|
|
311
311
|
"All Changes ({0} ↔ {1})",
|
|
312
312
|
historyItemLast.displayId ?? historyItemLast.id,
|
|
313
313
|
historyItem.displayId ?? historyItem.id
|
|
@@ -320,7 +320,7 @@ registerAction2(class extends Action2 {
|
|
|
320
320
|
constructor() {
|
|
321
321
|
super({
|
|
322
322
|
id: 'workbench.scm.action.graph.openFile',
|
|
323
|
-
title: ( localize(
|
|
323
|
+
title: ( localize(10042, "Open File")),
|
|
324
324
|
icon: Codicon.goToFile,
|
|
325
325
|
f1: false,
|
|
326
326
|
menu: [
|
|
@@ -654,7 +654,7 @@ let HistoryItemLoadMoreRenderer = class HistoryItemLoadMoreRenderer {
|
|
|
654
654
|
templateData.elementDisposables.add(autorun(reader => {
|
|
655
655
|
const isLoadingMore = this._isLoadingMore.read(reader);
|
|
656
656
|
const icon = `$(${isLoadingMore ? 'loading~spin' : 'fold-down'})`;
|
|
657
|
-
templateData.historyItemPlaceholderLabel.setLabel(( localize(
|
|
657
|
+
templateData.historyItemPlaceholderLabel.setLabel(( localize(10043, "{0} Load More...", icon)));
|
|
658
658
|
}));
|
|
659
659
|
}
|
|
660
660
|
}
|
|
@@ -714,7 +714,7 @@ SCMHistoryViewPaneActionRunner = ( __decorate([
|
|
|
714
714
|
], SCMHistoryViewPaneActionRunner));
|
|
715
715
|
class SCMHistoryTreeAccessibilityProvider {
|
|
716
716
|
getWidgetAriaLabel() {
|
|
717
|
-
return localize(
|
|
717
|
+
return localize(10044, "Source Control History");
|
|
718
718
|
}
|
|
719
719
|
getAriaLabel(element) {
|
|
720
720
|
if (isSCMRepository(element)) {
|
|
@@ -1157,8 +1157,8 @@ let RepositoryPicker = class RepositoryPicker {
|
|
|
1157
1157
|
this._quickInputService = _quickInputService;
|
|
1158
1158
|
this._scmViewService = _scmViewService;
|
|
1159
1159
|
this._autoQuickPickItem = {
|
|
1160
|
-
label: ( localize(
|
|
1161
|
-
description: ( localize(
|
|
1160
|
+
label: ( localize(10031, "Auto")),
|
|
1161
|
+
description: ( localize(10045, "Show the source control graph for the active repository")),
|
|
1162
1162
|
repository: 'auto'
|
|
1163
1163
|
};
|
|
1164
1164
|
}
|
|
@@ -1176,7 +1176,7 @@ let RepositoryPicker = class RepositoryPicker {
|
|
|
1176
1176
|
repository: r
|
|
1177
1177
|
}))));
|
|
1178
1178
|
return this._quickInputService.pick(picks, {
|
|
1179
|
-
placeHolder: ( localize(
|
|
1179
|
+
placeHolder: ( localize(10046, "Select the repository to view, type to filter all repositories"))
|
|
1180
1180
|
});
|
|
1181
1181
|
}
|
|
1182
1182
|
};
|
|
@@ -1192,21 +1192,21 @@ let HistoryItemRefPicker = class HistoryItemRefPicker extends Disposable {
|
|
|
1192
1192
|
this._quickInputService = _quickInputService;
|
|
1193
1193
|
this._allQuickPickItem = {
|
|
1194
1194
|
id: 'all',
|
|
1195
|
-
label: ( localize(
|
|
1196
|
-
description: ( localize(
|
|
1195
|
+
label: ( localize(10030, "All")),
|
|
1196
|
+
description: ( localize(10033, "All history item references")),
|
|
1197
1197
|
historyItemRef: 'all'
|
|
1198
1198
|
};
|
|
1199
1199
|
this._autoQuickPickItem = {
|
|
1200
1200
|
id: 'auto',
|
|
1201
|
-
label: ( localize(
|
|
1202
|
-
description: ( localize(
|
|
1201
|
+
label: ( localize(10031, "Auto")),
|
|
1202
|
+
description: ( localize(10047, "Current history item reference(s)")),
|
|
1203
1203
|
historyItemRef: 'auto'
|
|
1204
1204
|
};
|
|
1205
1205
|
}
|
|
1206
1206
|
async pickHistoryItemRef() {
|
|
1207
1207
|
const quickPick = this._quickInputService.createQuickPick({ useSeparators: true });
|
|
1208
1208
|
this._store.add(quickPick);
|
|
1209
|
-
quickPick.placeholder = ( localize(
|
|
1209
|
+
quickPick.placeholder = ( localize(10048, "Select one/more history item references to view, type to filter"));
|
|
1210
1210
|
quickPick.canSelectMany = true;
|
|
1211
1211
|
quickPick.hideCheckAll = true;
|
|
1212
1212
|
quickPick.busy = true;
|
|
@@ -1336,7 +1336,7 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
|
|
|
1336
1336
|
container.appendChild(element.root);
|
|
1337
1337
|
this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), element.root, {
|
|
1338
1338
|
markdown: {
|
|
1339
|
-
value: ( localize(
|
|
1339
|
+
value: ( localize(10049, "Please refresh the graph using the refresh action ($(refresh)).")),
|
|
1340
1340
|
supportThemeIcons: true
|
|
1341
1341
|
},
|
|
1342
1342
|
markdownNotSupportedFallback: undefined
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ViewPane, IViewPaneOptions } from "@codingame/monaco-vscode-
|
|
1
|
+
import { ViewPane, IViewPaneOptions } from "@codingame/monaco-vscode-4fad3647-b95d-5c19-bab1-bb9de627a5ec-common/vscode/vs/workbench/browser/parts/views/viewPane";
|
|
2
2
|
import { ISCMViewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service";
|
|
3
3
|
import { ISCMService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service";
|
|
4
4
|
import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
|
|
@@ -3,7 +3,7 @@ import { registerCss } from '@codingame/monaco-vscode-api/css';
|
|
|
3
3
|
import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
|
|
4
4
|
import * as scm from './media/scm.css';
|
|
5
5
|
import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
|
|
6
|
-
import { ViewPane } from '@codingame/monaco-vscode-
|
|
6
|
+
import { ViewPane } from '@codingame/monaco-vscode-4fad3647-b95d-5c19-bab1-bb9de627a5ec-common/vscode/vs/workbench/browser/parts/views/viewPane';
|
|
7
7
|
import { append, $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
|
|
8
8
|
import { WorkbenchCompressibleAsyncDataTree } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService';
|
|
9
9
|
import { ISCMViewService, ISCMService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
|
|
@@ -157,7 +157,7 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
|
|
|
157
157
|
return r.provider.label;
|
|
158
158
|
},
|
|
159
159
|
getWidgetAriaLabel() {
|
|
160
|
-
return localize(
|
|
160
|
+
return localize(10050, "Source Control Repositories");
|
|
161
161
|
}
|
|
162
162
|
}
|
|
163
163
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
|
|
2
2
|
import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
|
|
3
|
-
import { ViewPane, IViewPaneOptions } from "@codingame/monaco-vscode-
|
|
3
|
+
import { ViewPane, IViewPaneOptions } from "@codingame/monaco-vscode-4fad3647-b95d-5c19-bab1-bb9de627a5ec-common/vscode/vs/workbench/browser/parts/views/viewPane";
|
|
4
4
|
import { ISCMResourceGroup, ISCMResource, ISCMRepository, ISCMInput, ISCMActionButton, ISCMActionButtonDescriptor, ViewMode } from "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm";
|
|
5
5
|
import { ISCMViewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service";
|
|
6
6
|
import { ISCMService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service";
|
|
@@ -5,12 +5,12 @@ import * as scm from './media/scm.css';
|
|
|
5
5
|
import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
|
|
6
6
|
import { basename, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
|
|
7
7
|
import { Disposable, DisposableStore, toDisposable, combinedDisposable, MutableDisposable, dispose, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
8
|
-
import { ViewAction, ViewPane } from '@codingame/monaco-vscode-
|
|
8
|
+
import { ViewAction, ViewPane } from '@codingame/monaco-vscode-4fad3647-b95d-5c19-bab1-bb9de627a5ec-common/vscode/vs/workbench/browser/parts/views/viewPane';
|
|
9
9
|
import { append, $, Dimension, trackFocus, isPointerEvent, isActiveElement, clearNode } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
|
|
10
10
|
import { asCSSUrl } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/cssValue';
|
|
11
11
|
import { ViewMode, VIEW_PANE_ID, ISCMRepositorySortKey, InputValidationType, SCMInputChangeReason } from '@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm';
|
|
12
12
|
import { ISCMViewService, ISCMService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
|
|
13
|
-
import { ResourceLabels } from '@codingame/monaco-vscode-
|
|
13
|
+
import { ResourceLabels } from '@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common/vscode/vs/workbench/browser/labels';
|
|
14
14
|
import { CountBadge } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/countBadge/countBadge';
|
|
15
15
|
import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
16
16
|
import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
|
|
@@ -40,7 +40,7 @@ import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode
|
|
|
40
40
|
import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
|
|
41
41
|
import { EditorResourceAccessor, SideBySideEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
|
|
42
42
|
import { CodeEditorWidget } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
|
|
43
|
-
import { getSimpleEditorOptions, setupSimpleEditorSelectionStyling } from '@codingame/monaco-vscode-
|
|
43
|
+
import { getSimpleEditorOptions, setupSimpleEditorSelectionStyling } from '@codingame/monaco-vscode-e39a1c8f-7892-5d9b-9987-7b10b79e1a0a-common/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
|
|
44
44
|
import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
|
|
45
45
|
import { EditorExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
|
|
46
46
|
import { MenuPreventer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/browser/menuPreventer';
|
|
@@ -78,7 +78,7 @@ import { defaultCountBadgeStyles, defaultButtonStyles } from '@codingame/monaco-
|
|
|
78
78
|
import { InlineCompletionsController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
|
|
79
79
|
import { CodeActionController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/codeAction/browser/codeActionController';
|
|
80
80
|
import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
|
|
81
|
-
import { fillEditorsDragData } from '@codingame/monaco-vscode-
|
|
81
|
+
import { fillEditorsDragData } from '@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common/vscode/vs/workbench/browser/dnd';
|
|
82
82
|
import { CodeDataTransfers } from '@codingame/monaco-vscode-api/vscode/vs/platform/dnd/browser/dnd';
|
|
83
83
|
import { FormatOnType } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/format/browser/formatActions';
|
|
84
84
|
import { EditorOptions, EditorOption } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/editorOptions';
|
|
@@ -86,7 +86,7 @@ import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/plat
|
|
|
86
86
|
import { EditOperation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/editOperation';
|
|
87
87
|
import { WorkbenchToolBar, HiddenItemStrategy } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
|
|
88
88
|
import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
|
|
89
|
-
import { DropdownWithPrimaryActionViewItem } from '@codingame/monaco-vscode-
|
|
89
|
+
import { DropdownWithPrimaryActionViewItem } from '@codingame/monaco-vscode-09e9b2e8-42a8-5a68-864f-bfcdad0ca1df-common/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
|
|
90
90
|
import { clamp, rot } from '@codingame/monaco-vscode-api/vscode/vs/base/common/numbers';
|
|
91
91
|
import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
|
|
92
92
|
import { OpenScmGroupAction } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
|
|
@@ -760,7 +760,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
|
|
|
760
760
|
this.labelService = labelService;
|
|
761
761
|
}
|
|
762
762
|
getWidgetAriaLabel() {
|
|
763
|
-
return localize(
|
|
763
|
+
return localize(10051, "Source Control Management");
|
|
764
764
|
}
|
|
765
765
|
getAriaLabel(element) {
|
|
766
766
|
if (ResourceTree.isResourceNode(element)) {
|
|
@@ -772,17 +772,17 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
|
|
|
772
772
|
else if (isSCMInput(element)) {
|
|
773
773
|
const verbosity = this.configurationService.getValue(AccessibilityVerbositySettingId.SourceControl) === true;
|
|
774
774
|
if (!verbosity || !this.accessibilityService.isScreenReaderOptimized()) {
|
|
775
|
-
return localize(
|
|
775
|
+
return localize(10052, "Source Control Input");
|
|
776
776
|
}
|
|
777
777
|
const kbLabel = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
|
|
778
778
|
return kbLabel
|
|
779
779
|
? ( localize(
|
|
780
|
-
|
|
780
|
+
10053,
|
|
781
781
|
"Source Control Input, Use {0} to open Source Control Accessibility Help.",
|
|
782
782
|
kbLabel
|
|
783
783
|
))
|
|
784
784
|
: ( localize(
|
|
785
|
-
|
|
785
|
+
10054,
|
|
786
786
|
"Source Control Input, Run the Open Accessibility Help command for more information."
|
|
787
787
|
));
|
|
788
788
|
}
|
|
@@ -840,14 +840,14 @@ const ContextKeys = {
|
|
|
840
840
|
}
|
|
841
841
|
};
|
|
842
842
|
MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
|
|
843
|
-
title: ( localize(
|
|
843
|
+
title: ( localize(10055, "View & Sort")),
|
|
844
844
|
submenu: Menus.ViewSort,
|
|
845
845
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_PANE_ID)), ( ContextKeys.RepositoryCount.notEqualsTo(0)))),
|
|
846
846
|
group: '0_view&sort',
|
|
847
847
|
order: 1
|
|
848
848
|
});
|
|
849
849
|
MenuRegistry.appendMenuItem(Menus.ViewSort, {
|
|
850
|
-
title: ( localize(
|
|
850
|
+
title: ( localize(10056, "Repositories")),
|
|
851
851
|
submenu: Menus.Repositories,
|
|
852
852
|
when: ContextKeyExpr.greater(ContextKeys.RepositoryCount.key, 1),
|
|
853
853
|
group: '0_repositories'
|
|
@@ -937,7 +937,7 @@ class SetListViewModeAction extends ViewAction {
|
|
|
937
937
|
constructor(id = 'workbench.scm.action.setListViewMode', menu = {}) {
|
|
938
938
|
super({
|
|
939
939
|
id,
|
|
940
|
-
title: ( localize(
|
|
940
|
+
title: ( localize(10057, "View as List")),
|
|
941
941
|
viewId: VIEW_PANE_ID,
|
|
942
942
|
f1: false,
|
|
943
943
|
icon: Codicon.listTree,
|
|
@@ -963,7 +963,7 @@ class SetTreeViewModeAction extends ViewAction {
|
|
|
963
963
|
constructor(id = 'workbench.scm.action.setTreeViewMode', menu = {}) {
|
|
964
964
|
super({
|
|
965
965
|
id,
|
|
966
|
-
title: ( localize(
|
|
966
|
+
title: ( localize(10058, "View as Tree")),
|
|
967
967
|
viewId: VIEW_PANE_ID,
|
|
968
968
|
f1: false,
|
|
969
969
|
icon: Codicon.listFlat,
|
|
@@ -1016,17 +1016,17 @@ class RepositorySortAction extends ViewAction {
|
|
|
1016
1016
|
}
|
|
1017
1017
|
class RepositorySortByDiscoveryTimeAction extends RepositorySortAction {
|
|
1018
1018
|
constructor() {
|
|
1019
|
-
super(ISCMRepositorySortKey.DiscoveryTime, ( localize(
|
|
1019
|
+
super(ISCMRepositorySortKey.DiscoveryTime, ( localize(10059, "Sort by Discovery Time")));
|
|
1020
1020
|
}
|
|
1021
1021
|
}
|
|
1022
1022
|
class RepositorySortByNameAction extends RepositorySortAction {
|
|
1023
1023
|
constructor() {
|
|
1024
|
-
super(ISCMRepositorySortKey.Name, ( localize(
|
|
1024
|
+
super(ISCMRepositorySortKey.Name, ( localize(10060, "Sort by Name")));
|
|
1025
1025
|
}
|
|
1026
1026
|
}
|
|
1027
1027
|
class RepositorySortByPathAction extends RepositorySortAction {
|
|
1028
1028
|
constructor() {
|
|
1029
|
-
super(ISCMRepositorySortKey.Path, ( localize(
|
|
1029
|
+
super(ISCMRepositorySortKey.Path, ( localize(10061, "Sort by Path")));
|
|
1030
1030
|
}
|
|
1031
1031
|
}
|
|
1032
1032
|
registerAction2(RepositorySortByDiscoveryTimeAction);
|
|
@@ -1051,17 +1051,17 @@ class SetSortKeyAction extends ViewAction {
|
|
|
1051
1051
|
}
|
|
1052
1052
|
class SetSortByNameAction extends SetSortKeyAction {
|
|
1053
1053
|
constructor() {
|
|
1054
|
-
super(ViewSortKey.Name, ( localize(
|
|
1054
|
+
super(ViewSortKey.Name, ( localize(10062, "Sort Changes by Name")));
|
|
1055
1055
|
}
|
|
1056
1056
|
}
|
|
1057
1057
|
class SetSortByPathAction extends SetSortKeyAction {
|
|
1058
1058
|
constructor() {
|
|
1059
|
-
super(ViewSortKey.Path, ( localize(
|
|
1059
|
+
super(ViewSortKey.Path, ( localize(10063, "Sort Changes by Path")));
|
|
1060
1060
|
}
|
|
1061
1061
|
}
|
|
1062
1062
|
class SetSortByStatusAction extends SetSortKeyAction {
|
|
1063
1063
|
constructor() {
|
|
1064
|
-
super(ViewSortKey.Status, ( localize(
|
|
1064
|
+
super(ViewSortKey.Status, ( localize(10064, "Sort Changes by Status")));
|
|
1065
1065
|
}
|
|
1066
1066
|
}
|
|
1067
1067
|
registerAction2(SetSortByNameAction);
|
|
@@ -1071,7 +1071,7 @@ class CollapseAllRepositoriesAction extends ViewAction {
|
|
|
1071
1071
|
constructor() {
|
|
1072
1072
|
super({
|
|
1073
1073
|
id: `workbench.scm.action.collapseAllRepositories`,
|
|
1074
|
-
title: ( localize(
|
|
1074
|
+
title: ( localize(10065, "Collapse All Repositories")),
|
|
1075
1075
|
viewId: VIEW_PANE_ID,
|
|
1076
1076
|
f1: false,
|
|
1077
1077
|
icon: Codicon.collapseAll,
|
|
@@ -1090,7 +1090,7 @@ class ExpandAllRepositoriesAction extends ViewAction {
|
|
|
1090
1090
|
constructor() {
|
|
1091
1091
|
super({
|
|
1092
1092
|
id: `workbench.scm.action.expandAllRepositories`,
|
|
1093
|
-
title: ( localize(
|
|
1093
|
+
title: ( localize(10066, "Expand All Repositories")),
|
|
1094
1094
|
viewId: VIEW_PANE_ID,
|
|
1095
1095
|
f1: false,
|
|
1096
1096
|
icon: Codicon.expandAll,
|
|
@@ -1120,7 +1120,7 @@ registerAction2(class extends Action2 {
|
|
|
1120
1120
|
constructor() {
|
|
1121
1121
|
super({
|
|
1122
1122
|
id: SCMInputWidgetCommandId.SetupAction,
|
|
1123
|
-
title: ( localize(
|
|
1123
|
+
title: ( localize(10067, "Generate Commit Message")),
|
|
1124
1124
|
icon: Codicon.sparkle,
|
|
1125
1125
|
f1: false,
|
|
1126
1126
|
menu: {
|
|
@@ -1197,10 +1197,10 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
|
|
|
1197
1197
|
this._onDidChange = ( new Emitter());
|
|
1198
1198
|
this.onDidChange = this._onDidChange.event;
|
|
1199
1199
|
this._disposables = this._register(( new MutableDisposable()));
|
|
1200
|
-
this._dropdownAction = ( new Action('scmInputMoreActions', ( localize(
|
|
1200
|
+
this._dropdownAction = ( new Action('scmInputMoreActions', ( localize(10068, "More Actions...")), 'codicon-chevron-down'));
|
|
1201
1201
|
this._cancelAction = ( new MenuItemAction({
|
|
1202
1202
|
id: SCMInputWidgetCommandId.CancelAction,
|
|
1203
|
-
title: ( localize(
|
|
1203
|
+
title: ( localize(10069, "Cancel")),
|
|
1204
1204
|
icon: Codicon.stopCircle,
|
|
1205
1205
|
}, undefined, undefined, undefined, undefined, contextKeyService, commandService));
|
|
1206
1206
|
}
|
|
@@ -1416,13 +1416,13 @@ let SCMInputWidget = class SCMInputWidget {
|
|
|
1416
1416
|
const kbLabel = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
|
|
1417
1417
|
return kbLabel
|
|
1418
1418
|
? ( localize(
|
|
1419
|
-
|
|
1419
|
+
10070,
|
|
1420
1420
|
"{0}, Use {1} to open Source Control Accessibility Help.",
|
|
1421
1421
|
placeholder,
|
|
1422
1422
|
kbLabel
|
|
1423
1423
|
))
|
|
1424
1424
|
: ( localize(
|
|
1425
|
-
|
|
1425
|
+
10071,
|
|
1426
1426
|
"{0}, Run the Open Accessibility Help command for more information.",
|
|
1427
1427
|
placeholder
|
|
1428
1428
|
));
|
|
@@ -1667,14 +1667,11 @@ let SCMInputWidget = class SCMInputWidget {
|
|
|
1667
1667
|
}));
|
|
1668
1668
|
const renderer = this.instantiationService.createInstance(MarkdownRenderer, {});
|
|
1669
1669
|
const renderedMarkdown = renderer.render(message, {
|
|
1670
|
-
actionHandler: {
|
|
1671
|
-
|
|
1672
|
-
|
|
1673
|
-
|
|
1674
|
-
|
|
1675
|
-
this.contextViewService.hideContextView();
|
|
1676
|
-
},
|
|
1677
|
-
disposables: disposables
|
|
1670
|
+
actionHandler: (link, mdStr) => {
|
|
1671
|
+
openLinkFromMarkdown(this.openerService, link, mdStr.isTrusted);
|
|
1672
|
+
this.element.style.borderBottomLeftRadius = '2px';
|
|
1673
|
+
this.element.style.borderBottomRightRadius = '2px';
|
|
1674
|
+
this.contextViewService.hideContextView();
|
|
1678
1675
|
},
|
|
1679
1676
|
});
|
|
1680
1677
|
disposables.add(renderedMarkdown);
|
|
@@ -1682,7 +1679,7 @@ let SCMInputWidget = class SCMInputWidget {
|
|
|
1682
1679
|
}
|
|
1683
1680
|
const actionsContainer = append(validationContainer, $('.scm-editor-validation-actions'));
|
|
1684
1681
|
const actionbar = ( new ActionBar(actionsContainer));
|
|
1685
|
-
const action = ( new Action('scmInputWidget.validationMessage.close', ( localize(
|
|
1682
|
+
const action = ( new Action('scmInputWidget.validationMessage.close', ( localize(10072, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
|
|
1686
1683
|
this.contextViewService.hideContextView();
|
|
1687
1684
|
this.element.style.borderBottomLeftRadius = '2px';
|
|
1688
1685
|
this.element.style.borderBottomRightRadius = '2px';
|
|
@@ -8,7 +8,7 @@ import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/
|
|
|
8
8
|
import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
|
|
9
9
|
import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
|
|
10
10
|
import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
|
|
11
|
-
import { ViewPaneContainer } from "@codingame/monaco-vscode-
|
|
11
|
+
import { ViewPaneContainer } from "@codingame/monaco-vscode-71c8dbff-4c98-552f-aef0-e72b00fdcfc0-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer";
|
|
12
12
|
import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
|
|
13
13
|
export declare class SCMViewPaneContainer extends ViewPaneContainer {
|
|
14
14
|
constructor(layoutService: IWorkbenchLayoutService, telemetryService: ITelemetryService, instantiationService: IInstantiationService, contextMenuService: IContextMenuService, themeService: IThemeService, storageService: IStorageService, configurationService: IConfigurationService, extensionService: IExtensionService, contextService: IWorkspaceContextService, viewDescriptorService: IViewDescriptorService, logService: ILogService);
|
|
@@ -13,7 +13,7 @@ import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/
|
|
|
13
13
|
import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
|
|
14
14
|
import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
|
|
15
15
|
import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
|
|
16
|
-
import { ViewPaneContainer } from '@codingame/monaco-vscode-
|
|
16
|
+
import { ViewPaneContainer } from '@codingame/monaco-vscode-71c8dbff-4c98-552f-aef0-e72b00fdcfc0-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
|
|
17
17
|
import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
|
|
18
18
|
|
|
19
19
|
registerCss(scm);
|
|
@@ -51,7 +51,7 @@ let RepositoryPicker = class RepositoryPicker {
|
|
|
51
51
|
this._quickInputService = _quickInputService;
|
|
52
52
|
this._scmViewService = _scmViewService;
|
|
53
53
|
this._autoQuickPickItem = {
|
|
54
|
-
label: ( localize(
|
|
54
|
+
label: ( localize(10073, "Auto")),
|
|
55
55
|
description: this._autoQuickItemDescription,
|
|
56
56
|
repository: 'auto'
|
|
57
57
|
};
|
|
@@ -263,15 +263,21 @@ let SCMViewService = class SCMViewService {
|
|
|
263
263
|
return;
|
|
264
264
|
}
|
|
265
265
|
let added = Iterable.empty();
|
|
266
|
-
const
|
|
266
|
+
const removed = this._repositories.splice(repositoriesIndex, 1);
|
|
267
267
|
if (this._repositories.length > 0 && this.visibleRepositories.length === 0) {
|
|
268
268
|
this._repositories[0].selectionIndex = 0;
|
|
269
269
|
added = [this._repositories[0].repository];
|
|
270
270
|
}
|
|
271
|
-
this._onDidChangeRepositories.fire({ added, removed: (
|
|
272
|
-
if (
|
|
271
|
+
this._onDidChangeRepositories.fire({ added, removed: ( removed.map(r => r.repository)) });
|
|
272
|
+
if (removed.length === 1 && removed[0].focused && this.visibleRepositories.length > 0) {
|
|
273
273
|
this.focus(this.visibleRepositories[0]);
|
|
274
274
|
}
|
|
275
|
+
if (removed.length === 1 && this._repositories.length === 0) {
|
|
276
|
+
this._onDidFocusRepository.fire(undefined);
|
|
277
|
+
}
|
|
278
|
+
if (removed.length === 1 && removed[0].repository === this._activeRepositoryPinnedObs.get()) {
|
|
279
|
+
this._activeRepositoryPinnedObs.set(undefined, undefined);
|
|
280
|
+
}
|
|
275
281
|
}
|
|
276
282
|
isVisible(repository) {
|
|
277
283
|
return this._repositories.find(r => r.repository === repository)?.selectionIndex !== -1;
|