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, () => {

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

@@ -184,7 +184,7 @@ export abstract class MainThreadOutputServiceShape {
}
export abstract class MainThreadTerminalServiceShape {
$createTerminal(name?: string, shellPath?: string, shellArgs?: string[]): TPromise<number> { throw ni(); }
$createTerminal(name?: string, shellPath?: string, shellArgs?: string[], waitOnExit?: boolean): TPromise<number> { throw ni(); }
$dispose(terminalId: number): void { throw ni(); }
$hide(terminalId: number): void { throw ni(); }
$sendText(terminalId: number, text: string, addNewLine: boolean): void { throw ni(); }

3
src/vs/workbench/api/node/extHostLanguageFeatures.ts
View File

@@ -514,7 +514,8 @@ class SuggestAdapter {
//
insertText: undefined,
additionalTextEdits: item.additionalTextEdits && item.additionalTextEdits.map(TypeConverters.TextEdit.from),
command: this._commands.toInternal(item.command)
command: this._commands.toInternal(item.command),
commitCharacters: item.commitCharacters
};
// 'insertText'-logic

16
src/vs/workbench/api/node/extHostTerminalService.ts
View File

@@ -20,14 +20,20 @@ export class ExtHostTerminal implements vscode.Terminal {
private _pidPromise: TPromise<number>;
private _pidPromiseComplete: TValueCallback<number>;
constructor(proxy: MainThreadTerminalServiceShape, name?: string, shellPath?: string, shellArgs?: string[]) {
constructor(
proxy: MainThreadTerminalServiceShape,
name?: string,
shellPath?: string,
shellArgs?: string[],
waitOnExit?: boolean
) {
this._name = name;
this._queuedRequests = [];
this._proxy = proxy;
this._pidPromise = new TPromise<number>(c => {
this._pidPromiseComplete = c;
});
this._proxy.$createTerminal(name, shellPath, shellArgs).then((id) => {
this._proxy.$createTerminal(name, shellPath, shellArgs, waitOnExit).then((id) => {
this._id = id;
this._queuedRequests.forEach((r) => {
r.run(this._proxy, this._id);
@@ -107,6 +113,12 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
return terminal;
}
public createTerminalFromOptions(options: vscode.TerminalOptions): vscode.Terminal {
let terminal = new ExtHostTerminal(this._proxy, options.name, options.shellPath, options.shellArgs, options.waitOnExit);
this._terminals.push(terminal);
return terminal;
}
public get onDidCloseTerminal(): Event<vscode.Terminal> {
return this._onDidCloseTerminal && this._onDidCloseTerminal.event;
}

2
src/vs/workbench/api/node/mainThreadOutputService.ts
View File

@@ -53,7 +53,7 @@ export class MainThreadOutputService extends MainThreadOutputServiceShape {
public $close(channelId: string): TPromise<void> {
const panel = this._panelService.getActivePanel();
if (panel && panel.getId() === OUTPUT_PANEL_ID && channelId === this._outputService.getActiveChannel().id) {
this._partService.setPanelHidden(true);
return this._partService.setPanelHidden(true);
}
return undefined;

4
src/vs/workbench/api/node/mainThreadTerminalService.ts
View File

@@ -30,8 +30,8 @@ export class MainThreadTerminalService extends MainThreadTerminalServiceShape {
this._toDispose = dispose(this._toDispose);
}
public $createTerminal(name?: string, shellPath?: string, shellArgs?: string[]): TPromise<number> {
return TPromise.as(this.terminalService.createInstance(name, shellPath, shellArgs, true).id);
public $createTerminal(name?: string, shellPath?: string, shellArgs?: string[], waitOnExit?: boolean): TPromise<number> {
return TPromise.as(this.terminalService.createInstance(name, shellPath, shellArgs, waitOnExit, true).id);
}
public $show(terminalId: number, preserveFocus: boolean): void {