@codingame/monaco-vscode-scm-service-override 7.1.0 → 7.1.1

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/scm.css.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
@@ -15,7 +15,6 @@ import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/co
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 
-const _moduleId = "vs/workbench/contrib/scm/browser/scmViewPaneContainer";
 let SCMViewPaneContainer = class SCMViewPaneContainer extends ViewPaneContainer {
     constructor(scmViewService, layoutService, telemetryService, instantiationService, contextMenuService, themeService, storageService, configurationService, extensionService, contextService, viewDescriptorService) {
         super(VIEWLET_ID, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService);
@@ -29,7 +28,7 @@ let SCMViewPaneContainer = class SCMViewPaneContainer extends ViewPaneContainer
         return 400;
     }
     getTitle() {
-        return ( localizeWithPath(_moduleId, 0, "Source Control"));
+        return ( localize(6356, "Source Control"));
     }
     getActionsContext() {
         return this.scmViewService.visibleRepositories.length === 1 ? this.scmViewService.visibleRepositories[0].provider : undefined;

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

@@ -1,7 +1,12 @@
 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 { Disposable, DisposableMap, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/base/common/arrays';
+import 'vscode/vscode/vs/base/common/observableInternal/derived';
+import { autorunWithStore, autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
+import 'vscode/vscode/vs/base/common/observableInternal/utils';
+import 'vscode/vscode/vs/base/common/cancellation';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { observableConfigValue } from 'vscode/vscode/vs/platform/observable/common/platformObservableUtils';
 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';
@@ -10,62 +15,54 @@ import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor
 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 {
+let SCMWorkingSetController = class SCMWorkingSetController extends Disposable {
     static { this.ID = 'workbench.contrib.scmWorkingSets'; }
     constructor(configurationService, editorGroupsService, scmService, storageService, layoutService) {
+        super();
         this.configurationService = configurationService;
         this.editorGroupsService = editorGroupsService;
         this.scmService = scmService;
         this.storageService = storageService;
         this.layoutService = layoutService;
+        this._enabledConfig = observableConfigValue('scm.workingSets.enabled', false, this.configurationService);
         this._repositoryDisposables = ( new DisposableMap());
-        this._scmServiceDisposables = ( new DisposableStore());
-        this._disposables = ( new DisposableStore());
-        const onDidChangeConfiguration = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.workingSets.enabled'), this._disposables);
-        this._disposables.add(Event.runAndSubscribe(onDidChangeConfiguration, () => this._onDidChangeConfiguration()));
-    }
-    _onDidChangeConfiguration() {
-        if (!this.configurationService.getValue('scm.workingSets.enabled')) {
-            this.storageService.remove('scm.workingSets', StorageScope.WORKSPACE);
-            this._scmServiceDisposables.clear();
-            this._repositoryDisposables.clearAndDisposeAll();
-            return;
-        }
-        this._workingSets = this._loadWorkingSets();
-        this.scmService.onDidAddRepository(this._onDidAddRepository, this, this._scmServiceDisposables);
-        this.scmService.onDidRemoveRepository(this._onDidRemoveRepository, this, this._scmServiceDisposables);
-        for (const repository of this.scmService.repositories) {
-            this._onDidAddRepository(repository);
-        }
+        this._store.add(autorunWithStore((reader, store) => {
+            if (!this._enabledConfig.read(reader)) {
+                this.storageService.remove('scm.workingSets', StorageScope.WORKSPACE);
+                this._repositoryDisposables.clearAndDisposeAll();
+                return;
+            }
+            this._workingSets = this._loadWorkingSets();
+            this.scmService.onDidAddRepository(this._onDidAddRepository, this, store);
+            this.scmService.onDidRemoveRepository(this._onDidRemoveRepository, this, store);
+            for (const repository of this.scmService.repositories) {
+                this._onDidAddRepository(repository);
+            }
+        }));
     }
     _onDidAddRepository(repository) {
         const disposables = ( new DisposableStore());
-        disposables.add(Event.runAndSubscribe(repository.provider.onDidChangeHistoryProvider, () => {
-            if (!repository.provider.historyProvider) {
+        disposables.add(autorun(async (reader) => {
+            const historyProvider = repository.provider.historyProvider.read(reader);
+            const currentHistoryItemGroupId = historyProvider?.currentHistoryItemGroupId.read(reader);
+            if (!currentHistoryItemGroupId) {
+                return;
+            }
+            const providerKey = getProviderKey(repository.provider);
+            const repositoryWorkingSets = this._workingSets.get(providerKey);
+            if (!repositoryWorkingSets) {
+                this._workingSets.set(providerKey, { currentHistoryItemGroupId, editorWorkingSets: ( new Map()) });
+                return;
+            }
+            if (repositoryWorkingSets.currentHistoryItemGroupId === currentHistoryItemGroupId) {
                 return;
             }
-            disposables.add(Event.runAndSubscribe(repository.provider.historyProvider.onDidChangeCurrentHistoryItemGroup, async () => {
-                if (!repository.provider.historyProvider?.currentHistoryItemGroup?.id) {
-                    return;
-                }
-                const providerKey = getProviderKey(repository.provider);
-                const currentHistoryItemGroupId = repository.provider.historyProvider.currentHistoryItemGroup.id;
-                const repositoryWorkingSets = this._workingSets.get(providerKey);
-                if (!repositoryWorkingSets) {
-                    this._workingSets.set(providerKey, { currentHistoryItemGroupId, editorWorkingSets: ( new Map()) });
-                    return;
-                }
-                if (repositoryWorkingSets.currentHistoryItemGroupId === currentHistoryItemGroupId) {
-                    return;
-                }
-                this._saveWorkingSet(providerKey, currentHistoryItemGroupId, repositoryWorkingSets);
-                await this._restoreWorkingSet(providerKey, currentHistoryItemGroupId);
-            }));
+            this._saveWorkingSet(providerKey, currentHistoryItemGroupId, repositoryWorkingSets);
+            await this._restoreWorkingSet(providerKey, currentHistoryItemGroupId);
         }));
         this._repositoryDisposables.set(repository, disposables);
     }
     _onDidRemoveRepository(repository) {
-        this._workingSets.delete(getProviderKey(repository.provider));
         this._repositoryDisposables.deleteAndDispose(repository);
     }
     _loadWorkingSets() {
@@ -109,8 +106,7 @@ let SCMWorkingSetController = class SCMWorkingSetController {
     }
     dispose() {
         this._repositoryDisposables.dispose();
-        this._scmServiceDisposables.dispose();
-        this._disposables.dispose();
+        super.dispose();
     }
 };
 SCMWorkingSetController = ( __decorate([