Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

### Fixes

- In Kotlin, a call on a library type you import, like Jetpack Compose's `Modifier.pad()`, now links to the extension your project declares on that type (`fun Modifier.pad()`), when the calling file can see it: same package, or imported by name or with `.*`. The library type's own methods, like `Modifier.fillMaxSize()`, still never link to a project method that shares the name.
- In TypeScript, an awaited call with type arguments like `await fetchApi<User>("/me")` or `await api.get<T>(url)` now links to the function it calls. Before, the call was dropped, so typed fetch wrappers looked like they had no callers. (#2586)
- In React, a component rendered at module scope, in a top-level constant or inside a test's `it(…)` callback, like `createRoot(el).render(<App />)` or `render(<Card />)`, now counts as rendered there, so an app's entry reaches its root component and a component's tests show among its callers. (#2587)
- In Python, `import a.b as X` written inside a function now links its calls like `X.f()`, as the same import at module level already did. Thanks @Egrn for the report. (#2600)
Expand Down
112 changes: 112 additions & 0 deletions __tests__/kotlin-extension-on-imported-type.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
/**
* A Kotlin import from outside the project owns its name (#2196): after
* `import androidx.compose.ui.Modifier`, `Modifier.fillMaxSize()` is
* Compose's, never a project method that happens to be called `fillMaxSize`.
* But Kotlin lets the project extend that type — `fun Modifier.pad()`,
* indexed as `Modifier::pad` — and `Modifier.pad()` is that extension when
* the call site can see it: in its own package, or imported by name or `.*`.
* `fun Color.Companion.fromHex()` is called the same way, `Color.fromHex()`.
*/
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';

let root = '';
let cg: CodeGraph;

beforeAll(async () => {
root = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-kotlin-ext-imported-'));
const files: Record<string, string> = {
'src/main/kotlin/app/ui/Ext.kt': `package app.ui

import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color

fun Modifier.pad(): Modifier = this

fun Modifier.hidden(): Modifier = this

fun Color.Companion.fromHex(hex: String): Color = Color.Red
`,
'src/main/kotlin/app/other/Box.kt': `package app.other

class Box {
fun fillMaxSize(): Box = this
}
`,
'src/main/kotlin/app/gen/Gen.kt': `package app.gen

import javax.lang.model.element.Modifier

fun Modifier.keyword(): String = name
`,
'src/main/kotlin/app/ui/Screen.kt': `package app.ui

import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color

fun screen() {
Modifier.pad()
Modifier.fillMaxSize()
Color.fromHex("#fff")
}
`,
'src/main/kotlin/app/feature/Feed.kt': `package app.feature

import androidx.compose.ui.Modifier
import app.gen.keyword
import app.ui.pad

fun feed() {
Modifier.pad()
Modifier.hidden()
Modifier.keyword()
}
`,
'src/main/kotlin/app/settings/Settings.kt': `package app.settings

import androidx.compose.ui.Modifier
import app.ui.*

fun settings() {
Modifier.hidden()
}
`,
};
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 });
});

/** `kind qualified-name` of every non-structural edge out of a file. */
function edgesFrom(file: string): string[] {
const ids = cg.getNodesInFile(file).map((n) => n.id);
return cg
.getOutgoingEdgesFrom(ids)
.filter((e) => e.kind !== 'contains' && e.kind !== 'imports')
.map((e) => `${e.kind} ${cg.getNode(e.target)!.qualifiedName}`)
.sort();
}

describe('Kotlin: a project extension on a type an outside import names', () => {
it('is what a call on that type reaches from the same package; the type’s own members stay outside', () => {
expect(edgesFrom('src/main/kotlin/app/ui/Screen.kt')).toEqual([
'calls Color::fromHex',
'calls Modifier::pad',
]);
});

it('is reached from another package only through an import of it, by name or `.*`', () => {
expect(edgesFrom('src/main/kotlin/app/feature/Feed.kt')).toEqual(['calls Modifier::pad']);
expect(edgesFrom('src/main/kotlin/app/settings/Settings.kt')).toEqual(['calls Modifier::hidden']);
});
});
28 changes: 26 additions & 2 deletions src/resolution/name-matcher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1947,6 +1947,29 @@ function isJavaOutsideImport(name: string, ref: UnresolvedRef, context: Resoluti
return true;
}

/**
* `Modifier.pad()` after `import androidx.compose.ui.Modifier`: the type is
* outside the project, but Kotlin lets the project extend it. The call reaches
* a project extension on that type — `fun Modifier.pad()`, indexed as
* `Modifier::pad` — that the call site can see (its file, its package, an
* import of it by name or `.*`) and whose own file imports the same type.
* Compose's own `Modifier.fillMaxSize()` matches none and stays unlinked.
*/
function kotlinExtensionOnImportedType(ref: UnresolvedRef, context: ResolutionContext): ResolvedRef | null {
const call = /^(\w+)\.(\w+)$/.exec(ref.referenceName);
if (!call || ref.referenceKind !== 'calls') return null;
const binding = context.getImportMappings(ref.filePath, ref.language).find((m) => m.localName === call[1]);
if (!binding) return null;
const pkg = binding.source.slice(0, binding.source.lastIndexOf('.'));
const extensions = context.getNodesByQualifiedName(`${binding.exportedName}::${call[2]}`).filter((n) => {
if (n.kind !== 'method' || n.language !== 'kotlin' || !isKotlinTopLevelVisible(n, ref, context)) return false;
const scope = kotlinFileScope(n.filePath, context);
return scope.imports.has(binding.source) || scope.stars.has(pkg);
});
const chosen = extensions.length > 1 ? extensions.filter((n) => n.filePath === ref.filePath) : extensions;
return chosen.length === 1 ? { original: ref, targetNodeId: chosen[0]!.id, confidence: 0.9, resolvedBy: 'qualified-name' } : null;
}

/** Lua's global functions, and the test runner's: `local type = type` is the standard library's `type`. */
const LUA_GLOBAL_FUNCTIONS: ReadonlySet<string> = new Set([
'assert', 'error', 'ipairs', 'pairs', 'next', 'type', 'tostring', 'tonumber', 'setmetatable', 'getmetatable',
Expand Down Expand Up @@ -25671,10 +25694,11 @@ function matchReferenceInner(

// `import java.lang.reflect.Field;` — the file's `Field` is the JDK's, never
// a project class of that name (gson's production code bound it to a test's
// nested `ParameterizedTypesTest.Field`).
// nested `ParameterizedTypesTest.Field`). Only a Kotlin extension the
// project declares on that type is in the graph.
if ((ref.language === 'java' || ref.language === 'kotlin') && ref.referenceKind !== 'imports' &&
isJavaOutsideImport(ref.referenceName.split('.')[0]!, ref, context)) {
return null;
return ref.language === 'kotlin' ? kotlinExtensionOnImportedType(ref, context) : null;
}

// A symbolic name in a Scala type is a type (`F ~> G`) or a kind-projector
Expand Down