@codingame/monaco-vscode-base-service-override 10.1.4 → 11.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-base-service-override",
-  "version": "10.1.4",
+  "version": "11.0.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@10.1.4"
+    "vscode": "npm:@codingame/monaco-vscode-api@11.0.1"
   }
 }

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

@@ -106,7 +106,7 @@ let JSONEditingService = class JSONEditingService {
         switch (error) {
             case 0 : {
                 return ( localize(
-                    870,
+                    866,
                     "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

@@ -5,7 +5,8 @@ import { TernarySearchTree } from 'vscode/vscode/vs/base/common/ternarySearchTre
 import { DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { isThenable } from 'vscode/vscode/vs/base/common/async';
 import { LinkedList } from 'vscode/vscode/vs/base/common/linkedList';
-import { createCSSRule, asCSSPropertyValue, removeCSSRulesContainingSelector, createStyleSheet } from 'vscode/vscode/vs/base/browser/dom';
+import { createCSSRule, removeCSSRulesContainingSelector, createStyleSheet } from 'vscode/vscode/vs/base/browser/dom';
+import { asCSSPropertyValue } from 'vscode/vscode/vs/base/browser/cssValue';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { isFalsyOrWhitespace } from 'vscode/vscode/vs/base/common/strings';
@@ -158,7 +159,7 @@ class DecorationStyles {
         const strikethrough = ( (data.some(d => d.strikethrough)));
         if (onlyChildren) {
             badgeClassName = rule.bubbleBadgeClassName;
-            tooltip = ( localize(871, "Contains emphasized items"));
+            tooltip = ( localize(867, "Contains emphasized items"));
         }
         return {
             labelClassName,

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

@@ -26,7 +26,7 @@ import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
 const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'resourceLabelFormatters',
     jsonSchema: {
-        description: ( localize(872, 'Contributes resource label formatting rules.')),
+        description: ( localize(868, 'Contributes resource label formatting rules.')),
         type: 'array',
         items: {
             type: 'object',
@@ -35,52 +35,52 @@ const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoin
                 scheme: {
                     type: 'string',
                     description: ( localize(
-                        873,
+                        869,
                         'URI scheme on which to match the formatter on. For example "file". Simple glob patterns are supported.'
                     )),
                 },
                 authority: {
                     type: 'string',
                     description: ( localize(
-                        874,
+                        870,
                         'URI authority on which to match the formatter on. Simple glob patterns are supported.'
                     )),
                 },
                 formatting: {
-                    description: ( localize(875, "Rules for formatting uri resource labels.")),
+                    description: ( localize(871, "Rules for formatting uri resource labels.")),
                     type: 'object',
                     properties: {
                         label: {
                             type: 'string',
                             description: ( localize(
-                                876,
+                                872,
                                 "Label rules to display. For example: myLabel:/${path}. ${path}, ${scheme}, ${authority} and ${authoritySuffix} are supported as variables."
                             ))
                         },
                         separator: {
                             type: 'string',
                             description: ( localize(
-                                877,
+                                873,
                                 "Separator to be used in the uri label display. '/' or '\' as an example."
                             ))
                         },
                         stripPathStartingSeparator: {
                             type: 'boolean',
                             description: ( localize(
-                                878,
+                                874,
                                 "Controls whether `${path}` substitutions should have starting separator characters stripped."
                             ))
                         },
                         tildify: {
                             type: 'boolean',
                             description: ( localize(
-                                879,
+                                875,
                                 "Controls if the start of the uri label should be tildified when possible."
                             ))
                         },
                         workspaceSuffix: {
                             type: 'string',
-                            description: ( localize(880, "Suffix appended to the workspace label."))
+                            description: ( localize(876, "Suffix appended to the workspace label."))
                         }
                     }
                 }
@@ -259,10 +259,10 @@ let LabelService = class LabelService extends Disposable {
     }
     doGetWorkspaceLabel(workspaceUri, options) {
         if (isUntitledWorkspace(workspaceUri, this.environmentService)) {
-            return ( localize(881, "Untitled (Workspace)"));
+            return ( localize(877, "Untitled (Workspace)"));
         }
         if (isTemporaryWorkspace(workspaceUri)) {
-            return ( localize(882, "Workspace"));
+            return ( localize(878, "Workspace"));
         }
         let filename = basename(workspaceUri);
         if (filename.endsWith(WORKSPACE_EXTENSION)) {
@@ -275,14 +275,14 @@ let LabelService = class LabelService extends Disposable {
                 break;
             case 2 :
                 label = ( localize(
-                    883,
+                    879,
                     "{0} (Workspace)",
                     this.getUriLabel(joinPath(dirname(workspaceUri), filename))
                 ));
                 break;
             case 1 :
             default:
-                label = ( localize(884, "{0} (Workspace)", filename));
+                label = ( localize(880, "{0} (Workspace)", filename));
                 break;
         }
         if (options?.verbose === 0 ) {

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

@@ -1,43 +1,74 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 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 { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { insert } from 'vscode/vscode/vs/base/common/arrays';
+import { LinkedList } from 'vscode/vscode/vs/base/common/linkedList';
+import { isCancellationError, CancellationError } from 'vscode/vscode/vs/base/common/errors';
+import { NotificationPriority } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { localize } from 'vscode/vscode/vs/nls';
 
 let StoredFileWorkingCopySaveParticipant = class StoredFileWorkingCopySaveParticipant extends Disposable {
-    get length() { return this.saveParticipants.length; }
-    constructor(logService) {
+    get length() { return this.saveParticipants.size; }
+    constructor(logService, progressService) {
         super();
         this.logService = logService;
-        this.saveParticipants = [];
+        this.progressService = progressService;
+        this.saveParticipants = ( (new LinkedList()));
     }
     addSaveParticipant(participant) {
-        const remove = insert(this.saveParticipants, participant);
+        const remove = this.saveParticipants.push(participant);
         return toDisposable(() => remove());
     }
     async participate(workingCopy, context, progress, token) {
+        const cts = ( (new CancellationTokenSource(token)));
         workingCopy.model?.pushStackElement();
-        for (const saveParticipant of this.saveParticipants) {
-            if (token.isCancellationRequested || workingCopy.isDisposed()) {
-                break;
+        progress.report({
+            message: ( localize(4599, "Running Code Actions and Formatters..."))
+        });
+        let bubbleCancel = false;
+        await this.progressService.withProgress({
+            priority: NotificationPriority.URGENT,
+            location: 15 ,
+            cancellable: ( localize(4600, "Skip")),
+            delay: workingCopy.isDirty() ? 5000 : 3000
+        }, async (progress) => {
+            for (const saveParticipant of this.saveParticipants) {
+                if (cts.token.isCancellationRequested || workingCopy.isDisposed()) {
+                    break;
+                }
+                try {
+                    const promise = saveParticipant.participate(workingCopy, context, progress, cts.token);
+                    await raceCancellation(promise, cts.token);
+                }
+                catch (err) {
+                    if (!isCancellationError(err)) {
+                        this.logService.error(err);
+                    }
+                    else if (!cts.token.isCancellationRequested) {
+                        cts.cancel();
+                        bubbleCancel = true;
+                    }
+                }
             }
-            try {
-                const promise = saveParticipant.participate(workingCopy, context, progress, token);
-                await raceCancellation(promise, token);
-            }
-            catch (err) {
-                this.logService.warn(err);
-            }
-        }
+        }, () => {
+            cts.cancel();
+        });
         workingCopy.model?.pushStackElement();
+        cts.dispose();
+        if (bubbleCancel) {
+            throw ( (new CancellationError()));
+        }
     }
     dispose() {
-        this.saveParticipants.splice(0, this.saveParticipants.length);
+        this.saveParticipants.clear();
         super.dispose();
     }
 };
-StoredFileWorkingCopySaveParticipant = ( __decorate([
-    ( __param(0, ILogService))
-], StoredFileWorkingCopySaveParticipant));
+StoredFileWorkingCopySaveParticipant = ( (__decorate([
+    ( (__param(0, ILogService))),
+    ( (__param(1, IProgressService)))
+], StoredFileWorkingCopySaveParticipant)));
 
 export { StoredFileWorkingCopySaveParticipant };