Refactor conditions

We special completion on qualifiers of type Nothing to not return the method on Any. Also special case completion on qualifiers of type Null to not return completion that involves implicit conversions.
scala · Jan 21, 2019 · 4a55c5a · 4a55c5a
1 parent c85bc8e
commit 4a55c5a
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/compiler/src/dotty/tools/dotc/interactive/Completion.scala b/compiler/src/dotty/tools/dotc/interactive/Completion.scala
@@ -210,13 +210,9 @@ object Completion {
      * considered.
      */
     def addMemberCompletions(qual: Tree)(implicit ctx: Context): Unit = {
-      if (qual.tpe =:= defn.NothingType)
-        ()
-      else if (qual.tpe.isRef(defn.NullClass))
-        addAccessibleMembers(defn.AnyRefType)
-      else {
+      if (!qual.tpe.widenDealias.isBottomType) {
         addAccessibleMembers(qual.tpe)
-        if (!mode.is(Mode.Import)) {
+        if (!mode.is(Mode.Import) && !qual.tpe.isRef(defn.NullClass)) {
           // Implicit conversions do not kick in when importing
           implicitConversionTargets(qual)(ctx.fresh.setExploreTyperState())
             .foreach(addAccessibleMembers)