From f80496d3966145f032fa03994d2d1a8099ac8715 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Wed, 17 Aug 2016 09:06:26 +0200 Subject: [PATCH] revert paths.ts defaults --- src/vs/base/node/paths.ts | 35 ++++------------------------------- 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/src/vs/base/node/paths.ts b/src/vs/base/node/paths.ts index 5b1c647bc65..8cd14b49f6f 100644 --- a/src/vs/base/node/paths.ts +++ b/src/vs/base/node/paths.ts @@ -4,40 +4,13 @@ *--------------------------------------------------------------------------------------------*/ import uri from 'vs/base/common/uri'; -import * as path from 'path'; -import * as os from 'os'; interface IPaths { getAppDataPath(platform: string): string; getUserDataPath(platform: string, appName: string, args: string[]): string; } -function defaultGetAppDataPath(platform) { - switch (platform) { - case 'win32': return process.env['APPDATA']; - case 'darwin': return path.join(os.homedir(), 'Library', 'Application Support'); - case 'linux': return process.env['XDG_CONFIG_HOME'] || path.join(os.homedir(), '.config'); - default: throw new Error('Platform not supported'); - } -} - -function defaultGetUserDataPath(platform, appName) { - return path.join(getAppDataPath(platform), appName); -} - -let _getAppDataPath: (platform: string) => string; -let _getUserDataPath: (platform: string, appName: string, args: string[]) => string; - -try { - const pathsPath = uri.parse(require.toUrl('paths')).fsPath; - const paths = require.__$__nodeRequire(pathsPath); - - _getAppDataPath = paths.getAppDataPath; - _getUserDataPath = paths.getUserDataPath; -} catch (error) { - _getAppDataPath = (platform) => defaultGetAppDataPath(platform); - _getUserDataPath = (platform: string, appName: string, args: string[]) => defaultGetUserDataPath(platform, appName); -} - -export const getAppDataPath = _getAppDataPath; -export const getUserDataPath = _getUserDataPath; +const pathsPath = uri.parse(require.toUrl('paths')).fsPath; +const paths = require.__$__nodeRequire(pathsPath); +export const getAppDataPath = paths.getAppDataPath; +export const getUserDataPath = paths.getUserDataPath; -- GitLab