Skip to content

Commit 114a0ac

Browse files
committed
correct completion fix
1 parent 425f49c commit 114a0ac

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

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

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,11 @@ class Completions(
109109
else false
110110

111111
def isLanguageExperimental: Boolean =
112-
val n = sym.fullName.show
113-
n.contains(".language.experimental.") || n.endsWith(".language.experimental") ||
114-
n.contains("stdLibPatches.language.experimental")
115-
116-
def isExperimentalEndMarkersByName: Boolean =
117-
sym.decodedName == "methodBlockEndMarkers" && sym.maybeOwner.fullName.show.contains("language.experimental")
112+
val n = sym.fullName.show.replace("$","")
113+
n.contains(".language.experimental.") || n.endsWith(".language.experimental")
118114

119115
val excludeLanguageExperimental =
120-
!completionMode.is(Mode.ImportOrExport) && (isLanguageExperimental || isExperimentalEndMarkersByName)
116+
!completionMode.is(Mode.ImportOrExport) && isLanguageExperimental
121117

122118
if generalExclude || excludeLanguageExperimental then false
123119
else if completionMode.is(Mode.Type) then true
@@ -601,10 +597,7 @@ class Completions(
601597
// They are still available in import positions.
602598
{
603599
val n = sym.fullName.show
604-
val isExp = n.contains(".language.experimental.") || n.endsWith(".language.experimental") ||
605-
n.contains("stdLibPatches.language.experimental") ||
606-
(sym.decodedName == "methodBlockEndMarkers" && sym.maybeOwner.fullName.show.contains("language.experimental"))
607-
!isExp
600+
!n.contains(".language.experimental.") && !n.endsWith(".language.experimental")
608601
} &&
609602
!(sym.is(Flags.ExtensionMethod) || (sym.maybeOwner.is(Flags.Implicit) && sym.maybeOwner.isClass))
610603
then

0 commit comments

Comments
 (0)