better name for actual uri, microsoft#101978

jrieken · jrieken · commit 90efeb4f2dc4 · 2020-07-16T11:13:39.000+02:00
diff --git a/src/vs/base/common/uri.ts b/src/vs/base/common/uri.ts
@@ -252,7 +252,7 @@ export class URI implements UriComponents {
 			return this;
 		}
 
-		return new CachingURI(scheme, authority, path, query, fragment);
+		return new Uri(scheme, authority, path, query, fragment);
 	}
 
 	// ---- parse & validate ------------------------
@@ -266,9 +266,9 @@ export class URI implements UriComponents {
 	static parse(value: string, _strict: boolean = false): URI {
 		const match = _regexp.exec(value);
 		if (!match) {
-			return new CachingURI(_empty, _empty, _empty, _empty, _empty);
+			return new Uri(_empty, _empty, _empty, _empty, _empty);
 		}
-		return new CachingURI(
+		return new Uri(
 			match[2] || _empty,
 			percentDecode(match[4] || _empty),
 			percentDecode(match[5] || _empty),
@@ -323,11 +323,11 @@ export class URI implements UriComponents {
 			}
 		}
 
-		return new CachingURI('file', authority, path, _empty, _empty);
+		return new Uri('file', authority, path, _empty, _empty);
 	}
 
 	static from(components: { scheme: string; authority?: string; path?: string; query?: string; fragment?: string }): URI {
-		return new CachingURI(
+		return new Uri(
 			components.scheme,
 			components.authority,
 			components.path,
@@ -387,7 +387,7 @@ export class URI implements UriComponents {
 		} else if (data instanceof URI) {
 			return data;
 		} else {
-			const result = new CachingURI(data);
+			const result = new Uri(data);
 			result._formatted = (<UriState>data).external;
 			result._fsPath = (<UriState>data)._sep === _pathSepMarker ? (<UriState>data).fsPath : null;
 			return result;
@@ -413,7 +413,7 @@ interface UriState extends UriComponents {
 const _pathSepMarker = isWindows ? 1 : undefined;
 
 // This class exists so that URI is compatibile with vscode.Uri (API).
-class CachingURI extends URI {
+class Uri extends URI {
 
 	_formatted: string | null = null;
 	_fsPath: string | null = null;
