From 409e47474829b10475dd8d7369b00ff63984e0c7 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Fri, 17 Aug 2012 20:16:16 +0400
Subject: [PATCH] Component functions are indexed 1-based

---
 .../expressions/ExpressionTypingVisitorForStatements.java   | 2 +-
 .../tests/declarationChecks/MultiDeclarationErrors.kt       | 6 +++---
 .../tests/declarationChecks/kt2631_MultipleDeclaration.kt   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java
index 1ba3fefe1e0..1e3b0b0d27e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java
@@ -139,7 +139,7 @@ public class ExpressionTypingVisitorForStatements extends ExpressionTypingVisito
         if (expressionReceiver == null) {
             return JetTypeInfo.create(null, context.dataFlowInfo);
         }
-        int componentIndex = 0;
+        int componentIndex = 1;
         for (JetMultiDeclarationEntry entry : multiDeclaration.getEntries()) {
             final Name componentName = Name.identifier("component" + componentIndex);
             componentIndex++;
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.kt b/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.kt
index adfa81bf277..aa5a66a34a1 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.kt
@@ -1,13 +1,13 @@
 package a
 
 class MyClass {
-    fun component0(<!UNUSED_PARAMETER!>i<!>: Int) {}
+    fun component1(<!UNUSED_PARAMETER!>i<!>: Int) {}
 }
 
 class MyClass2 {}
 
-<!CONFLICTING_OVERLOADS!>fun MyClass2.component0()<!> = 1.2
-<!CONFLICTING_OVERLOADS!>fun MyClass2.component0()<!> = 1.3
+<!CONFLICTING_OVERLOADS!>fun MyClass2.component1()<!> = 1.2
+<!CONFLICTING_OVERLOADS!>fun MyClass2.component1()<!> = 1.3
 
 fun test(<!UNUSED_PARAMETER!>mc1<!>: MyClass, <!UNUSED_PARAMETER!>mc2<!>: MyClass2) {
     val (a, b) = <!COMPONENT_FUNCTION_MISSING, COMPONENT_FUNCTION_MISSING!>mc1<!>
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.kt b/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.kt
index f554e097298..aa72ec07d46 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.kt
@@ -2,13 +2,13 @@
 package a
 
 class MyClass {
-    fun component0() = 1
-    fun component1() = "a"
+    fun component1() = 1
+    fun component2() = "a"
 }
 
 class MyClass2 {}
 
-fun MyClass2.component0() = 1.2
+fun MyClass2.component1() = 1.2
 
 fun test(<!UNUSED_PARAMETER!>mc1<!>: MyClass, <!UNUSED_PARAMETER!>mc2<!>: MyClass2) {
     val (a, b) = mc1