azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not analyze all files in package in JetPositionManager

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-03-19 18:52:12 +03:00
parent a24f910b5a
commit 8bcc638bec
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt
+6 -8
View File
@@ -65,7 +65,7 @@ import java.util.Collections
class PositionedElement(val className: String?, val element: PsiElement?) class PositionedElement(val className: String?, val element: PsiElement?)
public class JetPositionManager(private val myDebugProcess: DebugProcess) : MultiRequestPositionManager { public class JetPositionManager(private val myDebugProcess: DebugProcess) : MultiRequestPositionManager {
private val myTypeMappers = WeakHashMap<Pair<FqName, IdeaModuleInfo>, CachedValue<JetTypeMapper>>() private val myTypeMappers = WeakHashMap<String, CachedValue<JetTypeMapper>>()
override fun getSourcePosition(location: Location?): SourcePosition? { override fun getSourcePosition(location: Location?): SourcePosition? {
if (location == null) { if (location == null) {
@@ -215,7 +215,7 @@ public class JetPositionManager(private val myDebugProcess: DebugProcess) : Mult
if (value == null) { if (value == null) {
value = CachedValuesManager.getManager(file.getProject()).createCachedValue<JetTypeMapper>( value = CachedValuesManager.getManager(file.getProject()).createCachedValue<JetTypeMapper>(
{() -> {() ->
val typeMapper = createTypeMapper(file, key.second) val typeMapper = createTypeMapper(file)
CachedValueProvider.Result<JetTypeMapper>(typeMapper, PsiModificationTracker.MODIFICATION_COUNT) CachedValueProvider.Result<JetTypeMapper>(typeMapper, PsiModificationTracker.MODIFICATION_COUNT)
}, false) }, false)
@@ -274,16 +274,14 @@ public class JetPositionManager(private val myDebugProcess: DebugProcess) : Mult
} }
class object { class object {
public fun createTypeMapper(file: JetFile, moduleInfo: IdeaModuleInfo): JetTypeMapper { public fun createTypeMapper(file: JetFile): JetTypeMapper {
val project = file.getProject() val project = file.getProject()
val packageFacadeScope = moduleInfo.contentScope()
val packageFiles = PackageIndexUtil.findFilesWithExactPackage(file.getPackageFqName(), packageFacadeScope, project)
val analysisResult = KotlinCacheService.getInstance(project).getAnalysisResults(packageFiles) val analysisResult = file.analyzeFullyAndGetResult()
analysisResult.throwIfError() analysisResult.throwIfError()
val state = GenerationState(project, ClassBuilderFactories.THROW_EXCEPTION, analysisResult.moduleDescriptor, val state = GenerationState(project, ClassBuilderFactories.THROW_EXCEPTION, analysisResult.moduleDescriptor,
analysisResult.bindingContext, packageFiles.toList()) analysisResult.bindingContext, listOf(file))
state.beforeCompile() state.beforeCompile()
return state.getTypeMapper() return state.getTypeMapper()
} }
@@ -427,7 +425,7 @@ public class JetPositionManager(private val myDebugProcess: DebugProcess) : Mult
return false return false
} }
private fun createKeyForTypeMapper(file: JetFile) = Pair(file.getPackageFqName(), file.getModuleInfo()) private fun createKeyForTypeMapper(file: JetFile) = PackagePartClassUtils.getPackagePartInternalName(file)
} }
private fun findInlinedCalls(element: PsiElement?, jetFile: PsiFile?): List<String> { private fun findInlinedCalls(element: PsiElement?, jetFile: PsiFile?): List<String> {