OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Pass builtin extension dir to vscode

Browse Source
This commit is contained in:
Asher
2019-02-06 11:01:15 -06:00
parent 91bd6775c3
commit ddf96077a3
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/vscode.patch
View File

@ -328,6 +328,19 @@ index 7b4e8721ac..96d612f940 100644
}
return codeEditorModel;
diff --git a/src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts b/src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts
index 4cb7a231f3..d5a9c26673 100644
--- a/src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts
@@ -31,6 +31,8 @@ interface IExtensionCacheData {
let _SystemExtensionsRoot: string | null = null;
function getSystemExtensionsRoot(): string {
+ const { client } = require("../../../../../../../../packages/vscode") as typeof import ("../../../../../../../../packages/vscode");
+ return client.builtInExtensionsDirectory;
if (!_SystemExtensionsRoot) {
_SystemExtensionsRoot = path.normalize(path.join(getPathFromAmdModule(require, ''), '..', 'extensions'));
}
diff --git a/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.ts b/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.ts
index 5b4136989f..25ccc0fe9e 100644
--- a/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.ts