Skip to content

Commit 648545e

Browse files
committed
Fix 3.6.3 completion test
1 parent 7324ca9 commit 648545e

File tree

1 file changed

+24
-23
lines changed

1 file changed

+24
-23
lines changed

Diff for: amm/compiler/src/main/scala-3.6.2+/dotty/ammonite/compiler/AmmCompletion.scala

+24-23
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,27 @@ import dotty.tools.dotc.interactive.{Completion, Interactive}
1212
import dotty.tools.dotc.util.SourcePosition
1313

1414
object AmmCompletion extends AmmCompletionExtras {
15+
val blacklist = Set(
16+
"scala.Predef.any2stringadd.+",
17+
"scala.Any.##",
18+
"java.lang.Object.##",
19+
"scala.<byname>",
20+
"scala.<empty>",
21+
"scala.<repeated>",
22+
"scala.<repeated...>",
23+
"scala.Predef.StringFormat.formatted",
24+
"scala.Predef.Ensuring.ensuring",
25+
"scala.Predef.ArrowAssoc.->",
26+
"scala.Predef.ArrowAssoc.→",
27+
"java.lang.Object.synchronized",
28+
"java.lang.Object.ne",
29+
"java.lang.Object.eq",
30+
"java.lang.Object.wait",
31+
"java.lang.Object.notifyAll",
32+
"java.lang.Object.notify",
33+
"java.lang.Object.clone",
34+
"java.lang.Object.finalize"
35+
)
1536

1637
def completions(
1738
pos: SourcePosition,
@@ -46,7 +67,9 @@ object AmmCompletion extends AmmCompletionExtras {
4667
var extra = List.empty[Completion]
4768

4869
val completions = path match {
49-
case Select(qual, _) :: _ => completer.selectionCompletions(qual)
70+
case Select(qual, _) :: _ =>
71+
completer.selectionCompletions(qual)
72+
.filter((_, mbrs) => !mbrs.exists(mbr => blacklist(mbr.symbol.fullName.decode.toString)))
5073
case Import(Ident(name), _) :: _
5174
if name.decode.toString == "$ivy" && dependencyCompleteOpt.nonEmpty =>
5275
val complete = dependencyCompleteOpt.get
@@ -79,28 +102,6 @@ object AmmCompletion extends AmmCompletionExtras {
79102
matches: Name => Boolean
80103
) extends Completion.Completer(mode, pos, untpdPath, matches):
81104
private def blacklisted(s: Symbol)(using Context) = {
82-
val blacklist = Set(
83-
"scala.Predef.any2stringadd.+",
84-
"scala.Any.##",
85-
"java.lang.Object.##",
86-
"scala.<byname>",
87-
"scala.<empty>",
88-
"scala.<repeated>",
89-
"scala.<repeated...>",
90-
"scala.Predef.StringFormat.formatted",
91-
"scala.Predef.Ensuring.ensuring",
92-
"scala.Predef.ArrowAssoc.->",
93-
"scala.Predef.ArrowAssoc.→",
94-
"java.lang.Object.synchronized",
95-
"java.lang.Object.ne",
96-
"java.lang.Object.eq",
97-
"java.lang.Object.wait",
98-
"java.lang.Object.notifyAll",
99-
"java.lang.Object.notify",
100-
"java.lang.Object.clone",
101-
"java.lang.Object.finalize"
102-
)
103-
104105
blacklist(s.showFullName) ||
105106
s.isOneOf(GivenOrImplicit) ||
106107
// Cache objects, which you should probably never need to

0 commit comments

Comments
 (0)