mirror of
https://github.com/colbymchenry/codegraph.git
synced 2026-10-17 05:07:37 +08:00
Colby Mchenry
b7b2a44cfa
- tree-sitter-kotlin can't read `class Name` / (comments) / `internal
constructor(…) : Super {` on separate lines — the class is dropped and its
members become loose top-level functions (okio's ByteString, Kotlin
Multiplatform's `expect` classes). The Kotlin preParse now blanks that
constructor's modifiers / annotations / keyword to spaces, so `(…) :
Super {` parses as the primary constructor; offsets and lines survive, and
preParse runs before the kernel, so both paths parse the same bytes.
- With members back on their classes, a Kotlin standard-library name on an
untyped chain link (scope functions, collection / string / conversion
methods — not names project types commonly carry) needs a receiver named
after its owner, in the exact / fuzzy filters and the unique-name guess.
A/B (edges removed / added): okio -1028/+1127, okhttp -979/+1145,
kotlinx-datetime -426/+515 (mostly re-keyed onto recovered classes),
koin -60/+4 (`msg.contains(…)` → a dependency map's `contains`).
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
79 lines
2.9 KiB
TypeScript
79 lines
2.9 KiB
TypeScript
/**
|
|
* Two Kotlin fixes that travel together:
|
|
* - a primary constructor on the line after its class name with a supertype
|
|
* list (`expect open class ByteString` / `internal constructor(…) :
|
|
* Comparable<ByteString> {`, Kotlin Multiplatform's shape) dropped the class
|
|
* and scattered its members as loose functions; the constructor's modifiers
|
|
* and keyword are blanked (offsets kept) so the class parses;
|
|
* - with members back on their classes, a standard-library name on an
|
|
* untyped chain link (`builder.apply { … }`, `"x".toPath().toString()`)
|
|
* needs a receiver named after the owner — okhttp's `.apply { }` went to
|
|
* `ConnectionSpec.apply`.
|
|
*/
|
|
import { describe, it, expect, afterAll, beforeAll } from 'vitest';
|
|
import * as fs from 'fs';
|
|
import * as os from 'os';
|
|
import * as path from 'path';
|
|
import { CodeGraph } from '../src';
|
|
import { joinKotlinSplitConstructors } from '../src/extraction/languages/kotlin';
|
|
|
|
let root = '';
|
|
let cg: CodeGraph;
|
|
|
|
const BYTE_STRING = `package okio
|
|
|
|
expect open class ByteString
|
|
// Trusted internal constructor doesn't clone data.
|
|
internal constructor(data: ByteArray) : Comparable<ByteString> {
|
|
fun hex(): String
|
|
fun toByteArray(): ByteArray
|
|
}
|
|
`;
|
|
|
|
beforeAll(async () => {
|
|
root = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-kotlin-split-'));
|
|
const files: Record<string, string> = {
|
|
'src/commonMain/kotlin/okio/ByteString.kt': BYTE_STRING,
|
|
'src/main/kotlin/app/ConnectionSpec.kt': `package app
|
|
|
|
class ConnectionSpec {
|
|
fun apply(sslSocket: Any, isFallback: Boolean) {}
|
|
}
|
|
`,
|
|
'src/main/kotlin/app/Builder.kt': `package app
|
|
|
|
class Builder {
|
|
var name = ""
|
|
fun build(): String = StringBuilder().apply { append(name) }.toString()
|
|
}
|
|
`,
|
|
};
|
|
for (const [rel, content] of Object.entries(files)) {
|
|
fs.mkdirSync(path.dirname(path.join(root, rel)), { recursive: true });
|
|
fs.writeFileSync(path.join(root, rel), content);
|
|
}
|
|
cg = await CodeGraph.init(root, { index: true });
|
|
});
|
|
|
|
afterAll(() => {
|
|
cg?.close();
|
|
if (root) fs.rmSync(root, { recursive: true, force: true });
|
|
});
|
|
|
|
describe('Kotlin split primary constructors and standard chain calls', () => {
|
|
it('keeps the class and its members', () => {
|
|
const nodes = cg.getNodesInFile('src/commonMain/kotlin/okio/ByteString.kt');
|
|
const hex = nodes.find((n) => n.name === 'hex')!;
|
|
expect(hex.qualifiedName).toBe('okio::ByteString::hex');
|
|
const out = joinKotlinSplitConstructors(BYTE_STRING);
|
|
expect(out.length).toBe(BYTE_STRING.length);
|
|
expect(out.split('\n')[4]).toMatch(/^\s+\(data: ByteArray\) : Comparable<ByteString> \{$/);
|
|
});
|
|
|
|
it('never sends a scope function to a project type', () => {
|
|
const build = cg.getNodesInFile('src/main/kotlin/app/Builder.kt').find((n) => n.name === 'build')!;
|
|
const targets = cg.getOutgoingEdges(build.id).filter((e) => e.kind === 'calls').map((e) => cg.getNode(e.target)!.qualifiedName);
|
|
expect(targets.some((t) => t.endsWith('ConnectionSpec::apply'))).toBe(false);
|
|
});
|
|
});
|