@codingame/monaco-vscode-base-service-override 13.1.7 → 14.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-base-service-override",
-  "version": "13.1.7",
+  "version": "14.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - base service-override",
   "keywords": [],
@@ -15,15 +15,14 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-039b5553-0838-562a-97c2-30d6e54a7b42-common": "13.1.7",
-    "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common": "13.1.7",
-    "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common": "13.1.7",
-    "@codingame/monaco-vscode-82e231ca-6ed7-5920-b2b8-1874ccc0be07-common": "13.1.7",
-    "@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common": "13.1.7",
-    "@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common": "13.1.7",
-    "@codingame/monaco-vscode-api": "13.1.7",
-    "@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common": "13.1.7",
-    "@codingame/monaco-vscode-d987325e-3e05-53aa-b9ff-6f97476f64db-common": "13.1.7"
+    "@codingame/monaco-vscode-039b5553-0838-562a-97c2-30d6e54a7b42-common": "14.0.0",
+    "@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common": "14.0.0",
+    "@codingame/monaco-vscode-407531d3-fdae-5387-8c41-49ba0e9574b5-common": "14.0.0",
+    "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common": "14.0.0",
+    "@codingame/monaco-vscode-91789cdf-e3cb-5a04-aaeb-6f7df7d3d231-common": "14.0.0",
+    "@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common": "14.0.0",
+    "@codingame/monaco-vscode-api": "14.0.0",
+    "@codingame/monaco-vscode-d987325e-3e05-53aa-b9ff-6f97476f64db-common": "14.0.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/services/configuration/common/jsonEditingService.js

