@theia/debug 1.22.1 → 1.23.0-next.26

package/src/browser/console/debug-console-contribution.tsx

@@ -24,9 +24,8 @@ import { Command, CommandRegistry } from '@theia/core/lib/common/command';
 import { Severity } from '@theia/core/lib/common/severity';
 import { inject, injectable, interfaces, postConstruct } from '@theia/core/shared/inversify';
 import * as React from '@theia/core/shared/react';
-import { DebugConsoleMode } from '../../common/debug-configuration';
 import { DebugSession } from '../debug-session';
-import { DebugSessionManager } from '../debug-session-manager';
+import { DebugSessionManager, DidChangeActiveDebugSession } from '../debug-session-manager';
 import { DebugConsoleSession, DebugConsoleSessionFactory } from './debug-console-session';
 
 export type InDebugReplContextKey = ContextKey<boolean>;
@@ -71,9 +70,9 @@ export class DebugConsoleContribution extends AbstractViewContribution<ConsoleWi
     @postConstruct()
     protected init(): void {
         this.debugSessionManager.onDidCreateDebugSession(session => {
-            const topParent = this.findParentSession(session);
-            if (topParent) {
-                const parentConsoleSession = this.consoleSessionManager.get(topParent.id);
+            const consoleParent = session.findConsoleParent();
+            if (consoleParent) {
+                const parentConsoleSession = this.consoleSessionManager.get(consoleParent.id);
                 if (parentConsoleSession instanceof DebugConsoleSession) {
                     session.on('output', event => parentConsoleSession.logOutput(parentConsoleSession.debugSession, event));
                 }
@@ -83,20 +82,24 @@ export class DebugConsoleContribution extends AbstractViewContribution<ConsoleWi
                 session.on('output', event => consoleSession.logOutput(session, event));
             }
         });
+        this.debugSessionManager.onDidChangeActiveDebugSession(event => this.handleActiveDebugSessionChanged(event));
         this.debugSessionManager.onDidDestroyDebugSession(session => {
             this.consoleSessionManager.delete(session.id);
         });
     }
 
-    protected findParentSession(session: DebugSession): DebugSession | undefined {
-        if (session.configuration.consoleMode !== DebugConsoleMode.MergeWithParent) {
-            return undefined;
+    protected handleActiveDebugSessionChanged(event: DidChangeActiveDebugSession): void {
+        if (!event.current) {
+            this.consoleSessionManager.selectedSession = undefined;
+        } else {
+            const topSession = event.current.findConsoleParent() || event.current;
+            const consoleSession = topSession ? this.consoleSessionManager.get(topSession.id) : undefined;
+            this.consoleSessionManager.selectedSession = consoleSession;
+            const consoleSelector = document.getElementById('debugConsoleSelector');
+            if (consoleSession && consoleSelector instanceof HTMLSelectElement) {
+                consoleSelector.value = consoleSession.id;
+            }
         }
-        let debugSession: DebugSession | undefined = session;
-        do {
-            debugSession = debugSession.parentSession;
-        } while (debugSession?.parentSession && debugSession.configuration.consoleMode === DebugConsoleMode.MergeWithParent);
-        return debugSession;
     }
 
     registerCommands(commands: CommandRegistry): void {

package/src/browser/console/debug-console-session.ts

@@ -22,7 +22,8 @@ import { DebugSession } from '../debug-session';
 import URI from '@theia/core/lib/common/uri';
 import { ExpressionContainer, ExpressionItem } from './debug-console-items';
 import { Severity } from '@theia/core/lib/common/severity';
-import { injectable, postConstruct } from '@theia/core/shared/inversify';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import { DebugSessionManager } from '../debug-session-manager';
 
 export const DebugConsoleSessionFactory = Symbol('DebugConsoleSessionFactory');
 
@@ -33,6 +34,8 @@ export class DebugConsoleSession extends ConsoleSession {
 
     static uri = new URI().withScheme('debugconsole');
 
+    @inject(DebugSessionManager) protected readonly sessionManager: DebugSessionManager;
+
     protected items: ConsoleItem[] = [];
 
     protected _debugSession: DebugSession;
@@ -86,20 +89,48 @@ export class DebugConsoleSession extends ConsoleSession {
     }
 
     protected async completions(model: monaco.editor.ITextModel, position: monaco.Position): Promise<monaco.languages.CompletionList | undefined> {
-        const session = this.debugSession;
-        if (session && session.capabilities.supportsCompletionsRequest) {
+        const completionSession = this.findCompletionSession();
+        if (completionSession) {
             const column = position.column;
             const lineNumber = position.lineNumber;
             const word = model.getWordAtPosition({ column, lineNumber });
             const overwriteBefore = word ? word.word.length : 0;
             const text = model.getValue();
-            const items = await session.completions(text, column, lineNumber);
+            const items = await completionSession.completions(text, column, lineNumber);
             const suggestions = items.map(item => this.asCompletionItem(text, position, overwriteBefore, item));
             return { suggestions };
         }
         return undefined;
     }
 
+    protected findCurrentSession(): DebugSession | undefined {
+        const currentSession = this.sessionManager.currentSession;
+        if (!currentSession) {
+            return undefined;
+        }
+        if (currentSession.id === this.debugSession.id) {
+            // perfect match
+            return this.debugSession;
+        }
+        const parentSession = currentSession.findConsoleParent();
+        if (parentSession?.id === this.debugSession.id) {
+            // child of our session
+            return currentSession;
+        }
+        return undefined;
+    }
+
+    protected findCompletionSession(): DebugSession | undefined {
+        let completionSession: DebugSession | undefined = this.findCurrentSession();
+        while (completionSession !== undefined) {
+            if (completionSession.capabilities.supportsCompletionsRequest) {
+                return completionSession;
+            }
+            completionSession = completionSession.parentSession;
+        }
+        return completionSession;
+    }
+
     protected asCompletionItem(text: string, position: monaco.Position, overwriteBefore: number, item: DebugProtocol.CompletionItem): monaco.languages.CompletionItem {
         return {
             label: item.label,
@@ -112,7 +143,7 @@ export class DebugConsoleSession extends ConsoleSession {
     }
 
     async execute(value: string): Promise<void> {
-        const expression = new ExpressionItem(value, () => this.debugSession);
+        const expression = new ExpressionItem(value, () => this.findCurrentSession());
         this.items.push(expression);
         await expression.evaluate();
         this.fireDidChange();

package/src/browser/debug-session.tsx

@@ -34,7 +34,7 @@ import debounce = require('p-debounce');
 import URI from '@theia/core/lib/common/uri';
 import { BreakpointManager } from './breakpoint/breakpoint-manager';
 import { DebugSessionOptions, InternalDebugSessionOptions } from './debug-session-options';
-import { DebugConfiguration } from '../common/debug-common';
+import { DebugConfiguration, DebugConsoleMode } from '../common/debug-common';
 import { SourceBreakpoint, ExceptionBreakpoint } from './breakpoint/breakpoint-marker';
 import { TerminalWidgetOptions, TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
 import { DebugFunctionBreakpoint } from './model/debug-function-breakpoint';
@@ -817,4 +817,19 @@ export class DebugSession implements CompositeTreeElement {
             contrib.register(configType, connection);
         }
     };
+
+    /**
+     * Returns the top-most parent session that is responsible for the console. If this session uses a {@link DebugConsoleMode.Separate separate console}
+     * or does not have any parent session, undefined is returned.
+     */
+    public findConsoleParent(): DebugSession | undefined {
+        if (this.configuration.consoleMode !== DebugConsoleMode.MergeWithParent) {
+            return undefined;
+        }
+        let debugSession: DebugSession | undefined = this;
+        do {
+            debugSession = this.parentSession;
+        } while (debugSession?.parentSession && debugSession.configuration.consoleMode === DebugConsoleMode.MergeWithParent);
+        return debugSession;
+    }
 }

package/src/browser/style/index.css

@@ -286,7 +286,7 @@
 	background: url('breakpoint-log.svg') center center no-repeat;
 }
 .theia-debug-logpoint-disabled,
-.monaco-editor .theia-debug-breakpoint-column.theia-debug-logpoint-disabled-columne {
+.monaco-editor .theia-debug-breakpoint-column.theia-debug-logpoint-disabled-column {
     background: url('breakpoint-log-disabled.svg') center center no-repeat;
 }
 .theia-debug-logpoint-unverified,

package/lib/node/inline-debug-adapter.d.ts

@@ -1,34 +0,0 @@
-/********************************************************************************
- * Copyright (C) 2021 Red Hat, Inc. and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- ********************************************************************************/
-import { Event } from '@theia/core/lib/common/event';
-import { DebugAdapter } from './debug-model';
-import * as theia from '@theia/plugin';
-/**
- * A debug adapter for using the inline implementation from a plugin.
- */
-export declare class InlineDebugAdapter implements DebugAdapter {
-    private debugAdapter;
-    private messageReceivedEmitter;
-    onMessageReceived: Event<string>;
-    onError: Event<Error>;
-    private closeEmitter;
-    onClose: Event<void>;
-    constructor(debugAdapter: theia.DebugAdapter);
-    start(): Promise<void>;
-    send(message: string): void;
-    stop(): Promise<void>;
-}
-//# sourceMappingURL=inline-debug-adapter.d.ts.map

package/lib/node/inline-debug-adapter.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"inline-debug-adapter.d.ts","sourceRoot":"","sources":["../../src/node/inline-debug-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAW,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,KAAK,MAAM,eAAe,CAAC;AAEvC;;GAEG;AACH,qBAAa,kBAAmB,YAAW,YAAY;IAOvC,OAAO,CAAC,YAAY;IANhC,OAAO,CAAC,sBAAsB,CAAyB;IACvD,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAqC;IACrE,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAc;IACnC,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAA2B;gBAE3B,YAAY,EAAE,KAAK,CAAC,YAAY;IAM9C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAG5B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIrB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAG9B"}

package/lib/node/inline-debug-adapter.js

@@ -1,45 +0,0 @@
-"use strict";
-/********************************************************************************
- * Copyright (C) 2021 Red Hat, Inc. and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- ********************************************************************************/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.InlineDebugAdapter = void 0;
-const event_1 = require("@theia/core/lib/common/event");
-/**
- * A debug adapter for using the inline implementation from a plugin.
- */
-class InlineDebugAdapter {
-    constructor(debugAdapter) {
-        this.debugAdapter = debugAdapter;
-        this.messageReceivedEmitter = new event_1.Emitter();
-        this.onMessageReceived = this.messageReceivedEmitter.event;
-        this.onError = event_1.Event.None;
-        this.closeEmitter = new event_1.Emitter();
-        this.onClose = this.closeEmitter.event;
-        this.debugAdapter.onDidSendMessage(msg => {
-            this.messageReceivedEmitter.fire(JSON.stringify(msg));
-        });
-    }
-    async start() {
-    }
-    send(message) {
-        this.debugAdapter.handleMessage(JSON.parse(message));
-    }
-    async stop() {
-        this.debugAdapter.dispose();
-    }
-}
-exports.InlineDebugAdapter = InlineDebugAdapter;
-//# sourceMappingURL=inline-debug-adapter.js.map

package/lib/node/inline-debug-adapter.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"inline-debug-adapter.js","sourceRoot":"","sources":["../../src/node/inline-debug-adapter.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,wDAA8D;AAI9D;;GAEG;AACH,MAAa,kBAAkB;IAO3B,YAAoB,YAAgC;QAAhC,iBAAY,GAAZ,YAAY,CAAoB;QAN5C,2BAAsB,GAAG,IAAI,eAAO,EAAU,CAAC;QACvD,sBAAiB,GAAkB,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC;QACrE,YAAO,GAAiB,aAAK,CAAC,IAAI,CAAC;QAC3B,iBAAY,GAAG,IAAI,eAAO,EAAQ,CAAC;QAC3C,YAAO,GAAgB,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC;QAG3C,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE;YACrC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,KAAK;IACX,CAAC;IAED,IAAI,CAAC,OAAe;QAChB,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,IAAI;QACN,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;IAChC,CAAC;CACJ;AAvBD,gDAuBC"}

package/src/node/inline-debug-adapter.ts

@@ -1,47 +0,0 @@
-/********************************************************************************
- * Copyright (C) 2021 Red Hat, Inc. and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- ********************************************************************************/
-
-import { Emitter, Event } from '@theia/core/lib/common/event';
-import { DebugAdapter } from './debug-model';
-import * as theia from '@theia/plugin';
-
-/**
- * A debug adapter for using the inline implementation from a plugin.
- */
-export class InlineDebugAdapter implements DebugAdapter {
-    private messageReceivedEmitter = new Emitter<string>();
-    onMessageReceived: Event<string> = this.messageReceivedEmitter.event;
-    onError: Event<Error> = Event.None;
-    private closeEmitter = new Emitter<void>();
-    onClose: Event<void> = this.closeEmitter.event;
-
-    constructor(private debugAdapter: theia.DebugAdapter) {
-        this.debugAdapter.onDidSendMessage(msg => {
-            this.messageReceivedEmitter.fire(JSON.stringify(msg));
-        });
-    }
-
-    async start(): Promise<void> {
-    }
-
-    send(message: string): void {
-        this.debugAdapter.handleMessage(JSON.parse(message));
-    }
-
-    async stop(): Promise<void> {
-        this.debugAdapter.dispose();
-    }
-}