Merge from master

src/vs/workbench/api/electron-browser/mainThreadLanguages.ts

@@ -2,29 +2,42 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
-import { TPromise } from 'vs/base/common/winjs.base';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { IModeService } from 'vs/editor/common/services/modeService';
+import { IModelService } from 'vs/editor/common/services/modelService';
 import { MainThreadLanguagesShape, MainContext, IExtHostContext } from '../node/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 
 @extHostNamedCustomer(MainContext.MainThreadLanguages)
 export class MainThreadLanguages implements MainThreadLanguagesShape {
 
-	private _modeService: IModeService;
-
 	constructor(
-		extHostContext: IExtHostContext,
-		@IModeService modeService: IModeService
+		_extHostContext: IExtHostContext,
+		@IModeService private readonly _modeService: IModeService,
+		@IModelService private readonly _modelService: IModelService
 	) {
-		this._modeService = modeService;
 	}
 
-	public dispose(): void {
+	dispose(): void {
+		// nothing
 	}
 
-	$getLanguages(): TPromise<string[]> {
-		return TPromise.as(this._modeService.getRegisteredModes());
+	$getLanguages(): Thenable<string[]> {
+		return Promise.resolve(this._modeService.getRegisteredModes());
+	}
+
+	$changeLanguage(resource: UriComponents, languageId: string): Thenable<void> {
+		const uri = URI.revive(resource);
+		let model = this._modelService.getModel(uri);
+		if (!model) {
+			return Promise.reject(new Error('Invalid uri'));
+		}
+		const languageIdentifier = this._modeService.getLanguageIdentifier(languageId);
+		if (!languageIdentifier || languageIdentifier.language !== languageId) {
+			return Promise.reject(new Error(`Unknown language id: ${languageId}`));
+		}
+		this._modelService.setMode(model, this._modeService.create(languageId));
+		return Promise.resolve(undefined);
 	}
 }