web api - use URIComponents

Benjamin Pasero · Benjamin Pasero · commit 3422d28e2c78 · 2019-09-13T18:08:27.000+02:00
diff --git a/src/vs/code/browser/workbench/workbench.ts b/src/vs/code/browser/workbench/workbench.ts
@@ -117,8 +117,8 @@ class PollingURLCallbackProvider extends Disposable implements IURLCallbackProvi
 		FRAGMENT: 'vscode-fragment'
 	};
 
-	private readonly _onCallback: Emitter<URI> = this._register(new Emitter<URI>());
-	readonly onCallback: Event<URI> = this._onCallback.event;
+	private readonly _onCallback: Emitter<UriComponents> = this._register(new Emitter<UriComponents>());
+	readonly onCallback: Event<UriComponents> = this._onCallback.event;
 
 	create(options?: Partial<UriComponents>): URI {
 		const queryValues: Map<string, string> = new Map();
@@ -168,7 +168,7 @@ class PollingURLCallbackProvider extends Disposable implements IURLCallbackProvi
 		const content = await streamToBuffer(result.stream);
 		if (content.byteLength > 0) {
 			try {
-				this._onCallback.fire(URI.revive(JSON.parse(content.toString())));
+				this._onCallback.fire(JSON.parse(content.toString()));
 			} catch (error) {
 				console.error(error);
 			}
diff --git a/src/vs/workbench/services/url/browser/urlService.ts b/src/vs/workbench/services/url/browser/urlService.ts
@@ -16,7 +16,7 @@ export interface IURLCallbackProvider {
 	 * Indicates that a Uri has been opened outside of VSCode. The Uri
 	 * will be forwarded to all installed Uri handlers in the system.
 	 */
-	readonly onCallback: Event<URI>;
+	readonly onCallback: Event<UriComponents>;
 
 	/**
 	 * Creates a Uri that - if opened in a browser - must result in
@@ -54,7 +54,7 @@ export class BrowserURLService extends AbstractURLService {
 
 	private registerListeners(): void {
 		if (this.provider) {
-			this._register(this.provider.onCallback(uri => this.open(uri)));
+			this._register(this.provider.onCallback(uri => this.open(URI.revive(uri))));
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ export interface IURLCallbackProvider {`
`16`	`16`	`* Indicates that a Uri has been opened outside of VSCode. The Uri`
`17`	`17`	`* will be forwarded to all installed Uri handlers in the system.`
`18`	`18`	`*/`
`19`		`- readonly onCallback: Event<URI>;`
	`19`	`+ readonly onCallback: Event<UriComponents>;`
`20`	`20`
`21`	`21`	`/**`
`22`	`22`	`* Creates a Uri that - if opened in a browser - must result in`
`@@ -54,7 +54,7 @@ export class BrowserURLService extends AbstractURLService {`
`54`	`54`
`55`	`55`	`private registerListeners(): void {`
`56`	`56`	`if (this.provider) {`
`57`		`- this._register(this.provider.onCallback(uri => this.open(uri)));`
	`57`	`+ this._register(this.provider.onCallback(uri => this.open(URI.revive(uri))));`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`