Skip to content

Commit 5ea523e

Browse files
committed
Keep annotation of @main methods in def main
Fixes #13848
1 parent 70d3c56 commit 5ea523e

File tree

3 files changed

+24
-0
lines changed

3 files changed

+24
-0
lines changed

compiler/src/dotty/tools/dotc/ast/MainProxies.scala

+9
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,17 @@ object MainProxies {
9494
val body = Try(call, handler :: Nil, EmptyTree)
9595
val mainArg = ValDef(nme.args, TypeTree(defn.ArrayType.appliedTo(defn.StringType)), EmptyTree)
9696
.withFlags(Param)
97+
def insertTypeSplices = new TreeMap {
98+
override def transform(tree: Tree)(using Context): Tree = tree match
99+
case tree: Ident => ref(tree.symbol)
100+
case tree => super.transform(tree)
101+
}
102+
val annots = mainFun.annotations
103+
.filterNot(_.matches(defn.MainAnnot))
104+
.map(annot => insertTypeSplices.transform(annot.tree))
97105
val mainMeth = DefDef(nme.main, (mainArg :: Nil) :: Nil, TypeTree(defn.UnitType), body)
98106
.withFlags(JavaStatic)
107+
.withAnnotations(annots)
99108
val mainTempl = Template(emptyConstructor, Nil, Nil, EmptyValDef, mainMeth :: Nil)
100109
val mainCls = TypeDef(mainFun.name.toTypeName, mainTempl)
101110
.withFlags(Final | Invisible)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import annotation.experimental
2+
3+
@main
4+
def run(): Unit = f // error
5+
6+
@experimental
7+
def f = 2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import annotation.experimental
2+
3+
@main
4+
@experimental
5+
def run(): Unit = f
6+
7+
@experimental
8+
def f = 2

0 commit comments

Comments
 (0)