@codingame/monaco-vscode-base-service-override 15.0.2 → 16.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-base-service-override",
-  "version": "15.0.2",
+  "version": "16.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - base service-override",
   "keywords": [],
@@ -15,14 +15,14 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-039b5553-0838-562a-97c2-30d6e54a7b42-common": "15.0.2",
-    "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common": "15.0.2",
-    "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common": "15.0.2",
-    "@codingame/monaco-vscode-7559b0be-bfa5-5fe6-b731-1973fe9fffa1-common": "15.0.2",
-    "@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common": "15.0.2",
-    "@codingame/monaco-vscode-a4c2011e-8775-52bd-abf0-4a3c07a9696b-common": "15.0.2",
-    "@codingame/monaco-vscode-api": "15.0.2",
-    "@codingame/monaco-vscode-d987325e-3e05-53aa-b9ff-6f97476f64db-common": "15.0.2"
+    "@codingame/monaco-vscode-039b5553-0838-562a-97c2-30d6e54a7b42-common": "16.0.0",
+    "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common": "16.0.0",
+    "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common": "16.0.0",
+    "@codingame/monaco-vscode-68b3311c-eb96-5711-8f72-f5f4b2e31932-common": "16.0.0",
+    "@codingame/monaco-vscode-7559b0be-bfa5-5fe6-b731-1973fe9fffa1-common": "16.0.0",
+    "@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common": "16.0.0",
+    "@codingame/monaco-vscode-api": "16.0.0",
+    "@codingame/monaco-vscode-d987325e-3e05-53aa-b9ff-6f97476f64db-common": "16.0.0"
   },
   "main": "index.js",
   "module": "index.js",
@@ -31,6 +31,9 @@
     ".": {
       "default": "./index.js"
     },
