Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: partially supported the VSCode TerminalExitReason API #4195

Merged
merged 1 commit into from
Dec 5, 2024

Conversation

life2015
Copy link
Member

@life2015 life2015 commented Dec 5, 2024

Types

兼容 vscode TerminalExitReason API,目前适配了 onProcessExit 的场景,其他场景采用兼容 API 的实现,确保插件的正常工作。

  • 🎉 New Features

Summary by CodeRabbit

  • 新功能
    • 引入了 TerminalExitReason 枚举,提供了终端退出的多种原因。
    • 更新了终端状态处理方法,使用 setExitStatus 取代 setExitCode,并增加了退出原因参数。
  • 文档
    • 更新了相关文档,增强了终端生命周期事件的语义理解。

Copy link
Contributor

coderabbitai bot commented Dec 5, 2024

Walkthrough

此次更改涉及对终端相关类的测试套件进行多项修改,包括将setExitCode方法重命名为setExitStatus,并更新相关的测试断言。此外,新增了一个TerminalExitReason枚举,定义了五种终端退出原因。更改还包括对ExtHostTerminal类的更新,以支持新的退出状态处理逻辑,并在TerminalExitStatus接口中添加了reason属性,以增强终端退出状态报告的详细性。

Changes

文件路径 更改摘要
packages/extension/__tests__/hosted/api/vscode/ext.host.terminal.test.ts setExitCode方法重命名为setExitStatus,更新测试断言以反映此更改,增加对终端创建、关闭和名称更改的断言。
packages/extension/src/common/vscode/ext-types.ts 新增TerminalExitReason枚举,定义五种终端退出原因及其对应的数值。
packages/extension/src/hosted/api/vscode/ext.host.terminal.ts 更新ExtHostTerminal类,替换setExitCodesetExitStatus,并新增reason参数,更新终端关闭逻辑以记录退出原因。
packages/types/vscode/typings/vscode.d.ts TerminalExitStatus接口中添加reason属性,新增TerminalExitReason枚举,更新文档以反映新属性和枚举。

Possibly related PRs

Suggested labels

🎨 feature

Suggested reviewers

  • Ricbet

Warning

There were issues while running some tools. Please review the errors and either fix the tool’s configuration or disable the tool if it’s a critical failure.

🔧 eslint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

warning eslint@8.57.1: This version is no longer supported. Please see https://eslint.org/version-support for other options.
warning eslint > @humanwhocodes/config-array@0.13.0: Use @eslint/config-array instead
warning eslint > @humanwhocodes/config-array > @humanwhocodes/object-schema@2.0.3: Use @eslint/object-schema instead
warning eslint > file-entry-cache > flat-cache > rimraf@3.0.2: Rimraf versions prior to v4 are no longer supported
warning eslint > file-entry-cache > flat-cache > rimraf > glob@7.2.3: Glob versions prior to v9 are no longer supported
warning eslint > file-entry-cache > flat-cache > rimraf > glob > inflight@1.0.6: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
warning eslint-import-resolver-typescript > glob@7.2.3: Glob versions prior to v9 are no longer supported
error Couldn't find any versions for "@opensumi/ide-dev-tool" that matches "workspace:*"


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🧹 Outside diff range and nitpick comments (3)
packages/extension/__tests__/hosted/api/vscode/ext.host.terminal.test.ts (1)

Line range hint 193-208: 建议增加退出原因的测试覆盖

当前测试只验证了退出码设置为 2,但没有验证退出原因是否正确设置。建议添加对 exitStatus.reason 的断言。

 const mockSetStatus = jest.spyOn(terminal4, 'setExitStatus');

 // 要等待前台创建完 terminal 示例后,pty 事件绑定完再 fire
 setTimeout(() => {
   closeEmitter.fire(2);

   // 要等待事件 fire 后能监听到
   setTimeout(() => {
     expect(mockTerminalExit).toHaveBeenCalledWith(terminalId, 2);
     expect(mockSetStatus).toHaveBeenCalled();
     expect(terminal4.exitStatus).toBeDefined();
     expect(terminal4.exitStatus?.code).toBe(2);
+    expect(terminal4.exitStatus?.reason).toBe(TerminalExitReason.Process);
     defered.resolve();
   }, 0);
 }, 0);
packages/extension/src/common/vscode/ext-types.ts (1)

2872-2878: 建议添加 JSDoc 文档

枚举值的定义正确且符合 VSCode API 设计。建议添加 JSDoc 注释说明每个退出原因的具体含义。

+/**
+ * 定义终端退出的原因。
+ */
 export enum TerminalExitReason {
+  /** 未知原因 */
   Unknown = 0,
+  /** 系统关闭 */
   Shutdown = 1,
+  /** 进程退出 */
   Process = 2,
+  /** 用户操作 */
   User = 3,
+  /** 扩展操作 */
   Extension = 4,
 }
packages/types/vscode/typings/vscode.d.ts (1)

2962-2990: 枚举定义完整且文档清晰!

TerminalExitReason 枚举很好地覆盖了所有常见的终端退出场景。建议在文档中添加一个示例代码,展示如何使用这些枚举值来处理不同的终端退出情况。

建议添加如下示例代码到文档中:

// 示例:处理不同的终端退出原因
terminal.onDidClose(e => {
  switch (e.exitStatus?.reason) {
    case TerminalExitReason.Process:
      console.log('终端进程已退出');
      break;
    case TerminalExitReason.User:
      console.log('用户关闭了终端');
      break;
    // ... 处理其他情况
  }
});
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 8031f46 and a3b0530.

📒 Files selected for processing (4)
  • packages/extension/__tests__/hosted/api/vscode/ext.host.terminal.test.ts (1 hunks)
  • packages/extension/src/common/vscode/ext-types.ts (1 hunks)
  • packages/extension/src/hosted/api/vscode/ext.host.terminal.ts (4 hunks)
  • packages/types/vscode/typings/vscode.d.ts (1 hunks)
🔇 Additional comments (2)
packages/extension/src/hosted/api/vscode/ext.host.terminal.ts (1)

755-757: 实现正确且类型安全

setExitStatus 方法的实现正确,使用 Object.freeze 确保状态对象不可变,并且参数类型定义完善。

packages/types/vscode/typings/vscode.d.ts (1)

2955-2959: 代码变更正确且合理!

新增的 reason 属性增强了终端退出状态的报告能力,通过提供退出原因使 API 更加完整。使用 readonly 修饰符确保了属性的不可变性,这是一个很好的 API 设计选择。

Copy link

codecov bot commented Dec 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 54.06%. Comparing base (8031f46) to head (a3b0530).
Report is 2 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #4195   +/-   ##
=======================================
  Coverage   54.05%   54.06%           
=======================================
  Files        1616     1616           
  Lines       97963    97970    +7     
  Branches    20055    20056    +1     
=======================================
+ Hits        52955    52964    +9     
+ Misses      37396    37393    -3     
- Partials     7612     7613    +1     
Flag Coverage Δ
jsdom 49.63% <100.00%> (+<0.01%) ⬆️
node 15.56% <54.54%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@life2015 life2015 merged commit 8bc3604 into main Dec 5, 2024
13 checks passed
@life2015 life2015 deleted the feat/support-terminal-exit-reason branch December 5, 2024 12:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎨 feature feature required
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants