From 027474cfb8394cb7ef8c70bba6a5575cddd47484 Mon Sep 17 00:00:00 2001 From: Brian Norman Date: Wed, 14 Feb 2024 07:48:16 -0600 Subject: [PATCH] [PowerAssert] Correctly align infix calls with string const receivers ^KT-65640 Fixed --- .../src/org/jetbrains/kotlin/powerassert/diagram/IrDiagram.kt | 1 - plugins/power-assert/testData/codegen/infix/RegexFunction.kt | 4 ---- plugins/power-assert/testData/codegen/infix/RegexInfix.kt | 4 ---- 3 files changed, 9 deletions(-) diff --git a/plugins/power-assert/power-assert.backend/src/org/jetbrains/kotlin/powerassert/diagram/IrDiagram.kt b/plugins/power-assert/power-assert.backend/src/org/jetbrains/kotlin/powerassert/diagram/IrDiagram.kt index 9b780415405..4a6a8c798e0 100644 --- a/plugins/power-assert/power-assert.backend/src/org/jetbrains/kotlin/powerassert/diagram/IrDiagram.kt +++ b/plugins/power-assert/power-assert.backend/src/org/jetbrains/kotlin/powerassert/diagram/IrDiagram.kt @@ -192,7 +192,6 @@ private fun memberAccessOffset( ?: return 0 val expressionInfo = sourceFile.getSourceRangeInfo(expression) var offset = receiver.endOffset - expressionInfo.startOffset + 1 - if (receiver is IrConst<*> && receiver.kind == IrConstKind.String) offset++ // String constants don't include the quote if (offset < 0 || offset >= source.length) return 0 // infix function called using non-infix syntax // Continue until there is a non-whitespace character diff --git a/plugins/power-assert/testData/codegen/infix/RegexFunction.kt b/plugins/power-assert/testData/codegen/infix/RegexFunction.kt index e295a721edb..1c60cbe717e 100644 --- a/plugins/power-assert/testData/codegen/infix/RegexFunction.kt +++ b/plugins/power-assert/testData/codegen/infix/RegexFunction.kt @@ -1,7 +1,3 @@ -// IGNORE_BACKEND_K1: JVM_IR -// IGNORE_BACKEND_K2: JVM_IR -// Disabled because of KT-65640 - fun box() = expectThrowableMessage { assert("Hello, World".matches("[A-Za-z]+".toRegex())) } diff --git a/plugins/power-assert/testData/codegen/infix/RegexInfix.kt b/plugins/power-assert/testData/codegen/infix/RegexInfix.kt index 55954833e3c..d3df1793097 100644 --- a/plugins/power-assert/testData/codegen/infix/RegexInfix.kt +++ b/plugins/power-assert/testData/codegen/infix/RegexInfix.kt @@ -1,7 +1,3 @@ -// IGNORE_BACKEND_K1: JVM_IR -// IGNORE_BACKEND_K2: JVM_IR -// Disabled because of KT-65640 - fun box() = expectThrowableMessage { assert("Hello, World" matches "[A-Za-z]+".toRegex()) }