@codingame/monaco-vscode-scm-service-override 4.5.1 → 4.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-scm-service-override",
-  "version": "4.5.1",
+  "version": "4.5.2",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.5.1"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.5.2"
   }
 }

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

@@ -18,6 +18,7 @@ import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { ITitleService } from 'vscode/vscode/vs/workbench/services/title/browser/titleService.service';
 
+const _moduleId = "vs/workbench/contrib/scm/browser/activity";
 function getCount(repository) {
     if (typeof repository.provider.count === 'number') {
         return repository.provider.count;
@@ -38,9 +39,9 @@ let SCMStatusController = class SCMStatusController {
         this.statusBarDisposable = Disposable.None;
         this.focusDisposable = Disposable.None;
         this.focusedRepository = undefined;
-        this.badgeDisposable = ( new MutableDisposable());
-        this.disposables = ( new DisposableStore());
-        this.repositoryDisposables = ( new Set());
+        this.badgeDisposable = ( (new MutableDisposable()));
+        this.disposables = ( (new DisposableStore()));
+        this.repositoryDisposables = ( (new Set()));
         this.scmService.onDidAddRepository(this.onDidAddRepository, this, this.disposables);
         this.scmService.onDidRemoveRepository(this.onDidRemoveRepository, this, this.disposables);
         const onDidChangeSCMCountBadge = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.countBadge'));
@@ -117,7 +118,7 @@ let SCMStatusController = class SCMStatusController {
         const label = repository.provider.rootUri
             ? `${basename(repository.provider.rootUri)} (${repository.provider.label})`
             : repository.provider.label;
-        const disposables = ( new DisposableStore());
+        const disposables = ( (new DisposableStore()));
         for (let index = 0; index < commands.length; index++) {
             const command = commands[index];
             const tooltip = `${label}${command.tooltip ? ` - ${command.tooltip}` : ''}`;
@@ -134,11 +135,7 @@ let SCMStatusController = class SCMStatusController {
                 repoAgnosticActionName = '';
             }
             const statusbarEntry = {
-                name: ( localizeWithPath(
-                    'vs/workbench/contrib/scm/browser/activity',
-                    'status.scm',
-                    "Source Control"
-                )) + (repoAgnosticActionName ? ` ${repoAgnosticActionName}` : ''),
+                name: ( localizeWithPath(_moduleId, 0, "Source Control")) + (repoAgnosticActionName ? ` ${repoAgnosticActionName}` : ''),
                 text: command.title,
                 ariaLabel: tooltip,
                 tooltip,
@@ -160,12 +157,7 @@ let SCMStatusController = class SCMStatusController {
             count = getCount(this.focusedRepository);
         }
         if (count > 0) {
-            const badge = ( new NumberBadge(count, num => ( localizeWithPath(
-                'vs/workbench/contrib/scm/browser/activity',
-                'scmPendingChangesBadge',
-                '{0} pending changes',
-                num
-            ))));
+            const badge = ( (new NumberBadge(count, num => ( localizeWithPath(_moduleId, 1, '{0} pending changes', num)))));
             this.badgeDisposable.value = this.activityService.showViewActivity(VIEW_PANE_ID, { badge });
         }
         else {
@@ -177,22 +169,22 @@ let SCMStatusController = class SCMStatusController {
         this.statusBarDisposable.dispose();
         this.badgeDisposable.dispose();
         this.disposables.dispose();
-        dispose(( this.repositoryDisposables.values()));
+        dispose(( (this.repositoryDisposables.values())));
         this.repositoryDisposables.clear();
     }
 };
-SCMStatusController = ( __decorate([
-    ( __param(0, ISCMService)),
-    ( __param(1, ISCMViewService)),
-    ( __param(2, IStatusbarService)),
-    ( __param(3, IActivityService)),
-    ( __param(4, IEditorService)),
-    ( __param(5, IConfigurationService)),
-    ( __param(6, IUriIdentityService))
-], SCMStatusController));
+SCMStatusController = ( (__decorate([
+    ( (__param(0, ISCMService))),
+    ( (__param(1, ISCMViewService))),
+    ( (__param(2, IStatusbarService))),
+    ( (__param(3, IActivityService))),
+    ( (__param(4, IEditorService))),
+    ( (__param(5, IConfigurationService))),
+    ( (__param(6, IUriIdentityService)))
+], SCMStatusController)));
 const ActiveRepositoryContextKeys = {
-    ActiveRepositoryName: ( new RawContextKey('scmActiveRepositoryName', '')),
-    ActiveRepositoryBranchName: ( new RawContextKey('scmActiveRepositoryBranchName', '')),
+    ActiveRepositoryName: ( (new RawContextKey('scmActiveRepositoryName', ''))),
+    ActiveRepositoryBranchName: ( (new RawContextKey('scmActiveRepositoryBranchName', ''))),
 };
 let SCMActiveRepositoryContextKeyController = class SCMActiveRepositoryContextKeyController {
     constructor(contextKeyService, editorService, scmViewService, titleService, uriIdentityService) {
@@ -201,7 +193,7 @@ let SCMActiveRepositoryContextKeyController = class SCMActiveRepositoryContextKe
         this.uriIdentityService = uriIdentityService;
         this.focusedRepository = undefined;
         this.focusDisposable = Disposable.None;
-        this.disposables = ( new DisposableStore());
+        this.disposables = ( (new DisposableStore()));
         this.activeRepositoryNameContextKey = ActiveRepositoryContextKeys.ActiveRepositoryName.bindTo(contextKeyService);
         this.activeRepositoryBranchNameContextKey = ActiveRepositoryContextKeys.ActiveRepositoryBranchName.bindTo(contextKeyService);
         titleService.registerVariables([
@@ -240,20 +232,20 @@ let SCMActiveRepositoryContextKeyController = class SCMActiveRepositoryContextKe
         this.disposables.dispose();
     }
 };
-SCMActiveRepositoryContextKeyController = ( __decorate([
-    ( __param(0, IContextKeyService)),
-    ( __param(1, IEditorService)),
-    ( __param(2, ISCMViewService)),
-    ( __param(3, ITitleService)),
-    ( __param(4, IUriIdentityService))
-], SCMActiveRepositoryContextKeyController));
+SCMActiveRepositoryContextKeyController = ( (__decorate([
+    ( (__param(0, IContextKeyService))),
+    ( (__param(1, IEditorService))),
+    ( (__param(2, ISCMViewService))),
+    ( (__param(3, ITitleService))),
+    ( (__param(4, IUriIdentityService)))
+], SCMActiveRepositoryContextKeyController)));
 let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyController {
     constructor(contextKeyService, editorService, scmService, uriIdentityService) {
         this.editorService = editorService;
         this.scmService = scmService;
         this.uriIdentityService = uriIdentityService;
-        this.disposables = ( new DisposableStore());
-        this.repositoryDisposables = ( new Set());
+        this.disposables = ( (new DisposableStore()));
+        this.repositoryDisposables = ( (new Set()));
         this.activeResourceHasChangesContextKey = contextKeyService.createKey('scmActiveResourceHasChanges', false);
         this.activeResourceRepositoryContextKey = contextKeyService.createKey('scmActiveResourceRepository', undefined);
         this.scmService.onDidAddRepository(this.onDidAddRepository, this, this.disposables);
@@ -280,10 +272,10 @@ let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyCon
             const activeResourceRepository = Iterable.find(this.scmService.repositories, r => Boolean(r.provider.rootUri && this.uriIdentityService.extUri.isEqualOrParent(activeResource, r.provider.rootUri)));
             this.activeResourceRepositoryContextKey.set(activeResourceRepository?.id);
             for (const resourceGroup of activeResourceRepository?.provider.groups ?? []) {
-                if (( resourceGroup.resources
+                if (( (resourceGroup.resources
                     .some(
                     scmResource => this.uriIdentityService.extUri.isEqual(activeResource, scmResource.sourceUri)
-                ))) {
+                )))) {
                     this.activeResourceHasChangesContextKey.set(true);
                     return;
                 }
@@ -297,15 +289,15 @@ let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyCon
     }
     dispose() {
         this.disposables.dispose();
-        dispose(( this.repositoryDisposables.values()));
+        dispose(( (this.repositoryDisposables.values())));
         this.repositoryDisposables.clear();
     }
 };
-SCMActiveResourceContextKeyController = ( __decorate([
-    ( __param(0, IContextKeyService)),
-    ( __param(1, IEditorService)),
-    ( __param(2, ISCMService)),
-    ( __param(3, IUriIdentityService))
-], SCMActiveResourceContextKeyController));
+SCMActiveResourceContextKeyController = ( (__decorate([
+    ( (__param(0, IContextKeyService))),
+    ( (__param(1, IEditorService))),
+    ( (__param(2, ISCMService))),
+    ( (__param(3, IUriIdentityService)))
+], SCMActiveResourceContextKeyController)));
 
 export { SCMActiveRepositoryContextKeyController, SCMActiveResourceContextKeyController, SCMStatusController };

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

@@ -12,12 +12,13 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
 import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
 
+const _moduleId = "vs/workbench/contrib/scm/browser/menus";
 function actionEquals(a, b) {
     return a.id === b.id;
 }
-const repositoryMenuDisposables = ( new DisposableStore());
+const repositoryMenuDisposables = ( (new DisposableStore()));
 MenuRegistry.onDidChangeMenu(e => {
-    if (( e.has(MenuId.SCMTitle))) {
+    if (( (e.has(MenuId.SCMTitle)))) {
         repositoryMenuDisposables.clear();
         for (const menuItem of MenuRegistry.getMenuItems(MenuId.SCMTitle)) {
             repositoryMenuDisposables.add(MenuRegistry.appendMenuItem(MenuId.SCMSourceControlInline, menuItem));
@@ -30,9 +31,9 @@ let SCMTitleMenu = class SCMTitleMenu {
     constructor(menuService, contextKeyService) {
         this._actions = [];
         this._secondaryActions = [];
-        this._onDidChangeTitle = ( new Emitter());
+        this._onDidChangeTitle = ( (new Emitter()));
         this.onDidChangeTitle = this._onDidChangeTitle.event;
-        this.disposables = ( new DisposableStore());
+        this.disposables = ( (new DisposableStore()));
         this.menu = menuService.createMenu(MenuId.SCMTitle, contextKeyService);
         this.disposables.add(this.menu);
         this.menu.onDidChange(this.updateTitleActions, this, this.disposables);
@@ -53,10 +54,10 @@ let SCMTitleMenu = class SCMTitleMenu {
         this.disposables.dispose();
     }
 };
-SCMTitleMenu = ( __decorate([
-    ( __param(0, IMenuService)),
-    ( __param(1, IContextKeyService))
-], SCMTitleMenu));
+SCMTitleMenu = ( (__decorate([
+    ( (__param(0, IMenuService))),
+    ( (__param(1, IContextKeyService)))
+], SCMTitleMenu)));
 class SCMMenusItem {
     get resourceGroupMenu() {
         if (!this._resourceGroupMenu) {
@@ -82,7 +83,7 @@ class SCMMenusItem {
             return this.genericResourceMenu;
         }
         if (!this.contextualResourceMenus) {
-            this.contextualResourceMenus = ( new Map());
+            this.contextualResourceMenus = ( (new Map()));
         }
         let item = this.contextualResourceMenus.get(resource.contextValue);
         if (!item) {
@@ -102,7 +103,7 @@ class SCMMenusItem {
         this._resourceFolderMenu?.dispose();
         this.genericResourceMenu?.dispose();
         if (this.contextualResourceMenus) {
-            dispose(( this.contextualResourceMenus.values()));
+            dispose(( (this.contextualResourceMenus.values())));
             this.contextualResourceMenus.clear();
             this.contextualResourceMenus = undefined;
         }
@@ -118,7 +119,7 @@ let SCMRepositoryMenus = class SCMRepositoryMenus {
     }
     get historyProviderMenu() {
         if (this.provider.historyProvider && !this._historyProviderMenu) {
-            this._historyProviderMenu = ( new SCMHistoryProviderMenus(this.contextKeyService, this.menuService));
+            this._historyProviderMenu = ( (new SCMHistoryProviderMenus(this.contextKeyService, this.menuService)));
             this.disposables.add(this._historyProviderMenu);
         }
         return this._historyProviderMenu;
@@ -126,14 +127,14 @@ let SCMRepositoryMenus = class SCMRepositoryMenus {
     constructor(provider, contextKeyService, instantiationService, menuService) {
         this.provider = provider;
         this.menuService = menuService;
-        this.resourceGroupMenusItems = ( new Map());
-        this.disposables = ( new DisposableStore());
+        this.resourceGroupMenusItems = ( (new Map()));
+        this.disposables = ( (new DisposableStore()));
         this.contextKeyService = contextKeyService.createOverlay([
             ['scmProvider', provider.contextValue],
             ['scmProviderRootUri', provider.rootUri?.toString()],
             ['scmProviderHasRootUri', !!provider.rootUri],
         ]);
-        const serviceCollection = ( new ServiceCollection([IContextKeyService, this.contextKeyService]));
+        const serviceCollection = ( (new ServiceCollection([IContextKeyService, this.contextKeyService])));
         instantiationService = instantiationService.createChild(serviceCollection);
         this.titleMenu = instantiationService.createInstance(SCMTitleMenu);
         this.disposables.add(this.titleMenu);
@@ -158,13 +159,13 @@ let SCMRepositoryMenus = class SCMRepositoryMenus {
                 ['scmResourceGroup', group.id],
                 ['multiDiffEditorEnableViewChanges', group.multiDiffEditorEnableViewChanges],
             ]);
-            result = ( new SCMMenusItem(contextKeyService, this.menuService));
+            result = ( (new SCMMenusItem(contextKeyService, this.menuService)));
             this.resourceGroupMenusItems.set(group, result);
         }
         return result;
     }
     onDidChangeResourceGroups() {
-        for (const resourceGroup of ( this.resourceGroupMenusItems.keys())) {
+        for (const resourceGroup of ( (this.resourceGroupMenusItems.keys()))) {
             if (!this.provider.groups.includes(resourceGroup)) {
                 this.resourceGroupMenusItems.get(resourceGroup)?.dispose();
                 this.resourceGroupMenusItems.delete(resourceGroup);
@@ -176,17 +177,17 @@ let SCMRepositoryMenus = class SCMRepositoryMenus {
         this.resourceGroupMenusItems.forEach(item => item.dispose());
     }
 };
-SCMRepositoryMenus = ( __decorate([
-    ( __param(1, IContextKeyService)),
-    ( __param(2, IInstantiationService)),
-    ( __param(3, IMenuService))
-], SCMRepositoryMenus));
+SCMRepositoryMenus = ( (__decorate([
+    ( (__param(1, IContextKeyService))),
+    ( (__param(2, IInstantiationService))),
+    ( (__param(3, IMenuService)))
+], SCMRepositoryMenus)));
 let SCMHistoryProviderMenus = class SCMHistoryProviderMenus {
     constructor(contextKeyService, menuService) {
         this.contextKeyService = contextKeyService;
         this.menuService = menuService;
-        this.historyItemMenus = ( new Map());
-        this.disposables = ( new DisposableStore());
+        this.historyItemMenus = ( (new Map()));
+        this.disposables = ( (new DisposableStore()));
     }
     getHistoryItemMenu(historyItem) {
         return this.getOrCreateHistoryItemMenu(historyItem);
@@ -233,15 +234,15 @@ let SCMHistoryProviderMenus = class SCMHistoryProviderMenus {
         this.disposables.dispose();
     }
 };
-SCMHistoryProviderMenus = ( __decorate([
-    ( __param(0, IContextKeyService)),
-    ( __param(1, IMenuService))
-], SCMHistoryProviderMenus));
+SCMHistoryProviderMenus = ( (__decorate([
+    ( (__param(0, IContextKeyService))),
+    ( (__param(1, IMenuService)))
+], SCMHistoryProviderMenus)));
 let SCMMenus = class SCMMenus {
     constructor(scmService, instantiationService) {
         this.instantiationService = instantiationService;
-        this.disposables = ( new DisposableStore());
-        this.menus = ( new Map());
+        this.disposables = ( (new DisposableStore()));
+        this.menus = ( (new Map()));
         this.titleMenu = instantiationService.createInstance(SCMTitleMenu);
         scmService.onDidRemoveRepository(this.onDidRemoveRepository, this, this.disposables);
     }
@@ -267,12 +268,12 @@ let SCMMenus = class SCMMenus {
         this.disposables.dispose();
     }
 };
-SCMMenus = ( __decorate([
-    ( __param(0, ISCMService)),
-    ( __param(1, IInstantiationService))
-], SCMMenus));
+SCMMenus = ( (__decorate([
+    ( (__param(0, ISCMService))),
+    ( (__param(1, IInstantiationService)))
+], SCMMenus)));
 MenuRegistry.appendMenuItem(MenuId.SCMResourceContext, {
-    title: ( localizeWithPath('vs/workbench/contrib/scm/browser/menus', 'miShare', "Share")),
+    title: ( localizeWithPath(_moduleId, 0, "Share")),
     submenu: MenuId.SCMResourceContextShare,
     group: '45_share',
     order: 3,