Simplify methods implemented in #436

1 files changed, 6 insertions, 12 deletions

diff --git a/src/dotty/tools/dotc/core/Symbols.scala b/src/dotty/tools/dotc/core/Symbols.scala
index 97fe1f23e..0b50187a5 100644
--- a/src/dotty/tools/dotc/core/Symbols.scala
+++ b/src/dotty/tools/dotc/core/Symbols.scala
@@ -161,20 +161,14 @@ trait Symbols { this: Context =>
           owner.thisType, modcls, parents, decls, TermRef.withSymAndName(owner.thisType, module, name)),
         privateWithin, coord, assocFile)
 
-  def synthesizeCompanionMethod(name: TermName, ret: SymDenotation, owner: SymDenotation)(implicit ctx: Context) = {
-    if(owner.exists && ret.exists && !owner.isAbsent && !ret.isAbsent) {
+  def synthesizeCompanionMethod(name: Name, target: SymDenotation, owner: SymDenotation)(implicit ctx: Context) =
+    if(owner.exists && target.exists && !owner.isAbsent && !target.isAbsent) {
       val existing = owner.unforcedDecls.lookup(name)
-      if (existing.exists) existing
-      else
-      ctx.newSymbol(
-        owner = owner.symbol,
-        name = name,
-        flags = Flags.Synthetic | Flags.Private,
-        info = ExprType(ret.typeRef))
 
-    }
-    else NoSymbol
-  }
+      existing.orElse{
+        ctx.newSymbol(owner.symbol, name, Flags.Synthetic | Flags.Private, ExprType(target.typeRef))
+      }
+    } else NoSymbol
 
   /** Create a package symbol with associated package class
    *  from its non-info fields and a lazy type for loading the package's members.