@codingame/monaco-vscode-notebook-service-override 7.1.0 → 7.1.1

package/vscode/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityHelp.js

@@ -1,11 +1,10 @@
 import { NOTEBOOK_IS_ACTIVE_EDITOR } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { AccessibleViewType, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
+import { localize } from 'vscode/vscode/vs/nls';
+import { AccessibleViewType, AccessibleContentProvider, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
 import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/notebookAccessibilityHelp";
 class NotebookAccessibilityHelp {
     constructor() {
         this.priority = 105;
@@ -17,78 +16,67 @@ class NotebookAccessibilityHelp {
         const activeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor()
             || accessor.get(ICodeEditorService).getFocusedCodeEditor()
             || accessor.get(IEditorService).activeEditorPane;
-        if (activeEditor) {
-            return runAccessibilityHelpAction(accessor, activeEditor);
+        if (!activeEditor) {
+            return;
         }
-        return;
+        return getAccessibilityHelpProvider(accessor, activeEditor);
     }
-    dispose() { }
 }
 function getAccessibilityHelpText() {
     return [
-        ( localizeWithPath(
-            _moduleId,
-            0,
+        ( localize(
+            8056,
             'The notebook view is a collection of code and markdown cells. Code cells can be executed and will produce output directly below the cell.'
         )),
-        ( localizeWithPath(
-            _moduleId,
-            1,
+        ( localize(
+            8057,
             'The Edit Cell command<keybinding:notebook.cell.edit> will focus on the cell input.'
         )),
-        ( localizeWithPath(
-            _moduleId,
-            2,
+        ( localize(
+            8058,
             'The Quit Edit command<keybinding:notebook.cell.quitEdit> will set focus on the cell container. The default (Escape) key may need to be pressed twice first exit the virtual cursor if active.'
         )),
-        ( localizeWithPath(
-            _moduleId,
-            3,
+        ( localize(
+            8059,
             'The Focus Output command<keybinding:notebook.cell.focusInOutput> will set focus in the cell\'s output.'
         )),
-        ( localizeWithPath(
-            _moduleId,
-            4,
+        ( localize(
+            8060,
             'The Focus Next Cell Editor command<keybinding:notebook.focusNextEditor> will set focus in the next cell\'s editor.'
         )),
-        ( localizeWithPath(
-            _moduleId,
-            5,
+        ( localize(
+            8061,
             'The Focus Previous Cell Editor command<keybinding:notebook.focusPreviousEditor> will set focus in the previous cell\'s editor.'
         )),
-        ( localizeWithPath(
-            _moduleId,
-            6,
+        ( localize(
+            8062,
             'The up and down arrows will also move focus between cells while focused on the outer cell container.'
         )),
-        ( localizeWithPath(
-            _moduleId,
-            7,
+        ( localize(
+            8063,
             'The Execute Cell command<keybinding:notebook.cell.executeAndFocusContainer> executes the cell that currently has focus.'
         )),
-        ( localizeWithPath(
-            _moduleId,
-            8,
-            'The Insert Cell Above/Below commands will create new empty code cells'
+        ( localize(
+            8064,
+            'The Insert Cell Above/Below commands will create new empty code cells.'
         )),
-        ( localizeWithPath(
-            _moduleId,
-            9,
+        ( localize(
+            8065,
             'The Change Cell to Code/Markdown commands are used to switch between cell types.'
         ))
-    ].join('\n\n');
+    ].join('\n');
 }
-function runAccessibilityHelpAction(accessor, editor) {
+function getAccessibilityHelpProvider(accessor, editor) {
     const helpText = getAccessibilityHelpText();
-    return {
-        id: AccessibleViewProviderId.Notebook,
-        verbositySettingKey: AccessibilityVerbositySettingId.Notebook,
-        provideContent: () => helpText,
-        onClose: () => {
-            editor.focus();
-        },
-        options: { type: AccessibleViewType.Help }
-    };
+    return (
+         (new AccessibleContentProvider(
+            AccessibleViewProviderId.Notebook,
+            { type: AccessibleViewType.Help },
+            () => helpText,
+            () => editor.focus(),
+            AccessibilityVerbositySettingId.Notebook
+        ))
+    );
 }
 
-export { NotebookAccessibilityHelp, getAccessibilityHelpText, runAccessibilityHelpAction };
+export { NotebookAccessibilityHelp, getAccessibilityHelpProvider, getAccessibilityHelpText };

package/vscode/src/vs/workbench/contrib/notebook/browser/notebookAccessibleView.js

@@ -1,4 +1,4 @@
-import { AccessibleViewType, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
+import { AccessibleViewType, AccessibleContentProvider, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
@@ -14,11 +14,10 @@ class NotebookAccessibleView {
     }
     getProvider(accessor) {
         const editorService = accessor.get(IEditorService);
-        return showAccessibleOutput(editorService);
+        return getAccessibleOutputProvider(editorService);
     }
-    dispose() { }
 }
-function showAccessibleOutput(editorService) {
+function getAccessibleOutputProvider(editorService) {
     const activePane = editorService.activeEditorPane;
     const notebookEditor = getNotebookEditorFromEditorPane(activePane);
     const notebookViewModel = notebookEditor?.getViewModel();
@@ -58,16 +57,16 @@ function showAccessibleOutput(editorService) {
     if (!outputContent) {
         return;
     }
-    return {
-        id: AccessibleViewProviderId.Notebook,
-        verbositySettingKey: AccessibilityVerbositySettingId.Notebook,
-        provideContent() { return outputContent; },
-        onClose() {
+    return ( new AccessibleContentProvider(
+        AccessibleViewProviderId.Notebook,
+        { type: AccessibleViewType.View },
+        () => { return outputContent; },
+        () => {
             notebookEditor?.setFocus(selections[0]);
             activePane?.focus();
         },
-        options: { type: AccessibleViewType.View }
-    };
+        AccessibilityVerbositySettingId.Notebook
+    ));
 }
 
-export { NotebookAccessibleView, showAccessibleOutput };
+export { NotebookAccessibleView, getAccessibleOutputProvider };

package/vscode/src/vs/workbench/contrib/notebook/browser/notebookExtensionPoint.js

@@ -1,4 +1,4 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
 import { NotebookEditorPriority } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -6,7 +6,6 @@ import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/d
 import { Extensions } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/notebookExtensionPoint";
 const NotebookEditorContribution = ( (Object.freeze({
     type: 'type',
     displayName: 'displayName',
@@ -28,7 +27,7 @@ const NotebookPreloadContribution = ( (Object.freeze({
     localResourceRoots: 'localResourceRoots',
 })));
 const notebookProviderContribution = {
-    description: ( localizeWithPath(_moduleId, 0, 'Contributes notebook document provider.')),
+    description: ( localize(7598, 'Contributes notebook document provider.')),
     type: 'array',
     defaultSnippets: [{ body: [{ type: '', displayName: '', 'selector': [{ 'filenamePattern': '' }] }] }],
     items: {
@@ -41,34 +40,33 @@ const notebookProviderContribution = {
         properties: {
             [NotebookEditorContribution.type]: {
                 type: 'string',
-                description: ( localizeWithPath(_moduleId, 1, 'Type of the notebook.')),
+                description: ( localize(7599, 'Type of the notebook.')),
             },
             [NotebookEditorContribution.displayName]: {
                 type: 'string',
-                description: ( localizeWithPath(_moduleId, 2, 'Human readable name of the notebook.')),
+                description: ( localize(7600, 'Human readable name of the notebook.')),
             },
             [NotebookEditorContribution.selector]: {
                 type: 'array',
-                description: ( localizeWithPath(_moduleId, 3, 'Set of globs that the notebook is for.')),
+                description: ( localize(7601, 'Set of globs that the notebook is for.')),
                 items: {
                     type: 'object',
                     properties: {
                         filenamePattern: {
                             type: 'string',
-                            description: ( localizeWithPath(_moduleId, 4, 'Glob that the notebook is enabled for.')),
+                            description: ( localize(7602, 'Glob that the notebook is enabled for.')),
                         },
                         excludeFileNamePattern: {
                             type: 'string',
-                            description: ( localizeWithPath(_moduleId, 5, 'Glob that the notebook is disabled for.'))
+                            description: ( localize(7603, 'Glob that the notebook is disabled for.'))
                         }
                     }
                 }
             },
             [NotebookEditorContribution.priority]: {
                 type: 'string',
-                markdownDeprecationMessage: ( localizeWithPath(
-                    _moduleId,
-                    6,
+                markdownDeprecationMessage: ( localize(
+                    7604,
                     'Controls if the custom editor is enabled automatically when the user opens a file. This may be overridden by users using the `workbench.editorAssociations` setting.'
                 )),
                 enum: [
@@ -76,14 +74,12 @@ const notebookProviderContribution = {
                     NotebookEditorPriority.option,
                 ],
                 markdownEnumDescriptions: [
-                    ( localizeWithPath(
-                        _moduleId,
-                        7,
+                    ( localize(
+                        7605,
                         'The editor is automatically used when the user opens a resource, provided that no other default custom editors are registered for that resource.'
                     )),
-                    ( localizeWithPath(
-                        _moduleId,
-                        8,
+                    ( localize(
+                        7606,
                         'The editor is not automatically used when the user opens a resource, but a user can switch to the editor using the `Reopen With` command.'
                     )),
                 ],
@@ -94,7 +90,7 @@ const notebookProviderContribution = {
 };
 const defaultRendererSnippet = ( (Object.freeze({ id: '', displayName: '', mimeTypes: [''], entrypoint: '' })));
 const notebookRendererContribution = {
-    description: ( localizeWithPath(_moduleId, 9, 'Contributes notebook output renderer provider.')),
+    description: ( localize(7607, 'Contributes notebook output renderer provider.')),
     type: 'array',
     defaultSnippets: [{ body: [defaultRendererSnippet] }],
     items: {
@@ -109,19 +105,18 @@ const notebookRendererContribution = {
                 properties: {
                     [NotebookRendererContribution.id]: {
                         type: 'string',
-                        description: ( localizeWithPath(_moduleId, 10, 'Unique identifier of the notebook output renderer.')),
+                        description: ( localize(7608, 'Unique identifier of the notebook output renderer.')),
                     },
                     [NotebookRendererContribution.displayName]: {
                         type: 'string',
-                        description: ( localizeWithPath(_moduleId, 11, 'Human readable name of the notebook output renderer.')),
+                        description: ( localize(7609, 'Human readable name of the notebook output renderer.')),
                     },
                     [NotebookRendererContribution.hardDependencies]: {
                         type: 'array',
                         uniqueItems: true,
                         items: { type: 'string' },
-                        markdownDescription: ( localizeWithPath(
-                            _moduleId,
-                            12,
+                        markdownDescription: ( localize(
+                            7610,
                             'List of kernel dependencies the renderer requires. If any of the dependencies are present in the `NotebookKernel.preloads`, the renderer can be used.'
                         )),
                     },
@@ -129,9 +124,8 @@ const notebookRendererContribution = {
                         type: 'array',
                         uniqueItems: true,
                         items: { type: 'string' },
-                        markdownDescription: ( localizeWithPath(
-                            _moduleId,
-                            13,
+                        markdownDescription: ( localize(
+                            7611,
                             'List of soft kernel dependencies the renderer can make use of. If any of the dependencies are present in the `NotebookKernel.preloads`, the renderer will be preferred over renderers that don\'t interact with the kernel.'
                         )),
                     },
@@ -143,21 +137,18 @@ const notebookRendererContribution = {
                             'never',
                         ],
                         enumDescriptions: [
-                            ( localizeWithPath(
-                                _moduleId,
-                                14,
+                            ( localize(
+                                7612,
                                 'Messaging is required. The renderer will only be used when it\'s part of an extension that can be run in an extension host.'
                             )),
-                            ( localizeWithPath(
-                                _moduleId,
-                                15,
+                            ( localize(
+                                7613,
                                 'The renderer is better with messaging available, but it\'s not requried.'
                             )),
-                            ( localizeWithPath(_moduleId, 16, 'The renderer does not require messaging.')),
+                            ( localize(7614, 'The renderer does not require messaging.')),
                         ],
-                        description: ( localizeWithPath(
-                            _moduleId,
-                            17,
+                        description: ( localize(
+                            7615,
                             'Defines how and if the renderer needs to communicate with an extension host, via `createRendererMessaging`. Renderers with stronger messaging requirements may not work in all environments.'
                         )),
                     },
@@ -173,13 +164,13 @@ const notebookRendererContribution = {
                         properties: {
                             [NotebookRendererContribution.mimeTypes]: {
                                 type: 'array',
-                                description: ( localizeWithPath(_moduleId, 18, 'Set of globs that the notebook is for.')),
+                                description: ( localize(7616, 'Set of globs that the notebook is for.')),
                                 items: {
                                     type: 'string'
                                 }
                             },
                             [NotebookRendererContribution.entrypoint]: {
-                                description: ( localizeWithPath(_moduleId, 19, 'File to load in the webview to render the extension.')),
+                                description: ( localize(7617, 'File to load in the webview to render the extension.')),
                                 type: 'string',
                             },
                         }
@@ -190,17 +181,17 @@ const notebookRendererContribution = {
                         ],
                         properties: {
                             [NotebookRendererContribution.entrypoint]: {
-                                description: ( localizeWithPath(_moduleId, 19, 'File to load in the webview to render the extension.')),
+                                description: ( localize(7617, 'File to load in the webview to render the extension.')),
                                 type: 'object',
                                 required: ['extends', 'path'],
                                 properties: {
                                     extends: {
                                         type: 'string',
-                                        description: ( localizeWithPath(_moduleId, 20, 'Existing renderer that this one extends.')),
+                                        description: ( localize(7618, 'Existing renderer that this one extends.')),
                                     },
                                     path: {
                                         type: 'string',
-                                        description: ( localizeWithPath(_moduleId, 19, 'File to load in the webview to render the extension.')),
+                                        description: ( localize(7618, 'File to load in the webview to render the extension.')),
                                     },
                                 }
                             },
@@ -212,7 +203,7 @@ const notebookRendererContribution = {
     }
 };
 const notebookPreloadContribution = {
-    description: ( localizeWithPath(_moduleId, 21, 'Contributes notebook preloads.')),
+    description: ( localize(7619, 'Contributes notebook preloads.')),
     type: 'array',
     defaultSnippets: [{ body: [{ type: '', entrypoint: '' }] }],
     items: {
@@ -224,18 +215,17 @@ const notebookPreloadContribution = {
         properties: {
             [NotebookPreloadContribution.type]: {
                 type: 'string',
-                description: ( localizeWithPath(_moduleId, 22, 'Type of the notebook.')),
+                description: ( localize(7620, 'Type of the notebook.')),
             },
             [NotebookPreloadContribution.entrypoint]: {
                 type: 'string',
-                description: ( localizeWithPath(_moduleId, 23, 'Path to file loaded in the webview.')),
+                description: ( localize(7621, 'Path to file loaded in the webview.')),
             },
             [NotebookPreloadContribution.localResourceRoots]: {
                 type: 'array',
                 items: { type: 'string' },
-                description: ( localizeWithPath(
-                    _moduleId,
-                    24,
+                description: ( localize(
+                    7622,
                     'Paths to additional resources that should be allowed in the webview.'
                 )),
             },
@@ -282,8 +272,8 @@ class NotebooksDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localizeWithPath(_moduleId, 25, "ID")),
-            ( localizeWithPath(_moduleId, 26, "Name")),
+            ( localize(7623, "ID")),
+            ( localize(7624, "Name")),
         ];
         const rows = ( (contrib
             .sort((a, b) => a.type.localeCompare(b.type))
@@ -316,8 +306,8 @@ class NotebookRenderersDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localizeWithPath(_moduleId, 27, "Name")),
-            ( localizeWithPath(_moduleId, 28, "Mimetypes")),
+            ( localize(7625, "Name")),
+            ( localize(7626, "Mimetypes")),
         ];
         const rows = ( (contrib
             .sort((a, b) => a.displayName.localeCompare(b.displayName))
@@ -338,7 +328,7 @@ class NotebookRenderersDataRenderer extends Disposable {
 }
 ( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
     id: 'notebooks',
-    label: ( localizeWithPath(_moduleId, 29, "Notebooks")),
+    label: ( localize(7627, "Notebooks")),
     access: {
         canToggle: false
     },
@@ -346,7 +336,7 @@ class NotebookRenderersDataRenderer extends Disposable {
 });
 ( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
     id: 'notebookRenderer',
-    label: ( localizeWithPath(_moduleId, 30, "Notebook Renderers")),
+    label: ( localize(7628, "Notebook Renderers")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IWorkspaceTrustRequestService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
@@ -9,7 +9,6 @@ import { CellKind, NotebookCellExecutionState } from 'vscode/vscode/vs/workbench
 import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { INotebookKernelService, INotebookKernelHistoryService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl";
 let NotebookExecutionService = class NotebookExecutionService {
     constructor(_commandService, _notebookKernelService, _notebookKernelHistoryService, _workspaceTrustRequestService, _logService, _notebookExecutionStateService) {
         this._commandService = _commandService;
@@ -27,11 +26,7 @@ let NotebookExecutionService = class NotebookExecutionService {
             return;
         }
         this._logService.debug(`NotebookExecutionService#executeNotebookCells ${JSON.stringify(( (cellsArr.map(c => c.handle))))}`);
-        const message = ( localizeWithPath(
-            _moduleId,
-            0,
-            "Executing a notebook cell will run code from this workspace."
-        ));
+        const message = ( localize(3262, "Executing a notebook cell will run code from this workspace."));
         const trust = await this._workspaceTrustRequestService.requestWorkspaceTrust({ message });
         if (!trust) {
             return;

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookKernelHistoryServiceImpl.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { LinkedMap, Touch } from 'vscode/vscode/vs/base/common/map';
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2 } from 'vscode/vscode/vs/nls';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
@@ -10,7 +10,6 @@ import { INotebookKernelService, INotebookKernelHistoryService } from 'vscode/vs
 import { INotebookLoggingService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service';
 
 var NotebookKernelHistoryService_1;
-const _moduleId = "vs/workbench/contrib/notebook/browser/services/notebookKernelHistoryServiceImpl";
 const MAX_KERNELS_IN_HISTORY = 5;
 let NotebookKernelHistoryService = class NotebookKernelHistoryService extends Disposable {
     static { NotebookKernelHistoryService_1 = this; }
@@ -114,7 +113,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.clearNotebookKernelsMRUCache',
-            title: ( localize2WithPath(_moduleId, 0, "Clear Notebook Kernels MRU Cache")),
+            title: ( localize2(3266, "Clear Notebook Kernels MRU Cache")),
             category: Categories.Developer,
             f1: true
         });

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookKeymapServiceImpl.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import 'vscode/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
@@ -19,7 +19,6 @@ import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
 import { distinct } from 'vscode/vscode/vs/base/common/arrays';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/services/notebookKeymapServiceImpl";
 function onExtensionChanged(accessor) {
     const extensionService = accessor.get(IExtensionManagementService);
     const extensionEnablementService = accessor.get(IWorkbenchExtensionEnablementService);
@@ -74,16 +73,15 @@ let NotebookKeymapService = class NotebookKeymapService extends Disposable {
                 this.extensionEnablementService.setEnablement(( (oldKeymaps.map(keymap => keymap.local))), EnablementState.DisabledGlobally);
             }
         };
-        this.notificationService.prompt(Severity$1.Info, ( localizeWithPath(
-            _moduleId,
-            0,
+        this.notificationService.prompt(Severity$1.Info, ( localize(
+            3263,
             "Disable other keymaps ({0}) to avoid conflicts between keybindings?",
             ( (distinct(( (oldKeymaps.map(k => k.local.manifest.displayName)))).map(name => `'${name}'`))).join(', ')
         )), [{
-                label: ( localizeWithPath(_moduleId, 1, "Yes")),
+                label: ( localize(3264, "Yes")),
                 run: () => onPrompt(true)
             }, {
-                label: ( localizeWithPath(_moduleId, 2, "No")),
+                label: ( localize(3265, "No")),
                 run: () => onPrompt(false)
             }]);
     }

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookLoggingServiceImpl.js

@@ -1,15 +1,14 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ILoggerService } from 'vscode/vscode/vs/platform/log/common/log.service';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/services/notebookLoggingServiceImpl";
 const logChannelId = 'notebook.rendering';
 let NotebookLoggingService = class NotebookLoggingService extends Disposable {
     static { this.ID = 'notebook'; }
     constructor(loggerService) {
         super();
-        this._logger = this._register(loggerService.createLogger(logChannelId, { name: ( localizeWithPath(_moduleId, 0, "Notebook rendering")) }));
+        this._logger = this._register(loggerService.createLogger(logChannelId, { name: ( localize(3267, "Notebook rendering")) }));
     }
     debug(category, output) {
         this._logger.debug(`[${category}] ${output}`);

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { toAction } from 'vscode/vscode/vs/base/common/actions';
 import { createErrorWithActions } from 'vscode/vscode/vs/base/common/errorMessage';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
@@ -37,7 +37,6 @@ import { INotebookDocumentService } from 'vscode/vscode/vs/workbench/services/no
 import { MergeEditorInput } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
 
 var NotebookProviderInfoStore_1, NotebookService_1;
-const _moduleId = "vs/workbench/contrib/notebook/browser/services/notebookServiceImpl";
 let NotebookProviderInfoStore = class NotebookProviderInfoStore extends Disposable {
     static { NotebookProviderInfoStore_1 = this; }
     static { this.CUSTOM_EDITORS_STORAGE_ID = 'notebookEditors'; }
@@ -549,7 +548,7 @@ let NotebookService = class NotebookService extends Disposable {
             const knownProvider = this.getViewTypeProvider(viewType);
             const actions = knownProvider ? [
                 toAction({
-                    id: 'workbench.notebook.action.installMissingViewType', label: ( localizeWithPath(_moduleId, 0, "Install extension for '{0}'", viewType)), run: async () => {
+                    id: 'workbench.notebook.action.installMissingViewType', label: ( localize(3261, "Install extension for '{0}'", viewType)), run: async () => {
                         await this._instantiationService.createInstance(InstallRecommendedExtensionAction, knownProvider).run();
                     }
                 })