@codingame/monaco-vscode-api 7.1.0 → 7.1.1

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../../nls.js';
+import { localize } from '../../../../../nls.js';
 import { toErrorMessage } from '../../../../../base/common/errorMessage.js';
 import { isEqual, basename } from '../../../../../base/common/resources.js';
 import { Action } from '../../../../../base/common/actions.js';
@@ -30,13 +30,11 @@ import { IPreferencesService } from '../../../../services/preferences/common/pre
 import { SaveReason, SideBySideEditor } from '../../../../common/editor.js';
 import { hash } from '../../../../../base/common/hash.js';
 import Severity$1 from '../../../../../base/common/severity.js';
-const _moduleId = "vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler";
 const CONFLICT_RESOLUTION_CONTEXT = 'saveConflictResolutionContext';
 const CONFLICT_RESOLUTION_SCHEME = 'conflictResolution';
 const LEARN_MORE_DIRTY_WRITE_IGNORE_KEY = 'learnMoreDirtyWriteError';
-const conflictEditorHelp = ( localizeWithPath(
-    _moduleId,
-    0,
+const conflictEditorHelp = ( localize(
+    5409,
     "Use the actions in the editor tool bar to either undo your changes or overwrite the content of the file with your changes."
 ));
 let TextFileSaveErrorHandler = class TextFileSaveErrorHandler extends Disposable {
@@ -99,9 +97,8 @@ let TextFileSaveErrorHandler = class TextFileSaveErrorHandler extends Disposable
                 secondaryActions.push(this.instantiationService.createInstance(DoNotShowResolveConflictLearnMoreAction));
             }
             else {
-                message = ( localizeWithPath(
-                    _moduleId,
-                    1,
+                message = ( localize(
+                    5410,
                     "Failed to save '{0}': The content of the file is newer. Please compare your version with the file contents or overwrite the content of the file with your changes.",
                     basename(resource)
                 ));
@@ -128,44 +125,38 @@ let TextFileSaveErrorHandler = class TextFileSaveErrorHandler extends Disposable
             primaryActions.push(this.instantiationService.createInstance(DiscardModelAction, model));
             if (isWriteLocked) {
                 if (triedToUnlock && canSaveElevated) {
-                    message = isWindows ? ( localizeWithPath(
-                        _moduleId,
-                        2,
+                    message = isWindows ? ( localize(
+                        5411,
                         "Failed to save '{0}': File is read-only. Select 'Overwrite as Admin' to retry as administrator.",
                         basename(resource)
-                    )) : ( localizeWithPath(
-                        _moduleId,
-                        3,
+                    )) : ( localize(
+                        5412,
                         "Failed to save '{0}': File is read-only. Select 'Overwrite as Sudo' to retry as superuser.",
                         basename(resource)
                     ));
                 }
                 else {
-                    message = ( localizeWithPath(
-                        _moduleId,
-                        4,
+                    message = ( localize(
+                        5413,
                         "Failed to save '{0}': File is read-only. Select 'Overwrite' to attempt to make it writeable.",
                         basename(resource)
                     ));
                 }
             }
             else if (canSaveElevated && isPermissionDenied) {
-                message = isWindows ? ( localizeWithPath(
-                    _moduleId,
-                    5,
+                message = isWindows ? ( localize(
+                    5414,
                     "Failed to save '{0}': Insufficient permissions. Select 'Retry as Admin' to retry as administrator.",
                     basename(resource)
-                )) : ( localizeWithPath(
-                    _moduleId,
-                    6,
+                )) : ( localize(
+                    5415,
                     "Failed to save '{0}': Insufficient permissions. Select 'Retry as Sudo' to retry as superuser.",
                     basename(resource)
                 ));
             }
             else {
-                message = ( localizeWithPath(
-                    _moduleId,
-                    7,
+                message = ( localize(
+                    5416,
                     "Failed to save '{0}': {1}",
                     basename(resource),
                     toErrorMessage(error, false)
@@ -205,7 +196,7 @@ function clearPendingResolveSaveConflictMessages() {
 }
 let ResolveConflictLearnMoreAction = class ResolveConflictLearnMoreAction extends Action {
     constructor(openerService) {
-        super('workbench.files.action.resolveConflictLearnMore', ( localizeWithPath(_moduleId, 8, "Learn More")));
+        super('workbench.files.action.resolveConflictLearnMore', ( localize(5417, "Learn More")));
         this.openerService = openerService;
     }
     async run() {
@@ -217,7 +208,7 @@ ResolveConflictLearnMoreAction = ( (__decorate([
 ], ResolveConflictLearnMoreAction)));
 let DoNotShowResolveConflictLearnMoreAction = class DoNotShowResolveConflictLearnMoreAction extends Action {
     constructor(storageService) {
-        super('workbench.files.action.resolveConflictLearnMoreDoNotShowAgain', ( localizeWithPath(_moduleId, 9, "Don't Show Again")));
+        super('workbench.files.action.resolveConflictLearnMoreDoNotShowAgain', ( localize(5418, "Don't Show Again")));
         this.storageService = storageService;
     }
     async run(notification) {
@@ -230,7 +221,7 @@ DoNotShowResolveConflictLearnMoreAction = ( (__decorate([
 ], DoNotShowResolveConflictLearnMoreAction)));
 let ResolveSaveConflictAction = class ResolveSaveConflictAction extends Action {
     constructor(model, editorService, notificationService, instantiationService, productService) {
-        super('workbench.files.action.resolveConflict', ( localizeWithPath(_moduleId, 10, "Compare")));
+        super('workbench.files.action.resolveConflict', ( localize(5419, "Compare")));
         this.model = model;
         this.editorService = editorService;
         this.notificationService = notificationService;
@@ -241,9 +232,8 @@ let ResolveSaveConflictAction = class ResolveSaveConflictAction extends Action {
         if (!this.model.isDisposed()) {
             const resource = this.model.resource;
             const name = basename(resource);
-            const editorLabel = ( localizeWithPath(
-                _moduleId,
-                11,
+            const editorLabel = ( localize(
+                5420,
                 "{0} (in file) ↔ {1} (in {2}) - Resolve save conflict",
                 name,
                 name,
@@ -271,7 +261,7 @@ ResolveSaveConflictAction = ( (__decorate([
 ], ResolveSaveConflictAction)));
 class SaveModelElevatedAction extends Action {
     constructor(model, options, triedToUnlock) {
-        super('workbench.files.action.saveModelElevated', triedToUnlock ? isWindows ? ( localizeWithPath(_moduleId, 12, "Overwrite as Admin...")) : ( localizeWithPath(_moduleId, 13, "Overwrite as Sudo...")) : isWindows ? ( localizeWithPath(_moduleId, 14, "Retry as Admin...")) : ( localizeWithPath(_moduleId, 15, "Retry as Sudo...")));
+        super('workbench.files.action.saveModelElevated', triedToUnlock ? isWindows ? ( localize(5421, "Overwrite as Admin...")) : ( localize(5422, "Overwrite as Sudo...")) : isWindows ? ( localize(5423, "Retry as Admin...")) : ( localize(5424, "Retry as Sudo...")));
         this.model = model;
         this.options = options;
         this.triedToUnlock = triedToUnlock;
@@ -289,7 +279,7 @@ class SaveModelElevatedAction extends Action {
 }
 class RetrySaveModelAction extends Action {
     constructor(model, options) {
-        super('workbench.files.action.saveModel', ( localizeWithPath(_moduleId, 16, "Retry")));
+        super('workbench.files.action.saveModel', ( localize(5425, "Retry")));
         this.model = model;
         this.options = options;
     }
@@ -301,7 +291,7 @@ class RetrySaveModelAction extends Action {
 }
 class DiscardModelAction extends Action {
     constructor(model) {
-        super('workbench.files.action.discardModel', ( localizeWithPath(_moduleId, 17, "Discard")));
+        super('workbench.files.action.discardModel', ( localize(5426, "Discard")));
         this.model = model;
     }
     async run() {
@@ -344,7 +334,7 @@ SaveModelAsAction = ( (__decorate([
 ], SaveModelAsAction)));
 class UnlockModelAction extends Action {
     constructor(model, options) {
-        super('workbench.files.action.unlock', ( localizeWithPath(_moduleId, 18, "Overwrite")));
+        super('workbench.files.action.unlock', ( localize(5427, "Overwrite")));
         this.model = model;
         this.options = options;
     }
@@ -356,7 +346,7 @@ class UnlockModelAction extends Action {
 }
 class SaveModelIgnoreModifiedSinceAction extends Action {
     constructor(model, options) {
-        super('workbench.files.action.saveIgnoreModifiedSince', ( localizeWithPath(_moduleId, 18, "Overwrite")));
+        super('workbench.files.action.saveIgnoreModifiedSince', ( localize(5427, "Overwrite")));
         this.model = model;
         this.options = options;
     }
@@ -368,7 +358,7 @@ class SaveModelIgnoreModifiedSinceAction extends Action {
 }
 let ConfigureSaveConflictAction = class ConfigureSaveConflictAction extends Action {
     constructor(preferencesService) {
-        super('workbench.files.action.configureSaveConflict', ( localizeWithPath(_moduleId, 19, "Configure")));
+        super('workbench.files.action.configureSaveConflict', ( localize(5428, "Configure")));
         this.preferencesService = preferencesService;
     }
     async run() {

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 { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { localize2, localize } from '../../../../nls.js';
 import { mark } from '../../../../base/common/performance.js';
 import { VIEW_ID, VIEWLET_ID, ExplorerViewletVisibleContext } from '../common/files.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
@@ -35,9 +35,8 @@ import { isMacintosh, isWeb } from '../../../../base/common/platform.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { isMouseEvent } from '../../../../base/browser/dom.js';
-const _moduleId = "vs/workbench/contrib/files/browser/explorerViewlet";
-const explorerViewIcon = registerIcon('explorer-view-icon', Codicon.files, ( localizeWithPath(_moduleId, 0, 'View icon of the explorer view.')));
-const openEditorsViewIcon = registerIcon('open-editors-view-icon', Codicon.book, ( localizeWithPath(_moduleId, 1, 'View icon of the open editors view.')));
+const explorerViewIcon = registerIcon('explorer-view-icon', Codicon.files, ( localize(5538, 'View icon of the explorer view.')));
+const openEditorsViewIcon = registerIcon('open-editors-view-icon', Codicon.book, ( localize(5539, 'View icon of the open editors view.')));
 let ExplorerViewletViewsContribution = class ExplorerViewletViewsContribution extends Disposable {
     static { this.ID = 'workbench.contrib.explorerViewletViews'; }
     constructor(workspaceContextService, progressService) {
@@ -119,7 +118,7 @@ let ExplorerViewletViewsContribution = class ExplorerViewletViewsContribution ex
     createExplorerViewDescriptor() {
         return {
             id: VIEW_ID,
-            name: ( localize2WithPath(_moduleId, 2, "Folders")),
+            name: ( localize2(5540, "Folders")),
             containerIcon: explorerViewIcon,
             ctorDescriptor: ( (new SyncDescriptor(ExplorerView))),
             order: 1,
@@ -214,7 +213,7 @@ ExplorerViewPaneContainer = ( (__decorate([
 const viewContainerRegistry = ( (Registry.as(Extensions.ViewContainersRegistry)));
 const VIEW_CONTAINER = viewContainerRegistry.registerViewContainer({
     id: VIEWLET_ID,
-    title: ( localize2WithPath(_moduleId, 3, "Explorer")),
+    title: ( localize2(5541, "Explorer")),
     ctorDescriptor: ( (new SyncDescriptor(ExplorerViewPaneContainer))),
     storageId: 'workbench.explorer.views.state',
     icon: explorerViewIcon,
@@ -223,15 +222,15 @@ const VIEW_CONTAINER = viewContainerRegistry.registerViewContainer({
     order: 0,
     openCommandActionDescriptor: {
         id: VIEWLET_ID,
-        title: ( localize2WithPath(_moduleId, 3, "Explorer")),
-        mnemonicTitle: ( localizeWithPath(_moduleId, 4, "&&Explorer")),
+        title: ( localize2(5541, "Explorer")),
+        mnemonicTitle: ( localize(5542, "&&Explorer")),
         keybindings: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.KeyE },
         order: 0
     },
 }, ViewContainerLocation.Sidebar, { isDefault: true });
-const openFolder = ( localizeWithPath(_moduleId, 5, "Open Folder"));
-const addAFolder = ( localizeWithPath(_moduleId, 6, "add a folder"));
-const openRecent = ( localizeWithPath(_moduleId, 7, "Open Recent"));
+const openFolder = ( localize(5543, "Open Folder"));
+const addAFolder = ( localize(5544, "add a folder"));
+const openRecent = ( localize(5545, "Open Recent"));
 const addRootFolderButton = `[${openFolder}](command:${AddRootFolderAction.ID})`;
 const addAFolderButton = `[${addAFolder}](command:${AddRootFolderAction.ID})`;
 const openFolderButton = `[${openFolder}](command:${(isMacintosh && !isWeb) ? OpenFileFolderAction.ID : OpenFolderAction.ID})`;
@@ -239,9 +238,8 @@ const openFolderViaWorkspaceButton = `[${openFolder}](command:${OpenFolderViaWor
 const openRecentButton = `[${openRecent}](command:${OpenRecentAction.ID})`;
 const viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
 viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
-    content: ( localizeWithPath(
-        _moduleId,
-        8,
+    content: ( localize(
+        5546,
         "You have not yet added a folder to the workspace.\n{0}",
         addRootFolderButton
     )),
@@ -252,9 +250,8 @@ viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
     order: 1
 });
 viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
-    content: ( localizeWithPath(
-        _moduleId,
-        9,
+    content: ( localize(
+        5547,
         "You have not yet opened a folder.\n{0}\n{1}",
         openFolderViaWorkspaceButton,
         openRecentButton
@@ -266,7 +263,7 @@ viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
     order: 1
 });
 viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
-    content: ( localizeWithPath(_moduleId, 10, "Connected to remote.\n{0}", openFolderButton)),
+    content: ( localize(5548, "Connected to remote.\n{0}", openFolderButton)),
     when: ( (ContextKeyExpr.and(
     (WorkbenchStateContext.notEqualsTo('workspace')),
     (RemoteNameContext.notEqualsTo('')),
@@ -275,9 +272,8 @@ viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
     order: 1
 });
 viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
-    content: ( localizeWithPath(
-        _moduleId,
-        11,
+    content: ( localize(
+        5549,
         "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
@@ -296,7 +292,7 @@ viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
     order: 1
 });
 viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
-    content: ( localizeWithPath(_moduleId, 12, "You have not yet opened a folder.\n{0}", openFolderButton)),
+    content: ( localize(5550, "You have not yet opened a folder.\n{0}", openFolderButton)),
     when: ( (ContextKeyExpr.and(
     ( (ContextKeyExpr.has('editorIsOpen')))?.negate(),  (ContextKeyExpr.or(
     (ContextKeyExpr.and(