Merge from vscode cfc1ab4c5f816765b91fb7ead3c3427a7c8581a3

This commit is contained in:
ADS Merger
2020-03-11 04:19:23 +00:00
parent 16fab722d5
commit 4c3e48773d
880 changed files with 20441 additions and 11232 deletions

18
src/vs/monaco.d.ts vendored
View File

@@ -174,6 +174,14 @@ declare namespace monaco {
query?: string;
fragment?: string;
}): Uri;
/**
* Join a Uri path with path fragments and normalizes the resulting path.
*
* @param resource The input Uri.
* @param pathFragment The path fragment to add to the Uri path.
* @returns The resulting Uri.
*/
static joinPaths(resource: Uri, ...pathFragment: string[]): Uri;
/**
* Creates a string representation for this Uri. It's guaranteed that calling
* `Uri.parse` with the result of this function creates an Uri which is equal
@@ -381,7 +389,6 @@ declare namespace monaco {
*/
MAX_VALUE = 112
}
export class KeyMod {
static readonly CtrlCmd: number;
static readonly Shift: number;
@@ -1370,6 +1377,10 @@ declare namespace monaco.editor {
* If set, the decoration will be rendered in the lines decorations with this CSS class name.
*/
linesDecorationsClassName?: string | null;
/**
* If set, the decoration will be rendered in the lines decorations with this CSS class name, but only for the first line in case of line wrapping.
*/
firstLineDecorationClassName?: string | null;
/**
* If set, the decoration will be rendered in the margin (covering its full width) with this CSS class name.
*/
@@ -6040,11 +6051,11 @@ declare namespace monaco.languages {
}
/**
* A provider of colors for editor models.
* A provider of folding ranges for editor models.
*/
export interface FoldingRangeProvider {
/**
* Provides the color ranges for a specific model.
* Provides the folding ranges for a specific model.
*/
provideFoldingRanges(model: editor.ITextModel, context: FoldingContext, token: CancellationToken): ProviderResult<FoldingRange[]>;
}
@@ -6187,6 +6198,7 @@ declare namespace monaco.languages {
}
export interface DocumentSemanticTokensProvider {
onDidChange?: IEvent<void>;
getLegend(): SemanticTokensLegend;
provideDocumentSemanticTokens(model: editor.ITextModel, lastResultId: string | null, token: CancellationToken): ProviderResult<SemanticTokens | SemanticTokensEdits>;
releaseDocumentSemanticTokens(resultId: string | undefined): void;