development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 05:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #58694

Browse source
This commit is contained in:
Johannes Rieken 2018-09-26 12:05:38 +02:00
parent 7da2a63c8e
commit 1bcc3508fa
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
extensions/extension-editing/src/extensionLinter.ts
View file

@ -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;
}
}
}
}