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

package/vscode/src/vs/workbench/contrib/debug/browser/debugTaskRunner.js

@@ -1,17 +1,17 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import Severity from 'monaco-editor/esm/vs/base/common/severity.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import Severity from 'vscode/vscode/vs/base/common/severity';
 import { Markers } from 'vscode/vscode/vs/workbench/contrib/markers/common/markers';
 import { ITaskService } from 'vscode/vscode/vs/workbench/contrib/tasks/common/taskService';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { MarkerSeverity, IMarkerService } from 'monaco-editor/esm/vs/platform/markers/common/markers.js';
+import { MarkerSeverity, IMarkerService } from 'vscode/vscode/vs/platform/markers/common/markers';
 import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
-import { createErrorWithActions } from 'monaco-editor/esm/vs/base/common/errorMessage.js';
-import { Action } from 'monaco-editor/esm/vs/base/common/actions.js';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { createErrorWithActions } from 'vscode/vscode/vs/base/common/errorMessage';
+import { Action } from 'vscode/vscode/vs/base/common/actions';
 import { DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL } from './debugCommands.js';
-import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 function once(match, event) {
@@ -63,28 +63,28 @@ let DebugTaskRunner = class DebugTaskRunner {
             }
             const taskLabel = typeof taskId === 'string' ? taskId : taskId ? taskId.name : '';
             const message = errorCount > 1
-                ? ( nls.localizeWithPath(
+                ? ( localizeWithPath(
                 'vs/workbench/contrib/debug/browser/debugTaskRunner',
                 'preLaunchTaskErrors',
                 "Errors exist after running preLaunchTask '{0}'.",
                 taskLabel
             ))
                 : errorCount === 1
-                    ? ( nls.localizeWithPath(
+                    ? ( localizeWithPath(
                 'vs/workbench/contrib/debug/browser/debugTaskRunner',
                 'preLaunchTaskError',
                 "Error exists after running preLaunchTask '{0}'.",
                 taskLabel
             ))
                     : taskSummary && typeof taskSummary.exitCode === 'number'
-                        ? ( nls.localizeWithPath(
+                        ? ( localizeWithPath(
                 'vs/workbench/contrib/debug/browser/debugTaskRunner',
                 'preLaunchTaskExitCode',
                 "The preLaunchTask '{0}' terminated with exit code {1}.",
                 taskLabel,
                 taskSummary.exitCode
             ))
-                        : ( nls.localizeWithPath(
+                        : ( localizeWithPath(
                 'vs/workbench/contrib/debug/browser/debugTaskRunner',
                 'preLaunchTaskTerminated',
                 "The preLaunchTask '{0}' terminated.",
@@ -101,7 +101,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                 message,
                 buttons: [
                     {
-                        label: ( nls.localizeWithPath(
+                        label: ( localizeWithPath(
                             'vs/workbench/contrib/debug/browser/debugTaskRunner',
                             { key: 'debugAnyway', comment: ['&& denotes a mnemonic'] },
                             "&&Debug Anyway"
@@ -109,7 +109,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                         run: () => DebugChoice.DebugAnyway
                     },
                     {
-                        label: ( nls.localizeWithPath(
+                        label: ( localizeWithPath(
                             'vs/workbench/contrib/debug/browser/debugTaskRunner',
                             { key: 'showErrors', comment: ['&& denotes a mnemonic'] },
                             "&&Show Errors"
@@ -118,11 +118,11 @@ let DebugTaskRunner = class DebugTaskRunner {
                     }
                 ],
                 cancelButton: {
-                    label: ( nls.localizeWithPath('vs/workbench/contrib/debug/browser/debugTaskRunner', 'abort', "Abort")),
+                    label: ( localizeWithPath('vs/workbench/contrib/debug/browser/debugTaskRunner', 'abort', "Abort")),
                     run: () => DebugChoice.Cancel
                 },
                 checkbox: {
-                    label: ( nls.localizeWithPath(
+                    label: ( localizeWithPath(
                         'vs/workbench/contrib/debug/browser/debugTaskRunner',
                         'remember',
                         "Remember my choice in user settings"
@@ -162,7 +162,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                     message: err.message,
                     buttons: [
                         {
-                            label: ( nls.localizeWithPath(
+                            label: ( localizeWithPath(
                                 'vs/workbench/contrib/debug/browser/debugTaskRunner',
                                 { key: 'debugAnyway', comment: ['&& denotes a mnemonic'] },
                                 "&&Debug Anyway"
@@ -178,7 +178,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                         run: () => DebugChoice.Cancel
                     },
                     checkbox: {
-                        label: ( nls.localizeWithPath(
+                        label: ( localizeWithPath(
                             'vs/workbench/contrib/debug/browser/debugTaskRunner',
                             'rememberTask',
                             "Remember my choice for this task"
@@ -202,7 +202,7 @@ let DebugTaskRunner = class DebugTaskRunner {
             return Promise.resolve(null);
         }
         if (!root) {
-            return Promise.reject(( new Error(( nls.localizeWithPath(
+            return Promise.reject(( new Error(( localizeWithPath(
                 'vs/workbench/contrib/debug/browser/debugTaskRunner',
                 'invalidTaskReference',
                 "Task '{0}' can not be referenced from a launch configuration that is in a different workspace folder.",
@@ -212,13 +212,13 @@ let DebugTaskRunner = class DebugTaskRunner {
         const task = await this.taskService.getTask(root, taskId);
         if (!task) {
             const errorMessage = typeof taskId === 'string'
-                ? ( nls.localizeWithPath(
+                ? ( localizeWithPath(
                 'vs/workbench/contrib/debug/browser/debugTaskRunner',
                 'DebugTaskNotFoundWithTaskId',
                 "Could not find the task '{0}'.",
                 taskId
             ))
-                : ( nls.localizeWithPath(
+                : ( localizeWithPath(
                 'vs/workbench/contrib/debug/browser/debugTaskRunner',
                 'DebugTaskNotFound',
                 "Could not find the specified task."
@@ -274,13 +274,13 @@ let DebugTaskRunner = class DebugTaskRunner {
                 setTimeout(() => {
                     if (!taskStarted) {
                         const errorMessage = typeof taskId === 'string'
-                            ? ( nls.localizeWithPath(
+                            ? ( localizeWithPath(
                             'vs/workbench/contrib/debug/browser/debugTaskRunner',
                             'taskNotTrackedWithTaskId',
                             "The task '{0}' cannot be tracked. Make sure to have a problem matcher defined.",
                             taskId
                         ))
-                            : ( nls.localizeWithPath(
+                            : ( localizeWithPath(
                             'vs/workbench/contrib/debug/browser/debugTaskRunner',
                             'taskNotTracked',
                             "The task '{0}' cannot be tracked. Make sure to have a problem matcher defined.",

package/vscode/src/vs/workbench/contrib/debug/browser/debugTitle.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
-import { dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
 import { ITitleService } from 'vscode/vscode/vs/workbench/services/title/browser/titleService';
 

package/vscode/src/vs/workbench/contrib/debug/browser/debugToolBar.js

@@ -1,36 +1,36 @@
 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 { StandardMouseEvent } from 'monaco-editor/esm/vs/base/browser/mouseEvent.js';
-import { ActionBar } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionbar.js';
-import { Action } from 'monaco-editor/esm/vs/base/common/actions.js';
-import * as arrays from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { RunOnceScheduler } from 'monaco-editor/esm/vs/base/common/async.js';
-import * as errors from 'monaco-editor/esm/vs/base/common/errors.js';
-import { dispose, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { PixelRatio } from 'vscode/vscode/vs/base/browser/browser';
+import { $, append, addDisposableListener, EventType, addDisposableGenericMouseUpListener, getWindow, addDisposableGenericMouseDownListener, getComputedStyle, show, hide } from 'vscode/vscode/vs/base/browser/dom';
+import { StandardMouseEvent } from 'vscode/vscode/vs/base/browser/mouseEvent';
+import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { Action } from 'vscode/vscode/vs/base/common/actions';
+import { equals } from 'vscode/vscode/vs/base/common/arrays';
+import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
+import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
+import { dispose, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import './media/debugToolBar.css.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { DropdownWithPrimaryActionViewItem } from 'vscode/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
-import { createActionViewItem, createAndFillInActionBarActions } from 'monaco-editor/esm/vs/platform/actions/browser/menuEntryActionViewItem.js';
-import { MenuRegistry, MenuId, IMenuService } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { ContextKeyExpr, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.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 { widgetShadow, widgetBorder } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
-import { Themable, IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
-import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
+import { createActionViewItem, createAndFillInActionBarActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
+import { MenuRegistry, MenuId, IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { widgetShadow, widgetBorder } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import { Themable, IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { FocusSessionActionViewItem } from './debugActionViewItems.js';
 import { debugToolBarBackground, debugToolBarBorder } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugColors';
 import { CONTINUE_LABEL, CONTINUE_ID, PAUSE_LABEL, PAUSE_ID, DISCONNECT_ID, DISCONNECT_LABEL, STOP_LABEL, STOP_ID, STEP_OVER_LABEL, STEP_OVER_ID, STEP_INTO_LABEL, STEP_INTO_ID, STEP_OUT_LABEL, STEP_OUT_ID, STEP_BACK_ID, REVERSE_CONTINUE_ID, FOCUS_SESSION_LABEL, FOCUS_SESSION_ID, DISCONNECT_AND_SUSPEND_ID, DISCONNECT_AND_SUSPEND_LABEL, RESTART_LABEL, RESTART_SESSION_ID } from './debugCommands.js';
 import { debugContinue, debugPause, debugDisconnect, debugStop, debugStepOver, debugStepInto, debugStepOut, debugStepBack, debugReverseContinue, debugGripper, debugRestart } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import { VIEWLET_ID, CONTEXT_DEBUG_STATE, CONTEXT_IN_DEBUG_MODE, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_MULTI_SESSION_DEBUG, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
-import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
-import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 
 const DEBUG_TOOLBAR_POSITION_KEY = 'debug.actionswidgetposition';
 const DEBUG_TOOLBAR_Y_KEY = 'debug.actionswidgety';
@@ -48,10 +48,10 @@ let DebugToolBar = class DebugToolBar extends Themable {
         this.isVisible = false;
         this.isBuilt = false;
         this.stopActionViewItemDisposables = this._register(( new DisposableStore()));
-        this.$el = dom.$('div.debug-toolbar');
+        this.$el = $('div.debug-toolbar');
         this.$el.style.top = `${layoutService.mainContainerOffset.top}px`;
-        this.dragArea = dom.append(this.$el, dom.$('div.drag-area' + ThemeIcon.asCSSSelector(debugGripper)));
-        const actionBarContainer = dom.append(this.$el, dom.$('div.action-bar-container'));
+        this.dragArea = append(this.$el, $('div.drag-area' + ThemeIcon.asCSSSelector(debugGripper)));
+        const actionBarContainer = append(this.$el, $('div.action-bar-container'));
         this.debugToolBarMenu = menuService.createMenu(MenuId.DebugToolBar, contextKeyService);
         this._register(this.debugToolBarMenu);
         this.activeActions = [];
@@ -82,7 +82,7 @@ let DebugToolBar = class DebugToolBar extends Themable {
             }
             const actions = [];
             createAndFillInActionBarActions(this.debugToolBarMenu, { shouldForwardArgs: true }, actions);
-            if (!arrays.equals(actions, this.activeActions, (first, second) => first.id === second.id && first.enabled === second.enabled)) {
+            if (!equals(actions, this.activeActions, (first, second) => first.id === second.id && first.enabled === second.enabled)) {
                 this.actionBar.clear();
                 this.actionBar.push(actions, { icon: true, label: false });
                 this.activeActions = actions;
@@ -106,39 +106,28 @@ let DebugToolBar = class DebugToolBar extends Themable {
         }));
         this._register(this.debugToolBarMenu.onDidChange(() => this.updateScheduler.schedule()));
         this._register(this.actionBar.actionRunner.onDidRun((e) => {
-            if (e.error && !errors.isCancellationError(e.error)) {
+            if (e.error && !isCancellationError(e.error)) {
                 this.notificationService.error(e.error);
             }
             this.telemetryService.publicLog2('workbenchActionExecuted', { id: e.action.id, from: 'debugActionsWidget' });
         }));
-        this._register(dom.addDisposableListener(mainWindow, dom.EventType.RESIZE, () => this.setCoordinates()));
-        this._register(dom.addDisposableGenericMouseUpListener(this.dragArea, (event) => {
-            const mouseClickEvent = ( new StandardMouseEvent(dom.getWindow(this.dragArea), event));
+        this._register(addDisposableListener(mainWindow, EventType.RESIZE, () => this.setCoordinates()));
+        this._register(addDisposableGenericMouseUpListener(this.dragArea, (event) => {
+            const mouseClickEvent = ( new StandardMouseEvent(getWindow(this.dragArea), event));
             if (mouseClickEvent.detail === 2) {
                 const widgetWidth = this.$el.clientWidth;
                 this.setCoordinates(0.5 * mainWindow.innerWidth - 0.5 * widgetWidth, 0);
                 this.storePosition();
             }
         }));
-        this._register(dom.addDisposableGenericMouseDownListener(this.dragArea, (event) => {
+        this._register(addDisposableGenericMouseDownListener(this.dragArea, (event) => {
             this.dragArea.classList.add('dragged');
-            const mouseMoveListener = dom.addDisposableGenericMouseMoveListener(mainWindow, (e) => {
-                const mouseMoveEvent = ( new StandardMouseEvent(mainWindow, e));
-                mouseMoveEvent.preventDefault();
-                this.setCoordinates(mouseMoveEvent.posx - 14, mouseMoveEvent.posy - 14);
-            });
-            const mouseUpListener = dom.addDisposableGenericMouseUpListener(mainWindow, (e) => {
-                this.storePosition();
-                this.dragArea.classList.remove('dragged');
-                mouseMoveListener.dispose();
-                mouseUpListener.dispose();
-            });
         }));
         this._register(this.layoutService.onDidChangePartVisibility(() => this.setYCoordinate()));
-        this._register(browser.PixelRatio.onDidChange(() => this.setYCoordinate()));
+        this._register(PixelRatio.onDidChange(() => this.setYCoordinate()));
     }
     storePosition() {
-        const left = dom.getComputedStyle(this.$el).left;
+        const left = getComputedStyle(this.$el).left;
         if (left) {
             const position = parseFloat(left) / mainWindow.innerWidth;
             this.storageService.store(DEBUG_TOOLBAR_POSITION_KEY, position, 0 , 1 );
@@ -219,12 +208,12 @@ let DebugToolBar = class DebugToolBar extends Themable {
             this.layoutService.mainContainer.appendChild(this.$el);
         }
         this.isVisible = true;
-        dom.show(this.$el);
+        show(this.$el);
         this.setCoordinates();
     }
     hide() {
         this.isVisible = false;
-        dom.hide(this.$el);
+        hide(this.$el);
     }
     dispose() {
         super.dispose();

package/vscode/src/vs/workbench/contrib/debug/browser/debugViewlet.js

@@ -1,19 +1,19 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { DisposableStore, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import './media/debugViewlet.css.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { createActionViewItem } from 'monaco-editor/esm/vs/platform/actions/browser/menuEntryActionViewItem.js';
-import { MenuRegistry, MenuId, registerAction2, Action2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { ContextKeyExpr, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { IContextMenuService, IContextViewService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { IProgressService } from 'monaco-editor/esm/vs/platform/progress/common/progress.js';
-import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.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 { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
-import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { createActionViewItem } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
+import { MenuRegistry, MenuId, registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextMenuService, IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress';
+import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { ViewsSubMenu, ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { WorkbenchStateContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { IViewsService, IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
@@ -163,7 +163,7 @@ registerAction2(class extends Action2 {
             title: {
                 value: DEBUG_CONFIGURE_LABEL,
                 original: 'Open \'launch.json\'',
-                mnemonicTitle: ( nls.localizeWithPath(
+                mnemonicTitle: ( localizeWithPath(
                     'vs/workbench/contrib/debug/browser/debugViewlet',
                     { key: 'miOpenConfigurations', comment: ['&& denotes a mnemonic'] },
                     "Open &&Configurations"
@@ -206,7 +206,7 @@ registerAction2(class extends Action2 {
                 const picks = ( launches.map(l => ({ label: l.name, launch: l })));
                 const picked = await quickInputService.pick(picks, {
                     activeItem: picks[0],
-                    placeHolder: ( nls.localizeWithPath(
+                    placeHolder: ( localizeWithPath(
                         'vs/workbench/contrib/debug/browser/debugViewlet',
                         { key: 'selectWorkspaceFolder', comment: ['User picks a workspace folder or a workspace configuration file here. Workspace configuration files can contain settings and thus a launch.json configuration can be written into one.'] },
                         "Select a workspace folder to create a launch.json file in or add it to the workspace config file"
@@ -226,7 +226,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'debug.toggleReplIgnoreFocus',
-            title: ( nls.localizeWithPath(
+            title: ( localizeWithPath(
                 'vs/workbench/contrib/debug/browser/debugViewlet',
                 'debugPanel',
                 "Debug Console"

package/vscode/src/vs/workbench/contrib/debug/browser/disassemblyView.js

@@ -1,28 +1,28 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { PixelRatio } from 'monaco-editor/esm/vs/base/browser/browser.js';
-import { append, $, addStandardDisposableListener } from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { binarySearch2 } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { dispose, Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { isAbsolute } from 'monaco-editor/esm/vs/base/common/path.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { applyFontInfo } from 'monaco-editor/esm/vs/editor/browser/config/domFontInfo.js';
-import { isCodeEditor } from 'monaco-editor/esm/vs/editor/browser/editorBrowser.js';
-import { BareFontInfo } from 'monaco-editor/esm/vs/editor/common/config/fontInfo.js';
-import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
-import { StringBuilder } from 'monaco-editor/esm/vs/editor/common/core/stringBuilder.js';
-import { ITextModelService } from 'monaco-editor/esm/vs/editor/common/services/resolverService.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.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 { WorkbenchTable } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.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 { editorBackground } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
-import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
-import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
+import { PixelRatio } from 'vscode/vscode/vs/base/browser/browser';
+import { append, $, addStandardDisposableListener } from 'vscode/vscode/vs/base/browser/dom';
+import { binarySearch2 } from 'vscode/vscode/vs/base/common/arrays';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { dispose, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { isAbsolute } from 'vscode/vscode/vs/base/common/path';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { applyFontInfo } from 'vscode/vscode/vs/editor/browser/config/domFontInfo';
+import { isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
+import { BareFontInfo } from 'vscode/vscode/vs/editor/common/config/fontInfo';
+import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { StringBuilder } from 'vscode/vscode/vs/editor/common/core/stringBuilder';
+import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+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 { WorkbenchTable } from 'vscode/vscode/vs/platform/list/browser/listService';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { editorBackground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
 import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 import { topStackFrameColor, focusedStackFrameColor } from 'vscode/vscode/vs/workbench/contrib/debug/browser/callStackEditorContribution';
 import { breakpoint, debugBreakpointHint, debugStackframe, debugStackframeFocused } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';

package/vscode/src/vs/workbench/contrib/debug/browser/exceptionWidget.js

@@ -1,26 +1,26 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/exceptionWidget.css.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { ZoneWidget } from 'monaco-editor/esm/vs/editor/contrib/zoneWidget/browser/zoneWidget.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { append, isAncestorOfActiveElement, $ as $$1 } from 'vscode/vscode/vs/base/browser/dom';
+import { ZoneWidget } from 'vscode/vscode/vs/editor/contrib/zoneWidget/browser/zoneWidget';
 import { EDITOR_CONTRIBUTION_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
-import { RunOnceScheduler } from 'monaco-editor/esm/vs/base/common/async.js';
-import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
-import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
-import { registerColor } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
+import { registerColor } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { LinkDetector } from './linkDetector.js';
-import { ActionBar } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionbar.js';
-import { Action } from 'monaco-editor/esm/vs/base/common/actions.js';
-import { widgetClose } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
+import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { Action } from 'vscode/vscode/vs/base/common/actions';
+import { widgetClose } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 
-const $ = dom.$;
-const debugExceptionWidgetBorder = registerColor('debugExceptionWidget.border', { dark: '#a31515', light: '#a31515', hcDark: '#a31515', hcLight: '#a31515' }, ( nls.localizeWithPath(
+const $ = $$1;
+const debugExceptionWidgetBorder = registerColor('debugExceptionWidget.border', { dark: '#a31515', light: '#a31515', hcDark: '#a31515', hcLight: '#a31515' }, ( localizeWithPath(
     'vs/workbench/contrib/debug/browser/exceptionWidget',
     'debugExceptionWidgetBorder',
     'Exception widget border color.'
 )));
-const debugExceptionWidgetBackground = registerColor('debugExceptionWidget.background', { dark: '#420b0d', light: '#f1dfde', hcDark: '#420b0d', hcLight: '#f1dfde' }, ( nls.localizeWithPath(
+const debugExceptionWidgetBackground = registerColor('debugExceptionWidget.background', { dark: '#420b0d', light: '#f1dfde', hcDark: '#420b0d', hcLight: '#f1dfde' }, ( localizeWithPath(
     'vs/workbench/contrib/debug/browser/exceptionWidget',
     'debugExceptionWidgetBackground',
     'Exception widget background color.'
@@ -60,38 +60,38 @@ let ExceptionWidget = class ExceptionWidget extends ZoneWidget {
         container.tabIndex = 0;
         const title = $('.title');
         const label = $('.label');
-        dom.append(title, label);
+        append(title, label);
         const actions = $('.actions');
-        dom.append(title, actions);
-        label.textContent = this.exceptionInfo.id ? ( nls.localizeWithPath(
+        append(title, actions);
+        label.textContent = this.exceptionInfo.id ? ( localizeWithPath(
             'vs/workbench/contrib/debug/browser/exceptionWidget',
             'exceptionThrownWithId',
             'Exception has occurred: {0}',
             this.exceptionInfo.id
-        )) : ( nls.localizeWithPath(
+        )) : ( localizeWithPath(
             'vs/workbench/contrib/debug/browser/exceptionWidget',
             'exceptionThrown',
             'Exception has occurred.'
         ));
         let ariaLabel = label.textContent;
         const actionBar = ( new ActionBar(actions));
-        actionBar.push(( new Action('editor.closeExceptionWidget', ( nls.localizeWithPath('vs/workbench/contrib/debug/browser/exceptionWidget', 'close', "Close")), ThemeIcon.asClassName(widgetClose), true, async () => {
+        actionBar.push(( new Action('editor.closeExceptionWidget', ( localizeWithPath('vs/workbench/contrib/debug/browser/exceptionWidget', 'close', "Close")), ThemeIcon.asClassName(widgetClose), true, async () => {
             const contribution = this.editor.getContribution(EDITOR_CONTRIBUTION_ID);
             contribution?.closeExceptionWidget();
         })), { label: false, icon: true });
-        dom.append(container, title);
+        append(container, title);
         if (this.exceptionInfo.description) {
             const description = $('.description');
             description.textContent = this.exceptionInfo.description;
             ariaLabel += ', ' + this.exceptionInfo.description;
-            dom.append(container, description);
+            append(container, description);
         }
         if (this.exceptionInfo.details && this.exceptionInfo.details.stackTrace) {
             const stackTrace = $('.stack-trace');
             const linkDetector = this.instantiationService.createInstance(LinkDetector);
             const linkedStackTrace = linkDetector.linkify(this.exceptionInfo.details.stackTrace, true, this.debugSession ? this.debugSession.root : undefined);
             stackTrace.appendChild(linkedStackTrace);
-            dom.append(container, stackTrace);
+            append(container, stackTrace);
             ariaLabel += ', ' + this.exceptionInfo.details.stackTrace;
         }
         container.setAttribute('aria-label', ariaLabel);
@@ -110,7 +110,7 @@ let ExceptionWidget = class ExceptionWidget extends ZoneWidget {
         if (!this.container) {
             return false;
         }
-        return dom.isAncestorOfActiveElement(this.container);
+        return isAncestorOfActiveElement(this.container);
     }
 };
 ExceptionWidget = ( __decorate([

package/vscode/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.js

@@ -1,12 +1,12 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
+import { Event } from 'vscode/vscode/vs/base/common/event';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { ExtensionHostDebugChannelClient, ExtensionHostDebugBroadcastChannel } from '../../../../platform/debug/common/extensionHostDebugIpc.js';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { isFolderToOpen, isWorkspaceToOpen } from 'vscode/vscode/vs/platform/window/common/window';
-import { toWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, hasWorkspaceFileExtension, IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
+import { toWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, hasWorkspaceFileExtension, IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
 import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';