Adjustments for dollars

som-snytt · som-snytt · commit 3690e96f22cd · 2025-12-07T05:31:57.000-08:00
diff --git a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileTastyUUIDParser.scala b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileTastyUUIDParser.scala
@@ -104,6 +104,6 @@ class ClassfileTastyUUIDParser(classfile: AbstractFile)(ictx: Context){
 class ConstantPool(using in: DataReader) extends ClassfileParser.AbstractConstantPool{
 def getClassOrArrayType(index: Int)(using ctx: Context, in: DataReader): Type = throw new UnsupportedOperationException
 def getClassSymbol(index: Int)(using ctx: Context, in: DataReader): Symbol = throw new UnsupportedOperationException
- def getType(index: Int, isVarargs: Boolean)(using x$3: Context, x$4: DataReader): Type = throw new UnsupportedOperationException
+ def getType(index: Int, isVarargs: Boolean)(using Context, DataReader): Type = throw new UnsupportedOperationException
 }
 }
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/CompilerCachingSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/CompilerCachingSuite.scala
@@ -30,7 +30,7 @@ class CompilerCachingSuite extends BasePCSuite:
 case pc: ScalaPresentationCompiler =>
 val compilations = pc.compilerAccess.withNonInterruptableCompiler(-1, EmptyCancelToken){driver =>
 driver.compiler().currentCtx.runId
- }(emptyQueryContext).get(timeout.length, timeout.unit)
+ }(using emptyQueryContext).get(timeout.length, timeout.unit)
 assertEquals(expected, compilations, s"Expected $expected compilations but got $compilations")
 case _ => throw IllegalStateException("Presentation compiler should always be of type of ScalaPresentationCompiler")
 
@@ -39,7 +39,7 @@ class CompilerCachingSuite extends BasePCSuite:
 case pc: ScalaPresentationCompiler =>
 pc.compilerAccess.withNonInterruptableCompiler(null, EmptyCancelToken){driver =>
 driver.compiler().currentCtx
- }(emptyQueryContext).get(timeout.length, timeout.unit)
+ }(using emptyQueryContext).get(timeout.length, timeout.unit)
 case _ => throw IllegalStateException("Presentation compiler should always be of type of ScalaPresentationCompiler")
 
 private def emptyQueryContext = PcQueryContext(None, () => "")(using EmptyReportContext())
@@ -133,7 +133,7 @@ class CompilerCachingSuite extends BasePCSuite:
 checkCompilationCount(6)
 
 
