Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 18:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into treeExplorerAPI

Browse Source
This commit is contained in:
Pine Wu
2016-11-08 23:13:32 -08:00
parent 0b15cbb028 6155c3cd1d
commit b9cf15dd1f
174 changed files with 6613 additions and 5230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vs/workbench/api/node/extHost.protocol.ts
View File

@@ -29,6 +29,7 @@ import * as modes from 'vs/editor/common/modes';
import { IResourceEdit } from 'vs/editor/common/services/bulkEdit';
import { ConfigurationTarget } from 'vs/workbench/services/configuration/common/configurationEditing';
import { WorkspaceConfigurationNode } from 'vs/workbench/services/configuration/common/configuration';
import { IPickOpenEntry, IPickOptions } from 'vs/workbench/services/quickopen/common/quickOpenService';
import { SaveReason } from 'vs/workbench/services/textfile/common/textfiles';
@@ -45,10 +46,6 @@ export interface IEnvironment {
extensionTestsPath: string;
}
export interface IInitConfiguration {
_initConfigurationBrand: void;
}
export interface IInitData {
parentPid: number;
environment: IEnvironment;
@@ -56,7 +53,7 @@ export interface IInitData {
workspace: IWorkspace;
};
extensions: IExtensionDescription[];
configuration: IInitConfiguration;
configuration: WorkspaceConfigurationNode;
telemetryInfo: ITelemetryInfo;
}
@@ -238,7 +235,7 @@ export abstract class ExtHostCommandsShape {
}
export abstract class ExtHostConfigurationShape {
$acceptConfigurationChanged(config: any) { throw ni(); }
$acceptConfigurationChanged(config: WorkspaceConfigurationNode) { throw ni(); }
}
export abstract class ExtHostDiagnosticsShape {