@codingame/monaco-vscode-interactive-service-override 7.1.0 → 8.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-interactive-service-override",
-  "version": "7.1.0",
+  "version": "8.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@8.0.0"
   }
 }

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

@@ -14,7 +14,7 @@ import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
 import { peekViewBorder } from 'vscode/vscode/vs/editor/contrib/peekView/browser/peekView';
 import { Context } from 'vscode/vscode/vs/editor/contrib/suggest/browser/suggest';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -68,8 +68,7 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IWorkingCopyEditorService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService.service';
 
-const _moduleId = "vs/workbench/contrib/interactive/browser/interactive.contribution";
-const interactiveWindowCategory = ( localize2WithPath(_moduleId, 0, "Interactive Window"));
+const interactiveWindowCategory = ( localize2(1871, "Interactive Window"));
 ( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(InteractiveEditor, INTERACTIVE_WINDOW_EDITOR_ID, 'Interactive Window'), [
     ( (new SyncDescriptor(InteractiveEditorInput)))
 ]);
@@ -258,11 +257,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: '_interactive.open',
-            title: ( localize2WithPath(_moduleId, 1, 'Open Interactive Window')),
+            title: ( localize2(1872, 'Open Interactive Window')),
             f1: false,
             category: interactiveWindowCategory,
             metadata: {
-                description: ( localizeWithPath(_moduleId, 1, 'Open Interactive Window')),
+                description: ( localize(1872, 'Open Interactive Window')),
                 args: [
                     {
                         name: 'showOptions',
@@ -366,7 +365,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.configure',
-            title: ( localize2WithPath(_moduleId, 2, 'Configure input box behavior')),
+            title: ( localize2(1873, 'Configure input box behavior')),
             category: interactiveWindowCategory,
             f1: false,
             icon: configIcon,
@@ -383,7 +382,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.execute',
-            title: ( localize2WithPath(_moduleId, 3, 'Execute Code')),
+            title: ( localize2(1874, 'Execute Code')),
             category: interactiveWindowCategory,
             keybinding: [{
                     when: ( (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'))),
@@ -504,7 +503,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.input.clear',
-            title: ( localize2WithPath(_moduleId, 4, 'Clear the interactive window input editor contents')),
+            title: ( localize2(1875, 'Clear the interactive window input editor contents')),
             category: interactiveWindowCategory,
             f1: false
         });
@@ -526,7 +525,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.history.previous',
-            title: ( localize2WithPath(_moduleId, 5, 'Previous value in history')),
+            title: ( localize2(1876, 'Previous value in history')),
             category: interactiveWindowCategory,
             f1: false,
             keybinding: [{
@@ -570,7 +569,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.history.next',
-            title: ( localize2WithPath(_moduleId, 6, 'Next value in history')),
+            title: ( localize2(1877, 'Next value in history')),
             category: interactiveWindowCategory,
             f1: false,
             keybinding: [{
@@ -614,7 +613,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.scrollToTop',
-            title: ( localizeWithPath(_moduleId, 7, 'Scroll to Top')),
+            title: ( localize(1878, 'Scroll to Top')),
             keybinding: {
                 when: ( (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'))),
                 primary: KeyMod.CtrlCmd | KeyCode.Home,
@@ -639,7 +638,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.scrollToBottom',
-            title: ( localizeWithPath(_moduleId, 8, 'Scroll to Bottom')),
+            title: ( localize(1879, 'Scroll to Bottom')),
             keybinding: {
                 when: ( (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'))),
                 primary: KeyMod.CtrlCmd | KeyCode.End,
@@ -665,7 +664,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.input.focus',
-            title: ( localize2WithPath(_moduleId, 9, 'Focus Input Editor')),
+            title: ( localize2(1880, 'Focus Input Editor')),
             category: interactiveWindowCategory,
             menu: {
                 id: MenuId.CommandPalette,
@@ -699,7 +698,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.history.focus',
-            title: ( localize2WithPath(_moduleId, 10, 'Focus History')),
+            title: ( localize2(1881, 'Focus History')),
             category: interactiveWindowCategory,
             menu: {
                 id: MenuId.CommandPalette,
@@ -721,9 +720,8 @@ registerColor('interactive.activeCodeBorder', {
     light: ifDefinedThenElse(peekViewBorder, peekViewBorder, '#007acc'),
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localizeWithPath(
-    _moduleId,
-    11,
+}, ( localize(
+    1882,
     'The border color for the current interactive code cell when the editor has focus.'
 )));
 registerColor('interactive.inactiveCodeBorder', {
@@ -731,9 +729,8 @@ registerColor('interactive.inactiveCodeBorder', {
     light: ifDefinedThenElse(listInactiveSelectionBackground, listInactiveSelectionBackground, '#E4E6F1'),
     hcDark: PANEL_BORDER,
     hcLight: PANEL_BORDER
-}, ( localizeWithPath(
-    _moduleId,
-    12,
+}, ( localize(
+    1883,
     'The border color for the current interactive code cell when the editor does not have focus.'
 )));
 ( (Registry.as(Extensions.Configuration))).registerConfiguration({
@@ -744,27 +741,24 @@ registerColor('interactive.inactiveCodeBorder', {
         [InteractiveWindowSetting.interactiveWindowAlwaysScrollOnNewCell]: {
             type: 'boolean',
             default: true,
-            markdownDescription: ( localizeWithPath(
-                _moduleId,
-                13,
+            markdownDescription: ( localize(
+                1884,
                 "Automatically scroll the interactive window to show the output of the last statement executed. If this value is false, the window will only scroll if the last cell was already the one scrolled to."
             ))
         },
         [NotebookSetting.InteractiveWindowPromptToSave]: {
             type: 'boolean',
             default: false,
-            markdownDescription: ( localizeWithPath(
-                _moduleId,
-                14,
+            markdownDescription: ( localize(
+                1885,
                 "Prompt to save the interactive window when it is closed. Only new interactive windows will be affected by this setting change."
             ))
         },
         [InteractiveWindowSetting.executeWithShiftEnter]: {
             type: 'boolean',
             default: false,
-            markdownDescription: ( localizeWithPath(
-                _moduleId,
-                15,
+            markdownDescription: ( localize(
+                1886,
                 "Execute the Interactive Window (REPL) input box with shift+enter, so that enter can be used to create a newline."
             )),
             tags: ['replExecute']
@@ -772,9 +766,8 @@ registerColor('interactive.inactiveCodeBorder', {
         [InteractiveWindowSetting.showExecutionHint]: {
             type: 'boolean',
             default: true,
-            markdownDescription: ( localizeWithPath(
-                _moduleId,
-                16,
+            markdownDescription: ( localize(
+                1887,
                 "Display a hint in the Interactive Window (REPL) input box to indicate how to execute code."
             )),
             tags: ['replExecute']

package/vscode/src/vs/workbench/contrib/interactive/browser/replInputHintContentWidget.js

@@ -7,14 +7,13 @@ import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { OS } from 'vscode/vscode/vs/base/common/platform';
 import { ContentWidgetPositionPreference } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { EditorOption } from 'vscode/vscode/vs/editor/common/config/editorOptions';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { InteractiveWindowSetting } from './interactiveCommon.js';
 
 var ReplInputHintContentWidget_1;
-const _moduleId = "vs/workbench/contrib/interactive/browser/replInputHintContentWidget";
 let ReplInputHintContentWidget = class ReplInputHintContentWidget extends Disposable {
     static { ReplInputHintContentWidget_1 = this; }
     static { this.ID = 'replInput.widget.emptyHint'; }
@@ -77,7 +76,7 @@ let ReplInputHintContentWidget = class ReplInputHintContentWidget extends Dispos
         const keybinding = this.getKeybinding();
         const keybindingHintLabel = keybinding?.getLabel();
         if (keybinding && keybindingHintLabel) {
-            const actionPart = ( localizeWithPath(_moduleId, 0, 'Press {0} to execute. ', keybindingHintLabel));
+            const actionPart = ( localize(10095, 'Press {0} to execute. ', keybindingHintLabel));
             const [before, after] = ( (actionPart.split(keybindingHintLabel).map((fragment) => {
                 const hintPart = $('span', undefined, fragment);
                 hintPart.style.fontStyle = 'italic';
@@ -90,9 +89,8 @@ let ReplInputHintContentWidget = class ReplInputHintContentWidget extends Dispos
             label.element.style.display = 'inline';
             hintElement.appendChild(after);
             this.domNode.append(hintElement);
-            this.ariaLabel = actionPart.concat(( localizeWithPath(
-                _moduleId,
-                1,
+            this.ariaLabel = actionPart.concat(( localize(
+                10096,
                 ' Toggle {0} in settings to disable this hint.',
                 AccessibilityVerbositySettingId.ReplInputHint
             )));

package/vscode/src/vs/workbench/contrib/replNotebook/browser/repl.contribution.js

@@ -16,7 +16,7 @@ import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extension
 import { IWorkingCopyEditorService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService.service';
 import { extname, isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2 } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService.service';
@@ -31,7 +31,6 @@ import { IInteractiveHistoryService } from 'vscode/vscode/vs/workbench/contrib/i
 import { INotebookEditorService } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 
-const _moduleId = "vs/workbench/contrib/replNotebook/browser/repl.contribution";
 class ReplEditorSerializer {
     canSerialize(input) {
         return input.typeId === ReplEditorInput.ID;
@@ -139,7 +138,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'repl.newRepl',
-            title: ( localize2WithPath(_moduleId, 0, 'New REPL Editor')),
+            title: ( localize2(5620, 'New REPL Editor')),
             category: 'Create',
         });
     }

package/vscode/src/vs/workbench/contrib/replNotebook/browser/replEditor.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/interactive.css.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { append, $, createStyleSheet, Dimension } from 'vscode/vscode/vs/base/browser/dom';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { DisposableStore, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -64,7 +64,6 @@ import { deepClone } from 'vscode/vscode/vs/base/common/objects';
 import { HoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/hoverController';
 import { ReplEditorInput } from './replEditorInput.js';
 
-const _moduleId = "vs/workbench/contrib/replNotebook/browser/replEditor";
 const DECORATION_KEY = 'interactiveInputDecoration';
 const INTERACTIVE_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'InteractiveEditorViewState';
 const INPUT_CELL_VERTICAL_PADDING = 8;
@@ -508,14 +507,8 @@ let ReplEditor = class ReplEditor extends EditorPane {
             if (languageId !== 'plaintext') {
                 const keybinding = this._keybindingService.lookupKeybinding(EXECUTE_REPL_COMMAND_ID, this._contextKeyService)?.getLabel();
                 const text = keybinding ?
-                    ( localizeWithPath(
-                        _moduleId,
-                        0,
-                        "Type '{0}' code here and press {1} to run",
-                        languageId,
-                        keybinding
-                    )) :
-                    ( localizeWithPath(_moduleId, 1, "Type '{0}' code here and click run", languageId));
+                    ( localize(5621, "Type '{0}' code here and press {1} to run", languageId, keybinding)) :
+                    ( localize(5622, "Type '{0}' code here and click run", languageId));
                 decorations.push({
                     range: {
                         startLineNumber: 0,