migrate MainThreadDecorations, #40169

src/vs/workbench/api/electron-browser/mainThreadDecorations.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+import URI, { UriComponents } from 'vs/base/common/uri';
 import { Emitter } from 'vs/base/common/event';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { ExtHostContext, MainContext, IExtHostContext, MainThreadDecorationsShape, ExtHostDecorationsShape } from '../node/extHost.protocol';
@@ -54,9 +54,9 @@ export class MainThreadDecorations implements MainThreadDecorationsShape {
 		this._provider.set(handle, [emitter, registration]);
 	}
 
-	$onDidChange(handle: number, resources: URI[]): void {
+	$onDidChange(handle: number, resources: UriComponents[]): void {
 		const [emitter] = this._provider.get(handle);
-		emitter.fire(resources);
+		emitter.fire(resources.map(URI.revive));
 	}
 
 	$unregisterDecorationProvider(handle: number): void {

src/vs/workbench/api/node/extHost.protocol.ts

@@ -140,7 +140,7 @@ export interface MainThreadDiaglogsShape extends IDisposable {
 export interface MainThreadDecorationsShape extends IDisposable {
 	$registerDecorationProvider(handle: number, label: string): void;
 	$unregisterDecorationProvider(handle: number): void;
-	$onDidChange(handle: number, resources: URI[]): void;
+	$onDidChange(handle: number, resources: UriComponents[]): void;
 }
 
 export interface MainThreadDocumentContentProvidersShape extends IDisposable {
@@ -668,7 +668,7 @@ export const MainContext = {
 	MainThreadCommands: <ProxyIdentifier<MainThreadCommandsShape>>createMainId<MainThreadCommandsShape>('MainThreadCommands', ProxyType.CustomMarshaller),
 	MainThreadConfiguration: createMainId<MainThreadConfigurationShape>('MainThreadConfiguration', ProxyType.CustomMarshaller),
 	MainThreadDebugService: createMainId<MainThreadDebugServiceShape>('MainThreadDebugService', ProxyType.CustomMarshaller),
-	MainThreadDecorations: createMainId<MainThreadDecorationsShape>('MainThreadDecorations', ProxyType.CustomMarshaller),
+	MainThreadDecorations: createMainId<MainThreadDecorationsShape>('MainThreadDecorations', ProxyType.NativeJSON),
 	MainThreadDiagnostics: createMainId<MainThreadDiagnosticsShape>('MainThreadDiagnostics', ProxyType.CustomMarshaller),
 	MainThreadDialogs: createMainId<MainThreadDiaglogsShape>('MainThreadDiaglogs', ProxyType.CustomMarshaller),
 	MainThreadDocuments: createMainId<MainThreadDocumentsShape>('MainThreadDocuments'),