use plugin.properties

Author: liufengyun

compiler/src/dotty/tools/dotc/plugins/Plugin.scala

@@ -8,7 +8,7 @@ import dotty.tools.io._
 import transform.MegaPhase.MiniPhase
 
 import java.io.InputStream
-import java.util.Scanner
+import java.util.Properties
 
 import scala.collection.mutable
 import scala.util.{ Try, Success, Failure }
@@ -59,7 +59,7 @@ trait ResearchPlugin extends Plugin {
 
 object Plugin {
 
-  private val PluginFile = "plugin"
+  private val PluginFile = "plugin.properties"
 
   /** Create a class loader with the specified locations plus
    *  the loader that loaded the Scala compiler.
@@ -101,10 +101,13 @@ object Plugin {
   {
 
     def fromFile(inputStream: InputStream): String = {
-      val s = new Scanner(inputStream)
+      val props = new Properties
+      props.load(inputStream)
 
-      if (s.hasNext) s.nextLine.trim
-      else throw new RuntimeException("Bad plugin descriptor.")
+      val pluginClass = props.getProperty("pluginClass")
+
+      if (pluginClass == null) throw new RuntimeException("Bad plugin descriptor.")
+      else pluginClass
     }
 
     def loadDescriptionFromDir(f: Path): Try[String] =

compiler/test/dotty/tools/dotc/CompilationTests.scala

@@ -314,7 +314,7 @@ class CompilationTests extends ParallelTesting {
   }
 
   @Test def testPlugins: Unit = {
-    val pluginFile = "plugin"
+    val pluginFile = "plugin.properties"
 
     // 1. hack with absolute path for -Xplugin
     // 2. copy `pluginFile` to destination

sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/plugin/src/main/resources/plugin

@@ -0,0 +1 @@
+pluginClass=dividezero.DivideZero

sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/plugin/src/main/resources/plugin.properties

@@ -0,0 +1 @@
+pluginClass=DivideZero

tests/plugins/neg/divideZero-research/plugin

@@ -0,0 +1 @@
+pluginClass=DivideZero