@@ -283,9 +283,9 @@ class Typer extends Namer with Applications with Implicits {
283
283
* from given import info
284
284
*/
285
285
def wildImportRef (imp : ImportInfo ): Type = {
286
- if (imp.isWildcardImport && ! (imp.excluded contains name.toTermName) ) {
286
+ if (imp.isWildcardImport) {
287
287
val pre = imp.site
288
- if (! isDisabled(imp, pre)) {
288
+ if (! isDisabled(imp, pre) && ! (imp.excluded contains name.toTermName) ) {
289
289
val denot = pre.member(name)
290
290
if (reallyExists(denot)) return pre.select(name, denot)
291
291
}
@@ -1024,7 +1024,7 @@ class Typer extends Namer with Applications with Implicits {
1024
1024
}
1025
1025
}
1026
1026
1027
- def typed (tree : untpd.Tree , pt : Type = WildcardType )(implicit ctx : Context ): Tree = ctx.traceIndented (s " typing ${tree.show}" , typr, show = true ) {
1027
+ def typed (tree : untpd.Tree , pt : Type = WildcardType )(implicit ctx : Context ): Tree = /* >|> */ ctx.traceIndented (s " typing ${tree.show}" , typr, show = true ) /* <|< */ {
1028
1028
if (! tree.isEmpty && ctx.typerState.isGlobalCommittable) assert(tree.pos.exists, tree)
1029
1029
try adapt(typedUnadapted(tree, pt), pt)
1030
1030
catch {
@@ -1090,8 +1090,8 @@ class Typer extends Namer with Applications with Implicits {
1090
1090
fallBack
1091
1091
}
1092
1092
1093
- def adapt (tree : Tree , pt : Type )(implicit ctx : Context ) = track(" adapt" ) {
1094
- ctx.traceIndented(i " adapting $tree of type ${tree.tpe} to $pt" , typr, show = true ) {
1093
+ def adapt (tree : Tree , pt : Type )(implicit ctx : Context ) = /* >|> */ track(" adapt" ) /* <|< */ {
1094
+ /* >|> */ ctx.traceIndented(i " adapting $tree of type ${tree.tpe} to $pt" , typr, show = true ) /* <|< */ {
1095
1095
interpolateUndetVars(tree)
1096
1096
tree overwriteType tree.tpe.simplified
1097
1097
adaptInterpolated(tree, pt)
0 commit comments