@codingame/monaco-vscode-notebook-service-override 2.2.2 → 3.1.0

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { append, $ as $$1, addStandardDisposableGenericMouseDownListener, addStandardDisposableGenericMouseUpListener, getActiveWindow, scheduleAtNextAnimationFrame, getWindow } from 'vscode/vscode/vs/base/browser/dom';
+import { getWindowById, append, $ as $$1, getWindow, addStandardDisposableGenericMouseDownListener, addStandardDisposableGenericMouseUpListener, getActiveWindow, scheduleAtNextAnimationFrame } from 'vscode/vscode/vs/base/browser/dom';
 import { findLastIdx } from 'vscode/vscode/vs/base/common/arraysFind';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
@@ -15,7 +15,7 @@ import { editorBackground, foreground, focusBorder, diffDiagonalFill } from 'vsc
 import { INotebookEditorWorkerService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/services/notebookWorkerService';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { BareFontInfo } from 'vscode/vscode/vs/editor/common/config/fontInfo';
-import { PixelRatio } from 'vscode/vscode/vs/base/browser/browser';
+import { PixelRatio } from 'vscode/vscode/vs/base/browser/pixelRatio';
 import { DiffSide, DIFF_CELL_MARGIN } from './notebookDiffEditorBrowser.js';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -32,6 +32,8 @@ import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contr
 import { cellRangesToIndexes, cellIndexesToRanges } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookRange';
 import { NotebookDiffOverviewRuler } from './notebookDiffOverviewRuler.js';
 import { registerZIndex, ZIndex } from 'vscode/vscode/vs/platform/layout/browser/zIndexRegistry';
+import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
+import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 
 var NotebookTextDiffEditor_1;
 const $ = $$1;
@@ -74,7 +76,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
     get isDisposed() {
         return this._isDisposed;
     }
-    constructor(instantiationService, themeService, contextKeyService, notebookEditorWorkerService, configurationService, telemetryService, storageService, notebookExecutionStateService) {
+    constructor(instantiationService, themeService, contextKeyService, notebookEditorWorkerService, configurationService, telemetryService, storageService, notebookExecutionStateService, codeEditorService) {
         super(NotebookTextDiffEditor_1.ID, telemetryService, themeService, storageService);
         this.instantiationService = instantiationService;
         this.contextKeyService = contextKeyService;
@@ -100,12 +102,27 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
         this.onDidChangeSelection = this._onDidChangeSelection.event;
         this._isDisposed = false;
         this.pendingLayouts = ( new WeakMap());
-        this._notebookOptions = ( new NotebookOptions(this.configurationService, notebookExecutionStateService, false));
+        this._notebookOptions = ( new NotebookOptions(
+            getWindowById(this.group?.windowId, true).window ?? mainWindow,
+            this.configurationService,
+            notebookExecutionStateService,
+            codeEditorService,
+            false
+        ));
         this._register(this._notebookOptions);
-        const editorOptions = this.configurationService.getValue('editor');
-        this._fontInfo = FontMeasurements.readFontInfo(BareFontInfo.createFromRawSettings(editorOptions, PixelRatio.value));
         this._revealFirst = true;
     }
+    get fontInfo() {
+        if (!this._fontInfo) {
+            this._fontInfo = this.createFontInfo();
+        }
+        return this._fontInfo;
+    }
+    createFontInfo() {
+        const window = getWindowById(this.group?.windowId, true).window;
+        const editorOptions = this.configurationService.getValue('editor');
+        return FontMeasurements.readFontInfo(window, BareFontInfo.createFromRawSettings(editorOptions, PixelRatio.getInstance(window).value));
+    }
     isOverviewRulerEnabled() {
         return this.configurationService.getValue(NotebookSetting.diffOverviewRuler) ?? false;
     }
@@ -172,7 +189,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
             this.instantiationService.createInstance(CellDiffSideBySideRenderer, this),
         ];
         this._listViewContainer = append(this._rootElement, $$1('.notebook-diff-list-view'));
-        this._list = this.instantiationService.createInstance(NotebookTextDiffList, 'NotebookTextDiff', this._listViewContainer, this.instantiationService.createInstance(NotebookCellTextDiffListDelegate), renderers, this.contextKeyService, {
+        this._list = this.instantiationService.createInstance(NotebookTextDiffList, 'NotebookTextDiff', this._listViewContainer, this.instantiationService.createInstance(NotebookCellTextDiffListDelegate, getWindow(this._listViewContainer)), renderers, this.contextKeyService, {
             setRowLineHeight: false,
             setRowHeight: false,
             supportDynamicHeights: true,
@@ -361,7 +378,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
         this._modifiedWebview.element.style.left = `calc(50%)`;
     }
     _generateFontFamily() {
-        return this._fontInfo?.fontFamily ?? `"SF Mono", Monaco, Menlo, Consolas, "Ubuntu Mono", "Liberation Mono", "DejaVu Sans Mono", "Courier New", monospace`;
+        return this.fontInfo.fontFamily ?? `"SF Mono", Monaco, Menlo, Consolas, "Ubuntu Mono", "Liberation Mono", "DejaVu Sans Mono", "Courier New", monospace`;
     }
     async _createOriginalWebview(id, viewType, resource) {
         this._originalWebview?.dispose();
@@ -389,7 +406,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
             return;
         }
         NotebookTextDiffEditor_1.prettyChanges(this._model, diffResult.cellsDiff);
-        const { viewModels, firstChangeIndex } = NotebookTextDiffEditor_1.computeDiff(this.instantiationService, this.configurationService, this._model, this._eventDispatcher, diffResult, this._fontInfo);
+        const { viewModels, firstChangeIndex } = NotebookTextDiffEditor_1.computeDiff(this.instantiationService, this.configurationService, this._model, this._eventDispatcher, diffResult, this.fontInfo);
         const isSame = this._isViewModelTheSame(viewModels);
         if (!isSame) {
             this._originalWebview?.removeInsets([...this._originalWebview?.insetMapping.keys()]);
@@ -761,7 +778,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
         return {
             width: this._dimension.width,
             height: this._dimension.height,
-            fontInfo: this._fontInfo,
+            fontInfo: this.fontInfo,
             scrollHeight: this._list?.getScrollHeight() ?? 0,
             stickyHeight: 0,
         };
@@ -795,14 +812,14 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
             return {
                 width: this._dimension.width / 2,
                 height: this._dimension.height / 2,
-                fontInfo: this._fontInfo
+                fontInfo: this.fontInfo
             };
         }
         if (viewModel.checkIfOutputsModified()) {
             return {
                 width: this._dimension.width / 2,
                 height: this._dimension.height / 2,
-                fontInfo: this._fontInfo
+                fontInfo: this.fontInfo
             };
         }
         else {
@@ -849,7 +866,8 @@ NotebookTextDiffEditor = NotebookTextDiffEditor_1 = ( __decorate([
     ( __param(4, IConfigurationService)),
     ( __param(5, ITelemetryService)),
     ( __param(6, IStorageService)),
-    ( __param(7, INotebookExecutionStateService))
+    ( __param(7, INotebookExecutionStateService)),
+    ( __param(8, ICodeEditorService))
 ], NotebookTextDiffEditor));
 registerZIndex(ZIndex.Base, 10, 'notebook-diff-view-viewport-slider');
 registerThemingParticipant((theme, collector) => {

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.js

@@ -18,17 +18,17 @@ import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/brows
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { CodiconActionViewItem } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/view/cellParts/cellActionView';
 import { BareFontInfo } from 'vscode/vscode/vs/editor/common/config/fontInfo';
-import { PixelRatio } from 'vscode/vscode/vs/base/browser/browser';
+import { PixelRatio } from 'vscode/vscode/vs/base/browser/pixelRatio';
 import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 import { fixedEditorOptions, fixedDiffEditorOptions } from './diffCellEditorOptions.js';
 import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
 
 var CellDiffSingleSideRenderer_1, CellDiffSideBySideRenderer_1;
 let NotebookCellTextDiffListDelegate = class NotebookCellTextDiffListDelegate {
-    constructor(configurationService) {
+    constructor(targetWindow, configurationService) {
         this.configurationService = configurationService;
         const editorOptions = this.configurationService.getValue('editor');
-        this.lineHeight = BareFontInfo.createFromRawSettings(editorOptions, PixelRatio.value).lineHeight;
+        this.lineHeight = BareFontInfo.createFromRawSettings(editorOptions, PixelRatio.getInstance(targetWindow).value).lineHeight;
     }
     getHeight(element) {
         return element.getHeight(this.lineHeight);
@@ -48,7 +48,7 @@ let NotebookCellTextDiffListDelegate = class NotebookCellTextDiffListDelegate {
     }
 };
 NotebookCellTextDiffListDelegate = ( __decorate([
-    ( __param(0, IConfigurationService))
+    ( __param(1, IConfigurationService))
 ], NotebookCellTextDiffListDelegate));
 let CellDiffSingleSideRenderer = class CellDiffSingleSideRenderer {
     static { CellDiffSingleSideRenderer_1 = this; }

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { PixelRatio } from 'vscode/vscode/vs/base/browser/browser';
-import { addStandardDisposableListener, EventType, runAtThisOrScheduleAtNextAnimationFrame, getWindow } from 'vscode/vscode/vs/base/browser/dom';
+import { getWindow, addStandardDisposableListener, EventType, runAtThisOrScheduleAtNextAnimationFrame } from 'vscode/vscode/vs/base/browser/dom';
 import { createFastDomNode } from 'vscode/vscode/vs/base/browser/fastDomNode';
+import { PixelRatio } from 'vscode/vscode/vs/base/browser/pixelRatio';
 import { Color } from 'vscode/vscode/vs/base/common/color';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { diffOverviewRulerInserted, diffInserted, defaultInsertColor, diffOverviewRulerRemoved, diffRemoved, defaultRemoveColor } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
@@ -31,7 +31,7 @@ let NotebookDiffOverviewRuler = class NotebookDiffOverviewRuler extends Themable
         this._overviewViewportDomElement.setPosition('absolute');
         this._overviewViewportDomElement.setWidth(width);
         container.appendChild(this._overviewViewportDomElement.domNode);
-        this._register(PixelRatio.onDidChange(() => {
+        this._register(PixelRatio.getInstance(getWindow(this._domNode.domNode)).onDidChange(() => {
             this._scheduleRender();
         }));
         this._register(this.themeService.onDidColorThemeChange(e => {
@@ -91,7 +91,7 @@ let NotebookDiffOverviewRuler = class NotebookDiffOverviewRuler extends Themable
         const layoutInfo = this.notebookEditor.getLayoutInfo();
         const height = layoutInfo.height;
         const contentHeight = ( this._diffElementViewModels.map(view => view.layoutInfo.totalHeight)).reduce((a, b) => a + b, 0);
-        const ratio = PixelRatio.value;
+        const ratio = PixelRatio.getInstance(getWindow(this._domNode.domNode)).value;
         this._domNode.setWidth(this.width);
         this._domNode.setHeight(height);
         this._domNode.domNode.width = this.width * ratio;

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

@@ -10,18 +10,18 @@ import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { Extensions as Extensions$1 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions as Extensions$2 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions as Extensions$1, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
 import { NotebookEditor } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditor';
 import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService';
 import './services/notebookServiceImpl.js';
-import { NotebookSetting, CellUri, CellKind, NotebookWorkingCopyTypeIdentifier } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { NotebookSetting, CellUri, NotebookWorkingCopyTypeIdentifier, CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IUndoRedoService } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo';
 import { INotebookEditorModelResolverService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
@@ -30,7 +30,7 @@ import { NotebookTextDiffEditor } from './diff/notebookDiffEditor.js';
 import './services/notebookWorkerServiceImpl.js';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import './services/notebookEditorServiceImpl.js';
-import { Extensions as Extensions$2 } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
+import { Extensions } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { getFormattedMetadataJSON, getStreamOutputData } from './diff/diffElementViewModel.js';
 import './services/notebookKernelServiceImpl.js';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
@@ -40,13 +40,14 @@ import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import './services/notebookRendererMessagingServiceImpl.js';
 import 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
-import 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/insertCellActions';
+import './controller/insertCellActions.js';
 import './controller/executeActions.js';
 import './controller/layoutActions.js';
 import 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/editActions';
 import 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/cellOutputActions';
 import './controller/apiActions.js';
 import 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/foldingController';
+import './controller/chat/cellChatActions.js';
 import './contrib/editorHint/emptyCellEditorHint.js';
 import './contrib/clipboard/notebookClipboard.js';
 import './contrib/find/notebookFind.js';
@@ -157,7 +158,9 @@ class NotebookEditorSerializer {
 }
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(NotebookEditorInput.ID, NotebookEditorSerializer);
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(NotebookDiffEditorInput.ID, NotebookDiffEditorSerializer);
-let NotebookContribution = NotebookContribution_1 = class NotebookContribution extends Disposable {
+let NotebookContribution = class NotebookContribution extends Disposable {
+    static { NotebookContribution_1 = this; }
+    static { this.ID = 'workbench.contrib.notebook'; }
     constructor(undoRedoService, configurationService, codeEditorService) {
         super();
         this.codeEditorService = codeEditorService;
@@ -206,6 +209,7 @@ NotebookContribution = NotebookContribution_1 = ( __decorate([
     ( __param(2, ICodeEditorService))
 ], NotebookContribution));
 let CellContentProvider = class CellContentProvider {
+    static { this.ID = 'workbench.contrib.cellContentProvider'; }
     constructor(textModelService, _modelService, _languageService, _notebookModelResolverService) {
         this._modelService = _modelService;
         this._languageService = _languageService;
@@ -265,6 +269,7 @@ CellContentProvider = ( __decorate([
     ( __param(3, INotebookEditorModelResolverService))
 ], CellContentProvider));
 let CellInfoContentProvider = class CellInfoContentProvider {
+    static { this.ID = 'workbench.contrib.cellInfoContentProvider'; }
     constructor(textModelService, _modelService, _languageService, _labelService, _notebookModelResolverService) {
         this._modelService = _modelService;
         this._languageService = _languageService;
@@ -405,12 +410,13 @@ CellInfoContentProvider = ( __decorate([
     ( __param(4, INotebookEditorModelResolverService))
 ], CellInfoContentProvider));
 class RegisterSchemasContribution extends Disposable {
+    static { this.ID = 'workbench.contrib.registerCellSchemas'; }
     constructor() {
         super();
         this.registerMetadataSchemas();
     }
     registerMetadataSchemas() {
-        const jsonRegistry = ( Registry.as(Extensions$2.JSONContribution));
+        const jsonRegistry = ( Registry.as(Extensions.JSONContribution));
         const metadataSchema = {
             properties: {
                 ['language']: {
@@ -426,6 +432,7 @@ class RegisterSchemasContribution extends Disposable {
     }
 }
 let NotebookEditorManager = class NotebookEditorManager {
+    static { this.ID = 'workbench.contrib.notebookEditorManager'; }
     constructor(_editorService, _notebookEditorModelService, editorGroups) {
         this._editorService = _editorService;
         this._notebookEditorModelService = _notebookEditorModelService;
@@ -463,6 +470,7 @@ NotebookEditorManager = ( __decorate([
     ( __param(2, IEditorGroupsService))
 ], NotebookEditorManager));
 let SimpleNotebookWorkingCopyEditorHandler = class SimpleNotebookWorkingCopyEditorHandler extends Disposable {
+    static { this.ID = 'workbench.contrib.simpleNotebookWorkingCopyEditorHandler'; }
     constructor(_instantiationService, _workingCopyEditorService, _extensionService, _notebookService) {
         super();
         this._instantiationService = _instantiationService;
@@ -509,6 +517,7 @@ SimpleNotebookWorkingCopyEditorHandler = ( __decorate([
     ( __param(3, INotebookService))
 ], SimpleNotebookWorkingCopyEditorHandler));
 let NotebookLanguageSelectorScoreRefine = class NotebookLanguageSelectorScoreRefine {
+    static { this.ID = 'workbench.contrib.notebookLanguageSelectorScoreRefine'; }
     constructor(_notebookService, languageFeaturesService) {
         this._notebookService = _notebookService;
         languageFeaturesService.setNotebookTypeResolver(this._getNotebookInfo.bind(this));
@@ -555,14 +564,14 @@ class NotebookAccessibleViewContribution extends Disposable {
         }, ( ContextKeyExpr.and(NOTEBOOK_OUTPUT_FOCUSED, ( ContextKeyExpr.equals('resourceExtname', '.ipynb'))))));
     }
 }
-const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
-workbenchContributionsRegistry.registerWorkbenchContribution(NotebookContribution, 1 );
-workbenchContributionsRegistry.registerWorkbenchContribution(CellContentProvider, 1 );
-workbenchContributionsRegistry.registerWorkbenchContribution(CellInfoContentProvider, 1 );
-workbenchContributionsRegistry.registerWorkbenchContribution(RegisterSchemasContribution, 1 );
-workbenchContributionsRegistry.registerWorkbenchContribution(NotebookEditorManager, 2 );
-workbenchContributionsRegistry.registerWorkbenchContribution(NotebookLanguageSelectorScoreRefine, 2 );
-workbenchContributionsRegistry.registerWorkbenchContribution(SimpleNotebookWorkingCopyEditorHandler, 2 );
+const workbenchContributionsRegistry = ( Registry.as(Extensions$1.Workbench));
+registerWorkbenchContribution2(NotebookContribution.ID, NotebookContribution, 1 );
+registerWorkbenchContribution2(CellContentProvider.ID, CellContentProvider, 1 );
+registerWorkbenchContribution2(CellInfoContentProvider.ID, CellInfoContentProvider, 1 );
+registerWorkbenchContribution2(RegisterSchemasContribution.ID, RegisterSchemasContribution, 1 );
+registerWorkbenchContribution2(NotebookEditorManager.ID, NotebookEditorManager, 2 );
+registerWorkbenchContribution2(NotebookLanguageSelectorScoreRefine.ID, NotebookLanguageSelectorScoreRefine, 2 );
+registerWorkbenchContribution2(SimpleNotebookWorkingCopyEditorHandler.ID, SimpleNotebookWorkingCopyEditorHandler, 2 );
 workbenchContributionsRegistry.registerWorkbenchContribution(NotebookAccessibilityHelpContribution, 4 );
 workbenchContributionsRegistry.registerWorkbenchContribution(NotebookAccessibleViewContribution, 4 );
 workbenchContributionsRegistry.registerWorkbenchContribution(NotebookVariables, 4 );
@@ -599,7 +608,7 @@ const editorOptionsCustomizationSchema = {
     ],
     tags: ['notebookLayout']
 };
-const configurationRegistry = ( Registry.as(Extensions$1.Configuration));
+const configurationRegistry = ( Registry.as(Extensions$2.Configuration));
 configurationRegistry.registerConfiguration({
     id: 'notebook',
     order: 100,

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

@@ -1,6 +1,10 @@
 import { localizeWithPath } 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';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import { Extensions } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 
 const NotebookEditorContribution = ( Object.freeze({
     type: 'type',
@@ -309,7 +313,7 @@ const notebookPreloadContribution = {
         }
     }
 };
-const notebooksExtensionPoint = ( ExtensionsRegistry.registerExtensionPoint({
+const notebooksExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'notebooks',
     jsonSchema: notebookProviderContribution,
     activationEventsGenerator: (contribs, result) => {
@@ -319,8 +323,8 @@ const notebooksExtensionPoint = ( ExtensionsRegistry.registerExtensionPoint({
             }
         }
     }
-}));
-const notebookRendererExtensionPoint = ( ExtensionsRegistry.registerExtensionPoint({
+});
+const notebookRendererExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'notebookRenderer',
     jsonSchema: notebookRendererContribution,
     activationEventsGenerator: (contribs, result) => {
@@ -330,10 +334,118 @@ const notebookRendererExtensionPoint = ( ExtensionsRegistry.registerExtensionPoi
             }
         }
     }
-}));
-const notebookPreloadExtensionPoint = ( ExtensionsRegistry.registerExtensionPoint({
+});
+const notebookPreloadExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'notebookPreload',
     jsonSchema: notebookPreloadContribution,
-}));
+});
+class NotebooksDataRenderer extends Disposable {
+    constructor() {
+        super(...arguments);
+        this.type = 'table';
+    }
+    shouldRender(manifest) {
+        return !!manifest.contributes?.notebooks;
+    }
+    render(manifest) {
+        const contrib = manifest.contributes?.notebooks || [];
+        if (!contrib.length) {
+            return { data: { headers: [], rows: [] }, dispose: () => { } };
+        }
+        const headers = [
+            ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
+                'Notebook id',
+                "ID"
+            )),
+            ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
+                'Notebook name',
+                "Name"
+            )),
+        ];
+        const rows = ( contrib
+            .sort((a, b) => a.type.localeCompare(b.type))
+            .map(notebook => {
+            return [
+                notebook.type,
+                notebook.displayName
+            ];
+        }));
+        return {
+            data: {
+                headers,
+                rows
+            },
+            dispose: () => { }
+        };
+    }
+}
+class NotebookRenderersDataRenderer extends Disposable {
+    constructor() {
+        super(...arguments);
+        this.type = 'table';
+    }
+    shouldRender(manifest) {
+        return !!manifest.contributes?.notebookRenderer;
+    }
+    render(manifest) {
+        const contrib = manifest.contributes?.notebookRenderer || [];
+        if (!contrib.length) {
+            return { data: { headers: [], rows: [] }, dispose: () => { } };
+        }
+        const headers = [
+            ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
+                'Notebook renderer name',
+                "Name"
+            )),
+            ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
+                'Notebook mimetypes',
+                "Mimetypes"
+            )),
+        ];
+        const rows = ( contrib
+            .sort((a, b) => a.displayName.localeCompare(b.displayName))
+            .map(notebookRenderer => {
+            return [
+                notebookRenderer.displayName,
+                notebookRenderer.mimeTypes.join(',')
+            ];
+        }));
+        return {
+            data: {
+                headers,
+                rows
+            },
+            dispose: () => { }
+        };
+    }
+}
+( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
+    id: 'notebooks',
+    label: ( localizeWithPath(
+        'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
+        'notebooks',
+        "Notebooks"
+    )),
+    access: {
+        canToggle: false
+    },
+    renderer: ( new SyncDescriptor(NotebooksDataRenderer)),
+});
+( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
+    id: 'notebookRenderer',
+    label: ( localizeWithPath(
+        'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
+        'notebookRenderer',
+        "Notebook Renderers"
+    )),
+    access: {
+        canToggle: false
+    },
+    renderer: ( new SyncDescriptor(NotebookRenderersDataRenderer)),
+});
 
 export { notebookPreloadExtensionPoint, notebookRendererExtensionPoint, notebooksExtensionPoint };

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

@@ -4,7 +4,7 @@ import { Disposable, combinedDisposable } from 'vscode/vscode/vs/base/common/lif
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
-import { AudioCue, IAudioCueService } from 'vscode/vscode/vs/platform/audioCues/browser/audioCueService';
+import { AccessibilitySignal, IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { CellUri, NotebookCellExecutionState, NotebookExecutionState } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
@@ -14,12 +14,12 @@ import { INotebookKernelService } from 'vscode/vscode/vs/workbench/contrib/noteb
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService';
 
 let NotebookExecutionStateService = class NotebookExecutionStateService extends Disposable {
-    constructor(_instantiationService, _logService, _notebookService, _audioCueService) {
+    constructor(_instantiationService, _logService, _notebookService, _accessibilitySignalService) {
         super();
         this._instantiationService = _instantiationService;
         this._logService = _logService;
         this._notebookService = _notebookService;
-        this._audioCueService = _audioCueService;
+        this._accessibilitySignalService = _accessibilitySignalService;
         this._executions = ( new ResourceMap());
         this._notebookExecutions = ( new ResourceMap());
         this._notebookListeners = ( new ResourceMap());
@@ -89,12 +89,12 @@ let NotebookExecutionStateService = class NotebookExecutionStateService extends
         if (lastRunSuccess !== undefined) {
             if (lastRunSuccess) {
                 if (this._executions.size === 0) {
-                    this._audioCueService.playAudioCue(AudioCue.notebookCellCompleted);
+                    this._accessibilitySignalService.playSignal(AccessibilitySignal.notebookCellCompleted);
                 }
                 this._clearLastFailedCell(notebookUri);
             }
             else {
-                this._audioCueService.playAudioCue(AudioCue.notebookCellFailed);
+                this._accessibilitySignalService.playSignal(AccessibilitySignal.notebookCellFailed);
                 this._setLastFailedCell(notebookUri, cellHandle);
             }
         }
@@ -235,7 +235,7 @@ NotebookExecutionStateService = ( __decorate([
     ( __param(0, IInstantiationService)),
     ( __param(1, ILogService)),
     ( __param(2, INotebookService)),
-    ( __param(3, IAudioCueService))
+    ( __param(3, IAccessibilitySignalService))
 ], NotebookExecutionStateService));
 class NotebookCellExecutionEvent {
     constructor(notebook, cellHandle, changed) {

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { LinkedMap } from 'vscode/vscode/vs/base/common/map';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath } 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 { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
@@ -112,14 +112,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.clearNotebookKernelsMRUCache',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/services/notebookKernelHistoryServiceImpl',
-                    'workbench.notebook.clearNotebookKernelsMRUCache',
-                    "Clear Notebook Kernels MRU Cache"
-                )),
-                original: 'Clear Notebook Kernels MRU Cache'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/services/notebookKernelHistoryServiceImpl',
+                'workbench.notebook.clearNotebookKernelsMRUCache',
+                "Clear Notebook Kernels MRU Cache"
+            )),
             category: Categories.Developer,
             f1: true
         });

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

@@ -8,8 +8,7 @@ import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/co
 import { MenuId, IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
-import { $window } from 'vscode/vscode/vs/base/browser/window';
-import { runWhenWindowIdle } from 'vscode/vscode/vs/base/browser/dom';
+import { runWhenWindowIdle, getActiveWindow } from 'vscode/vscode/vs/base/browser/dom';
 
 var NotebookKernelService_1;
 class KernelInfo {
@@ -124,7 +123,7 @@ let NotebookKernelService = class NotebookKernelService extends Disposable {
     }
     _persistMementos() {
         this._persistSoonHandle?.dispose();
-        this._persistSoonHandle = runWhenWindowIdle($window, () => {
+        this._persistSoonHandle = runWhenWindowIdle(getActiveWindow(), () => {
             this._storageService.store(NotebookKernelService_1._storageNotebookBinding, JSON.stringify(this._notebookBindings), 1 , 1 );
         }, 100);
     }