Merge pull request #23 from dwickern/scala3

add scala 3 support

Author: dwickern

.gitignore

@@ -1,2 +1,6 @@
 target/
 .bsp/
+.bloop/
+.idea/
+.metals/
+.vscode/

build.sbt

@@ -2,16 +2,17 @@ import ReleaseTransformations._
 
 ThisBuild / organization := "com.github.dwickern"
 
-lazy val scala213 = "2.13.4"
-lazy val scala212 = "2.12.13"
+lazy val scala3 = "3.0.2"
+lazy val scala213 = "2.13.7"
+lazy val scala212 = "2.12.15"
 lazy val scala211 = "2.11.12"
 
 lazy val root = project.in(file("."))
  .aggregate(nameof.projectRefs: _*)
  .enablePlugins(MdocPlugin)
  .settings(
  // for IntelliJ import: pick one project from the matrix to use
- nameof.jvm(scala213).settings,
+ nameof.jvm(scala3).settings,
  target := baseDirectory.value / "target",
  ideSkipProject := false,
  publish / skip := true,
@@ -25,14 +26,22 @@ lazy val nameof = (projectMatrix in file("."))
  releaseCrossBuild := true,
  ideSkipProject := true,
  libraryDependencies ++= Seq(
- "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided",
- "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided",
- "org.scalatest" %%% "scalatest" % "3.2.3" % Test,
- "com.chuusai" %% "shapeless" % "2.3.3" % Test,
+ "org.scalatest" %% "scalatest" % "3.2.10" % Test,
+ "javax.annotation" % "javax.annotation-api" % "1.3.1" % Test,
  ),
  )
- .jsPlatform(scalaVersions = Seq(scala213, scala212, scala211))
- .jvmPlatform(scalaVersions = Seq(scala213, scala212, scala211))
+ .jvmPlatform(scalaVersions = Seq(scala3), Seq(
+ libraryDependencies ++= Seq(
+ "org.typelevel" %% "shapeless3-test" % "3.0.4" % Test,
+ )
+ ))
+ .jvmPlatform(scalaVersions = Seq(scala213, scala212, scala211), Seq(
+ libraryDependencies ++= Seq(
+ "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided,
+ "org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided,
+ "com.chuusai" %% "shapeless" % "2.3.7" % Test,
+ ),
+ ))
 
 Global / excludeLintKeys += ideSkipProject
 

project/build.properties

@@ -1 +1 @@
-sbt.version = 1.4.7
+sbt.version = 1.5.7

project/plugins.sbt

@@ -1,9 +1,8 @@
 logLevel := Level.Warn
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.4.0")
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.5")
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.2")
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
-addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.7.0")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
+addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
+addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.9.0")
 addSbtPlugin("org.jetbrains" % "sbt-ide-settings" % "1.1.0")
-addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.17" )
+addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.23" )

src/main/scala/com/github/dwickern/macros/NameOf.scala renamed to src/main/scala-2/com/github/dwickern/macros/NameOf.scala

@@ -0,0 +1,52 @@
+package com.github.dwickern.macros
+
+import scala.quoted.*
+
+trait NameOf {
+ /**
+ * Obtain an identifier name as a constant string.
+ *
+ * Example usage:
+ * {{{
+ * val amount = 5
+ * nameOf(amount) => "amount"
+ * }}}
+ */
+ transparent inline def nameOf(inline expr: Any): String = ${NameOfImpl.nameOf('expr)}
+
+ /**
+ * Obtain an identifier name as a constant string.
+ *
+ * This overload can be used to access an instance method without having an instance of the type.
+ *
+ * Example usage:
+ * {{{
+ * class Person(val name: String)
+ * nameOf[Person](_.name) => "name"
+ * }}}
+ */
+ transparent inline def nameOf[T](inline expr: T => Any): String = ${NameOfImpl.nameOf('expr)}
+
+ /**
+ * Obtain a type's unqualified name as a constant string.
+ *
+ * Example usage:
+ * {{{
+ * nameOfType[String] => "String"
+ * nameOfType[fully.qualified.ClassName] => "ClassName"
+ * }}}
+ */
+ transparent inline def nameOfType[T]: String = ${NameOfImpl.nameOfType[T]}
+
+ /**
+ * Obtain a type's qualified name as a constant string.
+ *
+ * Example usage:
+ * {{{
+ * nameOfType[String] => "java.lang.String"
+ * nameOfType[fully.qualified.ClassName] => "fully.qualified.ClassName"
+ * }}}
+ */
+ transparent inline def qualifiedNameOfType[T]: String = ${NameOfImpl.qualifiedNameOfType[T]}
+}
+object NameOf extends NameOf

src/main/scala/com/github/dwickern/macros/NameOfImpl.scala renamed to src/main/scala-2/com/github/dwickern/macros/NameOfImpl.scala

@@ -0,0 +1,47 @@
+package com.github.dwickern.macros
+
+import scala.annotation.tailrec
+import scala.quoted.*
+
+object NameOfImpl {
+ def nameOf(expr: Expr[Any])(using Quotes): Expr[String] = {
+ import quotes.reflect.*
+ @tailrec def extract(tree: Tree): String = tree match {
+ case Ident(name) => name
+ case Select(_, name) => name
+ case Block(List(stmt), term) => extract(stmt)
+ case DefDef("$anonfun", _, _, Some(term)) => extract(term)
+ case Block(_, term) => extract(term)
+ case Apply(term, _) if term.symbol.fullName != "<special-ops>.throw" => extract(term)
+ case TypeApply(term, _) => extract(term)
+ case Inlined(_, _, term) => extract(term)
+ case Typed(term, _) => extract(term)
+ case _ => throw new MatchError(s"Unsupported expression: ${expr.show}")
+ }
+ val name = extract(expr.asTerm)
+ Expr(name)
+ }
+
+ def nameOfType[T](using Quotes, Type[T]): Expr[String] = {
+ import quotes.reflect.*
+ val name = TypeTree.of[T].tpe.dealias match {
+ case t @ (AndType(_, _) | OrType(_, _)) => throw new MatchError(s"Unsupported type: ${t.show}")
+ case t => t.typeSymbol.name
+ }
+ val clean = name.stripSuffix("$")
+ Expr(clean)
+ }
+
+ def qualifiedNameOfType[T](using Quotes, Type[T]): Expr[String] = {
+ import quotes.reflect.*
+ val fullName = TypeTree.of[T].tpe.dealias match {
+ case t @ (AndType(_, _) | OrType(_, _)) => throw new MatchError(s"Unsupported type: ${t.show}")
+ case t => t.typeSymbol.fullName
+ }
+ val clean = fullName
+ .split('.')
+ .map(_.stripPrefix("_$").stripSuffix("$"))
+ .mkString(".")
+ Expr(clean)
+ }
+}

src/main/scala-3/com/github/dwickern/macros/NameOf.scala

@@ -0,0 +1,5 @@
+package com.github.dwickern.macros
+
+package object test {
+ val illTyped = shapeless.test.illTyped
+}