Merge from master

This commit is contained in:
Raj Musuku
2019-02-21 17:56:04 -08:00
parent 5a146e34fa
commit 666ae11639
11482 changed files with 119352 additions and 255574 deletions

4
src/vs/nls.d.ts vendored
View File

@@ -8,5 +8,5 @@ export interface ILocalizeInfo {
comment: string[];
}
export declare function localize(info: ILocalizeInfo, message: string, ...args: any[]): string;
export declare function localize(key: string, message: string, ...args: any[]): string;
export declare function localize(info: ILocalizeInfo, message: string, ...args: (string | number | boolean | undefined | null)[]): string;
export declare function localize(key: string, message: string, ...args: (string | number | boolean | undefined | null)[]): string;