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 branch 'master' into scm-multiroot

Browse Source
This commit is contained in:
Joao
2017-08-25 11:36:39 +02:00
parent 7341dcd4df 5be69f3e65
commit 2624eff8fe
294 changed files with 4601 additions and 2062 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,8 +113,16 @@ export interface MainThreadDiagnosticsShape extends IDisposable {
$clear(owner: string): TPromise<any>;
}
export interface MainThreadDialogOptions {
uri?: URI;
openLabel?: string;
openFiles?: boolean;
openFolders?: boolean;
openMany?: boolean;
}
export interface MainThreadDiaglogsShape extends IDisposable {
$showOpenDialog(): TPromise<string[]>;
$showOpenDialog(options: MainThreadDialogOptions): TPromise<string[]>;
}
export interface MainThreadDocumentContentProvidersShape extends IDisposable {
@@ -227,7 +235,7 @@ export interface MainThreadLanguagesShape extends IDisposable {
}
export interface MainThreadMessageOptions {
extensionId?: string;
extension?: IExtensionDescription;
modal?: boolean;
}
@@ -280,7 +288,6 @@ export interface MainThreadStorageShape extends IDisposable {
export interface MainThreadTelemetryShape extends IDisposable {
$publicLog(eventName: string, data?: any): void;
$getTelemetryInfo(): TPromise<ITelemetryInfo>;
}
export interface MainThreadWorkspaceShape extends IDisposable {