diff options
Diffstat (limited to 'src/vs/code/electron-main/main.ts')
| -rw-r--r-- | src/vs/code/electron-main/main.ts | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts index 6bed7a06fee..762f288daba 100644 --- a/src/vs/code/electron-main/main.ts +++ b/src/vs/code/electron-main/main.ts @@ -3,8 +3,11 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import 'vs/platform/update/common/update.config.contribution'; + import { app, dialog } from 'electron'; import { unlinkSync } from 'fs'; +import { URI } from 'vs/base/common/uri'; import { coalesce, distinct } from 'vs/base/common/arrays'; import { Promises } from 'vs/base/common/async'; import { toErrorMessage } from 'vs/base/common/errorMessage'; @@ -15,7 +18,7 @@ import { getPathLabel, mnemonicButtonLabel } from 'vs/base/common/labels'; import { Schemas } from 'vs/base/common/network'; import { basename, join, resolve } from 'vs/base/common/path'; import { mark } from 'vs/base/common/performance'; -import { IProcessEnvironment, isMacintosh, isWindows } from 'vs/base/common/platform'; +import { IProcessEnvironment, isMacintosh, isWindows, OS } from 'vs/base/common/platform'; import { cwd } from 'vs/base/common/process'; import { rtrim, trim } from 'vs/base/common/strings'; import { Promises as FSPromises } from 'vs/base/node/pfs'; @@ -59,7 +62,6 @@ import { IStateMainService } from 'vs/platform/state/electron-main/state'; import { StateMainService } from 'vs/platform/state/electron-main/stateMainService'; import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils'; import { IThemeMainService, ThemeMainService } from 'vs/platform/theme/electron-main/themeMainService'; -import 'vs/platform/update/common/update.config.contribution'; /** * The main VS Code entry point. @@ -364,7 +366,7 @@ class CodeMain { private handleStartupDataDirError(environmentMainService: IEnvironmentMainService, title: string, error: NodeJS.ErrnoException): void { if (error.code === 'EACCES' || error.code === 'EPERM') { - const directories = coalesce([environmentMainService.userDataPath, environmentMainService.extensionsPath, XDG_RUNTIME_DIR]).map(folder => getPathLabel(folder, environmentMainService)); + const directories = coalesce([environmentMainService.userDataPath, environmentMainService.extensionsPath, XDG_RUNTIME_DIR]).map(folder => getPathLabel(URI.file(folder), { os: OS, tildify: environmentMainService })); this.showStartupWarningDialog( localize('startupDataDirError', "Unable to write program user data."), |