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

Merge pull request #2321 from neetopia/irLineNumberTestFix

Browse Source 
Fix compareCustom function in IrLineNumberTest class, to exclude comment
This commit is contained in:
max-kammerer
2019-05-10 11:40:19 +02:00
committed by GitHub
parent 021e94dced 2c5ebf3ab2
commit eeb1c0a0fc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/lineNumber/custom/functionCallWithDefault.kt
Vendored
+1 -1
View File
@@ -8,5 +8,5 @@ fun foo(i: Int = 1) {
inline fun bar(i: Int = 1) { inline fun bar(i: Int = 1) {
} }
// IGNORE_BACKEND: JVM_IR
// 2 3 13 14 4 7 6 10 9 15 // 2 3 13 14 4 7 6 10 9 15
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrLineNumberTest.kt
+1 -1
View File
@@ -25,7 +25,7 @@ abstract class AbstractIrLineNumberTest : AbstractLineNumberTest() {
override fun compareCustom(psiFile: KtFile, wholeFile: File) { override fun compareCustom(psiFile: KtFile, wholeFile: File) {
val fileText = psiFile.text val fileText = psiFile.text
val expectedLineNumbers = normalize( val expectedLineNumbers = normalize(
fileText.substring(fileText.indexOf("//") + 2) fileText.substring(Regex("// \\d+").find(fileText)!!.range.start + 2)
.trim().split(" ").map { it.trim() }.toMutableList() .trim().split(" ").map { it.trim() }.toMutableList()
) )
val actualLineNumbers = normalize(extractActualLineNumbersFromBytecode(classFileFactory, false)) val actualLineNumbers = normalize(extractActualLineNumbersFromBytecode(classFileFactory, false))