@codingame/monaco-vscode-scm-service-override 37.2.0 → 37.3.0

package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js

@@ -68,7 +68,7 @@ import { SCMInputWidget } from './scmInput.js';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var ActionButtonRenderer_1, InputRenderer_1, ResourceGroupRenderer_1, ResourceRenderer_1;
-registerCss(scm);
+registerCss(scm, 1);
 function processResourceFilterData(uri, filterData) {
     if (!filterData) {
         return [undefined, undefined];
@@ -181,7 +181,7 @@ class SCMTreeDragAndDrop {
         const items = SCMTreeDragAndDrop.getResourcesFromDragAndDropData(data);
         if (originalEvent.dataTransfer && items?.length) {
             this.instantiationService.invokeFunction(accessor => fillEditorsDragData(accessor, items, originalEvent));
-            const fileResources = ( items.filter(s => s.scheme === Schemas.file).map(r => r.fsPath));
+            const fileResources = items.filter(s => s.scheme === Schemas.file).map(r => r.fsPath);
             if (fileResources.length) {
                 originalEvent.dataTransfer.setData(CodeDataTransfers.FILES, JSON.stringify(fileResources));
             }
@@ -400,7 +400,7 @@ class RepositoryPaneActionRunner extends ActionRunner {
         const selection = this.getSelectedResources().filter(r => isSCMResourceGroup(r) === isContextResourceGroup);
         const contextIsSelected = ( selection.some(s => s === context));
         const actualContext = contextIsSelected ? selection : [context];
-        const args = ( actualContext.map(e => ResourceTree.isResourceNode(e) ? ResourceTree.collect(e) : [e])).flat();
+        const args = actualContext.map(e => ResourceTree.isResourceNode(e) ? ResourceTree.collect(e) : [e]).flat();
         await action.run(...args);
     }
 }
@@ -533,7 +533,7 @@ let ResourceRenderer = class ResourceRenderer {
     renderCompressedElements(node, index, template) {
         const compressed = node.element;
         const folder = compressed.elements[compressed.elements.length - 1];
-        const label = ( compressed.elements.map(e => e.name));
+        const label = compressed.elements.map(e => e.name);
         const fileKind = FileKind.FOLDER;
         const matches = createMatches(node.filterData);
         template.fileLabel.setResource({
@@ -739,7 +739,7 @@ let SCMTreeKeyboardNavigationLabelProvider = class SCMTreeKeyboardNavigationLabe
     }
     getCompressedNodeKeyboardNavigationLabel(elements) {
         const folders = elements;
-        return ( folders.map(e => e.name)).join("/");
+        return folders.map(e => e.name).join("/");
     }
 };
 SCMTreeKeyboardNavigationLabelProvider = ( __decorate([( __param(1, ILabelService))], SCMTreeKeyboardNavigationLabelProvider));
@@ -785,7 +785,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
         this.labelService = labelService;
     }
     getWidgetAriaLabel() {
-        return localize(15825, "Source Control Management");
+        return localize(17964, "Source Control Management");
     }
     getAriaLabel(element) {
         if (ResourceTree.isResourceNode(element)) {
@@ -798,15 +798,15 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
         } else if (isSCMInput(element)) {
             const verbosity = this.configurationService.getValue(AccessibilityVerbositySettingId.SourceControl) === true;
             if (!verbosity || !this.accessibilityService.isScreenReaderOptimized()) {
-                return localize(15826, "Source Control Input");
+                return localize(17965, "Source Control Input");
             }
             const kbLabel = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
             return kbLabel ? ( localize(
-                15827,
+                17966,
                 "Source Control Input, Use {0} to open Source Control Accessibility Help.",
                 kbLabel
             )) : ( localize(
-                15828,
+                17967,
                 "Source Control Input, Run the Open Accessibility Help command for more information."
             ));
         } else if (isSCMActionButton(element)) {
@@ -841,33 +841,33 @@ const Menus = {
     ViewSort: ( new MenuId("SCMViewSort")),
     Repositories: ( new MenuId("SCMRepositories"))};
 const ContextKeys = {
-    SCMViewMode: ( new RawContextKey("scmViewMode", ViewMode.List)),
-    SCMViewSortKey: ( new RawContextKey("scmViewSortKey", ViewSortKey.Path)),
-    SCMViewAreAllRepositoriesCollapsed: ( new RawContextKey("scmViewAreAllRepositoriesCollapsed", false)),
-    SCMViewIsAnyRepositoryCollapsible: ( new RawContextKey("scmViewIsAnyRepositoryCollapsible", false)),
-    SCMProvider: ( new RawContextKey("scmProvider", undefined)),
-    SCMProviderRootUri: ( new RawContextKey("scmProviderRootUri", undefined)),
-    SCMProviderHasRootUri: ( new RawContextKey("scmProviderHasRootUri", undefined)),
-    SCMHistoryItemCount: ( new RawContextKey("scmHistoryItemCount", 0)),
-    SCMHistoryViewMode: ( new RawContextKey("scmHistoryViewMode", ViewMode.List)),
-    SCMCurrentHistoryItemRefHasRemote: ( new RawContextKey("scmCurrentHistoryItemRefHasRemote", false)),
-    SCMCurrentHistoryItemRefHasBase: ( new RawContextKey("scmCurrentHistoryItemRefHasBase", false)),
-    SCMCurrentHistoryItemRefInFilter: ( new RawContextKey("scmCurrentHistoryItemRefInFilter", false)),
-    RepositoryCount: ( new RawContextKey("scmRepositoryCount", 0)),
-    RepositoryVisibilityCount: ( new RawContextKey("scmRepositoryVisibleCount", 0)),
+    SCMViewMode: new RawContextKey("scmViewMode", ViewMode.List),
+    SCMViewSortKey: new RawContextKey("scmViewSortKey", ViewSortKey.Path),
+    SCMViewAreAllRepositoriesCollapsed: new RawContextKey("scmViewAreAllRepositoriesCollapsed", false),
+    SCMViewIsAnyRepositoryCollapsible: new RawContextKey("scmViewIsAnyRepositoryCollapsible", false),
+    SCMProvider: new RawContextKey("scmProvider", undefined),
+    SCMProviderRootUri: new RawContextKey("scmProviderRootUri", undefined),
+    SCMProviderHasRootUri: new RawContextKey("scmProviderHasRootUri", undefined),
+    SCMHistoryItemCount: new RawContextKey("scmHistoryItemCount", 0),
+    SCMHistoryViewMode: new RawContextKey("scmHistoryViewMode", ViewMode.List),
+    SCMCurrentHistoryItemRefHasRemote: new RawContextKey("scmCurrentHistoryItemRefHasRemote", false),
+    SCMCurrentHistoryItemRefHasBase: new RawContextKey("scmCurrentHistoryItemRefHasBase", false),
+    SCMCurrentHistoryItemRefInFilter: new RawContextKey("scmCurrentHistoryItemRefInFilter", false),
+    RepositoryCount: new RawContextKey("scmRepositoryCount", 0),
+    RepositoryVisibilityCount: new RawContextKey("scmRepositoryVisibleCount", 0),
     RepositoryVisibility(repository) {
-        return ( new RawContextKey(`scmRepositoryVisible:${repository.provider.id}`, false));
+        return new RawContextKey(`scmRepositoryVisible:${repository.provider.id}`, false);
     }
 };
 MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
-    title: ( localize(15829, "View & Sort")),
+    title: ( localize(17968, "View & Sort")),
     submenu: Menus.ViewSort,
     when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("view", VIEW_PANE_ID)), ( ContextKeys.RepositoryCount.notEqualsTo(0)))),
     group: "0_view&sort",
     order: 1
 });
 MenuRegistry.appendMenuItem(Menus.ViewSort, {
-    title: ( localize(15830, "Repositories")),
+    title: ( localize(17969, "Repositories")),
     submenu: Menus.Repositories,
     when: ContextKeyExpr.greater(ContextKeys.RepositoryCount.key, 1),
     group: "0_repositories"
@@ -959,7 +959,7 @@ class SetListViewModeAction extends ViewAction {
     constructor(id = "workbench.scm.action.setListViewMode", menu = {}) {
         super({
             id,
-            title: ( localize(15831, "View as List")),
+            title: ( localize(17970, "View as List")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.listTree,
@@ -990,7 +990,7 @@ class SetTreeViewModeAction extends ViewAction {
     constructor(id = "workbench.scm.action.setTreeViewMode", menu = {}) {
         super({
             id,
-            title: ( localize(15832, "View as Tree")),
+            title: ( localize(17971, "View as Tree")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.listFlat,
@@ -1044,17 +1044,17 @@ class RepositorySortAction extends Action2 {
 }
 class RepositorySortByDiscoveryTimeAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.DiscoveryTime, ( localize(15833, "Sort by Discovery Time")));
+        super(ISCMRepositorySortKey.DiscoveryTime, ( localize(17972, "Sort by Discovery Time")));
     }
 }
 class RepositorySortByNameAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.Name, ( localize(15834, "Sort by Name")));
+        super(ISCMRepositorySortKey.Name, ( localize(17973, "Sort by Name")));
     }
 }
 class RepositorySortByPathAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.Path, ( localize(15835, "Sort by Path")));
+        super(ISCMRepositorySortKey.Path, ( localize(17974, "Sort by Path")));
     }
 }
 registerAction2(RepositorySortByDiscoveryTimeAction);
@@ -1087,12 +1087,12 @@ class RepositorySelectionModeAction extends Action2 {
 }
 class RepositorySingleSelectionModeAction extends RepositorySelectionModeAction {
     constructor() {
-        super(ISCMRepositorySelectionMode.Single, ( localize(15836, "Select Single Repository")), 1);
+        super(ISCMRepositorySelectionMode.Single, ( localize(17975, "Select Single Repository")), 1);
     }
 }
 class RepositoryMultiSelectionModeAction extends RepositorySelectionModeAction {
     constructor() {
-        super(ISCMRepositorySelectionMode.Multiple, ( localize(15837, "Select Multiple Repositories")), 2);
+        super(ISCMRepositorySelectionMode.Multiple, ( localize(17976, "Select Multiple Repositories")), 2);
     }
 }
 registerAction2(RepositorySingleSelectionModeAction);
@@ -1119,17 +1119,17 @@ class SetSortKeyAction extends ViewAction {
 }
 class SetSortByNameAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Name, ( localize(15838, "Sort Changes by Name")));
+        super(ViewSortKey.Name, ( localize(17977, "Sort Changes by Name")));
     }
 }
 class SetSortByPathAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Path, ( localize(15839, "Sort Changes by Path")));
