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

fix: interactive input handle api adds selection parameter #4346

Merged
merged 2 commits into from
Feb 8, 2025

Conversation

Ricbet
Copy link
Member

@Ricbet Ricbet commented Feb 7, 2025

Types

  • 🎉 New Features
  • 🐛 Bug Fixes

Background or solution

以及修复首行是 remove zone 区域时,操作栏遮挡的问题

before:
image

after:
image

Changelog

inline input api 新增 selection 参数

Summary by CodeRabbit

  • 重构
    • 优化了编辑器内联预览和输入组件的布局及交互逻辑,确保内容显示更准确、状态更新更及时,改善了选择处理和编辑响应。
    • 调整了预览策略的实现方式,使编辑器能更精确地反映用户选择。
  • 样式
    • 更新了加载遮罩的设计,采用上下均衡间距和圆角效果,提升了视觉表现和用户体验。

@Ricbet Ricbet requested review from hacke2 and erha19 February 7, 2025 13:00
@Ricbet Ricbet self-assigned this Feb 7, 2025
@opensumi opensumi bot added the 🐞 bug Something isn't working label Feb 7, 2025
@Ricbet
Copy link
Member Author

Ricbet commented Feb 7, 2025

/next

Copy link
Contributor

coderabbitai bot commented Feb 7, 2025

Walkthrough

该 PR 对多个模块进行了一系列更新。首先,更新了 IInteractiveInputHandler 的参数定义,增加了 selection 参数并导入 ISelection 类型。其次,对 inline diff 预览器的布局逻辑进行了调整,确保 removed widget 存在时正确计算偏移;同时更新了 inline input 控制器中对 selection、store 和装饰的管理逻辑,对输入事件的处理以及错误状态的设置也做了相应调整。此外,还在 inline stream diff 模块中添加了回调以触发编辑状态变更事件,并在预览装饰模型中扩展了方法签名。最后,对相关样式文件和 providePreviewStrategy 的实现做了轻量级更新。

Changes

文件路径 更改摘要
packages/ai-native/src/browser/types.ts 更新 IInteractiveInputHandler 参数列表(新增 selection 参数),并新增 ISelection 导入。
packages/ai-native/src/browser/widget/inline-diff/… 调整 layout 方法中 inlineContentWidget 的垂直偏移逻辑,增加对 removed widget 的判断。
packages/ai-native/src/browser/widget/inline-input/… 明确 inlineInputWidgetStore 类型,调整初始化顺序及对 selection 与装饰的管理;更新 onSend 事件传递 decorationSelection
packages/ai-native/src/browser/widget/inline-stream-diff/… touchRemovedWidget 调用中添加回调函数,用于触发 _onDidEditChange.fire()
packages/ai-native/src/browser/widget/inline-stream-diff/… 修改 LivePreviewDiffDecorationModeltouchRemovedWidget 方法,添加可选回调参数。
packages/startup/entry/sample-modules/ai-native/… 更新 import,引入 Selection;修改 providePreviewStrategy 方法以接受 selection 参数并使用 Selection.liftSelection
packages/core-browser/src/components/ai-native/ai-action/index.module.less 修改 .loading_mask 样式,移除 height,添加 topbottomborder-radius 属性。

Sequence Diagram(s)

sequenceDiagram
    participant 用户
    participant 编辑器
    participant InlineInputController
    participant InlineInputWidget

    用户->>编辑器: 输入命令
    编辑器->>InlineInputController: 调用 showInputInEmptyLine 或 showInputInSelection (传入 selection)
    InlineInputController->>InlineInputWidget: 初始化及更新装饰和 store
    InlineInputWidget->>InlineInputController: 触发 onSend (传递 decorationSelection)
    InlineInputController-->>InlineInputWidget: 设置状态为 READY
