Skip to content

fix: codeBlock version & make sure block file opened#4474

Merged
erha19 merged 1 commit intomainfrom
fix/restore-previewer
Mar 13, 2025
Merged

fix: codeBlock version & make sure block file opened#4474
erha19 merged 1 commit intomainfrom
fix/restore-previewer

Conversation

@ensorrow
Copy link
Copy Markdown
Contributor

@ensorrow ensorrow commented Mar 13, 2025

Types

  • 🐛 Bug Fixes

Background or solution

codeBlock version 计算有 BUG,兼容刷新后有待应用 apply 的文件可能未打开

Changelog

fix: codeBlock version & make sure block file opened

Summary by CodeRabbit

  • 新功能
    • 优化了内容块版本更新逻辑,确保新注册的内容块在现有数量基础上正确递增版本号。
    • 改进了处理流程,引入异步操作,确保待处理项目及时自动打开,从而提升整体响应效率。

@opensumi opensumi Bot added the 🐞 bug Something isn't working label Mar 13, 2025
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Mar 13, 2025

流程概览

BaseApplyService 类进行了修改。更新了代码块版本号的计算逻辑,即将版本号设为现有 URI 代码块数加 1。同时,将 processAll 方法从同步方法(返回 void)改为异步方法(返回 Promise<void>),并在方法内部增加了对未打开 URI 的检查,必要时使用 await 异步打开对应编辑器。

更改

文件 更改详情
packages/ai-native/src/browser/mcp/base-apply.service.ts - 代码块版本更新:将 newBlock.version = uriCodeBlocks.length; 修改为 newBlock.version = uriCodeBlocks.length + 1;
- processAll 方法更新:签名由同步返回 void 改为异步返回 Promise<void>,并增加了异步检查及打开未打开 URI 的逻辑

时序图

sequenceDiagram
    participant C as 调用方
    participant B as BaseApplyService
    participant O as URI打开器
    C->>B: 调用 processAll('accept'/'reject', uri)
    B->>B: 统计现有 URI 代码块数量并计算新版本号
    B->>B: 检查是否存在未打开的 URI
    alt 存在未打开 URI
        B->>O: 异步调用打开 URI (await)
        O-->>B: 返回打开确认
    else 无待处理 URI
        B->>B: 继续后续处理
    end
    B-->>C: 返回 Promise 完成 (void)
Loading

建议标签

🐞 bug

建议评审

  • 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.

yarn install v1.22.22
[1/4] Resolving packages...
warning [email protected]: This version is no longer supported. Please see https://eslint.org/version-support for other options.
warning eslint > @humanwhocodes/[email protected]: Use @eslint/config-array instead
warning eslint > @humanwhocodes/config-array > @humanwhocodes/[email protected]: Use @eslint/object-schema instead
warning eslint > file-entry-cache > flat-cache > [email protected]: Rimraf versions prior to v4 are no longer supported
warning eslint > file-entry-cache > flat-cache > rimraf > [email protected]: Glob versions prior to v9 are no longer supported
warning eslint > file-entry-cache > flat-cache > rimraf > glob > [email protected]: 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 > [email protected]: Glob versions prior to v9 are no longer supported
error Couldn't find any versions for "@opensumi/ide-dev-tool" that matches "workspace:*"
info Visit https://yarnpkg.com/en/docs/cli/install for documentation about this command.

Tip

⚡🧪 Multi-step agentic review comment chat (experimental)
  • We're introducing multi-step agentic chat in review comments. This experimental feature enhances review discussions with the CodeRabbit agentic chat by enabling advanced interactions, including the ability to create pull requests directly from comments.
    - To enable this feature, set early_access to true under in the settings.

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between d6ddd66 and ce189c0.

📒 Files selected for processing (1)
  • packages/ai-native/src/browser/mcp/base-apply.service.ts (3 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (8)
  • GitHub Check: unittest (ubuntu-latest, 18.x, jsdom)
  • GitHub Check: unittest (ubuntu-latest, 18.x, node)
  • GitHub Check: build (ubuntu-latest, 20.x)
  • GitHub Check: unittest (macos-latest, 18.x, jsdom)
  • GitHub Check: build-windows
  • GitHub Check: build (macos-latest, 20.x)
  • GitHub Check: ubuntu-latest, Node.js 20.x
  • GitHub Check: unittest (macos-latest, 18.x, node)
🔇 Additional comments (3)
packages/ai-native/src/browser/mcp/base-apply.service.ts (3)

250-250: 修复了代码块版本计算问题

原来的版本计算使用 uriCodeBlocks.length 可能会导致版本冲突,改为 uriCodeBlocks.length + 1 确保新代码块的版本始终比现有代码块数量大1,避免了刷新时可能出现的版本不一致问题。


483-483: 方法签名调整为异步,支持文件打开操作

processAll 方法从同步修改为异步返回 Promise,这是必要的变更,因为需要等待文件打开操作完成后再继续处理。


501-507: 确保处理前打开所有相关文件

这段代码解决了未打开文件的问题,通过检查所有需要处理的相对路径,找出尚未打开的文件,并在处理前打开它们。这样确保了即使文件未打开,也能正确应用变更,提高了系统稳定性。

✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ 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 generate docstrings to generate docstrings for this 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.

@codecov
Copy link
Copy Markdown

codecov Bot commented Mar 13, 2025

Codecov Report

Attention: Patch coverage is 0% with 8 lines in your changes missing coverage. Please review.

Project coverage is 53.23%. Comparing base (d6ddd66) to head (ce189c0).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
...es/ai-native/src/browser/mcp/base-apply.service.ts 0.00% 7 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4474      +/-   ##
==========================================
- Coverage   53.24%   53.23%   -0.01%     
==========================================
  Files        1663     1663              
  Lines      102619   102625       +6     
  Branches    22201    22210       +9     
==========================================
- Hits        54639    54633       -6     
- Misses      39920    39930      +10     
- Partials     8060     8062       +2     
Flag Coverage Δ
jsdom 48.72% <0.00%> (-0.01%) ⬇️
node 12.20% <0.00%> (-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.

🚀 New features to boost your workflow:
  • Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@erha19 erha19 merged commit 1725b0d into main Mar 13, 2025
@erha19 erha19 deleted the fix/restore-previewer branch March 13, 2025 09:45
@erha19 erha19 mentioned this pull request May 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🐞 bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants