Skip to content

Fix translation folding when the args are given with an explicit array #2578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Earthcomputer merged 2 commits into from
Feb 23, 2026
+14 −18
Merged

Fix translation folding when the args are given with an explicit array #2578

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4bb406
Fix translation folding when the args are given with an explicit array
O7410 Jan 30, 2026
40cb2b2
Don't depend on kotlin plugin & deal correctly with arrays as vararg …
O7410 Jan 31, 2026
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
7 changes: 4 additions & 3 deletions src/main/kotlin/translations/identification/TranslationIdentifier.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ import org.jetbrains.uast.UMethod
import org.jetbrains.uast.UQualifiedReferenceExpression
import org.jetbrains.uast.evaluateString
import org.jetbrains.uast.getContainingUClass
import org.jetbrains.uast.util.isArrayInitializer
import org.jetbrains.uast.kotlin.psi.toEllipsisTypeIfNeeded
Comment thread
O7410 marked this conversation as resolved.
Outdated
import org.jetbrains.uast.util.isNewArrayWithInitializer

object TranslationIdentifier {
fun identify(
Expand Down Expand Up @@ -207,9 +208,9 @@ object TranslationIdentifier {
}

private fun extractVarArgs(type: PsiType, elements: List<UExpression>): Array<String>? {
return if (elements[0].getExpressionType() == type) {
return if (elements[0].getExpressionType()?.toEllipsisTypeIfNeeded(true) == type) {
val initializer = elements[0]
if (initializer is UCallExpression && initializer.isArrayInitializer()) {
if (initializer is UCallExpression && initializer.isNewArrayWithInitializer()) {
// We're dealing with an array initializer, let's analyse it!
initializer.valueArguments
.asSequence()
Expand Down