MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[test, diff] IDEA-382647 Use ReadAction to ensure consistent access to PSI elements

Browse Source 
GitOrigin-RevId: dd2f99d8028e9103fa7264719e91ac58a42fe1b2
This commit is contained in:
Aleksey Dobrynin
2025-11-27 16:05:59 +00:00
committed by intellij-monorepo-bot
parent f56df81462
commit 78c432bafc
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/testRunner/src/com/intellij/execution/testframework/actions/TestDiffContent.kt
+5 -3
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.execution.testframework.actions
import com.intellij.diff.DiffContentFactory
@@ -7,6 +7,7 @@ import com.intellij.diff.contents.DiffContentBase
import com.intellij.diff.contents.DocumentContent
import com.intellij.diff.util.DiffUserDataKeysEx
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.ReadAction
import com.intellij.openapi.command.CommandProcessor
import com.intellij.openapi.command.undo.UndoManager
import com.intellij.openapi.diff.DiffBundle
@@ -114,8 +115,9 @@ class TestDiffContent(
return TestDiffContent(project, diffContent, text, elemPtr).apply {
val originalLineConvertor = original.getUserData(DiffUserDataKeysEx.LINE_NUMBER_CONVERTOR)
putUserData(DiffUserDataKeysEx.LINE_NUMBER_CONVERTOR, IntUnaryOperator { value ->
if (!element.isValid) return@IntUnaryOperator -1
val line = value + original.document.getLineNumber(element.startOffset)
val valid = ReadAction.compute<Boolean, Throwable> { element.isValid }
if (!valid) return@IntUnaryOperator -1
val line = ReadAction.compute<Int, Throwable> { value + original.document.getLineNumber(element.startOffset) }
originalLineConvertor?.applyAsInt(line) ?: line
})
}