Use paths starting with User

sandy081 · sandy081 · commit f75bbdbc09d9 · 2019-06-23T20:28:09.000+02:00
diff --git a/src/vs/workbench/services/userData/common/customUserDataService.ts b/src/vs/workbench/services/userData/common/customUserDataService.ts
@@ -8,17 +8,21 @@ import { Disposable } from 'vs/base/common/lifecycle';
 import { IUserDataService, IUserDataChangesEvent, IUserDataProvider, UserDataChangesEvent } from 'vs/workbench/services/userData/common/userData';
 import { URI } from 'vs/base/common/uri';
 import { Schemas } from 'vs/base/common/network';
+import { joinPath, relativePath } from 'vs/base/common/resources';
 
 export class CustomUserDataService extends Disposable implements IUserDataService {
 	_serviceBrand: any;
 
+	private readonly userDataHome: URI;
+
 	private _onDidChange: Emitter<IUserDataChangesEvent> = this._register(new Emitter<IUserDataChangesEvent>());
 	readonly onDidChange: Event<IUserDataChangesEvent> = this._onDidChange.event;
 
 	constructor(
 		private readonly userDataProvider: IUserDataProvider
 	) {
 		super();
+		this.userDataHome = URI.file('/User').with({ scheme: Schemas.userData });
 		this._register(this.userDataProvider.onDidChange(key => this._onDidChange.fire(new UserDataChangesEvent([key]))));
 	}
 
@@ -31,11 +35,11 @@ export class CustomUserDataService extends Disposable implements IUserDataServic
 	}
 
 	toResource(key: string): URI {
-		return URI.from({ scheme: Schemas.userData, path: key });
+		return joinPath(this.userDataHome, key);
 	}
 
 	toKey(resource: URI): string | undefined {
-		return resource.scheme === Schemas.userData ? resource.path : undefined;
+		return relativePath(this.userDataHome, resource);
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -8,17 +8,21 @@ import { Disposable } from 'vs/base/common/lifecycle';`
`8`	`8`	`import { IUserDataService, IUserDataChangesEvent, IUserDataProvider, UserDataChangesEvent } from 'vs/workbench/services/userData/common/userData';`
`9`	`9`	`import { URI } from 'vs/base/common/uri';`
`10`	`10`	`import { Schemas } from 'vs/base/common/network';`
	`11`	`+import { joinPath, relativePath } from 'vs/base/common/resources';`
`11`	`12`
`12`	`13`	`export class CustomUserDataService extends Disposable implements IUserDataService {`
`13`	`14`	`_serviceBrand: any;`
`14`	`15`
	`16`	`+ private readonly userDataHome: URI;`
	`17`	`+`
`15`	`18`	`private _onDidChange: Emitter<IUserDataChangesEvent> = this._register(new Emitter<IUserDataChangesEvent>());`
`16`	`19`	`readonly onDidChange: Event<IUserDataChangesEvent> = this._onDidChange.event;`
`17`	`20`
`18`	`21`	`constructor(`
`19`	`22`	`private readonly userDataProvider: IUserDataProvider`
`20`	`23`	`) {`
`21`	`24`	`super();`
	`25`	`+ this.userDataHome = URI.file('/User').with({ scheme: Schemas.userData });`
`22`	`26`	`this._register(this.userDataProvider.onDidChange(key => this._onDidChange.fire(new UserDataChangesEvent([key]))));`
`23`	`27`	`}`
`24`	`28`
`@@ -31,11 +35,11 @@ export class CustomUserDataService extends Disposable implements IUserDataServic`
`31`	`35`	`}`
`32`	`36`
`33`	`37`	`toResource(key: string): URI {`
`34`		`- return URI.from({ scheme: Schemas.userData, path: key });`
	`38`	`+ return joinPath(this.userDataHome, key);`
`35`	`39`	`}`
`36`	`40`
`37`	`41`	`toKey(resource: URI): string \| undefined {`
`38`		`- return resource.scheme === Schemas.userData ? resource.path : undefined;`
	`42`	`+ return relativePath(this.userDataHome, resource);`
`39`	`43`	`}`
`40`	`44`
`41`	`45`	`}`