Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix rewrite logic for old <function> _ syntax #21715

Merged
merged 1 commit into from
Oct 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions compiler/src/dotty/tools/dotc/typer/Migrations.scala
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,13 @@ trait Migrations:
}
nestedCtx.typerState.commit()

def functionPrefixSuffix(arity: Int) = if (arity > 0) ("", "") else ("(() => ", "())")

lazy val (prefix, suffix) = res match {
case Block(mdef @ DefDef(_, vparams :: Nil, _, _) :: Nil, _: Closure) =>
val arity = vparams.length
if (arity > 0) ("", "") else ("(() => ", "())")
case Block(DefDef(_, vparams :: Nil, _, _) :: Nil, _: Closure) =>
functionPrefixSuffix(vparams.length)
case Block(ValDef(_, _, _) :: Nil, Block(DefDef(_, vparams :: Nil, _, _) :: Nil, _: Closure)) =>
functionPrefixSuffix(vparams.length)
case _ =>
("(() => ", ")")
}
Expand Down
1 change: 1 addition & 0 deletions compiler/test/dotty/tools/dotc/CompilationTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ class CompilationTests {
compileFile("tests/rewrites/rewrites.scala", defaultOptions.and("-source", "3.0-migration").and("-rewrite", "-indent")),
compileFile("tests/rewrites/rewrites3x.scala", defaultOptions.and("-rewrite", "-source", "future-migration")),
compileFile("tests/rewrites/rewrites3x-fatal-warnings.scala", defaultOptions.and("-rewrite", "-source", "future-migration", "-Xfatal-warnings")),
compileFile("tests/rewrites/i21394.scala", defaultOptions.and("-rewrite", "-source", "future-migration")),
compileFile("tests/rewrites/uninitialized-var.scala", defaultOptions.and("-rewrite", "-source", "future-migration")),
compileFile("tests/rewrites/with-type-operator.scala", defaultOptions.and("-rewrite", "-source", "future-migration")),
compileFile("tests/rewrites/private-this.scala", defaultOptions.and("-rewrite", "-source", "future-migration")),
Expand Down
17 changes: 17 additions & 0 deletions tests/rewrites/i21394.check
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
trait Container:
def loopDef: Container
val loopVal: Container
def fun(x: Int)(y: Int): Int

def test(c: Container): Int =
use(c.fun)
+ use(c.loopDef.fun)
+ use(c.loopVal.fun)
+ use(c.loopDef.loopDef.fun)
+ use(c.loopVal.loopVal.fun)
+ use(c.loopVal.loopDef.fun)
+ use(c.loopDef.loopVal.fun)
+ use(c.loopVal.loopDef.loopVal.fun)
+ use(c.loopVal.loopDef.loopVal.loopDef.fun)

def use(f: Int => Int => Int): Int = ???
17 changes: 17 additions & 0 deletions tests/rewrites/i21394.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
trait Container:
def loopDef: Container
val loopVal: Container
def fun(x: Int)(y: Int): Int

def test(c: Container): Int =
use(c.fun _)
+ use(c.loopDef.fun _)
+ use(c.loopVal.fun _)
+ use(c.loopDef.loopDef.fun _)
+ use(c.loopVal.loopVal.fun _)
+ use(c.loopVal.loopDef.fun _)
+ use(c.loopDef.loopVal.fun _)
+ use(c.loopVal.loopDef.loopVal.fun _)
+ use(c.loopVal.loopDef.loopVal.loopDef.fun _)

def use(f: Int => Int => Int): Int = ???
Loading