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

Merge remote-tracking branch 'origin/master' into tyriar/15583

Browse Source
This commit is contained in:
Daniel Imms
2017-01-10 19:26:15 -08:00
parent 6bf0cde91e 676905ec60
commit d4c263d1de
64 changed files with 866 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,7 +96,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');

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

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;