@codingame/monaco-vscode-debug-service-override 1.85.0 → 1.85.2

package/debug.js

@@ -5,6 +5,8 @@ import { LanguageFeaturesService } from './vscode/src/vs/editor/common/services/
 import { ILanguageFeaturesService } from 'monaco-editor/esm/vs/editor/common/services/languageFeatures.js';
 import { ConfigurationResolverService } from './vscode/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.js';
 import { IConfigurationResolverService } from 'vscode/vscode/vs/workbench/services/configurationResolver/common/configurationResolver';
+import { IExtensionHostDebugService } from 'vscode/vscode/vs/platform/debug/common/extensionHostDebug';
+import { BrowserExtensionHostDebugService } from './vscode/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.js';
 import getServiceOverride$1 from '@codingame/monaco-vscode-layout-service-override';
 import './vscode/src/vs/workbench/contrib/debug/browser/debug.contribution.js';
 
@@ -17,7 +19,8 @@ function getServiceOverride() {
         ...getServiceOverride$1(),
         [( ILanguageFeaturesService.toString())]: new SyncDescriptor(LanguageFeaturesService, [], true),
         [( IDebugService.toString())]: new SyncDescriptor(DebugService, [], true),
-        [( IConfigurationResolverService.toString())]: new SyncDescriptor(ConfigurationResolverService, [], true)
+        [( IConfigurationResolverService.toString())]: new SyncDescriptor(ConfigurationResolverService, [], true),
+        [( IExtensionHostDebugService.toString())]: new SyncDescriptor(BrowserExtensionHostDebugService, [], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-debug-service-override",
-  "version": "1.85.0",
+  "version": "1.85.2",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,8 +18,8 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.85.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.2",
     "monaco-editor": "0.45.0",
-    "@codingame/monaco-vscode-layout-service-override": "1.85.0"
+    "@codingame/monaco-vscode-layout-service-override": "1.85.2"
   }
 }

package/vscode/src/vs/platform/debug/common/extensionHostDebugIpc.js

@@ -0,0 +1,73 @@
+import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
+import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+
+class ExtensionHostDebugBroadcastChannel {
+    constructor() {
+        this._onCloseEmitter = ( new Emitter());
+        this._onReloadEmitter = ( new Emitter());
+        this._onTerminateEmitter = ( new Emitter());
+        this._onAttachEmitter = ( new Emitter());
+    }
+    static { this.ChannelName = 'extensionhostdebugservice'; }
+    call(ctx, command, arg) {
+        switch (command) {
+            case 'close':
+                return Promise.resolve(this._onCloseEmitter.fire({ sessionId: arg[0] }));
+            case 'reload':
+                return Promise.resolve(this._onReloadEmitter.fire({ sessionId: arg[0] }));
+            case 'terminate':
+                return Promise.resolve(this._onTerminateEmitter.fire({ sessionId: arg[0] }));
+            case 'attach':
+                return Promise.resolve(this._onAttachEmitter.fire({ sessionId: arg[0], port: arg[1], subId: arg[2] }));
+        }
+        throw new Error('Method not implemented.');
+    }
+    listen(ctx, event, arg) {
+        switch (event) {
+            case 'close':
+                return this._onCloseEmitter.event;
+            case 'reload':
+                return this._onReloadEmitter.event;
+            case 'terminate':
+                return this._onTerminateEmitter.event;
+            case 'attach':
+                return this._onAttachEmitter.event;
+        }
+        throw new Error('Method not implemented.');
+    }
+}
+class ExtensionHostDebugChannelClient extends Disposable {
+    constructor(channel) {
+        super();
+        this.channel = channel;
+    }
+    reload(sessionId) {
+        this.channel.call('reload', [sessionId]);
+    }
+    get onReload() {
+        return this.channel.listen('reload');
+    }
+    close(sessionId) {
+        this.channel.call('close', [sessionId]);
+    }
+    get onClose() {
+        return this.channel.listen('close');
+    }
+    attachSession(sessionId, port, subId) {
+        this.channel.call('attach', [sessionId, port, subId]);
+    }
+    get onAttachSession() {
+        return this.channel.listen('attach');
+    }
+    terminateSession(sessionId, subId) {
+        this.channel.call('terminate', [sessionId, subId]);
+    }
+    get onTerminateSession() {
+        return this.channel.listen('terminate');
+    }
+    openExtensionDevelopmentHostWindow(args, debugRenderer) {
+        return this.channel.call('openExtensionDevelopmentHostWindow', [args, debugRenderer]);
+    }
+}
+
+export { ExtensionHostDebugBroadcastChannel, ExtensionHostDebugChannelClient };

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

