KE2: Extract lambda expressions #18110
Conversation
tamasvajk
force-pushed
the
ke2-lambda
branch
from
28022ce
to
f9fd733
Compare
| fun getLocallyVisibleFunctionLabelMapping( | ||
| key: KaFunctionSymbol | ||
| ): LocallyVisibleFunctionLabels { | ||
| lock.withLock { |
There was a problem hiding this comment.
This will only be used in a TrapWriter for a source file, not a diagnostic TRAP writer, so it isn't shared and won't need to use a lock. I think I'll take a look at refactoring TrapLabelManager to make it easier to use locks only when necessary, but for now let's at least add a TODO comment reminding us to come back to this.
| key: KaFunctionSymbol, | ||
| add: (KaFunctionSymbol) -> LocallyVisibleFunctionLabels | ||
| ): LocallyVisibleFunctionLabels { | ||
| lock.withLock { |
|
|
||
| is KtLambdaExpression -> { | ||
| // Propagate extraction to the wrapped function literal: | ||
| return extractExpression(e.functionLiteral, callable, parent) |
There was a problem hiding this comment.
Are all function literals wrapped by a lambda expression?
| * return invoke(args[0] as T0, args[1] as T1, ..., args[I] as TI) | ||
| * } | ||
| * } | ||
| * ``` |
java/kotlin-extractor2/src/main/kotlin/entities/FunctionalInterface.kt
Outdated
Show resolved
Hide resolved
| elementToReportOn: PsiElement, | ||
| compilerGeneratedKindOverride: CompilerGeneratedKinds? = null, | ||
| superConstructorSelector: (KaFunctionSymbol) -> Boolean = { it.valueParameters.isEmpty() }, | ||
| extractSuperConstructorArgs: (Label<DbSuperconstructorinvocationstmt>) -> Unit = {}, |
There was a problem hiding this comment.
Can we just inline the default here too?
There was a problem hiding this comment.
I think this can now be removed
There was a problem hiding this comment.
I think we might need to put this back later to cover this case: https://github.com/github/codeql/blob/main/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt#L7942-L7961
There was a problem hiding this comment.
Ah, sorry, I missed that. Anyway, like you say, we can always add it back if we need it.
java/kotlin-extractor2/src/main/kotlin/entities/FunctionalInterface.kt
Outdated
Show resolved
Hide resolved
tamasvajk
force-pushed
the
ke2-lambda
branch
from
23c66fc
to
7d50eb5
Compare
No description provided.