@codingame/monaco-vscode-api 2.0.3 → 2.1.0

package/vscode/src/vs/workbench/browser/actions/windowActions.js

@@ -1,8 +1,8 @@
-import { localizeWithPath } from '../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../nls.js';
 import '../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { MenuId, Action2, registerAction2, MenuRegistry } from '../../../platform/actions/common/actions.js';
 import { KeyChord } from '../../../base/common/keyCodes.js';
-import { IsAuxiliaryWindowFocusedContext, IsFullscreenContext } from '../../common/contextkeys.js';
+import { IsMainWindowFullscreenContext } from '../../common/contextkeys.js';
 import { IsDevelopmentContext, IsWebContext, IsIOSContext, IsMacNativeContext } from '../../../platform/contextkey/common/contextkeys.js';
 import { Categories } from '../../../platform/action/common/actionCommonCategories.js';
 import { KeybindingsRegistry } from '../../../platform/keybinding/common/keybindingsRegistry.js';
@@ -27,7 +27,6 @@ import { CommandsRegistry } from '../../../platform/commands/common/commands.js'
 import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
 import { isFolderBackupInfo, isWorkspaceBackupInfo } from '../../../platform/backup/common/backup.js';
 import { getActiveWindow, getActiveElement } from '../../../base/browser/dom.js';
-import { mainWindow } from '../../../base/browser/window.js';
 import { IDialogService } from '../../../platform/dialogs/common/dialogs.js';
 const inRecentFilesPickerContextKey = 'inRecentFilesPicker';
 class BaseOpenRecentAction extends Action2 {
@@ -277,11 +276,11 @@ class QuickPickRecentAction extends BaseOpenRecentAction {
     constructor() {
         super({
             id: 'workbench.action.quickOpenRecent',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/actions/windowActions',
                 'quickOpenRecent',
-                "Quick Open Recent..."
-            )), original: 'Quick Open Recent...' },
+                'Quick Open Recent...'
+            )),
             category: Categories.File,
             f1: false
         });
@@ -317,7 +316,7 @@ class ToggleFullScreenAction extends Action2 {
                 }
             },
             precondition: ( IsIOSContext.toNegated()),
-            toggled: IsFullscreenContext,
+            toggled: IsMainWindowFullscreenContext,
             menu: [{
                     id: MenuId.MenubarAppearanceMenu,
                     group: '1_toggle_view',
@@ -335,13 +334,12 @@ class ReloadWindowAction extends Action2 {
     constructor() {
         super({
             id: ReloadWindowAction.ID,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/actions/windowActions',
                 'reloadWindow',
-                "Reload Window"
-            )), original: 'Reload Window' },
+                'Reload Window'
+            )),
             category: Categories.Developer,
-            precondition: ( IsAuxiliaryWindowFocusedContext.toNegated()),
             f1: true,
             keybinding: {
                 weight: 200  + 50,
@@ -352,9 +350,7 @@ class ReloadWindowAction extends Action2 {
     }
     async run(accessor) {
         const hostService = accessor.get(IHostService);
-        if (getActiveWindow() === mainWindow) {
-            return hostService.reload();
-        }
+        return hostService.reload();
     }
 }
 class ShowAboutDialogAction extends Action2 {
@@ -420,11 +416,11 @@ class BlurAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.blur',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/actions/windowActions',
                 'blur',
-                "Remove keyboard focus from focused element"
-            )), original: 'Remove keyboard focus from focused element' }
+                'Remove keyboard focus from focused element'
+            ))
         });
     }
     run() {

package/vscode/src/vs/workbench/browser/actions/workspaceActions.js

@@ -1,4 +1,4 @@
-import { localizeWithPath } from '../../../nls.js';
+import { localize2WithPath, localizeWithPath } from '../../../nls.js';
 import { IWorkspaceContextService, hasWorkspaceFileExtension } from '../../../platform/workspace/common/workspace.js';
 import { IWorkspaceEditingService } from '../../services/workspaces/common/workspaceEditing.js';
 import { IEditorService } from '../../services/editor/common/editorService.js';
@@ -15,21 +15,21 @@ import { IWorkspacesService } from '../../../platform/workspaces/common/workspac
 import { IsMacNativeContext } from '../../../platform/contextkey/common/contextkeys.js';
 import { Categories } from '../../../platform/action/common/actionCommonCategories.js';
 import { IFileDialogService } from '../../../platform/dialogs/common/dialogs.js';
-const workspacesCategory = { value: ( localizeWithPath(
+const workspacesCategory = ( localize2WithPath(
     'vs/workbench/browser/actions/workspaceActions',
     'workspaces',
-    "Workspaces"
-)), original: 'Workspaces' };
+    'Workspaces'
+));
 class OpenFileAction extends Action2 {
     static { this.ID = 'workbench.action.files.openFile'; }
     constructor() {
         super({
             id: OpenFileAction.ID,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/actions/workspaceActions',
                 'openFile',
-                "Open File..."
-            )), original: 'Open File...' },
+                'Open File...'
+            )),
             category: Categories.File,
             f1: true,
             keybinding: {
@@ -49,11 +49,11 @@ class OpenFolderAction extends Action2 {
     constructor() {
         super({
             id: OpenFolderAction.ID,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/actions/workspaceActions',
                 'openFolder',
-                "Open Folder..."
-            )), original: 'Open Folder...' },
+                'Open Folder...'
+            )),
             category: Categories.File,
             f1: true,
             precondition: OpenFolderWorkspaceSupportContext,
