diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts
index c06f00974e3..5df073ba886 100644
--- a/src/vs/editor/common/modes.ts
+++ b/src/vs/editor/common/modes.ts
@@ -189,6 +189,7 @@ export type SuggestionType = 'method'
 	| 'unit'
 	| 'value'
 	| 'enum'
+	| 'enum-member'
 	| 'keyword'
 	| 'snippet'
 	| 'text'
diff --git a/src/vs/editor/contrib/suggest/browser/media/suggest.css b/src/vs/editor/contrib/suggest/browser/media/suggest.css
index 61e55caf358..da529cfa4c8 100644
--- a/src/vs/editor/contrib/suggest/browser/media/suggest.css
+++ b/src/vs/editor/contrib/suggest/browser/media/suggest.css
@@ -145,7 +145,7 @@
 .monaco-editor .suggest-widget .monaco-list .monaco-list-row .icon.unit { background-image: url('Ruler_16x.svg'); }
 .monaco-editor .suggest-widget .monaco-list .monaco-list-row .icon.value,
 .monaco-editor .suggest-widget .monaco-list .monaco-list-row .icon.enum { background-image: url('Enumerator_16x.svg'); }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .icon.enum-item { background-image: url('EnumItem_16x.svg'); }
+.monaco-editor .suggest-widget .monaco-list .monaco-list-row .icon.enum-member { background-image: url('EnumItem_16x.svg'); }
 .monaco-editor .suggest-widget .monaco-list .monaco-list-row .icon.keyword { background-image: url('IntelliSenseKeyword_16x.svg'); }
 .monaco-editor .suggest-widget .monaco-list .monaco-list-row .icon.text { background-image: url('String_16x.svg'); }
 .monaco-editor .suggest-widget .monaco-list .monaco-list-row .icon.color { background-image: url('ColorPalette_16x.svg'); }
@@ -296,7 +296,7 @@
 .monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .icon.value,
 .monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .icon.enum,
 .monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .icon.enum { background-image: url('Enumerator_inverse_16x.svg'); }
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .icon.enum-item { background-image: url('EnumItem_inverse_16x.svg'); }
+.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .icon.enum-member { background-image: url('EnumItem_inverse_16x.svg'); }
 
 .monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .icon.keyword,
 .monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .icon.keyword { background-image: url('IntelliSenseKeyword_inverse_16x.svg'); }
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index 0dc764fd500..dd807453508 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -2395,11 +2395,12 @@ declare module 'vscode' {
 		Unit = 10,
 		Value = 11,
 		Enum = 12,
+		EnumMember = 19,
 		Keyword = 13,
 		Snippet = 14,
 		Color = 15,
-		File = 16,
 		Reference = 17,
+		File = 16,
 		Folder = 18
 	}
 
diff --git a/src/vs/workbench/api/node/extHostTypeConverters.ts b/src/vs/workbench/api/node/extHostTypeConverters.ts
index 22bfbfbd348..a3e32a301ff 100644
--- a/src/vs/workbench/api/node/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/node/extHostTypeConverters.ts
@@ -30,14 +30,14 @@ export interface SelectionLike extends RangeLike {
 }
 
 export function toSelection(selection: ISelection): types.Selection {
-	let {selectionStartLineNumber, selectionStartColumn, positionLineNumber, positionColumn} = selection;
+	let { selectionStartLineNumber, selectionStartColumn, positionLineNumber, positionColumn } = selection;
 	let start = new types.Position(selectionStartLineNumber - 1, selectionStartColumn - 1);
 	let end = new types.Position(positionLineNumber - 1, positionColumn - 1);
 	return new types.Selection(start, end);
 }
 
 export function fromSelection(selection: SelectionLike): ISelection {
-	let {anchor, active} = selection;
+	let { anchor, active } = selection;
 	return {
 		selectionStartLineNumber: anchor.line + 1,
 		selectionStartColumn: anchor.character + 1,
@@ -47,7 +47,7 @@ export function fromSelection(selection: SelectionLike): ISelection {
 }
 
 export function fromRange(range: RangeLike): IRange {
-	let {start, end} = range;
+	let { start, end } = range;
 	return {
 		startLineNumber: start.line + 1,
 		startColumn: start.character + 1,
@@ -57,7 +57,7 @@ export function fromRange(range: RangeLike): IRange {
 }
 
 export function toRange(range: IRange): types.Range {
-	let {startLineNumber, startColumn, endLineNumber, endColumn} = range;
+	let { startLineNumber, startColumn, endLineNumber, endColumn } = range;
 	return new types.Range(startLineNumber - 1, startColumn - 1, endLineNumber - 1, endColumn - 1);
 }
 
@@ -252,6 +252,7 @@ export const CompletionItemKind = {
 			case types.CompletionItemKind.Unit: return 'unit';
 			case types.CompletionItemKind.Value: return 'value';
 			case types.CompletionItemKind.Enum: return 'enum';
+			case types.CompletionItemKind.EnumMember: return 'enum-member';
 			case types.CompletionItemKind.Keyword: return 'keyword';
 			case types.CompletionItemKind.Snippet: return 'snippet';
 			case types.CompletionItemKind.Text: return 'text';
diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts
index 7f28a316015..b9bbdf3d03a 100644
--- a/src/vs/workbench/api/node/extHostTypes.ts
+++ b/src/vs/workbench/api/node/extHostTypes.ts
@@ -66,7 +66,7 @@ export class Position {
 		if (other instanceof Position) {
 			return true;
 		}
-		let {line, character} = <Position>other;
+		let { line, character } = <Position>other;
 		if (typeof line === 'number' && typeof character === 'number') {
 			return true;
 		}
@@ -836,6 +836,7 @@ export enum CompletionItemKind {
 	Unit = 10,
 	Value = 11,
 	Enum = 12,
+	EnumMember = 19,
 	Keyword = 13,
 	Snippet = 14,
 	Color = 15,