@optave/codegraph 3.5.0 → 3.6.0

package/src/extractors/go.ts

@@ -4,9 +4,16 @@ import type {
   SubDeclaration,
   TreeSitterNode,
   TreeSitterTree,
-  TypeMapEntry,
 } from '../types.js';
-import { findChild, goVisibility, MAX_WALK_DEPTH, nodeEndLine } from './helpers.js';
+import {
+  findChild,
+  goVisibility,
+  lastPathSegment,
+  MAX_WALK_DEPTH,
+  nodeEndLine,
+  setTypeMapEntry,
+  stripQuotes,
+} from './helpers.js';
 
 /**
  * Extract symbols from Go files.
@@ -106,43 +113,63 @@ function handleGoTypeDecl(node: TreeSitterNode, ctx: ExtractorOutput): void {
     if (!spec || spec.type !== 'type_spec') continue;
     const nameNode = spec.childForFieldName('name');
     const typeNode = spec.childForFieldName('type');
-    if (nameNode && typeNode) {
-      if (typeNode.type === 'struct_type') {
-        const fields = extractStructFields(typeNode);
-        ctx.definitions.push({
-          name: nameNode.text,
-          kind: 'struct',
-          line: node.startPosition.row + 1,
-          endLine: nodeEndLine(node),
-          children: fields.length > 0 ? fields : undefined,
-        });
-      } else if (typeNode.type === 'interface_type') {
-        ctx.definitions.push({
-          name: nameNode.text,
-          kind: 'interface',
-          line: node.startPosition.row + 1,
-          endLine: nodeEndLine(node),
-        });
-        for (let j = 0; j < typeNode.childCount; j++) {
-          const member = typeNode.child(j);
-          if (member && member.type === 'method_elem') {
-            const methName = member.childForFieldName('name');
-            if (methName) {
-              ctx.definitions.push({
-                name: `${nameNode.text}.${methName.text}`,
-                kind: 'method',
-                line: member.startPosition.row + 1,
-                endLine: member.endPosition.row + 1,
-              });
-            }
-          }
-        }
-      } else {
+    if (!nameNode || !typeNode) continue;
+
+    if (typeNode.type === 'struct_type') {
+      handleGoStructType(node, nameNode, typeNode, ctx);
+    } else if (typeNode.type === 'interface_type') {
+      handleGoInterfaceType(node, nameNode, typeNode, ctx);
+    } else {
+      ctx.definitions.push({
+        name: nameNode.text,
+        kind: 'type',
+        line: node.startPosition.row + 1,
+        endLine: nodeEndLine(node),
+      });
+    }
+  }
+}
+
+/** Handle a struct type_spec: emit struct definition with field children. */
+function handleGoStructType(
+  declNode: TreeSitterNode,
+  nameNode: TreeSitterNode,
+  typeNode: TreeSitterNode,
+  ctx: ExtractorOutput,
+): void {
+  const fields = extractStructFields(typeNode);
+  ctx.definitions.push({
+    name: nameNode.text,
+    kind: 'struct',
+    line: declNode.startPosition.row + 1,
+    endLine: nodeEndLine(declNode),
+    children: fields.length > 0 ? fields : undefined,
+  });
+}
+
+/** Handle an interface type_spec: emit interface definition + method definitions. */
+function handleGoInterfaceType(
+  declNode: TreeSitterNode,
+  nameNode: TreeSitterNode,
+  typeNode: TreeSitterNode,
+  ctx: ExtractorOutput,
+): void {
+  ctx.definitions.push({
+    name: nameNode.text,
+    kind: 'interface',
+    line: declNode.startPosition.row + 1,
+    endLine: nodeEndLine(declNode),
+  });
+  for (let j = 0; j < typeNode.childCount; j++) {
+    const member = typeNode.child(j);
+    if (member && member.type === 'method_elem') {
+      const methName = member.childForFieldName('name');
+      if (methName) {
         ctx.definitions.push({
-          name: nameNode.text,
-          kind: 'type',
-          line: node.startPosition.row + 1,
-          endLine: nodeEndLine(node),
+          name: `${nameNode.text}.${methName.text}`,
+          kind: 'method',
+          line: member.startPosition.row + 1,
+          endLine: member.endPosition.row + 1,
         });
       }
     }
@@ -170,9 +197,9 @@ function handleGoImportDecl(node: TreeSitterNode, ctx: ExtractorOutput): void {
 function extractGoImportSpec(spec: TreeSitterNode, ctx: ExtractorOutput): void {
   const pathNode = spec.childForFieldName('path');
   if (pathNode) {
-    const importPath = pathNode.text.replace(/"/g, '');
+    const importPath = stripQuotes(pathNode.text);
     const nameNode = spec.childForFieldName('name');
-    const alias = nameNode ? nameNode.text : (importPath.split('/').pop() ?? importPath);
+    const alias = nameNode ? nameNode.text : lastPathSegment(importPath);
     ctx.imports.push({
       source: importPath,
       names: [alias],
@@ -220,113 +247,104 @@ function extractGoTypeMap(node: TreeSitterNode, ctx: ExtractorOutput): void {
   extractGoTypeMapDepth(node, ctx, 0);
 }
 
-function setIfHigher(
-  typeMap: Map<string, TypeMapEntry>,
-  name: string,
-  type: string,
-  confidence: number,
+/** Map identifiers in a typed declaration node to their type (confidence 0.9). */
+function handleTypedIdentifiers(
+  node: TreeSitterNode,
+  typeMap: Map<string, { type: string; confidence: number }>,
 ): void {
-  const existing = typeMap.get(name);
-  if (!existing || confidence > existing.confidence) {
-    typeMap.set(name, { type, confidence });
+  const typeNode = node.childForFieldName('type');
+  if (!typeNode) return;
+  const typeName = extractGoTypeName(typeNode);
+  if (!typeName) return;
+  for (let i = 0; i < node.childCount; i++) {
+    const child = node.child(i);
+    if (child && child.type === 'identifier') {
+      setTypeMapEntry(typeMap, child.text, typeName, 0.9);
+    }
   }
 }
 
-function extractGoTypeMapDepth(node: TreeSitterNode, ctx: ExtractorOutput, depth: number): void {
-  if (depth >= MAX_WALK_DEPTH) return;
-
-  // var x MyType = ... or var x, y MyType → var_declaration > var_spec (confidence 0.9)
-  if (node.type === 'var_spec') {
-    const typeNode = node.childForFieldName('type');
+/** Infer type from a single RHS expression in a short var declaration. */
+function inferShortVarType(
+  varNode: TreeSitterNode,
+  rhs: TreeSitterNode,
+  typeMap: Map<string, { type: string; confidence: number }>,
+): void {
+  // x := Struct{...} — composite literal (confidence 1.0)
+  if (rhs.type === 'composite_literal') {
+    const typeNode = rhs.childForFieldName('type');
     if (typeNode) {
       const typeName = extractGoTypeName(typeNode);
-      if (typeName) {
-        for (let i = 0; i < node.childCount; i++) {
-          const child = node.child(i);
-          if (child && child.type === 'identifier') {
-            if (ctx.typeMap) setIfHigher(ctx.typeMap, child.text, typeName, 0.9);
-          }
-        }
+      if (typeName) setTypeMapEntry(typeMap, varNode.text, typeName, 1.0);
+    }
+  }
+  // x := &Struct{...} — address-of composite literal (confidence 1.0)
+  if (rhs.type === 'unary_expression') {
+    const operand = rhs.childForFieldName('operand');
+    if (operand && operand.type === 'composite_literal') {
+      const typeNode = operand.childForFieldName('type');
+      if (typeNode) {
+        const typeName = extractGoTypeName(typeNode);
+        if (typeName) setTypeMapEntry(typeMap, varNode.text, typeName, 1.0);
       }
     }
   }
-
-  // Function/method parameter types: parameter_declaration (confidence 0.9)
-  if (node.type === 'parameter_declaration') {
-    const typeNode = node.childForFieldName('type');
-    if (typeNode) {
-      const typeName = extractGoTypeName(typeNode);
-      if (typeName) {
-        for (let i = 0; i < node.childCount; i++) {
-          const child = node.child(i);
-          if (child && child.type === 'identifier') {
-            if (ctx.typeMap) setIfHigher(ctx.typeMap, child.text, typeName, 0.9);
-          }
-        }
+  // x := NewFoo() or x := pkg.NewFoo() — factory function (confidence 0.7)
+  if (rhs.type === 'call_expression') {
+    const fn = rhs.childForFieldName('function');
+    if (fn && fn.type === 'selector_expression') {
+      const field = fn.childForFieldName('field');
+      if (field?.text.startsWith('New')) {
+        const typeName = field.text.slice(3);
+        if (typeName) setTypeMapEntry(typeMap, varNode.text, typeName, 0.7);
       }
+    } else if (fn && fn.type === 'identifier' && fn.text.startsWith('New')) {
+      const typeName = fn.text.slice(3);
+      if (typeName) setTypeMapEntry(typeMap, varNode.text, typeName, 0.7);
     }
   }
+}
 
-  // short_var_declaration: x := Struct{}, x := &Struct{}, x := NewFoo()
-  // Handles multi-variable forms: x, y := A{}, B{}
-  if (node.type === 'short_var_declaration') {
-    const left = node.childForFieldName('left');
-    const right = node.childForFieldName('right');
-    if (left && right) {
-      const lefts =
-        left.type === 'expression_list'
-          ? Array.from({ length: left.childCount }, (_, i) => left.child(i)).filter(
-              (c): c is TreeSitterNode => c?.type === 'identifier',
-            )
-          : left.type === 'identifier'
-            ? [left]
-            : [];
-      const rights =
-        right.type === 'expression_list'
-          ? Array.from({ length: right.childCount }, (_, i) => right.child(i)).filter(
-              (c): c is TreeSitterNode => !!c?.type,
-            )
-          : [right];
-
-      for (let idx = 0; idx < lefts.length; idx++) {
-        const varNode = lefts[idx];
-        const rhs = rights[idx];
-        if (!varNode || !rhs) continue;
-
-        // x := Struct{...} — composite literal (confidence 1.0)
-        if (rhs.type === 'composite_literal') {
-          const typeNode = rhs.childForFieldName('type');
-          if (typeNode) {
-            const typeName = extractGoTypeName(typeNode);
-            if (typeName && ctx.typeMap) setIfHigher(ctx.typeMap, varNode.text, typeName, 1.0);
-          }
-        }
-        // x := &Struct{...} — address-of composite literal (confidence 1.0)
-        if (rhs.type === 'unary_expression') {
-          const operand = rhs.childForFieldName('operand');
-          if (operand && operand.type === 'composite_literal') {
-            const typeNode = operand.childForFieldName('type');
-            if (typeNode) {
-              const typeName = extractGoTypeName(typeNode);
-              if (typeName && ctx.typeMap) setIfHigher(ctx.typeMap, varNode.text, typeName, 1.0);
-            }
-          }
-        }
-        // x := NewFoo() or x := pkg.NewFoo() — factory function (confidence 0.7)
-        if (rhs.type === 'call_expression') {
-          const fn = rhs.childForFieldName('function');
-          if (fn && fn.type === 'selector_expression') {
-            const field = fn.childForFieldName('field');
-            if (field?.text.startsWith('New')) {
-              const typeName = field.text.slice(3);
-              if (typeName && ctx.typeMap) setIfHigher(ctx.typeMap, varNode.text, typeName, 0.7);
-            }
-          } else if (fn && fn.type === 'identifier' && fn.text.startsWith('New')) {
-            const typeName = fn.text.slice(3);
-            if (typeName && ctx.typeMap) setIfHigher(ctx.typeMap, varNode.text, typeName, 0.7);
-          }
-        }
-      }
+/** Handle short_var_declaration: x := Struct{}, x := &Struct{}, x := NewFoo(). */
+function handleShortVarDecl(
+  node: TreeSitterNode,
+  typeMap: Map<string, { type: string; confidence: number }>,
+): void {
+  const left = node.childForFieldName('left');
+  const right = node.childForFieldName('right');
+  if (!left || !right) return;
+
+  const lefts =
+    left.type === 'expression_list'
+      ? Array.from({ length: left.childCount }, (_, i) => left.child(i)).filter(
+          (c): c is TreeSitterNode => c?.type === 'identifier',
+        )
+      : left.type === 'identifier'
+        ? [left]
+        : [];
+  const rights =
+    right.type === 'expression_list'
+      ? Array.from({ length: right.childCount }, (_, i) => right.child(i)).filter(
+          (c): c is TreeSitterNode => !!c?.type,
+        )
+      : [right];
+
+  for (let idx = 0; idx < lefts.length; idx++) {
+    const varNode = lefts[idx];
+    const rhs = rights[idx];
+    if (!varNode || !rhs) continue;
+    inferShortVarType(varNode, rhs, typeMap);
+  }
+}
+
+function extractGoTypeMapDepth(node: TreeSitterNode, ctx: ExtractorOutput, depth: number): void {
+  if (depth >= MAX_WALK_DEPTH) return;
+
+  if (ctx.typeMap) {
+    if (node.type === 'var_spec' || node.type === 'parameter_declaration') {
+      handleTypedIdentifiers(node, ctx.typeMap);
+    } else if (node.type === 'short_var_declaration') {
+      handleShortVarDecl(node, ctx.typeMap);
     }
   }
 

package/src/extractors/hcl.ts

@@ -6,7 +6,7 @@ import type {
   TreeSitterNode,
   TreeSitterTree,
 } from '../types.js';
-import { nodeEndLine } from './helpers.js';
+import { nodeEndLine, stripQuotes } from './helpers.js';
 
 /**
  * Extract symbols from HCL (Terraform) files.
@@ -80,18 +80,18 @@ function resolveHclBlockName(blockType: string, strings: TreeSitterNode[]): stri
   const s0 = strings[0];
   const s1 = strings[1];
   if (blockType === 'resource' && s0 && s1) {
-    return `${s0.text.replace(/"/g, '')}.${s1.text.replace(/"/g, '')}`;
+    return `${stripQuotes(s0.text)}.${stripQuotes(s1.text)}`;
   }
   if (blockType === 'data' && s0 && s1) {
-    return `data.${s0.text.replace(/"/g, '')}.${s1.text.replace(/"/g, '')}`;
+    return `data.${stripQuotes(s0.text)}.${stripQuotes(s1.text)}`;
   }
   if ((blockType === 'variable' || blockType === 'output' || blockType === 'module') && s0) {
-    return `${blockType}.${s0.text.replace(/"/g, '')}`;
+    return `${blockType}.${stripQuotes(s0.text)}`;
   }
   if (blockType === 'locals') return 'locals';
   if (blockType === 'terraform' || blockType === 'provider') {
     let name = blockType;
-    if (s0) name += `.${s0.text.replace(/"/g, '')}`;
+    if (s0) name += `.${stripQuotes(s0.text)}`;
     return name;
   }
   return '';
@@ -126,7 +126,7 @@ function extractHclModuleSource(
       const key = attr.childForFieldName('key') || attr.child(0);
       const val = attr.childForFieldName('val') || attr.child(2);
       if (key && key.text === 'source' && val) {
-        const src = val.text.replace(/"/g, '');
+        const src = stripQuotes(val.text);
         if (src.startsWith('./') || src.startsWith('../')) {
           ctx.imports.push({ source: src, names: [], line: attr.startPosition.row + 1 });
         }

package/src/extractors/helpers.ts

@@ -1,4 +1,4 @@
-import type { TreeSitterNode } from '../types.js';
+import type { SubDeclaration, TreeSitterNode, TypeMapEntry } from '../types.js';
 
 /**
  * Maximum recursion depth for tree-sitter AST walkers.
@@ -18,6 +18,22 @@ export function findChild(node: TreeSitterNode, type: string): TreeSitterNode |
   return null;
 }
 
+/**
+ * Merge a type-map entry, keeping the higher-confidence one.
+ * Shared across all language extractors that build type maps for call resolution.
+ */
+export function setTypeMapEntry(
+  typeMap: Map<string, TypeMapEntry>,
+  name: string,
+  type: string,
+  confidence: number,
+): void {
+  const existing = typeMap.get(name);
+  if (!existing || confidence > existing.confidence) {
+    typeMap.set(name, { type, confidence });
+  }
+}
+
 /**
  * Extract visibility from a node by scanning its children for modifier keywords.
  * Works for Java, C#, PHP, and similar languages where modifiers are child nodes.
@@ -70,6 +86,82 @@ export function rustVisibility(node: TreeSitterNode): 'public' | 'private' {
   return 'private';
 }
 
+// ── Parser abstraction helpers ─────────────────────────────────────────────
+
+/**
+ * Walk up the parent chain to find an enclosing node whose type is in `typeNames`.
+ * Returns the text of `nameField` (default `'name'`) on the matching ancestor, or null.
+ *
+ * Replaces per-language `findParentClass` / `findParentType` / `findCurrentImpl` helpers.
+ */
+export function findParentNode(
+  node: TreeSitterNode,
+  typeNames: readonly string[],
+  nameField: string = 'name',
+): string | null {
+  let current = node.parent;
+  while (current) {
+    if (typeNames.includes(current.type)) {
+      const nameNode = current.childForFieldName(nameField);
+      return nameNode ? nameNode.text : null;
+    }
+    current = current.parent;
+  }
+  return null;
+}
+
+/**
+ * Extract child declarations from a container node's body.
+ * Finds the body via `bodyFields` (tries childForFieldName then findChild for each),
+ * iterates its children, filters by `memberType`, extracts `nameField`, and returns SubDeclarations.
+ *
+ * Replaces per-language extractStructFields / extractEnumVariants / extractEnumConstants helpers
+ * for the common case where each member has a direct name field.
+ */
+export function extractBodyMembers(
+  containerNode: TreeSitterNode,
+  bodyFields: readonly string[],
+  memberType: string,
+  kind: SubDeclaration['kind'],
+  nameField: string = 'name',
+  visibility?: (member: TreeSitterNode) => SubDeclaration['visibility'],
+): SubDeclaration[] {
+  const members: SubDeclaration[] = [];
+  let body: TreeSitterNode | null = null;
+  for (const field of bodyFields) {
+    body = containerNode.childForFieldName(field) || findChild(containerNode, field);
+    if (body) break;
+  }
+  if (!body) return members;
+  for (let i = 0; i < body.childCount; i++) {
+    const member = body.child(i);
+    if (!member || member.type !== memberType) continue;
+    const nn = member.childForFieldName(nameField);
+    if (nn) {
+      const entry: SubDeclaration = { name: nn.text, kind, line: member.startPosition.row + 1 };
+      if (visibility) entry.visibility = visibility(member);
+      members.push(entry);
+    }
+  }
+  return members;
+}
+
+/**
+ * Strip leading/trailing quotes (single, double, or backtick) from a string.
+ * Strips only the leading/trailing delimiter; interior quotes are untouched.
+ */
+export function stripQuotes(text: string): string {
+  return text.replace(/^['"`]|['"`]$/g, '');
+}
+
+/**
+ * Extract the last segment of a delimited path.
+ * e.g. `lastPathSegment('java.util.List', '.')` → `'List'`
+ */
+export function lastPathSegment(path: string, separator: string = '/'): string {
+  return path.split(separator).pop() ?? path;
+}
+
 export function extractModifierVisibility(
   node: TreeSitterNode,
   modifierTypes: Set<string> = DEFAULT_MODIFIER_TYPES,

package/src/extractors/index.ts

@@ -1,9 +1,15 @@
+export { extractBashSymbols } from './bash.js';
+export { extractCSymbols } from './c.js';
+export { extractCppSymbols } from './cpp.js';
 export { extractCSharpSymbols } from './csharp.js';
 export { extractGoSymbols } from './go.js';
 export { extractHCLSymbols } from './hcl.js';
 export { extractJavaSymbols } from './java.js';
 export { extractSymbols } from './javascript.js';
+export { extractKotlinSymbols } from './kotlin.js';
 export { extractPHPSymbols } from './php.js';
 export { extractPythonSymbols } from './python.js';
 export { extractRubySymbols } from './ruby.js';
 export { extractRustSymbols } from './rust.js';
+export { extractScalaSymbols } from './scala.js';
+export { extractSwiftSymbols } from './swift.js';

package/src/extractors/java.ts

@@ -6,7 +6,14 @@ import type {
   TreeSitterTree,
   TypeMapEntry,
 } from '../types.js';
-import { extractModifierVisibility, findChild, nodeEndLine } from './helpers.js';
+import {
+  extractBodyMembers,
+  extractModifierVisibility,
+  findChild,
+  findParentNode,
+  lastPathSegment,
+  nodeEndLine,
+} from './helpers.js';
 
 /**
  * Extract symbols from Java files.
@@ -104,6 +111,25 @@ function handleJavaClassDecl(node: TreeSitterNode, ctx: ExtractorOutput): void {
   }
 }
 
+const JAVA_TYPE_NODE_TYPES = new Set(['type_identifier', 'identifier', 'generic_type']);
+
+/** Resolve interface name from a type node (handles generic_type unwrapping). */
+function resolveJavaIfaceName(node: TreeSitterNode): string | undefined {
+  return node.type === 'generic_type' ? node.child(0)?.text : node.text;
+}
+
+/** Push a single interface type node as an implements entry. */
+function pushJavaIface(
+  node: TreeSitterNode,
+  className: string,
+  line: number,
+  ctx: ExtractorOutput,
+): void {
+  if (!JAVA_TYPE_NODE_TYPES.has(node.type)) return;
+  const ifaceName = resolveJavaIfaceName(node);
+  if (ifaceName) ctx.classes.push({ name: className, implements: ifaceName, line });
+}
+
 function extractJavaInterfaces(
   interfaces: TreeSitterNode,
   className: string,
@@ -112,28 +138,15 @@ function extractJavaInterfaces(
 ): void {
   for (let i = 0; i < interfaces.childCount; i++) {
     const child = interfaces.child(i);
-    if (
-      child &&
-      (child.type === 'type_identifier' ||
-        child.type === 'identifier' ||
-        child.type === 'type_list' ||
-        child.type === 'generic_type')
-    ) {
-      if (child.type === 'type_list') {
-        for (let j = 0; j < child.childCount; j++) {
-          const t = child.child(j);
-          if (
-            t &&
-            (t.type === 'type_identifier' || t.type === 'identifier' || t.type === 'generic_type')
-          ) {
-            const ifaceName = t.type === 'generic_type' ? t.child(0)?.text : t.text;
-            if (ifaceName) ctx.classes.push({ name: className, implements: ifaceName, line });
-          }
-        }
-      } else {
-        const ifaceName = child.type === 'generic_type' ? child.child(0)?.text : child.text;
-        if (ifaceName) ctx.classes.push({ name: className, implements: ifaceName, line });
+    if (!child) continue;
+
+    if (child.type === 'type_list') {
+      for (let j = 0; j < child.childCount; j++) {
+        const t = child.child(j);
+        if (t) pushJavaIface(t, className, line, ctx);
       }
+    } else {
+      pushJavaIface(child, className, line, ctx);
     }
   }
 }
@@ -218,7 +231,7 @@ function handleJavaImportDecl(node: TreeSitterNode, ctx: ExtractorOutput): void
     const child = node.child(i);
     if (child && (child.type === 'scoped_identifier' || child.type === 'identifier')) {
       const fullPath = child.text;
-      const lastName = fullPath.split('.').pop() ?? fullPath;
+      const lastName = lastPathSegment(fullPath, '.');
       ctx.imports.push({
         source: fullPath,
         names: [lastName],
@@ -263,20 +276,13 @@ function handleJavaObjectCreation(node: TreeSitterNode, ctx: ExtractorOutput): v
   if (typeName) ctx.calls.push({ name: typeName, line: node.startPosition.row + 1 });
 }
 
+const JAVA_PARENT_TYPES = [
+  'class_declaration',
+  'enum_declaration',
+  'interface_declaration',
+] as const;
 function findJavaParentClass(node: TreeSitterNode): string | null {
-  let current = node.parent;
-  while (current) {
-    if (
-      current.type === 'class_declaration' ||
-      current.type === 'enum_declaration' ||
-      current.type === 'interface_declaration'
-    ) {
-      const nameNode = current.childForFieldName('name');
-      return nameNode ? nameNode.text : null;
-    }
-    current = current.parent;
-  }
-  return null;
+  return findParentNode(node, JAVA_PARENT_TYPES);
 }
 
 // ── Child extraction helpers ────────────────────────────────────────────────
@@ -333,16 +339,5 @@ function extractClassFields(classNode: TreeSitterNode): SubDeclaration[] {
 }
 
 function extractEnumConstants(enumNode: TreeSitterNode): SubDeclaration[] {
-  const constants: SubDeclaration[] = [];
-  const body = enumNode.childForFieldName('body') || findChild(enumNode, 'enum_body');
-  if (!body) return constants;
-  for (let i = 0; i < body.childCount; i++) {
-    const member = body.child(i);
-    if (!member || member.type !== 'enum_constant') continue;
-    const nameNode = member.childForFieldName('name');
-    if (nameNode) {
-      constants.push({ name: nameNode.text, kind: 'constant', line: member.startPosition.row + 1 });
-    }
-  }
-  return constants;
+  return extractBodyMembers(enumNode, ['body', 'enum_body'], 'enum_constant', 'constant');
 }