Skip to content

Commit a34cc54

Browse files
author
Benjamin Pasero
committed
fix compile
1 parent d5865f0 commit a34cc54

1 file changed

Lines changed: 12 additions & 11 deletions

File tree

src/vs/monaco.d.ts

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2975,7 +2975,7 @@ declare module monaco.editor {
29752975
* Accept suggestions on ENTER.
29762976
* Defaults to 'on'.
29772977
*/
2978-
acceptSuggestionOnEnter?: 'on' | 'smart' | 'off';
2978+
acceptSuggestionOnEnter?: boolean | 'on' | 'smart' | 'off';
29792979
/**
29802980
* Accept suggestions on provider defined characters.
29812981
* Defaults to true.
@@ -4459,7 +4459,7 @@ declare module monaco.languages {
44594459
* The human-readable doc-comment of this signature. Will be shown
44604460
* in the UI but can be omitted.
44614461
*/
4462-
documentation?: string;
4462+
documentation?: string | IMarkdownString;
44634463
}
44644464

44654465
/**
@@ -4477,7 +4477,7 @@ declare module monaco.languages {
44774477
* The human-readable doc-comment of this signature. Will be shown
44784478
* in the UI but can be omitted.
44794479
*/
4480-
documentation?: string;
4480+
documentation?: string | IMarkdownString;
44814481
/**
44824482
* The parameters of this signature.
44834483
*/
@@ -4807,11 +4807,12 @@ declare module monaco.languages {
48074807
}
48084808

48094809
/**
4810-
* A color formatter.
4810+
* Represents a color format
48114811
*/
4812-
export interface IColorFormatter {
4813-
readonly supportsTransparency: boolean;
4814-
format(color: IColor): string;
4812+
export enum ColorFormat {
4813+
RGB = 0,
4814+
HEX = 1,
4815+
HSL = 2,
48154816
}
48164817

48174818
/**
@@ -4826,10 +4827,6 @@ declare module monaco.languages {
48264827
* The color represented in this range.
48274828
*/
48284829
color: IColor;
4829-
/**
4830-
* The available formats for this specific color.
4831-
*/
4832-
formatters: IColorFormatter[];
48334830
}
48344831

48354832
/**
@@ -4840,6 +4837,10 @@ declare module monaco.languages {
48404837
* Provides the color ranges for a specific model.
48414838
*/
48424839
provideColorRanges(model: editor.IReadOnlyModel, token: CancellationToken): IColorRange[] | Thenable<IColorRange[]>;
4840+
/**
4841+
* Provide the string representation for a color.
4842+
*/
4843+
resolveColor(color: IColor, colorFormat: ColorFormat, token: CancellationToken): string | Thenable<string>;
48434844
}
48444845

48454846
export interface IResourceEdit {

0 commit comments

Comments
 (0)