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

Minor. Code clean

Browse Source
This commit is contained in:
Mikhael Bogdanov
2018-06-14 11:12:47 +02:00
parent 7c615eb7ab
commit 83ab2b1d34
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt
+4 -4
View File
@@ -21,8 +21,8 @@ import org.jetbrains.kotlin.codegen.ClassBuilder
import org.jetbrains.kotlin.codegen.SourceInfo import org.jetbrains.kotlin.codegen.SourceInfo
import java.util.* import java.util.*
val KOTLIN_STRATA_NAME = "Kotlin" const val KOTLIN_STRATA_NAME = "Kotlin"
val KOTLIN_DEBUG_STRATA_NAME = "KotlinDebug" const val KOTLIN_DEBUG_STRATA_NAME = "KotlinDebug"
//TODO join parameter //TODO join parameter
class SMAPBuilder( class SMAPBuilder(
@@ -104,7 +104,7 @@ open class NestedSourceMapper(
mappedLineNumber mappedLineNumber
} else { } else {
val rangeForMapping = val rangeForMapping =
(if (lastVisitedRange?.contains(lineNumber) ?: false) lastVisitedRange!! else findMappingIfExists(lineNumber)) (if (lastVisitedRange?.contains(lineNumber) == true) lastVisitedRange!! else findMappingIfExists(lineNumber))
?: error("Can't find range to map line $lineNumber in ${sourceInfo.source}: ${sourceInfo.pathOrCleanFQN}") ?: error("Can't find range to map line $lineNumber in ${sourceInfo.source}: ${sourceInfo.pathOrCleanFQN}")
val sourceLineNumber = rangeForMapping.mapDestToSource(lineNumber) val sourceLineNumber = rangeForMapping.mapDestToSource(lineNumber)
val newLineNumber = parent.mapLineNumber(sourceLineNumber, rangeForMapping.parent!!.name, rangeForMapping.parent!!.path) val newLineNumber = parent.mapLineNumber(sourceLineNumber, rangeForMapping.parent!!.name, rangeForMapping.parent!!.path)
@@ -135,7 +135,7 @@ open class InlineLambdaSourceMapper(
} }
override fun mapLineNumber(lineNumber: Int): Int { override fun mapLineNumber(lineNumber: Int): Int {
if (ranges.firstOrNull()?.contains(lineNumber) ?: false) { if (ranges.firstOrNull()?.contains(lineNumber) == true) {
//don't remap origin lambda line numbers //don't remap origin lambda line numbers
return lineNumber return lineNumber
} }