From 5d5fe21ec5aeb201bd3ac747935261ae99bbdfeb Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 3 Mar 2025 04:34:19 -0500
Subject: [PATCH] Revert run switching on 1.x

**Problem**
client-side run apparently won't work for Scala.JS,
so forcing sbtn users to client-side run will break the Scala.JS users.

**Solution**
This reverts the client-side run on sbt 1.x, while retaining the
mechanism for sbt 2.x usages via sbtn.
Now, if `run / connectInput := true` is true, stdout will not display on sbtn.
---
 .../sbt/internal/server/NetworkChannel.scala      | 15 ---------------
 .../src/test/scala/testpkg/ClientTest.scala       |  7 +------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/main/src/main/scala/sbt/internal/server/NetworkChannel.scala b/main/src/main/scala/sbt/internal/server/NetworkChannel.scala
index 6eebe449a..36ace91f1 100644
--- a/main/src/main/scala/sbt/internal/server/NetworkChannel.scala
+++ b/main/src/main/scala/sbt/internal/server/NetworkChannel.scala
@@ -148,21 +148,6 @@ final class NetworkChannel(
       self.onCancellationRequest(execId, crp)
   }
 
-  // Take over commandline for network channel
-  private val networkCommand: PartialFunction[String, String] = {
-    case cmd if cmd.split(" ").head.split("/").last == "run" =>
-      s"clientJob $cmd"
-  }
-  override protected def appendExec(commandLine: String, execId: Option[String]): Boolean =
-    if (clientCanWork && networkCommand.isDefinedAt(commandLine))
-      super.appendExec(networkCommand(commandLine), execId)
-    else super.appendExec(commandLine, execId)
-
-  override private[sbt] def onCommandLine(cmd: String): Boolean =
-    if (clientCanWork && networkCommand.isDefinedAt(cmd))
-      appendExec(networkCommand(cmd), None)
-    else super.onCommandLine(cmd)
-
   protected def setInitializeOption(opts: InitializeOption): Unit = initializeOption.set(opts)
 
   // Returns true if sbtn has declared with canWork: true
diff --git a/server-test/src/test/scala/testpkg/ClientTest.scala b/server-test/src/test/scala/testpkg/ClientTest.scala
index be9a29a13..628cbbda3 100644
--- a/server-test/src/test/scala/testpkg/ClientTest.scala
+++ b/server-test/src/test/scala/testpkg/ClientTest.scala
@@ -68,7 +68,7 @@ object ClientTest extends AbstractServerTest {
         false
       )
     )
-  private def clientWithStdoutLines(args: String*): (Int, Seq[String]) = {
+  def clientWithStdoutLines(args: String*): (Int, Seq[String]) = {
     val out = new CachingPrintStream
     val exitCode = background(
       NetworkClient.client(
@@ -120,11 +120,6 @@ object ClientTest extends AbstractServerTest {
   test("three commands with middle failure") { _ =>
     assert(client("compile;willFail;willSucceed") == 1)
   }
-  test("run") { _ =>
-    val (exitCode, lines) = clientWithStdoutLines("run")
-    assert(exitCode == 0)
-    assert(lines.toList.exists(_.endsWith("Hello, World!")))
-  }
   test("compi completions") { _ =>
     val expected = Vector(
       "compile",