@@ -79,11 +79,11 @@ class OpenFolderViaWorkspaceAction extends Action2 {
     constructor() {
         super({
             id: OpenFolderViaWorkspaceAction.ID,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/actions/workspaceActions',
                 'openFolder',
-                "Open Folder..."
-            )), original: 'Open Folder...' },
+                'Open Folder...'
+            )),
             category: Categories.File,
             f1: true,
             precondition: ( ContextKeyExpr.and(( OpenFolderWorkspaceSupportContext.toNegated()), ( WorkbenchStateContext.isEqualTo('workspace')))),
@@ -100,11 +100,11 @@ class OpenFolderViaWorkspaceAction extends Action2 {
 }
 class OpenFileFolderAction extends Action2 {
     static { this.ID = 'workbench.action.files.openFileFolder'; }
-    static { this.LABEL = { value: ( localizeWithPath(
+    static { this.LABEL = ( localize2WithPath(
         'vs/workbench/browser/actions/workspaceActions',
         'openFileFolder',
-        "Open..."
-    )), original: 'Open...' }; }
+        'Open...'
+    )); }
     constructor() {
         super({
             id: OpenFileFolderAction.ID,
@@ -128,11 +128,11 @@ class OpenWorkspaceAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkspaceAction.ID,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/actions/workspaceActions',
                 'openWorkspaceAction',
-                "Open Workspace from File..."
-            )), original: 'Open Workspace from File...' },
+                'Open Workspace from File...'
+            )),
             category: Categories.File,
             f1: true,
             precondition: EnterMultiRootWorkspaceSupportContext
@@ -148,11 +148,11 @@ class CloseWorkspaceAction extends Action2 {
     constructor() {
         super({
             id: CloseWorkspaceAction.ID,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/actions/workspaceActions',
                 'closeWorkspace',
-                "Close Workspace"
-            )), original: 'Close Workspace' },
+                'Close Workspace'
+            )),
             category: workspacesCategory,
             f1: true,
             precondition: ( ContextKeyExpr.and(( WorkbenchStateContext.notEqualsTo('empty')), EmptyWorkspaceSupportContext)),
@@ -173,11 +173,11 @@ class OpenWorkspaceConfigFileAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkspaceConfigFileAction.ID,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/actions/workspaceActions',
                 'openWorkspaceConfigFile',
