From e42b5cfa40118e6fd0e5cb26b5d8e93ebc6d9143 Mon Sep 17 00:00:00 2001 From: He-Pin Date: Sat, 20 Jun 2026 03:41:44 +0800 Subject: [PATCH] refactor: replace private[this] with private MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Motivation: `private[this]` restricts access to the current instance only, but in singleton objects there is only one instance, making it semantically identical to `private`. In the final class `StringBuilderWriter`, the `builder` field has no cross-instance access. Using `private` uniformly simplifies the access modifier vocabulary without changing behavior. Modification: - Renderer.scala: `private[this] val builder` → `private val builder` - SetModule.scala: 8 `private[this] final val` constants and 2 `@inline private[this] def` methods → `private` / `@inline private` Result: Cleaner, more idiomatic Scala with no semantic change. --- sjsonnet/src/sjsonnet/Renderer.scala | 2 +- sjsonnet/src/sjsonnet/stdlib/SetModule.scala | 22 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sjsonnet/src/sjsonnet/Renderer.scala b/sjsonnet/src/sjsonnet/Renderer.scala index f825a79c..9c4198a9 100644 --- a/sjsonnet/src/sjsonnet/Renderer.scala +++ b/sjsonnet/src/sjsonnet/Renderer.scala @@ -5,7 +5,7 @@ import java.io.{StringWriter, Writer} import upickle.core.{ArrVisitor, ObjVisitor} final class StringBuilderWriter(initialCapacity: Int = 16) extends Writer { - private[this] val builder = new java.lang.StringBuilder(initialCapacity) + private val builder = new java.lang.StringBuilder(initialCapacity) /** * Exposes the underlying [[java.lang.StringBuilder]] for callers that need direct diff --git a/sjsonnet/src/sjsonnet/stdlib/SetModule.scala b/sjsonnet/src/sjsonnet/stdlib/SetModule.scala index 7d686eb9..f489dd9e 100644 --- a/sjsonnet/src/sjsonnet/stdlib/SetModule.scala +++ b/sjsonnet/src/sjsonnet/stdlib/SetModule.scala @@ -24,16 +24,16 @@ object SetModule extends AbstractFunctionModule { def name = "set" private val DefaultKeyF = Val.Null(dummyPos) - private[this] final val SortKindOther = 0 - private[this] final val SortKindString = 1 - private[this] final val SortKindNumber = 2 - private[this] final val SortKindArray = 3 - private[this] final val SortKindBoolean = 4 - private[this] final val SortKindObject = 5 - private[this] final val SortKindNull = 6 - private[this] final val SortKindFunction = 7 - - @inline private[this] def sortKind(v: Val): Int = v match { + private final val SortKindOther = 0 + private final val SortKindString = 1 + private final val SortKindNumber = 2 + private final val SortKindArray = 3 + private final val SortKindBoolean = 4 + private final val SortKindObject = 5 + private final val SortKindNull = 6 + private final val SortKindFunction = 7 + + @inline private def sortKind(v: Val): Int = v match { case _: Val.Str => SortKindString case _: Val.Num => SortKindNumber case _: Val.Arr => SortKindArray @@ -44,7 +44,7 @@ object SetModule extends AbstractFunctionModule { case _ => SortKindOther } - @inline private[this] def allSameSortKind(values: Array[Val], kind: Int): Boolean = { + @inline private def allSameSortKind(values: Array[Val], kind: Int): Boolean = { var i = 1 while (i < values.length) { if (sortKind(values(i)) != kind) return false