@codingame/monaco-vscode-notebook-service-override 1.85.6 → 2.0.0-v2.1

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

@@ -1,39 +1,39 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { Disposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { scheduleAtNextAnimationFrame, getWindow, append, $, reset } from 'vscode/vscode/vs/base/browser/dom';
+import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { outputEqual, OUTPUT_EDITOR_HEIGHT_MAGIC, PropertyFoldingState, SideBySideDiffElementViewModel, getFormattedMetadataJSON, getFormattedOutputJSON } from './diffElementViewModel.js';
 import { DIFF_CELL_MARGIN, DiffSide, NOTEBOOK_DIFF_CELL_INPUT, NOTEBOOK_DIFF_CELL_PROPERTY, NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED } from './notebookDiffEditorBrowser.js';
-import { CodeEditorWidget } from 'monaco-editor/esm/vs/editor/browser/widget/codeEditorWidget.js';
-import { IModelService } from 'monaco-editor/esm/vs/editor/common/services/model.js';
-import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
+import { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditorWidget';
+import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
+import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
-import { MenuId, MenuItemAction, IMenuService } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
-import { createAndFillInActionBarActions } from 'monaco-editor/esm/vs/platform/actions/browser/menuEntryActionViewItem.js';
-import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { MenuId, MenuItemAction, IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { createAndFillInActionBarActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { CodiconActionViewItem } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/view/cellParts/cellActionView';
 import { collapsedIcon, expandedIcon } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { OutputContainer } from './diffElementOutputs.js';
-import { EditorExtensionsRegistry } from 'monaco-editor/esm/vs/editor/browser/editorExtensions.js';
-import { ContextMenuController } from 'monaco-editor/esm/vs/editor/contrib/contextmenu/browser/contextmenu.js';
-import { SnippetController2 } from 'monaco-editor/esm/vs/editor/contrib/snippet/browser/snippetController2.js';
-import { SuggestController } from 'monaco-editor/esm/vs/editor/contrib/suggest/browser/suggestController.js';
+import { EditorExtensionsRegistry } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+import { ContextMenuController } from 'vscode/vscode/vs/editor/contrib/contextmenu/browser/contextmenu';
+import { SnippetController2 } from 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetController2';
+import { SuggestController } from 'vscode/vscode/vs/editor/contrib/suggest/browser/suggestController';
 import { MenuPreventer } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/menuPreventer';
 import { SelectionClipboardContributionID } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/selectionClipboard';
 import { TabCompletionController } from 'vscode/vscode/vs/workbench/contrib/snippets/browser/tabCompletion';
-import { renderIcon } from 'monaco-editor/esm/vs/base/browser/ui/iconLabel/iconLabels.js';
-import { ITextModelService } from 'monaco-editor/esm/vs/editor/common/services/resolverService.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
-import { WorkbenchToolBar } from 'monaco-editor/esm/vs/platform/actions/browser/toolbar.js';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
+import { renderIcon } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabels';
+import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { fixedEditorPadding, fixedDiffEditorOptions, fixedEditorOptions } from './diffCellEditorOptions.js';
-import { IAccessibilityService } from 'monaco-editor/esm/vs/platform/accessibility/common/accessibility.js';
-import { DiffEditorWidget } from 'monaco-editor/esm/vs/editor/browser/widget/diffEditor/diffEditorWidget.js';
+import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
+import { DiffEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/diffEditor/diffEditorWidget';
 
 function getOptimizedNestedCodeEditorWidgetOptions() {
     return {
@@ -66,12 +66,12 @@ let PropertyHeader = class PropertyHeader extends Disposable {
     }
     buildHeader() {
         const metadataChanged = this.accessor.checkIfModified(this.cell);
-        this._foldingIndicator = dom.append(this.propertyHeaderContainer, dom.$('.property-folding-indicator'));
+        this._foldingIndicator = append(this.propertyHeaderContainer, $('.property-folding-indicator'));
         this._foldingIndicator.classList.add(this.accessor.prefix);
         this._updateFoldingIcon();
-        const metadataStatus = dom.append(this.propertyHeaderContainer, dom.$('div.property-status'));
-        this._statusSpan = dom.append(metadataStatus, dom.$('span'));
-        this._description = dom.append(metadataStatus, dom.$('span.property-description'));
+        const metadataStatus = append(this.propertyHeaderContainer, $('div.property-status'));
+        this._statusSpan = append(metadataStatus, $('span'));
+        this._description = append(metadataStatus, $('span.property-description'));
         if (metadataChanged) {
             this._statusSpan.textContent = this.accessor.changedLabel;
             this._statusSpan.style.fontWeight = 'bold';
@@ -85,7 +85,7 @@ let PropertyHeader = class PropertyHeader extends Disposable {
             this._description.textContent = '';
             this.propertyHeaderContainer.classList.remove('modified');
         }
-        const cellToolbarContainer = dom.append(this.propertyHeaderContainer, dom.$('div.property-toolbar'));
+        const cellToolbarContainer = append(this.propertyHeaderContainer, $('div.property-toolbar'));
         this._toolbar = ( new WorkbenchToolBar(cellToolbarContainer, {
             actionViewItemProvider: action => {
                 if (action instanceof MenuItemAction) {
@@ -175,11 +175,11 @@ let PropertyHeader = class PropertyHeader extends Disposable {
     }
     _updateFoldingIcon() {
         if (this.accessor.getFoldingState(this.cell) === PropertyFoldingState.Collapsed) {
-            dom.reset(this._foldingIndicator, renderIcon(collapsedIcon));
+            reset(this._foldingIndicator, renderIcon(collapsedIcon));
             this._propertyExpanded?.set(false);
         }
         else {
-            dom.reset(this._foldingIndicator, renderIcon(expandedIcon));
+            reset(this._foldingIndicator, renderIcon(expandedIcon));
             this._propertyExpanded?.set(true);
         }
     }
@@ -300,7 +300,7 @@ class AbstractElementRenderer extends Disposable {
         if (this.cell.metadataFoldingState === PropertyFoldingState.Expanded) {
             this._metadataInfoContainer.style.display = 'block';
             if (!this._metadataEditorContainer || !this._metadataEditor) {
-                this._metadataEditorContainer = dom.append(this._metadataInfoContainer, dom.$('.metadata-editor-container'));
+                this._metadataEditorContainer = append(this._metadataInfoContainer, $('.metadata-editor-container'));
                 this._buildMetadataEditor();
             }
             else {
@@ -336,7 +336,7 @@ class AbstractElementRenderer extends Disposable {
     }
     _buildOutputRawContainer() {
         if (!this._outputEditorContainer) {
-            this._outputEditorContainer = dom.append(this._outputInfoContainer, dom.$('.output-editor-container'));
+            this._outputEditorContainer = append(this._outputInfoContainer, $('.output-editor-container'));
             this._buildOutputEditor();
         }
     }
@@ -746,7 +746,7 @@ let DeletedElement = class DeletedElement extends SingleSideDiffElement {
         });
     }
     layout(state) {
-        dom.scheduleAtNextAnimationFrame(dom.getWindow(this._diffEditorContainer), () => {
+        scheduleAtNextAnimationFrame(getWindow(this._diffEditorContainer), () => {
             if (state.editorHeight || state.outerWidth) {
                 this._editor.layout({
                     width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, false),
@@ -773,9 +773,9 @@ let DeletedElement = class DeletedElement extends SingleSideDiffElement {
     }
     _buildOutputRendererContainer() {
         if (!this._outputViewContainer) {
-            this._outputViewContainer = dom.append(this._outputInfoContainer, dom.$('.output-view-container'));
-            this._outputEmptyElement = dom.append(this._outputViewContainer, dom.$('.output-empty-view'));
-            const span = dom.append(this._outputEmptyElement, dom.$('span'));
+            this._outputViewContainer = append(this._outputInfoContainer, $('.output-view-container'));
+            this._outputEmptyElement = append(this._outputViewContainer, $('.output-empty-view'));
+            const span = append(this._outputEmptyElement, $('span'));
             span.innerText = 'No outputs to render';
             if (this.cell.original.outputs.length === 0) {
                 this._outputEmptyElement.style.display = 'block';
@@ -870,8 +870,8 @@ let InsertElement = class InsertElement extends SingleSideDiffElement {
     }
     _buildOutputRendererContainer() {
         if (!this._outputViewContainer) {
-            this._outputViewContainer = dom.append(this._outputInfoContainer, dom.$('.output-view-container'));
-            this._outputEmptyElement = dom.append(this._outputViewContainer, dom.$('.output-empty-view'));
+            this._outputViewContainer = append(this._outputInfoContainer, $('.output-view-container'));
+            this._outputEmptyElement = append(this._outputViewContainer, $('.output-empty-view'));
             this._outputEmptyElement.innerText = 'No outputs to render';
             if (this.cell.modified.outputs.length === 0) {
                 this._outputEmptyElement.style.display = 'block';
@@ -910,7 +910,7 @@ let InsertElement = class InsertElement extends SingleSideDiffElement {
         }
     }
     layout(state) {
-        dom.scheduleAtNextAnimationFrame(dom.getWindow(this._diffEditorContainer), () => {
+        scheduleAtNextAnimationFrame(getWindow(this._diffEditorContainer), () => {
             if (state.editorHeight || state.outerWidth) {
                 this._editor.layout({
                     width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, false),
@@ -1042,8 +1042,8 @@ let ModifiedElement = class ModifiedElement extends AbstractElementRenderer {
     }
     _buildOutputRendererContainer() {
         if (!this._outputViewContainer) {
-            this._outputViewContainer = dom.append(this._outputInfoContainer, dom.$('.output-view-container'));
-            this._outputEmptyElement = dom.append(this._outputViewContainer, dom.$('.output-empty-view'));
+            this._outputViewContainer = append(this._outputInfoContainer, $('.output-view-container'));
+            this._outputEmptyElement = append(this._outputViewContainer, $('.output-empty-view'));
             this._outputEmptyElement.innerText = 'No outputs to render';
             if (!this.cell.checkIfOutputsModified() && this.cell.modified.outputs.length === 0) {
                 this._outputEmptyElement.style.display = 'block';
@@ -1061,9 +1061,9 @@ let ModifiedElement = class ModifiedElement extends AbstractElementRenderer {
                 }
                 this._decorate();
             }));
-            this._outputLeftContainer = dom.append(this._outputViewContainer, dom.$('.output-view-container-left'));
-            this._outputRightContainer = dom.append(this._outputViewContainer, dom.$('.output-view-container-right'));
-            this._outputMetadataContainer = dom.append(this._outputViewContainer, dom.$('.output-view-container-metadata'));
+            this._outputLeftContainer = append(this._outputViewContainer, $('.output-view-container-left'));
+            this._outputRightContainer = append(this._outputViewContainer, $('.output-view-container-right'));
+            this._outputMetadataContainer = append(this._outputViewContainer, $('.output-view-container-metadata'));
             const outputModified = this.cell.checkIfOutputsModified();
             const outputMetadataChangeOnly = outputModified
                 && outputModified.kind === 1
@@ -1242,7 +1242,7 @@ let ModifiedElement = class ModifiedElement extends AbstractElementRenderer {
         this.cell.editorHeight = contentHeight;
     }
     layout(state) {
-        dom.scheduleAtNextAnimationFrame(dom.getWindow(this._diffEditorContainer), () => {
+        scheduleAtNextAnimationFrame(getWindow(this._diffEditorContainer), () => {
             if (state.editorHeight) {
                 this._editorContainer.style.height = `${this.cell.layoutInfo.editorHeight}px`;
                 this._editor.layout({

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

@@ -1,14 +1,14 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { Disposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { $, addStandardDisposableListener, addDisposableListener, EventType, append } from 'vscode/vscode/vs/base/browser/dom';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { SideBySideDiffElementViewModel } from './diffElementViewModel.js';
 import { DiffSide } from './notebookDiffEditorBrowser.js';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService';
-import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { mimetypeIcon } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
-import { StandardKeyboardEvent } from 'monaco-editor/esm/vs/base/browser/keyboardEvent.js';
-import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
+import { StandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEvent';
+import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
 
 class OutputElement extends Disposable {
     constructor(_notebookEditor, _notebookTextModel, _notebookService, _quickInputService, _diffElementViewModel, _diffSide, _nestedCell, _outputContainer, output) {
@@ -31,24 +31,24 @@ class OutputElement extends Disposable {
         const pickedMimeTypeRenderer = mimeTypes[pick];
         if (mimeTypes.length > 1) {
             outputItemDiv.style.position = 'relative';
-            const mimeTypePicker = dom.$('.multi-mimetype-output');
+            const mimeTypePicker = $('.multi-mimetype-output');
             mimeTypePicker.classList.add(...ThemeIcon.asClassNameArray(mimetypeIcon));
             mimeTypePicker.tabIndex = 0;
-            mimeTypePicker.title = ( nls.localizeWithPath(
+            mimeTypePicker.title = ( localizeWithPath(
                 'vs/workbench/contrib/notebook/browser/diff/diffElementOutputs',
                 'mimeTypePicker',
                 "Choose a different output mimetype, available mimetypes: {0}",
                 ( mimeTypes.map(mimeType => mimeType.mimeType)).join(', ')
             ));
             outputItemDiv.appendChild(mimeTypePicker);
-            this.resizeListener.add(dom.addStandardDisposableListener(mimeTypePicker, 'mousedown', async (e) => {
+            this.resizeListener.add(addStandardDisposableListener(mimeTypePicker, 'mousedown', async (e) => {
                 if (e.leftButton) {
                     e.preventDefault();
                     e.stopPropagation();
                     await this.pickActiveMimeTypeRenderer(this._notebookTextModel, this.output);
                 }
             }));
-            this.resizeListener.add((dom.addDisposableListener(mimeTypePicker, dom.EventType.KEY_DOWN, async (e) => {
+            this.resizeListener.add((addDisposableListener(mimeTypePicker, EventType.KEY_DOWN, async (e) => {
                 const event = ( new StandardKeyboardEvent(e));
                 if ((event.equals(3 ) || event.equals(10 ))) {
                     e.preventDefault();
@@ -57,8 +57,8 @@ class OutputElement extends Disposable {
                 }
             })));
         }
-        const innerContainer = dom.$('.output-inner-container');
-        dom.append(outputItemDiv, innerContainer);
+        const innerContainer = $('.output-inner-container');
+        append(outputItemDiv, innerContainer);
         if (mimeTypes.length !== 0) {
             const renderer = this._notebookService.getRendererInfo(pickedMimeTypeRenderer.rendererId);
             result = renderer
@@ -83,7 +83,7 @@ class OutputElement extends Disposable {
     }
     _renderMissingRenderer(viewModel, preferredMimeType) {
         if (!viewModel.model.outputs.length) {
-            return this._renderMessage(viewModel, ( nls.localizeWithPath(
+            return this._renderMessage(viewModel, ( localizeWithPath(
                 'vs/workbench/contrib/notebook/browser/diff/diffElementOutputs',
                 'empty',
                 "Cell has no output"
@@ -92,7 +92,7 @@ class OutputElement extends Disposable {
         if (!preferredMimeType) {
             const mimeTypes = ( viewModel.model.outputs.map(op => op.mime));
             const mimeTypesMessage = mimeTypes.join(', ');
-            return this._renderMessage(viewModel, ( nls.localizeWithPath(
+            return this._renderMessage(viewModel, ( localizeWithPath(
                 'vs/workbench/contrib/notebook/browser/diff/diffElementOutputs',
                 'noRenderer.2',
                 "No renderer could be found for output. It has the following mimetypes: {0}",
@@ -103,8 +103,8 @@ class OutputElement extends Disposable {
     }
     _renderSearchForMimetype(viewModel, mimeType) {
         const query = `@tag:notebookRenderer ${mimeType}`;
-        const p = dom.$('p', undefined, `No renderer could be found for mimetype "${mimeType}", but one might be available on the Marketplace.`);
-        const a = dom.$('a', { href: `command:workbench.extensions.search?%22${query}%22`, class: 'monaco-button monaco-text-button', tabindex: 0, role: 'button', style: 'padding: 8px; text-decoration: none; color: rgb(255, 255, 255); background-color: rgb(14, 99, 156); max-width: 200px;' }, `Search Marketplace`);
+        const p = $('p', undefined, `No renderer could be found for mimetype "${mimeType}", but one might be available on the Marketplace.`);
+        const a = $('a', { href: `command:workbench.extensions.search?%22${query}%22`, class: 'monaco-button monaco-text-button', tabindex: 0, role: 'button', style: 'padding: 8px; text-decoration: none; color: rgb(255, 255, 255); background-color: rgb(14, 99, 156); max-width: 200px;' }, `Search Marketplace`);
         return {
             type: 0 ,
             source: viewModel,
@@ -112,7 +112,7 @@ class OutputElement extends Disposable {
         };
     }
     _renderMessage(viewModel, message) {
-        const el = dom.$('p', undefined, message);
+        const el = $('p', undefined, message);
         return { type: 0 , source: viewModel, htmlContent: el.outerHTML };
     }
     async pickActiveMimeTypeRenderer(notebookTextModel, viewModel) {
@@ -123,7 +123,7 @@ class OutputElement extends Disposable {
             index: index,
             picked: index === currIndex,
             detail: this.generateRendererInfo(mimeType.rendererId),
-            description: index === currIndex ? ( nls.localizeWithPath(
+            description: index === currIndex ? ( localizeWithPath(
                 'vs/workbench/contrib/notebook/browser/diff/diffElementOutputs',
                 'curruentActiveMimeType',
                 "Currently Active"
@@ -133,12 +133,12 @@ class OutputElement extends Disposable {
         picker.items = items;
         picker.activeItems = items.filter(item => !!item.picked);
         picker.placeholder = items.length !== mimeTypes.length
-            ? ( nls.localizeWithPath(
+            ? ( localizeWithPath(
             'vs/workbench/contrib/notebook/browser/diff/diffElementOutputs',
             'promptChooseMimeTypeInSecure.placeHolder',
             "Select mimetype to render for current output. Rich mimetypes are available only when the notebook is trusted"
         ))
-            : ( nls.localizeWithPath(
+            : ( localizeWithPath(
             'vs/workbench/contrib/notebook/browser/diff/diffElementOutputs',
             'promptChooseMimeType.placeHolder',
             "Select mimetype to render for current output"
@@ -172,7 +172,7 @@ class OutputElement extends Disposable {
             const displayName = renderInfo.displayName !== '' ? renderInfo.displayName : renderInfo.id;
             return `${displayName} (${renderInfo.extensionId.value})`;
         }
-        return ( nls.localizeWithPath(
+        return ( localizeWithPath(
             'vs/workbench/contrib/notebook/browser/diff/diffElementOutputs',
             'builtinRenderInfo',
             "built-in"

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

@@ -1,8 +1,8 @@
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { hash } from 'monaco-editor/esm/vs/base/common/hash.js';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { hash } from 'vscode/vscode/vs/base/common/hash';
 import { toFormattedString } from 'vscode/vscode/vs/base/common/jsonFormatter';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { DiffEditorWidget } from 'monaco-editor/esm/vs/editor/browser/widget/diffEditor/diffEditorWidget.js';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { DiffEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/diffEditor/diffEditorWidget';
 import { fixedEditorPadding } from './diffCellEditorOptions.js';
 import { NotebookDiffViewEventType } from './eventDispatcher.js';
 import { DiffSide, DIFF_CELL_MARGIN } from './notebookDiffEditorBrowser.js';

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

@@ -1,8 +1,8 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { generateUuid } from 'monaco-editor/esm/vs/base/common/uuid.js';
-import { PrefixSumComputer } from 'monaco-editor/esm/vs/editor/common/model/prefixSumComputer.js';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
+import { PrefixSumComputer } from 'vscode/vscode/vs/editor/common/model/prefixSumComputer';
 import { CellOutputViewModel } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/viewModel/cellOutputViewModel';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService';
 

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

@@ -1,5 +1,5 @@
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 
 var NotebookDiffViewEventType;
 ( (function(NotebookDiffViewEventType) {

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

@@ -1,16 +1,16 @@
-import { IBulkEditService, ResourceTextEdit } from 'monaco-editor/esm/vs/editor/browser/services/bulkEditService.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { registerAction2, Action2, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { IBulkEditService, ResourceTextEdit } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { SideBySideDiffElementViewModel } from './diffElementViewModel.js';
 import { NOTEBOOK_DIFF_CELL_PROPERTY, NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED, NOTEBOOK_DIFF_CELL_INPUT } from './notebookDiffEditorBrowser.js';
 import { NotebookTextDiffEditor } from './notebookDiffEditor.js';
 import { openAsTextIcon, revertIcon, renderOutputIcon, previousChangeIcon, nextChangeIcon } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
-import { Extensions } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
+import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { DEFAULT_EDITOR_ASSOCIATION } from 'vscode/vscode/vs/workbench/common/editor';
 import { NOTEBOOK_DIFF_EDITOR_ID } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 

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

@@ -1,32 +1,32 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { findLastIdx } from 'monaco-editor/esm/vs/base/common/arraysFind.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
-import { registerThemingParticipant, IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { append, $ as $$1, addStandardDisposableGenericMouseDownListener, addStandardDisposableGenericMouseUpListener, scheduleAtNextAnimationFrame, getWindow } 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';
+import { registerThemingParticipant, IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { getDefaultNotebookCreationOptions } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditorWidget';
-import { CancellationTokenSource } from 'monaco-editor/esm/vs/base/common/cancellation.js';
+import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { SideBySideDiffElementViewModel, SingleSideDiffElementViewModel } from './diffElementViewModel.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { CellDiffSingleSideRenderer, CellDiffSideBySideRenderer, NotebookTextDiffList, NotebookCellTextDiffListDelegate } from './notebookDiffList.js';
-import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { editorBackground, foreground, focusBorder, diffDiagonalFill } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { editorBackground, foreground, focusBorder, diffDiagonalFill } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
 import { INotebookEditorWorkerService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/services/notebookWorkerService';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { BareFontInfo } from 'monaco-editor/esm/vs/editor/common/config/fontInfo.js';
-import { PixelRatio } from 'monaco-editor/esm/vs/base/browser/browser.js';
+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 { DiffSide, DIFF_CELL_MARGIN } from './notebookDiffEditorBrowser.js';
-import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
-import { DisposableStore, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
+import { DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 import { NOTEBOOK_DIFF_EDITOR_ID, NotebookSetting, CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { SequencerByKey } from 'monaco-editor/esm/vs/base/common/async.js';
-import { generateUuid } from 'monaco-editor/esm/vs/base/common/uuid.js';
+import { SequencerByKey } from 'vscode/vscode/vs/base/common/async';
+import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
 import { DiffNestedCellViewModel } from './diffNestedCellViewModel.js';
 import { BackLayerWebView } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView';
 import { NotebookDiffEditorEventDispatcher, NotebookDiffLayoutChangedEvent } from './eventDispatcher.js';
-import { FontMeasurements } from 'monaco-editor/esm/vs/editor/browser/config/fontMeasurements.js';
+import { FontMeasurements } from 'vscode/vscode/vs/editor/browser/config/fontMeasurements';
 import { NotebookOptions } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookOptions';
 import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 import { cellRangesToIndexes, cellIndexesToRanges } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookRange';
@@ -34,7 +34,7 @@ import { NotebookDiffOverviewRuler } from './notebookDiffOverviewRuler.js';
 import { registerZIndex, ZIndex } from 'vscode/vscode/vs/platform/layout/browser/zIndexRegistry';
 
 var NotebookTextDiffEditor_1;
-const $ = dom.$;
+const $ = $$1;
 class NotebookDiffEditorSelection {
     constructor(selections) {
         this.selections = selections;
@@ -163,15 +163,15 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
     didResizeOutput(cellId) {
     }
     createEditor(parent) {
-        this._rootElement = dom.append(parent, dom.$('.notebook-text-diff-editor'));
+        this._rootElement = append(parent, $$1('.notebook-text-diff-editor'));
         this._overflowContainer = document.createElement('div');
         this._overflowContainer.classList.add('notebook-overflow-widget-container', 'monaco-editor');
-        dom.append(parent, this._overflowContainer);
+        append(parent, this._overflowContainer);
         const renderers = [
             this.instantiationService.createInstance(CellDiffSingleSideRenderer, this),
             this.instantiationService.createInstance(CellDiffSideBySideRenderer, this),
         ];
-        this._listViewContainer = dom.append(this._rootElement, dom.$('.notebook-diff-list-view'));
+        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, {
             setRowLineHeight: false,
             setRowHeight: false,
@@ -203,7 +203,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
             accessibilityProvider: {
                 getAriaLabel() { return null; },
                 getWidgetAriaLabel() {
-                    return ( nls.localizeWithPath(
+                    return ( localizeWithPath(
                         'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor',
                         'notebookTreeAriaLabel',
                         "Notebook Text Diff"
@@ -225,14 +225,14 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
         this._overviewRulerContainer.classList.add('notebook-overview-ruler-container');
         this._rootElement.appendChild(this._overviewRulerContainer);
         this._registerOverviewRuler();
-        this._webviewTransparentCover = dom.append(this._list.rowsContainer, $('.webview-cover'));
+        this._webviewTransparentCover = append(this._list.rowsContainer, $('.webview-cover'));
         this._webviewTransparentCover.style.display = 'none';
-        this._register(dom.addStandardDisposableGenericMouseDownListener(this._overflowContainer, (e) => {
+        this._register(addStandardDisposableGenericMouseDownListener(this._overflowContainer, (e) => {
             if (e.target.classList.contains('slider') && this._webviewTransparentCover) {
                 this._webviewTransparentCover.style.display = 'block';
             }
         }));
-        this._register(dom.addStandardDisposableGenericMouseUpListener(this._overflowContainer, () => {
+        this._register(addStandardDisposableGenericMouseUpListener(this._overflowContainer, () => {
             if (this._webviewTransparentCover) {
                 this._webviewTransparentCover.style.display = 'none';
             }
@@ -326,7 +326,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
     _attachModel() {
         this._eventDispatcher = ( new NotebookDiffEditorEventDispatcher());
         const updateInsets = () => {
-            dom.scheduleAtNextAnimationFrame(dom.getWindow(this._listViewContainer), () => {
+            scheduleAtNextAnimationFrame(getWindow(this._listViewContainer), () => {
                 if (this._isDisposed) {
                     return;
                 }
@@ -578,7 +578,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
             diffSide = diffElement.type === 'insert' ? DiffSide.Modified : DiffSide.Original;
         }
         const webview = diffSide === DiffSide.Modified ? this._modifiedWebview : this._originalWebview;
-        dom.scheduleAtNextAnimationFrame(dom.getWindow(this._listViewContainer), () => {
+        scheduleAtNextAnimationFrame(getWindow(this._listViewContainer), () => {
             webview?.ackHeight([{ cellId: cellInfo.cellId, outputId, height }]);
         }, 10);
     }
@@ -590,7 +590,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
             this.pendingLayouts.get(cell).dispose();
         }
         let r;
-        const layoutDisposable = dom.scheduleAtNextAnimationFrame(dom.getWindow(this._listViewContainer), () => {
+        const layoutDisposable = scheduleAtNextAnimationFrame(getWindow(this._listViewContainer), () => {
             this.pendingLayouts.delete(cell);
             relayout(cell, height);
             r();

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

@@ -1,4 +1,4 @@
-import { RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 
 var DiffSide;
 ( (function(DiffSide) {