@codingame/monaco-vscode-base-service-override 37.1.0 → 37.3.0

package/index.js

@@ -46,8 +46,6 @@ import { IRandomService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { RandomService } from './vscode/src/vs/workbench/contrib/editTelemetry/browser/randomService.js';
 import { registerServiceInitializeParticipant } from '@codingame/monaco-vscode-api/lifecycle';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { IMeteredConnectionService } from '@codingame/monaco-vscode-api/vscode/vs/platform/meteredConnection/common/meteredConnection.service';
-import { MeteredConnectionService } from './vscode/src/vs/platform/meteredConnection/browser/meteredConnectionService.js';
 
 let BrowserPathServiceOverride = class BrowserPathServiceOverride extends AbstractPathService {
     constructor(remoteAgentService, environmentService, contextService) {
@@ -83,8 +81,7 @@ function getServiceOverride() {
         [IMarkdownRendererService.toString()]: new SyncDescriptor(MarkdownRendererService, [], true),
         [IUserAttentionService.toString()]: new SyncDescriptor(UserAttentionService, [], true),
         [IRenameSymbolTrackerService.toString()]: new SyncDescriptor(RenameSymbolTrackerService, [], true),
-        [IRandomService.toString()]: new SyncDescriptor(RandomService, [], true),
-        [IMeteredConnectionService.toString()]: new SyncDescriptor(MeteredConnectionService, [], true)
+        [IRandomService.toString()]: new SyncDescriptor(RandomService, [], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-base-service-override",
-  "version": "37.1.0",
+  "version": "37.3.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - base service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "37.1.0"
+    "@codingame/monaco-vscode-api": "37.3.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/platform/url/common/urlService.js

@@ -14,7 +14,7 @@ class AbstractURLService extends Disposable {
     }
     open(uri, options) {
         const handlers = [...( this.handlers.values())];
-        return first(( handlers.map(h => () => h.handleURL(uri, options))), undefined, false).then(val => val || false);
+        return first(handlers.map(h => () => h.handleURL(uri, options)), undefined, false).then(val => val || false);
     }
     registerHandler(handler) {
         this.handlers.add(handler);

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

@@ -137,7 +137,7 @@ let JSONEditingService = class JSONEditingService {
         case JSONEditingErrorCode.ERROR_INVALID_FILE:
             {
                 return localize(
-                    19504,
+                    21647,
                     "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

@@ -34,7 +34,7 @@ import { getIconRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform
 class DecorationRule {
     static keyOf(data) {
         if (Array.isArray(data)) {
-            return ( data.map(DecorationRule.keyOf)).join(",");
+            return data.map(DecorationRule.keyOf).join(",");
         } else {
             const {
                 color,
@@ -178,11 +178,11 @@ class DecorationStyles {
         const labelClassName = rule.itemColorClassName;
         let badgeClassName = rule.itemBadgeClassName;
         const iconClassName = rule.iconBadgeClassName;
-        let tooltip = distinct(( data.filter(d => !isFalsyOrWhitespace(d.tooltip)).map(d => d.tooltip))).join(" • ");
+        let tooltip = distinct(data.filter(d => !isFalsyOrWhitespace(d.tooltip)).map(d => d.tooltip)).join(" • ");
         const strikethrough = ( data.some(d => d.strikethrough));
         if (onlyChildren) {
             badgeClassName = rule.bubbleBadgeClassName;
-            tooltip = ( localize(19554, "Contains emphasized items"));
+            tooltip = ( localize(21697, "Contains emphasized items"));
         }
         return {
             labelClassName,

package/vscode/src/vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification.js

@@ -20,7 +20,7 @@ const CODE_UNIFICATION_PREFIX = "cmp-cht-";
 const EXTENSION_UNIFICATION_PREFIX = "cmp-ext-";
 const CODE_UNIFICATION_FF = "inlineCompletionsUnificationCode";
 const MODEL_UNIFICATION_FF = "inlineCompletionsUnificationModel";
-const isRunningUnificationExperiment = ( new RawContextKey("isRunningUnificationExperiment", false));
+const isRunningUnificationExperiment = new RawContextKey("isRunningUnificationExperiment", false);
 const ExtensionUnificationSetting = "chat.extensionUnification.enabled";
 let InlineCompletionsUnificationImpl = class InlineCompletionsUnificationImpl extends Disposable {
     get state() {

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

@@ -32,7 +32,7 @@ import { escapeRegExpCharacters } from '@codingame/monaco-vscode-api/vscode/vs/b
 const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "resourceLabelFormatters",
     jsonSchema: {
-        description: ( localize(19869, "Contributes resource label formatting rules.")),
+        description: ( localize(22012, "Contributes resource label formatting rules.")),
         type: "array",
         items: {
             type: "object",
@@ -41,52 +41,52 @@ const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoin
                 scheme: {
                     type: "string",
                     description: ( localize(
-                        19870,
+                        22013,
                         "URI scheme on which to match the formatter on. For example \"file\". Simple glob patterns are supported."
                     ))
                 },
                 authority: {
                     type: "string",
                     description: ( localize(
-                        19871,
+                        22014,
                         "URI authority on which to match the formatter on. Simple glob patterns are supported."
                     ))
                 },
                 formatting: {
-                    description: ( localize(19872, "Rules for formatting uri resource labels.")),
+                    description: ( localize(22015, "Rules for formatting uri resource labels.")),
                     type: "object",
                     properties: {
                         label: {
                             type: "string",
                             description: ( localize(
-                                19873,
+                                22016,
                                 "Label rules to display. For example: myLabel:/${path}. ${path}, ${scheme}, ${authority} and ${authoritySuffix} are supported as variables."
                             ))
                         },
                         separator: {
                             type: "string",
                             description: ( localize(
-                                19874,
+                                22017,
                                 "Separator to be used in the uri label display. '/' or '' as an example."
                             ))
                         },
                         stripPathStartingSeparator: {
                             type: "boolean",
                             description: ( localize(
-                                19875,
+                                22018,
                                 "Controls whether `${path}` substitutions should have starting separator characters stripped."
                             ))
                         },
                         tildify: {
                             type: "boolean",
                             description: ( localize(
-                                19876,
+                                22019,
                                 "Controls if the start of the uri label should be tildified when possible."
                             ))
                         },
                         workspaceSuffix: {
                             type: "string",
-                            description: ( localize(19877, "Suffix appended to the workspace label."))
+                            description: ( localize(22020, "Suffix appended to the workspace label."))
                         }
                     }
                 }
@@ -367,10 +367,10 @@ let LabelService = class LabelService extends Disposable {
     }
     doGetWorkspaceLabel(workspaceUri, options) {
         if (isUntitledWorkspace(workspaceUri, this.environmentService)) {
-            return localize(19878, "Untitled (Workspace)");
+            return localize(22021, "Untitled (Workspace)");
         }
         if (isTemporaryWorkspace(workspaceUri)) {
-            return localize(19879, "Workspace");
+            return localize(22022, "Workspace");
         }
         let filename = basename(workspaceUri);
         if (filename.endsWith(WORKSPACE_EXTENSION)) {
@@ -383,14 +383,14 @@ let LabelService = class LabelService extends Disposable {
             break;
         case Verbosity.LONG:
             label = ( localize(
-                19880,
+                22023,
                 "{0} (Workspace)",
                 this.getUriLabel(joinPath(dirname(workspaceUri), filename))
             ));
             break;
         case Verbosity.MEDIUM:
         default:
-            label = ( localize(19881, "{0} (Workspace)", filename));
+            label = ( localize(22024, "{0} (Workspace)", filename));
             break;
         }
         if (options?.verbose === Verbosity.SHORT) {
@@ -489,7 +489,7 @@ let LabelService = class LabelService extends Disposable {
         } = formatter;
         const homePath = home.path.length > 1 ? home.path.replace(/\/+$/, "") : home.path;
         const parameterNames = ( new Set());
-        const matcherPattern = ( homePath.split("/").map(segment => {
+        const matcherPattern = homePath.split("/").map(segment => {
             const parameterMatch = homeTemplateParameterRegex.exec(segment);
             if (parameterMatch?.groups?.name) {
                 const parameterName = parameterMatch.groups.name;
@@ -505,7 +505,7 @@ let LabelService = class LabelService extends Disposable {
                 ));
             }
             return escapeRegExpCharacters(segment);
-        })).join("/");
+        }).join("/");
         const isRootHome = homePath === "" || homePath === "/";
         return {
             formatter,

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

@@ -15,7 +15,7 @@ import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/
 let BrowserRequestService = class BrowserRequestService extends AbstractRequestService {
     constructor(remoteAgentService, configurationService, loggerService) {
         const logger = loggerService.createLogger(`network`, {
-            name: ( localize(20013, "Network")),
+            name: ( localize(22156, "Network")),
             group: windowLogGroup
         });
         const logService = ( new LogService(logger));

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

@@ -29,13 +29,13 @@ let StoredFileWorkingCopySaveParticipant = class StoredFileWorkingCopySavePartic
         const cts = ( new CancellationTokenSource(token));
         workingCopy.model?.pushStackElement();
         progress.report({
-            message: ( localize(20416, "Running Code Actions and Formatters..."))
+            message: ( localize(22559, "Running Code Actions and Formatters..."))
         });
         let bubbleCancel = false;
         await this.progressService.withProgress({
             priority: NotificationPriority.URGENT,
             location: ProgressLocation.Notification,
-            cancellable: ( localize(20417, "Skip")),
+            cancellable: ( localize(22560, "Skip")),
             delay: workingCopy.isDirty() ? 5000 : 3000
         }, async progress => {
             const participants = Array.from(this.saveParticipants).sort((a, b) => {

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

@@ -50,17 +50,19 @@ let WorkingCopyFileService = class WorkingCopyFileService extends Disposable {
             return [];
         }
         if (isFile) {
-            const validateCreates = await Promises.settled(( operations.map(operation => this.fileService.canCreateFile(operation.resource, {
-                overwrite: operation.overwrite
-            }))));
+            const validateCreates = await Promises.settled(
+                operations.map(operation => this.fileService.canCreateFile(operation.resource, {
+                    overwrite: operation.overwrite
+                }))
+            );
             const error = validateCreates.find(validateCreate => validateCreate instanceof Error);
             if (error instanceof Error) {
                 throw error;
             }
         }
-        const files = ( operations.map(operation => ({
+        const files = operations.map(operation => ({
             target: operation.resource
-        })));
+        }));
         await this.runFileOperationParticipants(files, FileOperation.CREATE, undoInfo, token);
         const event = {
             correlationId: this.correlationIds++,
@@ -74,13 +76,15 @@ let WorkingCopyFileService = class WorkingCopyFileService extends Disposable {
         let stats;
         try {
             if (isFile) {
-                stats = await Promises.settled(( operations.map(
+                stats = await Promises.settled(operations.map(
                     operation => this.fileService.createFile(operation.resource, operation.contents, {
                         overwrite: operation.overwrite
                     })
-                )));
+                ));
             } else {
-                stats = await Promises.settled(( operations.map(operation => this.fileService.createFolder(operation.resource))));
+                stats = await Promises.settled(
+                    operations.map(operation => this.fileService.createFolder(operation.resource))
+                );
             }
         } catch (error) {
             await this._onDidFailWorkingCopyFileOperation.fireAsync(
@@ -115,7 +119,7 @@ let WorkingCopyFileService = class WorkingCopyFileService extends Disposable {
                 throw validateMoveOrCopy;
             }
         }
-        const files = ( operations.map(o => o.file));
+        const files = operations.map(o => o.file);
         await this.runFileOperationParticipants(files, move ? FileOperation.MOVE : FileOperation.COPY, undoInfo, token);
         const event = {
             correlationId: this.correlationIds++,
@@ -136,9 +140,9 @@ let WorkingCopyFileService = class WorkingCopyFileService extends Disposable {
             } of operations) {
                 if (!this.uriIdentityService.extUri.isEqual(source, target)) {
                     const dirtyWorkingCopies = (move ? [...this.getDirty(source), ...this.getDirty(target)] : this.getDirty(target));
-                    await Promises.settled(( dirtyWorkingCopies.map(dirtyWorkingCopy => dirtyWorkingCopy.revert({
+                    await Promises.settled(dirtyWorkingCopies.map(dirtyWorkingCopy => dirtyWorkingCopy.revert({
                         soft: true
-                    }))));
+                    })));
                 }
                 if (move) {
                     stats.push(await this.fileService.move(source, target, overwrite));
@@ -169,9 +173,9 @@ let WorkingCopyFileService = class WorkingCopyFileService extends Disposable {
                 throw validateDelete;
             }
         }
-        const files = ( operations.map(operation => ({
+        const files = operations.map(operation => ({
             target: operation.resource
-        })));
+        }));
         await this.runFileOperationParticipants(files, FileOperation.DELETE, undoInfo, token);
         const event = {
             correlationId: this.correlationIds++,
@@ -184,9 +188,9 @@ let WorkingCopyFileService = class WorkingCopyFileService extends Disposable {
         );
         for (const operation of operations) {
             const dirtyWorkingCopies = this.getDirty(operation.resource);
-            await Promises.settled(( dirtyWorkingCopies.map(dirtyWorkingCopy => dirtyWorkingCopy.revert({
+            await Promises.settled(dirtyWorkingCopies.map(dirtyWorkingCopy => dirtyWorkingCopy.revert({
                 soft: true
-            }))));
+            })));
         }
         try {
             for (const operation of operations) {

package/vscode/src/vs/platform/meteredConnection/browser/meteredConnectionService.d.ts

@@ -1,9 +0,0 @@
-import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { AbstractMeteredConnectionService } from "@codingame/monaco-vscode-api/vscode/vs/platform/meteredConnection/common/meteredConnection";
-/**
- * Browser implementation of the metered connection service.
- * This implementation monitors navigator.connection for changes.
- */
-export declare class MeteredConnectionService extends AbstractMeteredConnectionService {
-    constructor(configurationService: IConfigurationService);
-}

package/vscode/src/vs/platform/meteredConnection/browser/meteredConnectionService.js

@@ -1,22 +0,0 @@
-
-import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-import { AbstractMeteredConnectionService, getIsBrowserConnectionMetered } from '@codingame/monaco-vscode-api/vscode/vs/platform/meteredConnection/common/meteredConnection';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-
-let MeteredConnectionService = class MeteredConnectionService extends AbstractMeteredConnectionService {
-    constructor(configurationService) {
-        super(configurationService, getIsBrowserConnectionMetered());
-        const connection = navigator.connection;
-        if (connection) {
-            const onChange = () => this.setIsBrowserConnectionMetered(getIsBrowserConnectionMetered());
-            connection.addEventListener("change", onChange);
-            this._register(toDisposable(() => connection.removeEventListener("change", onChange)));
-        }
-    }
-};
-MeteredConnectionService = ( __decorate([( __param(0, IConfigurationService))], MeteredConnectionService));
-
-export { MeteredConnectionService };