added subproject for profiling compilation

Author: ghik

build.sbt

@@ -51,8 +51,14 @@ val commonSettings = Seq(
     "-Xfatal-warnings",
     s"-Xlint:-missing-interpolator,-adapted-args,${if (scalaBinaryVersion.value == "2.12") "-unused," else ""}_",
   ),
+  scalacOptions ++= {
+    if (scalaBinaryVersion.value == "2.12") Seq(
+      "-Ycache-plugin-class-loader:last-modified",
+      "-Ycache-macro-class-loader:last-modified",
+    ) else Seq.empty
+  },
   // some Java 8 related tests use Java interface static methods, Scala 2.11.12 requires JDK8 target for that
-  scalacOptions in Test ++= (if (scalaBinaryVersion.value == "2.11") Seq("-target:jvm-1.8") else Seq()),
+  scalacOptions in Test ++= (if (scalaBinaryVersion.value == "2.11") Seq("-target:jvm-1.8") else Nil),
   apiURL := Some(url("http://avsystem.github.io/scala-commons/api")),
   autoAPIMappings := true,
 
@@ -131,19 +137,20 @@ val CompileAndTest = "compile->compile;test->test"
 lazy val commons = project.in(file("."))
   .enablePlugins(ScalaUnidocPlugin)
   .aggregate(
+    `commons-analyzer`,
+    `commons-macros`,
     `commons-annotations`,
     `commons-annotations-js`,
-    `commons-macros`,
     `commons-core`,
     `commons-core-js`,
-    `commons-analyzer`,
     `commons-jetty`,
-    `commons-benchmark`,
     `commons-mongo`,
     `commons-spring`,
     `commons-redis`,
     `commons-akka`,
     `commons-kafka`,
+    `commons-benchmark`,
+    `commons-benchmark-js`,
   )
   .settings(
     commonSettings,
@@ -159,6 +166,7 @@ lazy val commons = project.in(file("."))
         `commons-core-js`,
         `commons-benchmark`,
         `commons-benchmark-js`,
+        `commons-comprof`,
       ),
   )
 
@@ -344,3 +352,30 @@ lazy val `commons-akka` = project
       "com.typesafe.akka" %% "akka-testkit" % akkaVersion % Test,
     ),
   )
+
+lazy val `commons-comprof` = project
+  .dependsOn(`commons-core`)
+  .settings(
+    jvmCommonSettings,
+    noPublishSettings,
+    ideSkipProject := true,
+    addCompilerPlugin("ch.epfl.scala" %% "scalac-profiling" % "1.0.0"),
+    scalacOptions ++= Seq(
+      s"-P:scalac-profiling:sourceroot:${baseDirectory.value}",
+      "-P:scalac-profiling:generate-macro-flamegraph",
+      "-P:scalac-profiling:no-profiledb",
+      "-Ystatistics",
+    ),
+    sourceGenerators in Compile += Def.task {
+      val originalSrc = (sourceDirectory in `commons-core`).value / 
+        "main/scala/com/avsystem/commons/rest/openapi/OpenApi.scala"
+      val originalContent = IO.read(originalSrc)
+      (0 until 10).map { i =>
+        val pkg = f"oa$i%02d"
+        val newContent = originalContent.replaceAllLiterally("package rest.openapi", s"package rest.$pkg")
+        val newFile = (sourceManaged in Compile).value / pkg / "OpenApi.scala"
+        IO.write(newFile, newContent)
+        newFile
+      }
+    }.taskValue
+  )

commons-macros/src/main/scala/com/avsystem/commons/macros/MacroCommons.scala

@@ -967,22 +967,17 @@ trait MacroCommons { bundle =>
       Some(ApplyUnapply(constructor, NoSymbol, paramsWithDefaults(constructor.typeSignatureIn(dtpe))))
     } else {
       val applicableResults = applyUnapplyPairs.flatMap {
+        case (apply, unapply) if caseClass && apply.isSynthetic && unapply.isSynthetic =>
+          val constructor = primaryConstructorOf(dtpe)
+          Some(ApplyUnapply(constructor, unapply, paramsWithDefaults(constructor.typeSignatureIn(dtpe))))
         case (apply, unapply) if typeParamsMatch(apply, unapply) =>
-          val constructor =
-            if (caseClass && apply.isSynthetic && unapply.isSynthetic)
-              primaryConstructorOf(dtpe)
-            else NoSymbol
-
           val applySig =
-            if (constructor != NoSymbol) constructor.typeSignatureIn(dtpe)
-            else setTypeArgs(apply.typeSignatureIn(typedCompanion.tpe))
+            setTypeArgs(apply.typeSignatureIn(typedCompanion.tpe))
           val unapplySig =
             setTypeArgs(unapply.typeSignatureIn(typedCompanion.tpe))
-
           if (matchingApplyUnapply(dtpe, applySig, unapplySig))
-            Some(ApplyUnapply(constructor orElse apply, unapply, paramsWithDefaults(applySig)))
+            Some(ApplyUnapply(apply, unapply, paramsWithDefaults(applySig)))
           else None
-
         case _ => None
       }
 

project/plugins.sbt

@@ -15,3 +15,4 @@ addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1")
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.3.0")
 addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M7")
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.4")
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.0.0")