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

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

@@ -1,27 +1,27 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import './notebookDiff.css.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { MouseController, isMonacoEditor } from 'monaco-editor/esm/vs/base/browser/ui/list/listWidget.js';
-import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { WorkbenchList, IListService } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
-import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
+import { $, append, createStyleSheet } from 'vscode/vscode/vs/base/browser/dom';
+import { MouseController, isMonacoEditor } from 'vscode/vscode/vs/base/browser/ui/list/listWidget';
+import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { WorkbenchList, IListService } from 'vscode/vscode/vs/platform/list/browser/listService';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { DIFF_CELL_MARGIN } from './notebookDiffEditorBrowser.js';
 import { InsertElement, DeletedElement, getOptimizedNestedCodeEditorWidgetOptions, ModifiedElement } from './diffComponents.js';
-import { CodeEditorWidget } from 'monaco-editor/esm/vs/editor/browser/widget/codeEditorWidget.js';
-import { DiffEditorWidget } from 'monaco-editor/esm/vs/editor/browser/widget/diffEditor/diffEditorWidget.js';
-import { MenuItemAction, IMenuService } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
-import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
+import { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditorWidget';
+import { DiffEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/diffEditor/diffEditorWidget';
+import { MenuItemAction, IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+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 'monaco-editor/esm/vs/editor/common/config/fontInfo.js';
-import { PixelRatio } from 'monaco-editor/esm/vs/base/browser/browser.js';
-import { WorkbenchToolBar } from 'monaco-editor/esm/vs/platform/actions/browser/toolbar.js';
+import { BareFontInfo } from 'vscode/vscode/vs/editor/common/config/fontInfo';
+import { PixelRatio } from 'vscode/vscode/vs/base/browser/browser';
+import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 import { fixedEditorOptions, fixedDiffEditorOptions } from './diffCellEditorOptions.js';
-import { IAccessibilityService } from 'monaco-editor/esm/vs/platform/accessibility/common/accessibility.js';
+import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
 
 var CellDiffSingleSideRenderer_1, CellDiffSideBySideRenderer_1;
 let NotebookCellTextDiffListDelegate = class NotebookCellTextDiffListDelegate {
@@ -61,22 +61,22 @@ let CellDiffSingleSideRenderer = class CellDiffSingleSideRenderer {
         return CellDiffSingleSideRenderer_1.TEMPLATE_ID;
     }
     renderTemplate(container) {
-        const body = dom.$('.cell-body');
-        dom.append(container, body);
-        const diffEditorContainer = dom.$('.cell-diff-editor-container');
-        dom.append(body, diffEditorContainer);
-        const diagonalFill = dom.append(body, dom.$('.diagonal-fill'));
-        const sourceContainer = dom.append(diffEditorContainer, dom.$('.source-container'));
+        const body = $('.cell-body');
+        append(container, body);
+        const diffEditorContainer = $('.cell-diff-editor-container');
+        append(body, diffEditorContainer);
+        const diagonalFill = append(body, $('.diagonal-fill'));
+        const sourceContainer = append(diffEditorContainer, $('.source-container'));
         const editor = this._buildSourceEditor(sourceContainer);
-        const metadataHeaderContainer = dom.append(diffEditorContainer, dom.$('.metadata-header-container'));
-        const metadataInfoContainer = dom.append(diffEditorContainer, dom.$('.metadata-info-container'));
-        const outputHeaderContainer = dom.append(diffEditorContainer, dom.$('.output-header-container'));
-        const outputInfoContainer = dom.append(diffEditorContainer, dom.$('.output-info-container'));
-        const borderContainer = dom.append(body, dom.$('.border-container'));
-        const leftBorder = dom.append(borderContainer, dom.$('.left-border'));
-        const rightBorder = dom.append(borderContainer, dom.$('.right-border'));
-        const topBorder = dom.append(borderContainer, dom.$('.top-border'));
-        const bottomBorder = dom.append(borderContainer, dom.$('.bottom-border'));
+        const metadataHeaderContainer = append(diffEditorContainer, $('.metadata-header-container'));
+        const metadataInfoContainer = append(diffEditorContainer, $('.metadata-info-container'));
+        const outputHeaderContainer = append(diffEditorContainer, $('.output-header-container'));
+        const outputInfoContainer = append(diffEditorContainer, $('.output-info-container'));
+        const borderContainer = append(body, $('.border-container'));
+        const leftBorder = append(borderContainer, $('.left-border'));
+        const rightBorder = append(borderContainer, $('.right-border'));
+        const topBorder = append(borderContainer, $('.top-border'));
+        const bottomBorder = append(borderContainer, $('.bottom-border'));
         return {
             body,
             container,
@@ -95,7 +95,7 @@ let CellDiffSingleSideRenderer = class CellDiffSingleSideRenderer {
         };
     }
     _buildSourceEditor(sourceContainer) {
-        const editorContainer = dom.append(sourceContainer, dom.$('.editor-container'));
+        const editorContainer = append(sourceContainer, $('.editor-container'));
         const editor = this.instantiationService.createInstance(CodeEditorWidget, editorContainer, {
             ...fixedEditorOptions,
             dimension: {
@@ -148,14 +148,14 @@ let CellDiffSideBySideRenderer = class CellDiffSideBySideRenderer {
         return CellDiffSideBySideRenderer_1.TEMPLATE_ID;
     }
     renderTemplate(container) {
-        const body = dom.$('.cell-body');
-        dom.append(container, body);
-        const diffEditorContainer = dom.$('.cell-diff-editor-container');
-        dom.append(body, diffEditorContainer);
-        const sourceContainer = dom.append(diffEditorContainer, dom.$('.source-container'));
+        const body = $('.cell-body');
+        append(container, body);
+        const diffEditorContainer = $('.cell-diff-editor-container');
+        append(body, diffEditorContainer);
+        const sourceContainer = append(diffEditorContainer, $('.source-container'));
         const { editor, editorContainer } = this._buildSourceEditor(sourceContainer);
-        const inputToolbarContainer = dom.append(sourceContainer, dom.$('.editor-input-toolbar-container'));
-        const cellToolbarContainer = dom.append(inputToolbarContainer, dom.$('div.property-toolbar'));
+        const inputToolbarContainer = append(sourceContainer, $('.editor-input-toolbar-container'));
+        const cellToolbarContainer = append(inputToolbarContainer, $('div.property-toolbar'));
         const toolbar = this.instantiationService.createInstance(WorkbenchToolBar, cellToolbarContainer, {
             actionViewItemProvider: action => {
                 if (action instanceof MenuItemAction) {
@@ -174,15 +174,15 @@ let CellDiffSideBySideRenderer = class CellDiffSideBySideRenderer {
                 return undefined;
             }
         });
-        const metadataHeaderContainer = dom.append(diffEditorContainer, dom.$('.metadata-header-container'));
-        const metadataInfoContainer = dom.append(diffEditorContainer, dom.$('.metadata-info-container'));
-        const outputHeaderContainer = dom.append(diffEditorContainer, dom.$('.output-header-container'));
-        const outputInfoContainer = dom.append(diffEditorContainer, dom.$('.output-info-container'));
-        const borderContainer = dom.append(body, dom.$('.border-container'));
-        const leftBorder = dom.append(borderContainer, dom.$('.left-border'));
-        const rightBorder = dom.append(borderContainer, dom.$('.right-border'));
-        const topBorder = dom.append(borderContainer, dom.$('.top-border'));
-        const bottomBorder = dom.append(borderContainer, dom.$('.bottom-border'));
+        const metadataHeaderContainer = append(diffEditorContainer, $('.metadata-header-container'));
+        const metadataInfoContainer = append(diffEditorContainer, $('.metadata-info-container'));
+        const outputHeaderContainer = append(diffEditorContainer, $('.output-header-container'));
+        const outputInfoContainer = append(diffEditorContainer, $('.output-info-container'));
+        const borderContainer = append(body, $('.border-container'));
+        const leftBorder = append(borderContainer, $('.left-border'));
+        const rightBorder = append(borderContainer, $('.right-border'));
+        const topBorder = append(borderContainer, $('.top-border'));
+        const bottomBorder = append(borderContainer, $('.bottom-border'));
         return {
             body,
             container,
@@ -203,7 +203,7 @@ let CellDiffSideBySideRenderer = class CellDiffSideBySideRenderer {
         };
     }
     _buildSourceEditor(sourceContainer) {
-        const editorContainer = dom.append(sourceContainer, dom.$('.editor-container'));
+        const editorContainer = append(sourceContainer, $('.editor-container'));
         const editor = this.instantiationService.createInstance(DiffEditorWidget, editorContainer, {
             ...fixedDiffEditorOptions,
             padding: {
@@ -306,7 +306,7 @@ let NotebookTextDiffList = class NotebookTextDiffList extends WorkbenchList {
     style(styles) {
         const selectorSuffix = this.view.domId;
         if (!this.styleElement) {
-            this.styleElement = dom.createStyleSheet(this.view.domNode);
+            this.styleElement = createStyleSheet(this.view.domNode);
         }
         const suffix = selectorSuffix && `.${selectorSuffix}`;
         const content = [];

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

@@ -1,11 +1,11 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import * as browser from 'monaco-editor/esm/vs/base/browser/browser.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { createFastDomNode } from 'monaco-editor/esm/vs/base/browser/fastDomNode.js';
-import { Color } from 'monaco-editor/esm/vs/base/common/color.js';
-import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { diffOverviewRulerInserted, diffInserted, defaultInsertColor, diffOverviewRulerRemoved, diffRemoved, defaultRemoveColor } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
-import { Themable, IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
+import { PixelRatio } from 'vscode/vscode/vs/base/browser/browser';
+import { addStandardDisposableListener, EventType, runAtThisOrScheduleAtNextAnimationFrame, getWindow } from 'vscode/vscode/vs/base/browser/dom';
+import { createFastDomNode } from 'vscode/vscode/vs/base/browser/fastDomNode';
+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';
+import { Themable, IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 
 const MINIMUM_SLIDER_SIZE = 20;
 let NotebookDiffOverviewRuler = class NotebookDiffOverviewRuler extends Themable {
@@ -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(browser.PixelRatio.onDidChange(() => {
+        this._register(PixelRatio.onDidChange(() => {
             this._scheduleRender();
         }));
         this._register(this.themeService.onDidColorThemeChange(e => {
@@ -44,7 +44,7 @@ let NotebookDiffOverviewRuler = class NotebookDiffOverviewRuler extends Themable
         this._register(this.notebookEditor.onDidScroll(() => {
             this._renderOverviewViewport();
         }));
-        this._register(dom.addStandardDisposableListener(container, dom.EventType.POINTER_DOWN, (e) => {
+        this._register(addStandardDisposableListener(container, EventType.POINTER_DOWN, (e) => {
             this.notebookEditor.delegateVerticalScrollbarPointerDown(e);
         }));
     }
@@ -80,7 +80,7 @@ let NotebookDiffOverviewRuler = class NotebookDiffOverviewRuler extends Themable
     }
     _scheduleRender() {
         if (this._renderAnimationFrame === null) {
-            this._renderAnimationFrame = dom.runAtThisOrScheduleAtNextAnimationFrame(dom.getWindow(this._domNode.domNode), this._onRenderScheduled.bind(this), 16);
+            this._renderAnimationFrame = runAtThisOrScheduleAtNextAnimationFrame(getWindow(this._domNode.domNode), this._onRenderScheduled.bind(this), 16);
         }
     }
     _onRenderScheduled() {
@@ -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 = browser.PixelRatio.value;
+        const ratio = PixelRatio.value;
         this._domNode.setWidth(this.width);
         this._domNode.setHeight(height);
         this._domNode.domNode.width = this.width * ratio;