Fix printing private and protected modifiers

Author: pweisenburger

compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala

@@ -1368,28 +1368,24 @@ object SourceCode {
 
     private def printProtectedOrPrivate(definition: Definition): Boolean = {
       var prefixWasPrinted = false
-      def printWithin(within: TypeRepr) = within match {
-        case TypeRef(_, name) => this += name
-        case _ => printFullClassName(within)
-      }
-      if (definition.symbol.flags.is(Flags.Protected)) {
+      def printWithin(within: Option[TypeRepr]) = within match
+        case _ if definition.symbol.flags.is(Flags.Local) => inSquare(this += "this")
+        case Some(TypeRef(_, name)) => inSquare(this += name)
+        case Some(within) => inSquare(printFullClassName(within))
+        case _ =>
+
+      if definition.symbol.flags.is(Flags.Protected) then
         this += highlightKeyword("protected")
-        definition.symbol.protectedWithin match {
-          case Some(within) =>
-            inSquare(printWithin(within))
-          case _ =>
-        }
+        printWithin(definition.symbol.protectedWithin)
         prefixWasPrinted = true
-      } else {
-        definition.symbol.privateWithin match {
-          case Some(within) =>
-            this += highlightKeyword("private")
-            inSquare(printWithin(within))
-            prefixWasPrinted = true
-          case _ =>
-        }
-      }
-      if (prefixWasPrinted)
+      else
+        val privateWithin = definition.symbol.privateWithin
+        if privateWithin.isDefined || definition.symbol.flags.is(Flags.Private) then
+          this += highlightKeyword("private")
+          printWithin(definition.symbol.privateWithin)
+          prefixWasPrinted = true
+
+      if prefixWasPrinted then
         this += " "
       prefixWasPrinted
     }

tests/run-macros/term-show/Macro_1.scala

@@ -0,0 +1,8 @@
+import scala.quoted.*
+
+object TypeToolbox {
+  inline def show(inline v: Any): String = ${ showImpl('v) }
+  private def showImpl(using Quotes)(v: Expr[Any]): Expr[String] =
+    import quotes.reflect.*
+    Expr(v.show)
+}

tests/run-macros/term-show/Test_2.scala

@@ -0,0 +1,29 @@
+object Test {
+  import TypeToolbox.*
+  def main(args: Array[String]): Unit = {
+   assert(show {
+      class C {
+        def a = 0
+        private def b = 0
+        private[this] def c = 0
+        private[C] def d = 0
+        protected def e = 0
+        protected[this] def f = 0
+        protected[C] def g = 0
+      }
+    }
+    ==
+    """{
+      |  class C() {
+      |    def a: scala.Int = 0
+      |    private[this] def b: scala.Int = 0
+      |    private[this] def c: scala.Int = 0
+      |    private[C] def d: scala.Int = 0
+      |    protected def e: scala.Int = 0
+      |    protected[this] def f: scala.Int = 0
+      |    protected[C] def g: scala.Int = 0
+      |  }
+      |  ()
+      |}""".stripMargin)
+  }
+}