@codingame/monaco-vscode-debug-service-override 11.1.1 → 12.0.0

package/index.d.ts

@@ -1 +1,2 @@
-export { default } from 'vscode/service-override/debug';
+import type { IEditorOverrideServices } from "vscode/vscode/vs/editor/standalone/browser/standaloneServices";
+export default function getServiceOverride(): IEditorOverrideServices;

package/index.js

@@ -1 +1,27 @@
-export { default } from './debug.js';
+
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
+import { DebugService } from './vscode/src/vs/workbench/contrib/debug/browser/debugService.js';
+import { LanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeaturesService';
+import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
+import { IExtensionHostDebugService } from 'vscode/vscode/vs/platform/debug/common/extensionHostDebug.service';
+import { BrowserExtensionHostDebugService } from './vscode/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.js';
+import { IDebugVisualizerService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugVisualizers.service';
+import { DebugVisualizerService } from './vscode/src/vs/workbench/contrib/debug/common/debugVisualizers.js';
+import './service-override/tools/debugAssets.js';
+import './vscode/src/vs/workbench/contrib/debug/browser/debug.contribution.js';
+
+const original = DebugService.prototype['showError'];
+DebugService.prototype['showError'] = function (message, errorActions) {
+    return original.call(this, message, errorActions, false);
+};
+function getServiceOverride() {
+    return {
+        [ILanguageFeaturesService.toString()]: new SyncDescriptor(LanguageFeaturesService, [], true),
+        [IDebugService.toString()]: new SyncDescriptor(DebugService, [], true),
+        [IExtensionHostDebugService.toString()]: new SyncDescriptor(BrowserExtensionHostDebugService, [], true),
+        [IDebugVisualizerService.toString()]: new SyncDescriptor(DebugVisualizerService, [], true)
+    };
+}
+
+export { getServiceOverride as default };

package/package.json

@@ -1,6 +1,8 @@
 {
   "name": "@codingame/monaco-vscode-debug-service-override",
-  "version": "11.1.1",
+  "version": "12.0.0",
+  "private": false,
+  "description": "VSCode public API plugged on the monaco editor - debug service-override",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -12,8 +14,39 @@
     "url": "git+ssh://git@github.com/CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
-  "private": false,
-  "description": "VSCode public API plugged on the monaco editor - debug service-override",
+  "dependencies": {
+    "@codingame/monaco-vscode-0b087f42-a5a3-5eb9-9bfd-1eebc1bba163-common": "12.0.0",
+    "@codingame/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common": "12.0.0",
+    "@codingame/monaco-vscode-2448342b-297f-5823-9f41-f18eef0f6ee8-common": "12.0.0",
+    "@codingame/monaco-vscode-37e80bf5-92f5-5e4c-8b6d-98e0bb89dbef-common": "12.0.0",
+    "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common": "12.0.0",
+    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "12.0.0",
+    "@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common": "12.0.0",
+    "@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common": "12.0.0",
+    "@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common": "12.0.0",
+    "@codingame/monaco-vscode-b4efa70b-52b9-5670-ab5c-f10b10b6834e-common": "12.0.0",
+    "@codingame/monaco-vscode-cc9ccbec-e2a1-599d-84ae-46f5efc666e3-common": "12.0.0",
+    "@codingame/monaco-vscode-e571cbbb-526b-5d8b-92c5-a0437d2dabb3-common": "12.0.0",
+    "@codingame/monaco-vscode-e59ecb8c-db32-5324-8fe4-cf9921fd92b8-common": "12.0.0",
+    "@codingame/monaco-vscode-fc42f049-7883-579d-bb0b-2aa1010a19a8-common": "12.0.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@12.0.0"
+  },
+  "peerDependencies": {
+    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": "12.0.0",
+    "@codingame/monaco-vscode-625898ab-0e33-5b7f-a3ae-29c10271dc1c-common": "12.0.0",
+    "@codingame/monaco-vscode-6845754f-e617-5ed9-8aaa-6ca3653a9532-common": "12.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": {
+      "optional": true
+    },
+    "@codingame/monaco-vscode-625898ab-0e33-5b7f-a3ae-29c10271dc1c-common": {
+      "optional": true
+    },
+    "@codingame/monaco-vscode-6845754f-e617-5ed9-8aaa-6ca3653a9532-common": {
+      "optional": true
+    }
+  },
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
@@ -22,11 +55,12 @@
       "default": "./index.js"
     },
     "./vscode/*": {
-      "default": "./vscode/src/*.js"
+      "default": "./vscode/src/*.js",
+      "types": "./vscode/src/*.d.ts"
+    },
+    "./*": {
+      "default": "./*.js",
+      "types": "./*.d.ts"
     }
-  },
-  "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@11.1.1",
-    "@codingame/monaco-vscode-debug-notebook-common": "11.1.1"
   }
 }

