From 5460327c8d90a02260a0a66c2284b6ba15dd922f Mon Sep 17 00:00:00 2001 From: Kirill Shmakov Date: Tue, 7 Apr 2020 20:49:54 +0300 Subject: [PATCH] Fix tests for KT-38079 --- .../jetbrains/kotlin/idea/filters/KotlinExceptionFilter.kt | 3 ++- .../kotlin/idea/filters/KotlinExceptionFilterTest.kt | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilter.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilter.kt index bf4d7fbe0c7..1c44838e77f 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilter.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilter.kt @@ -16,6 +16,7 @@ import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.idea.debugger.* import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.resolve.jvm.JvmClassName +import java.lang.Math.max import java.util.* import java.util.regex.Pattern @@ -154,7 +155,7 @@ class KotlinExceptionFilter(private val searchScope: GlobalSearchScope) : Filter val highlightEndOffset = offset + (if (lineNumber > 0) line.lastIndex else fileNameEnd) // OpenFileHyperlinkInfo accepts zero-based line number - val hyperLinkInfo = OpenFileHyperlinkInfo(project, virtualFile, lineNumber - 1, columnNumber) + val hyperLinkInfo = OpenFileHyperlinkInfo(project, virtualFile, max(0, lineNumber - 1), columnNumber) return Filter.Result(offset + fileNameBegin, highlightEndOffset, hyperLinkInfo) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterTest.kt b/idea/tests/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterTest.kt index 57fe261c5c7..0811d5fc8bc 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterTest.kt @@ -32,8 +32,8 @@ class KotlinExceptionFilterTest : KotlinLightCodeInsightFixtureTestCase() { private var myExceptionLine: String = "" private val mySuffixOptions = listOf( - SuffixOption("10:1", 10, 1), - SuffixOption("14:11", 14, 11), + SuffixOption("10:1", 9, 1), + SuffixOption("14:11", 13, 11), SuffixOption("", 0, 0) )