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

Merge remote-tracking branch 'origin/master' into colourpicker

Browse Source
This commit is contained in:
Joao Moreno
2017-07-27 16:39:09 +02:00
parent 7e1e817ff6 49ab4da7ca
commit d38e4fd69b
167 changed files with 3916 additions and 1467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,8 +123,8 @@ export abstract class MainThreadCommandsShape {
}
export abstract class MainThreadConfigurationShape {
$updateConfigurationOption(target: ConfigurationTarget, key: string, value: any): TPromise<void> { throw ni(); }
$removeConfigurationOption(target: ConfigurationTarget, key: string): TPromise<void> { throw ni(); }
$updateConfigurationOption(target: ConfigurationTarget, key: string, value: any, resource: URI): TPromise<void> { throw ni(); }
$removeConfigurationOption(target: ConfigurationTarget, key: string, resource: URI): TPromise<void> { throw ni(); }
}
export abstract class MainThreadDiagnosticsShape {