@opensumi/ide-debug 2.22.11 → 2.23.1-next-1679481979.0

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

@@ -262,8 +262,8 @@ export class DebugModel implements IDebugModel {
     this.renderFrames();
   }
 
-  render(): void {
-    this.renderBreakpoints();
+  async render() {
+    await this.renderBreakpoints();
     this.renderFrames();
   }
 
@@ -271,7 +271,8 @@ export class DebugModel implements IDebugModel {
    * 渲染断点信息装饰器
    * @memberof DebugModel
    */
-  renderBreakpoints(): void {
+  async renderBreakpoints() {
+    await this.breakpointManager.whenReady;
     this.renderNormalBreakpoints();
     this.renderCurrentBreakpoints();
   }

package/src/browser/model/debug-stack-frame.ts

@@ -1,4 +1,4 @@
-import { IRange } from '@opensumi/ide-core-browser';
+import { formatLocalize, IRange } from '@opensumi/ide-core-browser';
 import { IResourceOpenOptions } from '@opensumi/ide-editor';
 import { Range } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/range';
 import { DebugProtocol } from '@opensumi/vscode-debugprotocol/lib/debugProtocol';
@@ -9,12 +9,15 @@ import { DebugScope, ExpressionContainer } from '../tree/debug-tree-node.define'
 import { DebugSource } from './debug-source';
 import { DebugThread } from './debug-thread';
 
-
 export class DebugStackFrameData {
   readonly raw: DebugProtocol.StackFrame;
 }
 
 export class DebugStackFrame extends DebugStackFrameData {
+  public static is(frame: any): frame is DebugStackFrame {
+    return !!frame && 'raw' in frame;
+  }
+
   constructor(readonly thread: DebugThread, readonly session: DebugSession) {
     super();
   }
@@ -109,3 +112,25 @@ export class DebugStackFrame extends DebugStackFrameData {
     return scopesContainingRange.length ? scopesContainingRange : nonExpensiveScopes;
   }
 }
+
+export class ShowMoreDebugStackFrame {
+  constructor(
+    public readonly startIndex: number,
+    public readonly frames: DebugStackFrame[],
+    readonly session: DebugSession,
+    readonly origin: string,
+    readonly _open: (showMoreFrame: ShowMoreDebugStackFrame) => void,
+  ) {}
+
+  get name() {
+    return formatLocalize('debug.stack.showMoreAndOrigin', this.frames.length, this.origin);
+  }
+
+  get id(): string {
+    return `${this.session.id}:showMore:${this.startIndex}`;
+  }
+
+  open = () => {
+    this._open(this);
+  };
+}

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

@@ -11,7 +11,6 @@ import { WorkspaceEditDidRenameFileEvent, WorkspaceEditDidDeleteFileEvent } from
 import { DEBUG_REPORT_NAME, CONTEXT_IN_DEBUG_MODE_KEY, IDebugBreakpoint } from '../../../common';
 import { IDebugSessionManager } from '../../../common/debug-session';
 import {
-  DebugBreakpoint,
   DebugExceptionBreakpoint,
   isDebugBreakpoint,
   isDebugExceptionBreakpoint,
@@ -76,9 +75,9 @@ export class DebugBreakpointsService extends WithEventBus {
 
   async init() {
     await this.updateRoots();
-    this.updateBreakpoints();
+    await this.updateBreakpoints();
     this.workspaceService.onWorkspaceChanged(async () => {
-      await this.updateRoots();
+      this.updateRoots();
       this.updateBreakpoints();
     });
     this.breakpoints.onDidChangeBreakpoints(() => {
@@ -166,7 +165,8 @@ export class DebugBreakpointsService extends WithEventBus {
   }
 
   @action
-  private updateBreakpoints() {
+  private async updateBreakpoints() {
+    await this.breakpoints.whenReady;
     this.nodes = this.extractNodes([
       ...this.breakpoints.getExceptionBreakpoints(),
       ...this.breakpoints.getBreakpoints(),

package/src/browser/view/breakpoints/debug-breakpoints.view.tsx

@@ -8,13 +8,7 @@ import { useInjectable, ViewState, CommandService, EDITOR_COMMANDS, URI, getIcon
 import { DebugProtocol } from '@opensumi/vscode-debugprotocol/lib/debugProtocol';
 
 import { IDebugBreakpoint, IDebugSessionManager, ISourceBreakpoint } from '../../../common';
-import {
-  DebugBreakpoint,
-  DebugExceptionBreakpoint,
-  isDebugBreakpoint,
-  isRuntimeBreakpoint,
-  getStatus,
-} from '../../breakpoint';
+import { DebugExceptionBreakpoint, isDebugBreakpoint, isRuntimeBreakpoint, getStatus } from '../../breakpoint';
 import { DebugSessionManager } from '../../debug-session-manager';
 
 import styles from './debug-breakpoints.module.less';

package/src/browser/view/configuration/debug-toolbar.view.tsx

@@ -1,7 +1,7 @@
 import cls from 'classnames';
 import { action, observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
-import React, { useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 
 import { Injectable } from '@opensumi/di';
 import { Option, Select } from '@opensumi/ide-components';
@@ -104,63 +104,80 @@ export const DebugToolbarView = observer((props: DebugToolbarViewProps) => {
 
   const currentSessionId = currentSession && currentSession.id;
 
-  const renderToolBar = (session: DebugSession | undefined): React.ReactNode => {
-    if (session && session.id && toolBarMenuMap.has(session.id)) {
-      return <InlineMenuBar menus={toolBarMenuMap.get(session.id)!} />;
-    }
-    return null;
-  };
-  const renderStop = (state: DebugState): React.ReactNode => {
-    if (isAttach) {
+  const renderToolBar = useCallback(
+    (session: DebugSession | undefined): React.ReactNode => {
+      if (session && session.id) {
+        const menus = toolBarMenuMap.get(session.id);
+        if (menus) {
+          return <InlineMenuBar menus={menus} />;
+        }
+      }
+      return null;
+    },
+    [toolBarMenuMap],
+  );
+
+  const renderStop = useCallback(
+    (state: DebugState): React.ReactNode => {
+      if (isAttach) {
+        return (
+          <DebugAction
+            run={doStop}
+            enabled={typeof state === 'number' && state !== DebugState.Inactive}
+            icon={'disconnect'}
+            label={localize('debug.action.disattach')}
+          />
+        );
+      }
       return (
         <DebugAction
           run={doStop}
           enabled={typeof state === 'number' && state !== DebugState.Inactive}
-          icon={'disconnect'}
-          label={localize('debug.action.disattach')}
+          icon={'stop'}
+          label={localize('debug.action.stop')}
         />
       );
-    }
-    return (
-      <DebugAction
-        run={doStop}
-        enabled={typeof state === 'number' && state !== DebugState.Inactive}
-        icon={'stop'}
-        label={localize('debug.action.stop')}
-      />
-    );
-  };
-  const renderContinue = (state: DebugState): React.ReactNode => {
-    if (state === DebugState.Stopped) {
-      return <DebugAction run={doContinue} icon={'continue'} label={localize('debug.action.continue')} />;
-    }
-    return (
-      <DebugAction
-        run={doPause}
-        enabled={typeof state === 'number' && state === DebugState.Running}
-        icon={'pause'}
-        label={localize('debug.action.pause')}
-      />
-    );
-  };
+    },
+    [doStop],
+  );
 
-  const renderSessionOptions = (sessions: DebugSession[]) =>
-    sessions.map((session: DebugSession) => {
-      if (isElectronRenderer) {
-        return (
-          <option key={session.id} value={session.id}>
-            {session.label}
-          </option>
-        );
+  const renderContinue = useCallback(
+    (state: DebugState): React.ReactNode => {
+      if (state === DebugState.Stopped) {
+        return <DebugAction run={doContinue} icon={'continue'} label={localize('debug.action.continue')} />;
       }
       return (
-        <Option key={session.id} label={session.label} value={session.id}>
-          {session.label}
-        </Option>
+        <DebugAction
+          run={doPause}
+          enabled={typeof state === 'number' && state === DebugState.Running}
+          icon={'pause'}
+          label={localize('debug.action.pause')}
+        />
       );
-    });
+    },
+    [doPause, doContinue],
+  );
+
+  const renderSessionOptions = useCallback(
+    (sessions: DebugSession[]) =>
+      sessions.map((session: DebugSession) => {
+        if (isElectronRenderer) {
+          return (
+            <option key={session.id} value={session.id}>
+              {session.label}
+            </option>
+          );
+        }
+        return (
+          <Option key={session.id} label={session.label} value={session.id}>
+            {session.label}
+          </Option>
+        );
+      }),
+    [],
+  );
 
-  const renderSelections = (sessions: DebugSession[]) => {
+  const renderSelections = useCallback((sessions: DebugSession[]) => {
     if (sessions.length > 1) {
       return (
         <div className={cls(styles.debug_selection)}>
@@ -182,59 +199,60 @@ export const DebugToolbarView = observer((props: DebugToolbarViewProps) => {
         </div>
       );
     }
-  };
+  }, []);
 
-  const setCurrentSession = (event: React.ChangeEvent<HTMLSelectElement> | string | number) => {
-    let value = event;
-    if (isElectronRenderer) {
-      value = (event as React.ChangeEvent<HTMLSelectElement>).target.value;
-    }
+  const setCurrentSession = useCallback(
+    (event: React.ChangeEvent<HTMLSelectElement> | string | number) => {
+      let value = event;
+      if (isElectronRenderer) {
+        value = (event as React.ChangeEvent<HTMLSelectElement>).target.value;
+      }
 
-    if (!sessions) {
-      return;
-    }
-    for (const session of sessions) {
-      if (session.id === value) {
-        updateCurrentSession(session);
+      if (!sessions) {
+        return;
       }
-    }
-  };
+      for (const session of sessions) {
+        if (session.id === value) {
+          updateCurrentSession(session);
+        }
+      }
+    },
+    [updateCurrentSession],
+  );
 
   return (
-    <React.Fragment>
-      <div className={styles.debug_action_bar}>
-        {renderSelections(sessions.filter((s: DebugSession) => !s.parentSession))}
-        <div className={styles.debug_actions}>
-          {renderContinue(state)}
-          <DebugAction
-            run={doStepOver}
-            enabled={typeof state === 'number' && state === DebugState.Stopped}
-            icon={'step'}
-            label={localize('debug.action.step-over')}
-          />
-          <DebugAction
-            run={doStepIn}
-            enabled={typeof state === 'number' && state === DebugState.Stopped}
-            icon={'step-in'}
-            label={localize('debug.action.step-into')}
-          />
-          <DebugAction
-            run={doStepOut}
-            enabled={typeof state === 'number' && state === DebugState.Stopped}
-            icon={'step-out'}
-            label={localize('debug.action.step-out')}
-          />
-          <DebugAction
-            run={doRestart}
-            enabled={typeof state === 'number' && state !== DebugState.Inactive}
-            icon={'reload'}
-            label={localize('debug.action.restart')}
-          />
-          {renderStop(state)}
-          {renderToolBar(currentSession)}
-        </div>
+    <div className={styles.debug_action_bar}>
+      {renderSelections(sessions.filter((s: DebugSession) => !s.parentSession))}
+      <div className={styles.debug_actions}>
+        {renderContinue(state)}
+        <DebugAction
+          run={doStepOver}
+          enabled={typeof state === 'number' && state === DebugState.Stopped}
+          icon={'step'}
+          label={localize('debug.action.step-over')}
+        />
+        <DebugAction
+          run={doStepIn}
+          enabled={typeof state === 'number' && state === DebugState.Stopped}
+          icon={'step-in'}
+          label={localize('debug.action.step-into')}
+        />
+        <DebugAction
+          run={doStepOut}
+          enabled={typeof state === 'number' && state === DebugState.Stopped}
+          icon={'step-out'}
+          label={localize('debug.action.step-out')}
+        />
+        <DebugAction
+          run={doRestart}
+          enabled={typeof state === 'number' && state !== DebugState.Inactive}
+          icon={'reload'}
+          label={localize('debug.action.restart')}
+        />
+        {renderStop(state)}
+        {renderToolBar(currentSession)}
       </div>
-    </React.Fragment>
+    </div>
   );
 });
 

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

@@ -156,11 +156,11 @@ export class DebugConsoleService implements IHistoryNavigationWidget {
         if (inDebugMode) {
           this.updateReadOnly(false);
           this.updateInputDecoration();
-          this.debugContextKey.contextInDdebugMode.set(true);
+          this.debugContextKey.contextInDebugMode.set(true);
         } else {
           this.updateReadOnly(true);
           if (this.debugContextKey) {
-            this.debugContextKey.contextInDdebugMode.set(false);
+            this.debugContextKey.contextInDebugMode.set(false);
           }
         }
       }

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

@@ -24,7 +24,6 @@ import { DebugSessionManager } from '../debug-session-manager';
 import { DebugStackFrame } from '../model/debug-stack-frame';
 import { DebugThread } from '../model/debug-thread';
 
-
 @Injectable()
 export class DebugViewModel implements IDisposable {
   @Autowired(IDebugSessionManager)
@@ -43,7 +42,6 @@ export class DebugViewModel implements IDisposable {
   }
 
   protected readonly toDispose = new DisposableCollection(this.onDidChangeEmitter, this.onDidChangeBreakpointsEmitter);
-
   protected readonly _sessions = new Set<DebugSession>();
 
   get sessions(): IterableIterator<DebugSession> {
@@ -77,9 +75,11 @@ export class DebugViewModel implements IDisposable {
   get id(): string {
     return (this.session && this.session.id) || '-1';
   }
+
   get label(): string {
     return (this.session && this.session.label) || 'Unknown Session';
   }
+
   has(session: DebugSession | undefined): session is DebugSession {
     return !!session && this._sessions.has(session);
   }
@@ -120,10 +120,12 @@ export class DebugViewModel implements IDisposable {
       return this.manager.currentSession.getThreads(() => true);
     }
   }
+
   get currentSession(): DebugSession | undefined {
     const { currentSession } = this.manager;
     return (this.has(currentSession) && currentSession) || this.session;
   }
+
   set currentSession(currentSession: DebugSession | undefined) {
     this.manager.updateCurrentSession(currentSession);
   }
@@ -132,10 +134,12 @@ export class DebugViewModel implements IDisposable {
     const { currentSession } = this;
     return (currentSession && currentSession.state) || DebugState.Inactive;
   }
+
   get currentThread(): DebugThread | undefined {
     const { currentSession } = this;
     return currentSession && currentSession.currentThread;
   }
+
   get currentFrame(): DebugStackFrame | undefined {
     const { currentThread } = this;
     return currentThread && currentThread.currentFrame;