- private val testFunctions: List[OffsetParams => CompletableFuture[_]] = List(
+ private val testFunctions: List[OffsetParams => CompletableFuture[?]] = List(
 presentationCompiler.complete(_),
 presentationCompiler.convertToNamedArguments(_, Collections.emptyList()),
 presentationCompiler.autoImports("a", _, false),
diff --git a/repl/test-resources/type-printer/source-compatible b/repl/test-resources/type-printer/source-compatible
@@ -4,14 +4,14 @@ scala> val m = new Bag{val f = 23; def g = 47; def h(i: Int): Int = i; var i =
 val m:
 Bag{
 val f: Int; def g: Int; def h(i: Int): Int; val i: Int;
- def i_=(x$1: Int): Unit; type N = Int; val l: List[Int];
+ def i_=(`x$1`: Int): Unit; type N = Int; val l: List[Int];
 def p[T](t: T): String
 } = Bag()
-scala> type t = Bag{val f: Int; def g: Int; def h(i: Int): Int; val i: Int; def i_=(x$1: Int): Unit; type N = Int; val l: List[Int]; val s: String @unchecked }
+scala> type t = Bag{val f: Int; def g: Int; def h(i: Int): Int; val i: Int; def i_=(`x$1`: Int): Unit; type N = Int; val l: List[Int]; val s: String @unchecked }
 // defined alias type t
 =
 Bag{
 val f: Int; def g: Int; def h(i: Int): Int; val i: Int;
- def i_=(x$1: Int): Unit; type N = Int; val l: List[Int];
+ def i_=(`x$1`: Int): Unit; type N = Int; val l: List[Int];
 val s: String @unchecked
 }
diff --git a/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala b/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala
@@ -11,7 +11,7 @@ import scala.jdk.CollectionConverters._
 
 case class LazyEntry(getKey: String, value: () => String) extends JMapEntry[String, Object]:
 lazy val getValue: Object = value()
- def setValue(x$0: Object): Object = ???
+ def setValue(`x$0`: Object): Object = ???
 
 case class LoadedTemplate(
 templateFile: TemplateFile,
diff --git a/tests/init/warn/java1.scala b/tests/init/warn/java1.scala
@@ -5,7 +5,7 @@ class A extends Spliterator.OfDouble:
 def characteristics() = 10
 def estimateSize() = 10
 def trySplit() = ???
- def tryAdvance(x$0: java.util.function.DoubleConsumer): Boolean = false
+ def tryAdvance(`x$0`: java.util.function.DoubleConsumer): Boolean = false
 
 val m = n + 1
 val n = 10 // warn
diff --git a/tests/neg/i15381.scala b/tests/neg/i15381.scala
@@ -1,6 +1,6 @@
 //> using options -Vprint:parser
 
-case class $[A](value: A)
+case class `$`[A](value: A)
 
 def g: Int = $ // error
 
diff --git a/tests/neg/i4986c.scala b/tests/neg/i4986c.scala
@@ -14,7 +14,7 @@ class Outer[A]{
 }
 }
 
-trait X$Y
+trait `X$Y`
 
 @implicitNotFound(msg = "There's no U[${X}, ${Y}, ${Z}]")
 trait U[X, Y[_], Z[_, ZZ]]{
diff --git a/tests/warn/t11681.scala b/tests/warn/t11681.scala
@@ -106,4 +106,4 @@ object Answers{
 def answer: Int = 42
 }
 
-val a$1 = 2
+val `a$1` = 2

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,6 @@ class ClassfileTastyUUIDParser(classfile: AbstractFile)(ictx: Context){`
`104`	`104`	`classConstantPool(usingin: DataReader) extendsClassfileParser.AbstractConstantPool{`
`105`	`105`	`defgetClassOrArrayType(index: Int)(usingctx: Context, in: DataReader):Type=thrownewUnsupportedOperationException`
`106`	`106`	`defgetClassSymbol(index: Int)(usingctx: Context, in: DataReader):Symbol=thrownewUnsupportedOperationException`
`107`		`-defgetType(index: Int, isVarargs: Boolean)(usingx$3: Context,x$4:DataReader):Type=thrownewUnsupportedOperationException`
	`107`	`+defgetType(index: Int, isVarargs: Boolean)(usingContext, DataReader):Type=thrownewUnsupportedOperationException`
`108`	`108`	`}`
`109`	`109`	`}`
-Original file line number
+Diff line change
 casepc: ScalaPresentationCompiler=>
 valcompilations= pc.compilerAccess.withNonInterruptableCompiler(-1, EmptyCancelToken){driver =>
  driver.compiler().currentCtx.runId
 - }(emptyQueryContext).get(timeout.length, timeout.unit)
 + }(usingemptyQueryContext).get(timeout.length, timeout.unit)
  assertEquals(expected, compilations, s"Expected $expected compilations but got $compilations")
 case _ =>throwIllegalStateException("Presentation compiler should always be of type of ScalaPresentationCompiler")
 casepc: ScalaPresentationCompiler=>
  pc.compilerAccess.withNonInterruptableCompiler(null, EmptyCancelToken){driver =>
  driver.compiler().currentCtx
 - }(emptyQueryContext).get(timeout.length, timeout.unit)
 + }(usingemptyQueryContext).get(timeout.length, timeout.unit)
 case _ =>throwIllegalStateException("Presentation compiler should always be of type of ScalaPresentationCompiler")
 privatedefemptyQueryContext=PcQueryContext(None, () =>"")(usingEmptyReportContext())
  checkCompilationCount(6)
 -privatevaltestFunctions:List[OffsetParams=>CompletableFuture[_]] =List(
 +privatevaltestFunctions:List[OffsetParams=>CompletableFuture[?]] =List(
  presentationCompiler.complete(_),
  presentationCompiler.convertToNamedArguments(_, Collections.emptyList()),
  presentationCompiler.autoImports("a", _, false),
-Original file line number
+Diff line change
 caseclassLazyEntry(getKey: String, value: () =>String) extendsJMapEntry[String, Object]:
 lazyvalgetValue:Object= value()
 -defsetValue(x$0: Object):Object=???
 +defsetValue(`x$0`: Object):Object=???
 caseclassLoadedTemplate(
 templateFile: TemplateFile,
-Original file line number
+Diff line change
 defcharacteristics() =10
 defestimateSize() =10
 deftrySplit() =???
 -deftryAdvance(x$0: java.util.function.DoubleConsumer):Boolean=false
 +deftryAdvance(`x$0`: java.util.function.DoubleConsumer):Boolean=false
 valm= n +1
 valn=10// warn
-Original file line number
+Diff line change
@@ @@ -1,6 +1,6 @@ @@
 //>usingoptions-Vprint:parser
 -caseclass$[A](value: A)
 +caseclass`$`[A](value: A)
 defg:Int= $ // error
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class Outer[A]{`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
`17`		`-traitX$Y`
	`17`	+trait`X$Y`
`18`	`18`
`19`	`19`	`@implicitNotFound(msg ="There's no U[${X}, ${Y}, ${Z}]")`
`20`	`20`	`traitU[X, Y[_], Z[_, ZZ]]{`
Original file line number	Diff line number	Diff line change
`@@ -106,4 +106,4 @@ object Answers{`
`106`	`106`	`defanswer:Int=42`
`107`	`107`	`}`
`108`	`108`
`109`		`-vala$1=2`
	`109`	+val`a$1`=2