@codingame/monaco-vscode-views-service-override 2.0.3 → 2.1.0

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { CallHierarchyProviderRegistry, CallHierarchyModel } from 'vscode/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
@@ -167,11 +167,11 @@ registerAction2(class PeekCallHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showCallHierarchy',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution',
                 'title',
-                "Peek Call Hierarchy"
-            )), original: 'Peek Call Hierarchy' },
+                'Peek Call Hierarchy'
+            )),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: 'navigation',
@@ -195,11 +195,11 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showIncomingCalls',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution',
                 'title.incoming',
-                "Show Incoming Calls"
-            )), original: 'Show Incoming Calls' },
+                'Show Incoming Calls'
+            )),
             icon: registerIcon('callhierarchy-incoming', Codicon.callIncoming, ( localizeWithPath(
                 'vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution',
                 'showIncomingCallsIcons',
@@ -225,11 +225,11 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showOutgoingCalls',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution',
                 'title.outgoing',
-                "Show Outgoing Calls"
-            )), original: 'Show Outgoing Calls' },
+                'Show Outgoing Calls'
+            )),
             icon: registerIcon('callhierarchy-outgoing', Codicon.callOutgoing, ( localizeWithPath(
                 'vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution',
                 'showOutgoingCallsIcon',
@@ -255,11 +255,11 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.refocusCallHierarchy',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution',
                 'title.refocus',
-                "Refocus Call Hierarchy"
-            )), original: 'Refocus Call Hierarchy' },
+                'Refocus Call Hierarchy'
+            )),
             precondition: _ctxCallHierarchyVisible,
             keybinding: {
                 weight: 200 ,

package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileEditor.js

@@ -27,12 +27,13 @@ import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/p
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
+import { IFilesConfigurationService } from 'vscode/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService';
 
 var TextFileEditor_1;
 let TextFileEditor = class TextFileEditor extends AbstractTextCodeEditor {
     static { TextFileEditor_1 = this; }
     static { this.ID = TEXT_FILE_EDITOR_ID; }
-    constructor(telemetryService, fileService, paneCompositeService, instantiationService, contextService, storageService, textResourceConfigurationService, editorService, themeService, editorGroupService, textFileService, explorerService, uriIdentityService, pathService, configurationService, preferencesService, hostService) {
+    constructor(telemetryService, fileService, paneCompositeService, instantiationService, contextService, storageService, textResourceConfigurationService, editorService, themeService, editorGroupService, textFileService, explorerService, uriIdentityService, pathService, configurationService, preferencesService, hostService, filesConfigurationService) {
         super(TextFileEditor_1.ID, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorService, editorGroupService, fileService);
         this.paneCompositeService = paneCompositeService;
         this.contextService = contextService;
@@ -43,6 +44,7 @@ let TextFileEditor = class TextFileEditor extends AbstractTextCodeEditor {
         this.configurationService = configurationService;
         this.preferencesService = preferencesService;
         this.hostService = hostService;
+        this.filesConfigurationService = filesConfigurationService;
         this._register(this.fileService.onDidFilesChange(e => this.onDidFilesChange(e)));
         this._register(this.fileService.onDidRunOperation(e => this.onDidRunOperation(e)));
     }
@@ -153,7 +155,9 @@ let TextFileEditor = class TextFileEditor extends AbstractTextCodeEditor {
             }
             throw createTooLargeFileError(this.group, input, options, message, this.preferencesService);
         }
-        if (error.fileOperationResult === 1  && (await this.pathService.hasValidBasename(input.preferredResource))) {
+        if (error.fileOperationResult === 1  &&
+            !this.filesConfigurationService.isReadonly(input.preferredResource) &&
+            (await this.pathService.hasValidBasename(input.preferredResource))) {
             const fileNotFoundError = createEditorOpenError(( new FileOperationError(( localizeWithPath(
                 'vs/workbench/contrib/files/browser/editors/textFileEditor',
                 'unavailableResourceErrorEditorText',
@@ -245,7 +249,8 @@ TextFileEditor = TextFileEditor_1 = ( __decorate([
     ( __param(13, IPathService)),
     ( __param(14, IConfigurationService)),
     ( __param(15, IPreferencesService)),
-    ( __param(16, IHostService))
+    ( __param(16, IHostService)),
+    ( __param(17, IFilesConfigurationService))
 ], TextFileEditor));
 
 export { TextFileEditor };

package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileEditorTracker.js

@@ -49,7 +49,7 @@ let TextFileEditorTracker = class TextFileEditorTracker extends Disposable {
             if (fileModel?.hasState(2 )) {
                 return false;
             }
-            if (resource.scheme !== Schemas.untitled && this.filesConfigurationService.getAutoSaveMode() === 1  && !fileModel?.hasState(5 )) {
+            if (resource.scheme !== Schemas.untitled && !fileModel?.hasState(5 ) && this.filesConfigurationService.hasShortAutoSaveDelay(resource)) {
                 return false;
             }
             if (this.editorService.isOpened({ resource, typeId: resource.scheme === Schemas.untitled ? UntitledTextEditorInput.ID : FILE_EDITOR_INPUT_ID, editorId: DEFAULT_EDITOR_ASSOCIATION.id })) {

package/vscode/src/vs/workbench/contrib/files/browser/explorerService.js

@@ -333,12 +333,16 @@ let ExplorerService = class ExplorerService {
                 if (modelElement.parent) {
                     const parent = modelElement.parent;
                     parent.removeChild(modelElement);
+                    this.view?.focusNext();
                     const oldNestedParent = modelElement.nestedParent;
                     if (oldNestedParent) {
                         oldNestedParent.removeChild(modelElement);
                         await this.view?.refresh(false, oldNestedParent);
                     }
                     await this.view?.refresh(shouldDeepRefresh, parent);
+                    if (this.view?.getFocus().length === 0) {
+                        this.view?.focusLast();
+                    }
                 }
             })));
         }

package/vscode/src/vs/workbench/contrib/files/browser/fileActions.contribution.js

@@ -1,5 +1,5 @@
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
-import { GlobalCompareResourcesAction, FocusFilesExplorer, ShowActiveFileInExplorer, CompareWithClipboardAction, CompareNewUntitledTextFilesAction, ToggleAutoSaveAction, ShowOpenedFileInNewWindow, SetActiveEditorReadonlyInSession, SetActiveEditorWriteableInSession, ToggleActiveEditorReadonlyInSession, ResetActiveEditorReadonlyInSession, renameHandler, moveFileToTrashHandler, deleteFileHandler, cutFileHandler, copyFileHandler, pasteFileHandler, openFilePreserveFocusHandler, NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, COPY_FILE_LABEL, PASTE_FILE_LABEL, FileCopiedContext, DOWNLOAD_COMMAND_ID, DOWNLOAD_LABEL, UPLOAD_COMMAND_ID, UPLOAD_LABEL, TRIGGER_RENAME_LABEL, MOVE_FILE_TO_TRASH_LABEL } from 'vscode/vscode/vs/workbench/contrib/files/browser/fileActions';
+import { GlobalCompareResourcesAction, FocusFilesExplorer, ShowActiveFileInExplorer, CompareWithClipboardAction, CompareNewUntitledTextFilesAction, ToggleAutoSaveAction, OpenActiveFileInEmptyWorkspace, SetActiveEditorReadonlyInSession, SetActiveEditorWriteableInSession, ToggleActiveEditorReadonlyInSession, ResetActiveEditorReadonlyInSession, renameHandler, moveFileToTrashHandler, deleteFileHandler, cutFileHandler, copyFileHandler, pasteFileHandler, openFilePreserveFocusHandler, NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, COPY_FILE_LABEL, PASTE_FILE_LABEL, FileCopiedContext, DOWNLOAD_COMMAND_ID, DOWNLOAD_LABEL, UPLOAD_COMMAND_ID, UPLOAD_LABEL, TRIGGER_RENAME_LABEL, MOVE_FILE_TO_TRASH_LABEL } from 'vscode/vscode/vs/workbench/contrib/files/browser/fileActions';
 import { CONFLICT_RESOLUTION_CONTEXT, acceptLocalChangesCommand, revertLocalChangesCommand } from './editors/textFileSaveErrorHandler.js';
 import { registerAction2, MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import './fileCommands.js';
@@ -25,7 +25,7 @@ registerAction2(ShowActiveFileInExplorer);
 registerAction2(CompareWithClipboardAction);
 registerAction2(CompareNewUntitledTextFilesAction);
 registerAction2(ToggleAutoSaveAction);
-registerAction2(ShowOpenedFileInNewWindow);
+registerAction2(OpenActiveFileInEmptyWorkspace);
 registerAction2(SetActiveEditorReadonlyInSession);
 registerAction2(SetActiveEditorWriteableInSession);
 registerAction2(ToggleActiveEditorReadonlyInSession);

package/vscode/src/vs/workbench/contrib/files/browser/fileCommands.js

@@ -36,7 +36,7 @@ import { EditorResolution, EditorOpenSource } from 'vscode/vscode/vs/platform/ed
 import { hash } from 'vscode/vscode/vs/base/common/hash';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
-import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { OPEN_TO_SIDE_COMMAND_ID, COMPARE_WITH_SAVED_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, COMPARE_SELECTED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, COPY_PATH_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_WITH_EXPLORER_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_FILE_AS_COMMAND_ID, SAVE_ALL_COMMAND_ID, SAVE_ALL_IN_GROUP_COMMAND_ID, SAVE_FILES_COMMAND_ID, REVERT_FILE_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, PREVIOUS_COMPRESSED_FOLDER, NEXT_COMPRESSED_FOLDER, FIRST_COMPRESSED_FOLDER, LAST_COMPRESSED_FOLDER, NEW_UNTITLED_FILE_COMMAND_ID, NEW_UNTITLED_FILE_LABEL, NEW_FILE_COMMAND_ID } from 'vscode/vscode/vs/workbench/contrib/files/browser/fileConstants';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { RemoveRootFolderAction } from 'vscode/vscode/vs/workbench/browser/actions/workspaceActions';
@@ -271,11 +271,10 @@ CommandsRegistry.registerCommand({
         const explorerService = accessor.get(IExplorerService);
         const uri = getResourceForCommand(resource, accessor.get(IListService), accessor.get(IEditorService));
         if (uri && contextService.isInsideWorkspace(uri)) {
-            const explorerView = viewService.getViewWithId(VIEW_ID);
+            const explorerView = await viewService.openView(VIEW_ID, false);
             if (explorerView) {
                 const oldAutoReveal = explorerView.autoReveal;
                 explorerView.autoReveal = false;
-                await viewService.openView(VIEW_ID, false);
                 explorerView.setExpanded(true);
                 await explorerService.select(uri, 'force');
                 explorerView.focus();
@@ -328,7 +327,7 @@ async function saveSelectedEditors(accessor, options) {
     }
     await doSaveEditors(accessor, editors, options);
     const focusedCodeEditor = codeEditorService.getFocusedCodeEditor();
-    if (focusedCodeEditor instanceof EmbeddedCodeEditorWidget) {
+    if (focusedCodeEditor instanceof EmbeddedCodeEditorWidget && !focusedCodeEditor.isSimpleWidget) {
         const resource = focusedCodeEditor.getModel()?.uri;
         if (resource && !( editors.some(
             ({ editor }) => isEqual(EditorResourceAccessor.getCanonicalUri(editor, { supportSideBySide: SideBySideEditor.PRIMARY }), resource)

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

@@ -488,7 +488,7 @@ configurationRegistry.registerConfiguration({
                 '*.jsx': '${capture}.js',
                 '*.tsx': '${capture}.ts',
                 'tsconfig.json': 'tsconfig.*.json',
-                'package.json': 'package-lock.json, yarn.lock, pnpm-lock.yaml',
+                'package.json': 'package-lock.json, yarn.lock, pnpm-lock.yaml, bun.lockb',
             }
         }
     }

package/vscode/src/vs/workbench/contrib/files/browser/workspaceWatcher.js

@@ -54,7 +54,7 @@ let WorkspaceWatcher = class WorkspaceWatcher extends Disposable {
             this.notificationService.prompt(Severity.Warning, ( localizeWithPath(
                 'vs/workbench/contrib/files/browser/workspaceWatcher',
                 'enospcError',
-                "Unable to watch for file changes in this large workspace folder. Please follow the instructions link to resolve this issue."
+                "Unable to watch for file changes. Please follow the instructions link to resolve this issue."
             )), [{
                     label: ( localizeWithPath(
                         'vs/workbench/contrib/files/browser/workspaceWatcher',

package/vscode/src/vs/workbench/contrib/files/common/dirtyFilesIndicator.js

@@ -25,7 +25,7 @@ let DirtyFilesIndicator = class DirtyFilesIndicator extends Disposable {
     }
     onWorkingCopyDidChangeDirty(workingCopy) {
         const gotDirty = workingCopy.isDirty();
-        if (gotDirty && !((workingCopy.capabilities & 2) ) && this.filesConfigurationService.getAutoSaveMode() === 1 ) {
+        if (gotDirty && !((workingCopy.capabilities & 2) ) && this.filesConfigurationService.hasShortAutoSaveDelay(workingCopy.resource)) {
             return;
         }
         if (gotDirty || this.lastKnownDirtyCount > 0) {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.js

@@ -1,7 +1,7 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { basename } from 'vscode/vscode/vs/base/common/resources';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import '../../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
@@ -55,11 +55,11 @@ class OpenMergeEditor extends Action2 {
     constructor() {
         super({
             id: '_open.mergeEditor',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/mergeEditor/browser/commands/commands',
                 'title',
-                "Open Merge Editor"
-            )), original: 'Open Merge Editor' },
+                'Open Merge Editor'
+            )),
         });
     }
     run(accessor, ...args) {
@@ -161,11 +161,11 @@ class SetColumnLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.columnLayout',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/mergeEditor/browser/commands/commands',
                 'layout.column',
-                "Column Layout"
-            )), original: 'Column Layout' },
+                'Column Layout'
+            )),
             toggled: ( ctxMergeEditorLayout.isEqualTo('columns')),
             menu: [{
                     id: MenuId.EditorTitle,
@@ -464,7 +464,8 @@ class CompareInput1WithBaseCommand extends MergeEditorAction {
             )),
             f1: true,
             precondition: ctxIsMergeEditor,
-            menu: { id: MenuId.MergeInput1Toolbar }
+            menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
+            icon: Codicon.compareChanges,
         });
     }
     runWithViewModel(viewModel, accessor) {
@@ -492,7 +493,8 @@ class CompareInput2WithBaseCommand extends MergeEditorAction {
             )),
             f1: true,
             precondition: ctxIsMergeEditor,
-            menu: { id: MenuId.MergeInput2Toolbar }
+            menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
+            icon: Codicon.compareChanges,
         });
     }
     runWithViewModel(viewModel, accessor) {
@@ -556,9 +558,8 @@ class AcceptAllInput1 extends MergeEditorAction {
             },
             f1: true,
             precondition: ctxIsMergeEditor,
-            menu: [
-                { id: MenuId.MergeInput1Toolbar, }
-            ]
+            menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
+            icon: Codicon.checkAll,
         });
     }
     runWithViewModel(viewModel) {
@@ -580,9 +581,8 @@ class AcceptAllInput2 extends MergeEditorAction {
             },
             f1: true,
             precondition: ctxIsMergeEditor,
-            menu: [
-                { id: MenuId.MergeInput2Toolbar, }
-            ]
+            menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
+            icon: Codicon.checkAll,
         });
     }
     runWithViewModel(viewModel) {
@@ -609,7 +609,8 @@ class ResetToBaseAndAutoMergeCommand extends MergeEditorAction {
             )),
             f1: true,
             precondition: ctxIsMergeEditor,
-            menu: { id: MenuId.MergeInputResultToolbar }
+            menu: { id: MenuId.MergeInputResultToolbar, group: 'primary' },
+            icon: Codicon.discard,
         });
     }
     runWithViewModel(viewModel, accessor) {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.js

@@ -2,7 +2,7 @@ import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
 import '../../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
@@ -14,11 +14,11 @@ import { ctxIsMergeEditor } from 'vscode/vscode/vs/workbench/contrib/mergeEditor
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
-const MERGE_EDITOR_CATEGORY = { value: ( localizeWithPath(
+const MERGE_EDITOR_CATEGORY = ( localize2WithPath(
     'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
     'mergeEditor',
-    "Merge Editor (Dev)"
-)), original: 'Merge Editor (Dev)' };
+    'Merge Editor (Dev)'
+));
 class MergeEditorCopyContentsToJSON extends Action2 {
     constructor() {
         super({

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/codeEditorView.js

@@ -93,7 +93,7 @@ let TitleMenu = class TitleMenu extends Disposable {
         super();
         const toolbar = instantiationService.createInstance(MenuWorkbenchToolBar, targetHtmlElement, menuId, {
             menuOptions: { renderShortTitle: true },
-            toolbarOptions: { primaryGroup: () => false }
+            toolbarOptions: { primaryGroup: (g) => g === 'primary' }
         });
         this._store.add(toolbar);
     }

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

@@ -8,7 +8,7 @@ import { registerEditorContribution, EditorAction2 } from 'vscode/vscode/vs/edit
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { PeekContext } from 'vscode/vscode/vs/editor/contrib/peekView/browser/peekView';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { RawContextKey, ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
@@ -163,11 +163,11 @@ registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showTypeHierarchy',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution',
                 'title',
-                "Peek Type Hierarchy"
-            )), original: 'Peek Type Hierarchy' },
+                'Peek Type Hierarchy'
+            )),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: 'navigation',
@@ -186,11 +186,11 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showSupertypes',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution',
                 'title.supertypes',
-                "Show Supertypes"
-            )), original: 'Show Supertypes' },
+                'Show Supertypes'
+            )),
             icon: Codicon.typeHierarchySuper,
             precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo("subtypes" )))),
             keybinding: {
@@ -212,11 +212,11 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showSubtypes',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution',
                 'title.subtypes',
-                "Show Subtypes"
-            )), original: 'Show Subtypes' },
+                'Show Subtypes'
+            )),
             icon: Codicon.typeHierarchySub,
             precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo("supertypes" )))),
             keybinding: {
@@ -238,11 +238,11 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.refocusTypeHierarchy',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution',
                 'title.refocusTypeHierarchy',
-                "Refocus Type Hierarchy"
-            )), original: 'Refocus Type Hierarchy' },
+                'Refocus Type Hierarchy'
+            )),
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {
                 weight: 200 ,

package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { isFirefox } from 'vscode/vscode/vs/base/browser/browser';
-import { addDisposableListener, EventType } from 'vscode/vscode/vs/base/browser/dom';
+import { addDisposableListener, getActiveWindow, EventType } from 'vscode/vscode/vs/base/browser/dom';
 import { ThrottledDelayer } from 'vscode/vscode/vs/base/common/async';
 import { streamToBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
@@ -122,7 +122,7 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._tunnelService
         )));
         this._element = this._createElement(initInfo.options, initInfo.contentOptions);
