SI-7345 Use combinator to find next enclosing non-template.

scala · Apr 21, 2013 · b1cb004 · b1cb004
1 parent 281b850
commit b1cb004
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
@@ -329,9 +329,7 @@ trait Contexts { self: Analyzer =>
      * accessible.
      */
     def makeConstructorContext = {
-      var baseContext = enclClass.outer
-      while (baseContext.tree.isInstanceOf[Template])
-        baseContext = baseContext.outer
+      val baseContext = enclClass.outer.nextEnclosing(!_.tree.isInstanceOf[Template])
       val argContext = baseContext.makeNewScope(tree, owner)
       argContext.restoreState(state)
       argContext.inSelfSuperCall = true