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

use set to store and lookup paths of interest

Browse Source
This commit is contained in:
Jan Kretschmer
2021-11-20 00:16:06 +01:00
parent b074018c3e
commit 8779aaf2ae
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@ export function getCustomDataSource(toDispose: Disposable[]) {
toDispose.push(extensions.onDidChange(_ => {
const newPathsInExtensions = getCustomDataPathsFromAllExtensions();
if (newPathsInExtensions.length !== pathsInExtensions.length || !newPathsInExtensions.every((val, idx) => val === pathsInExtensions[idx])) {
if (pathsInExtensions.size !== newPathsInExtensions.size || ![...pathsInExtensions].every(path => newPathsInExtensions.has(path))) {
pathsInExtensions = newPathsInExtensions;
onChange.fire();
}
@@ -28,14 +28,14 @@ export function getCustomDataSource(toDispose: Disposable[]) {
toDispose.push(workspace.onDidChangeTextDocument(e => {
const path = e.document.uri.toString();
if (pathsInExtensions.indexOf(path) || pathsInWorkspace.indexOf(path)) {
if (pathsInExtensions.has(path) || pathsInWorkspace.has(path)) {
onChange.fire();
}
}));
return {
get uris() {
return pathsInWorkspace.concat(pathsInExtensions);
return [...pathsInWorkspace].concat([...pathsInExtensions]);
},
get onDidChange() {
return onChange.event;
@@ -44,10 +44,10 @@ export function getCustomDataSource(toDispose: Disposable[]) {
}
function getCustomDataPathsInAllWorkspaces(): string[] {
function getCustomDataPathsInAllWorkspaces(): Set<string> {
const workspaceFolders = workspace.workspaceFolders;
const dataPaths: string[] = [];
const dataPaths = new Set<string>();
if (!workspaceFolders) {
return dataPaths;
@@ -60,10 +60,10 @@ function getCustomDataPathsInAllWorkspaces(): string[] {
const uri = Uri.parse(path);
if (uri.scheme === 'file') {
// only resolve file paths relative to extension
dataPaths.push(resolvePath(rootFolder, path).toString());
dataPaths.add(resolvePath(rootFolder, path).toString());
} else {
// others schemes
dataPaths.push(path);
dataPaths.add(path);
}
}
}
@@ -88,8 +88,8 @@ function getCustomDataPathsInAllWorkspaces(): string[] {
return dataPaths;
}
function getCustomDataPathsFromAllExtensions(): string[] {
const dataPaths: string[] = [];
function getCustomDataPathsFromAllExtensions(): Set<string> {
const dataPaths = new Set<string>();
for (const extension of extensions.all) {
const customData = extension.packageJSON?.contributes?.html?.customData;
if (Array.isArray(customData)) {
@@ -97,10 +97,10 @@ function getCustomDataPathsFromAllExtensions(): string[] {
const uri = Uri.parse(rp);
if (uri.scheme === 'file') {
// only resolve file paths relative to extension
dataPaths.push(joinPath(extension.extensionUri, rp).toString());
dataPaths.add(joinPath(extension.extensionUri, rp).toString());
} else {
// others schemes
dataPaths.push(rp);
dataPaths.add(rp);
}
}

19
extensions/html-language-features/client/src/requests.ts
View File

@@ -21,18 +21,19 @@ export namespace FsReadDirRequest {
export function serveFileSystemRequests(client: CommonLanguageClient, runtime: Runtime, subscriptions: { dispose(): any }[]) {
subscriptions.push(client.onRequest(FsContentRequest.type, (param: { uri: string; encoding?: string; }) => {
const uri = Uri.parse(param.uri);
if (uri.scheme === 'file' && runtime.fs) {
return runtime.fs.getContent(param.uri);
}
return workspace.fs.readFile(uri).then(buffer => {
return new runtime.TextDecoder(param.encoding).decode(buffer);
}, () => {
// this path also considers TextDocumentContentProvider
if (uri.scheme === 'file') {
if (runtime.fs) {
return runtime.fs.getContent(param.uri);
} else {
return workspace.fs.readFile(uri).then(buffer => {
return new runtime.TextDecoder(param.encoding).decode(buffer);
});
}
} else {
return workspace.openTextDocument(uri).then(doc => {
return doc.getText();
});
});
}
}));
subscriptions.push(client.onRequest(FsReadDirRequest.type, (uriString: string) => {
const uri = Uri.parse(uriString);