add Uri.parse(value, strict) so that missing scheme throw

jrieken · jrieken · commit c15559789fca · 2018-11-09T10:50:20.000+01:00
diff --git a/src/vs/base/common/map.ts b/src/vs/base/common/map.ts
@@ -449,7 +449,7 @@ export class ResourceMap<T> {
 	}
 
 	public keys(): URI[] {
-		return keys(this.map).map(URI.parse);
+		return keys(this.map).map(k => URI.parse(k));
 	}
 
 	public clone(): ResourceMap<T> {
diff --git a/src/vs/base/common/uri.ts b/src/vs/base/common/uri.ts
@@ -21,11 +21,11 @@ export function setUriThrowOnMissingScheme(value: boolean): boolean {
 	return old;
 }
 
-function _validateUri(ret: URI): void {
+function _validateUri(ret: URI, _strict?: boolean): void {
 
 	// scheme, must be set
 	if (!ret.scheme) {
-		if (_throwOnMissingSchema) {
+		if (_strict || _throwOnMissingSchema) {
 			throw new Error(`[UriError]: Scheme is missing: {scheme: "", authority: "${ret.authority}", path: "${ret.path}", query: "${ret.query}", fragment: "${ret.fragment}"}`);
 		} else {
 			console.warn(`[UriError]: Scheme is missing: {scheme: "", authority: "${ret.authority}", path: "${ret.path}", query: "${ret.query}", fragment: "${ret.fragment}"}`);
@@ -141,7 +141,7 @@ export class URI implements UriComponents {
 	/**
 	 * @internal
 	 */
-	protected constructor(scheme: string, authority?: string, path?: string, query?: string, fragment?: string);
+	protected constructor(scheme: string, authority?: string, path?: string, query?: string, fragment?: string, _strict?: boolean);
 
 	/**
 	 * @internal
@@ -151,7 +151,7 @@ export class URI implements UriComponents {
 	/**
 	 * @internal
 	 */
-	protected constructor(schemeOrData: string | UriComponents, authority?: string, path?: string, query?: string, fragment?: string) {
+	protected constructor(schemeOrData: string | UriComponents, authority?: string, path?: string, query?: string, fragment?: string, _strict?: boolean) {
 
 		if (typeof schemeOrData === 'object') {
 			this.scheme = schemeOrData.scheme || _empty;
@@ -169,7 +169,7 @@ export class URI implements UriComponents {
 			this.query = query || _empty;
 			this.fragment = fragment || _empty;
 
-			_validateUri(this);
+			_validateUri(this, _strict);
 		}
 	}
 
@@ -261,7 +261,7 @@ export class URI implements UriComponents {
 	 *
 	 * @param value A string which represents an URI (see `URI#toString`).
 	 */
-	public static parse(value: string): URI {
+	public static parse(value: string, _strict: boolean = false): URI {
 		const match = _regexp.exec(value);
 		if (!match) {
 			return new _URI(_empty, _empty, _empty, _empty, _empty);
@@ -272,6 +272,7 @@ export class URI implements UriComponents {
 			decodeURIComponent(match[5] || _empty),
 			decodeURIComponent(match[7] || _empty),
 			decodeURIComponent(match[9] || _empty),
+			_strict
 		);
 	}
 
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
@@ -151,7 +151,7 @@ declare namespace monaco {
 		 *
 		 * @param value A string which represents an Uri (see `Uri#toString`).
 		 */
-		static parse(value: string): Uri;
+		static parse(value: string, _strict?: boolean): Uri;
 		/**
 		 * Creates a new Uri from a file system path, e.g. `c:\my\files`,
 		 * `/usr/home`, or `\\server\share\some\path`.

Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ export class ResourceMap<T> {`
`449`	`449`	`}`
`450`	`450`
`451`	`451`	`public keys(): URI[] {`
`452`		`- return keys(this.map).map(URI.parse);`
	`452`	`+ return keys(this.map).map(k => URI.parse(k));`
`453`	`453`	`}`
`454`	`454`
`455`	`455`	`public clone(): ResourceMap<T> {`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ declare namespace monaco {`
`151`	`151`	`*`
`152`	`152`	* @param value A string which represents an Uri (see `Uri#toString`).
`153`	`153`	`*/`
`154`		`- static parse(value: string): Uri;`
	`154`	`+ static parse(value: string, _strict?: boolean): Uri;`
`155`	`155`	`/**`
`156`	`156`	* Creates a new Uri from a file system path, e.g. `c:\my\files`,
`157`	`157`	* `/usr/home`, or `\\server\share\some\path`.