@codingame/monaco-vscode-scm-service-override 5.3.0 → 6.0.1

package/package.json

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

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

@@ -2,13 +2,14 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { basename } from 'vscode/vscode/vs/base/common/resources';
 import { Disposable, MutableDisposable, DisposableStore, combinedDisposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
-import { Event } from 'vscode/vscode/vs/base/common/event';
+import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
 import { VIEW_PANE_ID } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { ISCMService, ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { NumberBadge } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
 import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity.service';
 import { RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -17,6 +18,7 @@ import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/commo
 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';
+import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 
 const _moduleId = "vs/workbench/contrib/scm/browser/activity";
 function getCount(repository) {
@@ -142,8 +144,8 @@ let SCMStatusController = class SCMStatusController {
                 command: command.id ? command : undefined
             };
             disposables.add(index === 0 ?
-                this.statusbarService.addEntry(statusbarEntry, `status.scm.${index}`, 0 , 10000) :
-                this.statusbarService.addEntry(statusbarEntry, `status.scm.${index}`, 0 , { id: `status.scm.${index - 1}`, alignment: 1 , compact: true }));
+                this.statusbarService.addEntry(statusbarEntry, `status.scm.${index}`, StatusbarAlignment.LEFT, 10000) :
+                this.statusbarService.addEntry(statusbarEntry, `status.scm.${index}`, StatusbarAlignment.LEFT, { id: `status.scm.${index - 1}`, alignment: StatusbarAlignment.RIGHT, compact: true }));
         }
         this.statusBarDisposable = disposables;
     }
@@ -240,64 +242,79 @@ SCMActiveRepositoryContextKeyController = ( (__decorate([
     ( (__param(4, IUriIdentityService)))
 ], SCMActiveRepositoryContextKeyController)));
 let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyController {
-    constructor(contextKeyService, editorService, scmService, uriIdentityService) {
-        this.editorService = editorService;
+    constructor(editorGroupsService, scmService, uriIdentityService) {
         this.scmService = scmService;
         this.uriIdentityService = uriIdentityService;
         this.disposables = ( (new DisposableStore()));
         this.repositoryDisposables = ( (new Set()));
-        this.activeResourceHasChangesContextKey = contextKeyService.createKey('scmActiveResourceHasChanges', false);
-        this.activeResourceRepositoryContextKey = contextKeyService.createKey('scmActiveResourceRepository', undefined);
+        this.onDidRepositoryChange = ( (new Emitter()));
+        const activeResourceHasChangesContextKey = ( (new RawContextKey('scmActiveResourceHasChanges', false, ( localizeWithPath(_moduleId, 2, "Whether the active resource has changes")))));
+        const activeResourceRepositoryContextKey = ( (new RawContextKey('scmActiveResourceRepository', undefined, ( localizeWithPath(_moduleId, 3, "The active resource's repository")))));
         this.scmService.onDidAddRepository(this.onDidAddRepository, this, this.disposables);
         for (const repository of this.scmService.repositories) {
             this.onDidAddRepository(repository);
         }
-        editorService.onDidActiveEditorChange(this.updateContextKey, this, this.disposables);
+        const hasChangesContextKeyProvider = {
+            contextKey: activeResourceHasChangesContextKey,
+            getGroupContextKeyValue: (group) => this.getEditorHasChanges(group.activeEditor),
+            onDidChange: this.onDidRepositoryChange.event
+        };
+        const repositoryContextKeyProvider = {
+            contextKey: activeResourceRepositoryContextKey,
+            getGroupContextKeyValue: (group) => this.getEditorRepositoryId(group.activeEditor),
+            onDidChange: this.onDidRepositoryChange.event
+        };
+        this.disposables.add(editorGroupsService.registerContextKeyProvider(hasChangesContextKeyProvider));
+        this.disposables.add(editorGroupsService.registerContextKeyProvider(repositoryContextKeyProvider));
     }
     onDidAddRepository(repository) {
         const onDidChange = Event.any(repository.provider.onDidChange, repository.provider.onDidChangeResources);
-        const changeDisposable = onDidChange(() => this.updateContextKey());
+        const changeDisposable = onDidChange(() => {
+            this.onDidRepositoryChange.fire();
+        });
         const onDidRemove = Event.filter(this.scmService.onDidRemoveRepository, e => e === repository);
         const removeDisposable = onDidRemove(() => {
             disposable.dispose();
             this.repositoryDisposables.delete(disposable);
-            this.updateContextKey();
+            this.onDidRepositoryChange.fire();
         });
         const disposable = combinedDisposable(changeDisposable, removeDisposable);
         this.repositoryDisposables.add(disposable);
     }
-    updateContextKey() {
-        const activeResource = EditorResourceAccessor.getOriginalUri(this.editorService.activeEditor);
+    getEditorRepositoryId(activeEditor) {
+        const activeResource = EditorResourceAccessor.getOriginalUri(activeEditor);
+        if (activeResource?.scheme === Schemas.file || activeResource?.scheme === Schemas.vscodeRemote) {
+            const activeResourceRepository = Iterable.find(this.scmService.repositories, r => Boolean(r.provider.rootUri && this.uriIdentityService.extUri.isEqualOrParent(activeResource, r.provider.rootUri)));
+            return activeResourceRepository?.id;
+        }
+        return undefined;
+    }
+    getEditorHasChanges(activeEditor) {
+        const activeResource = EditorResourceAccessor.getOriginalUri(activeEditor);
         if (activeResource?.scheme === Schemas.file || activeResource?.scheme === Schemas.vscodeRemote) {
             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
                     .some(
                     scmResource => this.uriIdentityService.extUri.isEqual(activeResource, scmResource.sourceUri)
                 )))) {
-                    this.activeResourceHasChangesContextKey.set(true);
-                    return;
+                    return true;
                 }
             }
-            this.activeResourceHasChangesContextKey.set(false);
-        }
-        else {
-            this.activeResourceHasChangesContextKey.set(false);
-            this.activeResourceRepositoryContextKey.set(undefined);
         }
+        return false;
     }
     dispose() {
         this.disposables.dispose();
         dispose(( (this.repositoryDisposables.values())));
         this.repositoryDisposables.clear();
+        this.onDidRepositoryChange.dispose();
     }
 };
 SCMActiveResourceContextKeyController = ( (__decorate([
-    ( (__param(0, IContextKeyService))),
-    ( (__param(1, IEditorService))),
-    ( (__param(2, ISCMService))),
-    ( (__param(3, IUriIdentityService)))
+    ( (__param(0, IEditorGroupsService))),
+    ( (__param(1, ISCMService))),
+    ( (__param(2, IUriIdentityService)))
 ], SCMActiveResourceContextKeyController)));
 
 export { SCMActiveRepositoryContextKeyController, SCMActiveResourceContextKeyController, SCMStatusController };

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

