Rename endMarkersForMethodBlocks to methodBlockEndMarkers across the codebase and update related documentation.

Author: soronpo

compiler/src/dotty/tools/dotc/config/Feature.scala

@@ -40,7 +40,7 @@ object Feature:
   val packageObjectValues = experimental("packageObjectValues")
   val multiSpreads = experimental("multiSpreads")
   val subCases = experimental("subCases")
-  val endMarkersForMethodBlocks = experimental("endMarkersForMethodBlocks")
+  val methodBlockEndMarkers = experimental("methodBlockEndMarkers")
 
   def experimentalAutoEnableFeatures(using Context): List[TermName] =
     defn.languageExperimentalFeatures
@@ -70,7 +70,7 @@ object Feature:
     (into, "Allow into modifier on parameter types"),
     (modularity, "Enable experimental modularity features"),
     (packageObjectValues, "Enable experimental package objects as values"),
-    (endMarkersForMethodBlocks, "Enable experimental end markers for method blocks"),
+    (methodBlockEndMarkers, "Enable experimental end markers for method blocks"),
   )
 
   // legacy language features from Scala 2 that are no longer supported.

compiler/src/dotty/tools/dotc/config/SourceVersion.scala

@@ -47,7 +47,7 @@ enum SourceVersion:
   def enablesBetterFors(using Context) = isAtLeast(`3.8`) || (isAtLeast(`3.7`) && isPreviewEnabled)
   /** See PR #23441 and tests/neg/i23435-min */
   def enablesDistributeAnd = !isAtLeast(`3.8`)
