[terminal] IDEA-337522 Refactor: create events handler inside SimpleTerminalController

GitOrigin-RevId: a941b138ef2ed13c65d8f70df44c4c1f3d5a8a22
This commit is contained in:
Konstantin Hudyakov
2023-11-09 10:46:05 +00:00
committed by intellij-monorepo-bot
parent ce03113617
commit bb5a58edeb
4 changed files with 5 additions and 8 deletions
@@ -132,8 +132,7 @@ class BlockTerminalView(
}
private fun installAlternateBufferPanel() {
val eventsHandler = SimpleTerminalEventsHandler(session, settings)
val view = SimpleTerminalView(project, settings, session, eventsHandler, withVerticalScroll = false)
val view = SimpleTerminalView(project, settings, session, withVerticalScroll = false)
Disposer.register(this, view)
alternateBufferView = view
@@ -30,8 +30,7 @@ class PlainTerminalView(
private val view: SimpleTerminalView
init {
val eventsHandler = SimpleTerminalEventsHandler(session, settings)
view = SimpleTerminalView(project, settings, session, eventsHandler)
view = SimpleTerminalView(project, settings, session)
view.component.addComponentListener(object : ComponentAdapter() {
override fun componentResized(e: ComponentEvent?) {
val newSize = getTerminalSize() ?: return
@@ -20,8 +20,7 @@ import org.jetbrains.plugins.terminal.exp.TerminalUiUtils.toTextAttributes
class SimpleTerminalController(
settings: JBTerminalSystemSettingsProviderBase,
private val session: TerminalSession,
private val editor: EditorEx,
eventsHandler: TerminalEventsHandler
private val editor: EditorEx
) : Disposable {
val document: Document
get() = editor.document
@@ -43,6 +42,7 @@ class SimpleTerminalController(
terminalModel.isCommandRunning = true
setupContentListener()
val eventsHandler = SimpleTerminalEventsHandler(session, settings)
setupKeyEventDispatcher(editor, settings, eventsHandler, outputModel, selectionModel, disposable = this)
setupMouseListener(editor, settings, terminalModel, eventsHandler, disposable = this)
terminalModel.withContentLock {
@@ -25,7 +25,6 @@ class SimpleTerminalView(
private val project: Project,
private val settings: JBTerminalSystemSettingsProviderBase,
session: TerminalSession,
eventsHandler: TerminalEventsHandler,
private val withVerticalScroll: Boolean = true
) : Disposable {
private val editor: EditorImpl
@@ -48,7 +47,7 @@ class SimpleTerminalView(
init {
val palette = session.colorPalette
editor = createEditor(palette)
controller = SimpleTerminalController(settings, session, editor, eventsHandler)
controller = SimpleTerminalController(settings, session, editor)
component = SimpleTerminalPanel(palette)
editor.addFocusListener(object : FocusChangeListener {
override fun focusGained(editor: Editor) {