@@ -135,7 +135,7 @@ let SCMRepositoryMenus = class SCMRepositoryMenus {
             ['scmProviderHasRootUri', !!provider.rootUri],
         ]);
         const serviceCollection = ( (new ServiceCollection([IContextKeyService, this.contextKeyService])));
-        instantiationService = instantiationService.createChild(serviceCollection);
+        instantiationService = instantiationService.createChild(serviceCollection, this.disposables);
         this.titleMenu = instantiationService.createInstance(SCMTitleMenu);
         this.disposables.add(this.titleMenu);
         this.repositoryMenu = menuService.createMenu(MenuId.SCMSourceControlInline, this.contextKeyService);

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

@@ -1,25 +1,28 @@
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { Extensions, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { DirtyDiffWorkbenchController } from 'vscode/vscode/vs/workbench/contrib/scm/browser/dirtydiffDecorator';
 import { VIEWLET_ID, VIEW_PANE_ID, REPOSITORIES_VIEW_PANE_ID } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { SCMActiveResourceContextKeyController, SCMActiveRepositoryContextKeyController, SCMStatusController } from './activity.js';
-import { Extensions as Extensions$2 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import { Extensions as Extensions$2, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
-import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import { KeybindingsRegistry, KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import '../common/scmService.js';
-import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/views';
+import { Extensions as Extensions$1, ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { SCMViewPaneContainer } from './scmViewPaneContainer.js';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { ModesRegistry } from 'vscode/vscode/vs/editor/common/languages/modesRegistry';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
-import { SCMViewPane } from './scmViewPane.js';
+import { SCMViewPane, ContextKeys } from './scmViewPane.js';
 import './scmViewService.js';
 import { SCMRepositoriesViewPane } from './scmRepositoriesViewPane.js';
 import { Context } from 'vscode/vscode/vs/editor/contrib/suggest/browser/suggest';
@@ -28,6 +31,7 @@ import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import '../common/quickDiffService.js';
 import { getActiveElement } from 'vscode/vscode/vs/base/browser/dom';
 import { SCMWorkingSetController } from './workingSet.js';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 
 const _moduleId = "vs/workbench/contrib/scm/browser/scm.contribution";
 ModesRegistry.registerLanguage({
@@ -37,7 +41,7 @@ ModesRegistry.registerLanguage({
     mimetypes: ['text/x-scm-input']
 });
 ( (Registry.as(Extensions.Workbench)))
-    .registerWorkbenchContribution(DirtyDiffWorkbenchController, 3 );
+    .registerWorkbenchContribution(DirtyDiffWorkbenchController, LifecyclePhase.Restored);
 const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localizeWithPath(_moduleId, 0, 'View icon of the Source Control view.')));
 const viewContainer = ( (Registry.as(Extensions$1.ViewContainersRegistry))).registerViewContainer({
     id: VIEWLET_ID,
@@ -48,7 +52,7 @@ const viewContainer = ( (Registry.as(Extensions$1.ViewContainersRegistry))).regi
     alwaysUseContainerInfo: true,
     order: 2,
     hideIfEmpty: true,
-}, 0 , { doNotRegisterOpenCommand: true });
+}, ViewContainerLocation.Sidebar, { doNotRegisterOpenCommand: true });
 const viewsRegistry = ( (Registry.as(Extensions$1.ViewsRegistry)));
 viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
     content: ( localizeWithPath(_moduleId, 2, "No source control providers registered.")),
@@ -88,9 +92,9 @@ viewsRegistry.registerViews([{
             mnemonicTitle: ( localizeWithPath(_moduleId, 5, "Source &&Control")),
             keybindings: {
                 primary: 0,
-                win: { primary: 2048  | 1024  | 37  },
-                linux: { primary: 2048  | 1024  | 37  },
-                mac: { primary: 256  | 1024  | 37  },
+                win: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG },
+                linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG },
+                mac: { primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.KeyG },
             },
             order: 2,
         }
@@ -111,18 +115,18 @@ viewsRegistry.registerViews([{
         containerIcon: sourceControlViewIcon
     }], viewContainer);
 ( (Registry.as(Extensions.Workbench)))
-    .registerWorkbenchContribution(SCMActiveResourceContextKeyController, 3 );
+    .registerWorkbenchContribution(SCMActiveResourceContextKeyController, LifecyclePhase.Restored);
 ( (Registry.as(Extensions.Workbench)))
-    .registerWorkbenchContribution(SCMActiveRepositoryContextKeyController, 3 );
+    .registerWorkbenchContribution(SCMActiveRepositoryContextKeyController, LifecyclePhase.Restored);
 ( (Registry.as(Extensions.Workbench)))
-    .registerWorkbenchContribution(SCMStatusController, 3 );
-registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetController, 3 );
+    .registerWorkbenchContribution(SCMStatusController, LifecyclePhase.Restored);
+registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetController, WorkbenchPhase.AfterRestored);
 ( (Registry.as(Extensions$2.Configuration))).registerConfiguration({
     id: 'scm',
     order: 5,
     title: ( localizeWithPath(_moduleId, 7, "Source Control")),
     type: 'object',
-    scope: 4 ,
+    scope: ConfigurationScope.RESOURCE,
     properties: {
         'scm.diffDecorations': {
             type: 'string',
@@ -485,9 +489,9 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'scm.acceptInput',
     metadata: { description: ( localizeWithPath(_moduleId, 70, "Source Control: Accept Input")), args: [] },
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( (ContextKeyExpr.has('scmRepository'))),
-    primary: 2048  | 3 ,
+    primary: KeyMod.CtrlCmd | KeyCode.Enter,
     handler: accessor => {
         const contextKeyService = accessor.get(IContextKeyService);
         const context = contextKeyService.getContext(getActiveElement());
@@ -508,7 +512,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 const viewNextCommitCommand = {
     description: { description: ( localizeWithPath(_moduleId, 71, "Source Control: View Next Commit")), args: [] },
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     handler: (accessor) => {
         const contextKeyService = accessor.get(IContextKeyService);
         const scmService = accessor.get(ISCMService);
@@ -520,7 +524,7 @@ const viewNextCommitCommand = {
 };
 const viewPreviousCommitCommand = {
     description: { description: ( localizeWithPath(_moduleId, 72, "Source Control: View Previous Commit")), args: [] },
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     handler: (accessor) => {
         const contextKeyService = accessor.get(IContextKeyService);
         const scmService = accessor.get(ISCMService);
@@ -538,7 +542,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
          (ContextKeyExpr.has('scmInputIsInLastPosition')),
          (Context.Visible.toNegated())
     ))),
-    primary: 18
+    primary: KeyCode.DownArrow
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     ...viewPreviousCommitCommand,
@@ -548,19 +552,19 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
          (ContextKeyExpr.has('scmInputIsInFirstPosition')),
          (Context.Visible.toNegated())
     ))),
-    primary: 16
+    primary: KeyCode.UpArrow
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     ...viewNextCommitCommand,
     id: 'scm.forceViewNextCommit',
     when: ( (ContextKeyExpr.has('scmRepository'))),
-    primary: 512  | 18
+    primary: KeyMod.Alt | KeyCode.DownArrow
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     ...viewPreviousCommitCommand,
     id: 'scm.forceViewPreviousCommit',
     when: ( (ContextKeyExpr.has('scmRepository'))),
-    primary: 512  | 16
+    primary: KeyMod.Alt | KeyCode.UpArrow
 });
 CommandsRegistry.registerCommand('scm.openInIntegratedTerminal', async (accessor, provider) => {
     if (!provider || !provider.rootUri) {
@@ -604,3 +608,49 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
         ))
     )))
 });
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'workbench.scm.action.focusPreviousInput',
+    weight: KeybindingWeight.WorkbenchContrib,
+    when: ( (ContextKeys.RepositoryVisibilityCount.notEqualsTo(0))),
+    handler: async (accessor) => {
+        const viewsService = accessor.get(IViewsService);
+        const scmView = await viewsService.openView(VIEW_PANE_ID);
+        if (scmView) {
+            scmView.focusPreviousInput();
+        }
+    }
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'workbench.scm.action.focusNextInput',
+    weight: KeybindingWeight.WorkbenchContrib,
+    when: ( (ContextKeys.RepositoryVisibilityCount.notEqualsTo(0))),
+    handler: async (accessor) => {
+        const viewsService = accessor.get(IViewsService);
+        const scmView = await viewsService.openView(VIEW_PANE_ID);
+        if (scmView) {
+            scmView.focusNextInput();
+        }
+    }
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'workbench.scm.action.focusPreviousResourceGroup',
+    weight: KeybindingWeight.WorkbenchContrib,
+    handler: async (accessor) => {
+        const viewsService = accessor.get(IViewsService);
+        const scmView = await viewsService.openView(VIEW_PANE_ID);
+        if (scmView) {
+            scmView.focusPreviousResourceGroup();
+        }
+    }
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'workbench.scm.action.focusNextResourceGroup',
+    weight: KeybindingWeight.WorkbenchContrib,
+    handler: async (accessor) => {
+        const viewsService = accessor.get(IViewsService);
+        const scmView = await viewsService.openView(VIEW_PANE_ID);
+        if (scmView) {
+            scmView.focusNextResourceGroup();
+        }
+    }
+});

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

@@ -18,6 +18,7 @@ import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.s
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { RepositoryRenderer, RepositoryActionRunner } from './scmRepositoryRenderer.js';
 import { getActionViewItemProvider, collectContextMenuActions } from './util.js';
+import { Orientation } from 'vscode/vscode/vs/base/browser/ui/sash/sash';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
@@ -71,7 +72,7 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
         this._register(this.list.onContextMenu(this.onListContextMenu, this));
         this._register(this.scmViewService.onDidChangeRepositories(this.onDidChangeRepositories, this));
         this._register(this.scmViewService.onDidChangeVisibleRepositories(this.updateListSelection, this));
-        if (this.orientation === 0 ) {
+        if (this.orientation === Orientation.VERTICAL) {
             this._register(this.configurationService.onDidChangeConfiguration(e => {
                 if (e.affectsConfiguration('scm.repositories.visible')) {
                     this.updateBodySize();
@@ -94,7 +95,7 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
         this.list.layout(height, width);
     }
     updateBodySize() {
-        if (this.orientation === 1 ) {
+        if (this.orientation === Orientation.HORIZONTAL) {
             return;
         }
         const visibleCount = this.configurationService.getValue('scm.repositories.visible');