maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

more cleanup

Browse source
This commit is contained in:
Benjamin Pasero 2016-08-17 14:55:53 +02:00
parent 89a234b9f0
commit ffd210a7a5
4 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/vs/code/electron-main/window.ts
View file

@ -90,10 +90,6 @@ export interface IPath {
export interface IWindowConfiguration extends ICommandLineArguments { export interface IWindowConfiguration extends ICommandLineArguments {
// TODO@Ben things to still clean up
appSettingsHome: string;
userExtensionsHome: string;
// Used to configure the workbench when opening // Used to configure the workbench when opening
workspacePath?: string; workspacePath?: string;
recentFiles: string[]; recentFiles: string[];

8
src/vs/code/electron-main/windows.ts
View file

@ -726,16 +726,14 @@ export class WindowsManager implements IWindowsService {
private toConfiguration(userEnv: IProcessEnvironment, cli: ICommandLineArguments, workspacePath?: string, filesToOpen?: IPath[], filesToCreate?: IPath[], filesToDiff?: IPath[], extensionsToInstall?: string[]): IWindowConfiguration { private toConfiguration(userEnv: IProcessEnvironment, cli: ICommandLineArguments, workspacePath?: string, filesToOpen?: IPath[], filesToCreate?: IPath[], filesToDiff?: IPath[], extensionsToInstall?: string[]): IWindowConfiguration {
let configuration: IWindowConfiguration = mixin({}, cli); // inherit all properties from CLI let configuration: IWindowConfiguration = mixin({}, cli); // inherit all properties from CLI
configuration.appRoot = this.envService.appRoot;
configuration.execPath = process.execPath;
configuration.userEnv = userEnv;
configuration.workspacePath = workspacePath; configuration.workspacePath = workspacePath;
configuration.filesToOpen = filesToOpen; configuration.filesToOpen = filesToOpen;
configuration.filesToCreate = filesToCreate; configuration.filesToCreate = filesToCreate;
configuration.filesToDiff = filesToDiff; configuration.filesToDiff = filesToDiff;
configuration.extensionsToInstall = extensionsToInstall; configuration.extensionsToInstall = extensionsToInstall;
configuration.appRoot = this.envService.appRoot;
configuration.execPath = process.execPath;
configuration.appSettingsHome = this.envService.appSettingsHome;
configuration.userExtensionsHome = this.envService.userExtensionsHome;
configuration.userEnv = userEnv;
const recents = this.getRecentlyOpenedPaths(workspacePath, filesToOpen); const recents = this.getRecentlyOpenedPaths(workspacePath, filesToOpen);
configuration.recentFiles = recents.files; configuration.recentFiles = recents.files;

5
src/vs/platform/workspace/common/workspace.ts
View file

@ -87,11 +87,6 @@ export interface IConfiguration {
export interface IEnvironment { export interface IEnvironment {
appRoot: string; appRoot: string;
appSettingsHome: string;
disableExtensions: boolean;
userExtensionsHome: string;
extensionDevelopmentPath: string; extensionDevelopmentPath: string;
extensionTestsPath: string; extensionTestsPath: string;

2
src/vs/workbench/electron-browser/shell.ts
View file

@ -252,7 +252,7 @@ export class WorkbenchShell {
const config: ITelemetryServiceConfig = { const config: ITelemetryServiceConfig = {
appender: new TelemetryAppenderClient(channel), appender: new TelemetryAppenderClient(channel),
commonProperties: resolveWorkbenchCommonProperties(this.storageService, commit, version), commonProperties: resolveWorkbenchCommonProperties(this.storageService, commit, version),
piiPaths: [this.environmentService.appRoot, this.configuration.env.userExtensionsHome] piiPaths: [this.environmentService.appRoot, this.environmentService.extensionsPath]
}; };
const telemetryService = instantiationService.createInstance(TelemetryService, config); const telemetryService = instantiationService.createInstance(TelemetryService, config);