Merge pull request #2885 from dotty-staging/harden-ide-2

More IDE work

Author: odersky

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

@@ -61,14 +61,15 @@ object Annotations {
     def tree(implicit ctx: Context) = body
   }
 
-  case class LazyBodyAnnotation(bodyExpr: Context => Tree) extends BodyAnnotation {
+  case class LazyBodyAnnotation(private var bodyExpr: Context => Tree) extends BodyAnnotation {
     private var evaluated = false
     private var myBody: Tree = _
     def tree(implicit ctx: Context) = {
       if (evaluated) assert(myBody != null)
       else {
         evaluated = true
         myBody = bodyExpr(ctx)
+        bodyExpr = null
       }
       myBody
     }

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

@@ -2156,7 +2156,7 @@ object Types {
     }
   }
 
-  case class LazyRef(refFn: () => Type) extends UncachedProxyType with ValueType {
+  case class LazyRef(private var refFn: () => Type) extends UncachedProxyType with ValueType {
     private var myRef: Type = null
     private var computed = false
     def ref = {

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

@@ -62,6 +62,9 @@ object Interactive {
       sourceSymbol(sym.owner)
     else sym
 
+  private def safely[T](op: => List[T]): List[T] =
+    try op catch { case ex: TypeError => Nil }
+
   /** Possible completions at position `pos` */
   def completions(trees: List[SourceTree], pos: SourcePosition)(implicit ctx: Context): List[Symbol] = {
     val path = pathTo(trees, pos)
@@ -85,16 +88,13 @@ object Interactive {
   }
 
   /** Possible completions of members of `prefix` which are accessible when called inside `boundary` */
-  def completions(prefix: Type, boundary: Symbol)(implicit ctx: Context): List[Symbol] = {
-    val boundaryCtx = ctx.withOwner(boundary)
-    try
+  def completions(prefix: Type, boundary: Symbol)(implicit ctx: Context): List[Symbol] =
+    safely {
+      val boundaryCtx = ctx.withOwner(boundary)
       prefix.memberDenots(completionsFilter, (name, buf) =>
         buf ++= prefix.member(name).altsWith(d => !d.isAbsent && d.symbol.isAccessibleFrom(prefix)(boundaryCtx))
       ).map(_.symbol).toList
-    catch {
-      case ex: TypeError => Nil
     }
-  }
 
   /** Filter for names that should appear when looking for completions. */
   private[this] object completionsFilter extends NameFilter {
@@ -131,7 +131,7 @@ object Interactive {
    *  @param includeReferences  If true, include references and not just definitions
    */
   def namedTrees(trees: List[SourceTree], includeReferences: Boolean, treePredicate: NameTree => Boolean)
-    (implicit ctx: Context): List[SourceTree] = {
+    (implicit ctx: Context): List[SourceTree] = safely {
     val buf = new mutable.ListBuffer[SourceTree]
 
     trees foreach { case SourceTree(topTree, source) =>

compiler/src/dotty/tools/dotc/transform/LambdaLift.scala

@@ -204,7 +204,7 @@ class LambdaLift extends MiniPhase with IdentityDenotTransformer { thisTransform
           if (enclosure.is(PackageClass)) enclosure
           else if (enclosure.isConstructor) markFree(sym, enclosure.owner.enclosure)
           else markFree(sym, enclosure.enclosure)
-        narrowLiftedOwner(enclosure, intermediate orElse sym.enclosingClass)
+        if (intermediate.exists) narrowLiftedOwner(enclosure, intermediate)
         if (!intermediate.isRealClass || enclosure.isConstructor) {
           // Constructors and methods nested inside traits get the free variables
           // of the enclosing trait or class.
@@ -384,7 +384,7 @@ class LambdaLift extends MiniPhase with IdentityDenotTransformer { thisTransform
         local.copySymDenotation(
           owner = newOwner,
           name = newName(local),
-          initFlags = local.flags &~ Module | Private | maybeStatic,
+          initFlags = local.flags &~ Module &~ Final | Private | maybeStatic,
             // drop Module because class is no longer a singleton in the lifted context.
           info = liftedInfo(local)).installAfter(thisTransform)
       }