+    "./vscode/*.css": {
+      "default": "./vscode/src/*.css"
+    },
     "./vscode/*": {
       "types": "./vscode/src/*.d.ts",
       "default": "./vscode/src/*.js"

package/vscode/src/vs/platform/request/common/requestIpc.d.ts

@@ -1,6 +1,6 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
-import { IChannel, IServerChannel } from "@codingame/monaco-vscode-bd6ad8b7-9db3-51a8-9895-0046508c029d-common/vscode/vs/base/parts/ipc/common/ipc";
+import { IChannel, IServerChannel } from "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common/vscode/vs/base/parts/ipc/common/ipc";
 import { IRequestContext, IRequestOptions } from "@codingame/monaco-vscode-039b5553-0838-562a-97c2-30d6e54a7b42-common/vscode/vs/base/parts/request/common/request";
 import { 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";

package/vscode/src/vs/workbench/contrib/codeEditor/browser/workbenchEditorWorkerService.js

@@ -1,6 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { WorkerDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/defaultWorkerFactory';
+import { WebWorkerDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/webWorkerFactory';
+import { FileAccess } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { EditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/editorWorkerService';
 import { ILanguageConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/languageConfigurationRegistry.service';
 import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service';
@@ -10,7 +11,7 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 
 let WorkbenchEditorWorkerService = class WorkbenchEditorWorkerService extends EditorWorkerService {
     constructor(modelService, configurationService, logService, languageConfigurationService, languageFeaturesService) {
-        const workerDescriptor = ( new WorkerDescriptor('vs/editor/common/services/editorSimpleWorker', 'TextEditorWorker'));
+        const workerDescriptor = ( new WebWorkerDescriptor(( FileAccess.asBrowserUri('vs/editor/common/services/editorWebWorkerMain.js')), 'TextEditorWorker'));
         super(workerDescriptor, modelService, configurationService, logService, languageConfigurationService, languageFeaturesService);
     }
 };

package/vscode/src/vs/workbench/services/configuration/common/jsonEditingService.d.ts

@@ -4,13 +4,15 @@ import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 import { IJSONValue } from "@codingame/monaco-vscode-d987325e-3e05-53aa-b9ff-6f97476f64db-common/vscode/vs/workbench/services/configuration/common/jsonEditing";
 import { IJSONEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/configuration/common/jsonEditing.service";
+import { IFilesConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service";
 export declare class JSONEditingService implements IJSONEditingService {
     private readonly fileService;
     private readonly textModelResolverService;
     private readonly textFileService;
+    private readonly filesConfigurationService;
     _serviceBrand: undefined;
     private queue;
-    constructor(fileService: IFileService, textModelResolverService: ITextModelService, textFileService: ITextFileService);
+    constructor(fileService: IFileService, textModelResolverService: ITextModelService, textFileService: ITextFileService, filesConfigurationService: IFilesConfigurationService);
     write(resource: URI, values: IJSONValue[]): Promise<void>;
     private doWriteConfiguration;
     private writeToBuffer;

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-a4c2011e-8775-52bd-abf0-4a3c07a9696b-common/vscode/vs/base/common/jsonEdit';
+import { setProperty } from '@codingame/monaco-vscode-68b3311c-eb96-5711-8f72-f5f4b2e31932-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';
@@ -13,12 +13,14 @@ import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor
 import { JSONEditingErrorCode, JSONEditingError } from '@codingame/monaco-vscode-d987325e-3e05-53aa-b9ff-6f97476f64db-common/vscode/vs/workbench/services/configuration/common/jsonEditing';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
+import { IFilesConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
 
 let JSONEditingService = class JSONEditingService {
-    constructor(fileService, textModelResolverService, textFileService) {
+    constructor(fileService, textModelResolverService, textFileService, filesConfigurationService) {
         this.fileService = fileService;
         this.textModelResolverService = textModelResolverService;
         this.textFileService = textFileService;
+        this.filesConfigurationService = filesConfigurationService;
         this.queue = ( new Queue());
     }
     write(resource, values) {
@@ -34,13 +36,20 @@ let JSONEditingService = class JSONEditingService {
         }
     }
     async writeToBuffer(model, values) {
-        let hasEdits = false;
-        for (const value of values) {
-            const edit = this.getEdits(model, value)[0];
-            hasEdits = !!edit && this.applyEditsToBuffer(edit, model);
+        let disposable;
+        try {
+            disposable = this.filesConfigurationService.enableAutoSaveAfterShortDelay(model.uri);
+            let hasEdits = false;
+            for (const value of values) {
+                const edit = this.getEdits(model, value)[0];
+                hasEdits = (!!edit && this.applyEditsToBuffer(edit, model)) || hasEdits;
+            }
+            if (hasEdits) {
+                return this.textFileService.save(model.uri);
+            }
         }
-        if (hasEdits) {
-            return this.textFileService.save(model.uri);
+        finally {
+            disposable?.dispose();
         }
     }
     applyEditsToBuffer(edit, model) {
@@ -108,7 +117,7 @@ let JSONEditingService = class JSONEditingService {
         switch (error) {
             case JSONEditingErrorCode.ERROR_INVALID_FILE: {
                 return localize(
-                    11640,
+                    11971,
                     "Unable to write into the file. Please open the file to correct errors/warnings in the file and try again."
                 );
             }
@@ -118,7 +127,8 @@ let JSONEditingService = class JSONEditingService {
 JSONEditingService = ( __decorate([
     ( __param(0, IFileService)),
     ( __param(1, ITextModelService)),
-    ( __param(2, ITextFileService))
+    ( __param(2, ITextFileService)),
+    ( __param(3, IFilesConfigurationService))
 ], JSONEditingService));
 
 export { JSONEditingService };

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(11679, "Contains emphasized items"));
+            tooltip = ( localize(12010, "Contains emphasized items"));
         }
         return {
             labelClassName,

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

@@ -31,7 +31,7 @@ import { Memento } from '@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7a
 const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'resourceLabelFormatters',
     jsonSchema: {
-        description: ( localize(11974, 'Contributes resource label formatting rules.')),
+        description: ( localize(12307, 'Contributes resource label formatting rules.')),
         type: 'array',
         items: {
             type: 'object',
@@ -40,52 +40,52 @@ const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoin
                 scheme: {
                     type: 'string',
                     description: ( localize(
-                        11975,
+                        12308,
                         'URI scheme on which to match the formatter on. For example "file". Simple glob patterns are supported.'
                     )),
                 },
                 authority: {
                     type: 'string',
                     description: ( localize(
-                        11976,
+                        12309,
                         'URI authority on which to match the formatter on. Simple glob patterns are supported.'
                     )),
                 },
                 formatting: {
-                    description: ( localize(11977, "Rules for formatting uri resource labels.")),
+                    description: ( localize(12310, "Rules for formatting uri resource labels.")),
                     type: 'object',
                     properties: {
                         label: {
                             type: 'string',
                             description: ( localize(
-                                11978,
+                                12311,
                                 "Label rules to display. For example: myLabel:/${path}. ${path}, ${scheme}, ${authority} and ${authoritySuffix} are supported as variables."
                             ))
                         },
                         separator: {
                             type: 'string',
                             description: ( localize(
-                                11979,
+                                12312,
                                 "Separator to be used in the uri label display. '/' or '\' as an example."
                             ))
                         },
                         stripPathStartingSeparator: {
                             type: 'boolean',
                             description: ( localize(
-                                11980,
+                                12313,
                                 "Controls whether `${path}` substitutions should have starting separator characters stripped."
                             ))
                         },
                         tildify: {
                             type: 'boolean',
                             description: ( localize(
-                                11981,
+                                12314,
                                 "Controls if the start of the uri label should be tildified when possible."
                             ))
                         },
                         workspaceSuffix: {
                             type: 'string',
-                            description: ( localize(11982, "Suffix appended to the workspace label."))
+                            description: ( localize(12315, "Suffix appended to the workspace label."))
                         }
                     }
                 }
@@ -267,10 +267,10 @@ let LabelService = class LabelService extends Disposable {
     }
     doGetWorkspaceLabel(workspaceUri, options) {
         if (isUntitledWorkspace(workspaceUri, this.environmentService)) {
-            return localize(11983, "Untitled (Workspace)");
+            return localize(12316, "Untitled (Workspace)");
         }
         if (isTemporaryWorkspace(workspaceUri)) {
-            return localize(11984, "Workspace");
+            return localize(12317, "Workspace");
         }
         let filename = basename(workspaceUri);
         if (filename.endsWith(WORKSPACE_EXTENSION)) {
@@ -283,14 +283,14 @@ let LabelService = class LabelService extends Disposable {
                 break;
             case Verbosity.LONG:
                 label = ( localize(
-                    11985,
+                    12318,
                     "{0} (Workspace)",
                     this.getUriLabel(joinPath(dirname(workspaceUri), filename))
                 ));
                 break;
             case Verbosity.MEDIUM:
             default:
-                label = ( localize(11986, "{0} (Workspace)", filename));
+                label = ( localize(12319, "{0} (Workspace)", filename));
                 break;
         }
         if (options?.verbose === Verbosity.SHORT) {

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

@@ -13,7 +13,7 @@ import { windowLogGroup } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 
 let BrowserRequestService = class BrowserRequestService extends AbstractRequestService {
     constructor(remoteAgentService, configurationService, loggerService) {
-        const logger = loggerService.createLogger(`network`, { name: ( localize(12090, "Network")), group: windowLogGroup });
+        const logger = loggerService.createLogger(`network`, { name: ( localize(12423, "Network")), group: windowLogGroup });
         const logService = ( new LogService(logger));
         super(logService);
         this.remoteAgentService = remoteAgentService;

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(12473, "Running Code Actions and Formatters..."))
+            message: ( localize(12808, "Running Code Actions and Formatters..."))
         });
         let bubbleCancel = false;
         await this.progressService.withProgress({
             priority: NotificationPriority.URGENT,
             location: ProgressLocation.Notification,
-            cancellable: ( localize(12474, "Skip")),
+            cancellable: ( localize(12809, "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.d.ts

@@ -59,7 +59,6 @@ export type WorkingCopyProvider = (resourceOrFolder: URI) => IWorkingCopy[];
 export declare class WorkingCopyFileService extends Disposable implements IWorkingCopyFileService {
     private readonly fileService;
     private readonly workingCopyService;
-    private readonly instantiationService;
     private readonly uriIdentityService;
     readonly _serviceBrand: undefined;
     private readonly _onWillRunWorkingCopyFileOperation;

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

@@ -19,7 +19,6 @@ let WorkingCopyFileService = class WorkingCopyFileService extends Disposable {
         super();
         this.fileService = fileService;
         this.workingCopyService = workingCopyService;
-        this.instantiationService = instantiationService;
         this.uriIdentityService = uriIdentityService;
         this._onWillRunWorkingCopyFileOperation = this._register(( new AsyncEmitter()));
         this.onWillRunWorkingCopyFileOperation = this._onWillRunWorkingCopyFileOperation.event;
@@ -28,9 +27,9 @@ let WorkingCopyFileService = class WorkingCopyFileService extends Disposable {
         this._onDidRunWorkingCopyFileOperation = this._register(( new AsyncEmitter()));
         this.onDidRunWorkingCopyFileOperation = this._onDidRunWorkingCopyFileOperation.event;
         this.correlationIds = 0;
-        this.fileOperationParticipants = this._register(this.instantiationService.createInstance(WorkingCopyFileOperationParticipant));
-        this.saveParticipants = this._register(this.instantiationService.createInstance(StoredFileWorkingCopySaveParticipant));
         this.workingCopyProviders = [];
+        this.fileOperationParticipants = this._register(instantiationService.createInstance(WorkingCopyFileOperationParticipant));
+        this.saveParticipants = this._register(instantiationService.createInstance(StoredFileWorkingCopySaveParticipant));
         this._register(this.registerWorkingCopyProvider(resource => {
             return this.workingCopyService.workingCopies.filter(workingCopy => {
                 if (this.fileService.hasProvider(resource)) {