Merge from vscode 0f73473c08055054f317c1c94502f7f39fdbb164 (#6892)

* Merge from vscode 0f73473c08055054f317c1c94502f7f39fdbb164

* fix tslinting

src/vs/editor/common/modes.ts

@@ -404,7 +404,7 @@ export interface CompletionItem {
 	 * A modifier to the `kind` which affect how the item
 	 * is rendered, e.g. Deprecated is rendered with a strikeout
 	 */
-	kindModifier?: CompletionItemKindModifier;
+	kindModifier?: Set<CompletionItemKindModifier>;
 	/**
 	 * A human-readable string with additional information
 	 * about this item, like type or symbol information.
@@ -867,6 +867,9 @@ export const enum SymbolKind {
 	TypeParameter = 25
 }
 
+export const enum SymbolKindTag {
+	Deprecated = 1,
+}
 
 /**
  * @internal
@@ -910,6 +913,7 @@ export interface DocumentSymbol {
 	name: string;
 	detail: string;
 	kind: SymbolKind;
+	kindTags: SymbolKindTag[];
 	containerName?: string;
 	range: IRange;
 	selectionRange: IRange;

src/vs/editor/common/standalone/standaloneEnums.ts

@@ -660,4 +660,8 @@ export enum SymbolKind {
 	Event = 23,
 	Operator = 24,
 	TypeParameter = 25
+}
+
+export enum SymbolKindTag {
+	Deprecated = 1
 }