@opensumi/ide-debug 2.22.10 → 2.23.0

package/lib/common/debug-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"debug-service.d.ts","sourceRoot":"","sources":["../../src/common/debug-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"debug-service.d.ts","sourceRoot":"","sources":["../../src/common/debug-service.ts"],"names":[],"mappings":"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"}

package/lib/common/debug-service.js

@@ -1,16 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DebugError = exports.IDebugService = exports.IDebugServer = exports.DebugAdapterPath = void 0;
-const ide_core_common_1 = require("@opensumi/ide-core-common");
+exports.IDebugService = exports.IDebugServer = exports.DebugAdapterPath = void 0;
 exports.DebugAdapterPath = 'DebugAdaptor';
 // Browser DI Token
 exports.IDebugServer = Symbol('DebugServer');
 exports.IDebugService = Symbol('DebugService');
-var DebugError;
-(function (DebugError) {
-    DebugError.NotFound = ide_core_common_1.ApplicationError.declare(-41000, (type) => ({
-        message: `'${type}' debugger type is not supported.`,
-        data: { type },
-    }));
-})(DebugError = exports.DebugError || (exports.DebugError = {}));
 //# sourceMappingURL=debug-service.js.map

package/lib/common/debug-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"debug-service.js","sourceRoot":"","sources":["../../src/common/debug-service.ts"],"names":[],"mappings":";;;AAAA,+DAOmC;AA+EtB,QAAA,gBAAgB,GAAG,cAAc,CAAC;AAE/C,mBAAmB;AACN,QAAA,YAAY,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;AAkErC,QAAA,aAAa,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAepD,IAAiB,UAAU,CAK1B;AALD,WAAiB,UAAU;IACZ,mBAAQ,GAAG,kCAAgB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC;QAC1E,OAAO,EAAE,IAAI,IAAI,mCAAmC;QACpD,IAAI,EAAE,EAAE,IAAI,EAAE;KACf,CAAC,CAAC,CAAC;AACN,CAAC,EALgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAK1B"}
+{"version":3,"file":"debug-service.js","sourceRoot":"","sources":["../../src/common/debug-service.ts"],"names":[],"mappings":";;;AA+Ea,QAAA,gBAAgB,GAAG,cAAc,CAAC;AAE/C,mBAAmB;AACN,QAAA,YAAY,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;AAkErC,QAAA,aAAa,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC"}

package/lib/common/inline-values.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="vscode" />
 import { IRange, CancellationToken, Event } from '@opensumi/ide-core-common';
 import { Range } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/range';
 import { ITextModel } from '@opensumi/monaco-editor-core/esm/vs/editor/common/model';

