@opensumi/ide-debug 3.7.1-next-1739781685.0 → 3.7.1

package/src/browser/debug-progress.service.ts

@@ -9,7 +9,9 @@ import { DisposableCollection, IProgress, IProgressStep, ProgressLocation } from
 import { DebugProtocol } from '@opensumi/vscode-debugprotocol';
 
 import { IDebugProgress } from '../common/debug-progress';
-import { DebugState, IDebugSession, IDebugSessionManager } from '../common/debug-session';
+import { DebugState, IDebugSessionManager } from '../common/debug-session';
+
+import { DebugSession } from './debug-session';
 
 @Injectable()
 export class DebugProgressService implements IDebugProgress {
@@ -40,7 +42,7 @@ export class DebugProgressService implements IDebugProgress {
 
   public run(sessionsManager: IDebugSessionManager): void {
     let progressListener: DisposableCollection | undefined;
-    const listenOnProgress = (session: IDebugSession | undefined) => {
+    const listenOnProgress = (session: DebugSession | undefined) => {
       progressListener = new DisposableCollection();
 
       if (session) {

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

@@ -431,9 +431,6 @@ export class DebugSessionManager implements IDebugSessionManager {
     const session = sessionFactory.get(sessionId, options);
     this._sessions.set(sessionId, session);
     this._extraMap.set(sessionId, extra);
-    if (!options.lifecycleManagedByParent) {
-      this.updateCurrentSession(session);
-    }
 
     this.debugTypeKey.set(session.configuration.type);
     this.onDidCreateDebugSessionEmitter.fire(session);
@@ -468,6 +465,7 @@ export class DebugSessionManager implements IDebugSessionManager {
       this.onDidReceiveDebugSessionCustomEventEmitter.fire({ event, body, session }),
     );
 
+    this.updateCurrentSession(session);
     return session;
   }
 

package/src/browser/debug-session.ts

@@ -215,7 +215,6 @@ export class DebugSession implements IDebugSession {
         }
 
         this.onStateChange();
-        this.sessionManager.currentSession = this as IDebugSession;
         this._onDidStop.fire(event);
       }),
       this.on('thread', (event: DebugProtocol.ThreadEvent) => {
@@ -289,7 +288,7 @@ export class DebugSession implements IDebugSession {
   }
 
   getMemory(memoryReference: string): IMemoryRegion {
-    return new MemoryRegion(memoryReference, this as IDebugSession);
+    return new MemoryRegion(memoryReference, this);
   }
 
   get configuration(): DebugConfiguration {
@@ -1092,14 +1091,21 @@ export class DebugSession implements IDebugSession {
     return this.connection.onDidCustomEvent;
   }
 
+  // REPL
+
   hasSeparateRepl(): boolean {
     return !this.parentSession || this.options.repl !== 'mergeWithParent';
   }
 
+  // REPL end
+
+  // report service
   reportTime(name: string, defaults?: any): (msg: string | undefined, extra?: any) => number {
     return this.sessionManager.reportTime(name, defaults);
   }
 
+  // Cancellation
+
   private getNewCancellationToken(threadId: number, token?: CancellationToken): CancellationToken {
     const tokenSource = new CancellationTokenSource(token);
     const tokens = this.cancellationMap.get(threadId) || [];
@@ -1126,6 +1132,8 @@ export class DebugSession implements IDebugSession {
     }
   }
 
+  // Cancellation end
+
   public getDebugProtocolBreakpoint(breakpointId: string): DebugProtocol.Breakpoint | undefined {
     const data = this.breakpointManager.getBreakpoints().find((bp) => bp.id === breakpointId);
     if (data) {
@@ -1155,6 +1163,8 @@ export class DebugSession implements IDebugSession {
     return this.modelManager.model;
   }
 
+  // memory
+
   public async readMemory(
     memoryReference: string,
     offset: number,
@@ -1177,4 +1187,6 @@ export class DebugSession implements IDebugSession {
     }
     return Promise.resolve(undefined);
   }
+
+  // memory end
 }

package/src/browser/editor/debug-editor-contribution.ts

@@ -275,12 +275,6 @@ export class DebugEditorContribution implements IEditorFeatureContribution {
       }),
     );
 
-    this.disposer.addDispose(
-      this.debugSessionManager.onDidDestroyDebugSession(() => {
-        this.closeExceptionWidget();
-      }),
-    );
-
     this.disposer.addDispose(this.editorDisposer);
 
     this.toggleExceptionWidget();

package/src/browser/editor/debug-hover.view.tsx

@@ -3,7 +3,6 @@ import React from 'react';
 
 import { INodeRendererWrapProps, IRecycleTreeHandle, RecycleTree, TreeNodeEvent } from '@opensumi/ide-components';
 import { useInjectable } from '@opensumi/ide-core-browser';
-import { LayoutViewSizeConfig } from '@opensumi/ide-core-browser/lib/layout/constants';
 import { IDisposable } from '@opensumi/ide-core-common';
 
 import {
@@ -20,11 +19,8 @@ import styles from './debug-hover.module.less';
 
 export const DebugHoverView = () => {
   const debugHoverTreeModelService: DebugHoverTreeModelService = useInjectable(DebugHoverTreeModelService);
-  const layoutViewSize = useInjectable<LayoutViewSizeConfig>(LayoutViewSizeConfig);
 
   const DEFAULT_LAYOUT_HEIGHT = 250;
-  const DEFAULT_MAX_HEIGHT = 420;
-  const DEFAULT_HOVER_WEIGET_MARGIN_BOTTOM = 4;
   const [model, setModel] = React.useState<{ treeModel?: DebugHoverModel; variable?: DebugVariable }>({});
   const [treeLayoutHeight, setTreeLayoutHeight] = React.useState<number>(DEFAULT_LAYOUT_HEIGHT);
   const wrapperRef = React.useRef<HTMLDivElement | null>(null);
@@ -48,17 +44,9 @@ export const DebugHoverView = () => {
     setTreeLayoutHeight(DEFAULT_LAYOUT_HEIGHT);
 
     if (model.treeModel) {
-      disposable = model.treeModel.root.watcher.on(TreeNodeEvent.DidChangeExpansionState, () => {
-        const treeHeight = Math.max(DEFAULT_LAYOUT_HEIGHT, (model.treeModel?.root.branchSize || 0) * 22);
-        const rect = wrapperRef.current?.getBoundingClientRect();
-        if (rect) {
-          const top = rect.top;
-          const maxHeight =
-            window.innerHeight - top - layoutViewSize.statusBarHeight - DEFAULT_HOVER_WEIGET_MARGIN_BOTTOM;
-          setTreeLayoutHeight(Math.min(maxHeight, treeHeight, DEFAULT_MAX_HEIGHT));
-        } else {
-          setTreeLayoutHeight(Math.min(DEFAULT_MAX_HEIGHT, treeHeight));
-        }
+      disposable = model.treeModel.root.watcher.on(TreeNodeEvent.DidChangeExpansionState, (data) => {
+        const treeHeight = Math.max(DEFAULT_LAYOUT_HEIGHT, ~~model.treeModel?.root.branchSize! * 22);
+        setTreeLayoutHeight(Math.min(500, treeHeight));
       });
     }
     return () => {

package/src/browser/editor/debug-model.ts

@@ -7,6 +7,7 @@ import {
   IReporterService,
   PreferenceService,
   addClassName,
+  createClassNameTokens,
 } from '@opensumi/ide-core-browser';
 import {
   AbstractMenuService,

package/src/browser/view/breakpoints/debug-breakpoints.service.ts

@@ -143,7 +143,7 @@ export class DebugBreakpointsService extends WithEventBus {
     this.roots = roots.map((file) => new URI(file.uri));
   }
 
-  toggleBreakpointEnable = (data: IDebugBreakpoint | DebugExceptionBreakpoint) => {
+  toggleBreakpointEnable(data: IDebugBreakpoint | DebugExceptionBreakpoint) {
     if (isDebugBreakpoint(data)) {
       const real = this.breakpoints.getBreakpoint(URI.parse(data.uri), {
         lineNumber: data.raw.line,
@@ -157,7 +157,7 @@ export class DebugBreakpointsService extends WithEventBus {
     if (isDebugExceptionBreakpoint(data)) {
       this.breakpoints.updateExceptionBreakpoints(data.filter, !data.default);
     }
-  };
+  }
 
   extractNodes(item: DebugExceptionBreakpoint | IDebugBreakpoint): BreakpointItem | undefined {
     if (isDebugBreakpoint(item)) {

package/src/browser/view/configuration/debug-configuration.module.less

@@ -96,8 +96,6 @@
   justify-content: center;
   z-index: 10;
   user-select: none;
-  top: 0;
-  left: 0;
 
   .debug_action_bar {
     height: 100%;

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

@@ -5,7 +5,7 @@ import { DisposableCollection, Emitter, Event, ILogger, MessageType, localize }
 import { IThemeService } from '@opensumi/ide-theme';
 import { DebugProtocol } from '@opensumi/vscode-debugprotocol/lib/debugProtocol';
 
-import { IDebugConsoleSession, IDebugSession } from '../../../common';
+import { IDebugConsoleSession } from '../../../common';
 import { handleANSIOutput } from '../../debug-ansi-handle';
 import { LinkDetector } from '../../debug-link-detector';
 import { DebugSession } from '../../debug-session';
@@ -59,8 +59,8 @@ export class DebugConsoleSession implements IDebugConsoleSession {
     this.toDispose.push(this.session.on('output', (event) => this.logOutput(this.session, event)));
   }
 
-  addChildSession(child: IDebugSession): void {
-    this.toDispose.push(child.on('output', (event) => this.logOutput(child as DebugSession, event)));
+  addChildSession(child: DebugSession): void {
+    this.toDispose.push(child.on('output', (event) => this.logOutput(child, event)));
   }
 
   get onDidChange(): Event<void> {

package/src/browser/view/console/debug-console-tree.model.service.ts

@@ -21,7 +21,7 @@ import {
 } from '@opensumi/ide-core-browser';
 import { AbstractContextMenuService, ICtxMenuRenderer, MenuId } from '@opensumi/ide-core-browser/lib/menu/next';
 
-import { IDebugConsoleModelService, IDebugSession, IDebugSessionManager } from '../../../common';
+import { IDebugConsoleModelService, IDebugSessionManager } from '../../../common';
 import { LinkDetector } from '../../debug-link-detector';
 import { DebugSession } from '../../debug-session';
 import { DidChangeActiveDebugSession } from '../../debug-session-manager';
@@ -248,7 +248,7 @@ export class DebugConsoleModelService implements IDebugConsoleModelService {
     );
   }
 
-  async initTreeModel(session?: IDebugSession, force?: boolean) {
+  async initTreeModel(session?: DebugSession, force?: boolean) {
     if (!session) {
       this._activeDebugSessionModel = undefined;
       this.onDidUpdateTreeModelEmitter.fire(this._activeDebugSessionModel);
@@ -535,7 +535,7 @@ export class DebugConsoleModelService implements IDebugConsoleModelService {
     const textNode = new AnsiConsoleNode(value, parent, this.linkDetector);
     this.dispatchWatchEvent(parent, parent.path, { type: WatchEvent.Added, node: textNode, id: parent.id });
     const expressionNode = new DebugConsoleNode(
-      { session: this.manager.currentSession as DebugSession },
+      { session: this.manager.currentSession },
       value,
       parent as ExpressionContainer,
     );

package/src/common/debug-session.ts

@@ -32,7 +32,6 @@ export const IDebugSession = Symbol('DebugSession');
 
 export const IDebugSessionManager = Symbol('DebugSessionManager');
 export interface IDebugSessionManager {
-  currentSession: IDebugSession | undefined;
   fireWillStartDebugSession(): Promise<void>;
   resolveConfiguration(options: Readonly<DebugSessionOptions>): Promise<IDebugSessionDTO | undefined>;
   resolveDebugConfiguration(
@@ -50,85 +49,34 @@ export interface IDebugSessionManager {
 }
 
 export interface IDebugSession extends IDisposable {
-  // 状态管理
-  /** 当前调试会话的状态 */
   state: DebugState;
-
-  /** 父调试会话（如果有） */
   parentSession: IDebugSession | undefined;
-
-  /** 唯一标识符 */
   id: string;
-
-  /** 调试适配器的能力 */
   capabilities: DebugProtocol.Capabilities;
-
-  /** 是否压缩输出 */
-  compact: boolean;
-
-  // 事件处理
-  /** 内存无效化事件 */
   onDidInvalidateMemory: Event<DebugProtocol.MemoryEvent>;
-
-  /** 状态变化事件 */
-  onDidChangeState: Event<DebugState>;
-
-  /** 进度开始事件 */
-  onDidProgressStart: Event<DebugProtocol.ProgressStartEvent>;
-
-  /** 进度更新事件 */
-  onDidProgressUpdate: Event<DebugProtocol.ProgressUpdateEvent>;
-
-  /** 进度结束事件 */
-  onDidProgressEnd: Event<DebugProtocol.ProgressEndEvent>;
-
-  /** 调试适配器退出事件 */
-  onDidExitAdapter: Event<void>;
-
-  // 操作方法
-  /** 取消当前操作 */
-  cancel(reason?: string): Promise<DebugProtocol.CancelResponse | undefined>;
-
-  /** 发送请求到调试适配器 */
-  sendRequest<K extends keyof DebugRequestTypes>(
-    command: K,
-    args: DebugRequestTypes[K][0],
-    token?: CancellationToken | undefined,
-  ): Promise<DebugRequestTypes[K][1]>;
-
-  /** 获取调试协议中的断点 */
-  getDebugProtocolBreakpoint(breakpointId: string): DebugProtocol.Breakpoint | undefined;
-
-  /** 判断是否具有独立的 REPL */
-  hasSeparateRepl(): boolean;
-
-  /** 监听特定类型的事件 */
-  on<K extends keyof DebugEventTypes>(kind: K, listener: (e: DebugEventTypes[K]) => any): IDisposable;
-
-  /** 断开连接 */
-  disconnect(restart?: boolean | undefined): Promise<void>;
-
-  /** 终止调试会话 */
-  terminate(restart?: boolean | undefined): Promise<void>;
-
-  /** 重启调试会话 */
-  restart(args: DebugProtocol.RestartArguments): Promise<boolean>;
-
-  // 内存操作
-  /** 读取内存 */
   readMemory(
     memoryReference: string,
     offset: number,
     count: number,
   ): Promise<DebugProtocol.ReadMemoryResponse | undefined>;
-
-  /** 写入内存 */
   writeMemory(
     memoryReference: string,
     offset: number,
     data: string,
     allowPartial?: boolean | undefined,
   ): Promise<DebugProtocol.WriteMemoryResponse | undefined>;
+  hasSeparateRepl: () => boolean;
+  getDebugProtocolBreakpoint(breakpointId: string): DebugProtocol.Breakpoint | undefined;
+  compact: boolean;
+  on: <K extends keyof DebugEventTypes>(kind: K, listener: (e: DebugEventTypes[K]) => any) => IDisposable;
+  sendRequest<K extends keyof DebugRequestTypes>(
+    command: K,
+    args: DebugRequestTypes[K][0],
+    token?: CancellationToken | undefined,
+  ): Promise<DebugRequestTypes[K][1]>;
+  restart(args: DebugProtocol.RestartArguments): Promise<boolean>;
+  disconnect(restart?: boolean | undefined): Promise<void>;
+  terminate(restart?: boolean | undefined): Promise<void>;
 }
 
 /**