add Revived-type for generic revive-function

Author: jrieken

src/vs/base/common/marshalling.ts

@@ -5,7 +5,7 @@
 
 import { VSBuffer } from 'vs/base/common/buffer';
 import { regExpFlags } from 'vs/base/common/strings';
-import { URI } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 
 export function stringify(obj: any): string {
 	return JSON.stringify(obj, replacer);
@@ -33,23 +33,31 @@ function replacer(key: string, value: any): any {
 	return value;
 }
 
-export function revive(obj: any, depth = 0): any {
+
+type Deserialize<T> = T extends UriComponents ? URI
+	: T extends object
+	? Revived<T>
+	: T;
+
+export type Revived<T> = { [K in keyof T]: Deserialize<T[K]> };
+
+export function revive<T = any>(obj: any, depth = 0): Revived<T> {
 	if (!obj || depth > 200) {
 		return obj;
 	}
 
 	if (typeof obj === 'object') {
 
 		switch ((<MarshalledObject>obj).$mid) {
-			case 1: return URI.revive(obj);
-			case 2: return new RegExp(obj.source, obj.flags);
+			case 1: return <any>URI.revive(obj);
+			case 2: return <any>new RegExp(obj.source, obj.flags);
 		}
 
 		if (
 			obj instanceof VSBuffer
 			|| obj instanceof Uint8Array
 		) {
-			return obj;
+			return <any>obj;
 		}
 
 		if (Array.isArray(obj)) {