Update to Kotlin EAP RC (1.0.0-rc-1017)

Author: zarechenskiy

kotlin-bundled-compiler/META-INF/MANIFEST.MF

@@ -199,13 +199,9 @@ Export-Package: com.google.common.base,
  kotlin.jvm.functions,
  kotlin.jvm.internal;x-internal:=true,
  kotlin.jvm.internal.unsafe;x-internal:=true,
- kotlin.math,
  kotlin.properties,
  kotlin.reflect,
- kotlin.support,
- kotlin.test,
  kotlin.text,
- kotlin.util,
  messages,
  misc,
  net.sf.cglib.core,
@@ -413,4 +409,5 @@ Export-Package: com.google.common.base,
  org.jetbrains.kotlin.resolve.scopes.utils,
  org.jetbrains.kotlin.fileClasses,
  org.jetbrains.kotlin.progress,
- kotlin.ranges
+ kotlin.ranges,
+ kotlin.comparisons

kotlin-bundled-compiler/get_bundled.xml

@@ -1,6 +1,6 @@
 <project default="get_bundled">
 	<property name="compiler.tag" value="for_eclipse" />
-	<property name="bootstrap_branch" value="beta4"/>
+	<property name="bootstrap_branch" value="rc"/>
 	<property name="idea-version" value="143.1015.7"/>
 
 	<property name="compiler.query" value="${compiler.tag}.tcbuildtag" />

kotlin-eclipse-aspects/META-INF/MANIFEST.MF

@@ -41,7 +41,8 @@ Import-Package: com.intellij.navigation,
  org.jetbrains.kotlin.ui.editors,
  org.jetbrains.kotlin.ui.navigation,
  org.jetbrains.kotlin.ui.refactorings.rename,
- org.jetbrains.kotlin.utils
+ org.jetbrains.kotlin.utils,
+ org.eclipse.jdt.internal.ui.javaeditor
 Eclipse-SupplementBundle: 
  org.eclipse.jdt.debug.ui,
  org.eclipse.jdt.launching,

kotlin-eclipse-core/src/org/jetbrains/kotlin/core/model/KotlinNature.kt

@@ -58,7 +58,7 @@ public class KotlinNature: IProjectNature {
             if (!hasKotlinNature(project)) {
                 val description = project.getDescription()
 
-                val newNatureIds = description.getNatureIds().toArrayList()
+                val newNatureIds = description.getNatureIds().toMutableList()
                 newNatureIds.add(KotlinNature.KOTLIN_NATURE)
 
                 description.setNatureIds(newNatureIds.toTypedArray())

kotlin-eclipse-core/src/org/jetbrains/kotlin/core/resolve/BuiltInsReferenceResolver.java

@@ -198,7 +198,7 @@ private DeclarationDescriptor findCurrentDescriptorForMember(@NotNull MemberDesc
         MemberScope memberScope = getMemberScope(containingDeclaration);
         if (memberScope == null) return null;
 
-        String renderedOriginal = DescriptorRenderer.Companion.getFQ_NAMES_IN_TYPES().render(originalDescriptor);
+        String renderedOriginal = DescriptorRenderer.FQ_NAMES_IN_TYPES.render(originalDescriptor);
         Collection<? extends DeclarationDescriptor> descriptors;
         if (originalDescriptor instanceof ConstructorDescriptor && containingDeclaration instanceof ClassDescriptor) {
             descriptors = ((ClassDescriptor) containingDeclaration).getConstructors();
@@ -207,7 +207,7 @@ private DeclarationDescriptor findCurrentDescriptorForMember(@NotNull MemberDesc
             descriptors = memberScope.getContributedDescriptors(DescriptorKindFilter.ALL, MemberScope.Companion.getALL_NAME_FILTER());
         }
         for (DeclarationDescriptor member : descriptors) {
-            if (renderedOriginal.equals(DescriptorRenderer.Companion.getFQ_NAMES_IN_TYPES().render(member))) {
+            if (renderedOriginal.equals(DescriptorRenderer.FQ_NAMES_IN_TYPES.render(member))) {
                 return member;
             }
         }

kotlin-eclipse-core/src/org/jetbrains/kotlin/core/resolve/injection.kt

@@ -93,4 +93,13 @@ public fun createContainerForTopDownAnalyzerForJvm(
 
 private fun StorageComponentContainer.javaAnalysisInit() {
     get<JavaClassFinderPostConstruct>().postCreate()
+}
+
+// Copy functions from Dsl.kt as they were shrinked by proguard
+private inline fun <reified T : Any> StorageComponentContainer.useImpl() {
+    registerSingleton(T::class.java)
+}
+
+private inline fun <reified T : Any> ComponentProvider.get(): T {
+    return getService(T::class.java)
 }

kotlin-eclipse-ui-test/testData/navigation/javaToKotlin/toFunctionInObject/Foo.java.before

@@ -2,6 +2,6 @@ import pckg.navigation.KotlinObject;
 
 public class Foo {
 	public void some() {
-		KotlinObject.INSTANCE$.inOb<caret>ject();
+		KotlinObject.INSTANCE.inOb<caret>ject();
 	}
 }

kotlin-eclipse-ui-test/testData/navigation/javaToKotlin/toObjectInstance/Bar.kt.after

@@ -1,3 +1,3 @@
 package pckg.navigation
 
-object SomeObject
+object <caret>SomeObject

kotlin-eclipse-ui-test/testData/navigation/javaToKotlin/toObjectInstance/Foo.java.before

@@ -2,6 +2,6 @@ import pckg.navigation.SomeObject;
 
 public class Foo {
 	public void some() {
-		SomeObject.INSTA<caret>NCE$.hashCode();
+		SomeObject.INSTA<caret>NCE.hashCode();
 	}
 }

kotlin-eclipse-ui/src/org/jetbrains/kotlin/ui/editors/annotations/AnnotationManager.kt

@@ -56,7 +56,7 @@ public object AnnotationManager {
         val annotationModel = editor.getDocumentProvider().getAnnotationModel(editor.getEditorInput())
         if (annotationModel !is IAnnotationModelExtension) return
 
-        val newAnnotations = annotations.toMapBy({ it }, { it.position })
+        val newAnnotations = annotations.associateBy({ it }, { it.position })
         val oldAnnotations = getLineMarkerAnnotations(annotationModel)
         updateAnnotations<DiagnosticAnnotation>(annotationModel, newAnnotations, oldAnnotations)
     }