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

package/vscode/src/vs/workbench/services/label/common/labelService.d.ts

@@ -0,0 +1,47 @@
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IDisposable, Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IWorkbenchEnvironmentService } from "vscode/vscode/vs/workbench/services/environment/common/environmentService.service";
+import { IWorkspace, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from "vscode/vscode/vs/platform/workspace/common/workspace";
+import { IWorkspaceContextService } from "vscode/vscode/vs/platform/workspace/common/workspace.service";
+import { ResourceLabelFormatter, ResourceLabelFormatting, IFormatterChangeEvent, Verbosity } from "@codingame/monaco-vscode-82e231ca-6ed7-5920-b2b8-1874ccc0be07-common/vscode/vs/platform/label/common/label";
+import { ILabelService } from "vscode/vscode/vs/platform/label/common/label.service";
+import { ILifecycleService } from "vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
+import { IPathService } from "vscode/vscode/vs/workbench/services/path/common/pathService.service";
+import { IRemoteAgentService } from "vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+export declare class LabelService extends Disposable implements ILabelService {
+    private readonly environmentService;
+    private readonly contextService;
+    private readonly pathService;
+    private readonly remoteAgentService;
+    readonly _serviceBrand: undefined;
+    private formatters;
+    private readonly _onDidChangeFormatters;
+    readonly onDidChangeFormatters: import("vscode/vscode/vs/base/common/event").Event<IFormatterChangeEvent>;
+    private readonly storedFormattersMemento;
+    private readonly storedFormatters;
+    private os;
+    private userHome;
+    constructor(environmentService: IWorkbenchEnvironmentService, contextService: IWorkspaceContextService, pathService: IPathService, remoteAgentService: IRemoteAgentService, storageService: IStorageService, lifecycleService: ILifecycleService);
+    private resolveRemoteEnvironment;
+    findFormatting(resource: URI): ResourceLabelFormatting | undefined;
+    getUriLabel(resource: URI, options?: {
+        relative?: boolean;
+        noPrefix?: boolean;
+        separator?: "/" | "\\";
+    }): string;
+    private doGetUriLabel;
+    getUriBasenameLabel(resource: URI): string;
+    getWorkspaceLabel(workspace: IWorkspace | IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI, options?: {
+        verbose: Verbosity;
+    }): string;
+    private doGetWorkspaceLabel;
+    private doGetSingleFolderWorkspaceLabel;
+    getSeparator(scheme: string, authority?: string): "/" | "\\";
+    getHostLabel(scheme: string, authority?: string): string;
+    getHostTooltip(scheme: string, authority?: string): string | undefined;
+    registerCachedFormatter(formatter: ResourceLabelFormatter): IDisposable;
+    registerFormatter(formatter: ResourceLabelFormatter): IDisposable;
+    private formatUri;
+    private appendWorkspaceSuffix;
+}

