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

[css] update to vscode-uri@3.0

Browse Source
This commit is contained in:
Martin Aeschlimann
2020-12-18 10:31:24 +01:00
parent d6a6b44a13
commit daad75c2c6
12 changed files with 29 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/css-language-features/client/src/customData.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import { workspace, extensions, Uri, EventEmitter, Disposable } from 'vscode';
import { resolvePath, joinPath } from './requests';
import { Utils } from 'vscode-uri';
export function getCustomDataSource(toDispose: Disposable[]) {
let pathsInWorkspace = getCustomDataPathsInAllWorkspaces();
@@ -50,7 +50,7 @@ function getCustomDataPathsInAllWorkspaces(): string[] {
if (Array.isArray(paths)) {
for (const path of paths) {
if (typeof path === 'string') {
dataPaths.push(resolvePath(rootFolder, path).toString());
dataPaths.push(Utils.resolvePath(rootFolder, path).toString());
}
}
}
@@ -80,7 +80,7 @@ function getCustomDataPathsFromAllExtensions(): string[] {
const customData = extension.packageJSON?.contributes?.css?.customData;
if (Array.isArray(customData)) {
for (const rp of customData) {
dataPaths.push(joinPath(extension.extensionUri, rp).toString());
dataPaths.push(Utils.joinPath(extension.extensionUri, rp).toString());
}
}
}