Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 11:38:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

use regex, not Uri.parse, to detect custom scheme

Browse Source
This commit is contained in:
Jan Kretschmer
2021-11-24 22:07:31 +01:00
parent 8779aaf2ae
commit bb89815cfb
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
extensions/html-language-features/client/src/customData.ts
View File

@@ -4,7 +4,8 @@
*--------------------------------------------------------------------------------------------*/
import { workspace, extensions, Uri, EventEmitter, Disposable } from 'vscode';
import { resolvePath, joinPath } from './requests';
import { resolvePath, joinPath, uriScheme } from './requests';
export function getCustomDataSource(toDispose: Disposable[]) {
let pathsInWorkspace = getCustomDataPathsInAllWorkspaces();
@@ -57,8 +58,7 @@ function getCustomDataPathsInAllWorkspaces(): Set<string> {
if (Array.isArray(paths)) {
for (const path of paths) {
if (typeof path === 'string') {
const uri = Uri.parse(path);
if (uri.scheme === 'file') {
if (!uriScheme.test(path)) {
// only resolve file paths relative to extension
dataPaths.add(resolvePath(rootFolder, path).toString());
} else {
@@ -94,12 +94,11 @@ function getCustomDataPathsFromAllExtensions(): Set<string> {
const customData = extension.packageJSON?.contributes?.html?.customData;
if (Array.isArray(customData)) {
for (const rp of customData) {
const uri = Uri.parse(rp);
if (uri.scheme === 'file') {
// only resolve file paths relative to extension
if (!uriScheme.test(rp)) {
// no schame -> resolve relative to extension
dataPaths.add(joinPath(extension.extensionUri, rp).toString());
} else {
// others schemes
// actual schemes
dataPaths.add(rp);
}