@codingame/monaco-vscode-scm-service-override 11.1.2 → 12.0.0

package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.d.ts

@@ -0,0 +1,17 @@
+import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IContextMenuService } from "vscode/vscode/vs/platform/contextview/browser/contextView.service";
+import { IThemeService } from "vscode/vscode/vs/platform/theme/common/themeService.service";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IWorkbenchLayoutService } from "vscode/vscode/vs/workbench/services/layout/browser/layoutService.service";
+import { IExtensionService } from "vscode/vscode/vs/workbench/services/extensions/common/extensions.service";
+import { IWorkspaceContextService } from "vscode/vscode/vs/platform/workspace/common/workspace.service";
+import { IViewDescriptorService } from "vscode/vscode/vs/workbench/common/views.service";
+import { ViewPaneContainer } from "@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer";
+export declare class SCMViewPaneContainer extends ViewPaneContainer {
+    constructor(layoutService: IWorkbenchLayoutService, telemetryService: ITelemetryService, instantiationService: IInstantiationService, contextMenuService: IContextMenuService, themeService: IThemeService, storageService: IStorageService, configurationService: IConfigurationService, extensionService: IExtensionService, contextService: IWorkspaceContextService, viewDescriptorService: IViewDescriptorService);
+    create(parent: HTMLElement): void;
+    getOptimalWidth(): number;
+    getTitle(): string;
+}

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

@@ -1,8 +1,9 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import './media/scm.css.js';
 import { localize } from 'vscode/vscode/vs/nls';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
-import { VIEWLET_ID, VIEW_PANE_ID, REPOSITORIES_VIEW_PANE_ID, HISTORY_VIEW_PANE_ID } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
+import { VIEWLET_ID, VIEW_PANE_ID, REPOSITORIES_VIEW_PANE_ID, HISTORY_VIEW_PANE_ID } from '@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
@@ -12,7 +13,7 @@ import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/lay
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
-import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPaneContainer } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 
 let SCMViewPaneContainer = class SCMViewPaneContainer extends ViewPaneContainer {
     constructor(layoutService, telemetryService, instantiationService, contextMenuService, themeService, storageService, configurationService, extensionService, contextService, viewDescriptorService) {
@@ -36,20 +37,20 @@ let SCMViewPaneContainer = class SCMViewPaneContainer extends ViewPaneContainer
                 return super.getTitle();
             }
         }
-        return ( localize(6583, "Source Control"));
+        return localize(8564, "Source Control");
     }
 };
-SCMViewPaneContainer = ( (__decorate([
-    ( (__param(0, IWorkbenchLayoutService))),
-    ( (__param(1, ITelemetryService))),
-    ( (__param(2, IInstantiationService))),
-    ( (__param(3, IContextMenuService))),
-    ( (__param(4, IThemeService))),
-    ( (__param(5, IStorageService))),
-    ( (__param(6, IConfigurationService))),
-    ( (__param(7, IExtensionService))),
-    ( (__param(8, IWorkspaceContextService))),
-    ( (__param(9, IViewDescriptorService)))
-], SCMViewPaneContainer)));
+SCMViewPaneContainer = ( __decorate([
+    ( __param(0, IWorkbenchLayoutService)),
+    ( __param(1, ITelemetryService)),
+    ( __param(2, IInstantiationService)),
+    ( __param(3, IContextMenuService)),
+    ( __param(4, IThemeService)),
+    ( __param(5, IStorageService)),
+    ( __param(6, IConfigurationService)),
+    ( __param(7, IExtensionService)),
+    ( __param(8, IWorkspaceContextService)),
+    ( __param(9, IViewDescriptorService))
+], SCMViewPaneContainer));
 
 export { SCMViewPaneContainer };

package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.d.ts

