File tree 1 file changed +5
-2
lines changed
src/compiler/scala/tools/nsc/typechecker 1 file changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -1532,10 +1532,13 @@ trait Contexts { self: Analyzer =>
1532
1532
var selectors = tree.selectors
1533
1533
@ inline def current = selectors.head
1534
1534
while ((selectors ne Nil ) && result == NoSymbol ) {
1535
- if (current.rename == name.toTermName)
1535
+ def sameName (name : Name , other : Name ) = {
1536
+ (name ne null ) && name.start == other.start && name == other.toTermName // OPT
1537
+ }
1538
+ if (sameName(current.rename, name))
1536
1539
result = qual.tpe.nonLocalMember( // new to address #2733: consider only non-local members for imports
1537
1540
if (name.isTypeName) current.name.toTypeName else current.name)
1538
- else if (current.name == name.toTermName )
1541
+ else if (sameName( current.name, name) )
1539
1542
renamed = true
1540
1543
else if (current.name == nme.WILDCARD && ! renamed && ! requireExplicit)
1541
1544
result = qual.tpe.nonLocalMember(name)
You can’t perform that action at this time.
0 commit comments