Merge from vscode e3b9b8eefc062d68ba8a4b6a817162d132f3b533 (#6932)

* Merge from vscode e3b9b8eefc062d68ba8a4b6a817162d132f3b533

* skip failing test

* add comment
This commit is contained in:
Anthony Dresser
2019-08-24 00:19:48 -07:00
committed by GitHub
parent 023d06d114
commit 92a3acbfe8
77 changed files with 992 additions and 559 deletions

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

@@ -4790,7 +4790,7 @@ declare namespace monaco.languages {
Snippet = 25
}
export enum CompletionItemKindModifier {
export enum CompletionItemTag {
Deprecated = 1
}
@@ -4826,7 +4826,7 @@ declare namespace monaco.languages {
* A modifier to the `kind` which affect how the item
* is rendered, e.g. Deprecated is rendered with a strikeout
*/
kindModifier?: Set<CompletionItemKindModifier>;
tags?: ReadonlyArray<CompletionItemTag>;
/**
* A human-readable string with additional information
* about this item, like type or symbol information.
@@ -5236,7 +5236,7 @@ declare namespace monaco.languages {
TypeParameter = 25
}
export enum SymbolKindTag {
export enum SymbolTag {
Deprecated = 1
}
@@ -5244,7 +5244,7 @@ declare namespace monaco.languages {
name: string;
detail: string;
kind: SymbolKind;
kindTags: SymbolKindTag[];
tags: ReadonlyArray<SymbolTag>;
containerName?: string;
range: IRange;
selectionRange: IRange;