Skip to content

fix: delete files on multiple workspace#4449

Merged
erha19 merged 1 commit intomainfrom
fix/workspace-folders-file-delete
Mar 14, 2025
Merged

fix: delete files on multiple workspace#4449
erha19 merged 1 commit intomainfrom
fix/workspace-folders-file-delete

Conversation

@erha19
Copy link
Member

@erha19 erha19 commented Mar 7, 2025

Types

  • 🐛 Bug Fixes

Background or solution

close #4415.

Changelog

delete files on multiple workspace

Summary by CodeRabbit

  • 新功能
    • 在多工作区环境下优化了文件路径显示逻辑,现在文件路径会包含工作区标识,以提升文件导航的清晰性。
  • 重构
    • 优化了排序流程中的参数命名,提升了代码的一致性和可维护性。

@opensumi opensumi bot added the 🐞 bug Something isn't working label Mar 7, 2025
@coderabbitai
Copy link
Contributor

coderabbitai bot commented Mar 7, 2025

Walkthrough

本次更改针对 FileTreeService 类中的路径构造逻辑进行了调整。在多工作区环境下,若路径为根路径的子路径,则将工作区名称作为前缀添加至构造的路径中;而在单一工作区中,仍保持原有路径拼接方式。同时,将 sortPaths 方法的参数从 _paths 修改为 pathOrUri,以提升代码的可读性和一致性。

Changes

文件路径 变更说明
packages/file-tree-next/src/…/file-tree.service.ts 修改多工作区下的路径构造逻辑:如果 isMultipleWorkspace 为真,则在路径中添加工作区名称;同时重命名 sortPaths 方法参数,从 _paths 改为 pathOrUri

Sequence Diagram(s)

sequenceDiagram
    participant U as 用户调用
    participant F as FileTreeService

    U->>F: 请求构造路径(pathURI, rootUri)
    alt 多工作区环境 (isMultipleWorkspace = true)
        F->>F: 拼接路径:workspaceName + relativePath
    else 单工作区环境
        F->>F: 拼接路径:仅使用relativePath
    end
    F-->>U: 返回构造后的路径
Loading

Possibly related PRs

Suggested labels

🐞 bug

Suggested reviewers

  • bytemain

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 0c584d5 and b8f7723.

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

631-635: 优化了多工作区环境下的路径构造逻辑

这个改动很好地解决了多工作区环境下文件路径的构造问题。添加工作区名称作为前缀,有助于在多工作区环境中正确识别和管理文件。这对跨工作区文件删除操作十分关键。


733-734: 改进了参数命名,提高代码可读性

将参数名从 _paths 改为 pathOrUri 使函数签名更加清晰,参数名更能表达其实际含义,同时保持了与函数内部实现的一致性。

Also applies to: 742-742

✨ 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

codecov bot commented Mar 7, 2025

Codecov Report

Attention: Patch coverage is 85.71429% with 1 line in your changes missing coverage. Please review.

Project coverage is 53.27%. Comparing base (0c584d5) to head (b8f7723).
Report is 23 commits behind head on main.

Files with missing lines Patch % Lines
...es/file-tree-next/src/browser/file-tree.service.ts 85.71% 1 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main    #4449   +/-   ##
=======================================
  Coverage   53.27%   53.27%           
=======================================
  Files        1661     1661           
  Lines      102534   102537    +3     
  Branches    22179    22189   +10     
=======================================
+ Hits        54627    54629    +2     
- Misses      39859    39860    +1     
  Partials     8048     8048           
Flag Coverage Δ
jsdom 48.76% <85.71%> (+<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.

Copy link
Member

@Aaaaash Aaaaash left a comment

Choose a reason for hiding this comment

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

LGTM

@erha19 erha19 merged commit 031625b into main Mar 14, 2025
13 checks passed
@erha19 erha19 deleted the fix/workspace-folders-file-delete branch March 14, 2025 06:43
@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.

[BUG] multi-workspace deleting file failed

3 participants