Trailing comma support: Exprs like (T, \n) shouldn't tuple types/tuple exprs. This is the part of #SCL-10597

Author: dmitry.naydanov

src/org/jetbrains/plugins/scala/lang/parser/parsing/expressions/SimpleExpr.scala

@@ -10,6 +10,7 @@ import org.jetbrains.plugins.scala.lang.parser.parsing.builder.ScalaPsiBuilder
 import org.jetbrains.plugins.scala.lang.parser.parsing.top.ClassTemplate
 import org.jetbrains.plugins.scala.lang.parser.parsing.types.{Path, TypeArgs}
 import org.jetbrains.plugins.scala.lang.parser.parsing.xml.XmlExpr
+import org.jetbrains.plugins.scala.lang.parser.util.ParserUtils
 
 import scala.annotation.tailrec
 
@@ -100,7 +101,7 @@ trait SimpleExpr extends ParserNode with ScalaTokenTypes {
                   builder error ErrMsg("wrong.expression")
                 }
               }
-              if (builder.getTokenType == ScalaTokenTypes.tCOMMA) {
+              if (builder.getTokenType == ScalaTokenTypes.tCOMMA && !ParserUtils.eatTrailingComma(builder, ScalaTokenTypes.tRPARENTHESIS)) {
                 builder.advanceLexer()
                 isTuple = true
               }

src/org/jetbrains/plugins/scala/lang/parser/parsing/types/Types.scala

@@ -6,6 +6,7 @@ package types
 
 import org.jetbrains.plugins.scala.lang.lexer.ScalaTokenTypes
 import org.jetbrains.plugins.scala.lang.parser.parsing.builder.ScalaPsiBuilder
+import org.jetbrains.plugins.scala.lang.parser.util.ParserUtils
 
 /**
 * @author Alexander Podkhalyuzin
@@ -39,7 +40,7 @@ trait Types extends ParserNode {
       return (false,isTuple)
     }
     var exit = true
-    while (exit && builder.getTokenType == ScalaTokenTypes.tCOMMA) {
+    while (exit && builder.getTokenType == ScalaTokenTypes.tCOMMA && !ParserUtils.eatTrailingComma(builder, ScalaTokenTypes.tRPARENTHESIS)) {
       isTuple = true
       builder.advanceLexer() //Ate ,
       if (!typesParse) {

testdata/parser/data/trailingcommas/SimpleExpr.test

@@ -84,7 +84,7 @@ ScalaFile
           PsiWhiteSpace(' ')
           PsiElement(=)('=')
           PsiWhiteSpace(' ')
-          Tuple
+          ExpressionInParenthesis
             PsiElement(()('(')
             PsiWhiteSpace('\n    ')
             Literal

testdata/parser/data/trailingcommas/SimpleType.test

@@ -70,16 +70,15 @@ ScalaFile
             <empty list>
           PsiElement(:)(':')
           PsiWhiteSpace(' ')
-          TupleType: (
+          TypeInParenthesis: (
     Int,
     )
             PsiElement(()('(')
             PsiWhiteSpace('\n    ')
-            TypesList
-              SimpleType: Int
-                CodeReferenceElement: Int
-                  PsiElement(identifier)('Int')
-              PsiElement(,)(',')
+            SimpleType: Int
+              CodeReferenceElement: Int
+                PsiElement(identifier)('Int')
+            PsiElement(,)(',')
             PsiWhiteSpace('\n    ')
             PsiElement())(')')
           PsiWhiteSpace(' ')