package/lib/common/inline-values.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inline-values.d.ts","sourceRoot":"","sources":["../../src/common/inline-values.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAC7E,OAAO,EAAE,KAAK,EAAE,MAAM,8DAA8D,CAAC;AACrF,OAAO,EAAE,UAAU,EAAE,MAAM,yDAAyD,CAAC;AAGrF;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,KAAK,CAAC;CACxB;AAED;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;GAGG;AACH,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,OAAO,CAAC;CAC9B;AAED;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,WAAW,GAAG,eAAe,GAAG,yBAAyB,GAAG,qBAAqB,CAAC;AAE9F;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACnC;OACG;IACH,uBAAuB,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAClD;;;;OAIG;IACH,mBAAmB,CACjB,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,KAAK,EACf,OAAO,EAAE,kBAAkB,EAC3B,KAAK,EAAE,iBAAiB,GACvB,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;CAC5B"}
+{"version":3,"file":"inline-values.d.ts","sourceRoot":"","sources":["../../src/common/inline-values.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAC7E,OAAO,EAAE,KAAK,EAAE,MAAM,8DAA8D,CAAC;AACrF,OAAO,EAAE,UAAU,EAAE,MAAM,yDAAyD,CAAC;AAGrF;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,KAAK,CAAC;CACxB;AAED;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;GAGG;AACH,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,OAAO,CAAC;CAC9B;AAED;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,WAAW,GAAG,eAAe,GAAG,yBAAyB,GAAG,qBAAqB,CAAC;AAE9F;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACnC;OACG;IACH,uBAAuB,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAClD;;;;OAIG;IACH,mBAAmB,CACjB,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,KAAK,EACf,OAAO,EAAE,kBAAkB,EAC3B,KAAK,EAAE,iBAAiB,GACvB,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;CAC5B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-debug",
-  "version": "2.22.10",
+  "version": "2.23.0",
   "files": [
     "lib",
     "src"
@@ -17,33 +17,33 @@
     "url": "git@github.com:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-connection": "2.22.10",
-    "@opensumi/ide-core-common": "2.22.10",
-    "@opensumi/ide-core-node": "2.22.10",
-    "@opensumi/ide-file-service": "2.22.10",
-    "@opensumi/ide-task": "2.22.10",
-    "@opensumi/ide-terminal-next": "2.22.10",
+    "@opensumi/ide-connection": "2.23.0",
+    "@opensumi/ide-core-common": "2.23.0",
+    "@opensumi/ide-core-node": "2.23.0",
+    "@opensumi/ide-file-service": "2.23.0",
+    "@opensumi/ide-task": "2.23.0",
+    "@opensumi/ide-terminal-next": "2.23.0",
     "anser": "^1.4.9",
     "btoa": "^1.2.1"
   },
   "devDependencies": {
-    "@opensumi/ide-components": "2.22.10",
-    "@opensumi/ide-core-browser": "2.22.10",
+    "@opensumi/ide-components": "2.23.0",
+    "@opensumi/ide-core-browser": "2.23.0",
     "@opensumi/ide-dev-tool": "1.3.1",
-    "@opensumi/ide-editor": "2.22.10",
-    "@opensumi/ide-main-layout": "2.22.10",
-    "@opensumi/ide-monaco": "2.22.10",
-    "@opensumi/ide-monaco-enhance": "2.22.10",
-    "@opensumi/ide-output": "2.22.10",
-    "@opensumi/ide-overlay": "2.22.10",
-    "@opensumi/ide-preferences": "2.22.10",
-    "@opensumi/ide-quick-open": "2.22.10",
-    "@opensumi/ide-storage": "2.22.10",
-    "@opensumi/ide-theme": "2.22.10",
-    "@opensumi/ide-variable": "2.22.10",
-    "@opensumi/ide-workspace": "2.22.10",
-    "@opensumi/ide-workspace-edit": "2.22.10",
+    "@opensumi/ide-editor": "2.23.0",
+    "@opensumi/ide-main-layout": "2.23.0",
+    "@opensumi/ide-monaco": "2.23.0",
+    "@opensumi/ide-monaco-enhance": "2.23.0",
+    "@opensumi/ide-output": "2.23.0",
+    "@opensumi/ide-overlay": "2.23.0",
+    "@opensumi/ide-preferences": "2.23.0",
+    "@opensumi/ide-quick-open": "2.23.0",
+    "@opensumi/ide-storage": "2.23.0",
+    "@opensumi/ide-theme": "2.23.0",
+    "@opensumi/ide-variable": "2.23.0",
+    "@opensumi/ide-workspace": "2.23.0",
+    "@opensumi/ide-workspace-edit": "2.23.0",
     "@types/btoa": "^1.2.3"
   },
-  "gitHead": "93351a388ce5e0f469ed1c3964e728784eb3955f"
+  "gitHead": "5d8e4fcf717531446c838d142f7601699fd50d0f"
 }

package/src/browser/breakpoint/breakpoint-manager.ts

@@ -59,6 +59,11 @@ export class BreakpointManager extends MarkerManager<IDebugBreakpoint> {
     return Array.from(this._affected.values());
   }
 
+  protected whenReadyDeferred: Deferred<void> = new Deferred();
+  get whenReady() {
+    return this.whenReadyDeferred.promise;
+  }
+
   protected breakpointsDeffered: Deferred<void> | null = null;
 
   protected readonly onDidChangeBreakpointsEmitter = new Emitter<BreakpointsChangeEvent>();
@@ -266,6 +271,7 @@ export class BreakpointManager extends MarkerManager<IDebugBreakpoint> {
     this.defaultExceptionFilter.forEach((item) => {
       this.exceptionFilterValue![item.filter] = !!item.default;
     });
+    this.whenReadyDeferred.resolve();
   }
 
   async save(): Promise<void> {

package/src/browser/contextkeys/debug-contextkey.service.ts

@@ -25,7 +25,7 @@ export class DebugContextKey {
 
   public readonly contextInDebugRepl: IContextKey<boolean>;
   public readonly contextInDebugConsole: IContextKey<boolean>;
-  public readonly contextInDdebugMode: IContextKey<boolean>;
+  public readonly contextInDebugMode: IContextKey<boolean>;
   public readonly contextDebugState: IContextKey<keyof typeof DebugState>;
   public readonly contextVariableEvaluateNamePresent: IContextKey<boolean>;
   public readonly contextSetVariableSupported: IContextKey<boolean>;
@@ -38,7 +38,7 @@ export class DebugContextKey {
     this._contextKeyService = this.globalContextKeyService.createScoped(dom);
     this.contextInDebugRepl = CONTEXT_IN_DEBUG_REPL.bind(this.contextKeyScoped);
     this.contextInDebugConsole = CONTEXT_IN_DEBUG_CONSOLE.bind(this.contextKeyScoped);
-    this.contextInDdebugMode = CONTEXT_IN_DEBUG_MODE.bind(this.contextKeyScoped);
+    this.contextInDebugMode = CONTEXT_IN_DEBUG_MODE.bind(this.contextKeyScoped);
     this.contextDebugState = CONTEXT_DEBUG_STATE.bind(this.contextKeyScoped);
     this.contextVariableEvaluateNamePresent = CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT.bind(this.contextKeyScoped);
     this.contextSetVariableSupported = CONTEXT_SET_VARIABLE_SUPPORTED.bind(this.contextKeyScoped);

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

@@ -40,7 +40,6 @@ import { IVariableResolverService } from '@opensumi/ide-variable';
 
 import {
   DebugConfiguration,
-  DebugError,
   IDebugServer,
   DebugServer,
   DebugSessionOptions,
@@ -345,11 +344,6 @@ export class DebugSessionManager implements IDebugSessionManager {
       }
       return this.doStart(sessionId, resolved, extra);
     } catch (e) {
-      if (DebugError.NotFound.is(e)) {
-        this.messageService.error(formatLocalize('debug.launch.typeNotSupported', e.data.type));
-        return;
-      }
-
       this.messageService.error(localize('debug.launch.catchError'));
       throw e;
     }
@@ -455,7 +449,7 @@ export class DebugSessionManager implements IDebugSessionManager {
       this.debugContextKey.contextSetVariableSupported.set(session.capabilities.supportsSetVariable ?? false);
       this.debugContextKey.contextRestartFrameSupported.set(session.capabilities.supportsRestartFrame ?? false);
       this.debugContextKey.contextDebugState.set(DebugState[session.state] as keyof typeof DebugState);
-      this.debugContextKey.contextInDdebugMode.set(state !== DebugState.Inactive);
+      this.debugContextKey.contextInDebugMode.set(state !== DebugState.Inactive);
     });
     session.on('terminated', (event) => {
       const restart = event.body && event.body.restart;

package/src/browser/debug-session.ts

@@ -388,12 +388,12 @@ export class DebugSession implements IDebugSession {
 
   protected async configure(): Promise<void> {
     await this.initBreakpoints();
-    // 更新exceptionBreakpoint配置
+    // 更新 exceptionBreakpoint 配置
     this.breakpointManager.setExceptionBreakpoints(this.capabilities.exceptionBreakpointFilters || []);
+    this.initialized = true;
     if (this.capabilities.supportsConfigurationDoneRequest) {
-      await this.sendRequest('configurationDone', {});
+      this.sendRequest('configurationDone', {});
     }
-    this.initialized = true;
     if (!this.supportsThreadIdCorrespond) {
       await this.updateThreads(undefined);
     }

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

@@ -332,7 +332,7 @@ export class DebugEditorContribution implements IEditorFeatureContribution {
     codeEditorService.registerDecorationType('inline-value-decoration', INLINE_VALUE_DECORATION_KEY, {});
   }
 
-  public setHoverEnabled(editor: IEditor, isEnabled = !this.debugContextKey.contextInDdebugMode.get()) {
+  public setHoverEnabled(editor: IEditor, isEnabled = !this.debugContextKey.contextInDebugMode.get()) {
     editor.monacoEditor.updateOptions({
       hover: {
         enabled: isEnabled,

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/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;

package/src/browser/view/frames/debug-call-stack-session.view.tsx

@@ -211,7 +211,10 @@ export const DebugStackSessionView = (props: DebugStackSessionViewProps) => {
         >
           {supportsThreadIdCorrespond || threads.length > 0 ? (
             <>
-              <div className={unfold ? getIcon('down') : getIcon('right')} onClick={() => setUnfold(!unfold)}></div>
+              <div
+                className={unfold ? getIcon('arrow-down') : getIcon('arrow-right')}
+                onClick={() => setUnfold(!unfold)}
+              ></div>
               <div className={cls([getIcon('debug'), styles.debug_session_icon])}></div>
             </>
           ) : (

package/src/browser/view/frames/debug-call-stack-thread.view.tsx

@@ -68,7 +68,10 @@ export const DebugStackThreadView = (props: DebugStackThreadViewProps) => {
       {mutiple && (
         <div style={{ paddingLeft: `${indent}px` }} className={styles.debug_stack_item_label}>
           {thread.frames.length > 0 ? (
-            <div className={expanded ? getIcon('down') : getIcon('right')} onClick={() => setExpanded(!expanded)}></div>
+            <div
+              className={expanded ? getIcon('arrow-down') : getIcon('arrow-right')}
+              onClick={() => setExpanded(!expanded)}
+            ></div>
           ) : (
             <div style={{ width: 14 }}></div>
           )}

package/src/common/debug-service.ts

@@ -1,11 +1,4 @@
-import {
-  IDisposable,
-  IJSONSchema,
-  IJSONSchemaSnippet,
-  ApplicationError,
-  Event,
-  BinaryBuffer,
-} from '@opensumi/ide-core-common';
+import { IDisposable, IJSONSchema, IJSONSchemaSnippet, Event, BinaryBuffer } from '@opensumi/ide-core-common';
 
 import { DebugConfiguration } from './debug-configuration';
 import { IDebugSessionDTO } from './debug-session-options';
@@ -167,10 +160,3 @@ export interface IDebugServiceContributionPoint {
   contributions: IJSONSchema[];
   removed?: boolean;
 }
-
-export namespace DebugError {
-  export const NotFound = ApplicationError.declare(-41000, (type: string) => ({
-    message: `'${type}' debugger type is not supported.`,
-    data: { type },
-  }));
-}