Merged branch idea251.release into idea251.x

Author: builduser

scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/impl/toplevel/typedef/TypeDefinitionMembers.scala

@@ -196,10 +196,15 @@ object TypeDefinitionMembers {
     if (shouldProcessMethods(processor) && !processEnum(clazz, processor.execute(_, state)))
       return false
 
-    if (place.isInScala3File)
-      stdLibPatches(clazz).foreach {
+    if (place.isInScala3File) {
+      val member = processor match {
+        case p: ResolveProcessor => p.name
+        case _ => ""
+      }
+      stdLibPatches(clazz, member).foreach {
         processClassDeclarations(_, processor, state, lastParent, place)
       }
+    }
 
     true
   }
@@ -561,13 +566,14 @@ object TypeDefinitionMembers {
   private object stdLibPatches {
     private val map = Map(
       "scala.Predef" -> "scala.runtime.stdLibPatches.Predef",
-      "scala.language" -> "scala.runtime.stdLibPatches.language"
+      "scala.language" -> "scala.runtime.stdLibPatches.language",
+      "scala.language.experimental" -> "scala.runtime.stdLibPatches.language.experimental"
     )
 
-    def apply(clazz: PsiClass): Option[ScObject] =
+    def apply(clazz: PsiClass, member: String): Option[ScObject] =
       for {
         obj       <- clazz.asOptionOf[ScObject]
-        patchName <- map.get(obj.qualifiedName)
+        patchName <- map.get(obj.qualifiedName) if !map.contains(obj.qualifiedName + "." + member)
         patchObj  <- clazz.elementScope.getCachedObject(patchName)
       } yield patchObj
 

scala/scala-impl/test/org/jetbrains/plugins/scala/annotator/Scala3HighlightingTestsMix.scala

@@ -103,4 +103,17 @@ class Scala3HighlightingTestsMix extends ScalaHighlightingTestBase {
       Error("f(1)", "Expression of type Boolean doesn't conform to expected type Int")
     )
   }
+
+  def testStdLibPatches(): Unit = assertNothing(errorsFromScalaCode(
+    s"""import scala.language.dynamics
+       |import _root_.scala.language.dynamics
+       |
+       |import scala.language.experimental.macros
+       |import _root_.scala.language.experimental.macros
+       |
+       |import scala.language.noAutoTupling
+       |import _root_.scala.language.noAutoTupling
+       |
+       |import scala.language.experimental.namedTypeArguments
+       |import _root_.scala.language.experimental.namedTypeArguments""".stripMargin))
 }