@@ -2,7 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { parse } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
-import { setProperty } from '@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common/vscode/vs/base/common/jsonEdit';
+import { setProperty } from '@codingame/monaco-vscode-407531d3-fdae-5387-8c41-49ba0e9574b5-common/vscode/vs/base/common/jsonEdit';
 import { Queue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { EditOperation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/editOperation';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
@@ -108,7 +108,7 @@ let JSONEditingService = class JSONEditingService {
         switch (error) {
             case JSONEditingErrorCode.ERROR_INVALID_FILE: {
                 return localize(
-                    11320,
+                    11516,
                     "Unable to write into the file. Please open the file to correct errors/warnings in the file and try again."
                 );
             }

package/vscode/src/vs/workbench/services/decorations/browser/decorationsService.js

@@ -161,7 +161,7 @@ class DecorationStyles {
         const strikethrough = ( data.some(d => d.strikethrough));
         if (onlyChildren) {
             badgeClassName = rule.bubbleBadgeClassName;
-            tooltip = ( localize(11358, "Contains emphasized items"));
+            tooltip = ( localize(11555, "Contains emphasized items"));
         }
         return {
             labelClassName,

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

@@ -3,7 +3,7 @@ import { IDisposable, Disposable } from "@codingame/monaco-vscode-api/vscode/vs/
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 import { IWorkspace, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/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 { ResourceLabelFormatter, ResourceLabelFormatting, IFormatterChangeEvent, Verbosity } from "@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/label/common/label";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
 import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service";
@@ -29,6 +29,7 @@ export declare class LabelService extends Disposable implements ILabelService {
         relative?: boolean;
         noPrefix?: boolean;
         separator?: "/" | "\\";
+        appendWorkspaceSuffix?: boolean;
     }): string;
     private doGetUriLabel;
     getUriBasenameLabel(resource: URI): string;

package/vscode/src/vs/workbench/services/label/common/labelService.js

@@ -12,7 +12,7 @@ import { isWorkspace, toWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier,
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { basenameOrAuthority, basename, joinPath, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { getPathLabel, tildify } from '@codingame/monaco-vscode-api/vscode/vs/base/common/labels';
-import { Verbosity } from '@codingame/monaco-vscode-82e231ca-6ed7-5920-b2b8-1874ccc0be07-common/vscode/vs/platform/label/common/label';
+import { Verbosity } from '@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/label/common/label';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
 import { match } from '@codingame/monaco-vscode-api/vscode/vs/base/common/glob';
@@ -26,12 +26,12 @@ import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { Memento } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/common/memento';
+import { Memento } from '@codingame/monaco-vscode-91789cdf-e3cb-5a04-aaeb-6f7df7d3d231-common/vscode/vs/workbench/common/memento';
 
 const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'resourceLabelFormatters',
     jsonSchema: {
-        description: ( localize(11631, 'Contributes resource label formatting rules.')),
+        description: ( localize(11848, 'Contributes resource label formatting rules.')),
         type: 'array',
         items: {
             type: 'object',
@@ -40,52 +40,52 @@ const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoin
                 scheme: {
                     type: 'string',
                     description: ( localize(
-                        11632,
+                        11849,
                         'URI scheme on which to match the formatter on. For example "file". Simple glob patterns are supported.'
                     )),
                 },
                 authority: {
                     type: 'string',
                     description: ( localize(
-                        11633,
+                        11850,
                         'URI authority on which to match the formatter on. Simple glob patterns are supported.'
                     )),
                 },
                 formatting: {
-                    description: ( localize(11634, "Rules for formatting uri resource labels.")),
+                    description: ( localize(11851, "Rules for formatting uri resource labels.")),
                     type: 'object',
                     properties: {
                         label: {
                             type: 'string',
                             description: ( localize(
-                                11635,
+                                11852,
                                 "Label rules to display. For example: myLabel:/${path}. ${path}, ${scheme}, ${authority} and ${authoritySuffix} are supported as variables."
                             ))
                         },
                         separator: {
                             type: 'string',
                             description: ( localize(
-                                11636,
+                                11853,
                                 "Separator to be used in the uri label display. '/' or '\' as an example."
                             ))
                         },
                         stripPathStartingSeparator: {
                             type: 'boolean',
                             description: ( localize(
-                                11637,
+                                11854,
                                 "Controls whether `${path}` substitutions should have starting separator characters stripped."
                             ))
                         },
                         tildify: {
                             type: 'boolean',
                             description: ( localize(
-                                11638,
+                                11855,
                                 "Controls if the start of the uri label should be tildified when possible."
                             ))
                         },
                         workspaceSuffix: {
                             type: 'string',
-                            description: ( localize(11639, "Suffix appended to the workspace label."))
+                            description: ( localize(11856, "Suffix appended to the workspace label."))
                         }
                     }
                 }
@@ -178,9 +178,12 @@ let LabelService = class LabelService extends Disposable {
         if (formatting && options.separator) {
             formatting = { ...formatting, separator: options.separator };
         }
-        const label = this.doGetUriLabel(resource, formatting, options);
+        let label = this.doGetUriLabel(resource, formatting, options);
         if (!formatting && options.separator) {
-            return label.replace(sepRegexp, options.separator);
+            label = label.replace(sepRegexp, options.separator);
+        }
+        if (options.appendWorkspaceSuffix && formatting?.workspaceSuffix) {
+            label = this.appendWorkspaceSuffix(label, resource);
         }
         return label;
     }
@@ -264,10 +267,10 @@ let LabelService = class LabelService extends Disposable {
     }
     doGetWorkspaceLabel(workspaceUri, options) {
         if (isUntitledWorkspace(workspaceUri, this.environmentService)) {
-            return localize(11640, "Untitled (Workspace)");
+            return localize(11857, "Untitled (Workspace)");
         }
         if (isTemporaryWorkspace(workspaceUri)) {
-            return localize(11641, "Workspace");
+            return localize(11858, "Workspace");
         }
         let filename = basename(workspaceUri);
         if (filename.endsWith(WORKSPACE_EXTENSION)) {
@@ -280,14 +283,14 @@ let LabelService = class LabelService extends Disposable {
                 break;
             case Verbosity.LONG:
                 label = ( localize(
-                    11642,
+                    11859,
                     "{0} (Workspace)",
                     this.getUriLabel(joinPath(dirname(workspaceUri), filename))
                 ));
                 break;
             case Verbosity.MEDIUM:
             default:
-                label = ( localize(11643, "{0} (Workspace)", filename));
+                label = ( localize(11860, "{0} (Workspace)", filename));
                 break;
         }
         if (options?.verbose === Verbosity.SHORT) {

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

@@ -6,7 +6,7 @@ import { win32, posix } from '@codingame/monaco-vscode-api/vscode/vs/base/common
 import { OS, OperatingSystem } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { getVirtualWorkspaceScheme } from '@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common/vscode/vs/platform/workspace/common/virtualWorkspace';
+import { getVirtualWorkspaceScheme } from '@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/workspace/common/virtualWorkspace';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';

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

@@ -4,12 +4,12 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IRemoteAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
 import { AbstractRequestService, AuthInfo, Credentials } from "@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request";
 import { IRequestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service";
-import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { ILoggerService } from "@codingame/monaco-vscode-api/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);
+    constructor(remoteAgentService: IRemoteAgentService, configurationService: IConfigurationService, loggerService: ILoggerService);
     request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext>;
     resolveProxy(url: string): Promise<string | undefined>;
     lookupAuthorization(authInfo: AuthInfo): Promise<Credentials | undefined>;

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

@@ -6,18 +6,25 @@ import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { AbstractRequestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request';
 import { request } from '../../../../base/parts/request/common/requestImpl.js';
-import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { ILoggerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { LogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/logService';
+import { windowLogGroup } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/log/common/logConstants';
 
 let BrowserRequestService = class BrowserRequestService extends AbstractRequestService {
-    constructor(remoteAgentService, configurationService, logService) {
+    constructor(remoteAgentService, configurationService, loggerService) {
+        const logger = loggerService.createLogger(`network`, { name: ( localize(11964, "Network")), group: windowLogGroup });
+        const logService = ( new LogService(logger));
         super(logService);
         this.remoteAgentService = remoteAgentService;
         this.configurationService = configurationService;
+        this._register(logger);
+        this._register(logService);
     }
     async request(options, token) {
         try {
             if (!options.proxyAuthorization) {
-                options.proxyAuthorization = this.configurationService.getValue('http.proxyAuthorization');
+                options.proxyAuthorization = this.configurationService.inspect('http.proxyAuthorization').userLocalValue;
             }
             const context = await this.logAndRequest(options, () => request(options, token, () => navigator.onLine));
             const connection = this.remoteAgentService.getConnection();
@@ -53,7 +60,7 @@ let BrowserRequestService = class BrowserRequestService extends AbstractRequestS
 BrowserRequestService = ( __decorate([
     ( __param(0, IRemoteAgentService)),
     ( __param(1, IConfigurationService)),
-    ( __param(2, ILogService))
+    ( __param(2, ILoggerService))
 ], BrowserRequestService));
 CommandsRegistry.registerCommand('_workbench.fetchJSON', async function (accessor, url, method) {
     const result = await fetch(url, { method, headers: { Accept: 'application/json' } });

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

@@ -27,13 +27,13 @@ let StoredFileWorkingCopySaveParticipant = class StoredFileWorkingCopySavePartic
         const cts = ( new CancellationTokenSource(token));
         workingCopy.model?.pushStackElement();
         progress.report({
-            message: ( localize(12124, "Running Code Actions and Formatters..."))
+            message: ( localize(12346, "Running Code Actions and Formatters..."))
         });
         let bubbleCancel = false;
         await this.progressService.withProgress({
             priority: NotificationPriority.URGENT,
             location: ProgressLocation.Notification,
-            cancellable: ( localize(12125, "Skip")),
+            cancellable: ( localize(12347, "Skip")),
             delay: workingCopy.isDirty() ? 5000 : 3000
         }, async (progress) => {
             for (const saveParticipant of this.saveParticipants) {

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

@@ -6,7 +6,7 @@ import { FileOperation, IFileStatWithMetadata } from "@codingame/monaco-vscode-a
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { IWorkingCopyService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service";
-import { IWorkingCopy } from "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
+import { IWorkingCopy } from "@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buffer";
 import { SaveReason } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";