Loading
sequenceDiagram
    participant InlineDiffPreviewer
    participant RemovedWidget
    participant DiffDecorationModel
    participant 事件发射器

    InlineDiffPreviewer->>RemovedWidget: 计算并应用顶部偏移(包含 removed widget 高度+1)
    RemovedWidget->>DiffDecorationModel: 更新状态并执行回调
    DiffDecorationModel->>事件发射器: 调用 _onDidEditChange.fire()
Loading

Possibly related PRs

Suggested labels

🎨 feature

Suggested reviewers

  • bytemain
  • erha19

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 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:*"
info Visit https://yarnpkg.com/en/docs/cli/install for documentation about this command.


📜 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 f14a18a and 1409574.

📒 Files selected for processing (1)
  • packages/extension/src/browser/sumi/main.thread.chat-agents.ts (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (9)
  • GitHub Check: 🚀🚀🚀 Next Version for pull request
  • GitHub Check: unittest (ubuntu-latest, 18.x, jsdom)
  • GitHub Check: build (ubuntu-latest, 20.x)
  • GitHub Check: unittest (ubuntu-latest, 18.x, node)
  • GitHub Check: build-windows
  • GitHub Check: unittest (macos-latest, 18.x, jsdom)
  • GitHub Check: ubuntu-latest, Node.js 20.x
  • GitHub Check: unittest (macos-latest, 18.x, node)
  • GitHub Check: build (macos-latest, 20.x)
🔇 Additional comments (2)
packages/extension/src/browser/sumi/main.thread.chat-agents.ts (2)

88-132: 实现逻辑完善,建议完成选区功能

整体实现逻辑健壮,包括控制器创建、流处理、错误处理和取消令牌的处理都很完善。建议在完成选区功能的基础上保持现有的实现逻辑。


87-87: 🛠️ Refactor suggestion

未使用的 selection 参数

方法签名已更新以包含 selection 参数,但在实现中尚未使用该参数。根据 PR 目标,这个参数应该用于处理 "remove zone" 区域的操作栏遮挡问题。

建议使用 selection 参数来获取编辑器中的选中内容,并相应地调整操作栏的位置。例如:

-        providePreviewStrategy: async (editor, selection, value, token) => {
+        providePreviewStrategy: async (editor, selection, value, token) => {
+          // 使用 selection 参数获取选中区域
+          const selectedRange = editor.getModel()?.getValueInRange(selection);
+          // 根据选中区域调整控制器的位置
+          const controller = new InlineChatController({ 
+            enableCodeblockRender: !!metadata.enableCodeblockRender,
+            selectedRange,
+          });
✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

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 generate docstrings to generate docstrings for this PR. (Beta)
  • @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.

@Ricbet
Copy link
Member Author

Ricbet commented Feb 8, 2025

/next

@opensumi
Copy link
Contributor

opensumi bot commented Feb 8, 2025

🎉 PR Next publish successful!

3.7.1-next-1738980928.0

Copy link

codecov bot commented Feb 8, 2025

Codecov Report

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

Project coverage is 54.15%. Comparing base (512420a) to head (1409574).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
...ser/widget/inline-input/inline-input.controller.ts 0.00% 18 Missing and 1 partial ⚠️
...rowser/widget/inline-diff/inline-diff-previewer.ts 0.00% 5 Missing ⚠️
...ension/src/browser/sumi/main.thread.chat-agents.ts 0.00% 1 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main    #4346   +/-   ##
=======================================
  Coverage   54.15%   54.15%           
=======================================
  Files        1639     1639           
  Lines      100301   100310    +9     
  Branches    21768    21762    -6     
=======================================
+ Hits        54316    54323    +7     
- Misses      38210    38213    +3     
+ Partials     7775     7774    -1     
Flag Coverage Δ
jsdom 49.63% <0.00%> (+<0.01%) ⬆️
node 12.27% <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.

@Ricbet Ricbet requested review from life2015 and winjo February 8, 2025 02:37
@Ricbet Ricbet merged commit 9391b86 into main Feb 8, 2025
13 checks passed
@Ricbet Ricbet deleted the fix/inline-input-selection branch February 8, 2025 02:46
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