-  def enablesEndMarkersForMethodBlocks(using Context) = isAtLeast(`3.8`) || Feature.enabled(Feature.endMarkersForMethodBlocks)
+  def enablesMethodBlockEndMarkers(using Context) = isAtLeast(`3.8`) || Feature.enabled(Feature.methodBlockEndMarkers)
 
   def requiresNewSyntax = isAtLeast(future)
 

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -1544,7 +1544,7 @@ object Parsers {
       def updateSpanOfLast(last: T): Unit =
         last match
           case last: WithEndMarker[t] => last.withEndMarker()
-          case apply: Apply if sourceVersion.enablesEndMarkersForMethodBlocks => apply.setEndMarker()
+          case apply: Apply if sourceVersion.enablesMethodBlockEndMarkers => apply.setEndMarker()
           case _ =>
         last.span = last.span.withEnd(in.lastCharOffset)
 
@@ -1564,7 +1564,7 @@ object Parsers {
         case _: Match => in.token == MATCH
         case _: New => in.token == NEW
         case _: (ForYield | ForDo) => in.token == FOR
-        case apply: Apply if sourceVersion.enablesEndMarkersForMethodBlocks =>
+        case apply: Apply if sourceVersion.enablesMethodBlockEndMarkers =>
           // Extract method name from Apply node
           val methodName = apply.attachmentOrElse(untpd.MethodName, null)
           if methodName != null then
@@ -2936,7 +2936,7 @@ object Parsers {
       val res = Apply(fn, args._1)
       if args._2 then res.setApplyKind(ApplyKind.Using)
       // Track method name for end marker support when using colon syntax
-      if sourceVersion.enablesEndMarkersForMethodBlocks then
+      if sourceVersion.enablesMethodBlockEndMarkers then
         val methodName = fn match
           case Select(_, name) => name
           case Ident(name) => name

docs/_docs/reference/experimental/end-markers-method-blocks.md renamed to docs/_docs/reference/experimental/method-block-end-markers.md

@@ -1,6 +1,6 @@
-# End Markers for Method Blocks
+# Method Block End Markers
 
-End markers for method blocks allow you to explicitly mark the end of method application blocks that use colon syntax (braceless arguments).
+Method block end markers allow you to explicitly mark the end of method application blocks that use colon syntax (braceless arguments).
 
 ## Syntax
 
@@ -17,7 +17,7 @@ end methodName
 ### Simple Method Blocks
 
 ```scala
-import scala.language.experimental.endMarkersForMethodBlocks
+import scala.language.experimental.methodBlockEndMarkers
 
 def test(name: String)(body: => Unit): Unit =
   println(s"Running test: $name")
@@ -85,18 +85,18 @@ This rule ensures that the end marker always corresponds to the syntactically vi
 To use end markers for method blocks, you need to enable the experimental feature:
 
 ```scala
-import scala.language.experimental.endMarkersForMethodBlocks
+import scala.language.experimental.methodBlockEndMarkers
 ```
 
 Alternatively, you can enable it globally with the compiler flag:
 
 ```
--language:experimental.endMarkersForMethodBlocks
+-language:experimental.methodBlockEndMarkers
 ```
 
 ## When to Use
 
-End markers for method blocks are particularly useful when:
+Method block end markers are particularly useful when:
 
 - You have deeply nested method calls with colon syntax
 - You want to improve code readability by explicitly marking block boundaries

docs/_docs/reference/experimental/overview.md

@@ -11,7 +11,7 @@ All experimental language features can be found under the `scala.language.experi
 They are enabled by importing the feature or using the `-language` compiler flag.
 
 * [`erasedDefinitions`](./erased-defs.md): Enable support for `erased` modifier.
-* [`endMarkersForMethodBlocks`](./end-markers-method-blocks.md): Enable support for end markers for method blocks.
+* [`methodBlockEndMarkers`](./method-block-end-markers.md): Enable support for end markers for method blocks.
 * `fewerBraces`: Enable support for using indentation for arguments.
 * [`genericNumberLiterals`](./numeric-literals.md): Enable support for generic number literals.
 * [`namedTypeArguments`](./named-typeargs.md): Enable support for named type arguments

library/src/scala/runtime/stdLibPatches/language.scala

@@ -178,8 +178,8 @@ object language:
      *
      *  @see [[https://github.com/scala/improvement-proposals/pull/77]]
      */
-    @compileTimeOnly("`endMarkersForMethodBlocks` can only be used at compile time in import statements")
-    object endMarkersForMethodBlocks
+    @compileTimeOnly("`methodBlockEndMarkers` can only be used at compile time in import statements")
+    object methodBlockEndMarkers
   end experimental
 
   /** The deprecated object contains features that are no longer officially suypported in Scala.

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

@@ -108,7 +108,14 @@ class Completions(
           case _ => false
       else false
 
-    if generalExclude then false
+    def isLanguageExperimental: Boolean =
+      val n = sym.fullName.show
+      n.contains(".language.experimental.") || n.endsWith(".language.experimental")
+
+    val excludeLanguageExperimental =
+      !completionMode.is(Mode.ImportOrExport) && isLanguageExperimental
+
+    if generalExclude || excludeLanguageExperimental then false
     else if completionMode.is(Mode.Type) then true
     else !isWildcardParam(sym) && (sym.isTerm || sym.is(Package))
     end if
@@ -585,6 +592,13 @@ class Completions(
     if completionMode.is(Mode.Scope) && query.nonEmpty then
       val visitor = new CompilerSearchVisitor(sym =>
         if Completion.isValidCompletionSymbol(sym, completionMode, isNew) &&
+          // Avoid suggesting experimental language import symbols (`scala.language.experimental.*`)
+          // as auto-import completions in regular identifier positions.
+          // They are still available in import positions.
+          {
+            val n = sym.fullName.show
+            !n.contains(".language.experimental.") && !n.endsWith(".language.experimental")
+          } &&
           !(sym.is(Flags.ExtensionMethod) || (sym.maybeOwner.is(Flags.Implicit) && sym.maybeOwner.isClass))
         then
           indexedContext.lookupSym(sym) match

tests/neg/end-markers-method-blocks.scala

@@ -1,4 +1,4 @@
-import scala.language.experimental.endMarkersForMethodBlocks
+import scala.language.experimental.methodBlockEndMarkers
 
 object Test:
   def test(name: String)(body: => Unit): Unit =

tests/pos/end-markers-method-blocks.scala

@@ -1,4 +1,4 @@
-import scala.language.experimental.endMarkersForMethodBlocks
+import scala.language.experimental.methodBlockEndMarkers
 
 object Test:
   def test(name: String)(body: => Unit): Unit =