@@ -12,7 +12,7 @@ import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { IContextViewService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
 import { defaultInputBoxStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
-import { Expression, Variable, ExpressionContainer } from '../common/debugModel.js';
+import { Expression, Variable, ExpressionContainer } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { ReplEvaluationResult } from '../common/replModel.js';
 
 const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024;

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

@@ -33,7 +33,7 @@ import { STOP_ID, DISCONNECT_ID, PAUSE_LABEL, PAUSE_ID, CONTINUE_LABEL, CONTINUE
 import { callstackViewSession, debugRestartFrame, debugPause, debugContinue, debugRestart, debugStop, debugDisconnect, debugStepOver, debugStepInto, debugStepOut } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import { createDisconnectMenuItemAction } from './debugToolBar.js';
 import { CALLSTACK_VIEW_ID, CONTEXT_DEBUG_STATE, getStateLabel, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD, CONTEXT_CALLSTACK_ITEM_STOPPED, CONTEXT_CALLSTACK_SESSION_IS_ATTACH, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
-import { Thread, StackFrame, ThreadAndSessionIds } from '../common/debugModel.js';
+import { Thread, StackFrame, ThreadAndSessionIds } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { isSessionAttach } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
 
 var SessionsRenderer_1, ThreadsRenderer_1, StackFramesRenderer_1;

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

@@ -14,9 +14,9 @@ import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/view
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
 import { Extensions as Extensions$2 } from 'vscode/vscode/vs/workbench/common/views';
-import { BreakpointEditorContribution } from './breakpointEditorContribution.js';
-import { BreakpointsView } from './breakpointsView.js';
-import { CallStackEditorContribution } from './callStackEditorContribution.js';
+import { BreakpointEditorContribution } from 'vscode/vscode/vs/workbench/contrib/debug/browser/breakpointEditorContribution';
+import { BreakpointsView } from 'vscode/vscode/vs/workbench/contrib/debug/browser/breakpointsView';
+import { CallStackEditorContribution } from 'vscode/vscode/vs/workbench/contrib/debug/browser/callStackEditorContribution';
 import { CallStackView } from './callStackView.js';
 import { registerColors } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugColors';
 import { DEBUG_QUICK_ACCESS_PREFIX, SELECT_AND_START_ID, DEBUG_CONSOLE_QUICK_ACCESS_PREFIX, SELECT_DEBUG_CONSOLE_ID, TERMINATE_THREAD_ID, STEP_OVER_LABEL, STEP_OVER_ID, STEP_INTO_LABEL, STEP_INTO_ID, STEP_INTO_TARGET_LABEL, STEP_INTO_TARGET_ID, STEP_OUT_LABEL, STEP_OUT_ID, PAUSE_LABEL, PAUSE_ID, STOP_LABEL, STOP_ID, CONTINUE_LABEL, CONTINUE_ID, FOCUS_REPL_ID, JUMP_TO_CURSOR_ID, TOGGLE_INLINE_BREAKPOINT_ID, SELECT_AND_START_LABEL, CALLSTACK_TOP_LABEL, CALLSTACK_TOP_ID, CALLSTACK_BOTTOM_LABEL, CALLSTACK_BOTTOM_ID, CALLSTACK_UP_LABEL, CALLSTACK_UP_ID, CALLSTACK_DOWN_LABEL, CALLSTACK_DOWN_ID, RESTART_LABEL, RESTART_SESSION_ID, DISCONNECT_LABEL, DISCONNECT_ID, DISCONNECT_AND_SUSPEND_LABEL, DISCONNECT_AND_SUSPEND_ID, RESTART_FRAME_ID, COPY_STACK_TRACE_ID, EDIT_EXPRESSION_COMMAND_ID, SET_EXPRESSION_COMMAND_ID, REMOVE_EXPRESSION_COMMAND_ID, DEBUG_COMMAND_CATEGORY, NEXT_DEBUG_CONSOLE_LABEL, NEXT_DEBUG_CONSOLE_ID, PREV_DEBUG_CONSOLE_LABEL, PREV_DEBUG_CONSOLE_ID, OPEN_LOADED_SCRIPTS_LABEL, SHOW_LOADED_SCRIPTS_ID, SELECT_DEBUG_CONSOLE_LABEL, SELECT_DEBUG_SESSION_LABEL, SELECT_DEBUG_SESSION_ID } from './debugCommands.js';
@@ -40,7 +40,7 @@ import { WelcomeView } from './welcomeView.js';
 import { BREAKPOINT_EDITOR_CONTRIBUTION_ID, EDITOR_CONTRIBUTION_ID, CONTEXT_DEBUG_STATE, CONTEXT_IN_DEBUG_MODE, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_DEBUGGERS_AVAILABLE, getStateLabel, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_SET_EXPRESSION_SUPPORTED, CONTEXT_WATCH_ITEM_TYPE, DEBUG_PANEL_ID, REPL_VIEW_ID, VIEWLET_ID, VARIABLES_VIEW_ID, CONTEXT_DEBUG_UX, WATCH_VIEW_ID, CALLSTACK_VIEW_ID, BREAKPOINTS_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_HAS_DEBUGGED, LOADED_SCRIPTS_VIEW_ID, CONTEXT_LOADED_SCRIPTS_SUPPORTED, DISASSEMBLY_VIEW_ID, INTERNAL_CONSOLE_OPTIONS_SCHEMA, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { DebugContentProvider } from '../common/debugContentProvider.js';
 import { DebugLifecycle } from '../common/debugLifecycle.js';
-import { DisassemblyViewInput } from '../common/disassemblyViewInput.js';
+import { DisassemblyViewInput } from 'vscode/vscode/vs/workbench/contrib/debug/common/disassemblyViewInput';
 import { launchSchemaId } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
 
 const debugCategory = ( nls.localizeWithPath(

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

@@ -3,13 +3,13 @@ import { List } from 'monaco-editor/esm/vs/base/browser/ui/list/listWidget.js';
 import { KeybindingsRegistry } from 'monaco-editor/esm/vs/platform/keybinding/common/keybindingsRegistry.js';
 import { IListService } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
 import { IDebugService, CONTEXT_DISASSEMBLY_VIEW_FOCUS, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_IN_DEBUG_REPL, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, REPL_VIEW_ID, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_VARIABLES_FOCUSED, CONTEXT_EXPRESSION_SELECTED, CONTEXT_BREAKPOINT_INPUT_FOCUSED, EDITOR_CONTRIBUTION_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
-import { Expression, Variable, Breakpoint, FunctionBreakpoint, DataBreakpoint } from '../common/debugModel.js';
+import { Expression, Variable, Breakpoint, FunctionBreakpoint, DataBreakpoint } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { isCodeEditor } from 'monaco-editor/esm/vs/editor/browser/editorBrowser.js';
 import { MenuRegistry, MenuId, registerAction2, Action2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { EditorContextKeys } from 'monaco-editor/esm/vs/editor/common/editorContextKeys.js';
 import { IContextKeyService, ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { openBreakpointSource } from './breakpointsView.js';
+import { openBreakpointSource } from 'vscode/vscode/vs/workbench/contrib/debug/browser/breakpointsView';
 import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
 import { InputFocusedContext } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkeys.js';
 import { ResourceContextKey, ActiveEditorContext, PanelFocusContext } from 'vscode/vscode/vs/workbench/common/contextkeys';

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

@@ -5,7 +5,7 @@ import { CancellationTokenSource, CancellationToken } from 'monaco-editor/esm/vs
 import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
 import * as json from 'monaco-editor/esm/vs/base/common/json.js';
 import { DisposableStore, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import * as objects from 'monaco-editor/esm/vs/base/common/objects.js';
+import * as Objects from 'monaco-editor/esm/vs/base/common/objects.js';
 import * as resources from 'monaco-editor/esm/vs/base/common/resources.js';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import * as nls from 'monaco-editor/esm/vs/nls.js';
@@ -439,7 +439,7 @@ class AbstractLaunch {
         }
     }
     getConfiguration(name) {
-        const config = objects.deepClone(this.getConfig());
+        const config = Objects.deepClone(this.getConfig());
         if (!config || !config.configurations) {
             return undefined;
         }
@@ -534,7 +534,7 @@ let Launch = class Launch extends AbstractLaunch {
         });
     }
     async writeConfiguration(configuration) {
-        const fullConfig = objects.deepClone(this.getConfig());
+        const fullConfig = Objects.deepClone(this.getConfig());
         if (!fullConfig.configurations) {
             fullConfig.configurations = [];
         }

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

@@ -15,11 +15,11 @@ import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/b
 import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
 import { PanelFocusContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
-import { openBreakpointSource } from './breakpointsView.js';
+import { openBreakpointSource } from 'vscode/vscode/vs/workbench/contrib/debug/browser/breakpointsView';
 import { DisassemblyView } from './disassemblyView.js';
 import { CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE, CONTEXT_DISASSEMBLE_REQUEST_SUPPORTED, CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DISASSEMBLY_VIEW_FOCUS, IDebugService, REPL_VIEW_ID, WATCH_VIEW_ID, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, BREAKPOINT_EDITOR_CONTRIBUTION_ID, EDITOR_CONTRIBUTION_ID, CONTEXT_EXCEPTION_WIDGET_VISIBLE } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { getEvaluatableExpressionAtPosition } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
-import { DisassemblyViewInput } from '../common/disassemblyViewInput.js';
+import { DisassemblyViewInput } from 'vscode/vscode/vs/workbench/contrib/debug/common/disassemblyViewInput';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 
 class ToggleBreakpointAction extends Action2 {

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

@@ -36,7 +36,7 @@ import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/c
 import { DebugHoverWidget } from './debugHover.js';
 import { ExceptionWidget } from './exceptionWidget.js';
 import { CONTEXT_EXCEPTION_WIDGET_VISIBLE, IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
-import { Expression } from '../common/debugModel.js';
+import { Expression } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
 
 const MAX_NUM_INLINE_VALUES = 100;

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

@@ -18,7 +18,7 @@ import { renderExpressionValue } from './baseDebugView.js';
 import { LinkDetector } from './linkDetector.js';
 import { VariablesRenderer } from './variablesView.js';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
-import { Variable, Expression } from '../common/debugModel.js';
+import { Variable, Expression } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { getEvaluatableExpressionAtPosition } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
 
 var DebugHoverWidget_1;

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

@@ -34,12 +34,12 @@ import { DebugSession } from './debugSession.js';
 import { DebugTaskRunner } from './debugTaskRunner.js';
 import { CALLSTACK_VIEW_ID, DEBUG_MEMORY_SCHEME, CONTEXT_DEBUG_TYPE, CONTEXT_DEBUG_STATE, CONTEXT_HAS_DEBUGGED, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_UX, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_DISASSEMBLY_VIEW_FOCUS, getStateLabel, debuggerDisabledMessage, VIEWLET_ID, REPL_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { DebugCompoundRoot } from '../common/debugCompoundRoot.js';
-import { DebugModel, Breakpoint, FunctionBreakpoint, DataBreakpoint, InstructionBreakpoint } from '../common/debugModel.js';
+import { DebugModel, Breakpoint, FunctionBreakpoint, DataBreakpoint, InstructionBreakpoint } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { DebugStorage } from '../common/debugStorage.js';
 import { DebugTelemetry } from '../common/debugTelemetry.js';
 import { saveAllBeforeDebugStart, getExtensionHostDebugSession } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
 import { ViewModel } from '../common/debugViewModel.js';
-import { DisassemblyViewInput } from '../common/disassemblyViewInput.js';
+import { DisassemblyViewInput } from 'vscode/vscode/vs/workbench/contrib/debug/common/disassemblyViewInput';
 import { VIEWLET_ID as VIEWLET_ID$1 } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
 import { NumberBadge, IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';

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

@@ -23,8 +23,8 @@ import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/c
 import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
 import { RawDebugSession } from './rawDebugSession.js';
 import { IDebugService, VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
-import { MemoryRegion, ExpressionContainer, Thread } from '../common/debugModel.js';
-import { Source } from '../common/debugSource.js';
+import { MemoryRegion, ExpressionContainer, Thread } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
+import { Source } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugSource';
 import { filterExceptionsFromTelemetry } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
 import { ReplModel } from '../common/replModel.js';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';

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

@@ -24,11 +24,11 @@ import { editorBackground } from 'monaco-editor/esm/vs/platform/theme/common/col
 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 { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
-import { topStackFrameColor, focusedStackFrameColor } from './callStackEditorContribution.js';
+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';
 import { DISASSEMBLY_VIEW_ID, CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST, IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
-import { InstructionBreakpoint } from '../common/debugModel.js';
-import { getUriFromSource } from '../common/debugSource.js';
+import { InstructionBreakpoint } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
+import { getUriFromSource } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugSource';
 import { isUri, sourcesEqual } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 

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

@@ -0,0 +1,141 @@
+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 { 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 { 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 { 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';
+
+var BrowserExtensionHostDebugService_1;
+let BrowserExtensionHostDebugService = class BrowserExtensionHostDebugService extends ExtensionHostDebugChannelClient {
+    static { BrowserExtensionHostDebugService_1 = this; }
+    static { this.LAST_EXTENSION_DEVELOPMENT_WORKSPACE_KEY = 'debug.lastExtensionDevelopmentWorkspace'; }
+    constructor(remoteAgentService, environmentService, logService, hostService, contextService, storageService, fileService) {
+        const connection = remoteAgentService.getConnection();
+        let channel;
+        if (connection) {
+            channel = connection.getChannel(ExtensionHostDebugBroadcastChannel.ChannelName);
+        }
+        else {
+            channel = { call: async () => undefined, listen: () => Event.None };
+        }
+        super(channel);
+        this.storageService = storageService;
+        this.fileService = fileService;
+        if (environmentService.options && environmentService.options.workspaceProvider) {
+            this.workspaceProvider = environmentService.options.workspaceProvider;
+        }
+        else {
+            this.workspaceProvider = { open: async () => true, workspace: undefined, trusted: undefined };
+            logService.warn('Extension Host Debugging not available due to missing workspace provider.');
+        }
+        this._register(this.onReload(event => {
+            if (environmentService.isExtensionDevelopment && environmentService.debugExtensionHost.debugId === event.sessionId) {
+                hostService.reload();
+            }
+        }));
+        this._register(this.onClose(event => {
+            if (environmentService.isExtensionDevelopment && environmentService.debugExtensionHost.debugId === event.sessionId) {
+                hostService.close();
+            }
+        }));
+        if (environmentService.isExtensionDevelopment && !environmentService.extensionTestsLocationURI) {
+            const workspaceId = toWorkspaceIdentifier(contextService.getWorkspace());
+            if (isSingleFolderWorkspaceIdentifier(workspaceId) || isWorkspaceIdentifier(workspaceId)) {
+                const serializedWorkspace = isSingleFolderWorkspaceIdentifier(workspaceId) ? { folderUri: workspaceId.uri.toJSON() } : { workspaceUri: workspaceId.configPath.toJSON() };
+                storageService.store(BrowserExtensionHostDebugService_1.LAST_EXTENSION_DEVELOPMENT_WORKSPACE_KEY, JSON.stringify(serializedWorkspace), 0 , 1 );
+            }
+            else {
+                storageService.remove(BrowserExtensionHostDebugService_1.LAST_EXTENSION_DEVELOPMENT_WORKSPACE_KEY, 0 );
+            }
+        }
+    }
+    async openExtensionDevelopmentHostWindow(args, _debugRenderer) {
+        const environment = ( new Map());
+        const fileUriArg = this.findArgument('file-uri', args);
+        if (fileUriArg && !hasWorkspaceFileExtension(fileUriArg)) {
+            environment.set('openFile', fileUriArg);
+        }
+        const copyArgs = [
+            'extensionDevelopmentPath',
+            'extensionTestsPath',
+            'extensionEnvironment',
+            'debugId',
+            'inspect-brk-extensions',
+            'inspect-extensions',
+        ];
+        for (const argName of copyArgs) {
+            const value = this.findArgument(argName, args);
+            if (value) {
+                environment.set(argName, value);
+            }
+        }
+        let debugWorkspace = undefined;
+        const folderUriArg = this.findArgument('folder-uri', args);
+        if (folderUriArg) {
+            debugWorkspace = { folderUri: ( URI.parse(folderUriArg)) };
+        }
+        else {
+            const fileUriArg = this.findArgument('file-uri', args);
+            if (fileUriArg && hasWorkspaceFileExtension(fileUriArg)) {
+                debugWorkspace = { workspaceUri: ( URI.parse(fileUriArg)) };
+            }
+        }
+        const extensionTestsPath = this.findArgument('extensionTestsPath', args);
+        if (!debugWorkspace && !extensionTestsPath) {
+            const lastExtensionDevelopmentWorkspace = this.storageService.get(BrowserExtensionHostDebugService_1.LAST_EXTENSION_DEVELOPMENT_WORKSPACE_KEY, 0 );
+            if (lastExtensionDevelopmentWorkspace) {
+                try {
+                    const serializedWorkspace = JSON.parse(lastExtensionDevelopmentWorkspace);
+                    if (serializedWorkspace.workspaceUri) {
+                        debugWorkspace = { workspaceUri: URI.revive(serializedWorkspace.workspaceUri) };
+                    }
+                    else if (serializedWorkspace.folderUri) {
+                        debugWorkspace = { folderUri: URI.revive(serializedWorkspace.folderUri) };
+                    }
+                }
+                catch (error) {
+                }
+            }
+        }
+        if (debugWorkspace) {
+            const debugWorkspaceResource = isFolderToOpen(debugWorkspace) ? debugWorkspace.folderUri : isWorkspaceToOpen(debugWorkspace) ? debugWorkspace.workspaceUri : undefined;
+            if (debugWorkspaceResource) {
+                const workspaceExists = await this.fileService.exists(debugWorkspaceResource);
+                if (!workspaceExists) {
+                    debugWorkspace = undefined;
+                }
+            }
+        }
+        const success = await this.workspaceProvider.open(debugWorkspace, {
+            reuse: false,
+            payload: Array.from(environment.entries())
+        });
+        return { success };
+    }
+    findArgument(key, args) {
+        for (const a of args) {
+            const k = `--${key}=`;
+            if (a.indexOf(k) === 0) {
+                return a.substring(k.length);
+            }
+        }
+        return undefined;
+    }
+};
+BrowserExtensionHostDebugService = BrowserExtensionHostDebugService_1 = ( __decorate([
+    ( __param(0, IRemoteAgentService)),
+    ( __param(1, IBrowserWorkbenchEnvironmentService)),
+    ( __param(2, ILogService)),
+    ( __param(3, IHostService)),
+    ( __param(4, IWorkspaceContextService)),
+    ( __param(5, IStorageService)),
+    ( __param(6, IFileService))
+], BrowserExtensionHostDebugService));
+
+export { BrowserExtensionHostDebugService };

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import * as nls from 'monaco-editor/esm/vs/nls.js';
 import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import * as objects from 'monaco-editor/esm/vs/base/common/objects.js';
+import * as Objects from 'monaco-editor/esm/vs/base/common/objects.js';
 import { toAction } from 'monaco-editor/esm/vs/base/common/actions.js';
 import * as errors from 'monaco-editor/esm/vs/base/common/errors.js';
 import { createErrorWithActions } from 'monaco-editor/esm/vs/base/common/errorMessage.js';
@@ -681,7 +681,7 @@ let RawDebugSession = class RawDebugSession {
     }
     mergeCapabilities(capabilities) {
         if (capabilities) {
-            this._capabilities = objects.mixin(this._capabilities, capabilities);
+            this._capabilities = Objects.mixin(this._capabilities, capabilities);
         }
     }
     fireSimulatedContinuedEvent(threadId, allThreadsContinued = false) {

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

@@ -50,7 +50,7 @@ import { LinkDetector } from './linkDetector.js';
 import { ReplFilter } from './replFilter.js';
 import { ReplDelegate, ReplVariablesRenderer, ReplOutputElementRenderer, ReplEvaluationInputsRenderer, ReplGroupRenderer, ReplEvaluationResultsRenderer, ReplRawObjectsRenderer, ReplDataSource, ReplAccessibilityProvider } from './replViewer.js';
 import { DEBUG_SCHEME, CONTEXT_MULTI_SESSION_REPL, CONTEXT_IN_DEBUG_REPL, REPL_VIEW_ID, IDebugService, CONTEXT_DEBUG_STATE, getStateLabel } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
-import { Variable } from '../common/debugModel.js';
+import { Variable } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { ReplEvaluationResult, ReplGroup } from '../common/replModel.js';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { registerNavigableContainer } from 'vscode/vscode/vs/workbench/browser/actions/widgetNavigationCommands';

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

@@ -1,7 +1,7 @@
 import { matchesFuzzy } from 'monaco-editor/esm/vs/base/common/filters.js';
 import { splitGlobAware } from 'monaco-editor/esm/vs/base/common/glob.js';
 import { ReplEvaluationInput, ReplEvaluationResult } from '../common/replModel.js';
-import { Variable } from '../common/debugModel.js';
+import { Variable } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 
 class ReplFilter {
     constructor() {

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

@@ -17,7 +17,7 @@ import { renderExpressionValue, AbstractExpressionsRenderer, renderVariable } fr
 import { handleANSIOutput } from './debugANSIHandling.js';
 import { debugConsoleEvaluationInput } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
-import { Variable } from '../common/debugModel.js';
+import { Variable } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { ReplVariableElement, ReplEvaluationResult, ReplOutputElement, ReplEvaluationInput, ReplGroup, RawObjectReplElement } from '../common/replModel.js';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 

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

@@ -27,7 +27,7 @@ import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views'
 import { AbstractExpressionsRenderer, renderVariable, renderViewTree } from './baseDebugView.js';
 import { LinkDetector } from './linkDetector.js';
 import { IDebugService, VARIABLES_VIEW_ID, CONTEXT_VARIABLES_FOCUSED, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_DEBUG_PROTOCOL_VARIABLE_MENU_CONTEXT, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_VARIABLE_IS_READONLY } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
-import { Variable, getUriForDebugMemory, Expression, ErrorScope, Scope, StackFrame } from '../common/debugModel.js';
+import { Variable, getUriForDebugMemory, Expression, ErrorScope, Scope, StackFrame } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { IEditorService, SIDE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { RunOnceScheduler } from 'monaco-editor/esm/vs/base/common/async.js';
 import { CONTEXT_CAN_VIEW_MEMORY, CONTEXT_WATCH_ITEM_TYPE, WATCH_VIEW_ID, CONTEXT_WATCH_EXPRESSIONS_EXIST, IDebugService, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_WATCH_EXPRESSIONS_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
-import { Variable, Expression } from '../common/debugModel.js';
+import { Variable, Expression } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 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 { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';

package/vscode/src/vs/workbench/contrib/debug/common/debugContentProvider.js

@@ -5,7 +5,7 @@ import { IModelService } from 'monaco-editor/esm/vs/editor/common/services/model
 import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
 import { ITextModelService } from 'monaco-editor/esm/vs/editor/common/services/resolverService.js';
 import { DEBUG_SCHEME, IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
-import { Source } from './debugSource.js';
+import { Source } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugSource';
 import { IEditorWorkerService } from 'monaco-editor/esm/vs/editor/common/services/editorWorker.js';
 import { EditOperation } from 'monaco-editor/esm/vs/editor/common/core/editOperation.js';
 import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';

package/vscode/src/vs/workbench/contrib/debug/common/debugSchemas.js

@@ -1,7 +1,7 @@
 import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
 import * as nls from 'monaco-editor/esm/vs/nls.js';
 import { launchSchemaId } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
-import { inputsSchema } from '../../../services/configurationResolver/common/configurationResolverSchema.js';
+import { inputsSchema } from 'vscode/vscode/vs/workbench/services/configurationResolver/common/configurationResolverSchema';
 
 const debuggersExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'debuggers',

package/vscode/src/vs/workbench/contrib/debug/common/debugStorage.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
-import { Breakpoint, FunctionBreakpoint, ExceptionBreakpoint, DataBreakpoint, Expression } from './debugModel.js';
+import { Breakpoint, FunctionBreakpoint, ExceptionBreakpoint, DataBreakpoint, Expression } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
 import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
 import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';

package/vscode/src/vs/workbench/contrib/debug/common/debugger.js

@@ -4,7 +4,7 @@ import { isObject } from 'monaco-editor/esm/vs/base/common/types.js';
 import { DebugConfigurationProviderTriggerKind, debuggerDisabledMessage, IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { IConfigurationResolverService } from 'vscode/vscode/vs/workbench/services/configurationResolver/common/configurationResolver';
-import { applyDeprecatedVariableMessage } from '../../../services/configurationResolver/common/configurationResolverUtils.js';
+import { applyDeprecatedVariableMessage } from 'vscode/vscode/vs/workbench/services/configurationResolver/common/configurationResolverUtils';
 import { ITextResourcePropertiesService } from 'monaco-editor/esm/vs/editor/common/services/textResourceConfiguration.js';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';

package/vscode/src/vs/workbench/contrib/debug/common/replModel.js

@@ -3,7 +3,7 @@ import Severity from 'monaco-editor/esm/vs/base/common/severity.js';
 import { isObject, isString } from 'monaco-editor/esm/vs/base/common/types.js';
 import { generateUuid } from 'monaco-editor/esm/vs/base/common/uuid.js';
 import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { ExpressionContainer } from './debugModel.js';
+import { ExpressionContainer } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 
 const MAX_REPL_LENGTH = 10000;
 let topReplElementCounter = 0;