From 6ceed00f48b85545071a7b2490c3177914017670 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Mon, 12 Mar 2018 17:49:43 +0000
Subject: [PATCH] Cleanup NetworkChannel

---
 build.sbt                                           |  5 ++++-
 .../internal/server/LanguageServerProtocol.scala    |  3 ++-
 .../scala/sbt/internal/server/NetworkChannel.scala  | 13 +++----------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/build.sbt b/build.sbt
index a5f333fed..2f21cfe7f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -451,9 +451,12 @@ lazy val mainProj = (project in file("main"))
     sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala",
     mimaSettings,
     mimaBinaryIssueFilters ++= Vector(
-      // Changed signature or removed something in the internal pacakge
+      // Changed signature or removed something in the internal package
       exclude[DirectMissingMethodProblem]("sbt.internal.*"),
 
+      // Made something final in the internal package
+      exclude[FinalClassProblem]("sbt.internal.*"),
+
       // New and changed methods on KeyIndex. internal.
       exclude[ReversedMissingMethodProblem]("sbt.internal.KeyIndex.*"),
 
diff --git a/main/src/main/scala/sbt/internal/server/LanguageServerProtocol.scala b/main/src/main/scala/sbt/internal/server/LanguageServerProtocol.scala
index 8dc514d40..929ea21d1 100644
--- a/main/src/main/scala/sbt/internal/server/LanguageServerProtocol.scala
+++ b/main/src/main/scala/sbt/internal/server/LanguageServerProtocol.scala
@@ -20,7 +20,8 @@ import sbt.internal.langserver._
 import sbt.internal.util.ObjectEvent
 import sbt.util.Logger
 
-private[sbt] case class LangServerError(code: Long, message: String) extends Throwable(message)
+private[sbt] final case class LangServerError(code: Long, message: String)
+    extends Throwable(message)
 
 private[sbt] object LanguageServerProtocol {
   lazy val internalJsonProtocol = new InitializeOptionFormats with sjsonnew.BasicJsonProtocol {}
diff --git a/main/src/main/scala/sbt/internal/server/NetworkChannel.scala b/main/src/main/scala/sbt/internal/server/NetworkChannel.scala
index e1dc9fac0..9e5d3e718 100644
--- a/main/src/main/scala/sbt/internal/server/NetworkChannel.scala
+++ b/main/src/main/scala/sbt/internal/server/NetworkChannel.scala
@@ -46,18 +46,12 @@ final class NetworkChannel(val name: String,
   private val VsCodeOld = "application/vscode-jsonrpc; charset=utf8"
   private lazy val jsonFormat = new sjsonnew.BasicJsonProtocol with JValueFormats {}
 
-  def setContentType(ct: String): Unit = synchronized {
-    _contentType = ct
-  }
+  def setContentType(ct: String): Unit = synchronized { _contentType = ct }
   def contentType: String = _contentType
 
-  protected def authenticate(token: String): Boolean = {
-    instance.authenticate(token)
-  }
+  protected def authenticate(token: String): Boolean = instance.authenticate(token)
 
-  protected def setInitialized(value: Boolean): Unit = {
-    initialized = value
-  }
+  protected def setInitialized(value: Boolean): Unit = initialized = value
 
   protected def authOptions: Set[ServerAuthentication] = auth
 
@@ -74,7 +68,6 @@ final class NetworkChannel(val name: String,
         var bytesRead = 0
         def resetChannelState(): Unit = {
           contentLength = 0
-          // contentType = ""
           state = SingleLine
         }
         def tillEndOfLine: Option[Vector[Byte]] = {