Merge branch 'idempotency-on-boot' of https://github.com/dotty-staging/dotty into idempotency-on-boot

Author: nicolasstucki

.drone.yml

@@ -1,8 +1,8 @@
 # After updating this file, you need to re-sign it:
 #
 # - Install [drone-cli](http://readme.drone.io/usage/getting-started-cli/)
-# - Copy your token from  http://dotty-ci.epfl.ch/account (Click SHOW TOKEN)
-# - (export DRONE_TOKEN=your-token; export DRONE_SERVER=http://dotty-ci.epfl.ch; drone sign lampepfl/dotty)
+# - Copy your token from http://dotty-ci.epfl.ch/account (Click SHOW TOKEN)
+# - DRONE_TOKEN=your-token DRONE_SERVER=http://dotty-ci.epfl.ch drone sign lampepfl/dotty
 #
 # Please note that the signing can only be done by collaborators.
 
@@ -76,3 +76,5 @@ matrix:
       CI_PUBLISH: false
     - CI_TEST: dotty-bootstrapped/test
       CI_PUBLISH: false
+    - CI_TEST: ;set bootstrapOptimised in ThisBuild := true ;dotty-bootstrapped/test
+      CI_PUBLISH: false

.drone.yml.sig

@@ -1 +1 @@
-eyJhbGciOiJIUzI1NiJ9.IyBBZnRlciB1cGRhdGluZyB0aGlzIGZpbGUsIHlvdSBuZWVkIHRvIHJlLXNpZ24gaXQ6CiMKIyAtIEluc3RhbGwgW2Ryb25lLWNsaV0oaHR0cDovL3JlYWRtZS5kcm9uZS5pby91c2FnZS9nZXR0aW5nLXN0YXJ0ZWQtY2xpLykKIyAtIENvcHkgeW91ciB0b2tlbiBmcm9tICBodHRwOi8vZG90dHktY2kuZXBmbC5jaC9hY2NvdW50IChDbGljayBTSE9XIFRPS0VOKQojIC0gKGV4cG9ydCBEUk9ORV9UT0tFTj15b3VyLXRva2VuOyBleHBvcnQgRFJPTkVfU0VSVkVSPWh0dHA6Ly9kb3R0eS1jaS5lcGZsLmNoOyBkcm9uZSBzaWduIGxhbXBlcGZsL2RvdHR5KQojCiMgUGxlYXNlIG5vdGUgdGhhdCB0aGUgc2lnbmluZyBjYW4gb25seSBiZSBkb25lIGJ5IGNvbGxhYm9yYXRvcnMuCgpwaXBlbGluZToKICB0ZXN0OgogICAgaW1hZ2U6IGxhbXBlcGZsL2RvdHR5OjA3LTA2LTIwMTcKICAgIHB1bGw6IHRydWUKICAgIGNvbW1hbmRzOgogICAgICAtIC4vcHJvamVjdC9zY3JpcHRzL3NidCAiJHtDSV9URVNUfSIKICAgIHdoZW46CiAgICAgIGJyYW5jaDoKICAgICAgICBleGNsdWRlOiBnaC1wYWdlcwoKICBwdWJsaXNoX25pZ2h0bHk6CiAgICBpbWFnZTogbGFtcGVwZmwvZG90dHk6MDctMDYtMjAxNwogICAgcHVsbDogdHJ1ZQogICAgY29tbWFuZHM6CiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvc2J0ICI7Y2xlYW4gO3B1Ymxpc2hMb2NhbCIgIiR7Q0lfUFVCTElTSH0iCiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvc2J0ICJzYnQtZG90dHkvc2NyaXB0ZWQgc291cmNlLWRlcGVuZGVuY2llcy8qIiAiJHtDSV9QVUJMSVNIfSIKICAgICAgLSBOSUdIVExZQlVJTEQ9InllcyIgLi9wcm9qZWN0L3NjcmlwdHMvc2J0UHVibGlzaCAke0NJX1BVQkxJU0h9ICRTT05BVFlQRV9VU0VSICRTT05BVFlQRV9QVyAkUEdQX1BXICI7ZG90dHktYm9vdHN0cmFwcGVkL3B1Ymxpc2hTaWduZWQgO3NvbmF0eXBlUmVsZWFzZSIKICAgIHZvbHVtZXM6CiAgICAgIC0gL2hvbWUvZHJvbmUva2V5czova2V5cwogICAgd2hlbjoKICAgICAgZXZlbnQ6IGRlcGxveW1lbnQKICAgICAgZW52aXJvbm1lbnQ6IG5pZ2h0bHkKCiAgcHVibGlzaF9yZWxlYXNlOgogICAgaW1hZ2U6IGxhbXBlcGZsL2RvdHR5OjA3LTA2LTIwMTcKICAgIHB1bGw6IHRydWUKICAgIGNvbW1hbmRzOgogICAgICAtIFJFTEVBU0VCVUlMRD0ieWVzIiAuL3Byb2plY3Qvc2NyaXB0cy9zYnRQdWJsaXNoICR7Q0lfUFVCTElTSH0gJFNPTkFUWVBFX1VTRVIgJFNPTkFUWVBFX1BXICRQR1BfUFcgIjtkb3R0eS1ib290c3RyYXBwZWQvcHVibGlzaFNpZ25lZCA7c29uYXR5cGVSZWxlYXNlIgogICAgdm9sdW1lczoKICAgICAgLSAvaG9tZS9kcm9uZS9rZXlzOi9rZXlzCiAgICB3aGVuOgogICAgICBldmVudDogZGVwbG95bWVudAogICAgICBlbnZpcm9ubWVudDogcmVsZWFzZQoKICBwdWJsaXNoX3NidF9yZWxlYXNlOgogICAgaW1hZ2U6IGxhbXBlcGZsL2RvdHR5OjA3LTA2LTIwMTcKICAgIHB1bGw6IHRydWUKICAgIGNvbW1hbmRzOgogICAgICAtIFJFTEVBU0VCVUlMRD0ieWVzIiAuL3Byb2plY3Qvc2NyaXB0cy9zYnRQdWJsaXNoICR7Q0lfUFVCTElTSH0gJFNPTkFUWVBFX1VTRVIgJFNPTkFUWVBFX1BXICRQR1BfUFcgIjtzYnQtZG90dHkvcHVibGlzaFNpZ25lZCA7c29uYXR5cGVSZWxlYXNlIgogICAgdm9sdW1lczoKICAgICAgLSAvaG9tZS9kcm9uZS9rZXlzOi9rZXlzCiAgICB3aGVuOgogICAgICBldmVudDogZGVwbG95bWVudAogICAgICBlbnZpcm9ubWVudDogc2J0X3JlbGVhc2UKCiAgZG9jdW1lbnRhdGlvbjoKICAgIGltYWdlOiBsYW1wZXBmbC9kb3R0eTowNy0wNi0yMDE3CiAgICBwdWxsOiB0cnVlCiAgICBjb21tYW5kczoKICAgICAgLSAuL3Byb2plY3Qvc2NyaXB0cy9nZW5Eb2NzICIke0NJX1BVQkxJU0h9IiAkQk9UX1BBU1MKICAgIHdoZW46CiAgICAgIGJyYW5jaDogbWFzdGVyCgogIHNsYWNrOgogICAgaW1hZ2U6IHBsdWdpbnMvc2xhY2sKICAgIGNoYW5uZWw6IGRvdHR5CiAgICB3aGVuOgogICAgICBicmFuY2g6IG1hc3RlcgogICAgICBzdGF0dXM6IGNoYW5nZWQKCm1hdHJpeDoKICBpbmNsdWRlOgogICAgLSBDSV9URVNUOiBkb3R0eS1iaW4tdGVzdHMvdGVzdAogICAgICBDSV9QVUJMSVNIOiB0cnVlCiAgICAtIENJX1RFU1Q6IGxlZ2FjeVRlc3RzCiAgICAgIENJX1BVQkxJU0g6IGZhbHNlCiAgICAtIENJX1RFU1Q6IDt0ZXN0O3NidC1kb3R0eS9zY3JpcHRlZCBjb21waWxlclJlcG9ydGVyLyo7c2J0LWRvdHR5L3NjcmlwdGVkIGRpc2NvdmVyeS8qO3NidC1kb3R0eS9zY3JpcHRlZCBzYnQtZG90dHkvKgogICAgICBDSV9QVUJMSVNIOiBmYWxzZQogICAgLSBDSV9URVNUOiBkb3R0eS1ib290c3RyYXBwZWQvdGVzdAogICAgICBDSV9QVUJMSVNIOiBmYWxzZQo.REtW8iikLellOXP5ex7tY4WJFc4aIFHXTFsbPi0qkiA
+eyJhbGciOiJIUzI1NiJ9.IyBBZnRlciB1cGRhdGluZyB0aGlzIGZpbGUsIHlvdSBuZWVkIHRvIHJlLXNpZ24gaXQ6CiMKIyAtIEluc3RhbGwgW2Ryb25lLWNsaV0oaHR0cDovL3JlYWRtZS5kcm9uZS5pby91c2FnZS9nZXR0aW5nLXN0YXJ0ZWQtY2xpLykKIyAtIENvcHkgeW91ciB0b2tlbiBmcm9tIGh0dHA6Ly9kb3R0eS1jaS5lcGZsLmNoL2FjY291bnQgKENsaWNrIFNIT1cgVE9LRU4pCiMgLSBEUk9ORV9UT0tFTj15b3VyLXRva2VuIERST05FX1NFUlZFUj1odHRwOi8vZG90dHktY2kuZXBmbC5jaCBkcm9uZSBzaWduIGxhbXBlcGZsL2RvdHR5CiMKIyBQbGVhc2Ugbm90ZSB0aGF0IHRoZSBzaWduaW5nIGNhbiBvbmx5IGJlIGRvbmUgYnkgY29sbGFib3JhdG9ycy4KCnBpcGVsaW5lOgogIHRlc3Q6CiAgICBpbWFnZTogbGFtcGVwZmwvZG90dHk6MDctMDYtMjAxNwogICAgcHVsbDogdHJ1ZQogICAgY29tbWFuZHM6CiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvc2J0ICIke0NJX1RFU1R9IgogICAgd2hlbjoKICAgICAgYnJhbmNoOgogICAgICAgIGV4Y2x1ZGU6IGdoLXBhZ2VzCgogIHB1Ymxpc2hfbmlnaHRseToKICAgIGltYWdlOiBsYW1wZXBmbC9kb3R0eTowNy0wNi0yMDE3CiAgICBwdWxsOiB0cnVlCiAgICBjb21tYW5kczoKICAgICAgLSAuL3Byb2plY3Qvc2NyaXB0cy9zYnQgIjtjbGVhbiA7cHVibGlzaExvY2FsIiAiJHtDSV9QVUJMSVNIfSIKICAgICAgLSAuL3Byb2plY3Qvc2NyaXB0cy9zYnQgInNidC1kb3R0eS9zY3JpcHRlZCBzb3VyY2UtZGVwZW5kZW5jaWVzLyoiICIke0NJX1BVQkxJU0h9IgogICAgICAtIE5JR0hUTFlCVUlMRD0ieWVzIiAuL3Byb2plY3Qvc2NyaXB0cy9zYnRQdWJsaXNoICR7Q0lfUFVCTElTSH0gJFNPTkFUWVBFX1VTRVIgJFNPTkFUWVBFX1BXICRQR1BfUFcgIjtkb3R0eS1ib290c3RyYXBwZWQvcHVibGlzaFNpZ25lZCA7c29uYXR5cGVSZWxlYXNlIgogICAgdm9sdW1lczoKICAgICAgLSAvaG9tZS9kcm9uZS9rZXlzOi9rZXlzCiAgICB3aGVuOgogICAgICBldmVudDogZGVwbG95bWVudAogICAgICBlbnZpcm9ubWVudDogbmlnaHRseQoKICBwdWJsaXNoX3JlbGVhc2U6CiAgICBpbWFnZTogbGFtcGVwZmwvZG90dHk6MDctMDYtMjAxNwogICAgcHVsbDogdHJ1ZQogICAgY29tbWFuZHM6CiAgICAgIC0gUkVMRUFTRUJVSUxEPSJ5ZXMiIC4vcHJvamVjdC9zY3JpcHRzL3NidFB1Ymxpc2ggJHtDSV9QVUJMSVNIfSAkU09OQVRZUEVfVVNFUiAkU09OQVRZUEVfUFcgJFBHUF9QVyAiO2RvdHR5LWJvb3RzdHJhcHBlZC9wdWJsaXNoU2lnbmVkIDtzb25hdHlwZVJlbGVhc2UiCiAgICB2b2x1bWVzOgogICAgICAtIC9ob21lL2Ryb25lL2tleXM6L2tleXMKICAgIHdoZW46CiAgICAgIGV2ZW50OiBkZXBsb3ltZW50CiAgICAgIGVudmlyb25tZW50OiByZWxlYXNlCgogIHB1Ymxpc2hfc2J0X3JlbGVhc2U6CiAgICBpbWFnZTogbGFtcGVwZmwvZG90dHk6MDctMDYtMjAxNwogICAgcHVsbDogdHJ1ZQogICAgY29tbWFuZHM6CiAgICAgIC0gUkVMRUFTRUJVSUxEPSJ5ZXMiIC4vcHJvamVjdC9zY3JpcHRzL3NidFB1Ymxpc2ggJHtDSV9QVUJMSVNIfSAkU09OQVRZUEVfVVNFUiAkU09OQVRZUEVfUFcgJFBHUF9QVyAiO3NidC1kb3R0eS9wdWJsaXNoU2lnbmVkIDtzb25hdHlwZVJlbGVhc2UiCiAgICB2b2x1bWVzOgogICAgICAtIC9ob21lL2Ryb25lL2tleXM6L2tleXMKICAgIHdoZW46CiAgICAgIGV2ZW50OiBkZXBsb3ltZW50CiAgICAgIGVudmlyb25tZW50OiBzYnRfcmVsZWFzZQoKICBkb2N1bWVudGF0aW9uOgogICAgaW1hZ2U6IGxhbXBlcGZsL2RvdHR5OjA3LTA2LTIwMTcKICAgIHB1bGw6IHRydWUKICAgIGNvbW1hbmRzOgogICAgICAtIC4vcHJvamVjdC9zY3JpcHRzL2dlbkRvY3MgIiR7Q0lfUFVCTElTSH0iICRCT1RfUEFTUwogICAgd2hlbjoKICAgICAgYnJhbmNoOiBtYXN0ZXIKCiAgc2xhY2s6CiAgICBpbWFnZTogcGx1Z2lucy9zbGFjawogICAgY2hhbm5lbDogZG90dHkKICAgIHdoZW46CiAgICAgIGJyYW5jaDogbWFzdGVyCiAgICAgIHN0YXR1czogY2hhbmdlZAoKbWF0cml4OgogIGluY2x1ZGU6CiAgICAtIENJX1RFU1Q6IGRvdHR5LWJpbi10ZXN0cy90ZXN0CiAgICAgIENJX1BVQkxJU0g6IHRydWUKICAgIC0gQ0lfVEVTVDogbGVnYWN5VGVzdHMKICAgICAgQ0lfUFVCTElTSDogZmFsc2UKICAgIC0gQ0lfVEVTVDogO3Rlc3Q7c2J0LWRvdHR5L3NjcmlwdGVkIGNvbXBpbGVyUmVwb3J0ZXIvKjtzYnQtZG90dHkvc2NyaXB0ZWQgZGlzY292ZXJ5Lyo7c2J0LWRvdHR5L3NjcmlwdGVkIHNidC1kb3R0eS8qCiAgICAgIENJX1BVQkxJU0g6IGZhbHNlCiAgICAtIENJX1RFU1Q6IGRvdHR5LWJvb3RzdHJhcHBlZC90ZXN0CiAgICAgIENJX1BVQkxJU0g6IGZhbHNlCiAgICAtIENJX1RFU1Q6IDtzZXQgYm9vdHN0cmFwT3B0aW1pc2VkIGluIFRoaXNCdWlsZCA6PSB0cnVlIDtkb3R0eS1ib290c3RyYXBwZWQvdGVzdAogICAgICBDSV9QVUJMSVNIOiBmYWxzZQo.0COKo7FjFKxUxTYAwxWvpOHgRClgdi9A4M4Kb91h6HQ

