Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 02:58:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Color Decorator sits together with Color Picker.

Browse Source
This commit is contained in:
rebornix
2017-08-22 20:49:52 -07:00
committed by Peng Lyu
parent f4ccc31770
commit 9937bcf6ec
11 changed files with 220 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/api/node/extHost.protocol.ts
View File

@@ -226,7 +226,8 @@ export interface MainThreadLanguageFeaturesShape extends IDisposable {
$registerSignatureHelpProvider(handle: number, selector: vscode.DocumentSelector, triggerCharacter: string[]): TPromise<any>;
$registerDocumentLinkProvider(handle: number, selector: vscode.DocumentSelector): TPromise<any>;
$registerColorFormats(formats: IRawColorFormatMap): TPromise<any>;
$registerDocumentColorProvider(handle: number, selector: vscode.DocumentSelector): TPromise<any>;
$registerDocumentColorProvider(handle: number, selector: vscode.DocumentSelector, eventHandle: number): TPromise<any>;
$emitColorsEvent(eventHandle: number, event?: any): TPromise<any>;
$setLanguageConfiguration(handle: number, languageId: string, configuration: vscode.LanguageConfiguration): TPromise<any>;
}
@@ -474,7 +475,6 @@ export interface IRawColorInfo {
color: [number, number, number, number];
availableFormats: (number | [number, number])[];
range: IRange;
renderDecorator: boolean;
}
export type IRawColorFormatMap = [number, string][];

14
src/vs/workbench/api/node/extHostLanguageFeatures.ts
View File

@@ -734,8 +734,7 @@ class ColorProviderAdapter {
return {
color: [ci.color.red, ci.color.green, ci.color.blue, ci.color.alpha] as [number, number, number, number],
availableFormats: availableFormats,
range: TypeConverters.fromRange(ci.range),
renderDecorator: ci.renderDecorator
range: TypeConverters.fromRange(ci.range)
};
});
@@ -1040,9 +1039,16 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
registerColorProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentColorProvider): vscode.Disposable {
const handle = this._nextHandle();
const eventHandle = typeof provider.onDidChangeColors === 'function' ? this._nextHandle() : undefined;
this._adapter.set(handle, new ColorProviderAdapter(this._proxy, this._documents, this._colorFormatCache, provider));
this._proxy.$registerDocumentColorProvider(handle, selector);
return this._createDisposable(handle);
this._proxy.$registerDocumentColorProvider(handle, selector, eventHandle);
let result = this._createDisposable(handle);
if (eventHandle !== undefined) {
const subscription = provider.onDidChangeColors(_ => this._proxy.$emitColorsEvent(eventHandle));
result = Disposable.from(result, subscription);
}
return result;
}
$provideDocumentColors(handle: number, resource: URI): TPromise<IRawColorInfo[]> {

5
src/vs/workbench/api/node/extHostTypes.ts
View File

@@ -1056,9 +1056,7 @@ export class ColorRange {
availableFormats: IColorFormat[];
renderDecorator: boolean;
constructor(range: Range, color: Color, availableFormats: IColorFormat[], renderDecorator: boolean) {
constructor(range: Range, color: Color, availableFormats: IColorFormat[]) {
if (color && !(color instanceof Color)) {
throw illegalArgument('color');
}
@@ -1071,7 +1069,6 @@ export class ColorRange {
this.range = range;
this.color = color;
this.availableFormats = availableFormats;
this.renderDecorator = renderDecorator;
}
}