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

Minor: move methods from companion object

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-12-26 00:45:47 +03:00
parent 3678bda409
commit e8aef7d29e
1 changed files with 116 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
+20 -19
View File
@@ -360,24 +360,7 @@ public class KotlinPositionManager(private val myDebugProcess: DebugProcess) : M
myTypeMappers.put(key, value)
}
companion object {
public fun createTypeMapper(file: KtFile): JetTypeMapper {
val project = file.project
val analysisResult = file.analyzeFullyAndGetResult()
analysisResult.throwIfError()
val state = GenerationState(
project,
ClassBuilderFactories.THROW_EXCEPTION,
analysisResult.moduleDescriptor,
analysisResult.bindingContext,
listOf(file))
state.beforeCompile()
return state.typeMapper
}
public fun getInternalClassNameForElement(notPositionedElement: PsiElement?, typeMapper: JetTypeMapper, file: KtFile, isInLibrary: Boolean): PositionedElement {
private fun getInternalClassNameForElement(notPositionedElement: PsiElement?, typeMapper: JetTypeMapper, file: KtFile, isInLibrary: Boolean): PositionedElement {
val element = getElementToCalculateClassName(notPositionedElement)
when {
element is KtClassOrObject -> return PositionedElement(getJvmInternalNameForImpl(typeMapper, element), element)
@@ -483,7 +466,7 @@ public class KotlinPositionManager(private val myDebugProcess: DebugProcess) : M
}
private fun createKeyForTypeMapper(file: KtFile) = NoResolveFileClassesProvider.getFileClassInternalName(file)
}
private fun findInlinedCalls(element: PsiElement?, jetFile: PsiFile?): List<String> {
if (element == null || jetFile !is KtFile) {
@@ -518,4 +501,22 @@ public class KotlinPositionManager(private val myDebugProcess: DebugProcess) : M
}
private fun ReferenceType.containsKotlinStrata() = availableStrata().contains("Kotlin")
companion object {
public fun createTypeMapper(file: KtFile): JetTypeMapper {
val project = file.project
val analysisResult = file.analyzeFullyAndGetResult()
analysisResult.throwIfError()
val state = GenerationState(
project,
ClassBuilderFactories.THROW_EXCEPTION,
analysisResult.moduleDescriptor,
analysisResult.bindingContext,
listOf(file))
state.beforeCompile()
return state.typeMapper
}
}
}