Merge branch 'master' into scm-api

This commit is contained in:
Joao Moreno
2016-11-28 10:37:55 +01:00
182 changed files with 1285 additions and 934 deletions

View File

@@ -298,7 +298,7 @@ export function createApiFactory(initData: IInitData, threadService: IThreadServ
return extHostQuickOpen.showInput(options, token);
},
createStatusBarItem(position?: vscode.StatusBarAlignment, priority?: number): vscode.StatusBarItem {
return extHostStatusBar.createStatusBarEntry(<number>position, priority);
return extHostStatusBar.createStatusBarEntry(extension.id, <number>position, priority);
},
setStatusBarMessage(text: string, timeoutOrThenable?: number | Thenable<any>): vscode.Disposable {
return extHostStatusBar.setStatusBarMessage(text, timeoutOrThenable);