[parser] parse constructor annotations correctly in scala 3 (#SCL-21217, #SCL-21216, #SCL-18495) fixed

needed to increase getStubVersion because ScAnnotationElementType.annotationText has changed

Author: SrTobi

scala/scala-impl/src/org/jetbrains/plugins/scala/lang/parser/parsing/base/Constructor.scala

@@ -5,16 +5,17 @@ import org.jetbrains.plugins.scala.lang.parser.ScalaElementType
 import org.jetbrains.plugins.scala.lang.parser.parsing.ParsingRule
 import org.jetbrains.plugins.scala.lang.parser.parsing.builder.ScalaPsiBuilder
 import org.jetbrains.plugins.scala.lang.parser.parsing.expressions.ArgumentExprs
+import org.jetbrains.plugins.scala.lang.parser.parsing.top.params.ClassParam
 import org.jetbrains.plugins.scala.lang.parser.parsing.types.{AnnotType, SimpleType}
 
 /*
  * Constr ::= AnnotType {ArgumentExprs}
  */
 object Constructor extends ParsingRule {
 
-  override def parse(implicit builder: ScalaPsiBuilder): Boolean = parse(isAnnotation = false)
+  override def parse(implicit builder: ScalaPsiBuilder): Boolean = parse(isAnnotation = false, stopBeforeNonEmptyParameterClause = false)
 
-  def parse(isAnnotation: Boolean)(implicit builder: ScalaPsiBuilder): Boolean = {
+  def parse(isAnnotation: Boolean, stopBeforeNonEmptyParameterClause: Boolean)(implicit builder: ScalaPsiBuilder): Boolean = {
     val constrMarker = builder.mark()
     val latestDoneMarker = builder.getLatestDoneMarker
 
@@ -23,25 +24,51 @@ object Constructor extends ParsingRule {
         latestDoneMarker.getTokenType != ScalaElementType.MODIFIERS &&
         latestDoneMarker.getTokenType != ScalaElementType.TYPE_PARAM_CLAUSE)
 
-    if ((!isAnnotation && !AnnotType(isPattern = false, multipleSQBrackets = false)) ||
-      (isAnnotation && !SimpleType(isPattern = false))) {
+    val parsedType =
+      if (isAnnotation) {
+        SimpleType(isPattern = false)
+      } else {
+        AnnotType(isPattern = false, multipleSQBrackets = false)
+      }
+
+    if (!parsedType) {
       constrMarker.drop()
       return false
     }
 
-    if (builder.getTokenType == ScalaTokenTypes.tLPARENTHESIS) {
-      if (ArgumentExprs())
+    if (builder.isScala3) {
+      var first = true
 
       while (
         builder.getTokenType == ScalaTokenTypes.tLPARENTHESIS &&
-          (!isAnnotation || annotationAllowed) &&
+          (!stopBeforeNonEmptyParameterClause || !isParameter(first)) &&
           ArgumentExprs()
       ) {
-        // already parsed ArgumentExprs
+        first = false
+      }
+
+    } else {
+      if (builder.getTokenType == ScalaTokenTypes.tLPARENTHESIS) {
+        if (ArgumentExprs()) {
+          while (
+            builder.getTokenType == ScalaTokenTypes.tLPARENTHESIS &&
+              (!isAnnotation || annotationAllowed) &&
+              ArgumentExprs()
+          ) {
+            // already parsed ArgumentExprs
+          }
+        }
       }
     }
 
     constrMarker.done(ScalaElementType.CONSTRUCTOR)
     true
   }
+
+  private def isParameter(first: Boolean)(implicit builder: ScalaPsiBuilder): Boolean = builder.predict { builder =>
+    builder.getTokenType == ScalaTokenTypes.kIMPLICIT ||
+      builder.getTokenText == "using" ||
+      (!first && builder.getTokenType == ScalaTokenTypes.tRPARENTHESIS) ||
+      ClassParam.parse(ignoreErrors = false)(builder)
+  }
 }

scala/scala-impl/src/org/jetbrains/plugins/scala/lang/parser/parsing/expressions/Annotation.scala

@@ -17,7 +17,7 @@ import scala.annotation.tailrec
  */
 object Annotation {
 
-  def apply(countLinesAfterAnnotation: Boolean = true)(implicit builder: ScalaPsiBuilder): Boolean = {
+  def apply(countLinesAfterAnnotation: Boolean = true, forConstructor: Boolean = false)(implicit builder: ScalaPsiBuilder): Boolean = {
     if (builder.getTokenType != ScalaTokenTypes.tAT)
       return false
 
@@ -26,13 +26,13 @@ object Annotation {
 
     builder.advanceLexer() //Ate @
 
-    if (!AnnotationExpr()) {
+    if (!AnnotationExpr(forConstructor)) {
       builder error ScalaBundle.message("wrong.annotation.expression")
       annotMarker.drop()
     } else {
       annotMarker.done(ScalaElementType.ANNOTATION)
     }
-    if (countLinesAfterAnnotation && builder.twoNewlinesBeforeCurrentToken) {
+    if (!builder.isScala3 && countLinesAfterAnnotation && builder.twoNewlinesBeforeCurrentToken) {
       rollbackMarker.rollbackTo()
       return false
     } else rollbackMarker.drop()

scala/scala-impl/src/org/jetbrains/plugins/scala/lang/parser/parsing/expressions/AnnotationExpr.scala

@@ -8,11 +8,10 @@ import org.jetbrains.plugins.scala.lang.parser.parsing.builder.ScalaPsiBuilder
 /*
  * AnnotationExpr ::= Constr [[nl] '{' {NameValuePair} '}']
  */
-object AnnotationExpr extends ParsingRule {
-
-  override def parse(implicit builder: ScalaPsiBuilder): Boolean = {
+object AnnotationExpr {
+  def apply(forConstructor: Boolean)(implicit builder: ScalaPsiBuilder): Boolean = {
     val annotExprMarker = builder.mark()
-    if (Constructor.parse(isAnnotation = true)) {
+    if (Constructor.parse(isAnnotation = true, stopBeforeNonEmptyParameterClause = forConstructor)) {
       annotExprMarker.done(ScalaElementType.ANNOTATION_EXPR)
       true
     } else {

scala/scala-impl/src/org/jetbrains/plugins/scala/lang/parser/parsing/expressions/Annotations.scala

@@ -21,8 +21,8 @@ private[parsing] object Annotations extends ParsingRule {
     true
   }
 
-  def parseOnTheSameLine()(implicit builder: ScalaPsiBuilder): Boolean = {
-    parseAnnotations(builder.newlineBeforeCurrentToken)
+  def parseForConstructor()(implicit builder: ScalaPsiBuilder): Boolean = {
+    parseAnnotations(builder.newlineBeforeCurrentToken, forConstructor = true)
     true
   }
 
@@ -37,12 +37,12 @@ private[parsing] object Annotations extends ParsingRule {
     marker.setCustomEdgeTokenBinders(LeftEdgeBinder, null)
   }
 
-  private def parseAnnotations(newlineBeforeCurrentToken: Boolean = false)
+  private def parseAnnotations(newlineBeforeCurrentToken: Boolean = false, forConstructor: Boolean = false)
                               (implicit builder: ScalaPsiBuilder) = {
     val marker = builder.mark()
 
     if (!newlineBeforeCurrentToken) {
-      while (Annotation()) {}
+      while (Annotation(forConstructor = forConstructor)) {}
     }
     marker.done(ScalaElementType.ANNOTATIONS)
 

scala/scala-impl/src/org/jetbrains/plugins/scala/lang/parser/parsing/top/ConstrMods.scala

@@ -12,7 +12,7 @@ import org.jetbrains.plugins.scala.lang.parser.parsing.expressions.Annotations
 object ConstrMods extends ParsingRule {
 
   override def parse(implicit builder: ScalaPsiBuilder): Boolean = {
-    Annotations.parseOnTheSameLine()
+    Annotations.parseForConstructor()
 
     val modifiersMarker = builder.mark()
     if (!builder.newlineBeforeCurrentToken) {

scala/scala-impl/src/org/jetbrains/plugins/scala/lang/parser/parsing/top/params/ClassParam.scala

@@ -15,10 +15,13 @@ import org.jetbrains.plugins.scala.lang.parser.parsing.types.ParamType
 */
 object ClassParam extends ParsingRule {
 
-  override def parse(implicit builder: ScalaPsiBuilder): Boolean = {
+  override def parse(implicit builder: ScalaPsiBuilder): Boolean = parse(ignoreErrors = true)
+
+  def parse(ignoreErrors: Boolean)(implicit builder: ScalaPsiBuilder): Boolean = {
     val classParamMarker = builder.mark()
 
     Annotations()
+    var hasError = false
 
     //parse modifiers
     val modifierMarker = builder.mark()
@@ -55,9 +58,11 @@ object ClassParam extends ParsingRule {
         builder.advanceLexer() //Ate ':'
         if (!ParamType()) {
           builder.error(ScalaBundle.message("parameter.type.expected"))
+          hasError = true
         }
       case _ =>
         builder.error(ScalaBundle.message("colon.expected"))
+        hasError = true
     }
 
     //default param
@@ -66,11 +71,12 @@ object ClassParam extends ParsingRule {
         builder.advanceLexer() //Ate '='
         if (!Expr()) {
           builder.wrongExpressionError()
+          hasError = true
         }
       case _ =>
     }
     classParamMarker.done(ScalaElementType.CLASS_PARAM)
-    true
+    ignoreErrors || !hasError
   }
 
   private val canFollowInlineKeyword = Set(

scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/compiled/ScClassFileDecompiler.scala

@@ -39,7 +39,7 @@ object ScClassFileDecompiler {
 
   object ScClsStubBuilder extends compiled.ClsStubBuilder {
 
-    override val getStubVersion = 438
+    override val getStubVersion = 439
 
     override def buildFileStub(content: FileContent): stubs.PsiFileStubImpl[_ <: PsiFile] =
       decompiledScalaFile(content)