commit 7570eb026f7c9acf83db48f914116718aaa0f290
author Dmitry Jemerov <yole@jetbrains.com> Tue Dec 13 18:32:51 2016 +0100
committer Yan Zhulanow <Yan.Zhulanow@jetbrains.com> Thu Dec 15 17:13:26 2016 +0300
tree 51f344a56f84f62d3c1f754e0c6b7ea44e0b244a
parent 46e04516d2f9ea74ad9bc13992b0e25f6b259b73

Fix compilation

idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReportSubmitter.kt

diff --git a/idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReportSubmitter.kt b/idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReportSubmitter.kt
index c11c0f6..05193d4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReportSubmitter.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReportSubmitter.kt
@@ -33,9 +33,9 @@
     private var hasUpdate = false
     private var hasLatestVersion = false
 
-    override fun showErrorInRelease(event: IdeaLoggingEvent?) = !hasUpdate
+    override fun showErrorInRelease(event: IdeaLoggingEvent) = !hasUpdate
 
-    override fun submit(events: Array<out IdeaLoggingEvent>, additionalInfo: String?, parentComponent: Component, consumer: Consumer<SubmittedReportInfo>): Boolean {
+    override fun submit(events: Array<IdeaLoggingEvent>, additionalInfo: String?, parentComponent: Component, consumer: Consumer<SubmittedReportInfo>): Boolean {
         if (hasUpdate) {
             return true
         }

idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java

diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java
index d03f531..5f12eb3 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java
@@ -51,7 +51,7 @@
             @Nullable
             @Override
             public PsiElement resolve() {
-                return AstAccessControl.INSTANCE.execute(false, myTestRootDisposable, myFixture, new Function0<PsiElement>() {
+                return AstAccessControl.INSTANCE.execute(false, getTestRootDisposable(), myFixture, new Function0<PsiElement>() {
                     @Override
                     public PsiElement invoke() {
                         return reference.resolve();