Tuple-related classes are deprecated

#KT-2358 In Progress

compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java

@@ -64,10 +64,15 @@ public interface JetNodeTypes {
     JetNodeType VALUE_ARGUMENT                      = new JetNodeType("VALUE_ARGUMENT", JetValueArgument.class);
     JetNodeType VALUE_ARGUMENT_NAME                 = new JetNodeType("VALUE_ARGUMENT_NAME", JetValueArgumentName.class);
     JetNodeType TYPE_REFERENCE                      = new JetNodeType("TYPE_REFERENCE", JetTypeReference.class);
+
+    @Deprecated // Tuples are to be removed in Kotlin M4
     JetNodeType LABELED_TUPLE_ENTRY                 = new JetNodeType("LABELED_TUPLE_ENTRY");
+    @Deprecated // Tuples are to be removed in Kotlin M4
     JetNodeType LABELED_TUPLE_TYPE_ENTRY            = new JetNodeType("LABELED_TUPLE_TYPE_ENTRY");
 
     JetNodeType USER_TYPE     = new JetNodeType("USER_TYPE", JetUserType.class);
+
+    @Deprecated // Tuples are to be removed in Kotlin M4
     JetNodeType TUPLE_TYPE    = new JetNodeType("TUPLE_TYPE", JetTupleType.class);
     JetNodeType FUNCTION_TYPE = new JetNodeType("FUNCTION_TYPE", JetFunctionType.class);
     JetNodeType SELF_TYPE     = new JetNodeType("SELF_TYPE", JetSelfType.class);
@@ -95,6 +100,7 @@ public interface JetNodeTypes {
     JetNodeType LITERAL_STRING_TEMPLATE_ENTRY = new JetNodeType("LITERAL_STRING_TEMPLATE_ENTRY", JetLiteralStringTemplateEntry.class);
     JetNodeType ESCAPE_STRING_TEMPLATE_ENTRY = new JetNodeType("ESCAPE_STRING_TEMPLATE_ENTRY", JetEscapeStringTemplateEntry.class);
 
+    @Deprecated // Tuples are to be removed in Kotlin M4
     JetNodeType TUPLE                     = new JetNodeType("TUPLE", JetTupleExpression.class);
     JetNodeType PARENTHESIZED             = new JetNodeType("PARENTHESIZED", JetParenthesizedExpression.class);
     JetNodeType RETURN                    = new JetNodeType("RETURN", JetReturnExpression.class);

compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java

@@ -1591,6 +1591,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
      *   : "#" "(" (((SimpleName "=")? expression){","})? ")"
      *   ;
      */
+    @Deprecated // Tuples are to be removed in Kotlin M4
     private void parseTupleExpression() {
         assert _at(HASH);
         PsiBuilder.Marker mark = mark();

compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java

@@ -1564,6 +1564,7 @@ public class JetParsing extends AbstractJetParsing {
      *   : "#" "(" parameter{","} ")" // tuple with named entries, the names do not affect assignment compatibility
      *   ;
      */
+    @Deprecated // Tuples are to be removed in Kotlin M4
     private void parseTupleType() {
         assert _at(HASH);
 

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTupleExpression.java

@@ -25,7 +25,10 @@ import java.util.List;
 /**
  * @author max
  */
+@Deprecated // Tuples are to be removed in Kotlin M4
 public class JetTupleExpression extends JetExpressionImpl {
+
+    @Deprecated // Tuples are to be removed in Kotlin M4
     public JetTupleExpression(@NotNull ASTNode node) {
         super(node);
     }
@@ -40,6 +43,7 @@ public class JetTupleExpression extends JetExpressionImpl {
         return visitor.visitTupleExpression(this, data);
     }
 
+    @Deprecated // Tuples are to be removed in Kotlin M4
     public List<JetExpression> getEntries() {
         return PsiTreeUtil.getChildrenOfTypeAsList(this, JetExpression.class);
     }

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTupleType.java

@@ -25,7 +25,10 @@ import java.util.List;
 /**
  * @author max
  */
+@Deprecated // Tuples are to be removed in Kotlin M4
 public class JetTupleType extends JetTypeElement {
+
+    @Deprecated // Tuples are to be removed in Kotlin M4
     public JetTupleType(@NotNull ASTNode node) {
         super(node);
     }
@@ -47,6 +50,7 @@ public class JetTupleType extends JetTypeElement {
     }
 
     @NotNull
+    @Deprecated // Tuples are to be removed in Kotlin M4
     public List<JetTypeReference> getComponentTypeRefs() {
         return findChildrenByType(JetNodeTypes.TYPE_REFERENCE);
     }

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java

@@ -168,6 +168,7 @@ public class JetVisitor<R, D> extends PsiElementVisitor {
         return visitExpression(expression, data);
     }
 
+    @Deprecated // Tuples are to be removed in Kotlin M4
     public R visitTupleExpression(JetTupleExpression expression, D data) {
         return visitExpression(expression, data);
     }
@@ -336,6 +337,7 @@ public class JetVisitor<R, D> extends PsiElementVisitor {
         return visitTypeElement(type, data);
     }
 
+    @Deprecated // Tuples are to be removed in Kotlin M4
     public R visitTupleType(JetTupleType type, D data) {
         return visitTypeElement(type, data);
     }

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java

@@ -158,6 +158,7 @@ public class JetVisitorVoid extends PsiElementVisitor {
         visitExpression(expression);
     }
 
+    @Deprecated // Tuples are to be removed in Kotlin M4
     public void visitTupleExpression(JetTupleExpression expression) {
         visitExpression(expression);
     }
@@ -325,6 +326,7 @@ public class JetVisitorVoid extends PsiElementVisitor {
         visitTypeElement(type);
     }
 
+    @Deprecated // Tuples are to be removed in Kotlin M4
     public void visitTupleType(JetTupleType type) {
         visitTypeElement(type);
     }

idea/src/org/jetbrains/jet/plugin/quickfix/MigrateTuplesInProjectFix.java

@@ -47,6 +47,7 @@ import java.util.Collections;
 /**
  * @author abreslav
  */
+@Deprecated // Tuples are to be removed in Kotlin M4
 public class MigrateTuplesInProjectFix extends JetIntentionAction<PsiElement> {
     public MigrateTuplesInProjectFix(@NotNull PsiElement element) {
         super(element);