Skip to content

Commit fc251d6

Browse files
author
Benjamin Pasero
committed
tpromise => promise (for microsoft#53526)
1 parent 9d89efe commit fc251d6

40 files changed

Lines changed: 306 additions & 332 deletions

‎src/vs/base/browser/ui/dropdown/dropdown.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import 'vs/css!./dropdown';
7-
import { TPromise } from 'vs/base/common/winjs.base';
87
import { Gesture, EventType as GestureEventType } from 'vs/base/browser/touch';
98
import { ActionRunner, IAction, IActionRunner } from 'vs/base/common/actions';
109
import { BaseActionItem, IActionItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
@@ -244,7 +243,7 @@ export class DropdownMenu extends BaseDropdown {
244243

245244
this._contextMenuProvider.showContextMenu({
246245
getAnchor: () => this.element,
247-
getActions: () => TPromise.as(this.actions),
246+
getActions: () => Promise.resolve(this.actions),
248247
getActionsContext: () => this.menuOptions ? this.menuOptions.context : null,
249248
getActionItem: action => this.menuOptions && this.menuOptions.actionItemProvider ? this.menuOptions.actionItemProvider(action) : null,
250249
getKeyBinding: action => this.menuOptions && this.menuOptions.getKeyBinding ? this.menuOptions.getKeyBinding(action) : null,

‎src/vs/base/browser/ui/toolbar/toolbar.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import 'vs/css!./toolbar';
77
import * as nls from 'vs/nls';
8-
import { TPromise } from 'vs/base/common/winjs.base';
98
import { Action, IActionRunner, IAction } from 'vs/base/common/actions';
109
import { ActionBar, ActionsOrientation, IActionItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
1110
import { IContextMenuProvider, DropdownMenuActionItem } from 'vs/base/browser/ui/dropdown/dropdown';
@@ -176,10 +175,10 @@ class ToggleMenuAction extends Action {
176175
this.toggleDropdownMenu = toggleDropdownMenu;
177176
}
178177

179-
run(): TPromise<any> {
178+
run(): Promise<any> {
180179
this.toggleDropdownMenu();
181180

182-
return TPromise.as(true);
181+
return Promise.resolve(true);
183182
}
184183

185184
get menuActions() {

‎src/vs/base/node/encoding.ts‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import * as stream from 'vs/base/node/stream';
77
import * as iconv from 'iconv-lite';
8-
import { TPromise } from 'vs/base/common/winjs.base';
98
import { isLinux, isMacintosh } from 'vs/base/common/platform';
109
import { exec } from 'child_process';
1110
import { Readable, Writable, WritableOptions } from 'stream';
@@ -21,8 +20,7 @@ export interface IDecodeStreamOptions {
2120
overwriteEncoding?(detectedEncoding: string): string;
2221
}
2322

24-
export function toDecodeStream(readable: Readable, options: IDecodeStreamOptions): TPromise<{ detected: IDetectedEncodingResult, stream: NodeJS.ReadableStream }> {
25-
23+
export function toDecodeStream(readable: Readable, options: IDecodeStreamOptions): Promise<{ detected: IDetectedEncodingResult, stream: NodeJS.ReadableStream }> {
2624
if (!options.minBytesRequiredForDetection) {
2725
options.minBytesRequiredForDetection = options.guessEncoding ? AUTO_GUESS_BUFFER_MAX_LEN : NO_GUESS_BUFFER_MAX_LEN;
2826
}
@@ -31,7 +29,7 @@ export function toDecodeStream(readable: Readable, options: IDecodeStreamOptions
3129
options.overwriteEncoding = detected => detected || UTF8;
3230
}
3331

34-
return new TPromise<{ detected: IDetectedEncodingResult, stream: NodeJS.ReadableStream }>((resolve, reject) => {
32+
return new Promise<{ detected: IDetectedEncodingResult, stream: NodeJS.ReadableStream }>((resolve, reject) => {
3533
readable.pipe(new class extends Writable {
3634

3735
private _decodeStream: NodeJS.ReadWriteStream;
@@ -74,7 +72,7 @@ export function toDecodeStream(readable: Readable, options: IDecodeStreamOptions
7472

7573
_startDecodeStream(callback: Function): void {
7674

77-
this._decodeStreamConstruction = TPromise.as(detectEncodingFromBuffer({
75+
this._decodeStreamConstruction = Promise.resolve(detectEncodingFromBuffer({
7876
buffer: Buffer.concat(this._buffer), bytesRead: this._bytesBuffered
7977
}, options.guessEncoding)).then(detected => {
8078
detected.encoding = options.overwriteEncoding(detected.encoding);
@@ -180,7 +178,7 @@ export function detectEncodingByBOMFromBuffer(buffer: Buffer, bytesRead: number)
180178
* Detects the Byte Order Mark in a given file.
181179
* If no BOM is detected, null will be passed to callback.
182180
*/
183-
export function detectEncodingByBOM(file: string): TPromise<string> {
181+
export function detectEncodingByBOM(file: string): Promise<string> {
184182
return stream.readExactlyByFile(file, 3).then(({ buffer, bytesRead }) => detectEncodingByBOMFromBuffer(buffer, bytesRead));
185183
}
186184

@@ -190,8 +188,8 @@ const IGNORE_ENCODINGS = ['ascii', 'utf-8', 'utf-16', 'utf-32'];
190188
/**
191189
* Guesses the encoding from buffer.
192190
*/
193-
export function guessEncodingByBuffer(buffer: Buffer): TPromise<string> {
194-
return TPromise.wrap(import('jschardet')).then(jschardet => {
191+
export function guessEncodingByBuffer(buffer: Buffer): Promise<string> {
192+
return import('jschardet').then(jschardet => {
195193
jschardet.Constants.MINIMUM_THRESHOLD = MINIMUM_THRESHOLD;
196194

197195
const guessed = jschardet.detect(buffer);
@@ -270,8 +268,8 @@ export interface IDetectedEncodingResult {
270268
}
271269

272270
export function detectEncodingFromBuffer(readResult: stream.ReadResult, autoGuessEncoding?: false): IDetectedEncodingResult;
273-
export function detectEncodingFromBuffer(readResult: stream.ReadResult, autoGuessEncoding?: boolean): TPromise<IDetectedEncodingResult>;
274-
export function detectEncodingFromBuffer({ buffer, bytesRead }: stream.ReadResult, autoGuessEncoding?: boolean): TPromise<IDetectedEncodingResult> | IDetectedEncodingResult {
271+
export function detectEncodingFromBuffer(readResult: stream.ReadResult, autoGuessEncoding?: boolean): Promise<IDetectedEncodingResult>;
272+
export function detectEncodingFromBuffer({ buffer, bytesRead }: stream.ReadResult, autoGuessEncoding?: boolean): Promise<IDetectedEncodingResult> | IDetectedEncodingResult {
275273

276274
// Always first check for BOM to find out about encoding
277275
let encoding = detectEncodingByBOMFromBuffer(buffer, bytesRead);
@@ -356,8 +354,8 @@ const windowsTerminalEncodings = {
356354
'1252': 'cp1252' // West European Latin
357355
};
358356

359-
export function resolveTerminalEncoding(verbose?: boolean): TPromise<string> {
360-
let rawEncodingPromise: TPromise<string>;
357+
export function resolveTerminalEncoding(verbose?: boolean): Promise<string> {
358+
let rawEncodingPromise: Promise<string>;
361359

362360
// Support a global environment variable to win over other mechanics
363361
const cliEncodingEnv = process.env['VSCODE_CLI_ENCODING'];
@@ -366,23 +364,23 @@ export function resolveTerminalEncoding(verbose?: boolean): TPromise<string> {
366364
console.log(`Found VSCODE_CLI_ENCODING variable: ${cliEncodingEnv}`);
367365
}
368366

369-
rawEncodingPromise = TPromise.as(cliEncodingEnv);
367+
rawEncodingPromise = Promise.resolve(cliEncodingEnv);
370368
}
371369

372370
// Linux/Mac: use "locale charmap" command
373371
else if (isLinux || isMacintosh) {
374-
rawEncodingPromise = new TPromise<string>(c => {
372+
rawEncodingPromise = new Promise<string>(resolve => {
375373
if (verbose) {
376374
console.log('Running "locale charmap" to detect terminal encoding...');
377375
}
378376

379-
exec('locale charmap', (err, stdout, stderr) => c(stdout));
377+
exec('locale charmap', (err, stdout, stderr) => resolve(stdout));
380378
});
381379
}
382380

383381
// Windows: educated guess
384382
else {
385-
rawEncodingPromise = new TPromise<string>(c => {
383+
rawEncodingPromise = new Promise<string>(resolve => {
386384
if (verbose) {
387385
console.log('Running "chcp" to detect terminal encoding...');
388386
}
@@ -393,12 +391,12 @@ export function resolveTerminalEncoding(verbose?: boolean): TPromise<string> {
393391
for (let i = 0; i < windowsTerminalEncodingKeys.length; i++) {
394392
const key = windowsTerminalEncodingKeys[i];
395393
if (stdout.indexOf(key) >= 0) {
396-
return c(windowsTerminalEncodings[key]);
394+
return resolve(windowsTerminalEncodings[key]);
397395
}
398396
}
399397
}
400398

401-
return c(void 0);
399+
return resolve(void 0);
402400
});
403401
});
404402
}

‎src/vs/base/node/id.ts‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { TPromise } from 'vs/base/common/winjs.base';
76
import * as errors from 'vs/base/common/errors';
87
import * as uuid from 'vs/base/common/uuid';
98
import { networkInterfaces } from 'os';
@@ -76,15 +75,15 @@ export const virtualMachineHint: { value(): number } = new class {
7675
}
7776
};
7877

79-
let machineId: TPromise<string>;
80-
export function getMachineId(): TPromise<string> {
78+
let machineId: Promise<string>;
79+
export function getMachineId(): Promise<string> {
8180
return machineId || (machineId = getMacMachineId()
8281
.then(id => id || uuid.generateUuid())); // fallback, generate a UUID
8382
}
8483

85-
function getMacMachineId(): TPromise<string> {
86-
return new TPromise<string>(resolve => {
87-
TPromise.join([import('crypto'), import('getmac')]).then(([crypto, getmac]) => {
84+
function getMacMachineId(): Promise<string> {
85+
return new Promise<string>(resolve => {
86+
Promise.all([import('crypto'), import('getmac')]).then(([crypto, getmac]) => {
8887
try {
8988
getmac.getMac((error, macAddress) => {
9089
if (!error) {

‎src/vs/base/node/stream.ts‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55

66
import * as fs from 'fs';
77

8-
import { TPromise } from 'vs/base/common/winjs.base';
9-
108
export interface ReadResult {
119
buffer: Buffer;
1210
bytesRead: number;
@@ -15,24 +13,24 @@ export interface ReadResult {
1513
/**
1614
* Reads totalBytes from the provided file.
1715
*/
18-
export function readExactlyByFile(file: string, totalBytes: number): TPromise<ReadResult> {
19-
return new TPromise<ReadResult>((complete, error) => {
16+
export function readExactlyByFile(file: string, totalBytes: number): Promise<ReadResult> {
17+
return new Promise<ReadResult>((resolve, reject) => {
2018
fs.open(file, 'r', null, (err, fd) => {
2119
if (err) {
22-
return error(err);
20+
return reject(err);
2321
}
2422

2523
function end(err: Error, resultBuffer: Buffer, bytesRead: number): void {
2624
fs.close(fd, closeError => {
2725
if (closeError) {
28-
return error(closeError);
26+
return reject(closeError);
2927
}
3028

3129
if (err && (<any>err).code === 'EISDIR') {
32-
return error(err); // we want to bubble this error up (file is actually a folder)
30+
return reject(err); // we want to bubble this error up (file is actually a folder)
3331
}
3432

35-
return complete({ buffer: resultBuffer, bytesRead });
33+
return resolve({ buffer: resultBuffer, bytesRead });
3634
});
3735
}
3836

@@ -73,24 +71,24 @@ export function readExactlyByFile(file: string, totalBytes: number): TPromise<Re
7371
* @param maximumBytesToRead The maximum number of bytes to read before giving up.
7472
* @param callback The finished callback.
7573
*/
76-
export function readToMatchingString(file: string, matchingString: string, chunkBytes: number, maximumBytesToRead: number): TPromise<string> {
77-
return new TPromise<string>((complete, error) =>
74+
export function readToMatchingString(file: string, matchingString: string, chunkBytes: number, maximumBytesToRead: number): Promise<string> {
75+
return new Promise<string>((resolve, reject) =>
7876
fs.open(file, 'r', null, (err, fd) => {
7977
if (err) {
80-
return error(err);
78+
return reject(err);
8179
}
8280

8381
function end(err: Error, result: string): void {
8482
fs.close(fd, closeError => {
8583
if (closeError) {
86-
return error(closeError);
84+
return reject(closeError);
8785
}
8886

8987
if (err && (<any>err).code === 'EISDIR') {
90-
return error(err); // we want to bubble this error up (file is actually a folder)
88+
return reject(err); // we want to bubble this error up (file is actually a folder)
9189
}
9290

93-
return complete(result);
91+
return resolve(result);
9492
});
9593
}
9694

‎src/vs/code/electron-main/logUploader.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import * as path from 'path';
1010

1111
import { localize } from 'vs/nls';
1212
import { ILaunchChannel } from 'vs/platform/launch/electron-main/launchService';
13-
import { TPromise } from 'vs/base/common/winjs.base';
1413
import product from 'vs/platform/node/product';
1514
import { IRequestService } from 'vs/platform/request/node/request';
1615
import { IRequestContext } from 'vs/base/node/request';
@@ -92,7 +91,7 @@ async function postLogs(
9291
throw e;
9392
}
9493

95-
return new TPromise<PostResult>((res, reject) => {
94+
return new Promise<PostResult>((resolve, reject) => {
9695
const parts: Buffer[] = [];
9796
result.stream.on('data', data => {
9897
parts.push(data);
@@ -103,7 +102,7 @@ async function postLogs(
103102
try {
104103
const response = Buffer.concat(parts).toString('utf-8');
105104
if (result.res.statusCode === 200) {
106-
res(JSON.parse(response));
105+
resolve(JSON.parse(response));
107106
} else {
108107
const errorMessage = localize('responseError', 'Error posting logs. Got {0} — {1}', result.res.statusCode, response);
109108
console.log(errorMessage);
@@ -119,10 +118,10 @@ async function postLogs(
119118

120119
function zipLogs(
121120
logsPath: string
122-
): TPromise<string> {
121+
): Promise<string> {
123122
const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'vscode-log-upload'));
124123
const outZip = path.join(tempDir, 'logs.zip');
125-
return new TPromise<string>((resolve, reject) => {
124+
return new Promise<string>((resolve, reject) => {
126125
doZip(logsPath, outZip, tempDir, (err, stdout, stderr) => {
127126
if (err) {
128127
console.error(localize('zipError', 'Error zipping logs: {0}', err.message));

‎src/vs/code/node/shellEnv.ts‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
import * as cp from 'child_process';
77
import { assign } from 'vs/base/common/objects';
88
import { generateUuid } from 'vs/base/common/uuid';
9-
import { TPromise } from 'vs/base/common/winjs.base';
109
import { isWindows } from 'vs/base/common/platform';
1110

12-
function getUnixShellEnvironment(): TPromise<typeof process.env> {
13-
const promise = new TPromise((c, e) => {
11+
function getUnixShellEnvironment(): Promise<typeof process.env> {
12+
const promise = new Promise((resolve, reject) => {
1413
const runAsNode = process.env['ELECTRON_RUN_AS_NODE'];
1514
const noAttach = process.env['ELECTRON_NO_ATTACH_CONSOLE'];
1615
const mark = generateUuid().replace(/-/g, '').substr(0, 12);
@@ -29,12 +28,12 @@ function getUnixShellEnvironment(): TPromise<typeof process.env> {
2928
});
3029

3130
const buffers: Buffer[] = [];
32-
child.on('error', () => c({}));
31+
child.on('error', () => resolve({}));
3332
child.stdout.on('data', b => buffers.push(b as Buffer));
3433

3534
child.on('close', (code: number, signal: any) => {
3635
if (code !== 0) {
37-
return e(new Error('Failed to get environment'));
36+
return reject(new Error('Failed to get environment'));
3837
}
3938

4039
const raw = Buffer.concat(buffers).toString('utf8');
@@ -59,9 +58,9 @@ function getUnixShellEnvironment(): TPromise<typeof process.env> {
5958
// https://github.com/Microsoft/vscode/issues/22593#issuecomment-336050758
6059
delete env['XDG_RUNTIME_DIR'];
6160

62-
c(env);
61+
resolve(env);
6362
} catch (err) {
64-
e(err);
63+
reject(err);
6564
}
6665
});
6766
});
@@ -71,19 +70,19 @@ function getUnixShellEnvironment(): TPromise<typeof process.env> {
7170
}
7271

7372

74-
let _shellEnv: TPromise<typeof process.env>;
73+
let _shellEnv: Promise<typeof process.env>;
7574

7675
/**
7776
* We need to get the environment from a user's shell.
7877
* This should only be done when Code itself is not launched
7978
* from within a shell.
8079
*/
81-
export function getShellEnvironment(): TPromise<typeof process.env> {
80+
export function getShellEnvironment(): Promise<typeof process.env> {
8281
if (_shellEnv === undefined) {
8382
if (isWindows) {
84-
_shellEnv = TPromise.as({});
83+
_shellEnv = Promise.resolve({});
8584
} else if (process.env['VSCODE_CLI'] === '1') {
86-
_shellEnv = TPromise.as({});
85+
_shellEnv = Promise.resolve({});
8786
} else {
8887
_shellEnv = getUnixShellEnvironment();
8988
}

‎src/vs/platform/actions/common/actions.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { Action } from 'vs/base/common/actions';
7-
import { TPromise } from 'vs/base/common/winjs.base';
87
import { SyncDescriptor0, createSyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
98
import { IConstructorSignature2, createDecorator } from 'vs/platform/instantiation/common/instantiation';
109
import { IKeybindings } from 'vs/platform/keybinding/common/keybindingsRegistry';
@@ -215,7 +214,7 @@ export class ExecuteCommandAction extends Action {
215214
super(id, label);
216215
}
217216

218-
run(...args: any[]): TPromise<any> {
217+
run(...args: any[]): Promise<any> {
219218
return this._commandService.executeCommand(this.id, ...args);
220219
}
221220
}
@@ -253,7 +252,7 @@ export class MenuItemAction extends ExecuteCommandAction {
253252
this.alt = alt ? new MenuItemAction(alt, undefined, this._options, contextKeyService, commandService) : undefined;
254253
}
255254

256-
run(...args: any[]): TPromise<any> {
255+
run(...args: any[]): Promise<any> {
257256
let runArgs: any[] = [];
258257

259258
if (this._options.arg) {

0 commit comments

Comments
 (0)