From 5d6b0a5b7208c3c2bf7bb7b248ba81a01766dea4 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 18 Apr 2017 15:44:29 +0200 Subject: [PATCH] adding event and operator symbol kinds, #2628 --- src/vs/editor/common/modes.ts | 6 +++++- src/vs/monaco.d.ts | 2 ++ src/vs/vscode.d.ts | 8 +++++--- .../api/node/extHostTypeConverters.ts | 2 ++ src/vs/workbench/api/node/extHostTypes.ts | 4 +++- .../browser/media/Event_16x_vscode.svg | 1 + .../media/Event_16x_vscode_inverse.svg | 1 + .../browser/media/Operator_16x_vscode.svg | 1 + .../media/Operator_16x_vscode_inverse.svg | 1 + .../browser/media/gotoSymbolHandler.css | 20 +++++++++++++++++++ 10 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 src/vs/workbench/parts/quickopen/browser/media/Event_16x_vscode.svg create mode 100644 src/vs/workbench/parts/quickopen/browser/media/Event_16x_vscode_inverse.svg create mode 100644 src/vs/workbench/parts/quickopen/browser/media/Operator_16x_vscode.svg create mode 100644 src/vs/workbench/parts/quickopen/browser/media/Operator_16x_vscode_inverse.svg diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts index 3e60ba56be9..b17ba2c3c2c 100644 --- a/src/vs/editor/common/modes.ts +++ b/src/vs/editor/common/modes.ts @@ -492,7 +492,9 @@ export enum SymbolKind { Key = 19, Null = 20, EnumMember = 21, - Struct = 22 + Struct = 22, + Event = 23, + Operator = 24 } @@ -525,6 +527,8 @@ export const symbolKindToCssClass = (function () { _fromMapping[SymbolKind.Null] = 'null'; _fromMapping[SymbolKind.EnumMember] = 'enum-member'; _fromMapping[SymbolKind.Struct] = 'struct'; + _fromMapping[SymbolKind.Event] = 'event'; + _fromMapping[SymbolKind.Operator] = 'operator'; return function toCssClassName(kind: SymbolKind): string { return _fromMapping[kind] || 'property'; diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts index 4a445632abc..c2d5b4630eb 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -4748,6 +4748,8 @@ declare module monaco.languages { Null = 20, EnumMember = 21, Struct = 22, + Event = 23, + Operator = 24, } /** diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index d91d268c471..92ac4472116 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -1863,8 +1863,6 @@ declare module 'vscode' { Field = 7, Constructor = 8, Enum = 9, - EnumMember = 21, - Struct = 22, Interface = 10, Function = 11, Variable = 12, @@ -1875,7 +1873,11 @@ declare module 'vscode' { Array = 17, Object = 18, Key = 19, - Null = 20 + Null = 20, + EnumMember = 21, + Struct = 22, + Event = 23, + Operator = 24 } /** diff --git a/src/vs/workbench/api/node/extHostTypeConverters.ts b/src/vs/workbench/api/node/extHostTypeConverters.ts index 020adac6268..20141972bed 100644 --- a/src/vs/workbench/api/node/extHostTypeConverters.ts +++ b/src/vs/workbench/api/node/extHostTypeConverters.ts @@ -200,6 +200,8 @@ export namespace SymbolKind { _fromMapping[types.SymbolKind.Null] = modes.SymbolKind.Null; _fromMapping[types.SymbolKind.EnumMember] = modes.SymbolKind.EnumMember; _fromMapping[types.SymbolKind.Struct] = modes.SymbolKind.Struct; + _fromMapping[types.SymbolKind.Event] = modes.SymbolKind.Event; + _fromMapping[types.SymbolKind.Operator] = modes.SymbolKind.Operator; export function from(kind: vscode.SymbolKind): modes.SymbolKind { return _fromMapping[kind] || modes.SymbolKind.Property; diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts index f485b570029..53cc58a6d8a 100644 --- a/src/vs/workbench/api/node/extHostTypes.ts +++ b/src/vs/workbench/api/node/extHostTypes.ts @@ -761,7 +761,9 @@ export enum SymbolKind { Key = 19, Null = 20, EnumMember = 21, - Struct = 22 + Struct = 22, + Event = 23, + Operator = 24 } export class SymbolInformation { diff --git a/src/vs/workbench/parts/quickopen/browser/media/Event_16x_vscode.svg b/src/vs/workbench/parts/quickopen/browser/media/Event_16x_vscode.svg new file mode 100644 index 00000000000..0e202ec10be --- /dev/null +++ b/src/vs/workbench/parts/quickopen/browser/media/Event_16x_vscode.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/vs/workbench/parts/quickopen/browser/media/Event_16x_vscode_inverse.svg b/src/vs/workbench/parts/quickopen/browser/media/Event_16x_vscode_inverse.svg new file mode 100644 index 00000000000..a508edcd3d6 --- /dev/null +++ b/src/vs/workbench/parts/quickopen/browser/media/Event_16x_vscode_inverse.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/vs/workbench/parts/quickopen/browser/media/Operator_16x_vscode.svg b/src/vs/workbench/parts/quickopen/browser/media/Operator_16x_vscode.svg new file mode 100644 index 00000000000..ba2f2d091cf --- /dev/null +++ b/src/vs/workbench/parts/quickopen/browser/media/Operator_16x_vscode.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/vs/workbench/parts/quickopen/browser/media/Operator_16x_vscode_inverse.svg b/src/vs/workbench/parts/quickopen/browser/media/Operator_16x_vscode_inverse.svg new file mode 100644 index 00000000000..21e1e814b2e --- /dev/null +++ b/src/vs/workbench/parts/quickopen/browser/media/Operator_16x_vscode_inverse.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/vs/workbench/parts/quickopen/browser/media/gotoSymbolHandler.css b/src/vs/workbench/parts/quickopen/browser/media/gotoSymbolHandler.css index 49e2bfb4017..f0b7095b8a0 100644 --- a/src/vs/workbench/parts/quickopen/browser/media/gotoSymbolHandler.css +++ b/src/vs/workbench/parts/quickopen/browser/media/gotoSymbolHandler.css @@ -33,6 +33,26 @@ background-image: url('Structure_16x_vscode_inverse.svg'); } +.monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.event { + background-image: url('Event_16x_vscode.svg'); + background-repeat: no-repeat; + background-position: 0 -2px; +} +.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.event, +.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.event { + background-image: url('Event_16x_vscode_inverse.svg'); +} + +.monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.operator { + background-image: url('Operator_16x_vscode.svg'); + background-repeat: no-repeat; + background-position: 0 -2px; +} +.vs-dark .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.operator, +.hc-black .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.operator { + background-image: url('Operator_16x_vscode_inverse.svg'); +} + .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.method, .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.function, .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.constructor, -- GitLab