Merge branch 'master' into add-transparent-7

Author: OlivierBlanvillain

.drone.yml

@@ -23,23 +23,23 @@ pipeline:
   # We run tests in parallel. Tests run in a copy of the working directory to avoid conflict
   test:
     group: test
-    image: lampepfl/dotty:2018-09-14-2
+    image: lampepfl/dotty:2018-10-01
     commands:
       - cp -R . /tmp/1/ && cd /tmp/1/
       - ./project/scripts/sbt ";compile ;test"
       - ./project/scripts/cmdTests
 
   test_bootstrapped:
     group: test
-    image: lampepfl/dotty:2018-09-14-2
+    image: lampepfl/dotty:2018-10-01
     commands:
       - cp -R . /tmp/2/ && cd /tmp/2/
       - ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test"
       - ./project/scripts/bootstrapCmdTests
 
   test_sbt:
     group: test
-    image: lampepfl/dotty:2018-09-14-2
+    image: lampepfl/dotty:2018-10-01
     commands:
       - cp -R . /tmp/4/ && cd /tmp/4/
       - ./project/scripts/sbt sbt-dotty/scripted
@@ -49,7 +49,7 @@ pipeline:
 
   # DOCUMENTATION:
   documentation:
-    image: lampepfl/dotty:2018-09-14-2
+    image: lampepfl/dotty:2018-10-01
     commands:
       - ./project/scripts/genDocs
     secrets: [ bot_pass ]
@@ -61,7 +61,7 @@ pipeline:
   # PUBLISHING:
   # Publishing expect NIGHTLYBUILD or RELEASEBUILD to be set. See dottyVersion in Build.scala
   publish_nightly:
-    image: lampepfl/dotty:2018-09-14-2
+    image: lampepfl/dotty:2018-10-01
     environment:
       - NIGHTLYBUILD=yes
     commands:
@@ -72,7 +72,7 @@ pipeline:
       environment: nightly
 
   publish_release:
-    image: lampepfl/dotty:2018-09-14-2
+    image: lampepfl/dotty:2018-10-01
     environment:
       - RELEASEBUILD=yes
     commands:
@@ -96,7 +96,7 @@ pipeline:
       event: tag
 
   publish_sbt_release:
-    image: lampepfl/dotty:2018-09-14-2
+    image: lampepfl/dotty:2018-10-01
     environment:
       - RELEASEBUILD=yes
     commands:

.gitignore

@@ -19,6 +19,7 @@ project/local-plugins.sbt
 .ensime
 .ensime_cache/
 .sbt-scripted/
+local.sbt
 
 # npm
 node_modules

build.sbt

@@ -12,6 +12,7 @@ val `dotty-sbt-bridge-bootstrapped` = Build.`dotty-sbt-bridge-bootstrapped`
 val `dotty-language-server` = Build.`dotty-language-server`
 val `dotty-bench` = Build.`dotty-bench`
 val `dotty-bench-bootstrapped` = Build.`dotty-bench-bootstrapped`
+val `dotty-semanticdb` = Build.`dotty-semanticdb`
 val `scala-library` = Build.`scala-library`
 val `scala-compiler` = Build.`scala-compiler`
 val `scala-reflect` = Build.`scala-reflect`

compiler/sjs/backend/sjs/JSCodeGen.scala

@@ -1704,7 +1704,7 @@ class JSCodeGen()(implicit ctx: Context) {
       nme.UNARY_! -> js.JSUnaryOp.!
     )
 
-    def unapply(name: Names.TermName): Option[js.JSUnaryOp.Code] =
+    def unapply(name: TermName): Option[js.JSUnaryOp.Code] =
       map.get(name)
   }
 
@@ -1732,7 +1732,7 @@ class JSCodeGen()(implicit ctx: Context) {
       nme.ZOR  -> js.JSBinaryOp.||
     )
 
-    def unapply(name: Names.TermName): Option[js.JSBinaryOp.Code] =
+    def unapply(name: TermName): Option[js.JSBinaryOp.Code] =
       map.get(name)
   }
 