-                "Open Workspace Configuration File"
-            )), original: 'Open Workspace Configuration File' },
+                'Open Workspace Configuration File'
+            )),
             category: workspacesCategory,
             f1: true,
             precondition: ( WorkbenchStateContext.isEqualTo('workspace'))
@@ -213,11 +213,11 @@ class RemoveRootFolderAction extends Action2 {
     constructor() {
         super({
             id: RemoveRootFolderAction.ID,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/actions/workspaceActions',
                 'globalRemoveFolderFromWorkspace',
-                "Remove Folder from Workspace..."
-            )), original: 'Remove Folder from Workspace...' },
+                'Remove Folder from Workspace...'
+            )),
             category: workspacesCategory,
             f1: true,
             precondition: ( ContextKeyExpr.and(( WorkspaceFolderCountContext.notEqualsTo('0')), ( ContextKeyExpr.or(EnterMultiRootWorkspaceSupportContext, ( WorkbenchStateContext.isEqualTo('workspace'))))))
@@ -237,11 +237,11 @@ class SaveWorkspaceAsAction extends Action2 {
     constructor() {
         super({
             id: SaveWorkspaceAsAction.ID,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/actions/workspaceActions',
                 'saveWorkspaceAsAction',
-                "Save Workspace As..."
-            )), original: 'Save Workspace As...' },
+                'Save Workspace As...'
+            )),
             category: workspacesCategory,
             f1: true,
             precondition: EnterMultiRootWorkspaceSupportContext
@@ -269,11 +269,11 @@ class DuplicateWorkspaceInNewWindowAction extends Action2 {
     constructor() {
         super({
             id: DuplicateWorkspaceInNewWindowAction.ID,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/actions/workspaceActions',
                 'duplicateWorkspaceInNewWindow',
-                "Duplicate As Workspace in New Window"
-            )), original: 'Duplicate As Workspace in New Window' },
+                'Duplicate As Workspace in New Window'
+            )),
             category: workspacesCategory,
             f1: true,
             precondition: EnterMultiRootWorkspaceSupportContext

package/vscode/src/vs/workbench/browser/actions/workspaceCommands.js

@@ -1,4 +1,4 @@
-import { localizeWithPath } from '../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../nls.js';
 import { IWorkspaceContextService, hasWorkspaceFileExtension } from '../../../platform/workspace/common/workspace.js';
 import { IWorkspaceEditingService } from '../../services/workspaces/common/workspaceEditing.js';
 import { dirname } from '../../../base/common/resources.js';
@@ -18,11 +18,11 @@ import { IWorkspacesService } from '../../../platform/workspaces/common/workspac
 import { IPathService } from '../../services/path/common/pathService.js';
 import { IFileDialogService } from '../../../platform/dialogs/common/dialogs.js';
 const ADD_ROOT_FOLDER_COMMAND_ID = 'addRootFolder';
