tweak: try the original name first and then fallback to module

Avoid skipping searchin a member by the original name even when name is likely companion module name.
scala · Feb 24, 2024 · 4cb34e5 · 4cb34e5
1 parent 22d98d6
commit 4cb34e5
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/compiler/src/dotty/tools/dotc/core/ContextOps.scala b/compiler/src/dotty/tools/dotc/core/ContextOps.scala
@@ -59,13 +59,16 @@ object ContextOps:
         val preSym = pre.typeSymbol
         // 1. Try to search in current type and parents.
         val directSearch =
-          if name.isTypeName && name.endsWith(StdNames.str.MODULE_SUFFIX) then
-            pre.findMember(name.stripModuleClassSuffix, pre, required, excluded) match
-              case NoDenotation => NoDenotation
-              case symDenot: SymDenotation =>
-                symDenot.companionModule.denot
-          else
-            pre.findMember(name, pre, required, excluded)
+          def asModule =
+            if name.isTypeName && name.endsWith(StdNames.str.MODULE_SUFFIX) then
+              pre.findMember(name.stripModuleClassSuffix, pre, required, excluded) match
+                case NoDenotation => NoDenotation
+                case symDenot: SymDenotation =>
+                  symDenot.companionModule.denot
+            else NoDenotation
+          pre.findMember(name, pre, required, excluded) match
+            case NoDenotation => asModule
+            case denot => denot
 
         // 2. Try to search in companion class if current is an object.
         def searchCompanionClass = if lookInCompanion && preSym.is(Flags.Module) then