Merge branch 'main' into fix-#43

README.md

@@ -24,6 +24,8 @@ addCompilerPlugin("ch.epfl.scala" %% "scalac-profiling" % "<version>" cross Cros
 
 To learn how to use the plugin, read [Speeding Up Compilation Time with `scalac-profiling`](https://www.scala-lang.org/blog/2018/06/04/scalac-profiling.html) in the scala-lang blog.
 
+Note that in Scala 2.13, the preferred form of the compiler option to enable statistics is `-Vstatistics`. It is part of the family of `-V` flags that enable various "verbose" behaviors. (In 2.12, the flag is called `-Ystatistics`.)
+
 ### Compiler plugin options
 
 All the compiler plugin options are **prepended by `-P:scalac-profiling:`**.
@@ -38,12 +40,11 @@ All the compiler plugin options are **prepended by `-P:scalac-profiling:`**.
   flamegraph for implicit searches is enabled by default.
 * `print-failed-implicit-macro-candidates`: Print trees of all failed implicit
   searches that triggered a macro expansion.
-* `no-profiledb`: Recommended. Don't generate profiledb (will be on by default
-  in a future release).
+* `generate-profiledb`: Generate profiledb.
 * `show-concrete-implicit-tparams`: Use more concrete type parameters in the
   implicit search flamegraph. Note that it may change the shape of the
   flamegraph.
 
 ## Historical context
 
-The historical context of this project is quite interesting. For those wondering about the details, see the [dedicated section](HISTORICALCONTEXT.md).
+The historical context of this project is quite interesting. For those wondering about the details, see the [dedicated section](HISTORICALCONTEXT.md).

plugin/src/main/scala/ch/epfl/scala/PluginConfig.scala

@@ -4,7 +4,7 @@ import ch.epfl.scala.profiledb.utils.AbsolutePath
 
 final case class PluginConfig(
     showProfiles: Boolean,
-    noDb: Boolean,
+    generateDb: Boolean,
     sourceRoot: AbsolutePath,
     printSearchIds: Set[Int],
     generateMacroFlamegraph: Boolean,

plugin/src/main/scala/ch/epfl/scala/ProfilingPlugin.scala

@@ -35,7 +35,7 @@ class ProfilingPlugin(val global: Global) extends Plugin {
   private final lazy val GenerateMacroFlamegraph = "generate-macro-flamegraph"
   private final lazy val GenerateGlobalFlamegraph = "generate-global-flamegraph"
   private final lazy val PrintFailedMacroImplicits = "print-failed-implicit-macro-candidates"
-  private final lazy val NoProfileDb = "no-profiledb"
+  private final lazy val GenerateProfileDb = "generate-profiledb"
   private final lazy val ShowConcreteImplicitTparams = "show-concrete-implicit-tparams"
   private final lazy val PrintSearchRegex = s"$PrintSearchResult:(.*)".r
   private final lazy val SourceRootRegex = s"$SourceRoot:(.*)".r
@@ -56,7 +56,7 @@ class ProfilingPlugin(val global: Global) extends Plugin {
 
   private final lazy val config = PluginConfig(
     showProfiles = super.options.contains(ShowProfiles),
-    noDb = super.options.contains(NoProfileDb),
+    generateDb = super.options.contains(GenerateProfileDb),
     sourceRoot =
       findOption(SourceRoot, SourceRootRegex)
         .map(AbsolutePath.apply)
@@ -302,7 +302,7 @@ class ProfilingPlugin(val global: Global) extends Plugin {
         override def apply(unit: global.CompilationUnit): Unit = {
           if (
             SettingsOps.areStatisticsEnabled(global) &&
-            !config.noDb) {
+            config.generateDb) {
             val currentSourceFile = unit.source
             val compilationUnitEntry = profileDbEntryFor(currentSourceFile)
             dbPathFor(currentSourceFile) match {
@@ -325,7 +325,7 @@ class ProfilingPlugin(val global: Global) extends Plugin {
           val graphsDir = globalOutputDir.resolve(graphsRelativePath)
           reportStatistics(graphsDir)
 
-          if (!config.noDb) {
+          if (config.generateDb) {
             val globalDatabase = toGlobalDatabase(global.statistics)
             val globalRelativePath = ProfileDbPath.GlobalProfileDbRelativePath
             val globalProfileDbPath = ProfileDbPath(globalOutputDir, globalRelativePath)

project/BuildPlugin.scala

@@ -181,9 +181,8 @@ object BuildImplementation {
         val projectBuild = ref.build
         val workingDir = Keys.buildStructure.value.units(projectBuild).localBase.getAbsolutePath
         val sourceRoot = s"-P:scalac-profiling:sourceroot:$workingDir"
-        val noProfileDb = s"-P:scalac-profiling:no-profiledb"
         val pluginOpts = (PluginProject / BuildKeys.optionsForSourceCompilerPlugin).value
-        noProfileDb +: sourceRoot +: pluginOpts
+        sourceRoot +: pluginOpts
       }
     }