@codingame/monaco-vscode-api 8.0.4 → 9.0.0

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

@@ -34,7 +34,7 @@ const CONFLICT_RESOLUTION_CONTEXT = 'saveConflictResolutionContext';
 const CONFLICT_RESOLUTION_SCHEME = 'conflictResolution';
 const LEARN_MORE_DIRTY_WRITE_IGNORE_KEY = 'learnMoreDirtyWriteError';
 const conflictEditorHelp = ( localize(
-    5409,
+    5442,
     "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 {
@@ -98,7 +98,7 @@ let TextFileSaveErrorHandler = class TextFileSaveErrorHandler extends Disposable
             }
             else {
                 message = ( localize(
-                    5410,
+                    5443,
                     "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)
                 ));
@@ -122,22 +122,22 @@ let TextFileSaveErrorHandler = class TextFileSaveErrorHandler extends Disposable
                 primaryActions.push(this.instantiationService.createInstance(RetrySaveModelAction, model, options));
             }
             primaryActions.push(this.instantiationService.createInstance(SaveModelAsAction, model));
-            primaryActions.push(this.instantiationService.createInstance(DiscardModelAction, model));
+            primaryActions.push(this.instantiationService.createInstance(RevertModelAction, model));
             if (isWriteLocked) {
                 if (triedToUnlock && canSaveElevated) {
                     message = isWindows ? ( localize(
-                        5411,
+                        5444,
                         "Failed to save '{0}': File is read-only. Select 'Overwrite as Admin' to retry as administrator.",
                         basename(resource)
                     )) : ( localize(
-                        5412,
+                        5445,
                         "Failed to save '{0}': File is read-only. Select 'Overwrite as Sudo' to retry as superuser.",
                         basename(resource)
                     ));
                 }
                 else {
                     message = ( localize(
-                        5413,
+                        5446,
                         "Failed to save '{0}': File is read-only. Select 'Overwrite' to attempt to make it writeable.",
                         basename(resource)
                     ));
@@ -145,18 +145,18 @@ let TextFileSaveErrorHandler = class TextFileSaveErrorHandler extends Disposable
             }
             else if (canSaveElevated && isPermissionDenied) {
                 message = isWindows ? ( localize(
-                    5414,
+                    5447,
                     "Failed to save '{0}': Insufficient permissions. Select 'Retry as Admin' to retry as administrator.",
                     basename(resource)
                 )) : ( localize(
-                    5415,
+                    5448,
                     "Failed to save '{0}': Insufficient permissions. Select 'Retry as Sudo' to retry as superuser.",
                     basename(resource)
                 ));
             }
             else {
                 message = ( localize(
-                    5416,
+                    5449,
                     "Failed to save '{0}': {1}",
                     basename(resource),
                     toErrorMessage(error, false)
@@ -196,7 +196,7 @@ function clearPendingResolveSaveConflictMessages() {
 }
 let ResolveConflictLearnMoreAction = class ResolveConflictLearnMoreAction extends Action {
     constructor(openerService) {
-        super('workbench.files.action.resolveConflictLearnMore', ( localize(5417, "Learn More")));
+        super('workbench.files.action.resolveConflictLearnMore', ( localize(5450, "Learn More")));
         this.openerService = openerService;
     }
     async run() {
@@ -208,7 +208,7 @@ ResolveConflictLearnMoreAction = ( (__decorate([
 ], ResolveConflictLearnMoreAction)));
 let DoNotShowResolveConflictLearnMoreAction = class DoNotShowResolveConflictLearnMoreAction extends Action {
     constructor(storageService) {
-        super('workbench.files.action.resolveConflictLearnMoreDoNotShowAgain', ( localize(5418, "Don't Show Again")));
+        super('workbench.files.action.resolveConflictLearnMoreDoNotShowAgain', ( localize(5451, "Don't Show Again")));
         this.storageService = storageService;
     }
     async run(notification) {
@@ -221,7 +221,7 @@ DoNotShowResolveConflictLearnMoreAction = ( (__decorate([
 ], DoNotShowResolveConflictLearnMoreAction)));
 let ResolveSaveConflictAction = class ResolveSaveConflictAction extends Action {
     constructor(model, editorService, notificationService, instantiationService, productService) {
-        super('workbench.files.action.resolveConflict', ( localize(5419, "Compare")));
+        super('workbench.files.action.resolveConflict', ( localize(5452, "Compare")));
         this.model = model;
         this.editorService = editorService;
         this.notificationService = notificationService;
@@ -233,7 +233,7 @@ let ResolveSaveConflictAction = class ResolveSaveConflictAction extends Action {
             const resource = this.model.resource;
             const name = basename(resource);
             const editorLabel = ( localize(
-                5420,
+                5453,
                 "{0} (in file) ↔ {1} (in {2}) - Resolve save conflict",
                 name,
                 name,
@@ -261,7 +261,7 @@ ResolveSaveConflictAction = ( (__decorate([
 ], ResolveSaveConflictAction)));
 class SaveModelElevatedAction extends Action {
     constructor(model, options, triedToUnlock) {
-        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...")));
+        super('workbench.files.action.saveModelElevated', triedToUnlock ? isWindows ? ( localize(5454, "Overwrite as Admin...")) : ( localize(5455, "Overwrite as Sudo...")) : isWindows ? ( localize(5456, "Retry as Admin...")) : ( localize(5457, "Retry as Sudo...")));
         this.model = model;
         this.options = options;
         this.triedToUnlock = triedToUnlock;
@@ -279,7 +279,7 @@ class SaveModelElevatedAction extends Action {
 }
 class RetrySaveModelAction extends Action {
     constructor(model, options) {
-        super('workbench.files.action.saveModel', ( localize(5425, "Retry")));
+        super('workbench.files.action.saveModel', ( localize(5458, "Retry")));
         this.model = model;
         this.options = options;
     }
@@ -289,9 +289,9 @@ class RetrySaveModelAction extends Action {
         }
     }
 }
-class DiscardModelAction extends Action {
+class RevertModelAction extends Action {
     constructor(model) {
-        super('workbench.files.action.discardModel', ( localize(5426, "Discard")));
+        super('workbench.files.action.revertModel', ( localize(5459, "Revert")));
         this.model = model;
     }
     async run() {
@@ -334,7 +334,7 @@ SaveModelAsAction = ( (__decorate([
 ], SaveModelAsAction)));
 class UnlockModelAction extends Action {
     constructor(model, options) {
-        super('workbench.files.action.unlock', ( localize(5427, "Overwrite")));
+        super('workbench.files.action.unlock', ( localize(5460, "Overwrite")));
         this.model = model;
         this.options = options;
     }
@@ -346,7 +346,7 @@ class UnlockModelAction extends Action {
 }
 class SaveModelIgnoreModifiedSinceAction extends Action {
     constructor(model, options) {
-        super('workbench.files.action.saveIgnoreModifiedSince', ( localize(5427, "Overwrite")));
+        super('workbench.files.action.saveIgnoreModifiedSince', ( localize(5460, "Overwrite")));
         this.model = model;
         this.options = options;
     }
@@ -358,7 +358,7 @@ class SaveModelIgnoreModifiedSinceAction extends Action {
 }
 let ConfigureSaveConflictAction = class ConfigureSaveConflictAction extends Action {
     constructor(preferencesService) {
-        super('workbench.files.action.configureSaveConflict', ( localize(5428, "Configure")));
+        super('workbench.files.action.configureSaveConflict', ( localize(5461, "Configure")));
         this.preferencesService = preferencesService;
     }
     async run() {

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

@@ -35,8 +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 explorerViewIcon = registerIcon('explorer-view-icon', Codicon.files, ( localize(5522, 'View icon of the explorer view.')));
-const openEditorsViewIcon = registerIcon('open-editors-view-icon', Codicon.book, ( localize(5523, 'View icon of the open editors view.')));
+const explorerViewIcon = registerIcon('explorer-view-icon', Codicon.files, ( localize(5482, 'View icon of the explorer view.')));
+const openEditorsViewIcon = registerIcon('open-editors-view-icon', Codicon.book, ( localize(5483, 'View icon of the open editors view.')));
 let ExplorerViewletViewsContribution = class ExplorerViewletViewsContribution extends Disposable {
     static { this.ID = 'workbench.contrib.explorerViewletViews'; }
     constructor(workspaceContextService, progressService) {
@@ -118,7 +118,7 @@ let ExplorerViewletViewsContribution = class ExplorerViewletViewsContribution ex
     createExplorerViewDescriptor() {
         return {
             id: VIEW_ID,
-            name: ( localize2(5524, "Folders")),
+            name: ( localize2(5484, "Folders")),
             containerIcon: explorerViewIcon,
             ctorDescriptor: ( (new SyncDescriptor(ExplorerView))),
             order: 1,
@@ -213,7 +213,7 @@ ExplorerViewPaneContainer = ( (__decorate([
 const viewContainerRegistry = ( (Registry.as(Extensions.ViewContainersRegistry)));
 const VIEW_CONTAINER = viewContainerRegistry.registerViewContainer({
     id: VIEWLET_ID,
-    title: ( localize2(5525, "Explorer")),
+    title: ( localize2(5485, "Explorer")),
     ctorDescriptor: ( (new SyncDescriptor(ExplorerViewPaneContainer))),
     storageId: 'workbench.explorer.views.state',
     icon: explorerViewIcon,
@@ -222,15 +222,15 @@ const VIEW_CONTAINER = viewContainerRegistry.registerViewContainer({
     order: 0,
     openCommandActionDescriptor: {
         id: VIEWLET_ID,
-        title: ( localize2(5525, "Explorer")),
-        mnemonicTitle: ( localize(5526, "&&Explorer")),
+        title: ( localize2(5485, "Explorer")),
+        mnemonicTitle: ( localize(5486, "&&Explorer")),
         keybindings: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.KeyE },
         order: 0
     },
 }, ViewContainerLocation.Sidebar, { isDefault: true });
-const openFolder = ( localize(5527, "Open Folder"));
-const addAFolder = ( localize(5528, "add a folder"));
-const openRecent = ( localize(5529, "Open Recent"));
+const openFolder = ( localize(5487, "Open Folder"));
+const addAFolder = ( localize(5488, "add a folder"));
+const openRecent = ( localize(5489, "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,7 +239,7 @@ const openRecentButton = `[${openRecent}](command:${OpenRecentAction.ID})`;
 const viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
 viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
     content: ( localize(
-        5530,
+        5490,
         "You have not yet added a folder to the workspace.\n{0}",
         addRootFolderButton
     )),
@@ -251,7 +251,7 @@ viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
 });
 viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
     content: ( localize(
-        5531,
+        5491,
         "You have not yet opened a folder.\n{0}\n{1}",
         openFolderViaWorkspaceButton,
         openRecentButton
@@ -263,7 +263,7 @@ viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
     order: 1
 });
 viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
-    content: ( localize(5532, "Connected to remote.\n{0}", openFolderButton)),
+    content: ( localize(5492, "Connected to remote.\n{0}", openFolderButton)),
     when: ( (ContextKeyExpr.and(
     (WorkbenchStateContext.notEqualsTo('workspace')),
     (RemoteNameContext.notEqualsTo('')),
@@ -273,7 +273,7 @@ viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
 });
 viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
     content: ( localize(
-        5533,
+        5493,
         "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
@@ -292,7 +292,7 @@ viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
     order: 1
 });
 viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
-    content: ( localize(5534, "You have not yet opened a folder.\n{0}", openFolderButton)),
+    content: ( localize(5494, "You have not yet opened a folder.\n{0}", openFolderButton)),
     when: ( (ContextKeyExpr.and(
     ( (ContextKeyExpr.has('editorIsOpen')))?.negate(),  (ContextKeyExpr.or(
     (ContextKeyExpr.and(