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

Open
O7410 wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

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

Changes from all commits
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
32 changes: 14 additions & 18 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 @@ -31,20 +31,21 @@ import com.demonwav.mcdev.util.constantStringValue
import com.demonwav.mcdev.util.constantValue
import com.demonwav.mcdev.util.descriptor
import com.demonwav.mcdev.util.findModule
import com.demonwav.mcdev.util.mapToArray
import com.demonwav.mcdev.util.referencedMethod
import com.demonwav.mcdev.util.toTypedArray
import com.intellij.codeInsight.AnnotationUtil
import com.intellij.codeInsight.completion.CompletionUtilCore
import com.intellij.codeInspection.dataFlow.CommonDataflow
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.RecursionManager
import com.intellij.psi.CommonClassNames
import com.intellij.psi.JavaPsiFacade
import com.intellij.psi.PsiArrayType
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiEllipsisType
import com.intellij.psi.PsiExpression
import com.intellij.psi.PsiParameter
import com.intellij.psi.PsiType
import com.intellij.psi.PsiPrimitiveType
import java.util.IllegalFormatException
import java.util.MissingFormatArgumentException
import org.jetbrains.uast.UCallExpression
Expand All @@ -54,7 +55,7 @@ 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.util.isNewArrayWithInitializer

object TranslationIdentifier {
fun identify(
Expand Down Expand Up @@ -203,24 +204,19 @@ object TranslationIdentifier {
}

val elements = args.drop(index)
return extractVarArgs(psiParam.type, elements)
return extractVarArgs(elements)?.mapToArray { it.paramDisplayString() }
}

private fun extractVarArgs(type: PsiType, elements: List<UExpression>): Array<String>? {
return if (elements[0].getExpressionType() == type) {
val initializer = elements[0]
if (initializer is UCallExpression && initializer.isArrayInitializer()) {
// We're dealing with an array initializer, let's analyse it!
initializer.valueArguments
.asSequence()
.map { it.paramDisplayString() }
.toTypedArray()
} else {
// We're dealing with a more complex expression that results in an array, give up
return null
}
private fun extractVarArgs(elements: List<UExpression>): List<UExpression>? {
val arg = elements.singleOrNull() ?: return elements
val arrayType = arg.getExpressionType() as? PsiArrayType ?: return elements
if (arrayType.componentType is PsiPrimitiveType) return elements
return if (arg is UCallExpression && arg.isNewArrayWithInitializer()) {
// We're dealing with an array initializer, let's use its elements!
arg.valueArguments
} else {
elements.asSequence().map { it.paramDisplayString() }.toTypedArray()
// We're dealing with a more complex expression that results in an array, give up
null
}
}

Expand Down