fix microsoft#58694

jrieken · jrieken · commit 1bcc3508fa21 · 2018-09-26T12:05:54.000+02:00
diff --git a/extensions/extension-editing/src/extensionLinter.ts b/extensions/extension-editing/src/extensionLinter.ts
@@ -5,7 +5,7 @@
 
 import * as path from 'path';
 import * as fs from 'fs';
-
+import { URL } from 'url';
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
@@ -289,7 +289,7 @@ export class ExtensionLinter {
 	}
 
 	private addDiagnostics(diagnostics: Diagnostic[], document: TextDocument, begin: number, end: number, src: string, context: Context, info: PackageJsonInfo) {
-		const uri = parseUri(src);
+		const uri = parseUri(src, document.uri.toString());
 		if (!uri) {
 			return;
 		}
@@ -345,14 +345,15 @@ function endsWith(haystack: string, needle: string): boolean {
 	}
 }
 
-function parseUri(src: string) {
+function parseUri(src: string, base?: string, retry: boolean = true) {
 	try {
-		return Uri.parse(src);
+		let url = new URL(src, base);
+		return Uri.parse(url.toString());
 	} catch (err) {
-		try {
-			return Uri.parse(encodeURI(src));
-		} catch (err) {
+		if (retry) {
+			return parseUri(encodeURI(src), base, false);
+		} else {
 			return null;
 		}
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`import * as path from 'path';`
`7`	`7`	`import * as fs from 'fs';`
`8`		`-`
	`8`	`+import { URL } from 'url';`
`9`	`9`	`import * as nls from 'vscode-nls';`
`10`	`10`	`const localize = nls.loadMessageBundle();`
`11`	`11`
`@@ -289,7 +289,7 @@ export class ExtensionLinter {`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`private addDiagnostics(diagnostics: Diagnostic[], document: TextDocument, begin: number, end: number, src: string, context: Context, info: PackageJsonInfo) {`
`292`		`- const uri = parseUri(src);`
	`292`	`+ const uri = parseUri(src, document.uri.toString());`
`293`	`293`	`if (!uri) {`
`294`	`294`	`return;`
`295`	`295`	`}`
`@@ -345,14 +345,15 @@ function endsWith(haystack: string, needle: string): boolean {`
`345`	`345`	`}`
`346`	`346`	`}`
`347`	`347`
`348`		`-function parseUri(src: string) {`
	`348`	`+function parseUri(src: string, base?: string, retry: boolean = true) {`
`349`	`349`	`try {`
`350`		`- return Uri.parse(src);`
	`350`	`+ let url = new URL(src, base);`
	`351`	`+ return Uri.parse(url.toString());`
`351`	`352`	`} catch (err) {`
`352`		`- try {`
`353`		`- return Uri.parse(encodeURI(src));`
`354`		`- } catch (err) {`
	`353`	`+ if (retry) {`
	`354`	`+ return parseUri(encodeURI(src), base, false);`
	`355`	`+ } else {`
`355`	`356`	`return null;`
`356`	`357`	`}`
`357`	`358`	`}`
`358`		`-}`
	`359`	`+}`