@@ -0,0 +1,66 @@
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { ISCMRepository, ISCMViewVisibleRepositoryChangeEvent, ISCMMenus, ISCMRepositorySortKey } from "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm";
+import { ISCMViewService } from "vscode/vscode/vs/workbench/contrib/scm/common/scm.service";
+import { ISCMService } from "vscode/vscode/vs/workbench/contrib/scm/common/scm.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { IWorkspaceContextService } from "vscode/vscode/vs/platform/workspace/common/workspace.service";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { RawContextKey } from "vscode/vscode/vs/platform/contextkey/common/contextkey";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IExtensionService } from "vscode/vscode/vs/workbench/services/extensions/common/extensions.service";
+import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
+export declare const RepositoryContextKeys: {
+    RepositorySortKey: RawContextKey<ISCMRepositorySortKey>;
+};
+export interface ISCMViewServiceState {
+    readonly all: string[];
+    readonly sortKey: ISCMRepositorySortKey;
+    readonly visible: number[];
+}
+export declare class SCMViewService implements ISCMViewService {
+    private readonly scmService;
+    private readonly editorService;
+    private readonly configurationService;
+    private readonly storageService;
+    private readonly workspaceContextService;
+    readonly _serviceBrand: undefined;
+    readonly menus: ISCMMenus;
+    private didFinishLoading;
+    private didSelectRepository;
+    private previousState;
+    private readonly disposables;
+    private _repositories;
+    get repositories(): ISCMRepository[];
+    get visibleRepositories(): ISCMRepository[];
+    set visibleRepositories(visibleRepositories: ISCMRepository[]);
+    private _onDidChangeRepositories;
+    readonly onDidChangeRepositories: Event<ISCMViewVisibleRepositoryChangeEvent>;
+    private _onDidSetVisibleRepositories;
+    readonly onDidChangeVisibleRepositories: Event<ISCMViewVisibleRepositoryChangeEvent>;
+    get focusedRepository(): ISCMRepository | undefined;
+    private _onDidFocusRepository;
+    readonly onDidFocusRepository: Event<ISCMRepository | undefined>;
+    private readonly _focusedRepository;
+    private readonly _activeEditor;
+    private readonly _activeEditorRepository;
+    private readonly _activeRepository;
+    readonly activeRepository: import("vscode/vscode/vs/base/common/observable").IObservable<ISCMRepository | undefined, unknown>;
+    private _repositoriesSortKey;
+    private _sortKeyContextKey;
+    constructor(scmService: ISCMService, contextKeyService: IContextKeyService, editorService: IEditorService, extensionService: IExtensionService, instantiationService: IInstantiationService, configurationService: IConfigurationService, storageService: IStorageService, workspaceContextService: IWorkspaceContextService);
+    private onDidAddRepository;
+    private onDidRemoveRepository;
+    isVisible(repository: ISCMRepository): boolean;
+    toggleVisibility(repository: ISCMRepository, visible?: boolean): void;
+    toggleSortKey(sortKey: ISCMRepositorySortKey): void;
+    focus(repository: ISCMRepository | undefined): void;
+    private compareRepositories;
+    private getMaxSelectionIndex;
+    private getViewSortOrder;
+    private insertRepositoryView;
+    private onWillSaveState;
+    private eventuallyFinishLoading;
+    private finishLoading;
+    dispose(): void;
+}

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

@@ -1,10 +1,13 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
+import { ISCMRepositorySortKey } from '@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/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';
@@ -33,17 +36,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));
@@ -145,7 +145,7 @@ let SCMViewService = class SCMViewService {
         }, reader => this._activeRepository.read(reader));
         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 {
         }
