@codingame/monaco-vscode-bulk-edit-service-override 14.0.6 → 15.0.1

package/index.js

@@ -1,7 +1,7 @@
 
 import '@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices';
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
-import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService';
+import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService.service';
 import { BulkEditService } from './vscode/src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.js';
 import './vscode/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution.js';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-bulk-edit-service-override",
-  "version": "14.0.6",
+  "version": "15.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - bulk-edit service-override",
   "keywords": [],
@@ -15,10 +15,10 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "14.0.6",
-    "@codingame/monaco-vscode-91789cdf-e3cb-5a04-aaeb-6f7df7d3d231-common": "14.0.6",
-    "@codingame/monaco-vscode-af5ccfda-af82-504b-b365-92b4e654e5c5-common": "14.0.6",
-    "@codingame/monaco-vscode-api": "14.0.6"
+    "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common": "15.0.1",
+    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "15.0.1",
+    "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common": "15.0.1",
+    "@codingame/monaco-vscode-api": "15.0.1"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.d.ts

@@ -1,5 +1,6 @@
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IBulkEditOptions, IBulkEditPreviewHandler, IBulkEditResult, IBulkEditService, ResourceEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService";
+import { IBulkEditOptions, IBulkEditPreviewHandler, IBulkEditResult, ResourceEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService";
+import { IBulkEditService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService.service";
 import { WorkspaceEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.js

@@ -6,18 +6,18 @@ import { LinkedList } from '@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { ResourceMap, ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { isCodeEditor, isDiffEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
 import { ResourceTextEdit, ResourceFileEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { EditorOption } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/editorOptions';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { Progress } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { UndoRedoGroup } from '@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo';
-import { ResourceNotebookCellEdit, BulkCellEdits } from '@codingame/monaco-vscode-af5ccfda-af82-504b-b365-92b4e654e5c5-common/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
+import { ResourceNotebookCellEdit, BulkCellEdits } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
 import { BulkFileEdits } from './bulkFileEdits.js';
 import { BulkTextEdits } from './bulkTextEdits.js';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -71,24 +71,24 @@ let BulkEdit = class BulkEdit {
             }
         }
         if (this._edits.length === 0) {
-            return localize(4127, "Made no edits");
+            return localize(4155, "Made no edits");
         }
         else if (otherResources.size === 0) {
             if (textEditCount > 1 && textEditResources.size > 1) {
                 return localize(
-                    4128,
+                    4156,
                     "Made {0} text edits in {1} files",
                     textEditCount,
                     textEditResources.size
                 );
             }
             else {
-                return localize(4129, "Made {0} text edits in one file", textEditCount);
+                return localize(4157, "Made {0} text edits in one file", textEditCount);
             }
         }
         else {
             return localize(
-                4130,
+                4158,
                 "Made {0} text edits in {1} files, also created or deleted {2} files",
                 textEditCount,
                 textEditResources.size,
@@ -140,12 +140,12 @@ let BulkEdit = class BulkEdit {
     }
     async _performFileEdits(edits, undoRedoGroup, undoRedoSource, confirmBeforeUndo, progress) {
         this._logService.debug('_performFileEdits', JSON.stringify(edits));
-        const model = this._instaService.createInstance(BulkFileEdits, this._label || ( localize(4131, "Workspace Edit")), this._code || 'undoredo.workspaceEdit', undoRedoGroup, undoRedoSource, confirmBeforeUndo, progress, this._token, edits);
+        const model = this._instaService.createInstance(BulkFileEdits, this._label || ( localize(4159, "Workspace Edit")), this._code || 'undoredo.workspaceEdit', undoRedoGroup, undoRedoSource, confirmBeforeUndo, progress, this._token, edits);
         return await model.apply();
     }
     async _performTextEdits(edits, undoRedoGroup, undoRedoSource, progress) {
         this._logService.debug('_performTextEdits', JSON.stringify(edits));
-        const model = this._instaService.createInstance(BulkTextEdits, this._label || ( localize(4131, "Workspace Edit")), this._code || 'undoredo.workspaceEdit', this._editor, undoRedoGroup, undoRedoSource, progress, this._token, edits);
+        const model = this._instaService.createInstance(BulkTextEdits, this._label || ( localize(4159, "Workspace Edit")), this._code || 'undoredo.workspaceEdit', this._editor, undoRedoGroup, undoRedoSource, progress, this._token, edits);
         return await model.apply();
     }
     async _performCellEdits(edits, undoRedoGroup, undoRedoSource, progress) {
@@ -188,7 +188,7 @@ let BulkEditService = class BulkEditService {
     async apply(editsIn, options) {
         let edits = liftEdits(Array.isArray(editsIn) ? editsIn : editsIn.edits);
         if (edits.length === 0) {
-            return { ariaSummary: ( localize(4132, "Made no edits")), isApplied: false };
+            return { ariaSummary: ( localize(4160, "Made no edits")), isApplied: false };
         }
         if (this._previewHandler && (options?.showPreview || ( edits.some(value => value.metadata?.needsConfirmation)))) {
             edits = await this._previewHandler(edits, options);
@@ -259,28 +259,28 @@ let BulkEditService = class BulkEditService {
         let primaryButton;
         switch (reason) {
             case ShutdownReason.CLOSE:
-                message = ( localize(4133, "Are you sure you want to close the window?"));
-                primaryButton = ( localize(4134, "&&Close Window"));
+                message = ( localize(4161, "Are you sure you want to close the window?"));
+                primaryButton = ( localize(4162, "&&Close Window"));
                 break;
             case ShutdownReason.LOAD:
-                message = ( localize(4135, "Are you sure you want to change the workspace?"));
-                primaryButton = ( localize(4136, "Change &&Workspace"));
+                message = ( localize(4163, "Are you sure you want to change the workspace?"));
+                primaryButton = ( localize(4164, "Change &&Workspace"));
                 break;
             case ShutdownReason.RELOAD:
-                message = ( localize(4137, "Are you sure you want to reload the window?"));
-                primaryButton = ( localize(4138, "&&Reload Window"));
+                message = ( localize(4165, "Are you sure you want to reload the window?"));
+                primaryButton = ( localize(4166, "&&Reload Window"));
                 break;
             default:
-                message = ( localize(4139, "Are you sure you want to quit?"));
-                primaryButton = ( localize(4140, "&&Quit"));
+                message = ( localize(4167, "Are you sure you want to quit?"));
+                primaryButton = ( localize(4168, "&&Quit"));
                 break;
         }
         const result = await this._dialogService.confirm({
             message,
             detail: ( localize(
-                4141,
+                4169,
                 "'{0}' is in progress.",
-                label || ( localize(4142, "File operation"))
+                label || ( localize(4170, "File operation"))
             )),
             primaryButton
         });
@@ -302,7 +302,7 @@ const autoSaveSetting = 'files.refactoring.autoSave';
     properties: {
         [autoSaveSetting]: {
             description: ( localize(
-                4143,
+                4171,
                 "Controls if files that were part of a refactoring are saved automatically"
             )),
             default: true,

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/bulkTextEdits.d.ts

@@ -1,11 +1,11 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ICodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
-import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService";
+import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 import { IProgress } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress";
-import { IEditorWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker";
+import { IEditorWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker.service";
 import { UndoRedoGroup, UndoRedoSource } from "@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo";
 import { IUndoRedoService } from "@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service";
-import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model";
+import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 import { ResourceTextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 export declare class BulkTextEdits {

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/bulkTextEdits.js

@@ -3,12 +3,12 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 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';
-import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService';
-import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker';
+import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
+import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker.service';
 import { IUndoRedoService } from '@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service';
 import { SingleModelEditStackElement, MultiModelEditStackElement } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/editStack';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
-import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { ResourceTextEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService';
 import { SnippetController2 } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/snippet/browser/snippetController2';
 import { SnippetParser } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/snippet/browser/snippetParser';
@@ -50,7 +50,7 @@ class ModelEditTask {
         else {
             range = Range.lift(textEdit.range);
         }
-        this._edits.push({ ...EditOperation.replaceMove(range, textEdit.text), insertAsSnippet: textEdit.insertAsSnippet });
+        this._edits.push({ ...EditOperation.replaceMove(range, textEdit.text), insertAsSnippet: textEdit.insertAsSnippet, keepWhitespace: textEdit.keepWhitespace });
     }
     validate() {
         if (typeof this._expectedModelVersionId === 'undefined' || this.model.getVersionId() === this._expectedModelVersionId) {
@@ -105,7 +105,8 @@ class EditorEditTask extends ModelEditTask {
                     if (edit.range && edit.text !== null) {
                         snippetEdits.push({
                             range: Range.lift(edit.range),
-                            template: edit.insertAsSnippet ? edit.text : SnippetParser.escape(edit.text)
+                            template: edit.insertAsSnippet ? edit.text : SnippetParser.escape(edit.text),
+                            keepWhitespace: edit.keepWhitespace
                         });
                     }
                 }

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/conflicts.d.ts

@@ -1,6 +1,6 @@
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model";
+import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { ResourceEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/conflicts.js

@@ -1,12 +1,12 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { ResourceTextEdit, ResourceFileEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService';
-import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-af5ccfda-af82-504b-b365-92b4e654e5c5-common/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
+import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 
 let ConflictDetector = class ConflictDetector {

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution.js

@@ -2,13 +2,13 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
-import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService';
+import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService.service';
 import { BulkEditPane } from './bulkEditPane.js';
 import { ViewContainerLocation, Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { FocusedViewContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { ViewPaneContainer } from '@codingame/monaco-vscode-91789cdf-e3cb-5a04-aaeb-6f7df7d3d231-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPaneContainer } from '@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { RawContextKey, ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
@@ -97,12 +97,12 @@ let BulkEditPreviewContribution = class BulkEditPreviewContribution {
         if (view.hasInput()) {
             const { confirmed } = await this._dialogService.confirm({
                 type: Severity.Info,
-                message: ( localize(4144, "Another refactoring is being previewed.")),
+                message: ( localize(4172, "Another refactoring is being previewed.")),
                 detail: ( localize(
-                    4145,
+                    4173,
                     "Press 'Continue' to discard the previous refactoring and continue with the current refactoring."
                 )),
-                primaryButton: ( localize(4146, "&&Continue"))
+                primaryButton: ( localize(4174, "&&Continue"))
             });
             if (!confirmed) {
                 return [];
@@ -143,8 +143,8 @@ registerAction2(class ApplyAction extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.apply',
-            title: ( localize2(4147, "Apply Refactoring")),
-            category: ( localize2(4148, "Refactor Preview")),
+            title: ( localize2(4175, "Apply Refactoring")),
+            category: ( localize2(4176, "Refactor Preview")),
             icon: Codicon.check,
             precondition: ( ContextKeyExpr.and(BulkEditPreviewContribution.ctxEnabled, BulkEditPane.ctxHasCheckedChanges)),
             menu: [{
@@ -168,8 +168,8 @@ registerAction2(class DiscardAction extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.discard',
-            title: ( localize2(4149, "Discard Refactoring")),
-            category: ( localize2(4148, "Refactor Preview")),
+            title: ( localize2(4177, "Discard Refactoring")),
+            category: ( localize2(4176, "Refactor Preview")),
             icon: Codicon.clearAll,
             precondition: BulkEditPreviewContribution.ctxEnabled,
             menu: [{
@@ -188,8 +188,8 @@ registerAction2(class ToggleAction extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.toggleCheckedState',
-            title: ( localize2(4150, "Toggle Change")),
-            category: ( localize2(4148, "Refactor Preview")),
+            title: ( localize2(4178, "Toggle Change")),
+            category: ( localize2(4176, "Refactor Preview")),
             precondition: BulkEditPreviewContribution.ctxEnabled,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -212,8 +212,8 @@ registerAction2(class GroupByFile extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.groupByFile',
-            title: ( localize2(4151, "Group Changes By File")),
-            category: ( localize2(4148, "Refactor Preview")),
+            title: ( localize2(4179, "Group Changes By File")),
+            category: ( localize2(4176, "Refactor Preview")),
             icon: Codicon.ungroupByRefType,
             precondition: ( ContextKeyExpr.and(BulkEditPane.ctxHasCategories, ( BulkEditPane.ctxGroupByFile.negate()), BulkEditPreviewContribution.ctxEnabled)),
             menu: [{
@@ -234,8 +234,8 @@ registerAction2(class GroupByType extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.groupByType',
-            title: ( localize2(4152, "Group Changes By Type")),
-            category: ( localize2(4148, "Refactor Preview")),
+            title: ( localize2(4180, "Group Changes By Type")),
+            category: ( localize2(4176, "Refactor Preview")),
             icon: Codicon.groupByRefType,
             precondition: ( ContextKeyExpr.and(
                 BulkEditPane.ctxHasCategories,
@@ -260,8 +260,8 @@ registerAction2(class ToggleGrouping extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.toggleGrouping',
-            title: ( localize2(4152, "Group Changes By Type")),
-            category: ( localize2(4148, "Refactor Preview")),
+            title: ( localize2(4180, "Group Changes By Type")),
+            category: ( localize2(4176, "Refactor Preview")),
             icon: Codicon.listTree,
             toggled: ( BulkEditPane.ctxGroupByFile.negate()),
             precondition: ( ContextKeyExpr.and(BulkEditPane.ctxHasCategories, BulkEditPreviewContribution.ctxEnabled)),
@@ -278,10 +278,10 @@ registerAction2(class ToggleGrouping extends Action2 {
     }
 });
 registerWorkbenchContribution2(BulkEditPreviewContribution.ID, BulkEditPreviewContribution, WorkbenchPhase.BlockRestore);
-const refactorPreviewViewIcon = registerIcon('refactor-preview-view-icon', Codicon.lightbulb, ( localize(4153, 'View icon of the refactor preview view.')));
+const refactorPreviewViewIcon = registerIcon('refactor-preview-view-icon', Codicon.lightbulb, ( localize(4181, 'View icon of the refactor preview view.')));
 const container = ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
     id: BulkEditPane.ID,
-    title: ( localize2(4154, "Refactor Preview")),
+    title: ( localize2(4182, "Refactor Preview")),
     hideIfEmpty: true,
     ctorDescriptor: ( new SyncDescriptor(
         ViewPaneContainer,
@@ -292,7 +292,7 @@ const container = ( Registry.as(Extensions.ViewContainersRegistry)).registerView
 }, ViewContainerLocation.Panel);
 ( Registry.as(Extensions.ViewsRegistry)).registerViews([{
         id: BulkEditPane.ID,
-        name: ( localize2(4154, "Refactor Preview")),
+        name: ( localize2(4182, "Refactor Preview")),
         when: BulkEditPreviewContribution.ctxEnabled,
         ctorDescriptor: ( new SyncDescriptor(BulkEditPane)),
         containerIcon: refactorPreviewViewIcon,

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.d.ts

@@ -1,6 +1,6 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { ResourceEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService";
-import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService";
+import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { RawContextKey } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
@@ -12,7 +12,6 @@ import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platf
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
-import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
 import { ViewPane } from "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane";
 import { IViewletViewOptions } from "@codingame/monaco-vscode-55ed5668-e8ca-5335-a587-790bcf1200c0-common/vscode/vs/workbench/browser/parts/views/viewsViewlet";
@@ -44,7 +43,7 @@ export declare class BulkEditPane extends ViewPane {
     private _currentResolve?;
     private _currentInput?;
     private _currentProvider?;
-    constructor(options: IViewletViewOptions, _instaService: IInstantiationService, _editorService: IEditorService, _labelService: ILabelService, _textModelService: ITextModelService, _dialogService: IDialogService, _contextMenuService: IContextMenuService, _storageService: IStorageService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, openerService: IOpenerService, themeService: IThemeService, telemetryService: ITelemetryService, hoverService: IHoverService);
+    constructor(options: IViewletViewOptions, _instaService: IInstantiationService, _editorService: IEditorService, _labelService: ILabelService, _textModelService: ITextModelService, _dialogService: IDialogService, _contextMenuService: IContextMenuService, _storageService: IStorageService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, openerService: IOpenerService, themeService: IThemeService, hoverService: IHoverService);
     dispose(): void;
     protected renderBody(parent: HTMLElement): void;
     protected layoutBody(height: number, width: number): void;

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.js

@@ -5,7 +5,7 @@ import { LRUCachedFunction, CachedFunction } from '@codingame/monaco-vscode-api/
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import './bulkEdit.css.js';
-import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService';
+import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
@@ -21,10 +21,9 @@ import { WorkbenchAsyncDataTree } from '@codingame/monaco-vscode-api/vscode/vs/p
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 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 { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { defaultButtonStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { ResourceLabels } from '@codingame/monaco-vscode-91789cdf-e3cb-5a04-aaeb-6f7df7d3d231-common/vscode/vs/workbench/browser/labels';
+import { ResourceLabels } from '@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common/vscode/vs/workbench/browser/labels';
 import { ViewPane } from '@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
 import { BulkFileOperationType, BulkEditPreviewProvider, BulkFileOperations } from './bulkEditPreview.js';
@@ -46,8 +45,8 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
     static { this.ctxGroupByFile = ( new RawContextKey('refactorPreview.groupByFile', true)); }
     static { this.ctxHasCheckedChanges = ( new RawContextKey('refactorPreview.hasCheckedChanges', true)); }
     static { this._memGroupByFile = `${this.ID}.groupByFile`; }
-    constructor(options, _instaService, _editorService, _labelService, _textModelService, _dialogService, _contextMenuService, _storageService, contextKeyService, viewDescriptorService, keybindingService, contextMenuService, configurationService, openerService, themeService, telemetryService, hoverService) {
-        super({ ...options, titleMenuId: MenuId.BulkEditTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, _instaService, openerService, themeService, telemetryService, hoverService);
+    constructor(options, _instaService, _editorService, _labelService, _textModelService, _dialogService, _contextMenuService, _storageService, contextKeyService, viewDescriptorService, keybindingService, contextMenuService, configurationService, openerService, themeService, hoverService) {
+        super({ ...options, titleMenuId: MenuId.BulkEditTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, _instaService, openerService, themeService, hoverService);
         this._instaService = _instaService;
         this._editorService = _editorService;
         this._labelService = _labelService;
@@ -103,7 +102,6 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
         this._ctxHasCategories = BulkEditPane_1.ctxHasCategories.bindTo(contextKeyService);
         this._ctxGroupByFile = BulkEditPane_1.ctxGroupByFile.bindTo(contextKeyService);
         this._ctxHasCheckedChanges = BulkEditPane_1.ctxHasCheckedChanges.bindTo(contextKeyService);
-        this.telemetryService.publicLog2('views.bulkEditPane');
     }
     dispose() {
         this._tree.dispose();
@@ -139,15 +137,15 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
         const buttonBar = ( new ButtonBar(buttonsContainer));
         this._disposables.add(buttonBar);
         const btnConfirm = buttonBar.addButton({ supportIcons: true, ...defaultButtonStyles });
-        btnConfirm.label = ( localize(4155, 'Apply'));
+        btnConfirm.label = ( localize(4183, 'Apply'));
         btnConfirm.onDidClick(() => this.accept(), this, this._disposables);
         const btnCancel = buttonBar.addButton({ ...defaultButtonStyles, secondary: true });
-        btnCancel.label = ( localize(4156, 'Discard'));
+        btnCancel.label = ( localize(4184, 'Discard'));
         btnCancel.onDidClick(() => this.discard(), this, this._disposables);
         this._message = document.createElement('span');
         this._message.className = 'message';
         this._message.innerText = ( localize(
-            4157,
+            4185,
             "Invoke a code action, like rename, to see a preview of its changes here."
         ));
         parent.appendChild(this._message);
@@ -220,14 +218,14 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
         let message;
         if (conflicts.length === 1) {
             message = ( localize(
-                4158,
+                4186,
                 "Cannot apply refactoring because '{0}' has changed in the meantime.",
                 this._labelService.getUriLabel(conflicts[0], { relative: true })
             ));
         }
         else {
             message = ( localize(
-                4159,
+                4187,
                 "Cannot apply refactoring because {0} other files have changed in the meantime.",
                 conflicts.length
             ));
@@ -336,8 +334,7 @@ BulkEditPane = BulkEditPane_1 = ( __decorate([
     ( __param(12, IConfigurationService)),
     ( __param(13, IOpenerService)),
     ( __param(14, IThemeService)),
-    ( __param(15, ITelemetryService)),
-    ( __param(16, IHoverService))
+    ( __param(15, IHoverService))
 ], BulkEditPane));
 
 export { BulkEditPane };

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPreview.d.ts

@@ -1,7 +1,8 @@
-import { ITextModelContentProvider, ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService";
+import { ITextModelContentProvider } from "@codingame/monaco-vscode-model-service-override/vscode/vs/editor/common/services/resolverService";
+import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language";
-import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model";
+import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
+import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 import { WorkspaceEditMetadata } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 import { ISingleEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/editOperation";
 import { ServicesAccessor, IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPreview.js

@@ -1,9 +1,9 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService';
+import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language';
-import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model';
+import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { createTextBufferFactoryFromSnapshot } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { coalesceInPlace } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
@@ -103,7 +103,7 @@ class BulkFileOperation {
 }
 class BulkCategory {
     static { this._defaultMetadata = ( Object.freeze({
-        label: ( localize(4160, "Other")),
+        label: ( localize(4188, "Other")),
         icon: Codicon.symbolFile,
         needsConfirmation: false
     })); }

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.d.ts

@@ -1,7 +1,7 @@
 import { IAsyncDataSource, ITreeRenderer, ITreeNode, ITreeSorter } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/tree/tree";
-import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService";
+import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 import { FuzzyScore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/filters";
-import { ResourceLabels } from "@codingame/monaco-vscode-91789cdf-e3cb-5a04-aaeb-6f7df7d3d231-common/vscode/vs/workbench/browser/labels";
+import { ResourceLabels } from "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common/vscode/vs/workbench/browser/labels";
 import { IIdentityProvider, IListVirtualDelegate, IKeyboardNavigationLabelProvider } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/list/list";
 import { BulkFileOperations, BulkFileOperation, BulkTextEdit, BulkCategory } from "./bulkEditPreview.js";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.js

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService';
+import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { createMatches } from '@codingame/monaco-vscode-api/vscode/vs/base/common/filters';
 import { HighlightedLabel } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/highlightedlabel/highlightedLabel';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
@@ -240,7 +240,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
         this._labelService = _labelService;
     }
     getWidgetAriaLabel() {
-        return localize(4161, "Bulk Edit");
+        return localize(4189, "Bulk Edit");
     }
     getRole(_element) {
         return 'checkbox';
@@ -250,7 +250,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
             if (element.edit.textEdits.length > 0) {
                 if (element.edit.type & BulkFileOperationType.Rename && element.edit.newUri) {
                     return localize(
-                        4162,
+                        4190,
                         "Renaming {0} to {1}, also making text edits",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true }),
                         this._labelService.getUriLabel(element.edit.newUri, { relative: true })
@@ -258,21 +258,21 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
                 }
                 else if (element.edit.type & BulkFileOperationType.Create) {
                     return localize(
-                        4163,
+                        4191,
                         "Creating {0}, also making text edits",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     );
                 }
                 else if (element.edit.type & BulkFileOperationType.Delete) {
                     return localize(
-                        4164,
+                        4192,
                         "Deleting {0}, also making text edits",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     );
                 }
                 else {
                     return localize(
-                        4165,
+                        4193,
                         "{0}, making text edits",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     );
@@ -281,7 +281,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
             else {
                 if (element.edit.type & BulkFileOperationType.Rename && element.edit.newUri) {
                     return localize(
-                        4166,
+                        4194,
                         "Renaming {0} to {1}",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true }),
                         this._labelService.getUriLabel(element.edit.newUri, { relative: true })
@@ -289,14 +289,14 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
                 }
                 else if (element.edit.type & BulkFileOperationType.Create) {
                     return localize(
-                        4167,
+                        4195,
                         "Creating {0}",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     );
                 }
                 else if (element.edit.type & BulkFileOperationType.Delete) {
                     return localize(
-                        4168,
+                        4196,
                         "Deleting {0}",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     );
@@ -306,7 +306,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
         if (element instanceof TextEditElement) {
             if (element.selecting.length > 0 && element.inserting.length > 0) {
                 return localize(
-                    4169,
+                    4197,
                     "line {0}, replacing {1} with {2}",
                     element.edit.textEdit.textEdit.range.startLineNumber,
                     element.selecting,
@@ -315,7 +315,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
             }
             else if (element.selecting.length > 0 && element.inserting.length === 0) {
                 return localize(
-                    4170,
+                    4198,
                     "line {0}, removing {1}",
                     element.edit.textEdit.textEdit.range.startLineNumber,
                     element.selecting
@@ -323,7 +323,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
             }
             else if (element.selecting.length === 0 && element.inserting.length > 0) {
                 return localize(
-                    4171,
+                    4199,
                     "line {0}, inserting {1}",
                     element.edit.textEdit.textEdit.range.startLineNumber,
                     element.selecting
@@ -429,7 +429,7 @@ let FileElementTemplate = class FileElementTemplate {
             this._label.setResource({
                 resource: element.edit.uri,
                 name: ( localize(
-                    4172,
+                    4200,
                     "{0} → {1}",
                     this._labelService.getUriLabel(element.edit.uri, { relative: true }),
                     this._labelService.getUriLabel(element.edit.newUri, { relative: true })
@@ -437,7 +437,7 @@ let FileElementTemplate = class FileElementTemplate {
             }, {
                 fileDecorations: { colors: true, badges: false }
             });
-            this._details.innerText = ( localize(4173, "(renaming)"));
+            this._details.innerText = ( localize(4201, "(renaming)"));
         }
         else {
             const options = {
@@ -447,10 +447,10 @@ let FileElementTemplate = class FileElementTemplate {
                 extraClasses: []
             };
             if (element.edit.type & BulkFileOperationType.Create) {
-                this._details.innerText = ( localize(4174, "(creating)"));
+                this._details.innerText = ( localize(4202, "(creating)"));
             }
             else if (element.edit.type & BulkFileOperationType.Delete) {
-                this._details.innerText = ( localize(4175, "(deleting)"));
+                this._details.innerText = ( localize(4203, "(deleting)"));
                 options.extraClasses.push('delete');
             }
             else {
@@ -527,7 +527,7 @@ let TextEditElementTemplate = class TextEditElementTemplate {
         let title;
         const { metadata } = element.edit.textEdit;
         if (metadata && metadata.description) {
-            title = ( localize(4176, "{0} - {1}", metadata.label, metadata.description));
+            title = ( localize(4204, "{0} - {1}", metadata.label, metadata.description));
         }
         else if (metadata) {
             title = metadata.label;