Skip to content

Commit 40b0027

Browse files
Backport "Fix issue with pc breaking in requiredMethod on newly overloaded valueOf" to 3.7.3 (#23724)
Backports #23708 to the 3.7.3-RC2. PR submitted by the release tooling. [skip ci]
2 parents 5660842 + 186b6d8 commit 40b0027

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -734,15 +734,18 @@ class Completions(
734734
defn.Object_notifyAll,
735735
defn.Object_notify,
736736
defn.Predef_undefined,
737-
defn.ObjectClass.info.member(nme.wait_).symbol,
738737
// NOTE(olafur) IntelliJ does not complete the root package and without this filter
739738
// then `_root_` would appear as a completion result in the code `foobar(_<COMPLETE>)`
740739
defn.RootPackage,
741740
// NOTE(gabro) valueOf was added as a Predef member in 2.13. We filter it out since is a niche
742741
// use case and it would appear upon typing 'val'
743-
defn.ValueOfClass.info.member(nme.valueOf).symbol,
744-
defn.ScalaPredefModule.requiredMethod(nme.valueOf)
745-
).flatMap(_.alternatives.map(_.symbol)).toSet
742+
defn.ValueOfClass
743+
) ++ (
744+
Set(
745+
defn.ObjectClass.info.member(nme.wait_),
746+
defn.ScalaPredefModule.info.member(nme.valueOf)
747+
).flatMap(_.alternatives.map(_.symbol)).toSet
748+
)
746749

747750
private def isNotLocalForwardReference(sym: Symbol)(using Context): Boolean =
748751
!sym.isLocalToBlock ||

presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,6 @@ class CompletionSuite extends BaseCompletionSuite:
129129
|isInstanceOf[X0]: Boolean
130130
|synchronized[X0](x$0: X0): X0
131131
|toString(): String
132-
|wait(): Unit
133-
|wait(x$0: Long): Unit
134-
|wait(x$0: Long, x$1: Int): Unit
135132
|""".stripMargin
136133
)
137134

0 commit comments

Comments
 (0)