-const ADD_ROOT_FOLDER_LABEL = { value: ( localizeWithPath(
+const ADD_ROOT_FOLDER_LABEL = ( localize2WithPath(
     'vs/workbench/browser/actions/workspaceCommands',
     'addFolderToWorkspace',
-    "Add Folder to Workspace..."
-)), original: 'Add Folder to Workspace...' };
+    'Add Folder to Workspace...'
+));
 const SET_ROOT_FOLDER_COMMAND_ID = 'setRootFolder';
 const PICK_WORKSPACE_FOLDER_COMMAND_ID = '_workbench.pickWorkspaceFolder';
 CommandsRegistry.registerCommand({

package/vscode/src/vs/workbench/browser/dnd.js

@@ -466,10 +466,10 @@ let ResourceListDnDHandler = class ResourceListDnDHandler {
             this.instantiationService.invokeFunction(accessor => fillEditorsDragData(accessor, resources, originalEvent));
         }
     }
-    onDragOver(data, targetElement, targetIndex, originalEvent) {
+    onDragOver(data, targetElement, targetIndex, targetSector, originalEvent) {
         return false;
     }
-    drop(data, targetElement, targetIndex, originalEvent) { }
+    drop(data, targetElement, targetIndex, targetSector, originalEvent) { }
     dispose() { }
 };
 ResourceListDnDHandler = ( __decorate([

package/vscode/src/vs/workbench/browser/labels.js

@@ -1,4 +1,5 @@
 import { __decorate, __param } from '../../../../../external/tslib/tslib.es6.js';
+import { localizeWithPath } from '../../nls.js';
 import { URI } from '../../base/common/uri.js';
 import { isEqual, basenameOrAuthority, dirname } from '../../base/common/resources.js';
 import { IconLabel } from '../../base/browser/ui/iconLabel/iconLabel.js';
@@ -17,6 +18,7 @@ import { getIconClasses } from '../../editor/common/services/getIconClasses.js';
 import { Disposable, dispose, MutableDisposable } from '../../base/common/lifecycle.js';
 import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js';
 import { normalizeDriveLetter } from '../../base/common/labels.js';
+import { INotebookDocumentService } from '../services/notebook/common/notebookDocumentService.js';
 function toResource(props) {
     if (!props || !props.resource) {
         return undefined;
@@ -161,7 +163,7 @@ var Redraw;
     Redraw[Redraw["Full"] = 2] = "Full";
 })(Redraw || (Redraw = {})));
 let ResourceLabelWidget = class ResourceLabelWidget extends IconLabel {
-    constructor(container, options, languageService, modelService, decorationsService, labelService, textFileService, contextService) {
+    constructor(container, options, languageService, modelService, decorationsService, labelService, textFileService, contextService, notebookDocumentService) {
         super(container, options);
         this.languageService = languageService;
         this.modelService = modelService;
@@ -169,6 +171,7 @@ let ResourceLabelWidget = class ResourceLabelWidget extends IconLabel {
         this.labelService = labelService;
         this.textFileService = textFileService;
         this.contextService = contextService;
+        this.notebookDocumentService = notebookDocumentService;
         this._onDidRender = this._register(( new Emitter()));
         this.onDidRender = this._onDidRender.event;
         this.label = undefined;
@@ -299,9 +302,32 @@ let ResourceLabelWidget = class ResourceLabelWidget extends IconLabel {
                 }
             }
         }
+        if (!options.forceLabel && !isSideBySideEditor && resource?.scheme === Schemas.vscodeNotebookCell) {
+            const notebookDocument = this.notebookDocumentService.getNotebook(resource);
+            const cellIndex = notebookDocument?.getCellIndex(resource);
+            if (notebookDocument && cellIndex !== undefined && typeof label.name === 'string') {
+                options.title = ( localizeWithPath(
+                    'vs/workbench/browser/labels',
+                    'notebookCellLabel',
+                    "{0} • Cell {1}",
+                    label.name,
+                    `${cellIndex + 1}`
+                ));
+            }
+            if (typeof label.name === 'string' && notebookDocument && cellIndex !== undefined && typeof label.name === 'string') {
+                label.name = ( localizeWithPath(
+                    'vs/workbench/browser/labels',
+                    'notebookCellLabel',
+                    "{0} • Cell {1}",
+                    label.name,
+                    `${cellIndex + 1}`
+                ));
+            }
+        }
         const hasResourceChanged = this.hasResourceChanged(label);
         const hasPathLabelChanged = hasResourceChanged || this.hasPathLabelChanged(label);
         const hasFileKindChanged = this.hasFileKindChanged(options);
+        const hasIconChanged = this.hasIconChanged(options);
         this.label = label;
         this.options = options;
         if (hasResourceChanged) {
@@ -311,7 +337,7 @@ let ResourceLabelWidget = class ResourceLabelWidget extends IconLabel {
             this.computedPathLabel = undefined;
         }
         this.render({
-            updateIcon: hasResourceChanged || hasFileKindChanged,
+            updateIcon: hasResourceChanged || hasFileKindChanged || hasIconChanged,
             updateDecoration: hasResourceChanged || hasFileKindChanged
         });
     }
@@ -335,6 +361,9 @@ let ResourceLabelWidget = class ResourceLabelWidget extends IconLabel {
         const newResource = toResource(newLabel);
         return !!newResource && this.computedPathLabel !== this.labelService.getUriLabel(newResource);
     }
+    hasIconChanged(newOptions) {
+        return this.options?.icon !== newOptions?.icon;
+    }
     clear() {
         this.label = undefined;
         this.options = undefined;
@@ -387,7 +416,7 @@ let ResourceLabelWidget = class ResourceLabelWidget extends IconLabel {
         }
         if (this.options && !this.options.hideIcon) {
             if (!this.computedIconClasses) {
-                this.computedIconClasses = getIconClasses(this.modelService, this.languageService, resource, this.options.fileKind);
+                this.computedIconClasses = getIconClasses(this.modelService, this.languageService, resource, this.options.fileKind, this.options.icon);
             }
             iconLabelOptions.extraClasses = this.computedIconClasses.slice(0);
         }
@@ -446,6 +475,7 @@ ResourceLabelWidget = ( __decorate([
     ( __param(4, IDecorationsService)),
     ( __param(5, ILabelService)),
     ( __param(6, ITextFileService)),
-    ( __param(7, IWorkspaceContextService))
+    ( __param(7, IWorkspaceContextService)),
+    ( __param(8, INotebookDocumentService))
 ], ResourceLabelWidget));
 export { DEFAULT_LABELS_CONTAINER, ResourceLabel, ResourceLabels };

package/vscode/src/vs/workbench/browser/part.js

@@ -3,7 +3,7 @@ import { Component } from '../common/component.js';
 import { size, Dimension, getActiveDocument } from '../../base/browser/dom.js';
 import { Emitter } from '../../base/common/event.js';
 import { assertIsDefined } from '../../base/common/types.js';
-import { Disposable, toDisposable } from '../../base/common/lifecycle.js';
+import { toDisposable } from '../../base/common/lifecycle.js';
 class Part extends Component {
     get dimension() { return this._dimension; }
     constructor(id, options, themeService, storageService, layoutService) {
@@ -82,7 +82,7 @@ class PartLayout {
         return { titleSize, contentSize };
     }
 }
-class MultiWindowParts extends Disposable {
+class MultiWindowParts extends Component {
     constructor() {
         super(...arguments);
         this._parts = ( new Set());

package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.js

@@ -1,5 +1,5 @@
 import { Codicon } from '../../../../base/common/codicons.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { Action2, MenuId, registerAction2, MenuRegistry } from '../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
@@ -144,11 +144,11 @@ MenuRegistry.appendMenuItems([
             group: '3_workbench_layout_move',
             command: {
                 id: ToggleAuxiliaryBarAction.ID,
-                title: { value: ( localizeWithPath(
+                title: ( localize2WithPath(
                     'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions',
                     'hideAuxiliaryBar',
-                    "Hide Secondary Side Bar"
-                )), original: 'Hide Secondary Side Bar' },
+                    'Hide Secondary Side Bar'
+                )),
             },
             when: ( ContextKeyExpr.and(AuxiliaryBarVisibleContext, ( ContextKeyExpr.equals(
                 'viewLocation',

package/vscode/src/vs/workbench/browser/parts/compositeBarActions.js

@@ -15,7 +15,7 @@ import { CompositeDragAndDropObserver, toggleDropEffect } from '../dnd.js';
 import { BaseActionViewItem } from '../../../base/browser/ui/actionbar/actionViewItems.js';
 import { Codicon } from '../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
-import { IHoverService } from '../../services/hover/browser/hover.js';
+import { IHoverService } from '../../../platform/hover/browser/hover.js';
 import { RunOnceScheduler } from '../../../base/common/async.js';
 import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
 import { badgeForeground, badgeBackground, contrastBorder } from '../../../platform/theme/common/colorRegistry.js';