From a532ba0600444b3564b6b015688ebc4cdf084ba6 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Sat, 24 Mar 2012 20:26:40 -0700 Subject: Removing some foolishness. I swear this change didn't work last time I was in this neighborhood. --- .../scala/tools/nsc/typechecker/MethodSynthesis.scala | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala b/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala index 5287fad3bb..b57f139074 100644 --- a/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala +++ b/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala @@ -205,17 +205,13 @@ trait MethodSynthesis { enterBeans(tree) } def finishGetterSetter(typer: Typer, stat: Tree): List[Tree] = stat match { - case vd @ ValDef(mods, name, tpt, rhs) if !noFinishGetterSetter(vd) => + case vd @ ValDef(mods, name, tpt, rhs) if !noFinishGetterSetter(vd) && !vd.symbol.isLazy => // If we don't save the annotations, they seem to wander off. val annotations = stat.symbol.initialize.annotations - val trees = ( - allValDefDerived(vd) - map (acc => atPos(vd.pos.focus)(acc derive annotations)) - filterNot (_ eq EmptyTree) + ( allValDefDerived(vd) + map (acc => atPos(vd.pos.focus)(acc derive annotations)) + filterNot (_ eq EmptyTree) ) - // log(trees.mkString("Accessor trees:\n ", "\n ", "\n")) - if (vd.symbol.isLazy) List(stat) - else trees case _ => List(stat) } -- cgit v1.2.3