@@ -269,7 +269,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) {
@@ -291,13 +291,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) {
@@ -311,7 +311,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.d.ts

@@ -0,0 +1,25 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+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 { IWorkbenchLayoutService } from "vscode/vscode/vs/workbench/services/layout/browser/layoutService.service";
+export declare class SCMWorkingSetController extends Disposable implements IWorkbenchContribution {
+    private readonly configurationService;
+    private readonly editorGroupsService;
+    private readonly scmService;
+    private readonly storageService;
+    private readonly layoutService;
+    static readonly ID = "workbench.contrib.scmWorkingSets";
+    private _workingSets;
+    private _enabledConfig;
+    private readonly _repositoryDisposables;
+    constructor(configurationService: IConfigurationService, editorGroupsService: IEditorGroupsService, scmService: ISCMService, storageService: IStorageService, layoutService: IWorkbenchLayoutService);
+    private _onDidAddRepository;
+    private _onDidRemoveRepository;
+    private _loadWorkingSets;
+    private _saveWorkingSet;
+    private _restoreWorkingSet;
+    dispose(): void;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Disposable, DisposableMap, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import 'vscode/vscode/vs/base/common/arrays';
 import 'vscode/vscode/vs/base/common/event';
@@ -8,10 +9,12 @@ import 'vscode/vscode/vs/base/common/cancellation';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
 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 'vscode/vscode/vs/workbench/contrib/scm/browser/util';
+import { getProviderKey } from '@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common/vscode/vs/workbench/contrib/scm/browser/util';
 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 '@codingame/monaco-vscode-e571cbbb-526b-5d8b-92c5-a0437d2dabb3-common/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 
 let SCMWorkingSetController = class SCMWorkingSetController extends Disposable {
@@ -27,7 +30,7 @@ let SCMWorkingSetController = class SCMWorkingSetController extends Disposable {
         this._repositoryDisposables = ( new DisposableMap());
         this._store.add(autorunWithStore((reader, store) => {
             if (!this._enabledConfig.read(reader)) {
-                this.storageService.remove('scm.workingSets', 1 );
+                this.storageService.remove('scm.workingSets', StorageScope.WORKSPACE);
                 this._repositoryDisposables.clearAndDisposeAll();
                 return;
             }
@@ -70,7 +73,7 @@ let SCMWorkingSetController = class SCMWorkingSetController extends Disposable {
     }
     _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;
         }
@@ -91,7 +94,7 @@ let SCMWorkingSetController = class SCMWorkingSetController extends Disposable {
         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);
@@ -103,7 +106,7 @@ let SCMWorkingSetController = class SCMWorkingSetController extends Disposable {
             editorWorkingSetId = 'empty';
         }
         if (editorWorkingSetId) {
-            const preserveFocus = this.layoutService.hasFocus("workbench.parts.panel" );
+            const preserveFocus = this.layoutService.hasFocus(Parts.PANEL_PART);
             await this.editorGroupsService.applyWorkingSet(editorWorkingSetId, { preserveFocus });
         }
     }

package/vscode/src/vs/workbench/contrib/scm/common/quickDiffService.d.ts

@@ -0,0 +1,16 @@
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { Disposable, IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { QuickDiff, QuickDiffProvider } from "vscode/vscode/vs/workbench/contrib/scm/common/quickDiff";
+import { IQuickDiffService } from "vscode/vscode/vs/workbench/contrib/scm/common/quickDiff.service";
+import { IUriIdentityService } from "vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+export declare class QuickDiffService extends Disposable implements IQuickDiffService {
+    private readonly uriIdentityService;
+    readonly _serviceBrand: undefined;
+    private quickDiffProviders;
+    private readonly _onDidChangeQuickDiffProviders;
+    readonly onDidChangeQuickDiffProviders: import("vscode/vscode/vs/base/common/event").Event<void>;
+    constructor(uriIdentityService: IUriIdentityService);
+    addQuickDiffProvider(quickDiff: QuickDiffProvider): IDisposable;
+    private isQuickDiff;
+    getQuickDiffs(uri: URI, language?: string, isSynchronized?: boolean): Promise<QuickDiff[]>;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { isEqualOrParent } from 'vscode/vscode/vs/base/common/resources';
 import { score } from 'vscode/vscode/vs/editor/common/languageSelector';
@@ -62,7 +63,8 @@ let QuickDiffService = class QuickDiffService extends Disposable {
             const diff = {
                 originalResource: scoreValue > 0 ? (await provider.getOriginalResource(uri)) ?? undefined : undefined,
                 label: provider.label,
-                isSCM: provider.isSCM
+                isSCM: provider.isSCM,
+                visible: provider.visible
             };
             return diff;
         })));

package/vscode/src/vs/workbench/contrib/scm/common/scmService.d.ts

@@ -0,0 +1,27 @@
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { ISCMProvider, ISCMRepository } from "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm";
+import { ISCMService } from "vscode/vscode/vs/workbench/contrib/scm/common/scm.service";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IWorkspaceContextService } from "vscode/vscode/vs/platform/workspace/common/workspace.service";
+import { IUriIdentityService } from "vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+export declare class SCMService implements ISCMService {
+    private readonly logService;
+    private readonly uriIdentityService;
+    readonly _serviceBrand: undefined;
+    _repositories: Map<string, ISCMRepository>;
+    get repositories(): Iterable<ISCMRepository>;
+    get repositoryCount(): number;
+    private inputHistory;
+    private providerCount;
+    private readonly _onDidAddProvider;
+    readonly onDidAddRepository: Event<ISCMRepository>;
+    private readonly _onDidRemoveProvider;
+    readonly onDidRemoveRepository: Event<ISCMRepository>;
+    constructor(logService: ILogService, workspaceContextService: IWorkspaceContextService, contextKeyService: IContextKeyService, storageService: IStorageService, uriIdentityService: IUriIdentityService);
+    registerSCMProvider(provider: ISCMProvider): ISCMRepository;
+    getRepository(id: string): ISCMRepository | undefined;
+    getRepository(resource: URI): ISCMRepository | undefined;
+}

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

@@ -1,9 +1,11 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Disposable, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import { SCMInputChangeReason } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
+import { SCMInputChangeReason } from '@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/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';
@@ -172,7 +174,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) {
@@ -184,9 +186,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)) {
@@ -212,7 +214,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);
@@ -229,13 +231,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;
@@ -246,11 +248,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;

package/scm.js

@@ -1,17 +0,0 @@
-import { ISCMService, ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
-import { SCMService } from './vscode/src/vs/workbench/contrib/scm/common/scmService.js';
-import { SCMViewService } from './vscode/src/vs/workbench/contrib/scm/browser/scmViewService.js';
-import { IQuickDiffService } from 'vscode/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
-import { QuickDiffService } from './vscode/src/vs/workbench/contrib/scm/common/quickDiffService.js';
-import './vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js';
-import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-
-function getServiceOverride() {
-    return {
-        [( ISCMService.toString())]: new SyncDescriptor(SCMService, [], true),
-        [( ISCMViewService.toString())]: new SyncDescriptor(SCMViewService, [], true),
-        [( IQuickDiffService.toString())]: new SyncDescriptor(QuickDiffService, [], true)
-    };
-}
-
-export { getServiceOverride as default };