actually check if a symbol is infix before failing with ToplevelDefCantBeInfix

arainko · arainko · commit 535368f8a84d · 2023-06-17T15:41:50.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/typer/Checking.scala b/compiler/src/dotty/tools/dotc/typer/Checking.scala
@@ -555,7 +555,7 @@ object Checking {
         fail(CannotHaveSameNameAs(sym, cls, CannotHaveSameNameAs.CannotBeOverridden))
         sym.setFlag(Private) // break the overriding relationship by making sym Private
       }
-    if sym.isWrappedToplevelDef && !sym.isType then fail(ToplevelDefCantBeInfix(sym))
+    if sym.isWrappedToplevelDef && !sym.isType && sym.flags.is(Infix) then fail(ToplevelDefCantBeInfix(sym))
     checkApplicable(Erased,
       !sym.isOneOf(MutableOrLazy, butNot = Given) && !sym.isType || sym.isClass)
     checkCombination(Final, Open)

Original file line number	Diff line number	Diff line change
`@@ -555,7 +555,7 @@ object Checking {`
`555`	`555`	`fail(CannotHaveSameNameAs(sym, cls, CannotHaveSameNameAs.CannotBeOverridden))`
`556`	`556`	`sym.setFlag(Private) // break the overriding relationship by making sym Private`
`557`	`557`	`}`
`558`		`- if sym.isWrappedToplevelDef && !sym.isType then fail(ToplevelDefCantBeInfix(sym))`
	`558`	`+ if sym.isWrappedToplevelDef && !sym.isType && sym.flags.is(Infix) then fail(ToplevelDefCantBeInfix(sym))`
`559`	`559`	`checkApplicable(Erased,`
`560`	`560`	`!sym.isOneOf(MutableOrLazy, butNot = Given) && !sym.isType \|\| sym.isClass)`
`561`	`561`	`checkCombination(Final, Open)`