@codingame/monaco-vscode-scm-service-override 8.0.2 → 8.0.4
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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-scm-service-override",
|
|
3
|
-
"version": "8.0.
|
|
3
|
+
"version": "8.0.4",
|
|
4
4
|
"keywords": [],
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "CodinGame",
|
|
@@ -26,6 +26,6 @@
|
|
|
26
26
|
}
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"vscode": "npm:@codingame/monaco-vscode-api@8.0.
|
|
29
|
+
"vscode": "npm:@codingame/monaco-vscode-api@8.0.4"
|
|
30
30
|
}
|
|
31
31
|
}
|
|
@@ -59,7 +59,7 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
|
|
|
59
59
|
return r.provider.label;
|
|
60
60
|
},
|
|
61
61
|
getWidgetAriaLabel() {
|
|
62
|
-
return ( localize(
|
|
62
|
+
return ( localize(6402, "Source Control Repositories"));
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
65
|
});
|
|
@@ -119,10 +119,10 @@ import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/lay
|
|
|
119
119
|
import { fromNow } from 'vscode/vscode/vs/base/common/date';
|
|
120
120
|
|
|
121
121
|
var ActionButtonRenderer_1, InputRenderer_1, ResourceGroupRenderer_1, ResourceRenderer_1, HistoryItemGroupRenderer_1, HistoryItemRenderer_1, HistoryItem2Renderer_1, HistoryItemChangeRenderer_1, SeparatorRenderer_1, SCMInputWidget_1;
|
|
122
|
-
const historyItemAdditionsForeground = registerColor('scm.historyItemAdditionsForeground', 'gitDecoration.addedResourceForeground', ( localize(
|
|
123
|
-
const historyItemDeletionsForeground = registerColor('scm.historyItemDeletionsForeground', 'gitDecoration.deletedResourceForeground', ( localize(
|
|
124
|
-
registerColor('scm.historyItemStatisticsBorder', ( (transparent(foreground, 0.2))), ( localize(
|
|
125
|
-
registerColor('scm.historyItemSelectedStatisticsBorder', ( (transparent(listActiveSelectionForeground, 0.2))), ( localize(
|
|
122
|
+
const historyItemAdditionsForeground = registerColor('scm.historyItemAdditionsForeground', 'gitDecoration.addedResourceForeground', ( localize(6357, "History item additions foreground color.")));
|
|
123
|
+
const historyItemDeletionsForeground = registerColor('scm.historyItemDeletionsForeground', 'gitDecoration.deletedResourceForeground', ( localize(6358, "History item deletions foreground color.")));
|
|
124
|
+
registerColor('scm.historyItemStatisticsBorder', ( (transparent(foreground, 0.2))), ( localize(6359, "History item statistics border color.")));
|
|
125
|
+
registerColor('scm.historyItemSelectedStatisticsBorder', ( (transparent(listActiveSelectionForeground, 0.2))), ( localize(6360, "History item selected statistics border color.")));
|
|
126
126
|
function processResourceFilterData(uri, filterData) {
|
|
127
127
|
if (!filterData) {
|
|
128
128
|
return [undefined, undefined];
|
|
@@ -809,12 +809,12 @@ let HistoryItemRenderer = class HistoryItemRenderer {
|
|
|
809
809
|
if (historyItem.statistics) {
|
|
810
810
|
const statsAriaLabel = [
|
|
811
811
|
historyItem.statistics.files === 1 ?
|
|
812
|
-
( localize(
|
|
813
|
-
( localize(
|
|
814
|
-
historyItem.statistics.insertions === 1 ? ( localize(
|
|
815
|
-
historyItem.statistics.insertions > 1 ? ( localize(
|
|
816
|
-
historyItem.statistics.deletions === 1 ? ( localize(
|
|
817
|
-
historyItem.statistics.deletions > 1 ? ( localize(
|
|
812
|
+
( localize(6361, "{0} file changed", historyItem.statistics.files)) :
|
|
813
|
+
( localize(6362, "{0} files changed", historyItem.statistics.files)),
|
|
814
|
+
historyItem.statistics.insertions === 1 ? ( localize(6363, "{0} insertion{1}", historyItem.statistics.insertions, '(+)')) :
|
|
815
|
+
historyItem.statistics.insertions > 1 ? ( localize(6364, "{0} insertions{1}", historyItem.statistics.insertions, '(+)')) : '',
|
|
816
|
+
historyItem.statistics.deletions === 1 ? ( localize(6365, "{0} deletion{1}", historyItem.statistics.deletions, '(-)')) :
|
|
817
|
+
historyItem.statistics.deletions > 1 ? ( localize(6366, "{0} deletions{1}", historyItem.statistics.deletions, '(-)')) : ''
|
|
818
818
|
];
|
|
819
819
|
const statsTitle = statsAriaLabel.filter(l => l !== '').join(', ');
|
|
820
820
|
templateData.statsContainer.setAttribute('aria-label', statsTitle);
|
|
@@ -902,19 +902,19 @@ let HistoryItem2Renderer = class HistoryItem2Renderer {
|
|
|
902
902
|
if (historyItem.statistics) {
|
|
903
903
|
markdown.appendMarkdown(`---\n\n`);
|
|
904
904
|
markdown.appendMarkdown(`<span>${historyItem.statistics.files === 1 ?
|
|
905
|
-
( localize(
|
|
906
|
-
( localize(
|
|
905
|
+
( localize(6361, "{0} file changed", historyItem.statistics.files)) :
|
|
906
|
+
( localize(6362, "{0} files changed", historyItem.statistics.files))}</span>`);
|
|
907
907
|
if (historyItem.statistics.insertions) {
|
|
908
908
|
const historyItemAdditionsForegroundColor = colorTheme.getColor(historyItemAdditionsForeground);
|
|
909
909
|
markdown.appendMarkdown(`, <span style="color:${historyItemAdditionsForegroundColor};">${historyItem.statistics.insertions === 1 ?
|
|
910
|
-
( localize(
|
|
911
|
-
( localize(
|
|
910
|
+
( localize(6363, "{0} insertion{1}", historyItem.statistics.insertions, '(+)')) :
|
|
911
|
+
( localize(6364, "{0} insertions{1}", historyItem.statistics.insertions, '(+)'))}</span>`);
|
|
912
912
|
}
|
|
913
913
|
if (historyItem.statistics.deletions) {
|
|
914
914
|
const historyItemDeletionsForegroundColor = colorTheme.getColor(historyItemDeletionsForeground);
|
|
915
915
|
markdown.appendMarkdown(`, <span style="color:${historyItemDeletionsForegroundColor};">${historyItem.statistics.deletions === 1 ?
|
|
916
|
-
( localize(
|
|
917
|
-
( localize(
|
|
916
|
+
( localize(6365, "{0} deletion{1}", historyItem.statistics.deletions, '(-)')) :
|
|
917
|
+
( localize(6366, "{0} deletions{1}", historyItem.statistics.deletions, '(-)'))}</span>`);
|
|
918
918
|
}
|
|
919
919
|
}
|
|
920
920
|
if (historyItem.labels) {
|
|
@@ -1341,7 +1341,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
|
|
|
1341
1341
|
this.labelService = labelService;
|
|
1342
1342
|
}
|
|
1343
1343
|
getWidgetAriaLabel() {
|
|
1344
|
-
return ( localize(
|
|
1344
|
+
return ( localize(6367, "Source Control Management"));
|
|
1345
1345
|
}
|
|
1346
1346
|
getAriaLabel(element) {
|
|
1347
1347
|
if (ResourceTree.isResourceNode(element)) {
|
|
@@ -1351,7 +1351,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
|
|
|
1351
1351
|
return `${element.provider.name} ${element.provider.label}`;
|
|
1352
1352
|
}
|
|
1353
1353
|
else if (isSCMInput(element)) {
|
|
1354
|
-
return ( localize(
|
|
1354
|
+
return ( localize(6368, "Source Control Input"));
|
|
1355
1355
|
}
|
|
1356
1356
|
else if (isSCMActionButton(element)) {
|
|
1357
1357
|
return element.button?.command.title ?? '';
|
|
@@ -1430,7 +1430,7 @@ const ContextKeys = {
|
|
|
1430
1430
|
}
|
|
1431
1431
|
};
|
|
1432
1432
|
MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
|
|
1433
|
-
title: ( localize(
|
|
1433
|
+
title: ( localize(6369, "View & Sort")),
|
|
1434
1434
|
submenu: Menus.ViewSort,
|
|
1435
1435
|
when: ( (ContextKeyExpr.and(
|
|
1436
1436
|
(ContextKeyExpr.equals('view', VIEW_PANE_ID)),
|
|
@@ -1440,7 +1440,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
|
|
|
1440
1440
|
order: 1
|
|
1441
1441
|
});
|
|
1442
1442
|
MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
|
|
1443
|
-
title: ( localize(
|
|
1443
|
+
title: ( localize(6370, "Incoming & Outgoing")),
|
|
1444
1444
|
submenu: Menus.ChangesSettings,
|
|
1445
1445
|
when: ( (ContextKeyExpr.and(
|
|
1446
1446
|
(ContextKeyExpr.equals('view', VIEW_PANE_ID)),
|
|
@@ -1451,7 +1451,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
|
|
|
1451
1451
|
order: 2
|
|
1452
1452
|
});
|
|
1453
1453
|
MenuRegistry.appendMenuItem(Menus.ViewSort, {
|
|
1454
|
-
title: ( localize(
|
|
1454
|
+
title: ( localize(6371, "Repositories")),
|
|
1455
1455
|
submenu: Menus.Repositories,
|
|
1456
1456
|
when: ContextKeyExpr.greater(ContextKeys.RepositoryCount.key, 1),
|
|
1457
1457
|
group: '0_repositories'
|
|
@@ -1472,14 +1472,14 @@ class SCMChangesSettingAction extends Action2 {
|
|
|
1472
1472
|
}
|
|
1473
1473
|
}
|
|
1474
1474
|
MenuRegistry.appendMenuItem(MenuId.SCMChangesSeparator, {
|
|
1475
|
-
title: ( localize(
|
|
1475
|
+
title: ( localize(6372, "Show Incoming Changes")),
|
|
1476
1476
|
submenu: MenuId.SCMIncomingChangesSetting,
|
|
1477
1477
|
group: '1_incoming&outgoing',
|
|
1478
1478
|
order: 1,
|
|
1479
1479
|
when: ( (ContextKeyExpr.equals('config.scm.showHistoryGraph', false)))
|
|
1480
1480
|
});
|
|
1481
1481
|
MenuRegistry.appendMenuItem(Menus.ChangesSettings, {
|
|
1482
|
-
title: ( localize(
|
|
1482
|
+
title: ( localize(6372, "Show Incoming Changes")),
|
|
1483
1483
|
submenu: MenuId.SCMIncomingChangesSetting,
|
|
1484
1484
|
group: '1_incoming&outgoing',
|
|
1485
1485
|
order: 1,
|
|
@@ -1489,7 +1489,7 @@ registerAction2(class extends SCMChangesSettingAction {
|
|
|
1489
1489
|
constructor() {
|
|
1490
1490
|
super('scm.showIncomingChanges', 'always', {
|
|
1491
1491
|
id: 'workbench.scm.action.showIncomingChanges.always',
|
|
1492
|
-
title: ( localize(
|
|
1492
|
+
title: ( localize(6373, "Always")),
|
|
1493
1493
|
menu: { id: MenuId.SCMIncomingChangesSetting },
|
|
1494
1494
|
});
|
|
1495
1495
|
}
|
|
@@ -1498,7 +1498,7 @@ registerAction2(class extends SCMChangesSettingAction {
|
|
|
1498
1498
|
constructor() {
|
|
1499
1499
|
super('scm.showIncomingChanges', 'auto', {
|
|
1500
1500
|
id: 'workbench.scm.action.showIncomingChanges.auto',
|
|
1501
|
-
title: ( localize(
|
|
1501
|
+
title: ( localize(6374, "Auto")),
|
|
1502
1502
|
menu: {
|
|
1503
1503
|
id: MenuId.SCMIncomingChangesSetting,
|
|
1504
1504
|
}
|
|
@@ -1509,7 +1509,7 @@ registerAction2(class extends SCMChangesSettingAction {
|
|
|
1509
1509
|
constructor() {
|
|
1510
1510
|
super('scm.showIncomingChanges', 'never', {
|
|
1511
1511
|
id: 'workbench.scm.action.showIncomingChanges.never',
|
|
1512
|
-
title: ( localize(
|
|
1512
|
+
title: ( localize(6375, "Never")),
|
|
1513
1513
|
menu: {
|
|
1514
1514
|
id: MenuId.SCMIncomingChangesSetting,
|
|
1515
1515
|
}
|
|
@@ -1517,14 +1517,14 @@ registerAction2(class extends SCMChangesSettingAction {
|
|
|
1517
1517
|
}
|
|
1518
1518
|
});
|
|
1519
1519
|
MenuRegistry.appendMenuItem(MenuId.SCMChangesSeparator, {
|
|
1520
|
-
title: ( localize(
|
|
1520
|
+
title: ( localize(6376, "Show Outgoing Changes")),
|
|
1521
1521
|
submenu: MenuId.SCMOutgoingChangesSetting,
|
|
1522
1522
|
group: '1_incoming&outgoing',
|
|
1523
1523
|
order: 2,
|
|
1524
1524
|
when: ( (ContextKeyExpr.equals('config.scm.showHistoryGraph', false)))
|
|
1525
1525
|
});
|
|
1526
1526
|
MenuRegistry.appendMenuItem(Menus.ChangesSettings, {
|
|
1527
|
-
title: ( localize(
|
|
1527
|
+
title: ( localize(6376, "Show Outgoing Changes")),
|
|
1528
1528
|
submenu: MenuId.SCMOutgoingChangesSetting,
|
|
1529
1529
|
group: '1_incoming&outgoing',
|
|
1530
1530
|
order: 2,
|
|
@@ -1534,7 +1534,7 @@ registerAction2(class extends SCMChangesSettingAction {
|
|
|
1534
1534
|
constructor() {
|
|
1535
1535
|
super('scm.showOutgoingChanges', 'always', {
|
|
1536
1536
|
id: 'workbench.scm.action.showOutgoingChanges.always',
|
|
1537
|
-
title: ( localize(
|
|
1537
|
+
title: ( localize(6373, "Always")),
|
|
1538
1538
|
menu: {
|
|
1539
1539
|
id: MenuId.SCMOutgoingChangesSetting,
|
|
1540
1540
|
}
|
|
@@ -1545,7 +1545,7 @@ registerAction2(class extends SCMChangesSettingAction {
|
|
|
1545
1545
|
constructor() {
|
|
1546
1546
|
super('scm.showOutgoingChanges', 'auto', {
|
|
1547
1547
|
id: 'workbench.scm.action.showOutgoingChanges.auto',
|
|
1548
|
-
title: ( localize(
|
|
1548
|
+
title: ( localize(6374, "Auto")),
|
|
1549
1549
|
menu: {
|
|
1550
1550
|
id: MenuId.SCMOutgoingChangesSetting,
|
|
1551
1551
|
}
|
|
@@ -1556,7 +1556,7 @@ registerAction2(class extends SCMChangesSettingAction {
|
|
|
1556
1556
|
constructor() {
|
|
1557
1557
|
super('scm.showOutgoingChanges', 'never', {
|
|
1558
1558
|
id: 'workbench.scm.action.showOutgoingChanges.never',
|
|
1559
|
-
title: ( localize(
|
|
1559
|
+
title: ( localize(6375, "Never")),
|
|
1560
1560
|
menu: {
|
|
1561
1561
|
id: MenuId.SCMOutgoingChangesSetting,
|
|
1562
1562
|
}
|
|
@@ -1567,7 +1567,7 @@ registerAction2(class extends Action2 {
|
|
|
1567
1567
|
constructor() {
|
|
1568
1568
|
super({
|
|
1569
1569
|
id: 'workbench.scm.action.scm.showChangesSummary',
|
|
1570
|
-
title: ( localize(
|
|
1570
|
+
title: ( localize(6377, "Show Changes Summary")),
|
|
1571
1571
|
f1: false,
|
|
1572
1572
|
toggled: ( (ContextKeyExpr.equals('config.scm.showChangesSummary', true))),
|
|
1573
1573
|
menu: [
|
|
@@ -1594,7 +1594,7 @@ registerAction2(class extends Action2 {
|
|
|
1594
1594
|
constructor() {
|
|
1595
1595
|
super({
|
|
1596
1596
|
id: 'workbench.scm.action.scm.viewChanges',
|
|
1597
|
-
title: ( localize(
|
|
1597
|
+
title: ( localize(6378, "View Changes")),
|
|
1598
1598
|
f1: false,
|
|
1599
1599
|
menu: [
|
|
1600
1600
|
{
|
|
@@ -1627,7 +1627,7 @@ registerAction2(class extends Action2 {
|
|
|
1627
1627
|
const title = historyItems.length === 1 ?
|
|
1628
1628
|
`${historyItems[0].id.substring(0, 8)} - ${historyItems[0].message}` :
|
|
1629
1629
|
( localize(
|
|
1630
|
-
|
|
1630
|
+
6379,
|
|
1631
1631
|
"All Changes ({0} ↔ {1})",
|
|
1632
1632
|
historyItem.id.substring(0, 8),
|
|
1633
1633
|
historyItemLast.id.substring(0, 8)
|
|
@@ -1730,7 +1730,7 @@ class SetListViewModeAction extends ViewAction {
|
|
|
1730
1730
|
constructor(id = 'workbench.scm.action.setListViewMode', menu = {}) {
|
|
1731
1731
|
super({
|
|
1732
1732
|
id,
|
|
1733
|
-
title: ( localize(
|
|
1733
|
+
title: ( localize(6380, "View as List")),
|
|
1734
1734
|
viewId: VIEW_PANE_ID,
|
|
1735
1735
|
f1: false,
|
|
1736
1736
|
icon: Codicon.listTree,
|
|
@@ -1760,7 +1760,7 @@ class SetTreeViewModeAction extends ViewAction {
|
|
|
1760
1760
|
constructor(id = 'workbench.scm.action.setTreeViewMode', menu = {}) {
|
|
1761
1761
|
super({
|
|
1762
1762
|
id,
|
|
1763
|
-
title: ( localize(
|
|
1763
|
+
title: ( localize(6381, "View as Tree")),
|
|
1764
1764
|
viewId: VIEW_PANE_ID,
|
|
1765
1765
|
f1: false,
|
|
1766
1766
|
icon: Codicon.listFlat,
|
|
@@ -1817,17 +1817,17 @@ class RepositorySortAction extends ViewAction {
|
|
|
1817
1817
|
}
|
|
1818
1818
|
class RepositorySortByDiscoveryTimeAction extends RepositorySortAction {
|
|
1819
1819
|
constructor() {
|
|
1820
|
-
super(ISCMRepositorySortKey.DiscoveryTime, ( localize(
|
|
1820
|
+
super(ISCMRepositorySortKey.DiscoveryTime, ( localize(6382, "Sort by Discovery Time")));
|
|
1821
1821
|
}
|
|
1822
1822
|
}
|
|
1823
1823
|
class RepositorySortByNameAction extends RepositorySortAction {
|
|
1824
1824
|
constructor() {
|
|
1825
|
-
super(ISCMRepositorySortKey.Name, ( localize(
|
|
1825
|
+
super(ISCMRepositorySortKey.Name, ( localize(6383, "Sort by Name")));
|
|
1826
1826
|
}
|
|
1827
1827
|
}
|
|
1828
1828
|
class RepositorySortByPathAction extends RepositorySortAction {
|
|
1829
1829
|
constructor() {
|
|
1830
|
-
super(ISCMRepositorySortKey.Path, ( localize(
|
|
1830
|
+
super(ISCMRepositorySortKey.Path, ( localize(6384, "Sort by Path")));
|
|
1831
1831
|
}
|
|
1832
1832
|
}
|
|
1833
1833
|
registerAction2(RepositorySortByDiscoveryTimeAction);
|
|
@@ -1852,17 +1852,17 @@ class SetSortKeyAction extends ViewAction {
|
|
|
1852
1852
|
}
|
|
1853
1853
|
class SetSortByNameAction extends SetSortKeyAction {
|
|
1854
1854
|
constructor() {
|
|
1855
|
-
super(ViewSortKey.Name, ( localize(
|
|
1855
|
+
super(ViewSortKey.Name, ( localize(6385, "Sort Changes by Name")));
|
|
1856
1856
|
}
|
|
1857
1857
|
}
|
|
1858
1858
|
class SetSortByPathAction extends SetSortKeyAction {
|
|
1859
1859
|
constructor() {
|
|
1860
|
-
super(ViewSortKey.Path, ( localize(
|
|
1860
|
+
super(ViewSortKey.Path, ( localize(6386, "Sort Changes by Path")));
|
|
1861
1861
|
}
|
|
1862
1862
|
}
|
|
1863
1863
|
class SetSortByStatusAction extends SetSortKeyAction {
|
|
1864
1864
|
constructor() {
|
|
1865
|
-
super(ViewSortKey.Status, ( localize(
|
|
1865
|
+
super(ViewSortKey.Status, ( localize(6387, "Sort Changes by Status")));
|
|
1866
1866
|
}
|
|
1867
1867
|
}
|
|
1868
1868
|
registerAction2(SetSortByNameAction);
|
|
@@ -1872,7 +1872,7 @@ class CollapseAllRepositoriesAction extends ViewAction {
|
|
|
1872
1872
|
constructor() {
|
|
1873
1873
|
super({
|
|
1874
1874
|
id: `workbench.scm.action.collapseAllRepositories`,
|
|
1875
|
-
title: ( localize(
|
|
1875
|
+
title: ( localize(6388, "Collapse All Repositories")),
|
|
1876
1876
|
viewId: VIEW_PANE_ID,
|
|
1877
1877
|
f1: false,
|
|
1878
1878
|
icon: Codicon.collapseAll,
|
|
@@ -1895,7 +1895,7 @@ class ExpandAllRepositoriesAction extends ViewAction {
|
|
|
1895
1895
|
constructor() {
|
|
1896
1896
|
super({
|
|
1897
1897
|
id: `workbench.scm.action.expandAllRepositories`,
|
|
1898
|
-
title: ( localize(
|
|
1898
|
+
title: ( localize(6389, "Expand All Repositories")),
|
|
1899
1899
|
viewId: VIEW_PANE_ID,
|
|
1900
1900
|
f1: false,
|
|
1901
1901
|
icon: Codicon.expandAll,
|
|
@@ -1974,10 +1974,10 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
|
|
|
1974
1974
|
this._onDidChange = ( (new Emitter()));
|
|
1975
1975
|
this.onDidChange = this._onDidChange.event;
|
|
1976
1976
|
this._disposables = this._register(( (new MutableDisposable())));
|
|
1977
|
-
this._dropdownAction = ( (new Action('scmInputMoreActions', ( localize(
|
|
1977
|
+
this._dropdownAction = ( (new Action('scmInputMoreActions', ( localize(6390, "More Actions...")), 'codicon-chevron-down')));
|
|
1978
1978
|
this._cancelAction = ( (new MenuItemAction({
|
|
1979
1979
|
id: SCMInputWidgetCommandId.CancelAction,
|
|
1980
|
-
title: ( localize(
|
|
1980
|
+
title: ( localize(6391, "Cancel")),
|
|
1981
1981
|
icon: Codicon.debugStop,
|
|
1982
1982
|
}, undefined, undefined, undefined, undefined, contextKeyService, commandService)));
|
|
1983
1983
|
}
|
|
@@ -2427,7 +2427,7 @@ let SCMInputWidget = class SCMInputWidget {
|
|
|
2427
2427
|
}
|
|
2428
2428
|
const actionsContainer = append(validationContainer, $('.scm-editor-validation-actions'));
|
|
2429
2429
|
const actionbar = ( (new ActionBar(actionsContainer)));
|
|
2430
|
-
const action = ( (new Action('scmInputWidget.validationMessage.close', ( localize(
|
|
2430
|
+
const action = ( (new Action('scmInputWidget.validationMessage.close', ( localize(6392, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
|
|
2431
2431
|
this.contextViewService.hideContextView();
|
|
2432
2432
|
this.element.style.borderBottomLeftRadius = '2px';
|
|
2433
2433
|
this.element.style.borderBottomRightRadius = '2px';
|
|
@@ -3264,7 +3264,7 @@ let SCMTreeHistoryProviderDataSource = class SCMTreeHistoryProviderDataSource ex
|
|
|
3264
3264
|
incomingHistoryItemGroup = currentHistoryItemGroup.remote ? {
|
|
3265
3265
|
id: currentHistoryItemGroup.remote.id,
|
|
3266
3266
|
label: currentHistoryItemGroup.remote.name,
|
|
3267
|
-
ariaLabel: ( localize(
|
|
3267
|
+
ariaLabel: ( localize(6393, "Incoming changes from {0}", currentHistoryItemGroup.remote.name)),
|
|
3268
3268
|
icon: Codicon.arrowCircleDown,
|
|
3269
3269
|
direction: 'incoming',
|
|
3270
3270
|
ancestor: ancestor.id,
|
|
@@ -3275,7 +3275,7 @@ let SCMTreeHistoryProviderDataSource = class SCMTreeHistoryProviderDataSource ex
|
|
|
3275
3275
|
outgoingHistoryItemGroup = {
|
|
3276
3276
|
id: currentHistoryItemGroup.id,
|
|
3277
3277
|
label: currentHistoryItemGroup.name,
|
|
3278
|
-
ariaLabel: ( localize(
|
|
3278
|
+
ariaLabel: ( localize(6394, "Outgoing changes to {0}", currentHistoryItemGroup.name)),
|
|
3279
3279
|
icon: Codicon.arrowCircleUp,
|
|
3280
3280
|
direction: 'outgoing',
|
|
3281
3281
|
ancestor: ancestor.id,
|
|
@@ -3337,7 +3337,7 @@ let SCMTreeHistoryProviderDataSource = class SCMTreeHistoryProviderDataSource ex
|
|
|
3337
3337
|
children.push({
|
|
3338
3338
|
...historyItemsElement[0],
|
|
3339
3339
|
icon: historyItemsElement[0].icon ?? Codicon.files,
|
|
3340
|
-
message: ( localize(
|
|
3340
|
+
message: ( localize(6395, "All Changes")),
|
|
3341
3341
|
historyItemGroup: element,
|
|
3342
3342
|
type: 'allChanges'
|
|
3343
3343
|
});
|
|
@@ -3522,25 +3522,25 @@ let SCMTreeDataSource = class SCMTreeDataSource extends Disposable {
|
|
|
3522
3522
|
}
|
|
3523
3523
|
const historyItemGroups = await this.historyProviderDataSource.getHistoryItemGroups(inputOrElement);
|
|
3524
3524
|
if (historyItemGroups.length > 0) {
|
|
3525
|
-
let label = ( localize(
|
|
3526
|
-
let ariaLabel = ( localize(
|
|
3525
|
+
let label = ( localize(6396, "Incoming/Outgoing"));
|
|
3526
|
+
let ariaLabel = ( localize(6397, "Incoming and outgoing changes"));
|
|
3527
3527
|
const incomingHistoryItems = historyItemGroups.find(g => g.direction === 'incoming');
|
|
3528
3528
|
const outgoingHistoryItems = historyItemGroups.find(g => g.direction === 'outgoing');
|
|
3529
3529
|
if (incomingHistoryItems && !outgoingHistoryItems) {
|
|
3530
|
-
label = ( localize(
|
|
3531
|
-
ariaLabel = ( localize(
|
|
3530
|
+
label = ( localize(6398, "Incoming"));
|
|
3531
|
+
ariaLabel = ( localize(6399, "Incoming changes"));
|
|
3532
3532
|
}
|
|
3533
3533
|
else if (!incomingHistoryItems && outgoingHistoryItems) {
|
|
3534
|
-
label = ( localize(
|
|
3535
|
-
ariaLabel = ( localize(
|
|
3534
|
+
label = ( localize(6400, "Outgoing"));
|
|
3535
|
+
ariaLabel = ( localize(6401, "Outgoing changes"));
|
|
3536
3536
|
}
|
|
3537
3537
|
children.push({ label, ariaLabel, repository: inputOrElement, type: 'separator' });
|
|
3538
3538
|
}
|
|
3539
3539
|
children.push(...historyItemGroups);
|
|
3540
3540
|
const historyItems = await this.historyProviderDataSource.getHistoryItems2(inputOrElement);
|
|
3541
3541
|
if (historyItems.length > 0) {
|
|
3542
|
-
const label = ( localize(
|
|
3543
|
-
const ariaLabel = ( localize(
|
|
3542
|
+
const label = ( localize(6396, "Incoming/Outgoing"));
|
|
3543
|
+
const ariaLabel = ( localize(6397, "Incoming and outgoing changes"));
|
|
3544
3544
|
children.push({ label, ariaLabel, repository: inputOrElement, type: 'separator' });
|
|
3545
3545
|
}
|
|
3546
3546
|
children.push(...historyItems);
|