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

Merge branch 'master' into scm-api

Browse Source
This commit is contained in:
Joao Moreno
2017-01-11 11:58:59 +01:00
parent 2e6c8db768 1c38df7823
commit 970f663a74
96 changed files with 1861 additions and 1434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,7 +125,7 @@ export function createApiFactory(initData: IInitData, threadService: IThreadServ
if (extension.enableProposedApi) {
if (!initData.environment.enableProposedApi) {
if (!initData.environment.enableProposedApi && !extension.isBuiltin) {
extension.enableProposedApi = false;
console.warn('PROPOSED API is only available when developing an extension');
@@ -306,8 +306,11 @@ export function createApiFactory(initData: IInitData, threadService: IThreadServ
createOutputChannel(name: string): vscode.OutputChannel {
return extHostOutputService.createOutputChannel(name);
},
createTerminal(name?: string, shellPath?: string, shellArgs?: string[]): vscode.Terminal {
return extHostTerminalService.createTerminal(name, shellPath, shellArgs);
createTerminal(nameOrOptions: vscode.TerminalOptions | string, shellPath?: string, shellArgs?: string[]): vscode.Terminal {
if (typeof nameOrOptions === 'object') {
return extHostTerminalService.createTerminalFromOptions(<vscode.TerminalOptions>nameOrOptions);
}
return extHostTerminalService.createTerminal(<string>nameOrOptions, shellPath, shellArgs);
},
// proposed API
sampleFunction: proposedApiFunction(extension, () => {