package/service-override/tools/debugAssets.d.ts

@@ -0,0 +1 @@
+export {};

package/service-override/tools/debugAssets.js

@@ -0,0 +1,5 @@
+
+import pngAssets from '@codingame/monaco-vscode-e59ecb8c-db32-5324-8fe4-cf9921fd92b8-common/vscode/vs/workbench/contrib/debug/browser/media/all.png';
+import { registerAssets } from 'vscode/assets';
+
+registerAssets(pngAssets);

package/vscode/src/vs/platform/debug/common/extensionHostDebugIpc.d.ts

@@ -0,0 +1,28 @@
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IChannel, IServerChannel } from "vscode/vscode/vs/base/parts/ipc/common/ipc";
+import { IAttachSessionEvent, ICloseSessionEvent, IOpenExtensionWindowResult, IReloadSessionEvent, ITerminateSessionEvent } from "vscode/vscode/vs/platform/debug/common/extensionHostDebug";
+import { IExtensionHostDebugService } from "vscode/vscode/vs/platform/debug/common/extensionHostDebug.service";
+export declare class ExtensionHostDebugBroadcastChannel<TContext> implements IServerChannel<TContext> {
+    static readonly ChannelName = "extensionhostdebugservice";
+    private readonly _onCloseEmitter;
+    private readonly _onReloadEmitter;
+    private readonly _onTerminateEmitter;
+    private readonly _onAttachEmitter;
+    call(ctx: TContext, command: string, arg?: any): Promise<any>;
+    listen(ctx: TContext, event: string, arg?: any): Event<any>;
+}
+export declare class ExtensionHostDebugChannelClient extends Disposable implements IExtensionHostDebugService {
+    private channel;
+    readonly _serviceBrand: undefined;
+    constructor(channel: IChannel);
+    reload(sessionId: string): void;
+    get onReload(): Event<IReloadSessionEvent>;
+    close(sessionId: string): void;
+    get onClose(): Event<ICloseSessionEvent>;
+    attachSession(sessionId: string, port: number, subId?: string): void;
+    get onAttachSession(): Event<IAttachSessionEvent>;
+    terminateSession(sessionId: string, subId?: string): void;
+    get onTerminateSession(): Event<ITerminateSessionEvent>;
+    openExtensionDevelopmentHostWindow(args: string[], debugRenderer: boolean): Promise<IOpenExtensionWindowResult>;
+}

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

@@ -1,3 +1,4 @@
+
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 

package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.d.ts

