From 3753e0e1d2429703baebbccd51fb19cf9ba6cef3 Mon Sep 17 00:00:00 2001 From: rebornix Date: Fri, 8 Sep 2017 14:11:44 -0700 Subject: [PATCH] Align signatures with other providers. --- extensions/css/client/src/cssMain.ts | 4 ++-- extensions/html/client/src/htmlMain.ts | 4 ++-- extensions/json/client/src/jsonMain.ts | 2 +- src/vs/editor/contrib/colorPicker/common/colorFormatter.ts | 2 +- src/vs/vscode.proposed.d.ts | 2 +- .../api/electron-browser/mainThreadLanguageFeatures.ts | 2 +- src/vs/workbench/api/node/extHost.protocol.ts | 2 +- src/vs/workbench/api/node/extHostLanguageFeatures.ts | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/extensions/css/client/src/cssMain.ts b/extensions/css/client/src/cssMain.ts index 95f0da71a2d..cb9310fe1ca 100644 --- a/extensions/css/client/src/cssMain.ts +++ b/extensions/css/client/src/cssMain.ts @@ -70,13 +70,13 @@ export function activate(context: ExtensionContext) { }); }); }, - resolveColor(color: Color, colorFormat: ColorFormat): Thenable | string { + resolveDocumentColor(color: Color, colorFormat: ColorFormat): Thenable | string { switch (colorFormat) { case ColorFormat.RGB: if (color.alpha === 1) { return `rgb(${Math.round(color.red * 255)}, ${Math.round(color.green * 255)}, ${Math.round(color.blue * 255)})`; } else { - return `rgb(${Math.round(color.red * 255)}, ${Math.round(color.green * 255)}, ${Math.round(color.blue * 255)}, ${color.alpha})`; + return `rgba(${Math.round(color.red * 255)}, ${Math.round(color.green * 255)}, ${Math.round(color.blue * 255)}, ${color.alpha})`; } case ColorFormat.HEX: if (color.alpha === 1) { diff --git a/extensions/html/client/src/htmlMain.ts b/extensions/html/client/src/htmlMain.ts index defc1982ce0..659d60794ea 100644 --- a/extensions/html/client/src/htmlMain.ts +++ b/extensions/html/client/src/htmlMain.ts @@ -87,13 +87,13 @@ export function activate(context: ExtensionContext) { }); }); }, - resolveColor(color: Color, colorFormat: ColorFormat): Thenable | string { + resolveDocumentColor(color: Color, colorFormat: ColorFormat): Thenable | string { switch (colorFormat) { case ColorFormat.RGB: if (color.alpha === 1) { return `rgb(${Math.round(color.red * 255)}, ${Math.round(color.green * 255)}, ${Math.round(color.blue * 255)})`; } else { - return `rgb(${Math.round(color.red * 255)}, ${Math.round(color.green * 255)}, ${Math.round(color.blue * 255)}, ${color.alpha})`; + return `rgba(${Math.round(color.red * 255)}, ${Math.round(color.green * 255)}, ${Math.round(color.blue * 255)}, ${color.alpha})`; } case ColorFormat.HEX: if (color.alpha === 1) { diff --git a/extensions/json/client/src/jsonMain.ts b/extensions/json/client/src/jsonMain.ts index ed6ffe7e55c..026beb78a74 100644 --- a/extensions/json/client/src/jsonMain.ts +++ b/extensions/json/client/src/jsonMain.ts @@ -132,7 +132,7 @@ export function activate(context: ExtensionContext) { }); }); }, - resolveColor(color: Color, colorFormat: ColorFormat): Thenable | string { + resolveDocumentColor(color: Color, colorFormat: ColorFormat): Thenable | string { if (color.alpha === 1) { return `#${_toTwoDigitHex(Math.round(color.red * 255))}${_toTwoDigitHex(Math.round(color.green * 255))}${_toTwoDigitHex(Math.round(color.blue * 255))}`; } else { diff --git a/src/vs/editor/contrib/colorPicker/common/colorFormatter.ts b/src/vs/editor/contrib/colorPicker/common/colorFormatter.ts index 4dfd4f78e0f..4bf43664aee 100644 --- a/src/vs/editor/contrib/colorPicker/common/colorFormatter.ts +++ b/src/vs/editor/contrib/colorPicker/common/colorFormatter.ts @@ -19,7 +19,7 @@ export class RGBFormatter implements IColorFormatter { if (rgb.a === 1) { return `rgb(${rgb.r}, ${rgb.g}, ${rgb.b})`; } else { - return `rgb(${rgb.r}, ${rgb.g}, ${rgb.b}, ${rgb.a})`; + return `rgba(${rgb.r}, ${rgb.g}, ${rgb.b}, ${rgb.a})`; } } } diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index 32a7f37b426..575bde2236b 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -155,7 +155,7 @@ declare module 'vscode' { /** * Provide the string representation for a color. */ - resolveColor(color: Color, colorFormat: ColorFormat): ProviderResult; + resolveDocumentColor(color: Color, colorFormat: ColorFormat): ProviderResult; } export namespace languages { diff --git a/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts index 44979079968..70153754932 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts @@ -306,7 +306,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha }); }, resolveColor: (color, format, token) => { - return wireCancellationToken(token, proxy.$resolveColor(handle, color, format)); + return wireCancellationToken(token, proxy.$resolveDocumentColor(handle, color, format)); } }); diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index d2963b04958..0f5f2955d88 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -538,7 +538,7 @@ export interface ExtHostLanguageFeaturesShape { $provideDocumentLinks(handle: number, resource: URI): TPromise; $resolveDocumentLink(handle: number, link: modes.ILink): TPromise; $provideDocumentColors(handle: number, resource: URI): TPromise; - $resolveColor(handle: number, color: modes.IColor, colorFormat: modes.ColorFormat): TPromise; + $resolveDocumentColor(handle: number, color: modes.IColor, colorFormat: modes.ColorFormat): TPromise; } export interface ExtHostQuickOpenShape { diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts index fd77b9e39b2..2ea04f708b3 100644 --- a/src/vs/workbench/api/node/extHostLanguageFeatures.ts +++ b/src/vs/workbench/api/node/extHostLanguageFeatures.ts @@ -730,7 +730,7 @@ class ColorProviderAdapter { } resolveColor(color: modes.IColor, colorFormat: modes.ColorFormat): TPromise { - return asWinJsPromise(token => this._provider.resolveColor(color, colorFormat)); + return asWinJsPromise(token => this._provider.resolveDocumentColor(color, colorFormat)); } } @@ -1042,7 +1042,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape { return this._withAdapter(handle, ColorProviderAdapter, adapter => adapter.provideColors(resource)); } - $resolveColor(handle: number, color: modes.IColor, colorFormat: modes.ColorFormat): TPromise { + $resolveDocumentColor(handle: number, color: modes.IColor, colorFormat: modes.ColorFormat): TPromise { return this._withAdapter(handle, ColorProviderAdapter, adapter => adapter.resolveColor(color, colorFormat)); } -- GitLab