@codingame/monaco-vscode-scm-service-override 15.0.2 → 16.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 +17 -13
- package/vscode/src/vs/workbench/contrib/scm/browser/activity.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/activity.js +24 -12
- package/vscode/src/vs/workbench/contrib/scm/browser/media/dirtydiffDecorator.css +96 -0
- package/vscode/src/vs/workbench/contrib/scm/browser/media/scm.css +525 -0
- package/vscode/src/vs/workbench/contrib/scm/browser/menus.js +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffDecorator.js +6 -6
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffModel.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffModel.js +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffWidget.js +15 -15
- package/vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js +96 -81
- package/vscode/src/vs/workbench/contrib/scm/browser/scmAccessibilityHelp.js +30 -30
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.js +45 -46
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.js +8 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.js +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js +30 -27
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.js +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.d.ts +22 -5
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.js +52 -9
- package/vscode/src/vs/workbench/contrib/scm/browser/workingSet.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/workingSet.js +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/media/dirtydiffDecorator.css.js +0 -6
- package/vscode/src/vs/workbench/contrib/scm/browser/media/scm.css.js +0 -6
|
@@ -55,75 +55,75 @@ let SCMAccessibilityHelpContentProvider = class SCMAccessibilityHelpContentProvi
|
|
|
55
55
|
const content = [];
|
|
56
56
|
if (this._scmViewService.visibleRepositories.length > 1) {
|
|
57
57
|
const repositoryList = ( this._scmViewService.visibleRepositories.map(r => r.provider.name)).join(', ');
|
|
58
|
-
content.push(( localize(
|
|
58
|
+
content.push(( localize(9072, "Visible repositories: {0}", repositoryList)));
|
|
59
59
|
}
|
|
60
|
-
const
|
|
61
|
-
if (
|
|
62
|
-
content.push(( localize(
|
|
63
|
-
const currentHistoryItemRef =
|
|
60
|
+
const focusedRepository = this._scmViewService.focusedRepository;
|
|
61
|
+
if (focusedRepository) {
|
|
62
|
+
content.push(( localize(9073, "Repository: {0}", focusedRepository.provider.name)));
|
|
63
|
+
const currentHistoryItemRef = focusedRepository.provider.historyProvider.get()?.historyItemRef.get();
|
|
64
64
|
if (currentHistoryItemRef) {
|
|
65
|
-
content.push(( localize(
|
|
65
|
+
content.push(( localize(9074, "History item reference: {0}", currentHistoryItemRef.name)));
|
|
66
66
|
}
|
|
67
|
-
if (
|
|
68
|
-
content.push(( localize(
|
|
67
|
+
if (focusedRepository.input.visible && focusedRepository.input.enabled && focusedRepository.input.value !== '') {
|
|
68
|
+
content.push(( localize(9075, "Commit message: {0}", focusedRepository.input.value)));
|
|
69
69
|
}
|
|
70
|
-
const actionButton =
|
|
70
|
+
const actionButton = focusedRepository.provider.actionButton.get();
|
|
71
71
|
if (actionButton) {
|
|
72
72
|
const label = actionButton.command.tooltip ?? actionButton.command.title;
|
|
73
|
-
const enablementLabel = actionButton.enabled ? ( localize(
|
|
74
|
-
content.push(( localize(
|
|
73
|
+
const enablementLabel = actionButton.enabled ? ( localize(9076, "enabled")) : ( localize(9077, "disabled"));
|
|
74
|
+
content.push(( localize(9078, "Action button: {0}, {1}", label, enablementLabel)));
|
|
75
75
|
}
|
|
76
76
|
const resourceGroups = [];
|
|
77
|
-
for (const resourceGroup of
|
|
77
|
+
for (const resourceGroup of focusedRepository.provider.groups) {
|
|
78
78
|
resourceGroups.push(`${resourceGroup.label} (${resourceGroup.resources.length} resource(s))`);
|
|
79
79
|
}
|
|
80
|
-
(
|
|
81
|
-
content.push(( localize(
|
|
80
|
+
( focusedRepository.provider.groups.map(g => g.label)).join(', ');
|
|
81
|
+
content.push(( localize(9079, "Resource groups: {0}", resourceGroups.join(', '))));
|
|
82
82
|
}
|
|
83
83
|
content.push(( localize(
|
|
84
|
-
|
|
84
|
+
9080,
|
|
85
85
|
"Use the \"Source Control: Focus on Source Control Repositories View\" command to open the Source Control Repositories view."
|
|
86
86
|
)));
|
|
87
87
|
content.push(( localize(
|
|
88
|
-
|
|
88
|
+
9081,
|
|
89
89
|
"The Source Control Repositories view lists all repositories from the workspace and is only shown when the workspace contains more than one repository."
|
|
90
90
|
)));
|
|
91
|
-
content.push(( localize(
|
|
91
|
+
content.push(( localize(9082, "Once the Source Control Repositories view is opened you can:")));
|
|
92
92
|
content.push(( localize(
|
|
93
|
-
|
|
93
|
+
9083,
|
|
94
94
|
" - Use the up/down arrow keys to navigate the list of repositories."
|
|
95
95
|
)));
|
|
96
|
-
content.push(( localize(
|
|
97
|
-
content.push(( localize(
|
|
96
|
+
content.push(( localize(9084, " - Use the Enter or Space keys to select a repository.")));
|
|
97
|
+
content.push(( localize(9085, " - Use Shift + up/down keys to select multiple repositories.")));
|
|
98
98
|
content.push(( localize(
|
|
99
|
-
|
|
99
|
+
9086,
|
|
100
100
|
"Use the \"Source Control: Focus on Source Control View\" command to open the Source Control view."
|
|
101
101
|
)));
|
|
102
102
|
content.push(( localize(
|
|
103
|
-
|
|
103
|
+
9087,
|
|
104
104
|
"The Source Control view displays the resource groups and resources of the repository. If the workspace contains more than one repository it will list the resource groups and resources of the repositories selected in the Source Control Repositories view."
|
|
105
105
|
)));
|
|
106
|
-
content.push(( localize(
|
|
106
|
+
content.push(( localize(9088, "Once the Source Control view is opened you can:")));
|
|
107
107
|
content.push(( localize(
|
|
108
|
-
|
|
108
|
+
9089,
|
|
109
109
|
" - Use the up/down arrow keys to navigate the list of repositories, resource groups and resources."
|
|
110
110
|
)));
|
|
111
|
-
content.push(( localize(
|
|
111
|
+
content.push(( localize(9090, " - Use the Space key to expand or collapse a resource group.")));
|
|
112
112
|
content.push(( localize(
|
|
113
|
-
|
|
113
|
+
9091,
|
|
114
114
|
"Use the \"Source Control: Focus on Source Control Graph View\" command to open the Source Control Graph view."
|
|
115
115
|
)));
|
|
116
116
|
content.push(( localize(
|
|
117
|
-
|
|
117
|
+
9092,
|
|
118
118
|
"The Source Control Graph view displays a graph history items of the repository. If the workspace contains more than one repository it will list the history items of the active repository."
|
|
119
119
|
)));
|
|
120
|
-
content.push(( localize(
|
|
120
|
+
content.push(( localize(9093, "Once the Source Control Graph view is opened you can:")));
|
|
121
121
|
content.push(( localize(
|
|
122
|
-
|
|
122
|
+
9094,
|
|
123
123
|
" - Use the up/down arrow keys to navigate the list of history items."
|
|
124
124
|
)));
|
|
125
125
|
content.push(( localize(
|
|
126
|
-
|
|
126
|
+
9095,
|
|
127
127
|
" - Use the Space key to open the history item details in the multi-file diff editor."
|
|
128
128
|
)));
|
|
129
129
|
return content.join('\n');
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
|
|
2
2
|
import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
|
|
3
|
-
import './media/scm.css
|
|
3
|
+
import './media/scm.css';
|
|
4
4
|
import { language } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
|
|
5
5
|
import { $, reset, append, h } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
|
|
6
6
|
import { IconLabel } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabel';
|
|
@@ -41,7 +41,7 @@ import { getHistoryItemEditorTitle, isSCMHistoryItemViewModelTreeElement, isSCMH
|
|
|
41
41
|
import { HISTORY_VIEW_PANE_ID } from '@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm';
|
|
42
42
|
import { ISCMService, ISCMViewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
|
|
43
43
|
import { stripIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iconLabels';
|
|
44
|
-
import { Position } from '@codingame/monaco-vscode-
|
|
44
|
+
import { Position } from '@codingame/monaco-vscode-b1110435-a331-5549-ab1e-aa3d763c3a1f-common/vscode/vs/workbench/services/layout/browser/layoutService';
|
|
45
45
|
import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
|
|
46
46
|
import { HoverPosition } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverWidget';
|
|
47
47
|
import { registerAction2, MenuId, Action2, MenuRegistry, isIMenuItem } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
|
|
@@ -72,7 +72,7 @@ import { autorun, autorunWithStore } from '@codingame/monaco-vscode-api/vscode/v
|
|
|
72
72
|
import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
|
|
73
73
|
import { waitForState } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utilsCancellation';
|
|
74
74
|
import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
|
|
75
|
-
import {
|
|
75
|
+
import { observableSignal, constObservable, observableFromEvent, latestChangedValue, runOnChange } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
|
|
76
76
|
|
|
77
77
|
var HistoryItemRenderer_1, HistoryItemLoadMoreRenderer_1;
|
|
78
78
|
const PICK_REPOSITORY_ACTION_ID = 'workbench.scm.action.graph.pickRepository';
|
|
@@ -109,23 +109,23 @@ class SCMHistoryItemRefsActionViewItem extends ActionViewItem {
|
|
|
109
109
|
icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.gitBranch));
|
|
110
110
|
const name = $('.name');
|
|
111
111
|
if (this._historyItemsFilter === 'all') {
|
|
112
|
-
name.textContent = ( localize(
|
|
112
|
+
name.textContent = ( localize(9109, "All"));
|
|
113
113
|
}
|
|
114
114
|
else if (this._historyItemsFilter === 'auto') {
|
|
115
|
-
name.textContent = ( localize(
|
|
115
|
+
name.textContent = ( localize(9110, "Auto"));
|
|
116
116
|
}
|
|
117
117
|
else if (this._historyItemsFilter.length === 1) {
|
|
118
118
|
name.textContent = this._historyItemsFilter[0].name;
|
|
119
119
|
}
|
|
120
120
|
else {
|
|
121
|
-
name.textContent = ( localize(
|
|
121
|
+
name.textContent = ( localize(9111, "{0} Items", this._historyItemsFilter.length));
|
|
122
122
|
}
|
|
123
123
|
reset(this.label, icon, name);
|
|
124
124
|
}
|
|
125
125
|
}
|
|
126
126
|
getTooltip() {
|
|
127
127
|
if (this._historyItemsFilter === 'all') {
|
|
128
|
-
return localize(
|
|
128
|
+
return localize(9112, "All history item references");
|
|
129
129
|
}
|
|
130
130
|
else if (this._historyItemsFilter === 'auto') {
|
|
131
131
|
const historyProvider = this._repository.provider.historyProvider.get();
|
|
@@ -147,7 +147,7 @@ registerAction2(class extends ViewAction {
|
|
|
147
147
|
constructor() {
|
|
148
148
|
super({
|
|
149
149
|
id: PICK_REPOSITORY_ACTION_ID,
|
|
150
|
-
title: ( localize(
|
|
150
|
+
title: ( localize(9113, "Repository Picker")),
|
|
151
151
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
152
152
|
f1: false,
|
|
153
153
|
menu: {
|
|
@@ -166,7 +166,7 @@ registerAction2(class extends ViewAction {
|
|
|
166
166
|
constructor() {
|
|
167
167
|
super({
|
|
168
168
|
id: PICK_HISTORY_ITEM_REFS_ACTION_ID,
|
|
169
|
-
title: ( localize(
|
|
169
|
+
title: ( localize(9114, "History Item Reference Picker")),
|
|
170
170
|
icon: Codicon.gitBranch,
|
|
171
171
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
172
172
|
precondition: ( ContextKeys.SCMHistoryItemCount.notEqualsTo(0)),
|
|
@@ -186,7 +186,7 @@ registerAction2(class extends ViewAction {
|
|
|
186
186
|
constructor() {
|
|
187
187
|
super({
|
|
188
188
|
id: 'workbench.scm.action.graph.revealCurrentHistoryItem',
|
|
189
|
-
title: ( localize(
|
|
189
|
+
title: ( localize(9115, "Go to Current History Item")),
|
|
190
190
|
icon: Codicon.target,
|
|
191
191
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
192
192
|
precondition: ( ContextKeyExpr.and(( ContextKeys.SCMHistoryItemCount.notEqualsTo(0)), ( ContextKeys.SCMCurrentHistoryItemRefInFilter.isEqualTo(true)))),
|
|
@@ -206,7 +206,7 @@ registerAction2(class extends ViewAction {
|
|
|
206
206
|
constructor() {
|
|
207
207
|
super({
|
|
208
208
|
id: 'workbench.scm.action.graph.refresh',
|
|
209
|
-
title: ( localize(
|
|
209
|
+
title: ( localize(9116, "Refresh")),
|
|
210
210
|
viewId: HISTORY_VIEW_PANE_ID,
|
|
211
211
|
f1: false,
|
|
212
212
|
icon: Codicon.refresh,
|
|
@@ -225,7 +225,7 @@ registerAction2(class extends Action2 {
|
|
|
225
225
|
constructor() {
|
|
226
226
|
super({
|
|
227
227
|
id: 'workbench.scm.action.graph.viewChanges',
|
|
228
|
-
title: ( localize(
|
|
228
|
+
title: ( localize(9117, "Open Changes")),
|
|
229
229
|
f1: false,
|
|
230
230
|
menu: [
|
|
231
231
|
{
|
|
@@ -259,7 +259,7 @@ registerAction2(class extends Action2 {
|
|
|
259
259
|
const title = historyItems.length === 1 ?
|
|
260
260
|
getHistoryItemEditorTitle(historyItem) :
|
|
261
261
|
( localize(
|
|
262
|
-
|
|
262
|
+
9118,
|
|
263
263
|
"All Changes ({0} ↔ {1})",
|
|
264
264
|
historyItemLast.displayId ?? historyItemLast.id,
|
|
265
265
|
historyItem.displayId ?? historyItem.id
|
|
@@ -420,7 +420,7 @@ let HistoryItemRenderer = class HistoryItemRenderer {
|
|
|
420
420
|
? `$(${historyItem.authorIcon.id})`
|
|
421
421
|
: '$(account)';
|
|
422
422
|
if (historyItem.authorEmail) {
|
|
423
|
-
const emailTitle = ( localize(
|
|
423
|
+
const emailTitle = ( localize(9119, "Email"));
|
|
424
424
|
markdown.appendMarkdown(`${icon} [**${historyItem.author}**](mailto:${historyItem.authorEmail} "${emailTitle} ${historyItem.author}")`);
|
|
425
425
|
}
|
|
426
426
|
else {
|
|
@@ -436,19 +436,19 @@ let HistoryItemRenderer = class HistoryItemRenderer {
|
|
|
436
436
|
if (historyItem.statistics) {
|
|
437
437
|
markdown.appendMarkdown(`---\n\n`);
|
|
438
438
|
markdown.appendMarkdown(`<span>${historyItem.statistics.files === 1 ?
|
|
439
|
-
( localize(
|
|
440
|
-
( localize(
|
|
439
|
+
( localize(9120, "{0} file changed", historyItem.statistics.files)) :
|
|
440
|
+
( localize(9121, "{0} files changed", historyItem.statistics.files))}</span>`);
|
|
441
441
|
if (historyItem.statistics.insertions) {
|
|
442
442
|
const additionsForegroundColor = colorTheme.getColor(historyItemHoverAdditionsForeground);
|
|
443
443
|
markdown.appendMarkdown(`, <span style="color:${additionsForegroundColor};">${historyItem.statistics.insertions === 1 ?
|
|
444
|
-
( localize(
|
|
445
|
-
( localize(
|
|
444
|
+
( localize(9122, "{0} insertion{1}", historyItem.statistics.insertions, '(+)')) :
|
|
445
|
+
( localize(9123, "{0} insertions{1}", historyItem.statistics.insertions, '(+)'))}</span>`);
|
|
446
446
|
}
|
|
447
447
|
if (historyItem.statistics.deletions) {
|
|
448
448
|
const deletionsForegroundColor = colorTheme.getColor(historyItemHoverDeletionsForeground);
|
|
449
449
|
markdown.appendMarkdown(`, <span style="color:${deletionsForegroundColor};">${historyItem.statistics.deletions === 1 ?
|
|
450
|
-
( localize(
|
|
451
|
-
( localize(
|
|
450
|
+
( localize(9124, "{0} deletion{1}", historyItem.statistics.deletions, '(-)')) :
|
|
451
|
+
( localize(9125, "{0} deletions{1}", historyItem.statistics.deletions, '(-)'))}</span>`);
|
|
452
452
|
}
|
|
453
453
|
}
|
|
454
454
|
if ((historyItem.references ?? []).length > 0) {
|
|
@@ -517,7 +517,7 @@ let HistoryItemLoadMoreRenderer = class HistoryItemLoadMoreRenderer {
|
|
|
517
517
|
templateData.elementDisposables.add(autorun(reader => {
|
|
518
518
|
const isLoadingMore = this._isLoadingMore.read(reader);
|
|
519
519
|
const icon = `$(${isLoadingMore ? 'loading~spin' : 'fold-down'})`;
|
|
520
|
-
templateData.historyItemPlaceholderLabel.setLabel(( localize(
|
|
520
|
+
templateData.historyItemPlaceholderLabel.setLabel(( localize(9126, "{0} Load More...", icon)));
|
|
521
521
|
}));
|
|
522
522
|
}
|
|
523
523
|
}
|
|
@@ -571,7 +571,7 @@ SCMHistoryViewPaneActionRunner = ( __decorate([
|
|
|
571
571
|
], SCMHistoryViewPaneActionRunner));
|
|
572
572
|
class SCMHistoryTreeAccessibilityProvider {
|
|
573
573
|
getWidgetAriaLabel() {
|
|
574
|
-
return localize(
|
|
574
|
+
return localize(9127, "Source Control History");
|
|
575
575
|
}
|
|
576
576
|
getAriaLabel(element) {
|
|
577
577
|
if (isSCMRepository(element)) {
|
|
@@ -654,19 +654,7 @@ let SCMHistoryViewModel = class SCMHistoryViewModel extends Disposable {
|
|
|
654
654
|
this._scmService = _scmService;
|
|
655
655
|
this._scmViewService = _scmViewService;
|
|
656
656
|
this._storageService = _storageService;
|
|
657
|
-
this._closedRepository = observableFromEvent(this, this._scmService.onDidRemoveRepository, repository => repository);
|
|
658
|
-
this._firstRepository = this._scmService.repositoryCount > 0 ?
|
|
659
|
-
constObservable(Iterable.first(this._scmService.repositories)) :
|
|
660
|
-
observableFromEvent(this, Event.once(this._scmService.onDidAddRepository), repository => repository);
|
|
661
657
|
this._selectedRepository = observableValue(this, 'auto');
|
|
662
|
-
this._graphRepository = derived(reader => {
|
|
663
|
-
const selectedRepository = this._selectedRepository.read(reader);
|
|
664
|
-
if (selectedRepository !== 'auto') {
|
|
665
|
-
return selectedRepository;
|
|
666
|
-
}
|
|
667
|
-
return this._scmViewService.activeRepository.read(reader);
|
|
668
|
-
});
|
|
669
|
-
this.repository = latestChangedValue(this, [this._firstRepository, this._graphRepository]);
|
|
670
658
|
this.onDidChangeHistoryItemsFilter = observableSignal(this);
|
|
671
659
|
this.isViewModelEmpty = observableValue(this, false);
|
|
672
660
|
this._repositoryState = ( new Map());
|
|
@@ -675,8 +663,20 @@ let SCMHistoryViewModel = class SCMHistoryViewModel extends Disposable {
|
|
|
675
663
|
this._extensionService.onWillStop(this._saveHistoryItemsFilterState, this, this._store);
|
|
676
664
|
this._storageService.onWillSaveState(this._saveHistoryItemsFilterState, this, this._store);
|
|
677
665
|
this._scmHistoryItemCountCtx = ContextKeys.SCMHistoryItemCount.bindTo(this._contextKeyService);
|
|
666
|
+
const firstRepository = this._scmService.repositoryCount > 0
|
|
667
|
+
? constObservable(Iterable.first(this._scmService.repositories))
|
|
668
|
+
: observableFromEvent(this, Event.once(this._scmService.onDidAddRepository), repository => repository);
|
|
669
|
+
const graphRepository = derived(reader => {
|
|
670
|
+
const selectedRepository = this._selectedRepository.read(reader);
|
|
671
|
+
if (selectedRepository !== 'auto') {
|
|
672
|
+
return selectedRepository;
|
|
673
|
+
}
|
|
674
|
+
return this._scmViewService.activeRepository.read(reader);
|
|
675
|
+
});
|
|
676
|
+
this.repository = latestChangedValue(this, [firstRepository, graphRepository]);
|
|
677
|
+
const closedRepository = observableFromEvent(this, this._scmService.onDidRemoveRepository, repository => repository);
|
|
678
678
|
this._register(autorun(reader => {
|
|
679
|
-
const repository =
|
|
679
|
+
const repository = closedRepository.read(reader);
|
|
680
680
|
if (!repository) {
|
|
681
681
|
return;
|
|
682
682
|
}
|
|
@@ -867,14 +867,13 @@ SCMHistoryViewModel = ( __decorate([
|
|
|
867
867
|
( __param(4, ISCMViewService)),
|
|
868
868
|
( __param(5, IStorageService))
|
|
869
869
|
], SCMHistoryViewModel));
|
|
870
|
-
let RepositoryPicker = class RepositoryPicker
|
|
870
|
+
let RepositoryPicker = class RepositoryPicker {
|
|
871
871
|
constructor(_quickInputService, _scmViewService) {
|
|
872
|
-
super();
|
|
873
872
|
this._quickInputService = _quickInputService;
|
|
874
873
|
this._scmViewService = _scmViewService;
|
|
875
874
|
this._autoQuickPickItem = {
|
|
876
|
-
label: ( localize(
|
|
877
|
-
description: ( localize(
|
|
875
|
+
label: ( localize(9110, "Auto")),
|
|
876
|
+
description: ( localize(9128, "Show the source control graph for the active repository")),
|
|
878
877
|
repository: 'auto'
|
|
879
878
|
};
|
|
880
879
|
}
|
|
@@ -890,7 +889,7 @@ let RepositoryPicker = class RepositoryPicker extends Disposable {
|
|
|
890
889
|
repository: r
|
|
891
890
|
}))));
|
|
892
891
|
return this._quickInputService.pick(picks, {
|
|
893
|
-
placeHolder: ( localize(
|
|
892
|
+
placeHolder: ( localize(9129, "Select the repository to view, type to filter all repositories"))
|
|
894
893
|
});
|
|
895
894
|
}
|
|
896
895
|
};
|
|
@@ -906,21 +905,21 @@ let HistoryItemRefPicker = class HistoryItemRefPicker extends Disposable {
|
|
|
906
905
|
this._quickInputService = _quickInputService;
|
|
907
906
|
this._allQuickPickItem = {
|
|
908
907
|
id: 'all',
|
|
909
|
-
label: ( localize(
|
|
910
|
-
description: ( localize(
|
|
908
|
+
label: ( localize(9109, "All")),
|
|
909
|
+
description: ( localize(9112, "All history item references")),
|
|
911
910
|
historyItemRef: 'all'
|
|
912
911
|
};
|
|
913
912
|
this._autoQuickPickItem = {
|
|
914
913
|
id: 'auto',
|
|
915
|
-
label: ( localize(
|
|
916
|
-
description: ( localize(
|
|
914
|
+
label: ( localize(9110, "Auto")),
|
|
915
|
+
description: ( localize(9130, "Current history item reference(s)")),
|
|
917
916
|
historyItemRef: 'auto'
|
|
918
917
|
};
|
|
919
918
|
}
|
|
920
919
|
async pickHistoryItemRef() {
|
|
921
920
|
const quickPick = this._quickInputService.createQuickPick({ useSeparators: true });
|
|
922
921
|
this._store.add(quickPick);
|
|
923
|
-
quickPick.placeholder = ( localize(
|
|
922
|
+
quickPick.placeholder = ( localize(9131, "Select one/more history item references to view, type to filter"));
|
|
924
923
|
quickPick.canSelectMany = true;
|
|
925
924
|
quickPick.hideCheckAll = true;
|
|
926
925
|
quickPick.busy = true;
|
|
@@ -1050,7 +1049,7 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
|
|
|
1050
1049
|
container.appendChild(element.root);
|
|
1051
1050
|
this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), element.root, {
|
|
1052
1051
|
markdown: {
|
|
1053
|
-
value: ( localize(
|
|
1052
|
+
value: ( localize(9132, "Please refresh the graph using the refresh action ($(refresh)).")),
|
|
1054
1053
|
supportThemeIcons: true
|
|
1055
1054
|
},
|
|
1056
1055
|
markdownNotSupportedFallback: undefined
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
|
|
2
2
|
import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
|
|
3
|
-
import './media/scm.css
|
|
3
|
+
import './media/scm.css';
|
|
4
4
|
import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
|
|
5
5
|
import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
|
|
6
6
|
import { ViewPane } from '@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane';
|
|
@@ -59,12 +59,13 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
|
|
|
59
59
|
return r.provider.label;
|
|
60
60
|
},
|
|
61
61
|
getWidgetAriaLabel() {
|
|
62
|
-
return localize(
|
|
62
|
+
return localize(9133, "Source Control Repositories");
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
65
|
});
|
|
66
66
|
this._register(this.list);
|
|
67
67
|
this._register(this.list.onDidChangeSelection(this.onListSelectionChange, this));
|
|
68
|
+
this._register(this.list.onDidChangeFocus(this.onDidChangeFocus, this));
|
|
68
69
|
this._register(this.list.onContextMenu(this.onListContextMenu, this));
|
|
69
70
|
this._register(this.scmViewService.onDidChangeRepositories(this.onDidChangeRepositories, this));
|
|
70
71
|
this._register(this.scmViewService.onDidChangeVisibleRepositories(this.updateListSelection, this));
|
|
@@ -127,6 +128,11 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
|
|
|
127
128
|
this.list.scrollTop = scrollTop;
|
|
128
129
|
}
|
|
129
130
|
}
|
|
131
|
+
onDidChangeFocus(e) {
|
|
132
|
+
if (e.browserEvent && e.elements.length > 0) {
|
|
133
|
+
this.scmViewService.focus(e.elements[0]);
|
|
134
|
+
}
|
|
135
|
+
}
|
|
130
136
|
updateListSelection() {
|
|
131
137
|
const oldSelection = this.list.getSelection();
|
|
132
138
|
const oldSet = ( new Set(( Iterable.map(oldSelection, i => this.list.element(i)))));
|
|
@@ -16,7 +16,7 @@ import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/ac
|
|
|
16
16
|
import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
|
|
17
17
|
import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
|
|
18
18
|
import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
|
|
19
|
-
import { IManagedHover } from "@codingame/monaco-vscode-
|
|
19
|
+
import { IManagedHover } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hover";
|
|
20
20
|
import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
|
|
21
21
|
export declare class RepositoryActionRunner extends ActionRunner {
|
|
22
22
|
private readonly getSelectedRepositories;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
|
|
2
2
|
import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
|
|
3
|
-
import './media/scm.css
|
|
3
|
+
import './media/scm.css';
|
|
4
4
|
import { combinedDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
5
5
|
import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
|
|
6
6
|
import { append, $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
|