@codingame/monaco-vscode-bulk-edit-service-override 11.1.2 → 12.0.1

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

@@ -1,23 +1,26 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { IBulkEditService } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
 import { BulkEditPane } from './bulkEditPane.js';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/views';
+import { ViewContainerLocation, Extensions } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { FocusedViewContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { localize, localize2 } from 'vscode/vscode/vs/nls';
-import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPaneContainer } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { WorkbenchListFocusContextKey } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
-import Severity$1 from 'vscode/vscode/vs/base/common/severity';
+import Severity from 'vscode/vscode/vs/base/common/severity';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
@@ -34,15 +37,15 @@ let UXState = class UXState {
     constructor(_paneCompositeService, _editorGroupsService) {
         this._paneCompositeService = _paneCompositeService;
         this._editorGroupsService = _editorGroupsService;
-        this._activePanel = _paneCompositeService.getActivePaneComposite(1 )?.getId();
+        this._activePanel = _paneCompositeService.getActivePaneComposite(ViewContainerLocation.Panel)?.getId();
     }
     async restore(panels, editors) {
         if (panels) {
             if (typeof this._activePanel === 'string') {
-                await this._paneCompositeService.openPaneComposite(this._activePanel, 1 );
+                await this._paneCompositeService.openPaneComposite(this._activePanel, ViewContainerLocation.Panel);
             }
             else {
-                this._paneCompositeService.hideActivePaneComposite(1 );
+                this._paneCompositeService.hideActivePaneComposite(ViewContainerLocation.Panel);
             }
         }
         if (editors) {
@@ -61,12 +64,12 @@ let UXState = class UXState {
         }
     }
 };
-UXState = ( (__decorate([
-    ( (__param(0, IPaneCompositePartService))),
-    ( (__param(1, IEditorGroupsService)))
-], UXState)));
+UXState = ( __decorate([
+    ( __param(0, IPaneCompositePartService)),
+    ( __param(1, IEditorGroupsService))
+], UXState));
 class PreviewSession {
-    constructor(uxState, cts = ( (new CancellationTokenSource()))) {
+    constructor(uxState, cts = ( new CancellationTokenSource())) {
         this.uxState = uxState;
         this.cts = cts;
     }
@@ -74,7 +77,7 @@ class PreviewSession {
 let BulkEditPreviewContribution = class BulkEditPreviewContribution {
     static { BulkEditPreviewContribution_1 = this; }
     static { this.ID = 'workbench.contrib.bulkEditPreview'; }
-    static { this.ctxEnabled = ( (new RawContextKey('refactorPreview.enabled', false))); }
+    static { this.ctxEnabled = ( new RawContextKey('refactorPreview.enabled', false)); }
     constructor(_paneCompositeService, _viewsService, _editorGroupsService, _dialogService, bulkEditService, contextKeyService) {
         this._paneCompositeService = _paneCompositeService;
         this._viewsService = _viewsService;
@@ -85,7 +88,7 @@ let BulkEditPreviewContribution = class BulkEditPreviewContribution {
     }
     async _previewEdit(edits) {
         this._ctxEnabled.set(true);
-        const uxState = this._activeSession?.uxState ?? ( (new UXState(this._paneCompositeService, this._editorGroupsService)));
+        const uxState = this._activeSession?.uxState ?? ( new UXState(this._paneCompositeService, this._editorGroupsService));
         const view = await getBulkEditPane(this._viewsService);
         if (!view) {
             this._ctxEnabled.set(false);
@@ -93,13 +96,13 @@ let BulkEditPreviewContribution = class BulkEditPreviewContribution {
         }
         if (view.hasInput()) {
             const { confirmed } = await this._dialogService.confirm({
-                type: Severity$1.Info,
-                message: ( localize(2127, "Another refactoring is being previewed.")),
+                type: Severity.Info,
+                message: ( localize(4078, "Another refactoring is being previewed.")),
                 detail: ( localize(
-                    2128,
+                    4079,
                     "Press 'Continue' to discard the previous refactoring and continue with the current refactoring."
                 )),
-                primaryButton: ( localize(2129, "&&Continue"))
+                primaryButton: ( localize(4080, "&&Continue"))
             });
             if (!confirmed) {
                 return [];
@@ -109,10 +112,10 @@ let BulkEditPreviewContribution = class BulkEditPreviewContribution {
         if (this._activeSession) {
             await this._activeSession.uxState.restore(false, true);
             this._activeSession.cts.dispose(true);
-            session = ( (new PreviewSession(uxState)));
+            session = ( new PreviewSession(uxState));
         }
         else {
-            session = ( (new PreviewSession(uxState)));
+            session = ( new PreviewSession(uxState));
         }
         this._activeSession = session;
         try {
@@ -128,33 +131,30 @@ let BulkEditPreviewContribution = class BulkEditPreviewContribution {
         }
     }
 };
-BulkEditPreviewContribution = BulkEditPreviewContribution_1 = ( (__decorate([
-    ( (__param(0, IPaneCompositePartService))),
-    ( (__param(1, IViewsService))),
-    ( (__param(2, IEditorGroupsService))),
-    ( (__param(3, IDialogService))),
-    ( (__param(4, IBulkEditService))),
-    ( (__param(5, IContextKeyService)))
-], BulkEditPreviewContribution)));
+BulkEditPreviewContribution = BulkEditPreviewContribution_1 = ( __decorate([
+    ( __param(0, IPaneCompositePartService)),
+    ( __param(1, IViewsService)),
+    ( __param(2, IEditorGroupsService)),
+    ( __param(3, IDialogService)),
+    ( __param(4, IBulkEditService)),
+    ( __param(5, IContextKeyService))
+], BulkEditPreviewContribution));
 registerAction2(class ApplyAction extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.apply',
-            title: ( localize2(2130, "Apply Refactoring")),
-            category: ( localize2(2131, "Refactor Preview")),
+            title: ( localize2(4081, "Apply Refactoring")),
+            category: ( localize2(4082, "Refactor Preview")),
             icon: Codicon.check,
-            precondition: ( (ContextKeyExpr.and(BulkEditPreviewContribution.ctxEnabled, BulkEditPane.ctxHasCheckedChanges))),
+            precondition: ( ContextKeyExpr.and(BulkEditPreviewContribution.ctxEnabled, BulkEditPane.ctxHasCheckedChanges)),
             menu: [{
                     id: MenuId.BulkEditContext,
                     order: 1
                 }],
             keybinding: {
-                weight: 100  - 10,
-                when: ( (ContextKeyExpr.and(
-                    BulkEditPreviewContribution.ctxEnabled,
-                     (FocusedViewContext.isEqualTo(BulkEditPane.ID))
-                ))),
-                primary: 2048  + 3 ,
+                weight: KeybindingWeight.EditorContrib - 10,
+                when: ( ContextKeyExpr.and(BulkEditPreviewContribution.ctxEnabled, ( FocusedViewContext.isEqualTo(BulkEditPane.ID)))),
+                primary: KeyMod.CtrlCmd + KeyCode.Enter,
             }
         });
     }
@@ -168,8 +168,8 @@ registerAction2(class DiscardAction extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.discard',
-            title: ( localize2(2132, "Discard Refactoring")),
-            category: ( localize2(2131, "Refactor Preview")),
+            title: ( localize2(4083, "Discard Refactoring")),
+            category: ( localize2(4082, "Refactor Preview")),
             icon: Codicon.clearAll,
             precondition: BulkEditPreviewContribution.ctxEnabled,
             menu: [{
@@ -188,13 +188,13 @@ registerAction2(class ToggleAction extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.toggleCheckedState',
-            title: ( localize2(2133, "Toggle Change")),
-            category: ( localize2(2131, "Refactor Preview")),
+            title: ( localize2(4084, "Toggle Change")),
+            category: ( localize2(4082, "Refactor Preview")),
             precondition: BulkEditPreviewContribution.ctxEnabled,
             keybinding: {
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: WorkbenchListFocusContextKey,
-                primary: 10 ,
+                primary: KeyCode.Space,
             },
             menu: {
                 id: MenuId.BulkEditContext,
@@ -212,20 +212,13 @@ registerAction2(class GroupByFile extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.groupByFile',
-            title: ( localize2(2134, "Group Changes By File")),
-            category: ( localize2(2131, "Refactor Preview")),
+            title: ( localize2(4085, "Group Changes By File")),
+            category: ( localize2(4082, "Refactor Preview")),
             icon: Codicon.ungroupByRefType,
-            precondition: ( (ContextKeyExpr.and(
-                BulkEditPane.ctxHasCategories,
-                 (BulkEditPane.ctxGroupByFile.negate()),
-                BulkEditPreviewContribution.ctxEnabled
-            ))),
+            precondition: ( ContextKeyExpr.and(BulkEditPane.ctxHasCategories, ( BulkEditPane.ctxGroupByFile.negate()), BulkEditPreviewContribution.ctxEnabled)),
             menu: [{
                     id: MenuId.BulkEditTitle,
-                    when: ( (ContextKeyExpr.and(
-                        BulkEditPane.ctxHasCategories,
-                         (BulkEditPane.ctxGroupByFile.negate())
-                    ))),
+                    when: ( ContextKeyExpr.and(BulkEditPane.ctxHasCategories, ( BulkEditPane.ctxGroupByFile.negate()))),
                     group: 'navigation',
                     order: 3,
                 }]
@@ -241,17 +234,17 @@ registerAction2(class GroupByType extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.groupByType',
-            title: ( localize2(2135, "Group Changes By Type")),
-            category: ( localize2(2131, "Refactor Preview")),
+            title: ( localize2(4086, "Group Changes By Type")),
+            category: ( localize2(4082, "Refactor Preview")),
             icon: Codicon.groupByRefType,
-            precondition: ( (ContextKeyExpr.and(
+            precondition: ( ContextKeyExpr.and(
                 BulkEditPane.ctxHasCategories,
                 BulkEditPane.ctxGroupByFile,
                 BulkEditPreviewContribution.ctxEnabled
-            ))),
+            )),
             menu: [{
                     id: MenuId.BulkEditTitle,
-                    when: ( (ContextKeyExpr.and(BulkEditPane.ctxHasCategories, BulkEditPane.ctxGroupByFile))),
+                    when: ( ContextKeyExpr.and(BulkEditPane.ctxHasCategories, BulkEditPane.ctxGroupByFile)),
                     group: 'navigation',
                     order: 3
                 }]
@@ -267,11 +260,11 @@ registerAction2(class ToggleGrouping extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.toggleGrouping',
-            title: ( localize2(2135, "Group Changes By Type")),
-            category: ( localize2(2131, "Refactor Preview")),
+            title: ( localize2(4086, "Group Changes By Type")),
+            category: ( localize2(4082, "Refactor Preview")),
             icon: Codicon.listTree,
-            toggled: ( (BulkEditPane.ctxGroupByFile.negate())),
-            precondition: ( (ContextKeyExpr.and(BulkEditPane.ctxHasCategories, BulkEditPreviewContribution.ctxEnabled))),
+            toggled: ( BulkEditPane.ctxGroupByFile.negate()),
+            precondition: ( ContextKeyExpr.and(BulkEditPane.ctxHasCategories, BulkEditPreviewContribution.ctxEnabled)),
             menu: [{
                     id: MenuId.BulkEditContext,
                     order: 3
@@ -284,23 +277,23 @@ registerAction2(class ToggleGrouping extends Action2 {
         view?.toggleGrouping();
     }
 });
-registerWorkbenchContribution2(BulkEditPreviewContribution.ID, BulkEditPreviewContribution, 2 );
-const refactorPreviewViewIcon = registerIcon('refactor-preview-view-icon', Codicon.lightbulb, ( localize(2136, 'View icon of the refactor preview view.')));
-const container = ( (Registry.as(Extensions.ViewContainersRegistry))).registerViewContainer({
+registerWorkbenchContribution2(BulkEditPreviewContribution.ID, BulkEditPreviewContribution, WorkbenchPhase.BlockRestore);
+const refactorPreviewViewIcon = registerIcon('refactor-preview-view-icon', Codicon.lightbulb, ( localize(4087, 'View icon of the refactor preview view.')));
+const container = ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
     id: BulkEditPane.ID,
-    title: ( localize2(2137, "Refactor Preview")),
+    title: ( localize2(4088, "Refactor Preview")),
     hideIfEmpty: true,
-    ctorDescriptor: ( (new SyncDescriptor(
+    ctorDescriptor: ( new SyncDescriptor(
         ViewPaneContainer,
         [BulkEditPane.ID, { mergeViewWithContainerWhenSingleView: true }]
-    ))),
+    )),
     icon: refactorPreviewViewIcon,
     storageId: BulkEditPane.ID
-}, 1 );
-( (Registry.as(Extensions.ViewsRegistry))).registerViews([{
+}, ViewContainerLocation.Panel);
+( Registry.as(Extensions.ViewsRegistry)).registerViews([{
         id: BulkEditPane.ID,
-        name: ( localize2(2137, "Refactor Preview")),
+        name: ( localize2(4088, "Refactor Preview")),
         when: BulkEditPreviewContribution.ctxEnabled,
-        ctorDescriptor: ( (new SyncDescriptor(BulkEditPane))),
+        ctorDescriptor: ( new SyncDescriptor(BulkEditPane)),
         containerIcon: refactorPreviewViewIcon,
     }], container);

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

@@ -1,4 +1,4 @@
-import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
+import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css';
 
 var css = ".monaco-workbench .bulk-edit-panel .highlight.insert{background-color:var(--vscode-diffEditor-insertedTextBackground)}.monaco-workbench .bulk-edit-panel .highlight.remove{background-color:var(--vscode-diffEditor-removedTextBackground);text-decoration:line-through}.monaco-workbench .bulk-edit-panel .message{padding:10px 20px}.monaco-workbench .bulk-edit-panel[data-state=data] .content,.monaco-workbench .bulk-edit-panel[data-state=message] .message{display:flex}.monaco-workbench .bulk-edit-panel[data-state=data] .message,.monaco-workbench .bulk-edit-panel[data-state=message] .content{display:none}.monaco-workbench .bulk-edit-panel .content{display:flex;flex-direction:column;justify-content:space-between}.monaco-workbench .bulk-edit-panel .content .buttons{padding-left:20px;padding-top:10px}.monaco-workbench .bulk-edit-panel .content .buttons .monaco-button{display:inline-flex;margin:0 4px;padding:4px 8px;width:inherit}.monaco-workbench .bulk-edit-panel .monaco-tl-contents{display:flex}.monaco-workbench .bulk-edit-panel .monaco-tl-contents .edit-checkbox{align-self:center}.monaco-workbench .bulk-edit-panel .monaco-tl-contents .edit-checkbox.disabled{opacity:.5}.monaco-workbench .bulk-edit-panel .monaco-tl-contents .monaco-icon-label.delete .monaco-icon-label-container{text-decoration:line-through}.monaco-workbench .bulk-edit-panel .monaco-tl-contents .details{font-size:.9em;margin-left:.5em;opacity:.7;white-space:pre}.monaco-workbench .bulk-edit-panel .monaco-tl-contents.category{align-items:center;display:flex;flex:1;flex-flow:row nowrap}.monaco-workbench .bulk-edit-panel .monaco-tl-contents.category .theme-icon,.monaco-workbench .bulk-edit-panel .monaco-tl-contents.textedit .theme-icon{margin-right:4px}.monaco-workbench .bulk-edit-panel .monaco-tl-contents.category .uri-icon,.monaco-workbench .bulk-edit-panel .monaco-tl-contents.textedit .uri-icon,.monaco-workbench.hc-light .bulk-edit-panel .monaco-tl-contents.category .uri-icon,.monaco-workbench.hc-light .bulk-edit-panel .monaco-tl-contents.textedit .uri-icon{background-image:var(--background-light);background-position:0;background-repeat:no-repeat;background-size:contain;height:100%;margin-right:4px;min-width:16px;width:16px}.monaco-workbench.hc-black .bulk-edit-panel .monaco-tl-contents.category .uri-icon,.monaco-workbench.hc-black .bulk-edit-panel .monaco-tl-contents.textedit .uri-icon,.monaco-workbench.vs-dark .bulk-edit-panel .monaco-tl-contents.category .uri-icon,.monaco-workbench.vs-dark .bulk-edit-panel .monaco-tl-contents.textedit .uri-icon{background-image:var(--background-dark)}.monaco-workbench .bulk-edit-panel .monaco-tl-contents.textedit .monaco-highlighted-label{overflow:hidden;text-overflow:ellipsis}";
 n(css,{});

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

@@ -0,0 +1,65 @@
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { ResourceEdit } from "vscode/vscode/vs/editor/browser/services/bulkEditService";
+import { ITextModelService } from "vscode/vscode/vs/editor/common/services/resolverService";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { RawContextKey } from "vscode/vscode/vs/platform/contextkey/common/contextkey";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IContextMenuService } from "vscode/vscode/vs/platform/contextview/browser/contextView.service";
+import { IDialogService } from "vscode/vscode/vs/platform/dialogs/common/dialogs.service";
+import { IHoverService } from "vscode/vscode/vs/platform/hover/browser/hover.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IKeybindingService } from "vscode/vscode/vs/platform/keybinding/common/keybinding.service";
+import { ILabelService } from "vscode/vscode/vs/platform/label/common/label.service";
+import { IOpenerService } from "vscode/vscode/vs/platform/opener/common/opener.service";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IThemeService } from "vscode/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-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common/vscode/vs/workbench/browser/parts/views/viewsViewlet";
+import { IViewDescriptorService } from "vscode/vscode/vs/workbench/common/views.service";
+import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
+export declare class BulkEditPane extends ViewPane {
+    private readonly _instaService;
+    private readonly _editorService;
+    private readonly _labelService;
+    private readonly _textModelService;
+    private readonly _dialogService;
+    private readonly _contextMenuService;
+    private readonly _storageService;
+    static readonly ID = "refactorPreview";
+    static readonly Schema = "vscode-bulkeditpreview-multieditor";
+    static readonly ctxHasCategories: RawContextKey<false>;
+    static readonly ctxGroupByFile: RawContextKey<true>;
+    static readonly ctxHasCheckedChanges: RawContextKey<true>;
+    private static readonly _memGroupByFile;
+    private _tree;
+    private _treeDataSource;
+    private _treeViewStates;
+    private _message;
+    private readonly _ctxHasCategories;
+    private readonly _ctxGroupByFile;
+    private readonly _ctxHasCheckedChanges;
+    private readonly _disposables;
+    private readonly _sessionDisposables;
+    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);
+    dispose(): void;
+    protected renderBody(parent: HTMLElement): void;
+    protected layoutBody(height: number, width: number): void;
+    private _setState;
+    setInput(edit: ResourceEdit[], token: CancellationToken): Promise<ResourceEdit[] | undefined>;
+    hasInput(): boolean;
+    private _setTreeInput;
+    accept(): void;
+    discard(): void;
+    private _done;
+    toggleChecked(): void;
+    groupByFile(): void;
+    groupByType(): void;
+    toggleGrouping(): void;
+    private _openElementInMultiDiffEditor;
+    private readonly _computeResourceDiffEditorInputs;
+    private _onContextMenu;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { ButtonBar } from 'vscode/vscode/vs/base/browser/ui/button/button';
 import { LRUCachedFunction, CachedFunction } from 'vscode/vscode/vs/base/common/cache';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -18,26 +19,32 @@ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { defaultButtonStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
-import { ResourceLabels } from 'vscode/vscode/vs/workbench/browser/labels';
-import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
+import { ResourceLabels } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-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 'vscode/vscode/vs/workbench/common/views.service';
-import { BulkEditPreviewProvider, BulkFileOperations } from './bulkEditPreview.js';
+import { BulkFileOperationType, BulkEditPreviewProvider, BulkFileOperations } from './bulkEditPreview.js';
 import { compareBulkFileOperations, BulkEditDataSource, BulkEditDelegate, TextEditElementRenderer, FileElementRenderer, CategoryElementRenderer, BulkEditAccessibilityProvider, BulkEditIdentityProvider, BulkEditNaviLabelProvider, BulkEditSorter, FileElement, CategoryElement, TextEditElement } from './bulkEditTree.js';
 import { SIDE_GROUP, ACTIVE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
 var BulkEditPane_1;
+var State;
+(function (State) {
+    State["Data"] = "data";
+    State["Message"] = "message";
+})(State || (State = {}));
 let BulkEditPane = class BulkEditPane extends ViewPane {
     static { BulkEditPane_1 = this; }
     static { this.ID = 'refactorPreview'; }
     static { this.Schema = 'vscode-bulkeditpreview-multieditor'; }
-    static { this.ctxHasCategories = ( (new RawContextKey('refactorPreview.hasCategories', false))); }
-    static { this.ctxGroupByFile = ( (new RawContextKey('refactorPreview.groupByFile', true))); }
-    static { this.ctxHasCheckedChanges = ( (new RawContextKey('refactorPreview.hasCheckedChanges', true))); }
+    static { this.ctxHasCategories = ( new RawContextKey('refactorPreview.hasCategories', false)); }
+    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);
@@ -48,14 +55,14 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
         this._dialogService = _dialogService;
         this._contextMenuService = _contextMenuService;
         this._storageService = _storageService;
-        this._treeViewStates = ( (new Map()));
-        this._disposables = ( (new DisposableStore()));
-        this._sessionDisposables = ( (new DisposableStore()));
-        this._computeResourceDiffEditorInputs = ( (new LRUCachedFunction(async (fileOperations) => {
-            const computeDiffEditorInput = ( (new CachedFunction(async (fileOperation) => {
+        this._treeViewStates = ( new Map());
+        this._disposables = ( new DisposableStore());
+        this._sessionDisposables = ( new DisposableStore());
+        this._computeResourceDiffEditorInputs = ( new LRUCachedFunction(async (fileOperations) => {
+            const computeDiffEditorInput = ( new CachedFunction(async (fileOperation) => {
                 const fileOperationUri = fileOperation.uri;
                 const previewUri = this._currentProvider.asPreviewUri(fileOperationUri);
-                if (fileOperation.type & 4 ) {
+                if (fileOperation.type & BulkFileOperationType.Delete) {
                     return {
                         original: { resource: URI.revive(previewUri) },
                         modified: { resource: undefined },
@@ -77,7 +84,7 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
                         goToFileResource: leftResource,
                     };
                 }
-            })));
+            }));
             const sortedFileOperations = fileOperations.slice().sort(compareBulkFileOperations);
             const resources = [];
             for (const operation of sortedFileOperations) {
@@ -91,7 +98,7 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
                 resources,
                 getResourceDiffEditorInputIdOfOperation
             };
-        })));
+        }));
         this.element.classList.add('bulk-edit-panel', 'show-file-icons');
         this._ctxHasCategories = BulkEditPane_1.ctxHasCategories.bindTo(contextKeyService);
         this._ctxGroupByFile = BulkEditPane_1.ctxGroupByFile.bindTo(contextKeyService);
@@ -113,15 +120,15 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
         const treeContainer = document.createElement('div');
         contentContainer.appendChild(treeContainer);
         this._treeDataSource = this._instaService.createInstance(BulkEditDataSource);
-        this._treeDataSource.groupByFile = this._storageService.getBoolean(BulkEditPane_1._memGroupByFile, 0 , true);
+        this._treeDataSource.groupByFile = this._storageService.getBoolean(BulkEditPane_1._memGroupByFile, StorageScope.PROFILE, true);
         this._ctxGroupByFile.set(this._treeDataSource.groupByFile);
-        this._tree = this._instaService.createInstance(WorkbenchAsyncDataTree, this.id, treeContainer, ( (new BulkEditDelegate())), [this._instaService.createInstance(TextEditElementRenderer), this._instaService.createInstance(FileElementRenderer, resourceLabels), this._instaService.createInstance(CategoryElementRenderer)], this._treeDataSource, {
+        this._tree = this._instaService.createInstance((WorkbenchAsyncDataTree), this.id, treeContainer, ( new BulkEditDelegate()), [this._instaService.createInstance(TextEditElementRenderer), this._instaService.createInstance(FileElementRenderer, resourceLabels), this._instaService.createInstance(CategoryElementRenderer)], this._treeDataSource, {
             accessibilityProvider: this._instaService.createInstance(BulkEditAccessibilityProvider),
-            identityProvider: ( (new BulkEditIdentityProvider())),
+            identityProvider: ( new BulkEditIdentityProvider()),
             expandOnlyOnTwistieClick: true,
             multipleSelectionSupport: false,
-            keyboardNavigationLabelProvider: ( (new BulkEditNaviLabelProvider())),
-            sorter: ( (new BulkEditSorter())),
+            keyboardNavigationLabelProvider: ( new BulkEditNaviLabelProvider()),
+            sorter: ( new BulkEditSorter()),
             selectionNavigation: true
         });
         this._disposables.add(this._tree.onContextMenu(this._onContextMenu, this));
@@ -129,22 +136,22 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
         const buttonsContainer = document.createElement('div');
         buttonsContainer.className = 'buttons';
         contentContainer.appendChild(buttonsContainer);
-        const buttonBar = ( (new ButtonBar(buttonsContainer)));
+        const buttonBar = ( new ButtonBar(buttonsContainer));
         this._disposables.add(buttonBar);
         const btnConfirm = buttonBar.addButton({ supportIcons: true, ...defaultButtonStyles });
-        btnConfirm.label = ( localize(5280, 'Apply'));
+        btnConfirm.label = ( localize(4089, 'Apply'));
         btnConfirm.onDidClick(() => this.accept(), this, this._disposables);
         const btnCancel = buttonBar.addButton({ ...defaultButtonStyles, secondary: true });
-        btnCancel.label = ( localize(5281, 'Discard'));
+        btnCancel.label = ( localize(4090, 'Discard'));
         btnCancel.onDidClick(() => this.discard(), this, this._disposables);
         this._message = document.createElement('span');
         this._message.className = 'message';
         this._message.innerText = ( localize(
-            5282,
+            4091,
             "Invoke a code action, like rename, to see a preview of its changes here."
         ));
         parent.appendChild(this._message);
-        this._setState("message" );
+        this._setState(State.Message);
     }
     layoutBody(height, width) {
         super.layoutBody(height, width);
@@ -156,7 +163,7 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
         this.element.dataset['state'] = state;
     }
     async setInput(edit, token) {
-        this._setState("data" );
+        this._setState(State.Data);
         this._sessionDisposables.clear();
         this._treeViewStates.clear();
         if (this._currentResolve) {
@@ -172,17 +179,15 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
         this._treeDataSource.groupByFile = !hasCategories || this._treeDataSource.groupByFile;
         this._ctxHasCheckedChanges.set(input.checked.checkedCount > 0);
         this._currentInput = input;
-        return (
-             (new Promise(resolve => {
-                token.onCancellationRequested(() => resolve(undefined));
-                this._currentResolve = resolve;
-                this._setTreeInput(input);
-                this._sessionDisposables.add(input.checked.onDidChange(() => {
-                    this._tree.updateChildren();
-                    this._ctxHasCheckedChanges.set(input.checked.checkedCount > 0);
-                }));
-            }))
-        );
+        return ( new Promise(resolve => {
+            token.onCancellationRequested(() => resolve(undefined));
+            this._currentResolve = resolve;
+            this._setTreeInput(input);
+            this._sessionDisposables.add(input.checked.onDidChange(() => {
+                this._tree.updateChildren();
+                this._ctxHasCheckedChanges.set(input.checked.checkedCount > 0);
+            }));
+        }));
     }
     hasInput() {
         return Boolean(this._currentInput);
@@ -215,14 +220,14 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
         let message;
         if (conflicts.length === 1) {
             message = ( localize(
-                5283,
+                4092,
                 "Cannot apply refactoring because '{0}' has changed in the meantime.",
                 this._labelService.getUriLabel(conflicts[0], { relative: true })
             ));
         }
         else {
             message = ( localize(
-                5284,
+                4093,
                 "Cannot apply refactoring because {0} other files have changed in the meantime.",
                 conflicts.length
             ));
@@ -235,7 +240,7 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
     _done(accept) {
         this._currentResolve?.(accept ? this._currentInput?.getWorkspaceEdit() : undefined);
         this._currentInput = undefined;
-        this._setState("message" );
+        this._setState(State.Message);
         this._sessionDisposables.clear();
     }
     toggleChecked() {
@@ -264,7 +269,7 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
             this._treeViewStates.set(this._treeDataSource.groupByFile, oldViewState);
             this._treeDataSource.groupByFile = !this._treeDataSource.groupByFile;
             this._setTreeInput(input);
-            this._storageService.store(BulkEditPane_1._memGroupByFile, this._treeDataSource.groupByFile, 0 , 0 );
+            this._storageService.store(BulkEditPane_1._memGroupByFile, this._treeDataSource.groupByFile, StorageScope.PROFILE, StorageTarget.USER);
             this._ctxGroupByFile.set(this._treeDataSource.groupByFile);
         }
     }
@@ -297,7 +302,7 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
                 }
             }
         };
-        const multiDiffSource = ( (URI.from({ scheme: BulkEditPane_1.Schema })));
+        const multiDiffSource = ( URI.from({ scheme: BulkEditPane_1.Schema }));
         const label = 'Refactor Preview';
         this._editorService.openEditor({
             multiDiffSource,
@@ -316,23 +321,23 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
         });
     }
 };
-BulkEditPane = BulkEditPane_1 = ( (__decorate([
-    ( (__param(1, IInstantiationService))),
-    ( (__param(2, IEditorService))),
-    ( (__param(3, ILabelService))),
-    ( (__param(4, ITextModelService))),
-    ( (__param(5, IDialogService))),
-    ( (__param(6, IContextMenuService))),
-    ( (__param(7, IStorageService))),
-    ( (__param(8, IContextKeyService))),
-    ( (__param(9, IViewDescriptorService))),
-    ( (__param(10, IKeybindingService))),
-    ( (__param(11, IContextMenuService))),
-    ( (__param(12, IConfigurationService))),
-    ( (__param(13, IOpenerService))),
-    ( (__param(14, IThemeService))),
-    ( (__param(15, ITelemetryService))),
-    ( (__param(16, IHoverService)))
-], BulkEditPane)));
+BulkEditPane = BulkEditPane_1 = ( __decorate([
+    ( __param(1, IInstantiationService)),
+    ( __param(2, IEditorService)),
+    ( __param(3, ILabelService)),
+    ( __param(4, ITextModelService)),
+    ( __param(5, IDialogService)),
+    ( __param(6, IContextMenuService)),
+    ( __param(7, IStorageService)),
+    ( __param(8, IContextKeyService)),
+    ( __param(9, IViewDescriptorService)),
+    ( __param(10, IKeybindingService)),
+    ( __param(11, IContextMenuService)),
+    ( __param(12, IConfigurationService)),
+    ( __param(13, IOpenerService)),
+    ( __param(14, IThemeService)),
+    ( __param(15, ITelemetryService)),
+    ( __param(16, IHoverService))
+], BulkEditPane));
 
 export { BulkEditPane };