+        super(ViewSortKey.Path, ( localize(17978, "Sort Changes by Path")));
     }
 }
 class SetSortByStatusAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Status, ( localize(15840, "Sort Changes by Status")));
+        super(ViewSortKey.Status, ( localize(17979, "Sort Changes by Status")));
     }
 }
 registerAction2(SetSortByNameAction);
@@ -1139,7 +1139,7 @@ class CollapseAllRepositoriesAction extends ViewAction {
     constructor() {
         super({
             id: `workbench.scm.action.collapseAllRepositories`,
-            title: ( localize(15841, "Collapse All Repositories")),
+            title: ( localize(17980, "Collapse All Repositories")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.collapseAll,
@@ -1158,7 +1158,7 @@ class ExpandAllRepositoriesAction extends ViewAction {
     constructor() {
         super({
             id: `workbench.scm.action.expandAllRepositories`,
-            title: ( localize(15842, "Expand All Repositories")),
+            title: ( localize(17981, "Expand All Repositories")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.expandAll,
@@ -1179,7 +1179,7 @@ class CollapseAllAction extends ViewAction {
     constructor() {
         super({
             id: `workbench.scm.action.collapseAll`,
-            title: ( localize(15843, "Collapse All")),
+            title: ( localize(17982, "Collapse All")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.collapseAll,

package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.js

@@ -16,7 +16,7 @@ import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/w
 import { ViewPaneContainer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 
-registerCss(scm);
+registerCss(scm, 1);
 let SCMViewPaneContainer = class SCMViewPaneContainer extends ViewPaneContainer {
     constructor(
         layoutService,

package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.js

@@ -45,8 +45,8 @@ function getRepositoryName(workspaceContextService, repository) {
     return folder?.uri.toString() === ( repository.provider.rootUri.toString()) ? folder.name : basename(repository.provider.rootUri);
 }
 const RepositoryContextKeys = {
-    RepositorySortKey: ( new RawContextKey("scmRepositorySortKey", ISCMRepositorySortKey.DiscoveryTime)),
-    RepositorySelectionMode: ( new RawContextKey("scmRepositorySelectionMode", ISCMRepositorySelectionMode.Single))
+    RepositorySortKey: new RawContextKey("scmRepositorySortKey", ISCMRepositorySortKey.DiscoveryTime),
+    RepositorySelectionMode: new RawContextKey("scmRepositorySelectionMode", ISCMRepositorySelectionMode.Single)
 };
 let RepositoryPicker = class RepositoryPicker {
     constructor(
@@ -60,7 +60,7 @@ let RepositoryPicker = class RepositoryPicker {
         this._quickInputService = _quickInputService;
         this._scmViewService = _scmViewService;
         this._autoQuickPickItem = {
-            label: ( localize(15844, "Auto")),
+            label: ( localize(17983, "Auto")),
             description: this._autoQuickItemDescription,
             repository: "auto"
         };
@@ -72,7 +72,7 @@ let RepositoryPicker = class RepositoryPicker {
         const activeRepository = this._scmViewService.activeRepository.get();
         const repository = activeRepository?.repository;
         const pinned = activeRepository?.pinned === true;
-        picks.push(...( this._scmViewService.repositories.map(r => {
+        picks.push(...this._scmViewService.repositories.map(r => {
             const icon = getSCMRepositoryIcon(activeRepository, r);
             return {
                 label: r.provider.name,
@@ -80,7 +80,7 @@ let RepositoryPicker = class RepositoryPicker {
                 iconClass: ThemeIcon.asClassName(icon),
                 repository: r
             };
-        })));
+        }));
         const activeItem = pinned ? picks.find(p => p.type !== "separator" && p.repository === repository) : this._autoQuickPickItem;
         return this._quickInputService.pick(picks, {
             placeHolder: this._placeHolder,
@@ -91,13 +91,13 @@ let RepositoryPicker = class RepositoryPicker {
 RepositoryPicker = ( __decorate([( __param(2, IQuickInputService)), ( __param(3, ISCMViewService))], RepositoryPicker));
 let SCMViewService = class SCMViewService {
     get repositories() {
-        return ( this._repositories.filter(r => r.repository.provider.isHidden !== true).map(r => r.repository));
+        return this._repositories.filter(r => r.repository.provider.isHidden !== true).map(r => r.repository);
     }
     get visibleRepositories() {
         if (this._repositoriesSortKey === ISCMRepositorySortKey.DiscoveryTime) {
-            return ( this._repositories.filter(r => r.repository.provider.isHidden !== true && r.selectionIndex !== -1).sort((r1, r2) => r1.selectionIndex - r2.selectionIndex).map(r => r.repository));
+            return this._repositories.filter(r => r.repository.provider.isHidden !== true && r.selectionIndex !== -1).sort((r1, r2) => r1.selectionIndex - r2.selectionIndex).map(r => r.repository);
         }
-        return ( this._repositories.filter(r => r.repository.provider.isHidden !== true && r.selectionIndex !== -1).map(r => r.repository));
+        return this._repositories.filter(r => r.repository.provider.isHidden !== true && r.selectionIndex !== -1).map(r => r.repository);
     }
     set visibleRepositories(visibleRepositories) {
         const set = ( new Set(visibleRepositories));
@@ -350,7 +350,7 @@ let SCMViewService = class SCMViewService {
         }
         this._onDidChangeRepositories.fire({
             added,
-            removed: ( removed.map(r => r.repository))
+            removed: removed.map(r => r.repository)
         });
         if (removed.length === 1 && removed[0].focused && this.visibleRepositories.length > 0) {
             this.focus(this.visibleRepositories[0]);
@@ -433,7 +433,7 @@ let SCMViewService = class SCMViewService {
         return nameComparison;
     }
     getMaxSelectionIndex() {
-        return this._repositories.length === 0 ? -1 : Math.max(...( this._repositories.map(r => r.selectionIndex)));
+        return this._repositories.length === 0 ? -1 : Math.max(...this._repositories.map(r => r.selectionIndex));
     }
     getViewSortOrder() {
         const sortOder = this.configurationService.getValue("scm.repositories.sortOrder");
@@ -456,8 +456,8 @@ let SCMViewService = class SCMViewService {
         if (!this.didFinishLoadingRepositories.get()) {
             return;
         }
-        const all = ( this.repositories.map(r => getProviderStorageKey(r.provider)));
-        const visible = ( this.visibleRepositories.map(r => all.indexOf(getProviderStorageKey(r.provider))));
+        const all = this.repositories.map(r => getProviderStorageKey(r.provider));
+        const visible = this.visibleRepositories.map(r => all.indexOf(getProviderStorageKey(r.provider)));
         this.previousState = {
             all,
             visible,