also make null-lovers happy, #71992

microsoft · Apr 12, 2019 · 5ccbc56 · 5ccbc56
1 parent 261fa9f
commit 5ccbc56
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/vs/base/common/uri.ts b/src/vs/base/common/uri.ts
@@ -374,10 +374,12 @@ export class URI implements UriComponents {
 	}
 
 	static revive(data: UriComponents | URI): URI;
-	static revive(data: UriComponents | URI | undefined | null): URI | undefined;
-	static revive(data: UriComponents | URI | undefined | null): URI | undefined {
+	static revive(data: UriComponents | URI | undefined): URI | undefined;
+	static revive(data: UriComponents | URI | null): URI | null;
+	static revive(data: UriComponents | URI | undefined | null): URI | undefined | null;
+	static revive(data: UriComponents | URI | undefined | null): URI | undefined | null {
 		if (!data) {
-			return undefined;
+			return data;
 		} else if (data instanceof URI) {
 			return data;
 		} else {

diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
@@ -173,7 +173,9 @@ declare namespace monaco {
 		toString(skipEncoding?: boolean): string;
 		toJSON(): object;
 		static revive(data: UriComponents | Uri): Uri;
-		static revive(data: UriComponents | Uri | undefined | null): Uri | undefined;
+		static revive(data: UriComponents | Uri | undefined): Uri | undefined;
+		static revive(data: UriComponents | Uri | null): Uri | null;
+		static revive(data: UriComponents | Uri | undefined | null): Uri | undefined | null;
 	}
 
 	export interface UriComponents {