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

Merge branch 'master' into aeschli/decoration-attachments

Browse Source
This commit is contained in:
Martin Aeschlimann
2016-06-06 09:32:52 +02:00
parent 1a1c98141c 346834b1f0
commit c1713bbc0a
192 changed files with 2454 additions and 2567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,6 +42,7 @@ import vscode = require('vscode');
import {TextEditorRevealType} from 'vs/workbench/api/node/mainThreadEditors';
import * as paths from 'vs/base/common/paths';
import {ITelemetryService, ITelemetryInfo} from 'vs/platform/telemetry/common/telemetry';
import {LanguageConfigurationRegistry} from 'vs/editor/common/modes/languageConfigurationRegistry';
/**
* This class implements the API described in vscode.d.ts,
@@ -503,6 +504,6 @@ export class MainProcessVSCodeAPIHelper {
}
public Modes_RichEditSupport_register(disposeToken:string, modeId: string, configuration:vscode.LanguageConfiguration): void {
this._token2Dispose[disposeToken] = this._modeService.registerRichEditSupport(modeId, <any>configuration);
this._token2Dispose[disposeToken] = LanguageConfigurationRegistry.register(modeId, configuration);
}
}

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

@@ -717,8 +717,9 @@ export class CompletionItem {
insertText: string;
textEdit: TextEdit;
constructor(label: string) {
constructor(label: string, kind?: CompletionItemKind) {
this.label = label;
this.kind = kind;
}
toJSON(): any {