opensource/code-server
1
0
Fork 0
mirror of https://github.com/coder/code-server.git synced 2025-09-26 01:25:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(vscode): update to 1.53.2

Browse Source 
These conflicts will be resolved in the following commits. We do it this way so
that PR review is possible.
This commit is contained in:
Joe Previte
2021-02-25 11:27:27 -07:00
parent db3a13ba06 89b6e0164f
commit eae5d8c807
1900 changed files with 83066 additions and 64589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/vscode/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());
}
}
}