Fix wrong deserialization order

For case when property and function have the same name or
extension and non-extension member have the same name
This commit is contained in:
Pavel V. Talanov
2014-11-14 15:18:58 +03:00
parent e8aee5cddf
commit 40addaed13
8 changed files with 141 additions and 35 deletions
@@ -2368,6 +2368,12 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/memberOrder"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("callablesNameClash.kt")
public void testCallablesNameClash() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/callablesNameClash.kt");
doTest(fileName);
}
@TestMetadata("enumEntries.kt")
public void testEnumEntries() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.kt");
@@ -2380,6 +2386,12 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
doTest(fileName);
}
@TestMetadata("extensionPropertiesNameClash.kt")
public void testExtensionPropertiesNameClash() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionPropertiesNameClash.kt");
doTest(fileName);
}
@TestMetadata("innerClasses.kt")
public void testInnerClasses() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/innerClasses.kt");