Apply changes from code review

Co-authored-by: Nicolas Stucki <[email protected]>

Author: natsukagami

compiler/src/dotty/tools/dotc/cc/Setup.scala

@@ -261,7 +261,9 @@ extends tpd.TreeTraverser:
     case AppliedType(tycon, res :: exc :: Nil) if tycon.typeSymbol == defn.throwsAlias =>
       // hard-coded expansion since $throws aliases in stdlib are defined with `?=>` rather than `?->`
       defn.FunctionOf(
-        AnnotatedType(defn.CanThrowClass.typeRef.appliedTo(exc), Annotation(defn.ErasedParamAnnot, defn.CanThrowClass.span)) :: Nil,
+        AnnotatedType(
+          defn.CanThrowClass.typeRef.appliedTo(exc), 
+          Annotation(defn.ErasedParamAnnot, defn.CanThrowClass.span)) :: Nil,
         res,
         isContextual = true
       )

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -1261,10 +1261,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
 
           (pt1.argInfos.init, typeTree(interpolateWildcards(pt1.argInfos.last.hiBound)))
         case RefinedType(parent, nme.apply, mt @ MethodTpe(_, formals, restpe))
-        if defn.isNonRefinedFunction(parent) && formals.length == defaultArity =>
-          (formals, untpd.DependentTypeTree(syms => restpe.substParams(mt, syms.map(_.termRef))))
-        case RefinedType(parent, nme.apply, mt @ MethodTpe(_, formals, restpe))
-        if defn.isErasedFunctionType(parent) && formals.length == defaultArity =>
+        if (defn.isNonRefinedFunction(parent) || defn.isErasedFunctionType(parent)) && formals.length == defaultArity =>
           (formals, untpd.DependentTypeTree(syms => restpe.substParams(mt, syms.map(_.termRef))))
         case SAMType(mt @ MethodTpe(_, formals, restpe)) =>
           (formals,