@codingame/monaco-vscode-scm-service-override 5.2.0 → 6.0.0

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

@@ -1,10 +1,12 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
+import { ISCMRepositorySortKey } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { SCMMenus } from './menus.js';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { debounce } from 'vscode/vscode/vs/base/common/decorators';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
@@ -27,17 +29,14 @@ function getRepositoryName(workspaceContextService, repository) {
     return folder?.uri.toString() === ( repository.provider.rootUri.toString()) ? folder.name : basename(repository.provider.rootUri);
 }
 const RepositoryContextKeys = {
-    RepositorySortKey: ( new RawContextKey(
-        'scmRepositorySortKey',
-        "discoveryTime"
-    )),
+    RepositorySortKey: ( new RawContextKey('scmRepositorySortKey', ISCMRepositorySortKey.DiscoveryTime)),
 };
 let SCMViewService = class SCMViewService {
     get repositories() {
         return ( this._repositories.map(r => r.repository));
     }
     get visibleRepositories() {
-        if (this._repositoriesSortKey === "discoveryTime" ) {
+        if (this._repositoriesSortKey === ISCMRepositorySortKey.DiscoveryTime) {
             return ( this._repositories.filter(r => r.selectionIndex !== -1)
                 .sort((r1, r2) => r1.selectionIndex - r2.selectionIndex)
                 .map(r => r.repository));
@@ -112,7 +111,7 @@ let SCMViewService = class SCMViewService {
         this.onDidFocusRepository = this._onDidFocusRepository.event;
         this.menus = instantiationService.createInstance(SCMMenus);
         try {
-            this.previousState = JSON.parse(storageService.get('scm:view:visibleRepositories', 1 , ''));
+            this.previousState = JSON.parse(storageService.get('scm:view:visibleRepositories', StorageScope.WORKSPACE, ''));
         }
         catch {
         }
@@ -236,7 +235,7 @@ let SCMViewService = class SCMViewService {
         }
     }
     compareRepositories(op1, op2) {
-        if (this._repositoriesSortKey === "discoveryTime" ) {
+        if (this._repositoriesSortKey === ISCMRepositorySortKey.DiscoveryTime) {
             return op1.discoveryTime - op2.discoveryTime;
         }
         if (this._repositoriesSortKey === 'path' && op1.repository.provider.rootUri && op2.repository.provider.rootUri) {
@@ -258,13 +257,13 @@ let SCMViewService = class SCMViewService {
         const sortOder = this.configurationService.getValue('scm.repositories.sortOrder');
         switch (sortOder) {
             case 'discovery time':
-                return "discoveryTime" ;
+                return ISCMRepositorySortKey.DiscoveryTime;
             case 'name':
-                return "name" ;
+                return ISCMRepositorySortKey.Name;
             case 'path':
-                return "path" ;
+                return ISCMRepositorySortKey.Path;
             default:
-                return "discoveryTime" ;
+                return ISCMRepositorySortKey.DiscoveryTime;
         }
     }
     insertRepositoryView(repositories, repositoryView) {
@@ -278,7 +277,7 @@ let SCMViewService = class SCMViewService {
         const all = ( this.repositories.map(r => getProviderStorageKey(r.provider)));
         const visible = ( this.visibleRepositories.map(r => all.indexOf(getProviderStorageKey(r.provider))));
         this.previousState = { all, sortKey: this._repositoriesSortKey, visible };
-        this.storageService.store('scm:view:visibleRepositories', JSON.stringify(this.previousState), 1 , 1 );
+        this.storageService.store('scm:view:visibleRepositories', JSON.stringify(this.previousState), StorageScope.WORKSPACE, StorageTarget.MACHINE);
     }
     eventuallyFinishLoading() {
         this.finishLoading();

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

@@ -2,18 +2,22 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { DisposableMap, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { getProviderKey } from './util.js';
 import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+import { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
+import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 
 let SCMWorkingSetController = class SCMWorkingSetController {
     static { this.ID = 'workbench.contrib.scmWorkingSets'; }
-    constructor(configurationService, editorGroupsService, scmService, storageService) {
+    constructor(configurationService, editorGroupsService, scmService, storageService, layoutService) {
         this.configurationService = configurationService;
         this.editorGroupsService = editorGroupsService;
         this.scmService = scmService;
         this.storageService = storageService;
+        this.layoutService = layoutService;
         this._repositoryDisposables = ( new DisposableMap());
         this._scmServiceDisposables = ( new DisposableStore());
         this._disposables = ( new DisposableStore());
@@ -22,7 +26,7 @@ let SCMWorkingSetController = class SCMWorkingSetController {
     }
     _onDidChangeConfiguration() {
         if (!this.configurationService.getValue('scm.workingSets.enabled')) {
-            this.storageService.remove('scm.workingSets', 1 );
+            this.storageService.remove('scm.workingSets', StorageScope.WORKSPACE);
             this._scmServiceDisposables.clear();
             this._repositoryDisposables.clearAndDisposeAll();
             return;
@@ -66,7 +70,7 @@ let SCMWorkingSetController = class SCMWorkingSetController {
     }
     _loadWorkingSets() {
         const workingSets = ( new Map());
-        const workingSetsRaw = this.storageService.get('scm.workingSets', 1 );
+        const workingSetsRaw = this.storageService.get('scm.workingSets', StorageScope.WORKSPACE);
         if (!workingSetsRaw) {
             return workingSets;
         }
@@ -87,7 +91,7 @@ let SCMWorkingSetController = class SCMWorkingSetController {
         for (const [providerKey, { currentHistoryItemGroupId, editorWorkingSets }] of this._workingSets) {
             workingSets.push({ providerKey, currentHistoryItemGroupId, editorWorkingSets: [...editorWorkingSets] });
         }
-        this.storageService.store('scm.workingSets', JSON.stringify(workingSets), 1 , 1 );
+        this.storageService.store('scm.workingSets', JSON.stringify(workingSets), StorageScope.WORKSPACE, StorageTarget.MACHINE);
     }
     async _restoreWorkingSet(providerKey, currentHistoryItemGroupId) {
         const workingSets = this._workingSets.get(providerKey);
@@ -99,7 +103,8 @@ let SCMWorkingSetController = class SCMWorkingSetController {
             editorWorkingSetId = 'empty';
         }
         if (editorWorkingSetId) {
-            await this.editorGroupsService.applyWorkingSet(editorWorkingSetId);
+            const preserveFocus = this.layoutService.hasFocus(Parts.PANEL_PART);
+            await this.editorGroupsService.applyWorkingSet(editorWorkingSetId, { preserveFocus });
         }
     }
     dispose() {
@@ -112,7 +117,8 @@ SCMWorkingSetController = ( __decorate([
     ( __param(0, IConfigurationService)),
     ( __param(1, IEditorGroupsService)),
     ( __param(2, ISCMService)),
-    ( __param(3, IStorageService))
+    ( __param(3, IStorageService)),
+    ( __param(4, IWorkbenchLayoutService))
 ], SCMWorkingSetController));
 
 export { SCMWorkingSetController };

package/vscode/src/vs/workbench/contrib/scm/common/scmService.js

@@ -4,6 +4,7 @@ import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { SCMInputChangeReason } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { HistoryNavigator2 } from 'vscode/vscode/vs/base/common/history';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
@@ -36,13 +37,6 @@ class SCMInput {
         this._visible = visible;
         this._onDidChangeVisibility.fire(visible);
     }
-    get actionButton() {
-        return this._actionButton;
-    }
-    set actionButton(actionButton) {
-        this._actionButton = actionButton;
-        this._onDidChangeActionButton.fire();
-    }
     setFocus() {
         this._onDidChangeFocus.fire();
     }
@@ -71,8 +65,6 @@ class SCMInput {
         this._visible = true;
         this._onDidChangeVisibility = ( new Emitter());
         this.onDidChangeVisibility = this._onDidChangeVisibility.event;
-        this._onDidChangeActionButton = ( new Emitter());
-        this.onDidChangeActionButton = this._onDidChangeActionButton.event;
         this._onDidChangeFocus = ( new Emitter());
         this.onDidChangeFocus = this._onDidChangeFocus.event;
         this._onDidChangeValidationMessage = ( new Emitter());
@@ -178,7 +170,7 @@ let SCMInputHistory = class SCMInputHistory {
         this._onWillSaveHistory = this.disposables.add(( new Emitter()));
         this.onWillSaveHistory = this._onWillSaveHistory.event;
         this.histories = ( new Map());
-        const entries = this.storageService.getObject('scm.history', 1 , []);
+        const entries = this.storageService.getObject('scm.history', StorageScope.WORKSPACE, []);
         for (const [providerLabel, rootUri, history] of entries) {
             let providerHistories = this.histories.get(providerLabel);
             if (!providerHistories) {
@@ -190,9 +182,9 @@ let SCMInputHistory = class SCMInputHistory {
         if (this.migrateStorage()) {
             this.saveToStorage();
         }
-        this.disposables.add(this.storageService.onDidChangeValue(1 , 'scm.history', this.disposables)(e => {
+        this.disposables.add(this.storageService.onDidChangeValue(StorageScope.WORKSPACE, 'scm.history', this.disposables)(e => {
             if (e.external && e.key === 'scm.history') {
-                const raw = this.storageService.getObject('scm.history', 1 , []);
+                const raw = this.storageService.getObject('scm.history', StorageScope.WORKSPACE, []);
                 for (const [providerLabel, uri, rawHistory] of raw) {
                     const history = this.getHistory(providerLabel, uri);
                     for (const value of Iterable.reverse(rawHistory)) {
@@ -218,7 +210,7 @@ let SCMInputHistory = class SCMInputHistory {
                 }
             }
         }
-        this.storageService.store('scm.history', raw, 1 , 0 );
+        this.storageService.store('scm.history', raw, StorageScope.WORKSPACE, StorageTarget.USER);
     }
     getHistory(providerLabel, rootUri) {
         let providerHistories = this.histories.get(providerLabel);
@@ -235,13 +227,13 @@ let SCMInputHistory = class SCMInputHistory {
     }
     migrateStorage() {
         let didSomethingChange = false;
-        const machineKeys = Iterable.filter(( this.storageService.keys(-1, 1 )), key => key.startsWith('scm/input:'));
+        const machineKeys = Iterable.filter(( this.storageService.keys(StorageScope.APPLICATION, StorageTarget.MACHINE)), key => key.startsWith('scm/input:'));
         for (const key of machineKeys) {
             try {
-                const legacyHistory = JSON.parse(this.storageService.get(key, -1 , ''));
+                const legacyHistory = JSON.parse(this.storageService.get(key, StorageScope.APPLICATION, ''));
                 const match = /^scm\/input:([^:]+):(.+)$/.exec(key);
                 if (!match || !Array.isArray(legacyHistory?.history) || !Number.isInteger(legacyHistory?.timestamp)) {
-                    this.storageService.remove(key, -1 );
+                    this.storageService.remove(key, StorageScope.APPLICATION);
                     continue;
                 }
                 const [, providerLabel, rootPath] = match;
@@ -252,11 +244,11 @@ let SCMInputHistory = class SCMInputHistory {
                         history.prepend(entry);
                     }
                     didSomethingChange = true;
-                    this.storageService.remove(key, -1 );
+                    this.storageService.remove(key, StorageScope.APPLICATION);
                 }
             }
             catch {
-                this.storageService.remove(key, -1 );
+                this.storageService.remove(key, StorageScope.APPLICATION);
             }
         }
         return didSomethingChange;