maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed edge case

Browse source
This commit is contained in:
Wang Weixuan 2021-08-28 22:20:33 +08:00
parent 80710ea137
commit b58b850066
No known key found for this signature in database
GPG key ID: FE030314E7087630
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,7 +45,7 @@ interface TokenAndPosition {
interface PackageJsonInfo {
isExtension: boolean;
repository: GitHost | undefined;
repository: string | undefined;
}
export class ExtensionLinter {
@ -269,13 +269,14 @@ export class ExtensionLinter {
repoUrl = urlNode.value;
}
}
const gitHost = repoUrl && GitHost.fromUrl(repoUrl, { noGitPlus: true });
const info: PackageJsonInfo = {
isExtension: !!(engine && engine.type === 'string'),
repository: repoUrl && GitHost.fromUrl(repoUrl, { noGitPlus: true }) || undefined
repository: gitHost && gitHost.https() || repoUrl
};
const str = folder.toString();
const oldInfo = this.folderToPackageJsonInfo[str];
if (oldInfo && (oldInfo.isExtension !== info.isExtension || oldInfo.repository?.toString() !== info.repository?.toString())) {
if (oldInfo && (oldInfo.isExtension !== info.isExtension || oldInfo.repository !== info.repository)) {
this.packageJsonChanged(folder); // clears this.folderToPackageJsonInfo[str]
}
this.folderToPackageJsonInfo[str] = info;
@ -308,7 +309,7 @@ export class ExtensionLinter {
private addDiagnostics(diagnostics: Diagnostic[], document: TextDocument, begin: number, end: number, src: string, context: Context, info: PackageJsonInfo) {
const hasScheme = /^\w[\w\d+.-]*:/.test(src);
const uri = parseUri(src, info.repository ? info.repository.browse() : document.uri.toString());
const uri = parseUri(src, info.repository || document.uri.toString());
if (!uri) {
return;
}
@ -324,7 +325,7 @@ export class ExtensionLinter {
diagnostics.push(new Diagnostic(range, dataUrlsNotValid, DiagnosticSeverity.Warning));
}
if (!hasScheme && info.repository?.default !== 'https') {
if (!hasScheme && !info.repository?.startsWith('https')) {
const range = new Range(document.positionAt(begin), document.positionAt(end));
let message = (() => {
switch (context) {