adding event and operator completion item kinds, #2628

microsoft · Apr 18, 2017 · 24ef0ba · 24ef0ba
1 parent 747488c
commit 24ef0ba
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 5 deletions.
diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts
@@ -196,6 +196,8 @@ export type SuggestionType = 'method'
 	| 'interface'
 	| 'module'
 	| 'property'
+	| 'event'
+	| 'operator'
 	| 'unit'
 	| 'value'
 	| 'constant'

diff --git a/src/vs/editor/contrib/suggest/browser/media/Event_16x_vscode.svg b/src/vs/editor/contrib/suggest/browser/media/Event_16x_vscode.svg
diff --git a/src/vs/editor/contrib/suggest/browser/media/Event_16x_vscode_inverse.svg b/src/vs/editor/contrib/suggest/browser/media/Event_16x_vscode_inverse.svg
diff --git a/src/vs/editor/contrib/suggest/browser/media/Operator_16x_vscode.svg b/src/vs/editor/contrib/suggest/browser/media/Operator_16x_vscode.svg
diff --git a/src/vs/editor/contrib/suggest/browser/media/Operator_16x_vscode_inverse.svg b/src/vs/editor/contrib/suggest/browser/media/Operator_16x_vscode_inverse.svg
diff --git a/src/vs/editor/contrib/suggest/browser/media/suggest.css b/src/vs/editor/contrib/suggest/browser/media/suggest.css
@@ -128,6 +128,8 @@
 .monaco-editor .suggest-widget .monaco-list .monaco-list-row .icon.function,
 .monaco-editor .suggest-widget .monaco-list .monaco-list-row .icon.constructor { background-image: url('Method_16x.svg'); }
 .monaco-editor .suggest-widget .monaco-list .monaco-list-row .icon.field { background-image: url('Field_16x.svg'); }
+.monaco-editor .suggest-widget .monaco-list .monaco-list-row .icon.event { background-image: url('Event_16x_vscode.svg'); }
+.monaco-editor .suggest-widget .monaco-list .monaco-list-row .icon.operator { background-image: url('Operator_16x_vscode.svg'); }
 .monaco-editor .suggest-widget .monaco-list .monaco-list-row .icon.variable { background-image: url('LocalVariable_16x_vscode.svg'); }
 .monaco-editor .suggest-widget .monaco-list .monaco-list-row .icon.class { background-image: url('Class_16x.svg'); }
 .monaco-editor .suggest-widget .monaco-list .monaco-list-row .icon.interface { background-image: url('Interface_16x.svg'); }
@@ -252,6 +254,12 @@
 .monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .icon.field,
 .monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .icon.field { background-image: url('Field_inverse_16x.svg'); }
 
+.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .icon.event,
+.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .icon.event { background-image: url('Event_16x_vscode_inverse.svg'); }
+
+.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .icon.operator,
+.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .icon.operator { background-image: url('Operator_16x_vscode_inverse.svg'); }
+
 .monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .icon.variable,
 .monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .icon.variable { background-image: url('LocalVariable_16x_vscode_inverse.svg'); }
 

diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
@@ -2425,20 +2425,22 @@ declare module 'vscode' {
 		Variable = 5,
 		Class = 6,
 		Interface = 7,
-		Struct = 21,
 		Module = 8,
 		Property = 9,
 		Unit = 10,
 		Value = 11,
-		Constant = 20,
 		Enum = 12,
-		EnumMember = 19,
 		Keyword = 13,
 		Snippet = 14,
 		Color = 15,
 		Reference = 17,
 		File = 16,
-		Folder = 18
+		Folder = 18,
+		EnumMember = 19,
+		Constant = 20,
+		Struct = 21,
+		Event = 22,
+		Operator = 23
 	}
 
 	/**

diff --git a/src/vs/workbench/api/node/extHostTypeConverters.ts b/src/vs/workbench/api/node/extHostTypeConverters.ts
@@ -287,6 +287,8 @@ export const CompletionItemKind = {
 			case types.CompletionItemKind.File: return 'file';
 			case types.CompletionItemKind.Reference: return 'reference';
 			case types.CompletionItemKind.Folder: return 'folder';
+			case types.CompletionItemKind.Event: return 'event';
+			case types.CompletionItemKind.Operator: return 'operator';
 		}
 		return 'property';
 	},

diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts
@@ -872,7 +872,9 @@ export enum CompletionItemKind {
 	Folder = 18,
 	EnumMember = 19,
 	Constant = 20,
-	Struct = 21
+	Struct = 21,
+	Event = 22,
+	Operator = 23
 }
 
 export class CompletionItem {