Merged branch idea241.release into idea241.x

Author: builduser

scala/scala-impl/src/org/jetbrains/plugins/scala/annotator/element/ScMemberAnnotator.scala

@@ -1,13 +1,12 @@
 package org.jetbrains.plugins.scala.annotator.element
 
-import com.intellij.openapi.application.ApplicationManager
-import org.jetbrains.plugins.scala.{ScalaBundle, ScalaFileType}
+import org.jetbrains.plugins.scala.ScalaBundle
 import org.jetbrains.plugins.scala.annotator.ScalaAnnotationHolder
 import org.jetbrains.plugins.scala.extensions.{ObjectExt, PsiElementExt}
 import org.jetbrains.plugins.scala.lang.lexer.ScalaTokenTypes
+import org.jetbrains.plugins.scala.lang.psi.api.ScPackageLike
 import org.jetbrains.plugins.scala.lang.psi.api.statements.{ScFunction, ScTypeAlias, ScValueOrVariable}
 import org.jetbrains.plugins.scala.lang.psi.api.toplevel.typedef.ScMember
-import org.jetbrains.plugins.scala.lang.psi.impl.ScalaFileImpl
 
 object ScMemberAnnotator extends ElementAnnotator[ScMember] {
 
@@ -16,15 +15,18 @@ object ScMemberAnnotator extends ElementAnnotator[ScMember] {
     annotateWrongTopLevelMembers(element)
   }
 
-  // TODO package private
   private def annotateWrongTopLevelMembers(element: ScMember)
                                           (implicit holder: ScalaAnnotationHolder): Unit = {
     if (
       element.isTopLevel &&
         cannotBeTopLevelMemberInScala2(element) &&
         element.scalaLanguageLevel.exists(_.isScala2) &&
-        element.containingScalaFile.exists(file => file.getFileType == ScalaFileType.INSTANCE && !file.isWorksheetFile) &&
-        !ApplicationManager.getApplication.isUnitTestMode
+        // The problem is that we have many situations when it's not clear whether top-level definitions are allowed,
+        // because we are not in a real scala file, but some unittest or scripting editor.
+        // We know, however, that when a definition is in a package then it's not allowed.
+        // This fix might not be 100% correct, but I think the false positives are much worse than the false negatives.
+        // So it's better not to annotate a top-level val that is not allowed in scala 2 than annotating one that is allowed.
+        element.parents.exists(_.is[ScPackageLike])
     ) {
       val elementToAnnotate = element.depthFirst().find(c => keywords(c.elementType)).getOrElse(element)
       holder.createErrorAnnotation(elementToAnnotate, ScalaBundle.message("cannot.be.a.top.level.definition.in.scala.2"))

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

@@ -0,0 +1,32 @@
+package org.jetbrains.plugins.scala.annotator
+
+import org.jetbrains.plugins.scala.annotator.Message.Error
+
+class ScMemberAnnotatorTest extends ScalaHighlightingTestBase {
+  def test_ignored_wrong_toplevel_definition(): Unit =
+    assertNoErrors(
+      """
+        |val test = 3
+        |""".stripMargin
+    )
+
+  def test_wrong_toplevel_definition(): Unit =
+    assertErrorsWithHints(
+      """package test
+        |
+        |val x = 3
+        |""".stripMargin,
+      Error("val", "Cannot be a top-level definition in Scala 2")
+    )
+
+  def test_wrong_toplevel_definition_in_packaging(): Unit =
+    assertErrorsWithHints(
+      """package test {
+        |  val x = 3
+        |}
+        |
+        |val y = 6
+        |""".stripMargin,
+      Error("val", "Cannot be a top-level definition in Scala 2")
+    )
+}