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

package/notebook.js

@@ -1,4 +1,4 @@
-import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService';
 import { NotebookService } from './vscode/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.js';
 import { INotebookEditorModelResolverService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-notebook-service-override",
-  "version": "1.85.6",
+  "version": "2.0.0-v2.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -9,7 +9,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/CodinGame/monaco-vscode-api.git"
+    "url": "git@github.com:CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
   "private": false,
@@ -18,8 +18,8 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.85.6",
-    "monaco-editor": "0.45.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@2.0.0-v2.1",
+    "vscode-marked": "npm:marked@=3.0.2"
   },
   "exports": {
     ".": {

package/vscode/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.js

@@ -1,32 +1,32 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import './emptyTextEditorHint.css.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { dispose, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
+import { addDisposableListener, $ as $$1 } from 'vscode/vscode/vs/base/browser/dom';
+import { dispose, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { ChangeLanguageAction } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorStatus';
-import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
-import { PLAINTEXT_LANGUAGE_ID } from 'monaco-editor/esm/vs/editor/common/languages/modesRegistry.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { registerEditorContribution } from 'monaco-editor/esm/vs/editor/browser/editorExtensions.js';
-import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { PLAINTEXT_LANGUAGE_ID } from 'vscode/vscode/vs/editor/common/languages/modesRegistry';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { Event } from 'vscode/vscode/vs/base/common/event';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { registerEditorContribution } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
-import { renderFormattedText } from 'monaco-editor/esm/vs/base/browser/formattedTextRenderer.js';
+import { renderFormattedText } from 'vscode/vscode/vs/base/browser/formattedTextRenderer';
 import { ApplyFileSnippetAction } from 'vscode/vscode/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets';
 import { IInlineChatSessionService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSession';
 import { IInlineChatService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
-import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
-import { KeybindingLabel } from 'monaco-editor/esm/vs/base/browser/ui/keybindingLabel/keybindingLabel.js';
-import { OS } from 'monaco-editor/esm/vs/base/common/platform.js';
-import { status } from 'monaco-editor/esm/vs/base/browser/ui/aria/aria.js';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
+import { KeybindingLabel } from 'vscode/vscode/vs/base/browser/ui/keybindingLabel/keybindingLabel';
+import { OS } from 'vscode/vscode/vs/base/common/platform';
+import { status } from 'vscode/vscode/vs/base/browser/ui/aria/aria';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/configuration';
 import { OUTPUT_MODE_ID, LOG_MODE_ID } from 'vscode/vscode/vs/workbench/services/output/common/output';
 import { SEARCH_RESULT_LANGUAGE_ID } from 'vscode/vscode/vs/workbench/services/search/common/search';
 
-const $ = dom.$;
+const $ = $$1;
 ( Registry.as(Extensions.ConfigurationMigration))
     .registerConfigurationMigrations([{
         key: 'workbench.editor.untitled.hint',
@@ -364,7 +364,7 @@ class EmptyTextEditorHintContentWidget {
                 ' Toggle {0} in settings to disable this hint.',
                 "accessibility.verbosity.emptyEditorHint"
             )));
-            this.toDispose.add(dom.addDisposableListener(this.domNode, 'click', () => {
+            this.toDispose.add(addDisposableListener(this.domNode, 'click', () => {
                 this.editor.focus();
             }));
             this.editor.applyFontInfo(this.domNode);

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

@@ -1,10 +1,10 @@
-import { KeyChord } from 'monaco-editor/esm/vs/base/common/keyCodes.js';
-import { Mimes } from 'monaco-editor/esm/vs/base/common/mime.js';
-import { IBulkEditService, ResourceTextEdit } from 'monaco-editor/esm/vs/editor/browser/services/bulkEditService.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { registerAction2, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { InputFocusedContext, InputFocusedContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkeys.js';
+import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
+import { Mimes } from 'vscode/vscode/vs/base/common/mime';
+import { IBulkEditService, ResourceTextEdit } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { registerAction2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { InputFocusedContext, InputFocusedContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
 import { ResourceNotebookCellEdit } from 'vscode/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
 import { moveCellRange, copyCellRange, computeCellLinesContents, joinCellsWithSurrounds, joinSelectedCells, changeCellToKind } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
 import { NotebookCellAction, CELL_TITLE_CELL_GROUP_ID, NotebookMultiCellAction, parseMultiCellExecutionArgs, cellExecutionArgs } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
@@ -12,9 +12,9 @@ import { CellFocusMode, EXPAND_CELL_INPUT_COMMAND_ID, EXPAND_CELL_OUTPUT_COMMAND
 import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_HAS_OUTPUTS } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { moveUpIcon, moveDownIcon, splitCellIcon } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { CellKind, NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
-import { EditorContextKeys } from 'monaco-editor/esm/vs/editor/common/editorContextKeys.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 
 const MOVE_CELL_UP_COMMAND_ID = 'notebook.cell.moveUp';
 const MOVE_CELL_DOWN_COMMAND_ID = 'notebook.cell.moveDown';

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/contributedStatusBarItemController.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { Throttler } from 'monaco-editor/esm/vs/base/common/async.js';
-import { CancellationTokenSource } from 'monaco-editor/esm/vs/base/common/cancellation.js';
-import { Disposable, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Throttler } from 'vscode/vscode/vs/base/common/async';
+import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
+import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { NotebookVisibleCellObserver } from './notebookVisibleCellObserver.js';
 import { registerNotebookContribution } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 import { INotebookCellStatusBarService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCellStatusBarService';

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.js

@@ -1,11 +1,11 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { disposableTimeout, RunOnceScheduler } from 'monaco-editor/esm/vs/base/common/async.js';
-import { Disposable, MutableDisposable, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { language } from 'monaco-editor/esm/vs/base/common/platform.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { themeColorFromId } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
-import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
+import { disposableTimeout, RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
+import { Disposable, MutableDisposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { language } from 'vscode/vscode/vs/base/common/platform';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { themeColorFromId } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { NotebookVisibleCellObserver } from './notebookVisibleCellObserver.js';
 import { registerNotebookContribution } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 import { cellStatusIconSuccess, cellStatusIconError } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditorWidget';

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/notebookVisibleCellObserver.js

@@ -1,7 +1,7 @@
-import { diffSets } from 'monaco-editor/esm/vs/base/common/collections.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { isDefined } from 'monaco-editor/esm/vs/base/common/types.js';
+import { diffSets } from 'vscode/vscode/vs/base/common/collections';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { isDefined } from 'vscode/vscode/vs/base/common/types';
 import { cellRangesToIndexes } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookRange';
 
 class NotebookVisibleCellObserver extends Disposable {

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders.js

@@ -1,12 +1,12 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
-import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.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 { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
+import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { CHANGE_CELL_LANGUAGE, DETECT_CELL_LANGUAGE } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookCellStatusBarService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCellStatusBarService';

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.js

@@ -1,27 +1,27 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { expandCellRangesWithHiddenCells, cellRangeToViewCells, getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CopyAction, PasteAction, CutAction } from 'monaco-editor/esm/vs/editor/contrib/clipboard/browser/clipboard.js';
-import { IClipboardService } from 'monaco-editor/esm/vs/platform/clipboard/common/clipboardService.js';
+import { CopyAction, PasteAction, CutAction } from 'vscode/vscode/vs/editor/contrib/clipboard/browser/clipboard';
+import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
 import { cloneNotebookCellTextModel } from 'vscode/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 import { SelectionStateType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService';
-import * as platform from 'monaco-editor/esm/vs/base/common/platform.js';
-import { registerAction2, MenuId, Action2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
+import { isNative } from 'vscode/vscode/vs/base/common/platform';
+import { registerAction2, MenuId, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { NotebookCellAction, NotebookAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { InputFocusedContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkeys.js';
-import { UndoCommand, RedoCommand } from 'monaco-editor/esm/vs/editor/browser/editorExtensions.js';
-import { Categories } from 'monaco-editor/esm/vs/platform/action/common/actionCommonCategories.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { InputFocusedContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
+import { UndoCommand, RedoCommand } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { showWindowLogActionId } from 'vscode/vscode/vs/workbench/services/log/common/logConstants';
-import { getWindow, getActiveElement } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { getWindow, getActiveElement } from 'vscode/vscode/vs/base/browser/dom';
 
 let _logging = false;
 function toggleLogging() {
@@ -339,7 +339,7 @@ registerAction2(class extends NotebookCellAction {
                 when: NOTEBOOK_EDITOR_FOCUSED,
                 group: "1_copy" ,
             },
-            keybinding: platform.isNative ? undefined : {
+            keybinding: isNative ? undefined : {
                 primary: 2048  | 33 ,
                 win: { primary: 2048  | 33 , secondary: [2048  | 19 ] },
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
@@ -365,7 +365,7 @@ registerAction2(class extends NotebookCellAction {
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE)),
                 group: "1_copy" ,
             },
-            keybinding: platform.isNative ? undefined : {
+            keybinding: isNative ? undefined : {
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
                 primary: 2048  | 54 ,
                 win: { primary: 2048  | 54 , secondary: [1024  | 20 ] },
@@ -391,7 +391,7 @@ registerAction2(class extends NotebookAction {
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE)),
                 group: "1_copy" ,
             },
-            keybinding: platform.isNative ? undefined : {
+            keybinding: isNative ? undefined : {
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
                 primary: 2048  | 52 ,
                 win: { primary: 2048  | 52 , secondary: [1024  | 19 ] },

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookBreakpoints.js

@@ -1,9 +1,9 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { isEqual } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { isEqual } from 'vscode/vscode/vs/base/common/resources';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookCellPausing.js

@@ -1,8 +1,8 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { RunOnceScheduler } from 'monaco-editor/esm/vs/base/common/async.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookDebugDecorations.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { debugIconBreakpointForeground } from 'vscode/vscode/vs/workbench/contrib/debug/browser/breakpointEditorContribution';
 import { topStackFrameColor, focusedStackFrameColor } from 'vscode/vscode/vs/workbench/contrib/debug/browser/callStackEditorContribution';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/editorHint/emptyCellEditorHint.js

@@ -1,11 +1,11 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { registerEditorContribution } from 'monaco-editor/esm/vs/editor/browser/editorExtensions.js';
-import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { registerEditorContribution } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { EmptyTextEditorHintContribution } from '../../../../codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.js';
 import { IInlineChatSessionService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSession';
 import { IInlineChatService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';

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

@@ -1,11 +1,11 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { Disposable, DisposableStore, MutableDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { ILanguageFeaturesService } from 'monaco-editor/esm/vs/editor/common/services/languageFeatures.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { Disposable, DisposableStore, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { CENTER_ACTIVE_CELL } from '../navigation/arrow.js';
 import { SELECT_KERNEL_ID } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
@@ -106,14 +106,14 @@ let KernelStatus = class KernelStatus extends Disposable {
             }
             const tooltip = kernel.description ?? kernel.detail ?? kernel.label;
             this._kernelInfoElement.add(this._statusbarService.addEntry({
-                name: ( nls.localizeWithPath(
+                name: ( localizeWithPath(
                     'vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar',
                     'notebook.info',
                     "Notebook Kernel Info"
                 )),
                 text: `$(notebook-kernel-select) ${kernel.label}`,
                 ariaLabel: kernel.label,
-                tooltip: isSuggested ? ( nls.localizeWithPath(
+                tooltip: isSuggested ? ( localizeWithPath(
                     'vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar',
                     'tooltop',
                     "{0} (suggestion)",
@@ -125,17 +125,17 @@ let KernelStatus = class KernelStatus extends Disposable {
         }
         else {
             this._kernelInfoElement.add(this._statusbarService.addEntry({
-                name: ( nls.localizeWithPath(
+                name: ( localizeWithPath(
                     'vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar',
                     'notebook.select',
                     "Notebook Kernel Selection"
                 )),
-                text: ( nls.localizeWithPath(
+                text: ( localizeWithPath(
                     'vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar',
                     'kernel.select.label',
                     "Select Kernel"
                 )),
-                ariaLabel: ( nls.localizeWithPath(
+                ariaLabel: ( localizeWithPath(
                     'vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar',
                     'kernel.select.label',
                     "Select Kernel"
@@ -185,7 +185,7 @@ let ActiveCellStatus = class ActiveCellStatus extends Disposable {
             return;
         }
         const entry = {
-            name: ( nls.localizeWithPath(
+            name: ( localizeWithPath(
                 'vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar',
                 'notebook.activeCellStatusName',
                 "Notebook Editor Selections"
@@ -213,14 +213,14 @@ let ActiveCellStatus = class ActiveCellStatus extends Disposable {
         const numSelected = editor.getSelections().reduce((prev, range) => prev + (range.end - range.start), 0);
         const totalCells = editor.getLength();
         return numSelected > 1 ?
-            ( nls.localizeWithPath(
+            ( localizeWithPath(
                 'vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar',
                 'notebook.multiActiveCellIndicator',
                 "Cell {0} ({1} selected)",
                 idxFocused,
                 numSelected
             )) :
-            ( nls.localizeWithPath(
+            ( localizeWithPath(
                 'vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar',
                 'notebook.singleActiveCellIndicator',
                 "Cell {0} of {1}",

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/execute/executionEditorProgress.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { throttle } from 'monaco-editor/esm/vs/base/common/decorators.js';
-import { Disposable, MutableDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { throttle } from 'vscode/vscode/vs/base/common/decorators';
+import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { registerNotebookContribution } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 import { NotebookCellExecutionState } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFind.js

@@ -1,12 +1,12 @@
 import './media/notebookFind.css.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { isEqual } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
-import { EditorContextKeys } from 'monaco-editor/esm/vs/editor/common/editorContextKeys.js';
-import { StartFindAction, StartFindReplaceAction, getSelectionSearchString } from 'monaco-editor/esm/vs/editor/contrib/find/browser/findController.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { registerAction2, Action2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { isEqual } from 'vscode/vscode/vs/base/common/resources';
+import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
+import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
+import { StartFindAction, StartFindReplaceAction, getSelectionSearchString } from 'vscode/vscode/vs/editor/contrib/find/browser/findController';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { NotebookFindContrib } from './notebookFindWidget.js';
 import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { registerNotebookContribution } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.js

@@ -1,18 +1,18 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { alert } from 'monaco-editor/esm/vs/base/browser/ui/aria/aria.js';
-import { Lazy } from 'monaco-editor/esm/vs/base/common/lazy.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import * as strings from 'monaco-editor/esm/vs/base/common/strings.js';
-import { MATCHES_LIMIT } from 'monaco-editor/esm/vs/editor/contrib/find/browser/findModel.js';
-import { FindReplaceState } from 'monaco-editor/esm/vs/editor/contrib/find/browser/findState.js';
-import { NLS_MATCHES_LOCATION, NLS_NO_RESULTS } from 'monaco-editor/esm/vs/editor/contrib/find/browser/findWidget.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { IMenuService } from 'monaco-editor/esm/vs/platform/actions/common/actions.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 { IContextViewService, IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { append, addDisposableListener, EventType, getWindow } from 'vscode/vscode/vs/base/browser/dom';
+import { alert } from 'vscode/vscode/vs/base/browser/ui/aria/aria';
+import { Lazy } from 'vscode/vscode/vs/base/common/lazy';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { format } from 'vscode/vscode/vs/base/common/strings';
+import { MATCHES_LIMIT } from 'vscode/vscode/vs/editor/contrib/find/browser/findModel';
+import { FindReplaceState } from 'vscode/vscode/vs/editor/contrib/find/browser/findState';
+import { NLS_MATCHES_LOCATION, NLS_NO_RESULTS } from 'vscode/vscode/vs/editor/contrib/find/browser/findWidget';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextViewService, IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { FindModel } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/contrib/find/findModel';
 import { SimpleFindReplaceWidget } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget';
 import { CellEditState } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
@@ -51,7 +51,7 @@ let NotebookFindWidget = class NotebookFindWidget extends SimpleFindReplaceWidge
         this._showTimeout = null;
         this._hideTimeout = null;
         this._findModel = ( new FindModel(this._notebookEditor, this._state, this._configurationService));
-        dom.append(this._notebookEditor.getDomNode(), this.getDomNode());
+        append(this._notebookEditor.getDomNode(), this.getDomNode());
         this._findWidgetFocused = KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED.bindTo(contextKeyService);
         this._register(this._findInput.onKeyDown((e) => this._onFindInputKeyDown(e)));
         this._register(this._replaceInput.onKeyDown((e) => this._onReplaceInputKeyDown(e)));
@@ -75,7 +75,7 @@ let NotebookFindWidget = class NotebookFindWidget extends SimpleFindReplaceWidge
                 this._findInput.updateFilterState(this._state.filters?.isModified() ?? false);
             }
         }));
-        this._register(dom.addDisposableListener(this.getDomNode(), dom.EventType.FOCUS, e => {
+        this._register(addDisposableListener(this.getDomNode(), EventType.FOCUS, e => {
             this._previousFocusElement = e.relatedTarget instanceof HTMLElement ? e.relatedTarget : undefined;
         }, true));
     }
@@ -190,12 +190,12 @@ let NotebookFindWidget = class NotebookFindWidget extends SimpleFindReplaceWidge
         }
         if (this._showTimeout === null) {
             if (this._hideTimeout !== null) {
-                dom.getWindow(this.getDomNode()).clearTimeout(this._hideTimeout);
+                getWindow(this.getDomNode()).clearTimeout(this._hideTimeout);
                 this._hideTimeout = null;
                 this._notebookEditor.removeClassName(FIND_HIDE_TRANSITION);
             }
             this._notebookEditor.addClassName(FIND_SHOW_TRANSITION);
-            this._showTimeout = dom.getWindow(this.getDomNode()).setTimeout(() => {
+            this._showTimeout = getWindow(this.getDomNode()).setTimeout(() => {
                 this._notebookEditor.removeClassName(FIND_SHOW_TRANSITION);
                 this._showTimeout = null;
             }, 200);
@@ -207,12 +207,12 @@ let NotebookFindWidget = class NotebookFindWidget extends SimpleFindReplaceWidge
         this._replaceInput.select();
         if (this._showTimeout === null) {
             if (this._hideTimeout !== null) {
-                dom.getWindow(this.getDomNode()).clearTimeout(this._hideTimeout);
+                getWindow(this.getDomNode()).clearTimeout(this._hideTimeout);
                 this._hideTimeout = null;
                 this._notebookEditor.removeClassName(FIND_HIDE_TRANSITION);
             }
             this._notebookEditor.addClassName(FIND_SHOW_TRANSITION);
-            this._showTimeout = dom.getWindow(this.getDomNode()).setTimeout(() => {
+            this._showTimeout = getWindow(this.getDomNode()).setTimeout(() => {
                 this._notebookEditor.removeClassName(FIND_SHOW_TRANSITION);
                 this._showTimeout = null;
             }, 200);
@@ -226,12 +226,12 @@ let NotebookFindWidget = class NotebookFindWidget extends SimpleFindReplaceWidge
         this._progressBar.stop();
         if (this._hideTimeout === null) {
             if (this._showTimeout !== null) {
-                dom.getWindow(this.getDomNode()).clearTimeout(this._showTimeout);
+                getWindow(this.getDomNode()).clearTimeout(this._showTimeout);
                 this._showTimeout = null;
                 this._notebookEditor.removeClassName(FIND_SHOW_TRANSITION);
             }
             this._notebookEditor.addClassName(FIND_HIDE_TRANSITION);
-            this._hideTimeout = dom.getWindow(this.getDomNode()).setTimeout(() => {
+            this._hideTimeout = getWindow(this.getDomNode()).setTimeout(() => {
                 this._notebookEditor.removeClassName(FIND_HIDE_TRANSITION);
             }, 200);
         }
@@ -264,7 +264,7 @@ let NotebookFindWidget = class NotebookFindWidget extends SimpleFindReplaceWidge
                 matchesCount += '+';
             }
             const matchesPosition = this._findModel.currentMatch < 0 ? '?' : String((this._findModel.currentMatch + 1));
-            label = strings.format(NLS_MATCHES_LOCATION, matchesPosition, matchesCount);
+            label = format(NLS_MATCHES_LOCATION, matchesPosition, matchesCount);
         }
         else {
             label = NLS_NO_RESULTS;