-        const subscription = this._register(addDisposableListener($window, 'message', (e) => {
+        const subscription = this._register(addDisposableListener(initInfo.codeWindow ?? getActiveWindow(), 'message', (e) => {
             if (!this._encodedWebviewOrigin || e?.data?.target !== this.id) {
                 return;
             }

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

@@ -23,7 +23,7 @@ let WebviewPanelContribution = class WebviewPanelContribution extends Disposable
     constructor(editorGroupService) {
         super();
         this.editorGroupService = editorGroupService;
-        this.editorGroupService.mainPart.whenReady.then(() => this.editorGroupService.groups.forEach(group => {
+        this.editorGroupService.whenReady.then(() => this.editorGroupService.groups.forEach(group => {
             this.registerGroupListener(group);
         }));
         this._register(this.editorGroupService.onDidAddGroup(group => this.registerGroupListener(group)));

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

@@ -16,7 +16,8 @@ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/te
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { ViewPane, ViewPaneShowActions } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
-import { IViewDescriptorService, IViewsService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { ExtensionKeyedWebviewOriginStore, IWebviewService } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview';
 import { WebviewWindowDragMonitor } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webviewWindowDragMonitor';
 import { IWebviewViewService } from 'vscode/vscode/vs/workbench/contrib/webviewView/browser/webviewViewService';

package/vscode/src/vs/workbench/services/activity/browser/activityService.js

@@ -35,6 +35,7 @@ let ViewContainerActivityByView = class ViewContainerActivityByView extends Disp
     }
     dispose() {
         this.activityDisposable.dispose();
+        super.dispose();
     }
 };
 ViewContainerActivityByView = ( __decorate([

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

@@ -57,15 +57,28 @@ let EditorResolverService = class EditorResolverService extends Disposable {
     }
     resolveUntypedInputAndGroup(editor, preferredGroup) {
         const untypedEditor = editor;
-        const [group, activation] = this.instantiationService.invokeFunction(findGroup, untypedEditor, preferredGroup);
-        return [untypedEditor, group, activation];
+        const findGroupResult = this.instantiationService.invokeFunction(findGroup, untypedEditor, preferredGroup);
+        if (findGroupResult instanceof Promise) {
+            return findGroupResult.then(([group, activation]) => [untypedEditor, group, activation]);
+        }
+        else {
+            const [group, activation] = findGroupResult;
+            return [untypedEditor, group, activation];
+        }
     }
     async resolveEditor(editor, preferredGroup) {
         this._flattenedEditors = this._flattenEditorsMap();
         if (isResourceSideBySideEditorInput(editor)) {
             return this.doResolveSideBySideEditor(editor, preferredGroup);
         }
-        const resolvedUntypedAndGroup = this.resolveUntypedInputAndGroup(editor, preferredGroup);
+        let resolvedUntypedAndGroup;
+        const resolvedUntypedAndGroupResult = this.resolveUntypedInputAndGroup(editor, preferredGroup);
+        if (resolvedUntypedAndGroupResult instanceof Promise) {
+            resolvedUntypedAndGroup = await resolvedUntypedAndGroupResult;
+        }
+        else {
+            resolvedUntypedAndGroup = resolvedUntypedAndGroupResult;
+        }
         if (!resolvedUntypedAndGroup) {
             return 2 ;
         }
@@ -195,10 +208,11 @@ let EditorResolverService = class EditorResolverService extends Disposable {
     }
     getAllUserAssociations() {
         const inspectedEditorAssociations = this.configurationService.inspect(editorsAssociationsSettingId) || {};
+        const defaultAssociations = inspectedEditorAssociations.defaultValue ?? {};
         const workspaceAssociations = inspectedEditorAssociations.workspaceValue ?? {};
         const userAssociations = inspectedEditorAssociations.userValue ?? {};
         const rawAssociations = { ...workspaceAssociations };
-        for (const [key, value] of Object.entries(userAssociations)) {
+        for (const [key, value] of Object.entries({ ...defaultAssociations, ...userAssociations })) {
             if (rawAssociations[key] === undefined) {
                 rawAssociations[key] = value;
             }

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

@@ -665,12 +665,12 @@ let HistoryService = class HistoryService extends Disposable {
     ensureHistoryLoaded(history) {
         if (!this.history) {
             this.history = [];
-            if (this.editorGroupService.mainPart.isReady) {
+            if (this.editorGroupService.isReady) {
                 this.loadHistory();
             }
             else {
                 (async () => {
-                    await this.editorGroupService.mainPart.whenReady;
+                    await this.editorGroupService.whenReady;
                     this.loadHistory();
                 })();
             }

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

@@ -6,7 +6,7 @@ import { Progress } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { timeout, RunOnceScheduler, DeferredPromise } from 'vscode/vscode/vs/base/common/async';
 import { ProgressBadge, IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
-import { NotificationPriority, INotificationService, Severity } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { NotificationPriority, NotificationsFilter, isNotificationSource, INotificationService, Severity } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { ILayoutService } from 'vscode/vscode/vs/platform/layout/browser/layoutService';
@@ -14,7 +14,8 @@ import { Dialog } from 'vscode/vscode/vs/base/browser/ui/dialog/dialog';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
 import { EventHelper } from 'vscode/vscode/vs/base/browser/dom';
 import { parseLinkedText } from 'vscode/vscode/vs/base/common/linkedText';
-import { IViewDescriptorService, IViewsService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
 import { stripIcons } from 'vscode/vscode/vs/base/common/iconLabels';
 import { defaultButtonStyles, defaultCheckboxStyles, defaultInputBoxStyles, defaultDialogStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
@@ -52,8 +53,18 @@ let ProgressService = class ProgressService extends Disposable {
             return handleStringLocation(location);
         }
         switch (location) {
-            case 15 :
-                return this.withNotificationProgress({ ...options, location, priority: this.notificationService.doNotDisturbMode ? NotificationPriority.SILENT : undefined }, task, onDidCancel);
+            case 15 : {
+                let priority = options.priority;
+                if (priority !== NotificationPriority.URGENT) {
+                    if (this.notificationService.getFilter() === NotificationsFilter.ERROR) {
+                        priority = NotificationPriority.SILENT;
+                    }
+                    else if (isNotificationSource(options.source) && this.notificationService.getFilter(options.source) === NotificationsFilter.ERROR) {
+                        priority = NotificationPriority.SILENT;
+                    }
+                }
+                return this.withNotificationProgress({ ...options, location, priority }, task, onDidCancel);
+            }
             case 10 : {
                 const type = options.type;
                 if (options.command) {

package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorHandler.js

@@ -28,7 +28,7 @@ let UntitledTextEditorInputSerializer = class UntitledTextEditorInputSerializer
         }
         const untitledTextEditorInput = editorInput;
         let resource = untitledTextEditorInput.resource;
-        if (untitledTextEditorInput.model.hasAssociatedFilePath) {
+        if (untitledTextEditorInput.hasAssociatedFilePath) {
             resource = toLocalResource(resource, this.environmentService.remoteAuthority, this.pathService.defaultUriScheme);
         }
         let languageId;
@@ -36,7 +36,7 @@ let UntitledTextEditorInputSerializer = class UntitledTextEditorInputSerializer
         if (languageIdCandidate !== PLAINTEXT_LANGUAGE_ID) {
             languageId = languageIdCandidate;
         }
-        else if (untitledTextEditorInput.model.hasLanguageSetExplicitly) {
+        else if (untitledTextEditorInput.hasLanguageSetExplicitly) {
             languageId = languageIdCandidate;
         }
         const serialized = {

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

@@ -530,8 +530,12 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         });
     }
     registerViewsVisibilityActions(viewContainer, { viewContainerModel, disposables }) {
+        this.viewsVisibilityActionDisposables.deleteAndDispose(viewContainer);
         this.viewsVisibilityActionDisposables.set(viewContainer, this.registerViewsVisibilityActionsForContainer(viewContainerModel));
-        disposables.add(Event.any(viewContainerModel.onDidChangeActiveViewDescriptors, viewContainerModel.onDidAddVisibleViewDescriptors, viewContainerModel.onDidRemoveVisibleViewDescriptors, viewContainerModel.onDidMoveVisibleViewDescriptors)(e => this.viewsVisibilityActionDisposables.set(viewContainer, this.registerViewsVisibilityActionsForContainer(viewContainerModel))));
+        disposables.add(Event.any(viewContainerModel.onDidChangeActiveViewDescriptors, viewContainerModel.onDidAddVisibleViewDescriptors, viewContainerModel.onDidRemoveVisibleViewDescriptors, viewContainerModel.onDidMoveVisibleViewDescriptors)(e => {
+            this.viewsVisibilityActionDisposables.deleteAndDispose(viewContainer);
+            this.viewsVisibilityActionDisposables.set(viewContainer, this.registerViewsVisibilityActionsForContainer(viewContainerModel));
+        }));
     }
     registerViewsVisibilityActionsForContainer(viewContainerModel) {
         const disposables = ( new DisposableStore());
@@ -556,7 +560,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                                     group: '1_toggleVisibility'
                                 }, {
                                     id: MenuId.ViewTitleContext,
-                                    when: ( ContextKeyExpr.and(viewContainerModel.visibleViewDescriptors.length > 1 ? ( ContextKeyExpr.or(...( viewContainerModel.visibleViewDescriptors.map(v => ( ContextKeyExpr.equals('view', v.id)))))) : ( ContextKeyExpr.false()))),
+                                    when: ( ContextKeyExpr.and(( ContextKeyExpr.or(...( viewContainerModel.visibleViewDescriptors.map(v => ( ContextKeyExpr.equals('view', v.id)))))))),
                                     order: index,
                                     group: '2_toggleVisibility'
                                 }]

package/vscode/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.css.js

@@ -1,6 +0,0 @@
-import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-
-var css = ".monaco-breadcrumbs{display:flex;flex-direction:row;flex-wrap:nowrap;justify-content:flex-start;outline-style:none;user-select:none;-webkit-user-select:none}.monaco-breadcrumbs .monaco-breadcrumb-item{align-items:center;align-self:center;cursor:pointer;display:flex;flex:0 1 auto;height:100%;outline:none;white-space:nowrap}.monaco-breadcrumbs.disabled .monaco-breadcrumb-item{cursor:default}.monaco-breadcrumbs .monaco-breadcrumb-item .codicon-breadcrumb-separator{color:inherit}.monaco-breadcrumbs .monaco-breadcrumb-item:first-of-type:before{content:\" \"}";
-n(css,{});
-
-export { css, css as default };