Check field signature name

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java

@@ -17,6 +17,8 @@
 package org.jetbrains.jet.lang.resolve.java.kotlinSignature;
 
 import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiNamedElement;
+import com.intellij.util.containers.ComparatorUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
 import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptorImpl;
@@ -48,6 +50,7 @@ public class AlternativeFieldSignatureData extends ElementAlternativeSignatureDa
 
         try {
             checkForSyntaxErrors(altPropertyDeclaration);
+            checkEqualNames(altPropertyDeclaration, field);
             altReturnType = computeReturnType(originalReturnType, altPropertyDeclaration.getTypeRef(),
                                               new HashMap<TypeParameterDescriptor, TypeParameterDescriptorImpl>());
         }
@@ -66,4 +69,12 @@ public class AlternativeFieldSignatureData extends ElementAlternativeSignatureDa
     public String getSignature() {
         return field.getPsiField().getText();
     }
+
+    private static void checkEqualNames(PsiNamedElement namedElement, PsiFieldWrapper fieldWrapper) {
+        if (!ComparatorUtil.equalsNullable(fieldWrapper.getName(), namedElement.getName())) {
+            throw new AlternativeSignatureMismatchException(
+                    "Field name mismatch, original: %s, alternative: %s",
+                    fieldWrapper.getName(), namedElement.getName());
+        }
+    }
 }

compiler/testData/loadJava/kotlinSignature/error/WrongFieldName.java

@@ -0,0 +1,10 @@
+package test;
+
+import jet.runtime.typeinfo.KotlinSignature;
+
+import java.lang.String;
+
+public class WrongFieldName {
+    @KotlinSignature("val bar: String")
+    public String foo;
+}

compiler/testData/loadJava/kotlinSignature/error/WrongFieldName.kt

@@ -0,0 +1,7 @@
+package test
+
+import java.util.*
+
+public open class WrongFieldName : Object() {
+    public val foo : String? = ""
+}

compiler/testData/loadJava/kotlinSignature/error/WrongFieldName.txt

@@ -0,0 +1,6 @@
+namespace test
+
+public open class test.WrongFieldName : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.WrongFieldName
+    public final val foo: jet.String?
+}

compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java

@@ -338,11 +338,16 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 doTest("compiler/testData/loadJava/kotlinSignature/error/VarargReplacedWithNotVararg.java");
             }
             
+            @TestMetadata("WrongFieldName.java")
+            public void testWrongFieldName() throws Exception {
+                doTest("compiler/testData/loadJava/kotlinSignature/error/WrongFieldName.java");
+            }
+            
             @TestMetadata("WrongMethodName.java")
             public void testWrongMethodName() throws Exception {
                 doTest("compiler/testData/loadJava/kotlinSignature/error/WrongMethodName.java");
             }
-
+            
             @TestMetadata("WrongReturnTypeStructure.java")
             public void testWrongReturnTypeStructure() throws Exception {
                 doTest("compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.java");

compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java

@@ -1223,6 +1223,11 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
                     doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/error/VarargReplacedWithNotVararg.kt");
                 }
                 
+                @TestMetadata("WrongFieldName.kt")
+                public void testWrongFieldName() throws Exception {
+                    doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/error/WrongFieldName.kt");
+                }
+                
                 @TestMetadata("WrongMethodName.kt")
                 public void testWrongMethodName() throws Exception {
                     doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/error/WrongMethodName.kt");