@@ -95,15 +95,15 @@ class CheckUnused extends MiniPhase:
95
95
override def prepareForValDef (tree : tpd.ValDef )(using Context ): Context =
96
96
_key.unusedDataApply{ud =>
97
97
ud.registerDef(tree)
98
- if tree.symbol.is(Flags .Module ) then
99
- ud.addIgnoredUsage(tree.symbol)
98
+ ud.addIgnoredUsage(tree.symbol)
100
99
}
101
100
102
101
override def prepareForDefDef (tree : tpd.DefDef )(using Context ): Context =
103
102
_key.unusedDataApply{ ud =>
104
103
import ud .registerTrivial
105
104
tree.registerTrivial
106
105
ud.registerDef(tree)
106
+ ud.addIgnoredUsage(tree.symbol)
107
107
}
108
108
109
109
override def prepareForTypeDef (tree : tpd.TypeDef )(using Context ): Context =
@@ -121,11 +121,6 @@ class CheckUnused extends MiniPhase:
121
121
122
122
// ========== MiniPhase Transform ==========
123
123
124
- override def transformValDef (tree : tpd.ValDef )(using Context ): tpd.Tree =
125
- if tree.symbol.is(Flags .Module ) then
126
- _key.unusedDataApply(_.removeIgnoredUsage(tree.symbol))
127
- tree
128
-
129
124
override def transformBlock (tree : tpd.Block )(using Context ): tpd.Tree =
130
125
popOutBlockTemplatePackageDef()
131
126
tree
@@ -138,6 +133,14 @@ class CheckUnused extends MiniPhase:
138
133
popOutBlockTemplatePackageDef()
139
134
tree
140
135
136
+ override def transformValDef (tree : tpd.ValDef )(using Context ): tpd.Tree =
137
+ _key.unusedDataApply(_.removeIgnoredUsage(tree.symbol))
138
+ tree
139
+
140
+ override def transformDefDef (tree : tpd.DefDef )(using Context ): tpd.Tree =
141
+ _key.unusedDataApply(_.removeIgnoredUsage(tree.symbol))
142
+ tree
143
+
141
144
override def transformTypeDef (tree : tpd.TypeDef )(using Context ): tpd.Tree =
142
145
_key.unusedDataApply(_.removeIgnoredUsage(tree.symbol))
143
146
tree
0 commit comments