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

[DS-5554] move read action up to caller code and wrap whole cycles inside one read

Browse Source 
GitOrigin-RevId: a807c4a3d6266d57d0c152932e6c88a16e3dbcab
This commit is contained in:
Igor Slobodskov
2023-09-21 19:01:58 +00:00
committed by intellij-monorepo-bot
parent 6693fa4425
commit 89dd759681
1 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/CaretBasedCellSelectionModel.kt
+27 -25
View File
@@ -23,14 +23,18 @@ class CaretBasedCellSelectionModel(private val editor: Editor) : NotebookCellSel
override val selectedCells: List<NotebookCellLines.Interval>
get() {
val notebookCellLines = NotebookCellLines.get(editor)
return editor.caretModel.allCarets.flatMap { caret ->
notebookCellLines.getCells(editor.document.getSelectionLines(caret))
}.distinct()
return ReadAction.compute<List<NotebookCellLines.Interval>, Throwable> {
editor.caretModel.allCarets.flatMap { caret ->
notebookCellLines.getCells(editor.document.getSelectionLines(caret))
}.distinct()
}
}
override fun isSelectedCell(cell: NotebookCellLines.Interval): Boolean =
editor.caretModel.allCarets.any { caret ->
editor.document.getSelectionLines(caret).hasIntersectionWith(cell.lines)
ReadAction.compute<Boolean, Throwable> {
editor.caretModel.allCarets.any { caret ->
editor.document.getSelectionLines(caret).hasIntersectionWith(cell.lines)
}
}
override fun selectCell(cell: NotebookCellLines.Interval, makePrimary: Boolean) {
@@ -61,28 +65,26 @@ class CaretBasedCellSelectionModel(private val editor: Editor) : NotebookCellSel
}
private fun Document.getSelectionLines(caret: Caret): IntRange {
return ReadAction.compute<IntRange, Throwable> {
val selectionStart = caret.selectionStart
val selectionEnd = caret.selectionEnd
val lastLine = getLineNumber(selectionEnd)
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@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)
// 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)
}
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