package/vscode/src/vs/workbench/services/label/common/labelService.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 { localize } from 'vscode/vscode/vs/nls';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { dispose, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -11,22 +12,26 @@ import { isWorkspace, toWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier,
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { basenameOrAuthority, basename, joinPath, dirname } from 'vscode/vscode/vs/base/common/resources';
 import { getPathLabel, tildify } from 'vscode/vscode/vs/base/common/labels';
+import { Verbosity } from '@codingame/monaco-vscode-82e231ca-6ed7-5920-b2b8-1874ccc0be07-common/vscode/vs/platform/label/common/label';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
 import { match } from 'vscode/vscode/vs/base/common/glob';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService.service';
 import { isProposedApiEnabled } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { OS } from 'vscode/vscode/vs/base/common/platform';
+import { OS, OperatingSystem } from 'vscode/vscode/vs/base/common/platform';
 import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
-import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
+import { Memento } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/common/memento';
 
 const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'resourceLabelFormatters',
     jsonSchema: {
-        description: ( localize(1398, 'Contributes resource label formatting rules.')),
+        description: ( localize(11615, 'Contributes resource label formatting rules.')),
         type: 'array',
         items: {
             type: 'object',
@@ -35,52 +40,52 @@ const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoin
                 scheme: {
                     type: 'string',
                     description: ( localize(
-                        1399,
+                        11616,
                         'URI scheme on which to match the formatter on. For example "file". Simple glob patterns are supported.'
                     )),
                 },
                 authority: {
                     type: 'string',
                     description: ( localize(
-                        1400,
+                        11617,
                         'URI authority on which to match the formatter on. Simple glob patterns are supported.'
                     )),
                 },
                 formatting: {
-                    description: ( localize(1401, "Rules for formatting uri resource labels.")),
+                    description: ( localize(11618, "Rules for formatting uri resource labels.")),
                     type: 'object',
                     properties: {
                         label: {
                             type: 'string',
                             description: ( localize(
-                                1402,
+                                11619,
                                 "Label rules to display. For example: myLabel:/${path}. ${path}, ${scheme}, ${authority} and ${authoritySuffix} are supported as variables."
                             ))
                         },
                         separator: {
                             type: 'string',
                             description: ( localize(
-                                1403,
+                                11620,
                                 "Separator to be used in the uri label display. '/' or '\' as an example."
                             ))
                         },
                         stripPathStartingSeparator: {
                             type: 'boolean',
                             description: ( localize(
-                                1404,
+                                11621,
                                 "Controls whether `${path}` substitutions should have starting separator characters stripped."
                             ))
                         },
                         tildify: {
                             type: 'boolean',
                             description: ( localize(
-                                1405,
+                                11622,
                                 "Controls if the start of the uri label should be tildified when possible."
                             ))
                         },
                         workspaceSuffix: {
                             type: 'string',
-                            description: ( localize(1406, "Suffix appended to the workspace label."))
+                            description: ( localize(11623, "Suffix appended to the workspace label."))
                         }
                     }
                 }
@@ -95,7 +100,7 @@ function hasDriveLetterIgnorePlatform(path) {
 }
 let ResourceLabelFormattersHandler = class ResourceLabelFormattersHandler {
     constructor(labelService) {
-        this.formattersDisposables = ( (new Map()));
+        this.formattersDisposables = ( new Map());
         resourceLabelFormattersExtPoint.setHandler((extensions, delta) => {
             for (const added of delta.added) {
                 for (const untrustedFormatter of added.value) {
@@ -120,10 +125,10 @@ let ResourceLabelFormattersHandler = class ResourceLabelFormattersHandler {
         });
     }
 };
-ResourceLabelFormattersHandler = ( (__decorate([
-    ( (__param(0, ILabelService)))
-], ResourceLabelFormattersHandler)));
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(ResourceLabelFormattersHandler, 3 );
+ResourceLabelFormattersHandler = ( __decorate([
+    ( __param(0, ILabelService))
+], ResourceLabelFormattersHandler));
+( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(ResourceLabelFormattersHandler, LifecyclePhase.Restored);
 const FORMATTER_CACHE_SIZE = 50;
 let LabelService = class LabelService extends Disposable {
     constructor(environmentService, contextService, pathService, remoteAgentService, storageService, lifecycleService) {
@@ -132,12 +137,12 @@ let LabelService = class LabelService extends Disposable {
         this.contextService = contextService;
         this.pathService = pathService;
         this.remoteAgentService = remoteAgentService;
-        this._onDidChangeFormatters = this._register(( (new Emitter({ leakWarningThreshold: 400 }))));
+        this._onDidChangeFormatters = this._register(( new Emitter({ leakWarningThreshold: 400 })));
         this.onDidChangeFormatters = this._onDidChangeFormatters.event;
         this.os = OS;
         this.userHome = pathService.defaultUriScheme === Schemas.file ? this.pathService.userHome({ preferLocal: true }) : undefined;
-        const memento = this.storedFormattersMemento = ( (new Memento('cachedResourceLabelFormatters2', storageService)));
-        this.storedFormatters = memento.getMemento(0 , 1 );
+        const memento = this.storedFormattersMemento = ( new Memento('cachedResourceLabelFormatters2', storageService));
+        this.storedFormatters = memento.getMemento(StorageScope.PROFILE, StorageTarget.MACHINE);
         this.formatters = this.storedFormatters?.formatters?.slice() || [];
         this.resolveRemoteEnvironment();
     }
@@ -234,7 +239,7 @@ let LabelService = class LabelService extends Disposable {
             pathLib = posix;
         }
         else {
-            pathLib = ((this.os === 1) ) ? win32 : posix;
+            pathLib = (this.os === OperatingSystem.Windows) ? win32 : posix;
         }
         return pathLib.basename(label);
     }
@@ -259,10 +264,10 @@ let LabelService = class LabelService extends Disposable {
     }
     doGetWorkspaceLabel(workspaceUri, options) {
         if (isUntitledWorkspace(workspaceUri, this.environmentService)) {
-            return ( localize(1407, "Untitled (Workspace)"));
+            return localize(11624, "Untitled (Workspace)");
         }
         if (isTemporaryWorkspace(workspaceUri)) {
-            return ( localize(1408, "Workspace"));
+            return localize(11625, "Workspace");
         }
         let filename = basename(workspaceUri);
         if (filename.endsWith(WORKSPACE_EXTENSION)) {
@@ -270,22 +275,22 @@ let LabelService = class LabelService extends Disposable {
         }
         let label;
         switch (options?.verbose) {
-            case 0 :
+            case Verbosity.SHORT:
                 label = filename;
                 break;
-            case 2 :
+            case Verbosity.LONG:
                 label = ( localize(
-                    1409,
+                    11626,
                     "{0} (Workspace)",
                     this.getUriLabel(joinPath(dirname(workspaceUri), filename))
                 ));
                 break;
-            case 1 :
+            case Verbosity.MEDIUM:
             default:
-                label = ( localize(1410, "{0} (Workspace)", filename));
+                label = ( localize(11627, "{0} (Workspace)", filename));
                 break;
         }
-        if (options?.verbose === 0 ) {
+        if (options?.verbose === Verbosity.SHORT) {
             return label;
         }
         return this.appendWorkspaceSuffix(label, workspaceUri);
@@ -293,30 +298,30 @@ let LabelService = class LabelService extends Disposable {
     doGetSingleFolderWorkspaceLabel(folderUri, options) {
         let label;
         switch (options?.verbose) {
-            case 2 :
+            case Verbosity.LONG:
                 label = this.getUriLabel(folderUri);
                 break;
-            case 0 :
-            case 1 :
+            case Verbosity.SHORT:
+            case Verbosity.MEDIUM:
             default:
                 label = basename(folderUri) || posix.sep;
                 break;
         }
-        if (options?.verbose === 0 ) {
+        if (options?.verbose === Verbosity.SHORT) {
             return label;
         }
         return this.appendWorkspaceSuffix(label, folderUri);
     }
     getSeparator(scheme, authority) {
-        const formatter = this.findFormatting(( (URI.from({ scheme, authority }))));
+        const formatter = this.findFormatting(( URI.from({ scheme, authority })));
         return formatter?.separator || posix.sep;
     }
     getHostLabel(scheme, authority) {
-        const formatter = this.findFormatting(( (URI.from({ scheme, authority }))));
+        const formatter = this.findFormatting(( URI.from({ scheme, authority })));
         return formatter?.workspaceSuffix || authority || '';
     }
     getHostTooltip(scheme, authority) {
-        const formatter = this.findFormatting(( (URI.from({ scheme, authority }))));
+        const formatter = this.findFormatting(( URI.from({ scheme, authority })));
         return formatter?.workspaceTooltip;
     }
     registerCachedFormatter(formatter) {
@@ -393,13 +398,13 @@ let LabelService = class LabelService extends Disposable {
         return suffix ? `${label} [${suffix}]` : label;
     }
 };
-LabelService = ( (__decorate([
-    ( (__param(0, IWorkbenchEnvironmentService))),
-    ( (__param(1, IWorkspaceContextService))),
-    ( (__param(2, IPathService))),
-    ( (__param(3, IRemoteAgentService))),
-    ( (__param(4, IStorageService))),
-    ( (__param(5, ILifecycleService)))
-], LabelService)));
+LabelService = ( __decorate([
+    ( __param(0, IWorkbenchEnvironmentService)),
+    ( __param(1, IWorkspaceContextService)),
+    ( __param(2, IPathService)),
+    ( __param(3, IRemoteAgentService)),
+    ( __param(4, IStorageService)),
+    ( __param(5, ILifecycleService))
+], LabelService));
 
 export { LabelService };

package/vscode/src/vs/workbench/services/path/browser/pathService.d.ts

@@ -0,0 +1,9 @@
+import { IRemoteAgentService } from "vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
+import { AbstractPathService } from "../common/pathService.js";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IWorkbenchEnvironmentService } from "vscode/vscode/vs/workbench/services/environment/common/environmentService.service";
+import { IWorkspaceContextService } from "vscode/vscode/vs/platform/workspace/common/workspace.service";
+export declare class BrowserPathService extends AbstractPathService {
+    constructor(remoteAgentService: IRemoteAgentService, environmentService: IWorkbenchEnvironmentService, contextService: IWorkspaceContextService);
+}
+export declare function guessLocalUserHome(environmentService: IWorkbenchEnvironmentService, contextService: IWorkspaceContextService): URI;

package/vscode/src/vs/workbench/services/path/browser/pathService.js

@@ -1,3 +1,5 @@
+
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { AbstractPathService } from '../common/pathService.js';
 import { URI } from 'vscode/vscode/vs/base/common/uri';

package/vscode/src/vs/workbench/services/path/common/pathService.d.ts

@@ -0,0 +1,32 @@
+import { IPath } from "vscode/vscode/vs/base/common/path";
+import { OperatingSystem } from "vscode/vscode/vs/base/common/platform";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IWorkspaceContextService } from "vscode/vscode/vs/platform/workspace/common/workspace.service";
+import { IWorkbenchEnvironmentService } from "vscode/vscode/vs/workbench/services/environment/common/environmentService.service";
+import { IRemoteAgentService } from "vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
+import { IPathService } from "vscode/vscode/vs/workbench/services/path/common/pathService.service";
+export declare abstract class AbstractPathService implements IPathService {
+    private localUserHome;
+    private readonly remoteAgentService;
+    private readonly environmentService;
+    private contextService;
+    readonly _serviceBrand: undefined;
+    private resolveOS;
+    private resolveUserHome;
+    private maybeUnresolvedUserHome;
+    constructor(localUserHome: URI, remoteAgentService: IRemoteAgentService, environmentService: IWorkbenchEnvironmentService, contextService: IWorkspaceContextService);
+    hasValidBasename(resource: URI, basename?: string): Promise<boolean>;
+    hasValidBasename(resource: URI, os: OperatingSystem, basename?: string): boolean;
+    private doHasValidBasename;
+    get defaultUriScheme(): string;
+    static findDefaultUriScheme(environmentService: IWorkbenchEnvironmentService, contextService: IWorkspaceContextService): string;
+    userHome(options?: {
+        preferLocal: boolean;
+    }): Promise<URI>;
+    userHome(options: {
+        preferLocal: true;
+    }): URI;
+    get resolvedUserHome(): URI | undefined;
+    get path(): Promise<IPath>;
+    fileURI(_path: string): Promise<URI>;
+}

package/vscode/src/vs/workbench/services/path/common/pathService.js

@@ -1,11 +1,12 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { isValidBasename } from 'vscode/vscode/vs/base/common/extpath';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { win32, posix } from 'vscode/vscode/vs/base/common/path';
-import { OS } from 'vscode/vscode/vs/base/common/platform';
+import { OS, OperatingSystem } from 'vscode/vscode/vs/base/common/platform';
 import { basename } from 'vscode/vscode/vs/base/common/resources';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { getVirtualWorkspaceScheme } from 'vscode/vscode/vs/platform/workspace/common/virtualWorkspace';
+import { getVirtualWorkspaceScheme } from '@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common/vscode/vs/platform/workspace/common/virtualWorkspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
@@ -35,7 +36,7 @@ let AbstractPathService = AbstractPathService_1 = class AbstractPathService {
     }
     doHasValidBasename(resource, os, name) {
         if (resource.scheme === Schemas.file || resource.scheme === Schemas.vscodeRemote) {
-            return isValidBasename(name ?? basename(resource), os === 1 );
+            return isValidBasename(name ?? basename(resource), os === OperatingSystem.Windows);
         }
         return true;
     }
@@ -68,7 +69,7 @@ let AbstractPathService = AbstractPathService_1 = class AbstractPathService {
     }
     get path() {
         return this.resolveOS.then(os => {
-            return os === 1  ?
+            return os === OperatingSystem.Windows ?
                 win32 :
                 posix;
         });
@@ -76,7 +77,7 @@ let AbstractPathService = AbstractPathService_1 = class AbstractPathService {
     async fileURI(_path) {
         let authority = '';
         const os = await this.resolveOS;
-        if (os === 1 ) {
+        if (os === OperatingSystem.Windows) {
             _path = _path.replace(/\\/g, '/');
         }
         if (_path[0] === '/' && _path[1] === '/') {

package/vscode/src/vs/workbench/services/request/browser/requestService.d.ts

@@ -0,0 +1,19 @@
+import { IRequestOptions, IRequestContext } from "@codingame/monaco-vscode-039b5553-0838-562a-97c2-30d6e54a7b42-common/vscode/vs/base/parts/request/common/request";
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IRemoteAgentService } from "vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
+import { AbstractRequestService, AuthInfo, Credentials } from "vscode/vscode/vs/platform/request/common/request";
+import { IRequestService } from "vscode/vscode/vs/platform/request/common/request.service";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+export declare class BrowserRequestService extends AbstractRequestService implements IRequestService {
+    private readonly remoteAgentService;
+    private readonly configurationService;
+    readonly _serviceBrand: undefined;
+    constructor(remoteAgentService: IRemoteAgentService, configurationService: IConfigurationService, logService: ILogService);
+    request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext>;
+    resolveProxy(url: string): Promise<string | undefined>;
+    lookupAuthorization(authInfo: AuthInfo): Promise<Credentials | undefined>;
+    lookupKerberosAuthorization(url: string): Promise<string | undefined>;
+    loadCertificates(): Promise<string[]>;
+    private _makeRemoteRequest;
+}

package/vscode/src/vs/workbench/services/request/browser/requestService.js

@@ -1,10 +1,11 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { RequestChannelClient } from '../../../../platform/request/common/requestIpc.js';
 import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { AbstractRequestService } from 'vscode/vscode/vs/platform/request/common/request';
-import { request } from '../../../../base/parts/request/browser/request.js';
+import { request } from '../../../../base/parts/request/common/requestImpl.js';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 
 let BrowserRequestService = class BrowserRequestService extends AbstractRequestService {
@@ -18,7 +19,7 @@ let BrowserRequestService = class BrowserRequestService extends AbstractRequestS
             if (!options.proxyAuthorization) {
                 options.proxyAuthorization = this.configurationService.getValue('http.proxyAuthorization');
             }
-            const context = await this.logAndRequest(options, () => request(options, token));
+            const context = await this.logAndRequest(options, () => request(options, token, () => navigator.onLine));
             const connection = this.remoteAgentService.getConnection();
             if (connection && context.res.statusCode === 405) {
                 return this._makeRemoteRequest(connection, options, token);

package/vscode/src/vs/workbench/services/url/browser/urlService.d.ts

@@ -0,0 +1,15 @@
+import { URI, UriComponents } from "vscode/vscode/vs/base/common/uri";
+import { AbstractURLService } from "../../../../platform/url/common/urlService.js";
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { IBrowserWorkbenchEnvironmentService } from "vscode/vscode/vs/workbench/services/environment/browser/environmentService.service";
+import { IOpenerService } from "vscode/vscode/vs/platform/opener/common/opener.service";
+import { IProductService } from "vscode/vscode/vs/platform/product/common/productService.service";
+export interface IURLCallbackProvider {
+    readonly onCallback: Event<URI>;
+    create(options?: Partial<UriComponents>): URI;
+}
+export declare class BrowserURLService extends AbstractURLService {
+    private provider;
+    constructor(environmentService: IBrowserWorkbenchEnvironmentService, openerService: IOpenerService, productService: IProductService);
+    create(options?: Partial<UriComponents>): URI;
+}

package/vscode/src/vs/workbench/services/url/browser/urlService.js

@@ -1,6 +1,8 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { AbstractURLService } from '../../../../platform/url/common/urlService.js';
 import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';

package/vscode/src/vs/workbench/services/userActivity/common/userActivityRegistry.d.ts

@@ -0,0 +1,11 @@
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IUserActivityService } from "vscode/vscode/vs/workbench/services/userActivity/common/userActivityService.service";
+declare class UserActivityRegistry {
+    private todo;
+    add: (ctor: {
+        new (s: IUserActivityService, ...args: any[]): unknown;
+    }) => void;
+    take(userActivityService: IUserActivityService, instantiation: IInstantiationService): void;
+}
+export declare const userActivityRegistry: UserActivityRegistry;
+export {};

package/vscode/src/vs/workbench/services/userActivity/common/userActivityRegistry.js

@@ -1,3 +1,5 @@
+
+
 class UserActivityRegistry {
     constructor() {
         this.todo = [];

package/vscode/src/vs/workbench/services/userActivity/common/userActivityService.d.ts

@@ -0,0 +1,17 @@
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { Disposable, IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IUserActivityService } from "vscode/vscode/vs/workbench/services/userActivity/common/userActivityService.service";
+export interface IMarkActiveOptions {
+    whenHeldFor?: number;
+}
+export declare class UserActivityService extends Disposable implements IUserActivityService {
+    readonly _serviceBrand: undefined;
+    private readonly markInactive;
+    private readonly changeEmitter;
+    private active;
+    isActive: boolean;
+    onDidChangeIsActive: Event<boolean>;
+    constructor(instantiationService: IInstantiationService);
+    markActive(opts?: IMarkActiveOptions): IDisposable;
+}

package/vscode/src/vs/workbench/services/userActivity/common/userActivityService.js

@@ -1,7 +1,9 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { RunOnceScheduler, runWhenGlobalIdle, disposableTimeout } from 'vscode/vscode/vs/base/common/async';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { userActivityRegistry } from './userActivityRegistry.js';
 

package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopySaveParticipant.d.ts

@@ -0,0 +1,17 @@
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { IProgress, IProgressStep } from "vscode/vscode/vs/platform/progress/common/progress";
+import { IProgressService } from "vscode/vscode/vs/platform/progress/common/progress.service";
+import { IDisposable, Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IStoredFileWorkingCopySaveParticipant, IStoredFileWorkingCopySaveParticipantContext } from "./workingCopyFileService.js";
+import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from "@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
+export declare class StoredFileWorkingCopySaveParticipant extends Disposable {
+    private readonly logService;
+    private readonly progressService;
+    private readonly saveParticipants;
+    get length(): number;
+    constructor(logService: ILogService, progressService: IProgressService);
+    addSaveParticipant(participant: IStoredFileWorkingCopySaveParticipant): IDisposable;
+    participate(workingCopy: IStoredFileWorkingCopy<IStoredFileWorkingCopyModel>, context: IStoredFileWorkingCopySaveParticipantContext, progress: IProgress<IProgressStep>, token: CancellationToken): Promise<void>;
+    dispose(): void;
+}

package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopySaveParticipant.js

@@ -1,7 +1,9 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { raceCancellation } from 'vscode/vscode/vs/base/common/async';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { ProgressLocation } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { LinkedList } from 'vscode/vscode/vs/base/common/linkedList';
@@ -15,23 +17,23 @@ let StoredFileWorkingCopySaveParticipant = class StoredFileWorkingCopySavePartic
         super();
         this.logService = logService;
         this.progressService = progressService;
-        this.saveParticipants = ( (new LinkedList()));
+        this.saveParticipants = ( new LinkedList());
     }
     addSaveParticipant(participant) {
         const remove = this.saveParticipants.push(participant);
         return toDisposable(() => remove());
     }
     async participate(workingCopy, context, progress, token) {
-        const cts = ( (new CancellationTokenSource(token)));
+        const cts = ( new CancellationTokenSource(token));
         workingCopy.model?.pushStackElement();
         progress.report({
-            message: ( localize(4784, "Running Code Actions and Formatters..."))
+            message: ( localize(12108, "Running Code Actions and Formatters..."))
         });
         let bubbleCancel = false;
         await this.progressService.withProgress({
             priority: NotificationPriority.URGENT,
-            location: 15 ,
-            cancellable: ( localize(4785, "Skip")),
+            location: ProgressLocation.Notification,
+            cancellable: ( localize(12109, "Skip")),
             delay: workingCopy.isDirty() ? 5000 : 3000
         }, async (progress) => {
             for (const saveParticipant of this.saveParticipants) {
@@ -58,7 +60,7 @@ let StoredFileWorkingCopySaveParticipant = class StoredFileWorkingCopySavePartic
         workingCopy.model?.pushStackElement();
         cts.dispose();
         if (bubbleCancel) {
-            throw ( (new CancellationError()));
+            throw ( new CancellationError());
         }
     }
     dispose() {
@@ -66,9 +68,9 @@ let StoredFileWorkingCopySaveParticipant = class StoredFileWorkingCopySavePartic
         super.dispose();
     }
 };
-StoredFileWorkingCopySaveParticipant = ( (__decorate([
-    ( (__param(0, ILogService))),
-    ( (__param(1, IProgressService)))
-], StoredFileWorkingCopySaveParticipant)));
+StoredFileWorkingCopySaveParticipant = ( __decorate([
+    ( __param(0, ILogService)),
+    ( __param(1, IProgressService))
+], StoredFileWorkingCopySaveParticipant));
 
 export { StoredFileWorkingCopySaveParticipant };

package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyFileOperationParticipant.d.ts

@@ -0,0 +1,15 @@
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { IDisposable, Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IWorkingCopyFileOperationParticipant, SourceTargetPair, IFileOperationUndoRedoInfo } from "./workingCopyFileService.js";
+import { FileOperation } from "vscode/vscode/vs/platform/files/common/files";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+export declare class WorkingCopyFileOperationParticipant extends Disposable {
+    private readonly logService;
+    private readonly configurationService;
+    private readonly participants;
+    constructor(logService: ILogService, configurationService: IConfigurationService);
+    addFileOperationParticipant(participant: IWorkingCopyFileOperationParticipant): IDisposable;
+    participate(files: SourceTargetPair[], operation: FileOperation, undoInfo: IFileOperationUndoRedoInfo | undefined, token: CancellationToken): Promise<void>;
+    dispose(): void;
+}

package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyFileOperationParticipant.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 { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';