From 88b80f483f0c817addc097c90327cb423c254be1 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 4 Dec 2020 08:57:58 +0100 Subject: [PATCH 1/3] Update SourceFile API --- sourcecode/src-3/sourcecode/Macros.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sourcecode/src-3/sourcecode/Macros.scala b/sourcecode/src-3/sourcecode/Macros.scala index 2779bf2..d82cf32 100644 --- a/sourcecode/src-3/sourcecode/Macros.scala +++ b/sourcecode/src-3/sourcecode/Macros.scala @@ -213,7 +213,7 @@ object Macros { def text[T: Type](v: Expr[T])(using Quotes): Expr[sourcecode.Text[T]] = { import quotes.reflect._ - val txt = Term.of(v).pos.sourceCode + val txt = Term.of(v).pos.sourceCode.get '{sourcecode.Text[T]($v, ${Expr(txt)})} } From 25f3ef4bf9d9fc4d582640211ddb1e9c4493f889 Mon Sep 17 00:00:00 2001 From: Liu Fengyun Date: Mon, 7 Dec 2020 11:50:10 +0100 Subject: [PATCH 2/3] Fix case object apply --- sourcecode/src-3/sourcecode/Macros.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sourcecode/src-3/sourcecode/Macros.scala b/sourcecode/src-3/sourcecode/Macros.scala index d82cf32..8bc8ad5 100644 --- a/sourcecode/src-3/sourcecode/Macros.scala +++ b/sourcecode/src-3/sourcecode/Macros.scala @@ -239,12 +239,12 @@ object Macros { val chunk = current match { case sym if - sym.isValDef || sym.isDefDef => Chunk.ValVarLzyDef + sym.isValDef || sym.isDefDef => Chunk.ValVarLzyDef.apply case sym if sym.isPackageDef || - sym.moduleClass != Symbol.noSymbol => Chunk.PkgObj - case sym if sym.isClassDef => Chunk.ClsTrt - case _ => Chunk.PkgObj + sym.moduleClass != Symbol.noSymbol => Chunk.PkgObj.apply + case sym if sym.isClassDef => Chunk.ClsTrt.apply + case _ => Chunk.PkgObj.apply } path = chunk(Util.getName(current).stripSuffix("$")) :: path From eb4ae0548185ee1e4d527cff12c480aa0238d921 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Thu, 17 Dec 2020 16:27:06 +0100 Subject: [PATCH 3/3] Upgrade Scala 3 to M3 --- build.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sc b/build.sc index 4e283af..8dc15f1 100644 --- a/build.sc +++ b/build.sc @@ -65,7 +65,7 @@ trait SourcecodeTestModule extends ScalaModule { object sourcecode extends Module { val dottyVersion = Option(sys.props("dottyVersion")) - object jvm extends Cross[JvmSourcecodeModule]((List("2.11.12", "2.12.8", "2.13.0", "3.0.0-M2") ++ dottyVersion): _*) + object jvm extends Cross[JvmSourcecodeModule]((List("2.11.12", "2.12.8", "2.13.0", "3.0.0-M3") ++ dottyVersion): _*) class JvmSourcecodeModule(val crossScalaVersion: String) extends SourcecodeMainModule with ScalaModule with SourcecodeModule {