@codingame/monaco-vscode-view-common-service-override 34.1.1 → 35.0.0

package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.js

@@ -18,7 +18,7 @@ class ShowWebViewEditorFindWidgetAction extends Action2 {
         this.ID = "editor.action.webvieweditor.showFind";
     }
     static {
-        this.LABEL = ( localize(16017, "Show find"));
+        this.LABEL = ( localize(16682, "Show find"));
     }
     constructor() {
         super({
@@ -43,7 +43,7 @@ class HideWebViewEditorFindCommand extends Action2 {
         this.ID = "editor.action.webvieweditor.hideFind";
     }
     static {
-        this.LABEL = ( localize(16018, "Stop find"));
+        this.LABEL = ( localize(16683, "Stop find"));
     }
     constructor() {
         super({
@@ -68,7 +68,7 @@ class WebViewEditorFindNextCommand extends Action2 {
         this.ID = "editor.action.webvieweditor.findNext";
     }
     static {
-        this.LABEL = ( localize(16019, "Find next"));
+        this.LABEL = ( localize(16684, "Find next"));
     }
     constructor() {
         super({
@@ -93,7 +93,7 @@ class WebViewEditorFindPreviousCommand extends Action2 {
         this.ID = "editor.action.webvieweditor.findPrevious";
     }
     static {
-        this.LABEL = ( localize(16020, "Find previous"));
+        this.LABEL = ( localize(16685, "Find previous"));
     }
     constructor() {
         super({
@@ -118,7 +118,7 @@ class ReloadWebviewAction extends Action2 {
         this.ID = "workbench.action.webview.reloadWebviewAction";
     }
     static {
-        this.LABEL = ( localize2(16021, "Reload Webviews"));
+        this.LABEL = ( localize2(16686, "Reload Webviews"));
     }
     constructor() {
         super({

package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution.js

@@ -19,7 +19,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/ins
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-    EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(16023, "webview editor"))),
+    EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(16688, "webview editor"))),
     [( new SyncDescriptor(WebviewInput))]
 );
 let WebviewPanelContribution = class WebviewPanelContribution extends Disposable {

package/vscode/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.js

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { getWindow, EventType, addDisposableListener, findParentWithClass } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { addDisposableListener, getWindow, EventType, findParentWithClass } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { MutableDisposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
@@ -103,6 +103,13 @@ let WebviewViewPane = class WebviewViewPane extends ViewPane {
         super.renderBody(container);
         this._container = container;
         this._rootContainer = undefined;
+        container.tabIndex = 0;
+        container.setAttribute("role", "document");
+        this._register(addDisposableListener(container, "focus", e => {
+            if (e.target === container && this._webview.value) {
+                this._webview.value.focus();
+            }
+        }));
         this.layoutWebview();
     }
     saveState() {

package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.js

@@ -636,8 +636,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         if (storedChoices[globForResource]?.find(editorID => editorID === currentEditor.editorId)) {
             return;
         }
-        const handle = this.notificationService.prompt(Severity.Warning, ( localize(16865, "There are multiple default editors available for the resource.")), [{
-            label: ( localize(16866, "Configure Default")),
+        const handle = this.notificationService.prompt(Severity.Warning, ( localize(17528, "There are multiple default editors available for the resource.")), [{
+            label: ( localize(17529, "Configure Default")),
             run: async () => {
                 const picked = await this.doPickEditor(untypedInput, true);
                 if (!picked) {
@@ -655,7 +655,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                 }]);
             }
         }, {
-            label: ( localize(16867, "Keep {0}", editorName)),
+            label: ( localize(17530, "Keep {0}", editorName)),
             run: writeCurrentEditorsToStorage
         }]);
         const onCloseListener = handle.onDidClose(() => {
@@ -681,9 +681,9 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             }
         });
         const quickPickEntries = [];
-        const currentlyActiveLabel = ( localize(16868, "Active"));
-        const currentDefaultLabel = ( localize(16869, "Default"));
-        const currentDefaultAndActiveLabel = ( localize(16870, "Active and Default"));
+        const currentlyActiveLabel = ( localize(17531, "Active"));
+        const currentDefaultLabel = ( localize(17532, "Default"));
+        const currentDefaultAndActiveLabel = ( localize(17533, "Active and Default"));
         let defaultViewType = defaultSetting;
         if (!defaultViewType && registeredEditors.length > 2 && this.getEffectivePriority(registeredEditors[1].editorInfo, associationType) !== RegisteredEditorPriority.option) {
             defaultViewType = registeredEditors[1]?.editorInfo.id;
@@ -710,7 +710,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             quickPickEntries.push(separator);
             const configureDefaultEntry = {
                 id: EditorResolverService_1.configureDefaultID,
-                label: ( localize(16871, "Configure default editor for '{0}'...", `*${extname(resource)}`))
+                label: ( localize(17534, "Configure default editor for '{0}'...", `*${extname(resource)}`))
             };
             quickPickEntries.push(configureDefaultEntry);
         }
@@ -731,7 +731,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         const editorPicker = disposables.add(this.quickInputService.createQuickPick({
             useSeparators: true
         }));
-        const placeHolderMessage = showDefaultPicker ? ( localize(16872, "Select new default editor for '{0}'", `*${extname(resource)}`)) : ( localize(16873, "Select editor for '{0}'", basename(resource)));
+        const placeHolderMessage = showDefaultPicker ? ( localize(17535, "Select new default editor for '{0}'", `*${extname(resource)}`)) : ( localize(17536, "Select editor for '{0}'", basename(resource)));
         editorPicker.placeholder = placeHolderMessage;
         editorPicker.canAcceptInBackground = true;
         editorPicker.items = editorPicks;

package/vscode/src/vs/workbench/services/history/browser/historyService.d.ts

@@ -96,8 +96,13 @@ export declare class HistoryService extends Disposable implements IHistoryServic
     private static readonly MAX_RECENTLY_CLOSED_EDITORS;
     private recentlyClosedEditors;
     private ignoreEditorCloseEvent;
+    private recentlyClosedEditorsBatchId;
+    private recentlyClosedEditorsBatchScheduled;
     private handleEditorCloseEventInReopen;
+    private currentRecentlyClosedEditorsBatchId;
     reopenLastClosedEditor(): Promise<void>;
+    private takeLastClosedEditorsBatch;
+    private doReopenLastClosedEditors;
     private doReopenLastClosedEditor;
     private removeFromRecentlyClosedEditors;
     private static readonly MAX_HISTORY_ITEMS;

package/vscode/src/vs/workbench/services/history/browser/historyService.js

@@ -20,7 +20,7 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.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';
-import { coalesce, remove } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
+import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { registerSingleton, InstantiationType } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { WindowIdleValue, addDisposableListener, EventType, EventHelper } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { IWorkspacesService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspaces/common/workspaces.service';
@@ -87,6 +87,8 @@ let HistoryService = class HistoryService extends Disposable {
         this.navigatingInRecentlyUsedEditorsInGroupStack = false;
         this.recentlyClosedEditors = [];
         this.ignoreEditorCloseEvent = false;
+        this.recentlyClosedEditorsBatchId = 0;
+        this.recentlyClosedEditorsBatchScheduled = false;
         this.history = undefined;
         this.editorHistoryListeners = this._register(( new DisposableMap()));
         this.resourceExcludeMatcher = this._register(new WindowIdleValue(mainWindow, () => {
@@ -101,33 +103,33 @@ let HistoryService = class HistoryService extends Disposable {
             return matcher;
         }));
         this.editorHelper = this.instantiationService.createInstance(EditorHelper);
-        this.canNavigateBackContextKey = ( new RawContextKey("canNavigateBack", false, ( localize(17088, "Whether it is possible to navigate back in editor history")))).bindTo(this.contextKeyService);
-        this.canNavigateForwardContextKey = ( new RawContextKey("canNavigateForward", false, ( localize(17089, "Whether it is possible to navigate forward in editor history")))).bindTo(this.contextKeyService);
+        this.canNavigateBackContextKey = ( new RawContextKey("canNavigateBack", false, ( localize(17752, "Whether it is possible to navigate back in editor history")))).bindTo(this.contextKeyService);
+        this.canNavigateForwardContextKey = ( new RawContextKey("canNavigateForward", false, ( localize(17753, "Whether it is possible to navigate forward in editor history")))).bindTo(this.contextKeyService);
         this.canNavigateBackInNavigationsContextKey = ( new RawContextKey("canNavigateBackInNavigationLocations", false, ( localize(
-            17090,
+            17754,
             "Whether it is possible to navigate back in editor navigation locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateForwardInNavigationsContextKey = ( new RawContextKey("canNavigateForwardInNavigationLocations", false, ( localize(
-            17091,
+            17755,
             "Whether it is possible to navigate forward in editor navigation locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateToLastNavigationLocationContextKey = ( new RawContextKey("canNavigateToLastNavigationLocation", false, ( localize(
-            17092,
+            17756,
             "Whether it is possible to navigate to the last editor navigation location"
         )))).bindTo(this.contextKeyService);
         this.canNavigateBackInEditsContextKey = ( new RawContextKey("canNavigateBackInEditLocations", false, ( localize(
-            17093,
+            17757,
             "Whether it is possible to navigate back in editor edit locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateForwardInEditsContextKey = ( new RawContextKey("canNavigateForwardInEditLocations", false, ( localize(
-            17094,
+            17758,
             "Whether it is possible to navigate forward in editor edit locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateToLastEditLocationContextKey = ( new RawContextKey("canNavigateToLastEditLocation", false, ( localize(
-            17095,
+            17759,
             "Whether it is possible to navigate to the last editor edit location"
         )))).bindTo(this.contextKeyService);
-        this.canReopenClosedEditorContextKey = ( new RawContextKey("canReopenClosedEditor", false, ( localize(17096, "Whether it is possible to reopen the last closed editor")))).bindTo(this.contextKeyService);
+        this.canReopenClosedEditorContextKey = ( new RawContextKey("canReopenClosedEditor", false, ( localize(17760, "Whether it is possible to reopen the last closed editor")))).bindTo(this.contextKeyService);
         this.registerListeners();
         if (this.editorService.activeEditorPane) {
             this.onDidActiveEditorChange();
@@ -565,22 +567,54 @@ let HistoryService = class HistoryService extends Disposable {
             resource: EditorResourceAccessor.getOriginalUri(editor),
             associatedResources,
             index: event.index,
-            sticky: event.sticky
+            sticky: event.sticky,
+            batchId: this.currentRecentlyClosedEditorsBatchId()
         });
         if (this.recentlyClosedEditors.length > HistoryService_1.MAX_RECENTLY_CLOSED_EDITORS) {
             this.recentlyClosedEditors.shift();
         }
         this.canReopenClosedEditorContextKey.set(true);
     }
+    currentRecentlyClosedEditorsBatchId() {
+        if (!this.recentlyClosedEditorsBatchScheduled) {
+            this.recentlyClosedEditorsBatchScheduled = true;
+            this.recentlyClosedEditorsBatchId++;
+            queueMicrotask(() => this.recentlyClosedEditorsBatchScheduled = false);
+        }
+        return this.recentlyClosedEditorsBatchId;
+    }
     async reopenLastClosedEditor() {
-        const lastClosedEditor = this.recentlyClosedEditors.pop();
+        const lastClosedEditors = this.takeLastClosedEditorsBatch();
         let reopenClosedEditorPromise = undefined;
-        if (lastClosedEditor) {
-            reopenClosedEditorPromise = this.doReopenLastClosedEditor(lastClosedEditor);
+        if (lastClosedEditors.length) {
+            reopenClosedEditorPromise = this.doReopenLastClosedEditors(lastClosedEditors);
         }
         this.canReopenClosedEditorContextKey.set(this.recentlyClosedEditors.length > 0);
         return reopenClosedEditorPromise;
     }
+    takeLastClosedEditorsBatch() {
+        const lastClosedEditor = this.recentlyClosedEditors.at(-1);
+        if (!lastClosedEditor) {
+            return [];
+        }
+        const batch = [];
+        while (this.recentlyClosedEditors.length && this.recentlyClosedEditors[this.recentlyClosedEditors.length - 1].batchId === lastClosedEditor.batchId) {
+            batch.unshift(this.recentlyClosedEditors.pop());
+        }
+        return batch;
+    }
+    async doReopenLastClosedEditors(lastClosedEditors) {
+        let anyReopened = false;
+        for (const lastClosedEditor of lastClosedEditors) {
+            const editorPane = await this.doReopenLastClosedEditor(lastClosedEditor);
+            if (editorPane) {
+                anyReopened = true;
+            }
+        }
+        if (!anyReopened && this.recentlyClosedEditors.length) {
+            return this.reopenLastClosedEditor();
+        }
+    }
     async doReopenLastClosedEditor(lastClosedEditor) {
         const options = {
             pinned: true,
@@ -606,10 +640,7 @@ let HistoryService = class HistoryService extends Disposable {
                 this.ignoreEditorCloseEvent = false;
             }
         }
-        if (!editorPane) {
-            remove(this.recentlyClosedEditors, lastClosedEditor);
-            this.reopenLastClosedEditor();
-        }
+        return editorPane;
     }
     removeFromRecentlyClosedEditors(arg1) {
         this.recentlyClosedEditors = this.recentlyClosedEditors.filter(recentlyClosedEditor => {

package/vscode/src/vs/workbench/services/progress/browser/progressService.js

@@ -175,20 +175,20 @@ let ProgressService = class ProgressService extends Disposable {
             let title;
             const source = options.source && typeof options.source !== "string" ? options.source.label : options.source;
             if (progressTitle && progressMessage) {
-                text = ( localize(17225, "{0}: {1}", progressTitle, progressMessage));
-                title = source ? ( localize(17226, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
+                text = ( localize(17890, "{0}: {1}", progressTitle, progressMessage));
+                title = source ? ( localize(17891, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
             } else if (progressTitle) {
                 text = progressTitle;
-                title = source ? ( localize(17227, "[{0}]: {1}", source, progressTitle)) : text;
+                title = source ? ( localize(17892, "[{0}]: {1}", source, progressTitle)) : text;
             } else if (progressMessage) {
                 text = progressMessage;
-                title = source ? ( localize(17227, "[{0}]: {1}", source, progressMessage)) : text;
+                title = source ? ( localize(17892, "[{0}]: {1}", source, progressMessage)) : text;
             } else {
                 this.updateWindowProgress(idx + 1);
                 return;
             }
             const statusEntryProperties = {
-                name: ( localize(17228, "Progress Message")),
+                name: ( localize(17893, "Progress Message")),
                 text,
                 showProgress: options.type || true,
                 ariaLabel: text,
@@ -294,7 +294,7 @@ let ProgressService = class ProgressService extends Disposable {
                     constructor() {
                         super(
                             "progress.cancel",
-                            typeof options.cancellable === "string" ? options.cancellable : ( localize(17229, "Cancel")),
+                            typeof options.cancellable === "string" ? options.cancellable : ( localize(17894, "Cancel")),
                             undefined,
                             true
                         );
@@ -486,7 +486,7 @@ let ProgressService = class ProgressService extends Disposable {
             const buttons = options.buttons || [];
             if (!options.sticky) {
                 buttons.push(
-                    options.cancellable ? (typeof options.cancellable === "boolean" ? ( localize(17229, "Cancel")) : options.cancellable) : ( localize(17230, "Dismiss"))
+                    options.cancellable ? (typeof options.cancellable === "boolean" ? ( localize(17894, "Cancel")) : options.cancellable) : ( localize(17895, "Dismiss"))
                 );
             }
             dialog = ( new Dialog(

package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.js

@@ -500,7 +500,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                 mergeViewWithContainerWhenSingleView: true
             }])),
             title: {
-                value: ( localize(17607, "User View Container")),
+                value: ( localize(18272, "User View Container")),
                 original: "User View Container"
             },
             icon: location === ViewContainerLocation.Sidebar ? defaultViewIcon : undefined,
@@ -813,7 +813,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                             title: viewDescriptor.name,
                             metadata: {
                                 description: ( localize2(
-                                    17608,
+                                    18273,
                                     "Toggles the visibility of the {0} view if the view container it is located in is visible",
                                     viewDescriptor.name.value
                                 ))
@@ -844,10 +844,10 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                         super({
                             id: `${viewDescriptor.id}.removeView`,
                             viewPaneContainerId: viewContainerModel.viewContainer.id,
-                            title: ( localize(17609, "Hide '{0}'", viewDescriptor.name.value)),
+                            title: ( localize(18274, "Hide '{0}'", viewDescriptor.name.value)),
                             metadata: {
                                 description: ( localize2(
-                                    17610,
+                                    18275,
                                     "Hides the {0} view if it is visible and the view container it is located in is visible",
                                     viewDescriptor.name.value
                                 ))
@@ -877,7 +877,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
             constructor() {
                 super({
                     id: `${viewContainer.id}.resetViewContainerLocation`,
-                    title: ( localize2(17611, "Reset Location")),
+                    title: ( localize2(18276, "Reset Location")),
                     menu: [{
                         id: MenuId.ViewContainerTitleContext,
                         group: "1_viewActions",

package/vscode/src/vs/workbench/services/views/browser/viewsService.js

@@ -285,7 +285,7 @@ let ViewsService = class ViewsService extends Disposable {
         return this.viewDescriptorService.getViewDescriptorById(( viewId.toString()));
     }
     getFocusedViewName() {
-        const textEditorFocused = this.editorService.activeTextEditorControl?.hasTextFocus() ? ( localize(17612, "Text Editor")) : undefined;
+        const textEditorFocused = this.editorService.activeTextEditorControl?.hasTextFocus() ? ( localize(18277, "Text Editor")) : undefined;
         return this.getFocusedView()?.name?.value ?? textEditorFocused ?? "";
     }
     async openView(id, focus) {
@@ -391,12 +391,12 @@ let ViewsService = class ViewsService extends Disposable {
                             const originalTitle = typeof title === "string" ? title : title.original;
                             if (viewContainerLocation === ViewContainerLocation.Sidebar) {
                                 return {
-                                    value: ( localize(17613, "Show {0}", localizedTitle)),
+                                    value: ( localize(18278, "Show {0}", localizedTitle)),
                                     original: `Show ${originalTitle}`
                                 };
                             } else {
                                 return {
-                                    value: ( localize(17614, "Toggle {0}", localizedTitle)),
+                                    value: ( localize(18279, "Toggle {0}", localizedTitle)),
                                     original: `Toggle ${originalTitle}`
                                 };
                             }
@@ -468,12 +468,12 @@ let ViewsService = class ViewsService extends Disposable {
                         const originalTitle = typeof title === "string" ? title : title.original;
                         if (viewContainerLocation === ViewContainerLocation.Sidebar) {
                             return {
-                                value: ( localize(17613, "Show {0}", localizedTitle)),
+                                value: ( localize(18278, "Show {0}", localizedTitle)),
                                 original: `Show ${originalTitle}`
                             };
                         } else {
                             return {
-                                value: ( localize(17614, "Toggle {0}", localizedTitle)),
+                                value: ( localize(18279, "Toggle {0}", localizedTitle)),
                                 original: `Toggle ${originalTitle}`
                             };
                         }
@@ -486,7 +486,7 @@ let ViewsService = class ViewsService extends Disposable {
                     } : undefined,
                     f1: viewDescriptor.openCommandActionDescriptor ? true : undefined,
                     metadata: {
-                        description: ( localize(17615, "Opens view {0}", viewDescriptor.name.value)),
+                        description: ( localize(18280, "Opens view {0}", viewDescriptor.name.value)),
                         args: [{
                             name: "options",
                             schema: {
@@ -495,7 +495,7 @@ let ViewsService = class ViewsService extends Disposable {
                                     "preserveFocus": {
                                         type: "boolean",
                                         default: false,
-                                        description: ( localize(17616, "Whether to preserve the existing focus when opening the view."))
+                                        description: ( localize(18281, "Whether to preserve the existing focus when opening the view."))
                                     }
                                 }
                             }
@@ -542,7 +542,7 @@ let ViewsService = class ViewsService extends Disposable {
     registerFocusViewAction(viewDescriptor, category) {
         return registerAction2(class FocusViewAction extends Action2 {
             constructor() {
-                const title = ( localize2(17617, "Focus on {0} View", viewDescriptor.name.value));
+                const title = ( localize2(18282, "Focus on {0} View", viewDescriptor.name.value));
                 super({
                     id: viewDescriptor.focusCommand ? viewDescriptor.focusCommand.id : `${viewDescriptor.id}.focus`,
                     title,
@@ -588,7 +588,7 @@ let ViewsService = class ViewsService extends Disposable {
             constructor() {
                 super({
                     id: `${viewDescriptor.id}.resetViewLocation`,
-                    title: ( localize2(17618, "Reset Location")),
+                    title: ( localize2(18283, "Reset Location")),
                     menu: [{
                         id: MenuId.ViewTitleContext,
                         when: ( ContextKeyExpr.or(( ContextKeyExpr.and(( ContextKeyExpr.equals("view", viewDescriptor.id)), ( ContextKeyExpr.equals(`${viewDescriptor.id}.defaultViewLocation`, false)))))),