README.md

@@ -14,6 +14,12 @@ Try it out
 ==========
 To try it in your project see also the [Getting Started User Guide](http://dotty.epfl.ch/#getting-started).
 
+Code of Conduct
+===============
+Dotty uses the [Scala Code of Conduct](https://www.scala-lang.org/conduct.html)
+for all communication and discussion. This includes both GitHub, Gitter chat and
+other more direct lines of communication such as email.
+
 How to Contribute
 =================
 * [Getting Started as Contributor](http://dotty.epfl.ch/docs/contributing/getting-started.html)

compiler/src/dotty/tools/dotc/core/Symbols.scala

@@ -556,9 +556,10 @@ object Symbols {
     type ThisName = TypeName
 
     /** If this is a top-level class, and if `-Yretain-trees` is set, return the TypeDef tree
-     *  for this class, otherwise EmptyTree.
+     *  for this class, otherwise EmptyTree. This will force the info of the class.
      */
     def tree(implicit ctx: Context): tpd.Tree /* tpd.TypeDef | tpd.EmptyTree */ = {
+      denot.info
       // TODO: Consider storing this tree like we store lazy trees for inline functions
       if (unpickler != null && !denot.isAbsent) {
         assert(myTree.isEmpty)

compiler/src/dotty/tools/dotc/core/Types.scala

@@ -125,7 +125,9 @@ object Types {
     def isRef(sym: Symbol)(implicit ctx: Context): Boolean = stripAnnots.stripTypeVar match {
       case this1: TypeRef =>
         this1.info match { // see comment in Namer#typeDefSig
-          case TypeAlias(tp) => tp.isRef(sym)
+          case TypeAlias(tp) =>
+            assert((tp ne this) && (tp ne this1), s"$tp / $this")
+            tp.isRef(sym)
           case _ =>  this1.symbol eq sym
         }
       case this1: RefinedOrRecType => this1.parent.isRef(sym)

compiler/src/dotty/tools/dotc/interactive/InteractiveDriver.scala

@@ -44,8 +44,13 @@ class InteractiveDriver(settings: List[String]) extends Driver {
 
   def currentCtx: Context = myCtx
 
-  private val myOpenedFiles = new mutable.LinkedHashMap[URI, SourceFile]
-  private val myOpenedTrees = new mutable.LinkedHashMap[URI, List[SourceTree]]
+  private val myOpenedFiles = new mutable.LinkedHashMap[URI, SourceFile] {
+    override def default(key: URI) = NoSource
+  }
+
+  private val myOpenedTrees = new mutable.LinkedHashMap[URI, List[SourceTree]] {
+    override def default(key: URI) = Nil
+  }
 
   def openedFiles: Map[URI, SourceFile] = myOpenedFiles
   def openedTrees: Map[URI, List[SourceTree]] = myOpenedTrees
@@ -69,6 +74,10 @@ class InteractiveDriver(settings: List[String]) extends Driver {
     }
   }
 
+  // Presence of a file with one of these suffixes indicates that the
+  // corresponding class has been pickled with TASTY.
+  private val tastySuffixes = List(".hasTasty", ".tasty")
+
   private def classNames(cp: ClassPath, packageName: String): List[String] = {
     def className(classSegments: List[String]) =
       classSegments.mkString(".").stripSuffix(".class")
@@ -85,9 +94,6 @@ class InteractiveDriver(settings: List[String]) extends Driver {
               binFile.name.stripSuffix(".class")
             else
               null
-          // Presence of a file with one of these suffixes indicates that the
-          // corresponding class has been pickled with TASTY.
-          val tastySuffixes = List(".hasTasty", ".tasty")
           prefix != null && {
             binFile match {
               case pf: PlainFile =>
@@ -123,8 +129,12 @@ class InteractiveDriver(settings: List[String]) extends Driver {
       .stream
       .toArray(new IntFunction[Array[ZipEntry]] { def apply(size: Int) = new Array(size) })
       .toSeq
-    entries.filter(_.getName.endsWith(".tasty"))
-      .map(_.getName.replace("/", ".").stripSuffix(".tasty"))
+    for {
+      entry <- entries
+      name = entry.getName
+      tastySuffix <- tastySuffixes
+      if name.endsWith(tastySuffix)
+    } yield name.replace("/", ".").stripSuffix(tastySuffix)
   }
 
   // FIXME: classfiles in directories may change at any point, so we retraverse
@@ -136,8 +146,14 @@ class InteractiveDriver(settings: List[String]) extends Driver {
       val root = dirCp.dir.toPath
       Files.walkFileTree(root, new SimpleFileVisitor[Path] {
         override def visitFile(path: Path, attrs: BasicFileAttributes) = {
-          if (!attrs.isDirectory && path.getFileName.toString.endsWith(".tasty")) {
-            names += root.relativize(path).toString.replace("/", ".").stripSuffix(".tasty")
+          if (!attrs.isDirectory) {
+            val name = path.getFileName.toString
+            for {
+              tastySuffix <- tastySuffixes
+              if name.endsWith(tastySuffix)
+            } {
+              names += root.relativize(path).toString.replace("/", ".").stripSuffix(tastySuffix)
+            }
           }
           FileVisitResult.CONTINUE
         }

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -1681,7 +1681,7 @@ object Parsers {
 
     def addFlag(mods: Modifiers, flag: FlagSet): Modifiers = {
       def incompatible(kind: String) = {
-        syntaxError(s"modifier(s) `${mods.flags}' not allowed for $kind")
+        syntaxError(ModifiersNotAllowed(mods.flags, kind))
         Modifiers(flag)
       }
       if (compatible(mods.flags, flag)) mods | flag

compiler/src/dotty/tools/dotc/reporting/diagnostic/ErrorMessageID.java

@@ -89,7 +89,8 @@ public enum ErrorMessageID {
     OnlyCaseClassOrCaseObjectAllowedID,
     ExpectedClassOrObjectDefID,
     AnonymousFunctionMissingParamTypeID,
-    SuperCallsNotAllowedInlineID
+    SuperCallsNotAllowedInlineID,
+    ModifiersNotAllowedID,
     ;
 
     public int errorNumber() {

compiler/src/dotty/tools/dotc/reporting/diagnostic/messages.scala

@@ -20,6 +20,7 @@ import printing.Formatting
 import ErrorMessageID._
 import Denotations.SingleDenotation
 import dotty.tools.dotc.ast.Trees
+import dotty.tools.dotc.ast.untpd.Modifiers
 import dotty.tools.dotc.core.Flags.{FlagSet, Mutable}
 import dotty.tools.dotc.core.SymDenotations.SymDenotation
 
@@ -1614,4 +1615,20 @@ object messages {
     val msg = s"super call not allowed in inline $symbol"
     val explanation = "Method inlining prohibits calling superclass methods, as it may lead to confusion about which super is being called."
   }
+
+  case class ModifiersNotAllowed(flags: FlagSet, sort: String)(implicit ctx: Context)
+    extends Message(ModifiersNotAllowedID) {
+    val kind = "Syntax"
+    val msg = s"modifier(s) `$flags' not allowed for $sort"
+    val explanation = {
+      val code = "sealed def y: Int = 1"
+      hl"""You tried to use a modifier that is inapplicable for the type of item under modification
+         |
+         |
+         |Consider the following example:
+         |$code
+         |In this instance, the modifier 'sealed' is not applicable to the item type 'def' (method)
+        """
+    }
+  }
 }

compiler/test/dotty/tools/dotc/reporting/ErrorMessagesTests.scala

@@ -839,4 +839,14 @@ class ErrorMessagesTests extends ErrorMessagesTest {
         val SuperCallsNotAllowedInline(symbol) = err
         assertEquals("method bar", symbol.show)
       }
+
+  @Test def modifiersNotAllowed =
+    checkMessagesAfter("refchecks")("""lazy trait T""")
+      .expect { (ictx, messages) =>
+        implicit val ctx: Context = ictx
+        assertMessageCount(1, messages)
+        val ModifiersNotAllowed(flags, sort) :: Nil = messages
+        assertEquals("lazy", flags.toString)
+        assertEquals("trait", sort)
+      }
 }

doc-tool/resources/css/dottydoc.css

@@ -172,6 +172,9 @@ h1#doc-page-title {
     margin: 10px 0 40px 10px;
     font-family: "Source Sans Pro", sans-serif;
     font-weight: 400;
+    display: -webkit-flex;
+    display: flex;
+    width: 550px;
 }
 
 div#post-title > h2#sub-title {

language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala

@@ -351,9 +351,12 @@ object DottyLanguageServer {
 
   /** Convert an lsp4j.Position to a SourcePosition */
   def sourcePosition(driver: InteractiveDriver, uri: URI, pos: lsp4j.Position): SourcePosition = {
-    val source = driver.openedFiles(uri) // might throw exception
-    val p = Positions.Position(source.lineToOffset(pos.getLine) + pos.getCharacter)
-    new SourcePosition(source, p)
+    val source = driver.openedFiles(uri)
+    if (source.exists) {
+      val p = Positions.Position(source.lineToOffset(pos.getLine) + pos.getCharacter)
+      new SourcePosition(source, p)
+    }
+    else NoSourcePosition
   }
 
   /** Convert a SourcePosition to an lsp4j.Range */

project/Build.scala

@@ -25,6 +25,7 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
 object ExposedValues extends AutoPlugin {
   object autoImport {
     val bootstrapFromPublishedJars = Build.bootstrapFromPublishedJars
+    val bootstrapOptimised = Build.bootstrapOptimised
   }
 }
 
@@ -52,6 +53,7 @@ object Build {
   val JENKINS_BUILD = "dotty.jenkins.build"
   val DRONE_MEM = "dotty.drone.mem"
 
+
   val agentOptions = List(
     // "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"
     // "-agentpath:/home/dark/opt/yjp-2013-build-13072/bin/linux-x86-64/libyjpagent.so"
@@ -84,12 +86,14 @@ object Build {
   lazy val dottydoc = inputKey[Unit]("run dottydoc")
 
   lazy val bootstrapFromPublishedJars = settingKey[Boolean]("If true, bootstrap dotty from published non-bootstrapped dotty")
+  lazy val bootstrapOptimised = settingKey[Boolean]("Bootstrap with -optimise")
 
   // Used in build.sbt
   lazy val thisBuildSettings = Def.settings(
     // Change this to true if you want to bootstrap using a published non-bootstrapped compiler
     bootstrapFromPublishedJars := false,
 
+    bootstrapOptimised := false,
 
     // Override `runCode` from sbt-dotty to use the language-server and
     // vscode extension from the source repository of dotty instead of a
@@ -167,8 +171,6 @@ object Build {
     // otherwise sbt 0.13 incremental compilation breaks (https://github.com/sbt/sbt/issues/3142)
     scalacOptions ++= Seq("-bootclasspath", sys.props("sun.boot.class.path")),
 
-    scalacOptions += "-optimise",
-
     // sbt gets very unhappy if two projects use the same target
     target := baseDirectory.value / ".." / "out" / "bootstrap" / name.value,
 
@@ -177,6 +179,13 @@ object Build {
     // ...but scala-library is
     libraryDependencies += "org.scala-lang" % "scala-library" % scalacVersion,
 
+    scalacOptions ++= {
+      if (bootstrapOptimised.value)
+        Seq("-optimise")
+      else
+        Seq()
+    },
+
     ivyConfigurations ++= {
       if (bootstrapFromPublishedJars.value)
         Seq(Configurations.ScalaTool)

tests/idempotency/Checker.scala

@@ -1,4 +1,5 @@
 
+
 object Test {
   def main(args: Array[String]): Unit =
     IdempotencyCheck.checkIdempotency("../out/idempotency")