@theia/debug 1.56.0 → 1.57.0-next.136

package/src/browser/view/debug-watch-expression.tsx

@@ -25,6 +25,7 @@ export class DebugWatchExpression extends ExpressionItem {
 
     readonly id: number;
     protected isError: boolean;
+    protected isNotAvailable: boolean;
 
     constructor(protected readonly options: {
         id: number,
@@ -42,7 +43,16 @@ export class DebugWatchExpression extends ExpressionItem {
     }
 
     protected override setResult(body?: DebugProtocol.EvaluateResponse['body'], error?: string): void {
-        if (this.options.session()) {
+        const session = this.options.session();
+        this.isNotAvailable = false;
+        this.isError = false;
+
+        // not available must be set regardless of the session's availability.
+        // not available is used when there is no session or the current stack frame is not available.
+        if (error === ExpressionItem.notAvailable) {
+            super.setResult(undefined, error);
+            this.isNotAvailable = true;
+        } else if (session) {
             super.setResult(body, error);
             this.isError = !!error;
         }
@@ -50,15 +60,26 @@ export class DebugWatchExpression extends ExpressionItem {
     }
 
     override render(): React.ReactNode {
+        const valueClass = this.valueClass();
         return <div className='theia-debug-console-variable theia-debug-watch-expression'>
             <div className={TREE_NODE_SEGMENT_GROW_CLASS}>
                 <span title={this.type || this._expression} className='name'>{this._expression}: </span>
-                <span title={this._value} ref={this.setValueRef} className={this.isError ? 'watch-error' : ''}>{this._value}</span>
+                <span title={this._value} ref={this.setValueRef} className={valueClass}>{this._value}</span>
             </div>
             <div className={codicon('close', true)} title={nls.localizeByDefault('Remove Expression')} onClick={this.options.remove} />
         </div>;
     }
 
+    protected valueClass(): string {
+        if (this.isError) {
+            return 'watch-error';
+        }
+        if (this.isNotAvailable) {
+            return 'watch-not-available';
+        }
+        return '';
+    }
+
     async open(): Promise<void> {
         const input = new SingleTextInputDialog({
             title: nls.localizeByDefault('Edit Expression'),

package/src/common/debug-adapter-session.ts

@@ -43,7 +43,6 @@ export class DebugAdapterSessionImpl implements DebugAdapterSession {
         this.debugAdapter.onMessageReceived((message: string) => this.send(message));
         this.debugAdapter.onClose(() => this.onDebugAdapterExit());
         this.debugAdapter.onError(error => this.onDebugAdapterError(error));
-
     }
 
     async start(channel: DebugChannel): Promise<void> {

package/src/node/debug-backend-module.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { bindContributionProvider, ILogger } from '@theia/core/lib/common';
+import { bindContributionProvider } from '@theia/core/lib/common';
 import { ContainerModule } from '@theia/core/shared/inversify';
 import {
     DebugPath,
@@ -50,8 +50,4 @@ export default new ContainerModule(bind => {
     bind(DebugAdapterFactory).to(LaunchBasedDebugAdapterFactory).inSingletonScope();
     bind(DebugAdapterSessionManager).toSelf().inSingletonScope();
     bind(MessagingService.Contribution).toService(DebugAdapterSessionManager);
-
-    bind(ILogger).toDynamicValue(({ container }) =>
-        container.get<ILogger>(ILogger).child('debug')
-    ).inSingletonScope().whenTargetNamed('debug');
 });