Combine icon & kind in Outline View into a unified styleable property

flow-libs/atom.js.flow

@@ -49,6 +49,11 @@ type atom$Octicon = 'alert' | 'alignment-align' | 'alignment-aligned-to' | 'alig
   'trashcan' | 'triangle-down' | 'triangle-left' | 'triangle-right' | 'triangle-up' | 'unfold' |
   'unmute' | 'unverified' | 'verified' | 'versions' | 'watch' | 'x' | 'zap';
 
+type atom$OcticonsPrivate =
+  'type-array' | 'type-boolean' | 'type-class' | 'type-constant' | 'type-constructor' | 'type-enum' |
+  'type-field' | 'type-file' | 'type-function' | 'type-interface' | 'type-method' | 'type-module' |
+  'type-namespace' | 'type-number' | 'type-package' | 'type-property' | 'type-string' | 'type-variable';
+
 declare class atom$Model {
   destroy(): void,
   isDestroyed(): boolean,

modules/atom-ide-ui/pkg/atom-ide-outline-view/lib/OutlineView.js

@@ -175,11 +175,7 @@ class OutlineTree extends React.PureComponent {
       }
     };
 
-    const classNames = ['list-nested-item'];
-    if (outline.kind) {
-      classNames.push(`kind-${outline.kind}`);
-    }
-    const classes = classnames(classNames, {
+    const classes = classnames('list-nested-item', {
       selected: outline.highlighted,
     });
     return (

modules/atom-ide-ui/pkg/atom-ide-outline-view/lib/createOutlines.js

@@ -93,7 +93,6 @@ function treeToUiTree(
   const shortName = nameOnly && outlineTree.representativeName != null;
   return {
     icon: nameOnly ? undefined : outlineTree.icon,
-    kind: nameOnly ? undefined : outlineTree.kind,
     plainText: shortName
       ? outlineTree.representativeName
       : outlineTree.plainText,

modules/atom-ide-ui/pkg/atom-ide-outline-view/lib/main.js

@@ -29,11 +29,10 @@ import {createOutlines} from './createOutlines';
 import {Observable} from 'rxjs';
 
 import type {TokenizedText} from 'nuclide-commons/tokenized-text-rpc-types';
-import type {Outline, OutlineTreeKind} from './rpc-types';
+import type {Outline} from './rpc-types';
 
 export type OutlineTreeForUi = {
-  icon?: string, // from atom$Octicon, but we use string for convenience of remoting
-  kind?: OutlineTreeKind, // kind you can pass to the UI for theming
+  icon?: string, // from atom$Octicon | atom$OcticonPrivate - we use string for remoting
   plainText?: string,
   tokenizedText?: TokenizedText,
 

modules/atom-ide-ui/pkg/atom-ide-outline-view/lib/rpc-types.js

@@ -12,8 +12,7 @@
 import type {TokenizedText} from 'nuclide-commons/tokenized-text-rpc-types';
 
 export type OutlineTree = {
-  icon?: string, // from atom$Octicon (that type's not allowed over rpc so we use string)
-  kind?: OutlineTreeKind, // kind you can pass to the UI for theming
+  icon?: string, // from atom$Octicon | atom$OcticonsPrivate (types not allowed over rpc so we use string)
 
   // Must be one or the other. If both are present, tokenizedText is preferred.
   plainText?: string,
@@ -28,24 +27,3 @@ export type OutlineTree = {
 export type Outline = {
   outlineTrees: Array<OutlineTree>,
 };
-
-// Kind of outline tree - matches the names from the Language Server Protocol v2.
-export type OutlineTreeKind =
-  | 'file'
-  | 'module'
-  | 'namespace'
-  | 'package'
-  | 'class'
-  | 'method'
-  | 'property'
-  | 'field'
-  | 'constructor'
-  | 'enum'
-  | 'interface'
-  | 'function'
-  | 'variable'
-  | 'constant'
-  | 'string'
-  | 'number'
-  | 'boolean'
-  | 'array';