compiler/sjs/backend/sjs/JSEncoding.scala

@@ -39,11 +39,11 @@ object JSEncoding {
   private final val ScalaJSEnvironmentName = "ScalaJS"
 
   implicit class SymOps(val self: Symbol) extends AnyVal {
-    def unexpandedName(implicit ctx: Context): Names.Name =
+    def unexpandedName(implicit ctx: Context): Name =
       self.name.unexpandedName
   }
 
-  implicit class MyNameOps(val self: Names.Name) extends AnyVal {
+  implicit class MyNameOps(val self: Name) extends AnyVal {
     def decoded: String = self.decode.toString
   }
 

compiler/sjs/backend/sjs/JSPositions.scala

@@ -11,7 +11,7 @@ import org.scalajs.core.ir
 class JSPositions()(implicit ctx: Context) {
 
   /** Implicit conversion from dotty Position to ir.Position. */
-  implicit def pos2irPos(pos: Positions.Position): ir.Position = {
+  implicit def pos2irPos(pos: Position): ir.Position = {
     if (!pos.exists) ir.Position.NoPosition
     else {
       val source = pos2irPosCache.toIRSource(ctx.compilationUnit.source)
@@ -23,7 +23,7 @@ class JSPositions()(implicit ctx: Context) {
 
   /** Implicitly materializes an ir.Position from an implicit dotty Position. */
   implicit def implicitPos2irPos(
-      implicit pos: Positions.Position): ir.Position = {
+      implicit pos: Position): ir.Position = {
     pos2irPos(pos)
   }
 

compiler/src/dotty/tools/backend/jvm/CollectEntryPoints.scala

@@ -5,30 +5,15 @@ import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.Types
 import dotty.tools.dotc.transform.MegaPhase._
 import dotty.tools.dotc.ast.tpd
-import dotty.tools.dotc
-import dotty.tools.dotc.core.Flags.FlagSet
-import dotty.tools.dotc.transform.Erasure
-import dotty.tools.dotc.transform.SymUtils._
-import java.io.{File => JFile}
+import java.io.{File => _}
 
-import scala.collection.generic.Clearable
-import scala.collection.mutable
-import scala.reflect.ClassTag
-import dotty.tools.io.{Directory, PlainDirectory, AbstractFile}
-import scala.tools.asm.{ClassVisitor, FieldVisitor, MethodVisitor}
-import scala.tools.nsc.backend.jvm.{BCodeHelpers, BackendInterface}
 import dotty.tools.dotc.core._
-import Periods._
 import SymDenotations._
 import Contexts._
 import Types._
 import Symbols._
-import Denotations._
-import Phases._
-import java.lang.AssertionError
 import dotty.tools.dotc.util.Positions.Position
 import Decorators._
-import tpd._
 import StdNames.nme
 
 /**
@@ -46,7 +31,7 @@ class CollectEntryPoints extends MiniPhase {
 }
 
 object CollectEntryPoints{
-  def isJavaMainMethod(sym: Symbol)(implicit ctx: Context) = {
+  def isJavaMainMethod(sym: Symbol)(implicit ctx: Context): Boolean = {
     (sym.name == nme.main) && (sym.info match {
       case r@MethodTpe(_, List(defn.ArrayOf(t)), _) =>
         (t.widenDealias =:= defn.StringType) && (
@@ -56,7 +41,6 @@ object CollectEntryPoints{
   }
 
   def isJavaEntryPoint(sym: Symbol)(implicit ctx: Context): Boolean = {
-    import Types.MethodType
     val d = ctx.definitions
     val StringType = d.StringType
     // The given class has a main method.

compiler/src/dotty/tools/backend/jvm/CollectSuperCalls.scala

@@ -1,7 +1,6 @@
 package dotty.tools.backend.jvm
 
 import dotty.tools.dotc.ast.tpd
-import dotty.tools.dotc.ast.Trees._
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Flags.Trait