proper handling of namespace and package type in goto symbol handler

src/vs/workbench/api/node/extHostTypeConverters.ts

@@ -198,9 +198,11 @@ export namespace SymbolKind {
 				return 'class';
 			case types.SymbolKind.Interface:
 				return 'interface';
-			case types.SymbolKind.Module:
 			case types.SymbolKind.Namespace:
+				return 'namespace';
 			case types.SymbolKind.Package:
+				return 'package';
+			case types.SymbolKind.Module:
 				return 'module';
 			case types.SymbolKind.Property:
 				return 'property';
@@ -234,9 +236,11 @@ export namespace SymbolKind {
 				return types.SymbolKind.Class;
 			case 'interface':
 				return types.SymbolKind.Interface;
+			case 'namespace':
+				return types.SymbolKind.Namespace;
+			case 'package':
+				return types.SymbolKind.Package;
 			case 'module':
-			// case types.SymbolKind.Namespace:
-			// case types.SymbolKind.Package:
 				return types.SymbolKind.Module;
 			case 'property':
 				return types.SymbolKind.Property;

src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts

@@ -221,6 +221,8 @@ class OutlineModel extends QuickOpenModel {
 		result['variable'] = nls.localize('variable', "variables ({0})");
 		result['class'] = nls.localize('class', "classes ({0})");
 		result['interface'] = nls.localize('interface', "interfaces ({0})");
+		result['namespace'] = nls.localize('namespace', "namespaces ({0})");
+		result['package'] = nls.localize('package', "packages ({0})");
 		result['module'] = nls.localize('modules', "modules ({0})");
 		result['property'] = nls.localize('property', "properties ({0})");
 		result['enum'] = nls.localize('enum', "enumerations ({0})");

src/vs/workbench/parts/quickopen/browser/media/gotoSymbolHandler.css

@@ -9,6 +9,8 @@
 .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.variable,
 .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.class,
 .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.interface,
+.monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.namespace,
+.monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.package,
 .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.module,
 .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.property,
 .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.enum,
@@ -28,6 +30,8 @@
 .monaco-workbench.vs .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.variable 			{ background-position: -22px -4px; }
 .monaco-workbench.vs .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.class 			{ background-position: -43px -3px; }
 .monaco-workbench.vs .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.interface 		{ background-position: -63px -4px; }
+.monaco-workbench.vs .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.namespace,
+.monaco-workbench.vs .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.package,
 .monaco-workbench.vs .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.module 			{ background-position: -82px -4px; }
 .monaco-workbench.vs .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.property 			{ background-position: -102px -3px; }
 .monaco-workbench.vs .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.enum		 		{ background-position: -122px -3px; }
@@ -44,6 +48,8 @@
 .monaco-workbench.vs-dark .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.variable 	{ background-position: -22px -24px; }
 .monaco-workbench.vs-dark .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.class 		{ background-position: -43px -23px; }
 .monaco-workbench.vs-dark .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.interface 	{ background-position: -63px -24px; }
+.monaco-workbench.vs-dark .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.namespace,
+.monaco-workbench.vs-dark .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.package,
 .monaco-workbench.vs-dark .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.module 		{ background-position: -82px -24px; }
 .monaco-workbench.vs-dark .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.property 	{ background-position: -102px -23px; }
 .monaco-workbench.vs-dark .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.string		{ background-position: -202px -23px; }
@@ -62,6 +68,8 @@
 .monaco-workbench.hc-black .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.variable,
 .monaco-workbench.hc-black .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.class,
 .monaco-workbench.hc-black .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.interface,
+.monaco-workbench.hc-black .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.namespace,
+.monaco-workbench.hc-black .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.package,
 .monaco-workbench.hc-black .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.module,
 .monaco-workbench.hc-black .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.property,
 .monaco-workbench.hc-black .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.enum,
@@ -81,6 +89,8 @@
 .monaco-workbench.hc-black .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.variable:before,
 .monaco-workbench.hc-black .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.class:before,
 .monaco-workbench.hc-black .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.interface:before,
+.monaco-workbench.hc-black .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.namespace:before,
+.monaco-workbench.hc-black .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.package:before,
 .monaco-workbench.hc-black .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.module:before,
 .monaco-workbench.hc-black .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.property:before,
 .monaco-workbench.hc-black .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.enum:before,
@@ -116,6 +126,8 @@
 	content: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZmlsbD0iIzc1QkVGRiIgZD0iTTExLjUgNGMtMS43NTkgMC0zLjIwNCAxLjMwOC0zLjQ0OSAzaC0zLjEyMmMtLjIyMy0uODYxLS45OTgtMS41LTEuOTI5LTEuNS0xLjEwNCAwLTIgLjg5NS0yIDIgMCAxLjEwNC44OTYgMiAyIDIgLjkzMSAwIDEuNzA2LS42MzkgMS45MjktMS41aDMuMTIyYy4yNDUgMS42OTEgMS42OSAzIDMuNDQ5IDMgMS45MyAwIDMuNS0xLjU3IDMuNS0zLjUgMC0xLjkzMS0xLjU3LTMuNS0zLjUtMy41em0wIDVjLS44MjcgMC0xLjUtLjY3NC0xLjUtMS41IDAtLjgyOC42NzMtMS41IDEuNS0xLjVzMS41LjY3MiAxLjUgMS41YzAgLjgyNi0uNjczIDEuNS0xLjUgMS41eiIvPjwvc3ZnPg==");
 }
 
+.monaco-workbench.hc-black .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.namespace:before,
+.monaco-workbench.hc-black .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.package:before,
 .monaco-workbench.hc-black .quick-open-widget .quick-open-tree .quick-open-entry .quick-open-entry-icon.module:before {
 	content: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZmlsbD0iI0M1QzVDNSIgZD0iTTkgMTF2LTFjMC0uODM0LjQ5Ni0xLjczOCAxLTItLjUwNC0uMjctMS0xLjE2OC0xLTJ2LTFjMC0uODQtLjU4NC0xLTEtMXYtMWMyLjA4MyAwIDIgMS4xNjYgMiAydjFjMCAuOTY5LjcwMy45OCAxIDF2MmMtLjMyMi4wMi0xIC4wNTMtMSAxdjFjMCAuODM0LjA4MyAyLTIgMnYtMWMuODMzIDAgMS0xIDEtMXptLTYgMHYtMWMwLS44MzQtLjQ5Ni0xLjczOC0xLTIgLjUwNC0uMjcgMS0xLjE2OCAxLTJ2LTFjMC0uODQuNTg0LTEgMS0xdi0xYy0yLjA4MyAwLTIgMS4xNjYtMiAydjFjMCAuOTY5LS43MDMuOTgtMSAxdjJjLjMyMi4wMiAxIC4wNTMgMSAxdjFjMCAuODM0LS4wODMgMiAyIDJ2LTFjLS44MzMgMC0xLTEtMS0xeiIvPjwvc3ZnPg==");
 	margin-left: 2px;