Skip to content

Commit 57ddfdd

Browse files
sandy081sandy081
committed
write tests for file user data provider
1 parent cf9c14d commit 57ddfdd

2 files changed

Lines changed: 484 additions & 6 deletions

File tree

‎src/vs/workbench/services/userData/common/fileUserDataProvider.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,13 @@ export class FileUserDataProvider extends Disposable implements IFileSystemProvi
128128
}
129129

130130
private toUserDataResource(fileSystemResource: URI): URI | null {
131-
const userDataRelativePath = resources.relativePath(this.fileSystemUserDataHome, fileSystemResource);
132-
if (userDataRelativePath) {
133-
return resources.joinPath(this.userDataHome, userDataRelativePath);
131+
if (resources.isEqualOrParent(fileSystemResource, this.fileSystemUserDataHome)) {
132+
const relativePath = resources.relativePath(this.fileSystemUserDataHome, fileSystemResource);
133+
return relativePath ? resources.joinPath(this.userDataHome, relativePath) : this.userDataHome;
134134
}
135-
const backupRelativePath = resources.relativePath(this.fileSystemBackupsHome, fileSystemResource);
136-
if (backupRelativePath) {
137-
return resources.joinPath(this.userDataHome, BACKUPS, backupRelativePath);
135+
if (resources.isEqualOrParent(fileSystemResource, this.fileSystemBackupsHome)) {
136+
const relativePath = resources.relativePath(this.fileSystemBackupsHome, fileSystemResource);
137+
return relativePath ? resources.joinPath(this.userDataHome, BACKUPS, relativePath) : resources.joinPath(this.userDataHome, BACKUPS);
138138
}
139139
return null;
140140
}

0 commit comments

Comments
 (0)