mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-01-06 11:50:54 +07:00
[PyCharm] PY-74366 Jupyter/RemoteDev (fix): Keep command mode action handler only on frontend
(cherry picked from commit 5ada255740be515ddeb7237b86680630669682e6) (cherry picked from commit faa788f65a73279c6c62539e5c468f7d984215e1) IJ-CR-147319 GitOrigin-RevId: 2820d6df53ba458f2df2bfa2f381c3587a6b2bcc
This commit is contained in:
Nikita.Ashihmin
committed by
intellij-monorepo-bot
intellij-monorepo-bot
parent
a5608efc3a
commit
7d89c85eba
@@ -2,16 +2,9 @@
|
||||
package com.intellij.notebooks.ui.editor.actions.command.mode
|
||||
|
||||
import com.intellij.injected.editor.EditorWindow
|
||||
import com.intellij.openapi.actionSystem.ex.ActionUtil
|
||||
import com.intellij.openapi.application.ApplicationManager
|
||||
import com.intellij.openapi.diagnostic.thisLogger
|
||||
import com.intellij.openapi.editor.CaretVisualAttributes
|
||||
import com.intellij.openapi.editor.Editor
|
||||
import com.intellij.openapi.editor.event.CaretEvent
|
||||
import com.intellij.openapi.editor.event.CaretListener
|
||||
import com.intellij.openapi.editor.ex.EditorEx
|
||||
import com.intellij.openapi.editor.ex.MarkupModelEx
|
||||
import com.intellij.openapi.editor.ex.RangeHighlighterEx
|
||||
import com.intellij.openapi.util.Key
|
||||
import com.intellij.ui.Gray
|
||||
import com.intellij.util.concurrency.ThreadingAssertions
|
||||
@@ -40,87 +33,6 @@ interface NotebookEditorModeListener {
|
||||
fun onModeChange(editor: Editor, mode: NotebookEditorMode)
|
||||
}
|
||||
|
||||
class NotebookEditorModeListenerAdapter(private val editor: Editor) : NotebookEditorModeListener, CaretListener {
|
||||
private var currentEditorMode: NotebookEditorMode? = null
|
||||
|
||||
private fun getCaretAttributes(mode: NotebookEditorMode): CaretVisualAttributes {
|
||||
return when (mode) {
|
||||
NotebookEditorMode.EDIT -> CaretVisualAttributes.getDefault()
|
||||
NotebookEditorMode.COMMAND -> INVISIBLE_CARET
|
||||
}
|
||||
}
|
||||
|
||||
private fun isCaretRowShown(mode: NotebookEditorMode): Boolean =
|
||||
when (mode) {
|
||||
NotebookEditorMode.EDIT -> true
|
||||
NotebookEditorMode.COMMAND -> false
|
||||
}
|
||||
|
||||
private fun handleCarets(mode: NotebookEditorMode) {
|
||||
when (mode) {
|
||||
NotebookEditorMode.EDIT -> {
|
||||
// selection of multiple cells leads to multiple invisible carets, remove them
|
||||
editor.caretModel.removeSecondaryCarets()
|
||||
}
|
||||
NotebookEditorMode.COMMAND -> {
|
||||
// text selection shouldn't be visible in command mode
|
||||
for (caret in editor.caretModel.allCarets) {
|
||||
caret.removeSelection()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onModeChange(editor: Editor, mode: NotebookEditorMode) {
|
||||
val modeWasChanged = currentEditorMode != mode
|
||||
|
||||
currentEditorMode = mode
|
||||
|
||||
if (editor.isDisposed) {
|
||||
thisLogger().warn("Cannot change notebook mode, Editor is disposed already")
|
||||
return
|
||||
}
|
||||
|
||||
editor.apply {
|
||||
(markupModel as MarkupModelEx).apply {
|
||||
allHighlighters.filterIsInstance<RangeHighlighterEx>().forEach {
|
||||
val lineMarkerRenderer = it.getLineMarkerRenderer()
|
||||
it.setLineMarkerRenderer(null)
|
||||
it.setLineMarkerRenderer(lineMarkerRenderer) // to fireChange
|
||||
}
|
||||
}
|
||||
|
||||
if (modeWasChanged) {
|
||||
handleCarets(mode)
|
||||
editor.settings.isCaretRowShown = isCaretRowShown(mode)
|
||||
}
|
||||
|
||||
caretModel.allCarets.forEach { caret ->
|
||||
caret.visualAttributes = getCaretAttributes(mode)
|
||||
}
|
||||
|
||||
editor.contentComponent.putClientProperty(ActionUtil.ALLOW_PlAIN_LETTER_SHORTCUTS, when (mode) {
|
||||
NotebookEditorMode.EDIT -> false
|
||||
NotebookEditorMode.COMMAND -> true
|
||||
})
|
||||
editor.contentComponent.enableInputMethods(when (mode) {
|
||||
NotebookEditorMode.EDIT -> true
|
||||
NotebookEditorMode.COMMAND -> false
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
override fun caretAdded(event: CaretEvent) {
|
||||
val mode = currentEditorMode ?: return
|
||||
event.caret?.visualAttributes = getCaretAttributes(mode)
|
||||
(editor as EditorEx).gutterComponentEx.repaint()
|
||||
}
|
||||
|
||||
override fun caretRemoved(event: CaretEvent) {
|
||||
(editor as EditorEx).gutterComponentEx.repaint()
|
||||
}
|
||||
}
|
||||
|
||||
private val key = Key<NotebookEditorMode>("Jupyter Notebook Editor Mode")
|
||||
|
||||
val Editor.currentMode: NotebookEditorMode
|
||||
@@ -149,6 +61,6 @@ fun Editor.setMode(mode: NotebookEditorMode) {
|
||||
}
|
||||
}
|
||||
|
||||
private val INVISIBLE_CARET = CaretVisualAttributes(Gray.TRANSPARENT,
|
||||
CaretVisualAttributes.Weight.NORMAL)
|
||||
internal val INVISIBLE_CARET = CaretVisualAttributes(Gray.TRANSPARENT,
|
||||
CaretVisualAttributes.Weight.NORMAL)
|
||||
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
package com.intellij.notebooks.ui.editor.actions.command.mode
|
||||
|
||||
import com.intellij.openapi.Disposable
|
||||
import com.intellij.openapi.actionSystem.ex.ActionUtil
|
||||
import com.intellij.openapi.diagnostic.thisLogger
|
||||
import com.intellij.openapi.editor.CaretVisualAttributes
|
||||
import com.intellij.openapi.editor.Editor
|
||||
import com.intellij.openapi.editor.event.CaretEvent
|
||||
import com.intellij.openapi.editor.event.CaretListener
|
||||
import com.intellij.openapi.editor.ex.EditorEx
|
||||
import com.intellij.openapi.editor.ex.MarkupModelEx
|
||||
import com.intellij.openapi.editor.ex.RangeHighlighterEx
|
||||
import com.intellij.openapi.editor.ex.util.EditorUtil
|
||||
|
||||
class NotebookEditorModeListenerAdapter private constructor(private val editor: Editor) : NotebookEditorModeListener, CaretListener, Disposable.Default {
|
||||
private var currentEditorMode: NotebookEditorMode? = null
|
||||
|
||||
|
||||
override fun onModeChange(editor: Editor, mode: NotebookEditorMode) {
|
||||
val modeWasChanged = currentEditorMode != mode
|
||||
|
||||
currentEditorMode = mode
|
||||
|
||||
if (editor.isDisposed) {
|
||||
thisLogger().warn("Cannot change notebook mode, Editor is disposed already")
|
||||
return
|
||||
}
|
||||
|
||||
editor.apply {
|
||||
(markupModel as MarkupModelEx).apply {
|
||||
allHighlighters.filterIsInstance<RangeHighlighterEx>().forEach {
|
||||
val lineMarkerRenderer = it.getLineMarkerRenderer()
|
||||
it.setLineMarkerRenderer(null)
|
||||
it.setLineMarkerRenderer(lineMarkerRenderer) // to fireChange
|
||||
}
|
||||
}
|
||||
|
||||
if (modeWasChanged) {
|
||||
handleCarets(mode)
|
||||
editor.settings.isCaretRowShown = isCaretRowShown(mode)
|
||||
}
|
||||
|
||||
caretModel.allCarets.forEach { caret ->
|
||||
caret.visualAttributes = getCaretAttributes(mode)
|
||||
}
|
||||
|
||||
editor.contentComponent.putClientProperty(ActionUtil.ALLOW_PlAIN_LETTER_SHORTCUTS, when (mode) {
|
||||
NotebookEditorMode.EDIT -> false
|
||||
NotebookEditorMode.COMMAND -> true
|
||||
})
|
||||
editor.contentComponent.enableInputMethods(when (mode) {
|
||||
NotebookEditorMode.EDIT -> true
|
||||
NotebookEditorMode.COMMAND -> false
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
override fun caretAdded(event: CaretEvent) {
|
||||
val mode = currentEditorMode ?: return
|
||||
event.caret?.visualAttributes = getCaretAttributes(mode)
|
||||
(editor as EditorEx).gutterComponentEx.repaint()
|
||||
}
|
||||
|
||||
override fun caretRemoved(event: CaretEvent) {
|
||||
(editor as EditorEx).gutterComponentEx.repaint()
|
||||
}
|
||||
|
||||
private fun getCaretAttributes(mode: NotebookEditorMode) = when (mode) {
|
||||
NotebookEditorMode.EDIT -> CaretVisualAttributes.getDefault()
|
||||
NotebookEditorMode.COMMAND -> INVISIBLE_CARET
|
||||
}
|
||||
|
||||
private fun isCaretRowShown(mode: NotebookEditorMode): Boolean = when (mode) {
|
||||
NotebookEditorMode.EDIT -> true
|
||||
NotebookEditorMode.COMMAND -> false
|
||||
}
|
||||
|
||||
private fun handleCarets(mode: NotebookEditorMode) = when (mode) {
|
||||
NotebookEditorMode.EDIT -> {
|
||||
// selection of multiple cells leads to multiple invisible carets, remove them
|
||||
editor.caretModel.removeSecondaryCarets()
|
||||
}
|
||||
NotebookEditorMode.COMMAND -> {
|
||||
// text selection shouldn't be visible in command mode
|
||||
for (caret in editor.caretModel.allCarets) {
|
||||
caret.removeSelection()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
fun setupForEditor(editor: Editor) {
|
||||
val listener = NotebookEditorModeListenerAdapter(editor)
|
||||
editor.caretModel.addCaretListener(listener, listener)
|
||||
EditorUtil.disposeWithEditor(editor, listener)
|
||||
val connection = editor.project?.messageBus?.connect(listener)
|
||||
connection?.subscribe(NOTEBOOK_EDITOR_MODE, listener)
|
||||
listener.onModeChange(editor, editor.currentMode)
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user