A quick fix to replace tuples (expressions and types) by Unit, Pair and Triple
Changes are made to all files in the project This quick-fix is to be removed in the next milestone #KT-2358 In Progress
This commit is contained in:
@@ -47,6 +47,9 @@ import static org.jetbrains.jet.lang.diagnostics.Severity.WARNING;
|
||||
*/
|
||||
public interface Errors {
|
||||
|
||||
// TODO: Temporary error message: to deprecate tuples we report this error and provide a quick fix
|
||||
SimpleDiagnosticFactory<PsiElement> TUPLES_ARE_NOT_SUPPORTED = SimpleDiagnosticFactory.create(ERROR);
|
||||
|
||||
DiagnosticFactory1<JetFile, Throwable> EXCEPTION_WHILE_ANALYZING = DiagnosticFactory1.create(ERROR);
|
||||
|
||||
UnresolvedReferenceDiagnosticFactory UNRESOLVED_REFERENCE = UnresolvedReferenceDiagnosticFactory.create();
|
||||
|
||||
+4
@@ -45,6 +45,10 @@ public class DefaultErrorMessages {
|
||||
public static final DiagnosticRenderer<Diagnostic> RENDERER = new DispatchingDiagnosticRenderer(MAP);
|
||||
|
||||
static {
|
||||
|
||||
// TODO: remove when tuples are completely dropped
|
||||
MAP.put(TUPLES_ARE_NOT_SUPPORTED, "Tuples are not supported. Press Alt+Enter to replace tuples with library classes");
|
||||
|
||||
MAP.put(EXCEPTION_WHILE_ANALYZING, "{0}", new Renderer<Throwable>() {
|
||||
@NotNull
|
||||
@Override
|
||||
|
||||
@@ -37,6 +37,7 @@ import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import static org.jetbrains.jet.lang.diagnostics.Errors.TUPLES_ARE_NOT_SUPPORTED;
|
||||
import static org.jetbrains.jet.lang.diagnostics.Errors.UNSUPPORTED;
|
||||
import static org.jetbrains.jet.lang.diagnostics.Errors.WRONG_NUMBER_OF_TYPE_ARGUMENTS;
|
||||
|
||||
@@ -180,6 +181,9 @@ public class TypeResolver {
|
||||
|
||||
@Override
|
||||
public void visitTupleType(JetTupleType type) {
|
||||
// TODO: remove this method completely when tuples are droppped
|
||||
trace.report(TUPLES_ARE_NOT_SUPPORTED.on(type));
|
||||
|
||||
// TODO labels
|
||||
result[0] = JetStandardClasses.getTupleType(resolveTypes(scope, type.getComponentTypeRefs(), trace, checkBounds));
|
||||
}
|
||||
|
||||
+3
@@ -356,6 +356,9 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
|
||||
|
||||
@Override
|
||||
public JetTypeInfo visitTupleExpression(JetTupleExpression expression, ExpressionTypingContext context) {
|
||||
// TODO: remove this method completely when tuples are droppped
|
||||
context.trace.report(TUPLES_ARE_NOT_SUPPORTED.on(expression));
|
||||
|
||||
List<JetExpression> entries = expression.getEntries();
|
||||
List<JetType> types = new ArrayList<JetType>();
|
||||
for (JetExpression entry : entries) {
|
||||
|
||||
Reference in New Issue
Block a user