@opensumi/ide-debug 2.21.7-rc-1670246007.0 → 2.21.7

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

@@ -1,164 +0,0 @@
-import throttle from 'lodash/throttle';
-
-import { Autowired, Injectable, Optional } from '@opensumi/di';
-import { DisposableCollection, Emitter, Event, MessageType, ILogger } from '@opensumi/ide-core-common';
-import { IThemeService } from '@opensumi/ide-theme';
-import { DebugProtocol } from '@opensumi/vscode-debugprotocol/lib/debugProtocol';
-
-import { handleANSIOutput } from '../../debug-ansi-handle';
-import { LinkDetector } from '../../debug-link-detector';
-import { DebugSession } from '../../debug-session';
-import { ExpressionContainer, AnsiConsoleNode, DebugConsoleNode, DebugVariableContainer } from '../../tree';
-
-import { DebugConsoleTreeModel } from './debug-console-model';
-
-type ConsoleNodes = DebugConsoleNode | AnsiConsoleNode | DebugVariableContainer;
-
-@Injectable({ multiple: true })
-export class DebugConsoleSession {
-  @Autowired(ILogger)
-  private logger: ILogger;
-
-  @Autowired(LinkDetector)
-  private linkDetector: LinkDetector;
-
-  @Autowired(IThemeService)
-  protected readonly themeService: IThemeService;
-
-  // 缓冲未完成的append进来的内容
-  protected uncompletedItemContent: string | undefined;
-
-  protected readonly toDispose = new DisposableCollection();
-
-  protected fireDidChange: any = throttle(() => this.onDidChangeEmitter.fire(), 50);
-
-  private onDidChangeEmitter: Emitter<void> = new Emitter();
-
-  constructor(@Optional() private session: DebugSession, @Optional() private treeModel: DebugConsoleTreeModel) {
-    this.init();
-  }
-
-  /**
-   * 这里需要将 tree 的 children 做扁平处理
-   * 因为当用户在控制台输入表达式求值时，得到的结果如果是对象，也需要把这个对象的 children 给扔到 DebugConsoleRoot.updatePresetChildren 方法里去
-   * 否则会出现，对象展开的状态下，有新的日志内容发送过来时，对象的所有子属性都消失的情况，
-   */
-  resolveChildren() {
-    const flattenedBranch = this.treeModel.root.flattenedBranch || [];
-    return flattenedBranch.map((id: number) => this.treeModel.root.getTreeNodeById(id)) as ConsoleNodes[];
-  }
-
-  getLastItem(): ConsoleNodes | undefined {
-    const { flattenedBranch } = this.treeModel.root;
-    const lastBranch = flattenedBranch?.length ? flattenedBranch[flattenedBranch.length - 1] : undefined;
-    return lastBranch ? (this.treeModel.root.getTreeNodeById(lastBranch) as ConsoleNodes) : undefined;
-  }
-
-  async init() {
-    this.session.on('output', (event) => this.logOutput(this.session, event));
-  }
-
-  get onDidChange(): Event<void> {
-    return this.onDidChangeEmitter.event;
-  }
-
-  clear(): void {
-    this.fireDidChange();
-  }
-
-  protected async logOutput(session: DebugSession, event: DebugProtocol.OutputEvent): Promise<void> {
-    const body = event.body;
-    const { category, variablesReference, source, line } = body;
-    if (!this.treeModel) {
-      return;
-    }
-    const severity =
-      category === 'stderr'
-        ? MessageType.Error
-        : event.body.category === 'console'
-        ? MessageType.Warning
-        : MessageType.Info;
-    if (category === 'telemetry') {
-      this.logger.debug(`telemetry/${event.body.output}`, event.body.data);
-      return;
-    }
-    if (variablesReference) {
-      const node = new ExpressionContainer(
-        { session, variablesReference, source, line },
-        this.treeModel?.root as ExpressionContainer,
-      );
-      await node.hardReloadChildren();
-      if (node.children) {
-        for (const child of node.children) {
-          this.treeModel.root.insertItem(child as DebugConsoleNode);
-        }
-      }
-    } else if (typeof body.output === 'string') {
-      const previousItem = this.getLastItem();
-      /**
-       * 如果上一条 output 结尾没有换行符则应该与下一条 output 拼接在一起
-       */
-      if (previousItem && !previousItem.description.endsWith('\n') && !previousItem.description.endsWith('\r\n')) {
-        this.treeModel.root.unlinkItem(previousItem);
-        await this.insertItemWithAnsi(previousItem.description + body.output, severity, source, line);
-      } else {
-        await this.insertItemWithAnsi(body.output, severity, source, line);
-      }
-    }
-
-    this.fireDidChange();
-  }
-
-  private async insertItemWithAnsi(
-    output: string,
-    severity?: MessageType,
-    source?: DebugProtocol.Source,
-    line?: string | number,
-  ) {
-    const ansiNode = await handleANSIOutput(output, this.linkDetector, this.themeService, undefined);
-    this.treeModel.root.insertItem(
-      new AnsiConsoleNode(output, this.treeModel?.root, this.linkDetector, ansiNode, severity, source, line),
-    );
-  }
-
-  async execute(value: string): Promise<void> {
-    this.treeModel.root.insertItem(
-      new AnsiConsoleNode(value, this.treeModel.root, this.linkDetector, undefined, MessageType.Info),
-    );
-    const expression = new DebugConsoleNode(this.session, value, this.treeModel?.root as ExpressionContainer);
-    this.treeModel.root.insertItem(expression);
-    this.fireDidChange();
-  }
-
-  append(value: string): void {
-    if (!value) {
-      return;
-    }
-
-    const lastItem = this.resolveChildren().slice(-1)[0];
-    if (lastItem instanceof AnsiConsoleNode && lastItem.description === this.uncompletedItemContent) {
-      this.resolveChildren().pop();
-      this.uncompletedItemContent += value;
-    } else {
-      this.uncompletedItemContent = value;
-    }
-
-    this.treeModel.root.insertItem(
-      new AnsiConsoleNode(
-        this.uncompletedItemContent,
-        this.treeModel?.root,
-        this.linkDetector,
-        undefined,
-        MessageType.Info,
-      ),
-    );
-    this.fireDidChange();
-  }
-
-  appendLine(value: string): void {
-    this.treeModel.root.insertItem(
-      new AnsiConsoleNode(value, this.treeModel?.root, this.linkDetector, undefined, MessageType.Info),
-    );
-    this.fireDidChange();
-  }
-}

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

@@ -1,28 +0,0 @@
-import { observer } from 'mobx-react-lite';
-import React from 'react';
-
-import { Select, Option } from '@opensumi/ide-components';
-import { localize, isElectronRenderer } from '@opensumi/ide-core-browser';
-import { Select as NativeSelect } from '@opensumi/ide-core-browser/lib/components/select';
-
-import styles from './debug-console.module.less';
-
-export const DebugConsoleToolbarView = observer(() => {
-  if (isElectronRenderer()) {
-    return (
-      <NativeSelect value='default' className={styles.debug_console_select}>
-        <option value='default'>{localize('debug.console.panel.default')}</option>
-      </NativeSelect>
-    );
-  }
-
-  return (
-    <div className={styles.debug_console_toolbar}>
-      <Select size='small' value='default' className={styles.debug_console_select}>
-        <Option value='default' label={localize('debug.console.panel.default')}>
-          {localize('debug.console.panel.default')}
-        </Option>
-      </Select>
-    </div>
-  );
-});