fix(parity): align Scala TS extractor kinds and inheritance with Rust engine (#708)

- trait_definition kind: 'trait' -> 'interface' (matches Rust)
- object_definition kind: 'module' -> 'class' (matches Rust)
- Inheritance: use found_extends flag to distinguish extends vs implements
- Skip function-local val/var in Scala and let/var in Swift extractors
- Update test expectations accordingly

Author: carlos-alm

src/extractors/scala.ts

@@ -83,7 +83,7 @@ function handleScalaTraitDef(node: TreeSitterNode, ctx: ExtractorOutput): void {
 
   ctx.definitions.push({
     name,
-    kind: 'trait',
+    kind: 'interface',
     line: node.startPosition.row + 1,
     endLine: nodeEndLine(node),
     children: children.length > 0 ? children : undefined,
@@ -100,7 +100,7 @@ function handleScalaObjectDef(node: TreeSitterNode, ctx: ExtractorOutput): void
 
   ctx.definitions.push({
     name,
-    kind: 'module',
+    kind: 'class',
     line: node.startPosition.row + 1,
     endLine: nodeEndLine(node),
     children: children.length > 0 ? children : undefined,
@@ -172,8 +172,9 @@ function handleScalaCallExpression(node: TreeSitterNode, ctx: ExtractorOutput):
 }
 
 function handleScalaValVarDef(node: TreeSitterNode, ctx: ExtractorOutput): void {
-  // Only handle top-level vals/vars
+  // Only handle top-level vals/vars — skip class members and function-local bindings
   if (node.parent?.type === 'template_body') return;
+  if (node.parent?.type === 'block' || node.parent?.type === 'indented_block') return;
   const pattern = node.childForFieldName('pattern');
   if (!pattern) return;
   const nameNode = pattern.type === 'identifier' ? pattern : findChild(pattern, 'identifier');
@@ -192,15 +193,31 @@ function handleScalaValVarDef(node: TreeSitterNode, ctx: ExtractorOutput): void
 function extractScalaInheritance(node: TreeSitterNode, name: string, ctx: ExtractorOutput): void {
   const extendsClause = findChild(node, 'extends_clause');
   if (!extendsClause) return;
+  let foundExtends = false;
   for (let i = 0; i < extendsClause.childCount; i++) {
     const child = extendsClause.child(i);
     if (!child) continue;
-    if (child.type === 'type_identifier' || child.type === 'identifier') {
-      ctx.classes.push({
-        name,
-        extends: child.text,
-        line: node.startPosition.row + 1,
-      });
+    if (
+      child.type === 'type_identifier' ||
+      child.type === 'generic_type' ||
+      child.type === 'identifier'
+    ) {
+      const typeName = child.type === 'generic_type' ? child.child(0)?.text : child.text;
+      if (!typeName) continue;
+      if (!foundExtends) {
+        ctx.classes.push({
+          name,
+          extends: typeName,
+          line: node.startPosition.row + 1,
+        });
+        foundExtends = true;
+      } else {
+        ctx.classes.push({
+          name,
+          implements: typeName,
+          line: node.startPosition.row + 1,
+        });
+      }
     }
   }
 }

src/extractors/swift.ts

@@ -273,6 +273,10 @@ function handleSwiftPropertyDecl(node: TreeSitterNode, ctx: ExtractorOutput): vo
   ) {
     return;
   }
+  // Skip function-local let/var bindings
+  if (node.parent?.type === 'statements' || node.parent?.type === 'function_body') {
+    return;
+  }
   const pattern = findChild(node, 'pattern');
   if (!pattern) return;
   const nameNode = findChild(pattern, 'simple_identifier');

tests/parsers/scala.test.ts

@@ -44,14 +44,14 @@ describe('Scala parser', () => {
   it('extracts trait definitions', () => {
     const symbols = parseScala(`trait Serializable { def serialize(): String }`);
     expect(symbols.definitions).toContainEqual(
-      expect.objectContaining({ name: 'Serializable', kind: 'trait', line: 1 }),
+      expect.objectContaining({ name: 'Serializable', kind: 'interface', line: 1 }),
     );
   });
 
   it('extracts object definitions', () => {
     const symbols = parseScala(`object Config { }`);
     expect(symbols.definitions).toContainEqual(
-      expect.objectContaining({ name: 'Config', kind: 'module', line: 1 }),
+      expect.objectContaining({ name: 'Config', kind: 'class', line: 1 }),
     );
   });