Skip to content

Commit 4a55c5a

Browse files
committed
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.
1 parent c85bc8e commit 4a55c5a

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

compiler/src/dotty/tools/dotc/interactive/Completion.scala

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -210,13 +210,9 @@ object Completion {
210210
* considered.
211211
*/
212212
def addMemberCompletions(qual: Tree)(implicit ctx: Context): Unit = {
213-
if (qual.tpe =:= defn.NothingType)
214-
()
215-
else if (qual.tpe.isRef(defn.NullClass))
216-
addAccessibleMembers(defn.AnyRefType)
217-
else {
213+
if (!qual.tpe.widenDealias.isBottomType) {
218214
addAccessibleMembers(qual.tpe)
219-
if (!mode.is(Mode.Import)) {
215+
if (!mode.is(Mode.Import) && !qual.tpe.isRef(defn.NullClass)) {
220216
// Implicit conversions do not kick in when importing
221217
implicitConversionTargets(qual)(ctx.fresh.setExploreTyperState())
222218
.foreach(addAccessibleMembers)

0 commit comments

Comments
 (0)