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

Fix tests for KT-38079

Browse Source
This commit is contained in:
Kirill Shmakov
2020-04-07 20:49:54 +03:00
parent 2b8b5af18b
commit 5460327c8d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilter.kt
+2 -1
View File
@@ -16,6 +16,7 @@ import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.idea.debugger.* import org.jetbrains.kotlin.idea.debugger.*
import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.idea.util.application.runReadAction
import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.resolve.jvm.JvmClassName
import java.lang.Math.max
import java.util.* import java.util.*
import java.util.regex.Pattern 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) val highlightEndOffset = offset + (if (lineNumber > 0) line.lastIndex else fileNameEnd)
// OpenFileHyperlinkInfo accepts zero-based line number // 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) return Filter.Result(offset + fileNameBegin, highlightEndOffset, hyperLinkInfo)
} }
idea/tests/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterTest.kt
+2 -2
View File
@@ -32,8 +32,8 @@ class KotlinExceptionFilterTest : KotlinLightCodeInsightFixtureTestCase() {
private var myExceptionLine: String = "" private var myExceptionLine: String = ""
private val mySuffixOptions = listOf( private val mySuffixOptions = listOf(
SuffixOption("10:1", 10, 1), SuffixOption("10:1", 9, 1),
SuffixOption("14:11", 14, 11), SuffixOption("14:11", 13, 11),
SuffixOption("<unknown>", 0, 0) SuffixOption("<unknown>", 0, 0)
) )