Skip to content

fix: delete files on multiple workspace #4449

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.

Sign up for GitHub

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

Merged
erha19 merged 1 commit into from
Mar 14, 2025
Merged

fix: delete files on multiple workspace #4449

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions packages/file-tree-next/src/browser/file-tree.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,11 @@ export class FileTreeService extends Tree implements IFileTreeService {
if (rootUri.isEqualOrParent(pathURI)) {
const relativePath = rootUri.relative(pathURI);
if (relativePath) {
path = new Path(this.root.path).join(relativePath.toString()).toString();
if (this.isMultipleWorkspace) {
path = new Path(this.root.path).join(rootUri.displayName).join(relativePath.toString()).toString();
} else {
path = new Path(this.root.path).join(relativePath.toString()).toString();
}
}
}
}
Expand Down Expand Up @@ -726,16 +730,16 @@ export class FileTreeService extends Tree implements IFileTreeService {
/**
* 将文件排序并删除多余文件（指已有父文件夹将被删除）
*/
public sortPaths(_paths: (string | URI)[]) {
const paths = _paths.slice();
public sortPaths(pathOrUri: (string | URI)[]) {
const paths = pathOrUri.slice();
const nodes = paths
.map((path) => ({
node: this.getNodeByPathOrUri(path),
path,
}))
.filter((node) => node && !!node.node) as ISortNode[];

if (_paths.length > 1) {
if (pathOrUri.length > 1) {
nodes.sort((pathA, pathB) => {
// 直接获取节点深度比通过path取深度更可靠
const pathADepth = pathA.node?.depth || 0;
Expand Down
Loading