@@ -0,0 +1,79 @@
+import { ActionBar } from "vscode/vscode/vs/base/browser/ui/actionbar/actionbar";
+import { HighlightedLabel, IHighlight } from "vscode/vscode/vs/base/browser/ui/highlightedlabel/highlightedLabel";
+import { IInputValidationOptions } from "vscode/vscode/vs/base/browser/ui/inputbox/inputBox";
+import { IAsyncDataSource, ITreeNode, ITreeRenderer } from "vscode/vscode/vs/base/browser/ui/tree/tree";
+import { FuzzyScore } from "vscode/vscode/vs/base/common/filters";
+import { DisposableStore, IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { ICommandService } from "vscode/vscode/vs/platform/commands/common/commands.service";
+import { IContextViewService } from "vscode/vscode/vs/platform/contextview/browser/contextView.service";
+import { IHoverService } from "vscode/vscode/vs/platform/hover/browser/hover.service";
+import { IExpression } from "vscode/vscode/vs/workbench/contrib/debug/common/debug";
+import { IDebugService } from "vscode/vscode/vs/workbench/contrib/debug/common/debug.service";
+import { IDebugVisualizerService } from "vscode/vscode/vs/workbench/contrib/debug/common/debugVisualizers.service";
+import { LinkDetector } from "@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/linkDetector";
+export interface IRenderValueOptions {
+    showChanged?: boolean;
+    maxValueLength?: number;
+    hover?: false | {
+        commands: {
+            id: string;
+            args: unknown[];
+        }[];
+        commandService: ICommandService;
+    };
+    colorize?: boolean;
+    linkDetector?: LinkDetector;
+}
+export interface IVariableTemplateData {
+    expression: HTMLElement;
+    name: HTMLElement;
+    type: HTMLElement;
+    value: HTMLElement;
+    label: HighlightedLabel;
+    lazyButton: HTMLElement;
+}
+export declare function renderViewTree(container: HTMLElement): HTMLElement;
+export interface IInputBoxOptions {
+    initialValue: string;
+    ariaLabel: string;
+    placeholder?: string;
+    validationOptions?: IInputValidationOptions;
+    onFinish: (value: string, success: boolean) => void;
+}
+export interface IExpressionTemplateData {
+    expression: HTMLElement;
+    name: HTMLSpanElement;
+    type: HTMLSpanElement;
+    value: HTMLSpanElement;
+    inputBoxContainer: HTMLElement;
+    actionBar?: ActionBar;
+    elementDisposable: DisposableStore;
+    templateDisposable: IDisposable;
+    label: HighlightedLabel;
+    lazyButton: HTMLElement;
+    currentElement: IExpression | undefined;
+}
+export declare abstract class AbstractExpressionDataSource<Input, Element extends IExpression> implements IAsyncDataSource<Input, Element> {
+    protected debugService: IDebugService;
+    protected debugVisualizer: IDebugVisualizerService;
+    constructor(debugService: IDebugService, debugVisualizer: IDebugVisualizerService);
+    abstract hasChildren(element: Input | Element): boolean;
+    getChildren(element: Input | Element): Promise<Element[]>;
+    protected abstract doGetChildren(element: Input | Element): Promise<Element[]>;
+}
+export declare abstract class AbstractExpressionsRenderer<T = IExpression> implements ITreeRenderer<T, FuzzyScore, IExpressionTemplateData> {
+    protected debugService: IDebugService;
+    private readonly contextViewService;
+    protected readonly hoverService: IHoverService;
+    constructor(debugService: IDebugService, contextViewService: IContextViewService, hoverService: IHoverService);
+    abstract get templateId(): string;
+    renderTemplate(container: HTMLElement): IExpressionTemplateData;
+    abstract renderElement(node: ITreeNode<T, FuzzyScore>, index: number, data: IExpressionTemplateData): void;
+    protected renderExpressionElement(element: IExpression, node: ITreeNode<T, FuzzyScore>, data: IExpressionTemplateData): void;
+    renderInputBox(nameElement: HTMLElement, valueElement: HTMLElement, inputBoxContainer: HTMLElement, options: IInputBoxOptions): IDisposable;
+    protected abstract renderExpression(expression: T, data: IExpressionTemplateData, highlights: IHighlight[]): void;
+    protected abstract getInputBoxOptions(expression: IExpression, settingValue: boolean): IInputBoxOptions | undefined;
+    protected renderActionBar?(actionBar: ActionBar, expression: IExpression, data: IExpressionTemplateData): void;
+    disposeElement(node: ITreeNode<T, FuzzyScore>, index: number, templateData: IExpressionTemplateData): void;
+    disposeTemplate(templateData: IExpressionTemplateData): void;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { $ as $$1, append, addDisposableListener, EventType, clearNode, addStandardDisposableListener } from 'vscode/vscode/vs/base/browser/dom';
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { HighlightedLabel } from 'vscode/vscode/vs/base/browser/ui/highlightedlabel/highlightedLabel';
@@ -7,6 +8,7 @@ import { InputBox } from 'vscode/vscode/vs/base/browser/ui/inputbox/inputBox';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { createMatches } from 'vscode/vscode/vs/base/common/filters';
 import { createSingleCallFunction } from 'vscode/vscode/vs/base/common/functional';
+import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { DisposableStore, dispose, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { localize } from 'vscode/vscode/vs/nls';
@@ -14,7 +16,7 @@ import { IContextViewService } from 'vscode/vscode/vs/platform/contextview/brows
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 import { defaultInputBoxStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
-import { Variable } from '@codingame/monaco-vscode-debug-notebook-common/vscode/vs/workbench/contrib/debug/common/debugModel';
+import { Variable } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { IDebugVisualizerService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugVisualizers.service';
 
 const $ = $$1;
@@ -32,7 +34,7 @@ let AbstractExpressionDataSource = class AbstractExpressionDataSource {
     async getChildren(element) {
         const vm = this.debugService.getViewModel();
         const children = await this.doGetChildren(element);
-        return Promise.all(( (children.map(async (r) => {
+        return Promise.all(( children.map(async (r) => {
             const vizOrTree = vm.getVisualizedExpression(r);
             if (typeof vizOrTree === 'string') {
                 const viz = await this.debugVisualizer.getVisualizedNodeFor(vizOrTree, r);
@@ -45,13 +47,13 @@ let AbstractExpressionDataSource = class AbstractExpressionDataSource {
                 return vizOrTree;
             }
             return r;
-        }))));
+        })));
     }
 };
-AbstractExpressionDataSource = ( (__decorate([
-    ( (__param(0, IDebugService))),
-    ( (__param(1, IDebugVisualizerService)))
-], AbstractExpressionDataSource)));
+AbstractExpressionDataSource = ( __decorate([
+    ( __param(0, IDebugService)),
+    ( __param(1, IDebugVisualizerService))
+], AbstractExpressionDataSource));
 let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
     constructor(debugService, contextViewService, hoverService) {
         this.debugService = debugService;
@@ -59,22 +61,22 @@ let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
         this.hoverService = hoverService;
     }
     renderTemplate(container) {
-        const templateDisposable = ( (new DisposableStore()));
+        const templateDisposable = ( new DisposableStore());
         const expression = append(container, $('.expression'));
         const name = append(expression, $('span.name'));
         const lazyButton = append(expression, $('span.lazy-button'));
         lazyButton.classList.add(...ThemeIcon.asClassNameArray(Codicon.eye));
-        templateDisposable.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), lazyButton, ( localize(10440, "Click to expand"))));
+        templateDisposable.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), lazyButton, ( localize(4936, "Click to expand"))));
         const type = append(expression, $('span.type'));
         const value = append(expression, $('span.value'));
-        const label = templateDisposable.add(( (new HighlightedLabel(name))));
+        const label = templateDisposable.add(( new HighlightedLabel(name)));
         const inputBoxContainer = append(expression, $('.inputBoxContainer'));
         let actionBar;
         if (this.renderActionBar) {
             append(expression, $('.span.actionbar-spacer'));
-            actionBar = templateDisposable.add(( (new ActionBar(expression))));
+            actionBar = templateDisposable.add(( new ActionBar(expression)));
         }
-        const template = { expression, name, type, value, label, inputBoxContainer, actionBar, elementDisposable: ( (new DisposableStore())), templateDisposable, lazyButton, currentElement: undefined };
+        const template = { expression, name, type, value, label, inputBoxContainer, actionBar, elementDisposable: ( new DisposableStore()), templateDisposable, lazyButton, currentElement: undefined };
         templateDisposable.add(addDisposableListener(lazyButton, EventType.CLICK, () => {
             if (template.currentElement) {
                 this.debugService.getViewModel().evaluateLazyExpression(template.currentElement);
@@ -101,11 +103,11 @@ let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
         valueElement.style.display = 'none';
         inputBoxContainer.style.display = 'initial';
         clearNode(inputBoxContainer);
-        const inputBox = ( (new InputBox(
+        const inputBox = ( new InputBox(
             inputBoxContainer,
             this.contextViewService,
             { ...options, inputBoxStyles: defaultInputBoxStyles }
-        )));
+        ));
         inputBox.value = options.initialValue;
         inputBox.focus();
         inputBox.select();
@@ -123,8 +125,8 @@ let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
         const toDispose = [
             inputBox,
             addStandardDisposableListener(inputBox.inputElement, EventType.KEY_DOWN, (e) => {
-                const isEscape = e.equals(9 );
-                const isEnter = e.equals(3 );
+                const isEscape = e.equals(KeyCode.Escape);
+                const isEnter = e.equals(KeyCode.Enter);
                 if (isEscape || isEnter) {
                     e.preventDefault();
                     e.stopPropagation();
@@ -151,10 +153,10 @@ let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
         templateData.templateDisposable.dispose();
     }
 };
-AbstractExpressionsRenderer = ( (__decorate([
-    ( (__param(0, IDebugService))),
-    ( (__param(1, IContextViewService))),
-    ( (__param(2, IHoverService)))
-], AbstractExpressionsRenderer)));
+AbstractExpressionsRenderer = ( __decorate([
+    ( __param(0, IDebugService)),
+    ( __param(1, IContextViewService)),
+    ( __param(2, IHoverService))
+], AbstractExpressionsRenderer));
 
 export { AbstractExpressionDataSource, AbstractExpressionsRenderer, renderViewTree };

package/vscode/src/vs/workbench/contrib/debug/browser/callStackView.d.ts

@@ -0,0 +1,45 @@
+import { IMenuService } from "vscode/vscode/vs/platform/actions/common/actions.service";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IContextMenuService } from "vscode/vscode/vs/platform/contextview/browser/contextView.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IKeybindingService } from "vscode/vscode/vs/platform/keybinding/common/keybinding.service";
+import { IOpenerService } from "vscode/vscode/vs/platform/opener/common/opener.service";
+import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IThemeService } from "vscode/vscode/vs/platform/theme/common/themeService.service";
+import { ViewPane } from "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane";
+import { IViewletViewOptions } from "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common/vscode/vs/workbench/browser/parts/views/viewsViewlet";
+import { IViewDescriptorService } from "vscode/vscode/vs/workbench/common/views.service";
+import { IDebugSession, IStackFrame, IThread } from "vscode/vscode/vs/workbench/contrib/debug/common/debug";
+import { IDebugService } from "vscode/vscode/vs/workbench/contrib/debug/common/debug.service";
+import { ThreadAndSessionIds } from "@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/common/debugModel";
+import { IHoverService } from "vscode/vscode/vs/platform/hover/browser/hover.service";
+type CallStackItem = IStackFrame | IThread | IDebugSession | string | ThreadAndSessionIds | IStackFrame[];
+export declare function getContext(element: CallStackItem | null): any;
+export declare function getContextForContributedActions(element: CallStackItem | null): string | number;
+export declare function getSpecificSourceName(stackFrame: IStackFrame): string;
+export declare class CallStackView extends ViewPane {
+    private options;
+    private readonly debugService;
+    private readonly menuService;
+    private stateMessage;
+    private stateMessageLabel;
+    private stateMessageLabelHover;
+    private onCallStackChangeScheduler;
+    private needsRefresh;
+    private ignoreSelectionChangedEvent;
+    private ignoreFocusStackFrameEvent;
+    private dataSource;
+    private tree;
+    private autoExpandedSessions;
+    private selectionNeedsUpdate;
+    constructor(options: IViewletViewOptions, contextMenuService: IContextMenuService, debugService: IDebugService, keybindingService: IKeybindingService, instantiationService: IInstantiationService, viewDescriptorService: IViewDescriptorService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, openerService: IOpenerService, themeService: IThemeService, telemetryService: ITelemetryService, hoverService: IHoverService, menuService: IMenuService);
+    protected renderHeaderTitle(container: HTMLElement): void;
+    protected renderBody(container: HTMLElement): void;
+    protected layoutBody(height: number, width: number): void;
+    focus(): void;
+    collapseAll(): void;
+    private updateTreeSelection;
+    private onContextMenu;
+}
+export {};