From 79a7015ae1753328203cef5105f44423505446f1 Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan@lightbend.com>
Date: Thu, 23 Feb 2017 12:05:21 -0800
Subject: Clean up copyMethodCompleter, capture less

---
 src/compiler/scala/tools/nsc/typechecker/Namers.scala | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
index e8eb19c52b..355d7cba30 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
@@ -600,12 +600,10 @@ trait Namers extends MethodSynthesis {
     }
 
     def copyMethodCompleter(copyDef: DefDef): TypeCompleter = {
-      val sym      = copyDef.symbol
-      val lazyType = completerOf(copyDef)
-
       /* Assign the types of the class parameters to the parameters of the
-       * copy method. See comment in `Unapplies.caseClassCopyMeth` */
-      def assignParamTypes() {
+       * copy method. See comment in `Unapplies.caseClassCopyMeth`
+       */
+      def assignParamTypes(copyDef: DefDef, sym: Symbol) {
         val clazz = sym.owner
         val constructorType = clazz.primaryConstructor.tpe
         val subst = new SubstSymMap(clazz.typeParams, copyDef.tparams map (_.symbol))
@@ -618,9 +616,11 @@ trait Namers extends MethodSynthesis {
         )
       }
 
-      mkTypeCompleter(copyDef) { sym =>
-        assignParamTypes()
-        lazyType complete sym
+      new CompleterWrapper(completerOf(copyDef)) {
+        override def complete(sym: Symbol): Unit = {
+          assignParamTypes(tree.asInstanceOf[DefDef], sym)
+          super.complete(sym)
+        }
       }
     }
 
-- 
cgit v1.2.3