Merge from master

src/vs/platform/localizations/common/localizations.ts

@@ -2,10 +2,8 @@
  *  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 { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { Event } from 'vs/base/common/event';
 
 export interface ILocalization {
@@ -21,7 +19,7 @@ export interface ITranslation {
 	path: string;
 }
 
-export enum LanguageType {
+export const enum LanguageType {
 	Core = 1,
 	Contributed
 }
@@ -31,7 +29,7 @@ export interface ILocalizationsService {
 	_serviceBrand: any;
 
 	readonly onDidLanguagesChange: Event<void>;
-	getLanguageIds(type?: LanguageType): TPromise<string[]>;
+	getLanguageIds(type?: LanguageType): Thenable<string[]>;
 }
 
 export function isValidLocalization(localization: ILocalization): boolean {

src/vs/platform/localizations/common/localizationsIpc.ts

@@ -1,56 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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 { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { Event, buffer } from 'vs/base/common/event';
-import { ILocalizationsService, LanguageType } from 'vs/platform/localizations/common/localizations';
-
-export interface ILocalizationsChannel extends IChannel {
-	listen(event: 'onDidLanguagesChange'): Event<void>;
-	listen<T>(event: string, arg?: any): Event<T>;
-
-	call(command: 'getLanguageIds'): TPromise<string[]>;
-	call(command: string, arg?: any): TPromise<any>;
-}
-
-export class LocalizationsChannel implements ILocalizationsChannel {
-
-	onDidLanguagesChange: Event<void>;
-
-	constructor(private service: ILocalizationsService) {
-		this.onDidLanguagesChange = buffer(service.onDidLanguagesChange, true);
-	}
-
-	listen<T>(event: string): Event<any> {
-		switch (event) {
-			case 'onDidLanguagesChange': return this.onDidLanguagesChange;
-		}
-
-		throw new Error('No event found');
-	}
-
-	call(command: string, arg?: any): TPromise<any> {
-		switch (command) {
-			case 'getLanguageIds': return this.service.getLanguageIds(arg);
-		}
-		return undefined;
-	}
-}
-
-export class LocalizationsChannelClient implements ILocalizationsService {
-
-	_serviceBrand: any;
-
-	constructor(private channel: ILocalizationsChannel) { }
-
-	get onDidLanguagesChange(): Event<void> { return this.channel.listen('onDidLanguagesChange'); }
-
-	getLanguageIds(type?: LanguageType): TPromise<string[]> {
-		return this.channel.call('getLanguageIds', type);
-	}
-}