@codingame/monaco-vscode-scm-service-override 26.2.2 → 27.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/index.js +6 -2
- package/package.json +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/activity.js +5 -5
- package/vscode/src/vs/workbench/contrib/scm/browser/menus.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/menus.js +3 -3
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffDecorator.js +3 -3
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffWidget.js +13 -13
- package/vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js +75 -74
- package/vscode/src/vs/workbench/contrib/scm/browser/scmAccessibilityHelp.js +23 -23
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.js +26 -26
- package/vscode/src/vs/workbench/contrib/scm/browser/scmInput.d.ts +62 -0
- package/vscode/src/vs/workbench/contrib/scm/browser/scmInput.js +828 -0
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.js +2 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.d.ts +1 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js +35 -814
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.js +2 -1
- package/vscode/src/vs/workbench/contrib/scm/common/scmService.js +10 -8
|
@@ -130,20 +130,20 @@ class SCMHistoryItemRefsActionViewItem extends ActionViewItem {
|
|
|
130
130
|
icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.gitBranch));
|
|
131
131
|
const name = $(".name");
|
|
132
132
|
if (this._historyItemsFilter === "all") {
|
|
133
|
-
name.textContent = ( localize(
|
|
133
|
+
name.textContent = ( localize(11853, "All"));
|
|
134
134
|
} else if (this._historyItemsFilter === "auto") {
|
|
135
|
-
name.textContent = ( localize(
|
|
135
|
+
name.textContent = ( localize(11854, "Auto"));
|
|
136
136
|
} else if (this._historyItemsFilter.length === 1) {
|
|
137
137
|
name.textContent = this._historyItemsFilter[0].name;
|
|
138
138
|
} else {
|
|
139
|
-
name.textContent = ( localize(
|
|
139
|
+
name.textContent = ( localize(11855, "{0} Items", this._historyItemsFilter.length));
|
|
140
140
|
}
|
|
141
141
|
reset(this.label, icon, name);
|
|
142
142
|
}
|
|
143
143
|
}
|
|
144
144
|
getTooltip() {
|
|
145
145
|
if (this._historyItemsFilter === "all") {
|
|
146
|
-
return localize(
|
|
146
|
+
return localize(11856, "All history item references");
|
|
147
147
|
} else if (this._historyItemsFilter === "auto") {
|
|
148
148
|
const historyProvider = this._repository.provider.historyProvider.get();
|
|
149
149
|
return [
|
|
@@ -162,7 +162,7 @@ registerAction2(class extends ViewAction {
|
|
|
162
162
|
constructor() {
|
|
163
163
|
super({
|
|
164
164
|
id: PICK_REPOSITORY_ACTION_ID,
|
|
165
|
-
title: ( localize(
|
|
165
|
+
title: ( localize(11857, "Repository Picker")),
|
|
166
166
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
167
167
|
f1: false,
|
|
168
168
|
menu: {
|
|
@@ -181,7 +181,7 @@ registerAction2(class extends ViewAction {
|
|
|
181
181
|
constructor() {
|
|
182
182
|
super({
|
|
183
183
|
id: PICK_HISTORY_ITEM_REFS_ACTION_ID,
|
|
184
|
-
title: ( localize(
|
|
184
|
+
title: ( localize(11858, "History Item Reference Picker")),
|
|
185
185
|
icon: Codicon.gitBranch,
|
|
186
186
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
187
187
|
precondition: ( ContextKeys.SCMHistoryItemCount.notEqualsTo(0)),
|
|
@@ -201,7 +201,7 @@ registerAction2(class extends ViewAction {
|
|
|
201
201
|
constructor() {
|
|
202
202
|
super({
|
|
203
203
|
id: "workbench.scm.action.graph.revealCurrentHistoryItem",
|
|
204
|
-
title: ( localize(
|
|
204
|
+
title: ( localize(11859, "Go to Current History Item")),
|
|
205
205
|
icon: Codicon.target,
|
|
206
206
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
207
207
|
precondition: ( ContextKeyExpr.and(( ContextKeys.SCMHistoryItemCount.notEqualsTo(0)), ( ContextKeys.SCMCurrentHistoryItemRefInFilter.isEqualTo(true)))),
|
|
@@ -221,7 +221,7 @@ registerAction2(class extends ViewAction {
|
|
|
221
221
|
constructor() {
|
|
222
222
|
super({
|
|
223
223
|
id: "workbench.scm.action.graph.refresh",
|
|
224
|
-
title: ( localize(
|
|
224
|
+
title: ( localize(11860, "Refresh")),
|
|
225
225
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
226
226
|
f1: false,
|
|
227
227
|
icon: Codicon.refresh,
|
|
@@ -240,7 +240,7 @@ registerAction2(class extends ViewAction {
|
|
|
240
240
|
constructor() {
|
|
241
241
|
super({
|
|
242
242
|
id: "workbench.scm.action.graph.setListViewMode",
|
|
243
|
-
title: ( localize(
|
|
243
|
+
title: ( localize(11861, "View as List")),
|
|
244
244
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
245
245
|
toggled: ( ContextKeys.SCMHistoryViewMode.isEqualTo(ViewMode.List)),
|
|
246
246
|
menu: {
|
|
@@ -259,7 +259,7 @@ registerAction2(class extends ViewAction {
|
|
|
259
259
|
constructor() {
|
|
260
260
|
super({
|
|
261
261
|
id: "workbench.scm.action.graph.setTreeViewMode",
|
|
262
|
-
title: ( localize(
|
|
262
|
+
title: ( localize(11862, "View as Tree")),
|
|
263
263
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
264
264
|
toggled: ( ContextKeys.SCMHistoryViewMode.isEqualTo(ViewMode.Tree)),
|
|
265
265
|
menu: {
|
|
@@ -278,7 +278,7 @@ registerAction2(class extends Action2 {
|
|
|
278
278
|
constructor() {
|
|
279
279
|
super({
|
|
280
280
|
id: "workbench.scm.action.graph.viewChanges",
|
|
281
|
-
title: ( localize(
|
|
281
|
+
title: ( localize(11863, "Open Changes")),
|
|
282
282
|
icon: Codicon.diffMultiple,
|
|
283
283
|
f1: false,
|
|
284
284
|
menu: [{
|
|
@@ -338,7 +338,7 @@ registerAction2(class extends Action2 {
|
|
|
338
338
|
constructor() {
|
|
339
339
|
super({
|
|
340
340
|
id: "workbench.scm.action.graph.openFile",
|
|
341
|
-
title: ( localize(
|
|
341
|
+
title: ( localize(11864, "Open File")),
|
|
342
342
|
icon: Codicon.goToFile,
|
|
343
343
|
f1: false,
|
|
344
344
|
menu: [{
|
|
@@ -359,9 +359,9 @@ registerAction2(class extends Action2 {
|
|
|
359
359
|
}
|
|
360
360
|
let version;
|
|
361
361
|
if (historyItem.id === SCMIncomingHistoryItemId) {
|
|
362
|
-
version = ( localize(
|
|
362
|
+
version = ( localize(11865, "Incoming Changes"));
|
|
363
363
|
} else if (historyItem.id === SCMOutgoingHistoryItemId) {
|
|
364
|
-
version = ( localize(
|
|
364
|
+
version = ( localize(11866, "Outgoing Changes"));
|
|
365
365
|
} else {
|
|
366
366
|
version = historyItem.displayId ?? historyItem.id;
|
|
367
367
|
}
|
|
@@ -765,7 +765,7 @@ let HistoryItemLoadMoreRenderer = class HistoryItemLoadMoreRenderer {
|
|
|
765
765
|
templateData.elementDisposables.add(autorun(reader => {
|
|
766
766
|
const isLoadingMore = this._isLoadingMore.read(reader);
|
|
767
767
|
const icon = `$(${isLoadingMore ? "loading~spin" : "fold-down"})`;
|
|
768
|
-
templateData.historyItemPlaceholderLabel.setLabel(( localize(
|
|
768
|
+
templateData.historyItemPlaceholderLabel.setLabel(( localize(11867, "{0} Load More...", icon)));
|
|
769
769
|
}));
|
|
770
770
|
}
|
|
771
771
|
}
|
|
@@ -795,7 +795,7 @@ let SCMHistoryViewPaneActionRunner = class SCMHistoryViewPaneActionRunner extend
|
|
|
795
795
|
SCMHistoryViewPaneActionRunner = ( __decorate([( __param(0, IProgressService))], SCMHistoryViewPaneActionRunner));
|
|
796
796
|
class SCMHistoryTreeAccessibilityProvider {
|
|
797
797
|
getWidgetAriaLabel() {
|
|
798
|
-
return localize(
|
|
798
|
+
return localize(11868, "Source Control History");
|
|
799
799
|
}
|
|
800
800
|
getAriaLabel(element) {
|
|
801
801
|
if (isSCMRepository(element)) {
|
|
@@ -1285,8 +1285,8 @@ let RepositoryPicker = class RepositoryPicker {
|
|
|
1285
1285
|
this._quickInputService = _quickInputService;
|
|
1286
1286
|
this._scmViewService = _scmViewService;
|
|
1287
1287
|
this._autoQuickPickItem = {
|
|
1288
|
-
label: ( localize(
|
|
1289
|
-
description: ( localize(
|
|
1288
|
+
label: ( localize(11854, "Auto")),
|
|
1289
|
+
description: ( localize(11869, "Show the source control graph for the active repository")),
|
|
1290
1290
|
repository: "auto"
|
|
1291
1291
|
};
|
|
1292
1292
|
}
|
|
@@ -1301,7 +1301,7 @@ let RepositoryPicker = class RepositoryPicker {
|
|
|
1301
1301
|
repository: r
|
|
1302
1302
|
}))));
|
|
1303
1303
|
return this._quickInputService.pick(picks, {
|
|
1304
|
-
placeHolder: ( localize(
|
|
1304
|
+
placeHolder: ( localize(11870, "Select the repository to view, type to filter all repositories"))
|
|
1305
1305
|
});
|
|
1306
1306
|
}
|
|
1307
1307
|
};
|
|
@@ -1314,14 +1314,14 @@ let HistoryItemRefPicker = class HistoryItemRefPicker extends Disposable {
|
|
|
1314
1314
|
this._quickInputService = _quickInputService;
|
|
1315
1315
|
this._allQuickPickItem = {
|
|
1316
1316
|
id: "all",
|
|
1317
|
-
label: ( localize(
|
|
1318
|
-
description: ( localize(
|
|
1317
|
+
label: ( localize(11853, "All")),
|
|
1318
|
+
description: ( localize(11856, "All history item references")),
|
|
1319
1319
|
historyItemRef: "all"
|
|
1320
1320
|
};
|
|
1321
1321
|
this._autoQuickPickItem = {
|
|
1322
1322
|
id: "auto",
|
|
1323
|
-
label: ( localize(
|
|
1324
|
-
description: ( localize(
|
|
1323
|
+
label: ( localize(11854, "Auto")),
|
|
1324
|
+
description: ( localize(11871, "Current history item reference(s)")),
|
|
1325
1325
|
historyItemRef: "auto"
|
|
1326
1326
|
};
|
|
1327
1327
|
}
|
|
@@ -1330,7 +1330,7 @@ let HistoryItemRefPicker = class HistoryItemRefPicker extends Disposable {
|
|
|
1330
1330
|
useSeparators: true
|
|
1331
1331
|
});
|
|
1332
1332
|
this._store.add(quickPick);
|
|
1333
|
-
quickPick.placeholder = ( localize(
|
|
1333
|
+
quickPick.placeholder = ( localize(11872, "Select one/more history item references to view, type to filter"));
|
|
1334
1334
|
quickPick.canSelectMany = true;
|
|
1335
1335
|
quickPick.hideCheckAll = true;
|
|
1336
1336
|
quickPick.busy = true;
|
|
@@ -1484,7 +1484,7 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
|
|
|
1484
1484
|
compact: true,
|
|
1485
1485
|
showPointer: true
|
|
1486
1486
|
},
|
|
1487
|
-
content: ( new MarkdownString(( localize(
|
|
1487
|
+
content: ( new MarkdownString(( localize(11873, "Please refresh the graph using the refresh action ($(refresh)).")), {
|
|
1488
1488
|
supportThemeIcons: true
|
|
1489
1489
|
})),
|
|
1490
1490
|
position: {
|
|
@@ -1754,7 +1754,7 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
|
|
|
1754
1754
|
} else if (isSCMHistoryItemChangeViewModelTreeElement(e.element)) {
|
|
1755
1755
|
const historyItemChange = e.element.historyItemChange;
|
|
1756
1756
|
const historyItem = e.element.historyItemViewModel.historyItem;
|
|
1757
|
-
const historyItemDisplayId = historyItem.id === SCMIncomingHistoryItemId ? ( localize(
|
|
1757
|
+
const historyItemDisplayId = historyItem.id === SCMIncomingHistoryItemId ? ( localize(11865, "Incoming Changes")) : historyItem.id === SCMOutgoingHistoryItemId ? ( localize(11866, "Outgoing Changes")) : historyItem.displayId ?? historyItem.id;
|
|
1758
1758
|
const historyItemParentId = historyItem.parentIds.length > 0 ? historyItem.parentIds[0] : undefined;
|
|
1759
1759
|
const historyItemParentDisplayId = historyItemParentId && historyItem.displayId ? historyItemParentId.substring(0, historyItem.displayId.length) : historyItemParentId;
|
|
1760
1760
|
if (historyItemChange.originalUri && historyItemChange.modifiedUri) {
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
|
|
2
|
+
import { ISCMInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm";
|
|
3
|
+
import { ISCMViewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service";
|
|
4
|
+
import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
|
|
5
|
+
import { IContextViewService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
|
|
6
|
+
import { RawContextKey } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
|
|
7
|
+
import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
|
|
8
|
+
import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
|
|
9
|
+
import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
|
|
10
|
+
import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
|
|
11
|
+
import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
|
|
12
|
+
import { Selection } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/selection";
|
|
13
|
+
import { IMarkdownRendererService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service";
|
|
14
|
+
import { IAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service";
|
|
15
|
+
export declare const SCMInputContextKeys: {
|
|
16
|
+
SCMInputHasValidationMessage: RawContextKey<boolean>;
|
|
17
|
+
};
|
|
18
|
+
export declare class SCMInputWidget {
|
|
19
|
+
private modelService;
|
|
20
|
+
private keybindingService;
|
|
21
|
+
private configurationService;
|
|
22
|
+
private readonly scmViewService;
|
|
23
|
+
private readonly contextViewService;
|
|
24
|
+
private readonly openerService;
|
|
25
|
+
private readonly accessibilityService;
|
|
26
|
+
private readonly markdownRendererService;
|
|
27
|
+
private static readonly ValidationTimeouts;
|
|
28
|
+
private readonly contextKeyService;
|
|
29
|
+
private element;
|
|
30
|
+
private editorContainer;
|
|
31
|
+
private readonly inputEditor;
|
|
32
|
+
private readonly inputEditorOptions;
|
|
33
|
+
private toolbarContainer;
|
|
34
|
+
private toolbar;
|
|
35
|
+
private readonly disposables;
|
|
36
|
+
private model;
|
|
37
|
+
private repositoryIdContextKey;
|
|
38
|
+
private validationMessageContextKey;
|
|
39
|
+
private readonly repositoryDisposables;
|
|
40
|
+
private validation;
|
|
41
|
+
private validationContextView;
|
|
42
|
+
private validationHasFocus;
|
|
43
|
+
private _validationTimer;
|
|
44
|
+
private lastLayoutWasTrash;
|
|
45
|
+
private shouldFocusAfterLayout;
|
|
46
|
+
readonly onDidChangeContentHeight: Event<void>;
|
|
47
|
+
get input(): ISCMInput | undefined;
|
|
48
|
+
set input(input: ISCMInput | undefined);
|
|
49
|
+
get selections(): Selection[] | null;
|
|
50
|
+
set selections(selections: Selection[] | null);
|
|
51
|
+
private setValidation;
|
|
52
|
+
constructor(container: HTMLElement, overflowWidgetsDomNode: HTMLElement, contextKeyService: IContextKeyService, instantiationService: IInstantiationService, modelService: IModelService, keybindingService: IKeybindingService, configurationService: IConfigurationService, scmViewService: ISCMViewService, contextViewService: IContextViewService, openerService: IOpenerService, accessibilityService: IAccessibilityService, markdownRendererService: IMarkdownRendererService);
|
|
53
|
+
getContentHeight(): number;
|
|
54
|
+
layout(): void;
|
|
55
|
+
focus(): void;
|
|
56
|
+
hasFocus(): boolean;
|
|
57
|
+
private onDidChangeEditorOptions;
|
|
58
|
+
private renderValidation;
|
|
59
|
+
private getToolbarWidth;
|
|
60
|
+
clearValidation(): void;
|
|
61
|
+
dispose(): void;
|
|
62
|
+
}
|