Fix compareCustom function in IrLineNumberTest class, to exclude comment

lines that are not related for line number verification. Unmute a test case should have been unmuted but shadowed by this bug.
JetBrains · May 8, 2019 · 2c5ebf3 · 2c5ebf3
1 parent 8c83beb
commit 2c5ebf3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/compiler/testData/lineNumber/custom/functionCallWithDefault.kt b/compiler/testData/lineNumber/custom/functionCallWithDefault.kt
@@ -8,5 +8,5 @@ fun foo(i: Int = 1) {
 
 inline fun bar(i: Int = 1) {
 }
-// IGNORE_BACKEND: JVM_IR
+
 // 2 3 13 14 4 7 6 10 9 15
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrLineNumberTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrLineNumberTest.kt
@@ -25,7 +25,7 @@ abstract class AbstractIrLineNumberTest : AbstractLineNumberTest() {
     override fun compareCustom(psiFile: KtFile, wholeFile: File) {
         val fileText = psiFile.text
         val expectedLineNumbers = normalize(
-            fileText.substring(fileText.indexOf("//") + 2)
+            fileText.substring(Regex("// \\d+").find(fileText)!!.range.start + 2)
                 .trim().split(" ").map { it.trim() }.toMutableList()
         )
         val actualLineNumbers = normalize(extractActualLineNumbersFromBytecode(classFileFactory, false))