azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation

Browse Source 
(cherry picked from commit 46b9041)
This commit is contained in:
Dmitry Jemerov
2016-12-13 18:32:51 +01:00
parent 0995f2700e
commit 60a2151a33
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReportSubmitter.kt
+2 -2
View File
@@ -33,9 +33,9 @@ class KotlinReportSubmitter : ITNReporter() {
private var hasUpdate = false private var hasUpdate = false
private var hasLatestVersion = 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) { if (hasUpdate) {
return true return true
} }
idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java
+1 -1
View File
@@ -51,7 +51,7 @@ public abstract class AbstractReferenceResolveWithLibTest extends AbstractRefere
@Nullable @Nullable
@Override @Override
public PsiElement resolve() { public PsiElement resolve() {
return AstAccessControl.INSTANCE.execute(false, myTestRootDisposable, myFixture, new Function0<PsiElement>() { return AstAccessControl.INSTANCE.execute(false, getTestRootDisposable(), myFixture, new Function0<PsiElement>() {
@Override @Override
public PsiElement invoke() { public PsiElement invoke() {
return reference.resolve(); return reference.resolve();