|
@@ -1,10 +1,12 @@
|
|
|
diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
|
|
|
-index bceda01..174c766 100644
|
|
|
+index 3f50bef..2b4e8c2 100644
|
|
|
--- a/src/vs/platform/product/common/product.ts
|
|
|
+++ b/src/vs/platform/product/common/product.ts
|
|
|
-@@ -6,3 +6,3 @@
|
|
|
- import { FileAccess } from 'vs/base/common/network';
|
|
|
+@@ -5,4 +5,4 @@
|
|
|
+
|
|
|
+-import { FileAccess } from 'vs/base/common/network';
|
|
|
-import { globals } from 'vs/base/common/platform';
|
|
|
++import { AppResourcePath, FileAccess } from 'vs/base/common/network';
|
|
|
+import { globals, isWindows } from 'vs/base/common/platform';
|
|
|
import { env } from 'vs/base/common/process';
|
|
|
@@ -11,2 +11,3 @@ import { dirname, joinPath } from 'vs/base/common/resources';
|
|
@@ -46,7 +48,7 @@ index bceda01..174c766 100644
|
|
|
+ const userDataPath = getUserDataPath({} as any, product.nameShort);
|
|
|
+ const userProductPath = isWindows ? `file:///${userDataPath}/product.json` : `file://${userDataPath}/product.json`;
|
|
|
+
|
|
|
-+ const userProduct = require.__$__nodeRequire(FileAccess.asFileUri(userProductPath, require).fsPath);
|
|
|
++ const userProduct = require.__$__nodeRequire(FileAccess.asFileUri(userProductPath as AppResourcePath).fsPath);
|
|
|
+
|
|
|
+ product = merge(product, userProduct);
|
|
|
+ } catch (ex) {
|