diff --git a/src/vs/base/node/request.ts b/src/vs/base/node/request.ts index a33361279c4..e037a11e883 100644 --- a/src/vs/base/node/request.ts +++ b/src/vs/base/node/request.ts @@ -108,7 +108,7 @@ export function download(filePath: string, context: IRequestContext): TPromise { +export function asText(context: IRequestContext): TPromise { return new Promise((c, e) => { if (!isSuccess(context)) { return e('Server returned ' + context.res.statusCode); @@ -125,7 +125,7 @@ export function text(context: IRequestContext): TPromise { }); } -export function json(context: IRequestContext): TPromise { +export function asJson(context: IRequestContext): TPromise { return new Promise((c, e) => { if (!isSuccess(context)) { return e('Server returned ' + context.res.statusCode); diff --git a/src/vs/code/electron-main/auto-updater.linux.ts b/src/vs/code/electron-main/auto-updater.linux.ts index ee97eb08316..4eba9fe8d74 100644 --- a/src/vs/code/electron-main/auto-updater.linux.ts +++ b/src/vs/code/electron-main/auto-updater.linux.ts @@ -8,7 +8,7 @@ import { EventEmitter } from 'events'; import { isString } from 'vs/base/common/types'; import { Promise } from 'vs/base/common/winjs.base'; -import { request, json } from 'vs/base/node/request'; +import { request, asJson } from 'vs/base/node/request'; import { getProxyAgent } from 'vs/base/node/proxy'; import { ISettingsService } from 'vs/code/electron-main/settings'; import { IEnvironmentService } from 'vs/code/electron-main/env'; @@ -55,7 +55,7 @@ export class LinuxAutoUpdaterImpl extends EventEmitter { const agent = getProxyAgent(this.url, { proxyUrl, strictSSL }); this.currentRequest = request({ url: this.url, agent }) - .then(context => json(context)) + .then(context => asJson(context)) .then(update => { if (!update || !update.url || !update.version) { this.emit('update-not-available'); diff --git a/src/vs/code/electron-main/auto-updater.win32.ts b/src/vs/code/electron-main/auto-updater.win32.ts index 5b1bff1d385..2c9f5cee1c4 100644 --- a/src/vs/code/electron-main/auto-updater.win32.ts +++ b/src/vs/code/electron-main/auto-updater.win32.ts @@ -14,7 +14,7 @@ import { spawn } from 'child_process'; import { mkdirp } from 'vs/base/node/extfs'; import { isString } from 'vs/base/common/types'; import { Promise, TPromise } from 'vs/base/common/winjs.base'; -import { request, download, json } from 'vs/base/node/request'; +import { request, download, asJson } from 'vs/base/node/request'; import { getProxyAgent } from 'vs/base/node/proxy'; import { ISettingsService } from 'vs/code/electron-main/settings'; import { ILifecycleService } from 'vs/code/electron-main/lifecycle'; @@ -69,7 +69,7 @@ export class Win32AutoUpdaterImpl extends EventEmitter { const agent = getProxyAgent(this.url, { proxyUrl, strictSSL }); this.currentRequest = request({ url: this.url, agent }) - .then(context => json(context)) + .then(context => asJson(context)) .then(update => { if (!update || !update.url || !update.version) { this.emit('update-not-available'); diff --git a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts index 2b13b8e815b..f53eeaca413 100644 --- a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts +++ b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts @@ -13,7 +13,7 @@ import { assign, getOrDefault } from 'vs/base/common/objects'; import { IRequestService } from 'vs/platform/request/common/request'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IPager } from 'vs/base/common/paging'; -import { download, json } from 'vs/base/node/request'; +import { download, asJson } from 'vs/base/node/request'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import pkg from 'vs/platform/package'; import product from 'vs/platform/product'; @@ -309,7 +309,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService { headers }); }) - .then(context => json(context)) + .then(context => asJson(context)) .then(result => { const r = result.results[0]; const galleryExtensions = r.extensions; @@ -358,7 +358,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService { return this.getCommonHeaders() .then(headers => assign(headers, { 'accept-encoding': 'gzip' })) .then(headers => this.requestService.request({ url, headers })) - .then(context => json(context)) + .then(context => asJson(context)) .then(manifest => { const desc = { isBuiltin: false, diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts index b1829c95728..c05768571a4 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts @@ -18,7 +18,7 @@ import { IViewlet } from 'vs/workbench/common/viewlet'; import { IViewletService } from 'vs/workbench/services/viewlet/common/viewletService'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { text } from 'vs/base/node/request'; +import { asText } from 'vs/base/node/request'; import { IRequestService } from 'vs/platform/request/common/request'; import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement'; import { IThemeService } from 'vs/workbench/services/themes/common/themeService'; @@ -177,7 +177,7 @@ export class ExtensionEditor extends BaseEditor { promise = promise .then(() => addClass(this.body, 'loading')) .then(() => this.requestService.request({ url: extension.readmeUrl })) - .then(text) + .then(asText) .then(marked.parse) .then(body => { const webview = new WebView(