From 942006ab33c480336d46f15dcd3caca508bbb149 Mon Sep 17 00:00:00 2001
From: Bart van Helvert <bart.vanhelvert@jetbrains.com>
Date: Wed, 11 Feb 2026 22:08:39 +0100
Subject: [PATCH] refactor [jvm]: Simplify call chains

GitOrigin-RevId: ed33660bc3bd21d007755bce22761ebf4bcd0368
---
 .../codeInspection/sourceToSink/TaintAnalyzer.kt      |  4 +---
 .../codeInspection/sourceToSink/TaintValueFactory.kt  | 11 +++--------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/sourceToSink/TaintAnalyzer.kt b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/sourceToSink/TaintAnalyzer.kt
index 03df0ffe4c24..4bcd02fd1a05 100644
--- a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/sourceToSink/TaintAnalyzer.kt
+++ b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/sourceToSink/TaintAnalyzer.kt
@@ -1060,9 +1060,7 @@ class TaintAnalyzer(private val myTaintValueFactory: TaintValueFactory) {
         .getCachedValue(parentSourcePsiForCache, CachedValueProvider {
           val uClass = parentSourcePsiForCache.toUElement() as? UClass
           val uMethods = if (uClass != null) {
-            listOf(uClass, *uClass.innerClasses)
-              .map { it.methods.toList() }
-              .flatten()
+            listOf(uClass, *uClass.innerClasses).flatMap { it.methods.toList() }
           }
           else {
             listOf()
diff --git a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/sourceToSink/TaintValueFactory.kt b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/sourceToSink/TaintValueFactory.kt
index fc9f3ec360d7..04fab3eccc8c 100644
--- a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/sourceToSink/TaintValueFactory.kt
+++ b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/sourceToSink/TaintValueFactory.kt
@@ -170,8 +170,7 @@ class TaintValueFactory(private val myConfiguration: UntaintedConfiguration) {
       if (allowSecond) {
         info = context.secondaryItems().asSequence()
                  .flatMap { listOf(fromElementInner(CustomContext(it, context.place, null), false), fromAnnotationOwner(it.modifierList)) }
-                 .filter { it != null && it !== TaintValue.UNKNOWN }
-                 .firstOrNull() ?: info
+                 .firstOrNull { it != null && it !== TaintValue.UNKNOWN } ?: info
       }
     }
     if (info == TaintValue.UNKNOWN) {
@@ -196,10 +195,7 @@ class TaintValueFactory(private val myConfiguration: UntaintedConfiguration) {
     }
     val annotationsManager = ExternalAnnotationsManager.getInstance(owner.project)
     val annotations = annotationsManager.findExternalAnnotations(owner)
-    return annotations.asSequence()
-             .map { fromAnnotation(it) }
-             .filterNotNull()
-             .firstOrNull() ?: TaintValue.UNKNOWN
+    return annotations.asSequence().firstNotNullOfOrNull { fromAnnotation(it) } ?: TaintValue.UNKNOWN
   }
 
   private fun of(annotationOwner: PsiModifierListOwner): TaintValue {
@@ -305,8 +301,7 @@ class TaintValueFactory(private val myConfiguration: UntaintedConfiguration) {
     val target = context.target
     if (target is PsiMethod) {
       val result = customReturnFactories.asSequence()
-        .map { it.invoke(target, context.targetClass) }
-        .filterNotNull()
+        .mapNotNull { it.invoke(target, context.targetClass) }
         .reduceOrNull { acc, returnFactoriesResult -> acc.reduce(returnFactoriesResult) }
       if (result?.taintValue != null) {
         return result.taintValue