[parser] emit "expression expected" instead of "wrong expression" error #SCL-23798 fixed

Author: SrTobi

scala/scala-impl/src/org/jetbrains/plugins/scala/lang/parser/parsing/builder/ScalaPsiBuilder.scala

@@ -63,4 +63,8 @@ trait ScalaPsiBuilder extends PsiBuilder {
   final def wrongExpressionError(): Unit = {
     error(ErrMsg("wrong.expression"))
   }
+
+  final def expressionExpectedError(): Unit = {
+    error(ErrMsg("expression.expected"))
+  }
 }

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

@@ -21,7 +21,7 @@ object Enumerator extends ParsingRule {
         case ScalaTokenTypes.tASSIGN =>
           builder.advanceLexer() //Ate =
           if (!ExprInIndentationRegion()) {
-            builder.wrongExpressionError()
+            builder.expressionExpectedError()
           }
           enumeratorMarker.done(ScalaElementType.FOR_BINDING)
           true

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

@@ -27,7 +27,7 @@ object Generator extends ParsingRule {
         builder.advanceLexer()
 
         if (!ExprInIndentationRegion()) {
-          builder.wrongExpressionError()
+          builder.expressionExpectedError()
         }
         genMarker.done(ScalaElementType.GENERATOR)
         builder.getTokenType match {

scala/scala-impl/src/org/jetbrains/plugins/scala/lang/parser/parsing/statements/FunDef.scala

@@ -42,7 +42,7 @@ object FunDef extends ParsingRule {
                   true
                 }
                 else {
-                  builder.wrongExpressionError()
+                  builder.expressionExpectedError()
                   faultMarker.drop()
                   true
                 }
@@ -59,7 +59,7 @@ object FunDef extends ParsingRule {
               true
             }
             else {
-              builder.error(ScalaBundle.message("expression.expected"))
+              builder.expressionExpectedError()
               faultMarker.drop()
               true
             }

scala/scala-impl/src/org/jetbrains/plugins/scala/lang/parser/parsing/statements/PatDef.scala

@@ -53,7 +53,7 @@ object PatDef extends ParsingRule {
         builder.checkedAdvanceLexer()
 
         if (!ExprInIndentationRegion()) {
-          builder.error(ErrMsg("expression.expected"))
+          builder.expressionExpectedError()
         }
 
         patDefMarker.drop()

scala/scala-impl/test/org/jetbrains/plugins/scala/lang/parser/scala3/ExprParserTest.scala

@@ -2644,7 +2644,7 @@ class ExprParserTest extends SimpleScala3ParserTestBase {
       |              PsiElement(identifier)('String')
       |          PsiWhiteSpace(' ')
       |          PsiElement(=)('=')
-      |          PsiErrorElement:Wrong expression
+      |          PsiErrorElement:Expression expected
       |            <empty list>
       |        PsiWhiteSpace('\n\n  ')
       |        ScPatternDefinition: value1
@@ -2764,7 +2764,7 @@ class ExprParserTest extends SimpleScala3ParserTestBase {
       |                PsiElement(identifier)('x')
       |              PsiWhiteSpace(' ')
       |              PsiElement(<-)('<-')
-      |              PsiErrorElement:Wrong expression
+      |              PsiErrorElement:Expression expected
       |                <empty list>
       |          PsiWhiteSpace(' ')
       |          PsiElement(})('}')
@@ -2784,7 +2784,7 @@ class ExprParserTest extends SimpleScala3ParserTestBase {
       |                PsiElement(identifier)('y')
       |              PsiWhiteSpace(' ')
       |              PsiElement(<-)('<-')
-      |              PsiErrorElement:Wrong expression
+      |              PsiErrorElement:Expression expected
       |                <empty list>
       |          PsiWhiteSpace(' ')
       |          PsiElement(})('}')