@@ -8,6 +8,7 @@ import com.intellij.openapi.progress.ProgressIndicator
88import com.intellij.openapi.progress.Task
99import com.intellij.openapi.project.DumbService
1010import com.intellij.openapi.project.Project
11+ import com.intellij.openapi.roots.ModuleRootManager
1112import com.intellij.openapi.roots.OrderEnumerator
1213import com.intellij.openapi.roots.ProjectFileIndex
1314import com.intellij.openapi.ui.Messages
@@ -27,7 +28,6 @@ import com.intellij.task.impl.ProjectTaskList
2728import com.intellij.util.concurrency.AppExecutorUtil
2829import com.intellij.util.containers.ContainerUtil
2930import com.intellij.util.containers.nullize
30- import com.jetbrains.python.sdk.basePath
3131import java.io.File
3232import java.nio.file.Path
3333import java.nio.file.Paths
@@ -236,13 +236,17 @@ object UtTestsDialogProcessor {
236236 when (val approach = model.typeReplacementApproach) {
237237 DoNotReplace -> emptyList()
238238 is ReplaceIfPossible -> {
239- // TODO: use common parent path for srcModule and used Spring
240- // config module if they are different modules
241- val projectFileStorage = model.srcModule.basePath
239+ val contentRoots = listOfNotNull(
240+ model.srcModule,
241+ springConfigClass?.module
242+ ).distinct().flatMap { module ->
243+ ModuleRootManager .getInstance(module).contentRoots.toList()
244+ }
242245 process.getSpringBeanQualifiedNames(
243246 classpathForClassLoader,
244247 approach.config,
245- projectFileStorage,
248+ // TODO: consider passing it as an array
249+ contentRoots.joinToString(File .pathSeparator),
246250 )
247251 }
248252 }
0 commit comments