From 2e5cc82959ca49d29246720b73e671965467f5e7 Mon Sep 17 00:00:00 2001
From: Sergey Simonchik <sergey.simonchik@jetbrains.com>
Date: Sat, 9 Dec 2023 22:31:53 +0100
Subject: [PATCH] terminal: use `session.commandManager.sendCommandToExecute`
 instead of `session.sendCommandToExecute`

It is a misleading shortcut now, when command isn't sent to the process immediately.

GitOrigin-RevId: 1e9b571d8980ec22eed8255ce73d7292c6a05e00
---
 .../jetbrains/plugins/terminal/exp/BlockTerminalController.kt | 2 +-
 .../jetbrains/plugins/terminal/exp/BlockTerminalSession.kt    | 4 ----
 .../org/jetbrains/plugins/terminal/exp/PlainTerminalView.kt   | 2 +-
 .../org/jetbrains/plugins/terminal/block/BlockTerminalTest.kt | 4 ++--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalController.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalController.kt
index 3104926e1ce2..3ceeadd19261 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalController.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalController.kt
@@ -60,7 +60,7 @@ class BlockTerminalController(
     promptVisibilityAlarm.addRequest(Runnable {
       promptController.promptIsVisible = false
     }, 50)
-    session.sendCommandToExecute(command)
+    session.commandManager.sendCommandToExecute(command)
     session.model.isCommandRunning = true
   }
 
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalSession.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalSession.kt
index f935c1478e1a..2296a33c72b3 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalSession.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalSession.kt
@@ -79,10 +79,6 @@ class BlockTerminalSession(settings: JBTerminalSystemSettingsProviderBase,
     TerminalUtil.addItem(terminationListeners, onTerminated, parentDisposable)
   }
 
-  fun sendCommandToExecute(shellCommand: String) {
-    commandManager.sendCommandToExecute(shellCommand)
-  }
-
   fun postResize(newSize: TermSize) {
     terminalStarterFuture.thenAccept {
       if (it != null && (newSize.columns != model.width || newSize.rows != model.height)) {
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/PlainTerminalView.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/PlainTerminalView.kt
index 9709b76def4b..c96c1c295358 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/PlainTerminalView.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/PlainTerminalView.kt
@@ -62,7 +62,7 @@ class PlainTerminalView(
   }
 
   override fun sendCommandToExecute(shellCommand: String) {
-    session.sendCommandToExecute(shellCommand)
+    session.commandManager.sendCommandToExecute(shellCommand)
   }
 
   override fun dispose() {}
diff --git a/plugins/terminal/tests/org/jetbrains/plugins/terminal/block/BlockTerminalTest.kt b/plugins/terminal/tests/org/jetbrains/plugins/terminal/block/BlockTerminalTest.kt
index 12b66e178849..304caf3c3013 100644
--- a/plugins/terminal/tests/org/jetbrains/plugins/terminal/block/BlockTerminalTest.kt
+++ b/plugins/terminal/tests/org/jetbrains/plugins/terminal/block/BlockTerminalTest.kt
@@ -99,7 +99,7 @@ class BlockTerminalTest(private val shellPath: String) {
         }
         withTimeout(20.seconds) { generatorCommandSent.await() }
         delay((1..50).random().milliseconds) // wait a little to start generator
-        session.sendCommandToExecute("echo foo")
+        session.sendCommandToExecuteWithoutAddingToHistory("echo foo")
         val env: ShellEnvironment? = withTimeout(20.seconds) { envListDeferred.await() }
         Assert.assertTrue(env != null && env.envs.isNotEmpty())
         assertCommandResult(0, "foo\n", outputFuture)
@@ -176,7 +176,7 @@ class BlockTerminalTest(private val shellPath: String) {
     TerminalSessionTestUtil.startBlockTerminalSession(projectRule.project, shellPath, disposableRule.disposable, termSize)
 
   private fun BlockTerminalSession.sendCommandToExecuteWithoutAddingToHistory(shellCommand: String) {
-    this.sendCommandToExecute(" $shellCommand")
+    this.commandManager.sendCommandToExecute(" $shellCommand")
   }
 
   @Suppress("SameParameterValue")