@codingame/monaco-vscode-api 1.83.2 → 1.83.3

package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.js

@@ -129,19 +129,15 @@ let ExternalUriOpenerService = class ExternalUriOpenerService extends Disposable
         }));
         items.push({
             label: isWeb
-                ? ( nls.localize('selectOpenerDefaultLabel.web', 'Open in new browser window'))
-                : ( nls.localize('selectOpenerDefaultLabel', 'Open in default browser')),
+                ? nls.localizeWithPath('vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService', 'selectOpenerDefaultLabel.web', 'Open in new browser window')
+                : nls.localizeWithPath('vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService', 'selectOpenerDefaultLabel', 'Open in default browser'),
             opener: undefined
         }, { type: 'separator' }, {
-            label: ( nls.localize('selectOpenerConfigureTitle', "Configure default opener...")),
+            label: nls.localizeWithPath('vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService', 'selectOpenerConfigureTitle', "Configure default opener..."),
             opener: 'configureDefault'
         });
         const picked = await this.quickInputService.pick(items, {
-            placeHolder: ( nls.localize(
-                'selectOpenerPlaceHolder',
-                "How would you like to open: {0}",
-                ( targetUri.toString())
-            ))
+            placeHolder: nls.localizeWithPath('vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService', 'selectOpenerPlaceHolder', "How would you like to open: {0}", ( targetUri.toString()))
         });
         if (!picked) {
             return true;

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/explorerviewlet.css.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { mark } from 'monaco-editor/esm/vs/base/common/performance.js';
 import { VIEWLET_ID, VIEW_ID, ExplorerViewletVisibleContext } from '../common/files.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
@@ -23,14 +23,15 @@ import { KeyChord } from 'monaco-editor/esm/vs/base/common/keyCodes.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
 import { IProgressService } from 'monaco-editor/esm/vs/platform/progress/common/progress.js';
 import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
-import { WorkbenchStateContext, RemoteNameContext } from '../../../common/contextkeys.js';
+import { WorkbenchStateContext, OpenFolderWorkspaceSupportContext, RemoteNameContext } from '../../../common/contextkeys.js';
 import { IsWebContext } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkeys.js';
-import { OpenFileFolderAction, OpenFolderAction } from '../../../browser/actions/workspaceActions.js';
+import { AddRootFolderAction, OpenFileFolderAction, OpenFolderAction, OpenFolderViaWorkspaceAction } from '../../../browser/actions/workspaceActions.js';
+import { OpenRecentAction } from '../../../browser/actions/windowActions.js';
 import { isMacintosh, isWeb } from 'monaco-editor/esm/vs/base/common/platform.js';
 import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
 import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
-const explorerViewIcon = registerIcon('explorer-view-icon', Codicon.files, ( localize('explorerViewIcon', 'View icon of the explorer view.')));
-const openEditorsViewIcon = registerIcon('open-editors-view-icon', Codicon.book, ( localize('openEditorsIcon', 'View icon of the open editors view.')));
+const explorerViewIcon = registerIcon('explorer-view-icon', Codicon.files, localizeWithPath('vs/workbench/contrib/files/browser/explorerViewlet', 'explorerViewIcon', 'View icon of the explorer view.'));
+const openEditorsViewIcon = registerIcon('open-editors-view-icon', Codicon.book, localizeWithPath('vs/workbench/contrib/files/browser/explorerViewlet', 'openEditorsIcon', 'View icon of the open editors view.'));
 let ExplorerViewletViewsContribution = class ExplorerViewletViewsContribution extends Disposable {
     constructor(workspaceContextService, progressService) {
         super();
@@ -46,7 +47,10 @@ let ExplorerViewletViewsContribution = class ExplorerViewletViewsContribution ex
         const viewDescriptors = viewsRegistry.getViews(VIEW_CONTAINER);
         const viewDescriptorsToRegister = [];
         const viewDescriptorsToDeregister = [];
-        this.createOpenEditorsViewDescriptor();
+        const openEditorsViewDescriptor = this.createOpenEditorsViewDescriptor();
+        if (!( viewDescriptors.some(v => v.id === openEditorsViewDescriptor.id))) {
+            viewDescriptorsToRegister.push(openEditorsViewDescriptor);
+        }
         const explorerViewDescriptor = this.createExplorerViewDescriptor();
         const registeredExplorerViewDescriptor = viewDescriptors.find(v => v.id === explorerViewDescriptor.id);
         const emptyViewDescriptor = this.createEmptyViewDescriptor();
@@ -108,7 +112,7 @@ let ExplorerViewletViewsContribution = class ExplorerViewletViewsContribution ex
     createExplorerViewDescriptor() {
         return {
             id: VIEW_ID,
-            name: ( localize('folders', "Folders")),
+            name: localizeWithPath('vs/workbench/contrib/files/browser/explorerViewlet', 'folders', "Folders"),
             containerIcon: explorerViewIcon,
             ctorDescriptor: ( new SyncDescriptor(ExplorerView)),
             order: 1,
@@ -203,7 +207,7 @@ ExplorerViewPaneContainer = ( __decorate([
 const viewContainerRegistry = ( Registry.as(Extensions.ViewContainersRegistry));
 const VIEW_CONTAINER = viewContainerRegistry.registerViewContainer({
     id: VIEWLET_ID,
-    title: { value: ( localize('explore', "Explorer")), original: 'Explorer' },
+    title: { value: localizeWithPath('vs/workbench/contrib/files/browser/explorerViewlet', 'explore', "Explorer"), original: 'Explorer' },
     ctorDescriptor: ( new SyncDescriptor(ExplorerViewPaneContainer)),
     storageId: 'workbench.explorer.views.state',
     icon: explorerViewIcon,
@@ -212,24 +216,57 @@ const VIEW_CONTAINER = viewContainerRegistry.registerViewContainer({
     order: 0,
     openCommandActionDescriptor: {
         id: VIEWLET_ID,
-        title: { value: ( localize('explore', "Explorer")), original: 'Explorer' },
-        mnemonicTitle: ( localize(
-            { key: 'miViewExplorer', comment: ['&& denotes a mnemonic'] },
-            "&&Explorer"
-        )),
+        title: { value: localizeWithPath('vs/workbench/contrib/files/browser/explorerViewlet', 'explore', "Explorer"), original: 'Explorer' },
+        mnemonicTitle: localizeWithPath('vs/workbench/contrib/files/browser/explorerViewlet', { key: 'miViewExplorer', comment: ['&& denotes a mnemonic'] }, "&&Explorer"),
         keybindings: { primary: 2048  | 1024  | 35  },
         order: 0
     },
 }, 0 , { isDefault: true });
-const openFolder = ( localize('openFolder', "Open Folder"));
+const openFolder = localizeWithPath('vs/workbench/contrib/files/browser/explorerViewlet', 'openFolder', "Open Folder");
+const addAFolder = localizeWithPath('vs/workbench/contrib/files/browser/explorerViewlet', 'addAFolder', "add a folder");
+const openRecent = localizeWithPath('vs/workbench/contrib/files/browser/explorerViewlet', 'openRecent', "Open Recent");
+const addRootFolderButton = `[${openFolder}](command:${AddRootFolderAction.ID})`;
+const addAFolderButton = `[${addAFolder}](command:${AddRootFolderAction.ID})`;
 const openFolderButton = `[${openFolder}](command:${(isMacintosh && !isWeb) ? OpenFileFolderAction.ID : OpenFolderAction.ID})`;
+const openFolderViaWorkspaceButton = `[${openFolder}](command:${OpenFolderViaWorkspaceAction.ID})`;
+const openRecentButton = `[${openRecent}](command:${OpenRecentAction.ID})`;
 const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
 ( viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
-    content: ( localize(
-        { key: 'noFolderHelp', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] },
-        "You have not yet opened a folder.\n{0}",
-        openFolderButton
-    )),
+    content: localizeWithPath('vs/workbench/contrib/files/browser/explorerViewlet', { key: 'noWorkspaceHelp', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] }, "You have not yet added a folder to the workspace.\n{0}", addRootFolderButton),
+    when: ( ContextKeyExpr.and((
+    WorkbenchStateContext.isEqualTo('workspace')),
+    OpenFolderWorkspaceSupportContext)),
+    group: ViewContentGroups.Open,
+    order: 1
+}));
+( viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
+    content: localizeWithPath('vs/workbench/contrib/files/browser/explorerViewlet', { key: 'noFolderHelpWeb', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] }, "You have not yet opened a folder.\n{0}\n{1}", openFolderViaWorkspaceButton, openRecentButton),
+    when: ( ContextKeyExpr.and((
+    WorkbenchStateContext.isEqualTo('workspace')), (
+    OpenFolderWorkspaceSupportContext.toNegated()))),
+    group: ViewContentGroups.Open,
+    order: 1
+}));
+( viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
+    content: localizeWithPath('vs/workbench/contrib/files/browser/explorerViewlet', { key: 'remoteNoFolderHelp', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] }, "Connected to remote.\n{0}", openFolderButton),
+    when: ( ContextKeyExpr.and((
+    WorkbenchStateContext.notEqualsTo('workspace')), (
+    RemoteNameContext.notEqualsTo('')), (
+    IsWebContext.toNegated()))),
+    group: ViewContentGroups.Open,
+    order: 1
+}));
+( viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
+    content: localizeWithPath('vs/workbench/contrib/files/browser/explorerViewlet', { key: 'noFolderButEditorsHelp', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] }, "You have not yet opened a folder.\n{0}\nOpening a folder will close all currently open editors. To keep them open, {1} instead.", openFolderButton, addAFolderButton),
+    when: ( ContextKeyExpr.and((
+    ContextKeyExpr.has('editorIsOpen')), ( ContextKeyExpr.or((
+    ContextKeyExpr.and(( WorkbenchStateContext.notEqualsTo('workspace')), ( RemoteNameContext.isEqualTo('')))), (
+    ContextKeyExpr.and(( WorkbenchStateContext.notEqualsTo('workspace')), IsWebContext)))))),
+    group: ViewContentGroups.Open,
+    order: 1
+}));
+( viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
+    content: localizeWithPath('vs/workbench/contrib/files/browser/explorerViewlet', { key: 'noFolderHelp', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] }, "You have not yet opened a folder.\n{0}", openFolderButton),
     when: ( ContextKeyExpr.and(
     ( ContextKeyExpr.has('editorIsOpen'))?.negate(), ( ContextKeyExpr.or((
     ContextKeyExpr.and(( WorkbenchStateContext.notEqualsTo('workspace')), ( RemoteNameContext.isEqualTo('')))), (