MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

DS-5554 Caret access is moved under read action to avoid read access exceptions

Browse Source 
GitOrigin-RevId: 2a252a71cd6d5deacebb4f7aa7115cb0eab2473c
This commit is contained in:
Anton Bragin
2023-09-15 12:26:54 +02:00
committed by intellij-monorepo-bot
parent 2b641a7f92
commit 24521d56f2
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/CaretBasedCellSelectionModel.kt
View File

@@ -1,5 +1,6 @@
package org.jetbrains.plugins.notebooks.visualization
import com.intellij.openapi.application.ReadAction
import com.intellij.openapi.editor.Caret
import com.intellij.openapi.editor.Document
import com.intellij.openapi.editor.Editor
@@ -60,26 +61,28 @@ class CaretBasedCellSelectionModel(private val editor: Editor) : NotebookCellSel
}
private fun Document.getSelectionLines(caret: Caret): IntRange {
val selectionStart = caret.selectionStart
val selectionEnd = caret.selectionEnd
val lastLine = getLineNumber(selectionEnd)
return ReadAction.compute<IntRange, Throwable> {
val selectionStart = caret.selectionStart
val selectionEnd = caret.selectionEnd
val lastLine = getLineNumber(selectionEnd)
// See: DS-3659 Context menu action "Delete cell" deletes wrong cell
if (caret.offset < selectionStart || caret.offset > selectionEnd) {
val caretLine = getLineNumber(caret.offset)
return IntRange(caretLine, caretLine)
// See: DS-3659 Context menu action "Delete cell" deletes wrong cell
if (caret.offset < selectionStart || caret.offset > selectionEnd) {
val caretLine = getLineNumber(caret.offset)
return@compute IntRange(caretLine, caretLine)
}
if (caret.offset < selectionEnd && getLineStartOffset(lastLine) == selectionEnd) {
// for example, after triple click on line1
// #%%
// <selection><caret>line1
// </selection>#%%
// line2
return@compute IntRange(getLineNumber(caret.selectionStart), lastLine - 1)
}
return@compute IntRange(getLineNumber(caret.selectionStart), lastLine)
}
if (caret.offset < selectionEnd && getLineStartOffset(lastLine) == selectionEnd) {
// for example, after triple click on line1
// #%%
// <selection><caret>line1
// </selection>#%%
// line2
return IntRange(getLineNumber(caret.selectionStart), lastLine - 1)
}
return IntRange(getLineNumber(caret.selectionStart), lastLine)
}
private val NotebookCellLines.Interval.startLogicalPosition: LogicalPosition