From e6aeb668750b8ef507ca8aa2956097ab8efad37c Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 18 Dec 2017 16:14:40 +0300 Subject: [PATCH] Sort files according to given scope in debugger (KT-21931) #KT-21931 Fixed --- .../src/org/jetbrains/kotlin/idea/debugger/DebuggerUtils.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/DebuggerUtils.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/DebuggerUtils.kt index d4e28879e65..75df25bfc40 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/DebuggerUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/DebuggerUtils.kt @@ -96,8 +96,10 @@ object DebuggerUtils { return result } - private fun findFilesByNameInPackage(className: JvmClassName, fileName: String, project: Project, searchScope: GlobalSearchScope) - = findFilesWithExactPackage(className.packageFqName, searchScope, project).filter { it.name == fileName } + private fun findFilesByNameInPackage(className: JvmClassName, fileName: String, project: Project, searchScope: GlobalSearchScope): List { + val files = findFilesWithExactPackage(className.packageFqName, searchScope, project).filter { it.name == fileName } + return files.sortedWith(JavaElementFinder.byClasspathComparator(searchScope)) + } fun analyzeInlinedFunctions( resolutionFacadeForFile: ResolutionFacade,