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

Add overrides in order to fix compilation errors

Browse Source
This commit is contained in:
Nikolay Krasko
2014-12-29 18:21:21 +03:00
parent a49a206de3
commit 20b7a55bf2
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java
+6 -7
View File
@@ -21,7 +21,6 @@ import com.google.common.collect.Collections2;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Condition;
import com.intellij.psi.*; import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValue;
@@ -29,6 +28,7 @@ import com.intellij.psi.util.CachedValueProvider;
import com.intellij.psi.util.CachedValuesManager; import com.intellij.psi.util.CachedValuesManager;
import com.intellij.psi.util.PsiModificationTracker; import com.intellij.psi.util.PsiModificationTracker;
import com.intellij.util.SmartList; import com.intellij.util.SmartList;
import com.intellij.util.containers.Predicate;
import com.intellij.util.containers.SLRUCache; import com.intellij.util.containers.SLRUCache;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -212,7 +212,7 @@ public class JavaElementFinder extends PsiElementFinder implements KotlinFinderM
return answer.toArray(new PsiClass[answer.size()]); return answer.toArray(new PsiClass[answer.size()]);
} }
// implements a method added in 14.1 @Override
@NotNull @NotNull
public PsiFile[] getPackageFiles(@NotNull PsiPackage psiPackage, @NotNull GlobalSearchScope scope) { public PsiFile[] getPackageFiles(@NotNull PsiPackage psiPackage, @NotNull GlobalSearchScope scope) {
FqName packageFQN = new FqName(psiPackage.getQualifiedName()); FqName packageFQN = new FqName(psiPackage.getQualifiedName());
@@ -220,13 +220,12 @@ public class JavaElementFinder extends PsiElementFinder implements KotlinFinderM
return result.toArray(new PsiFile[result.size()]); return result.toArray(new PsiFile[result.size()]);
} }
// implements a method added in IDEA 14.1 @Override
@SuppressWarnings({"UnusedDeclaration", "MethodMayBeStatic"})
@Nullable @Nullable
public Condition<PsiFile> getPackageFilesFilter(@NotNull final PsiPackage psiPackage, @NotNull GlobalSearchScope scope) { public Predicate<PsiFile> getPackageFilesFilter(@NotNull final PsiPackage psiPackage, @NotNull GlobalSearchScope scope) {
return new Condition<PsiFile>() { return new Predicate<PsiFile>() {
@Override @Override
public boolean value(@Nullable PsiFile input) { public boolean apply(@Nullable PsiFile input) {
if (!(input instanceof JetFile)) { if (!(input instanceof JetFile)) {
return true; return true;
} }
idea/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.kt
+3 -3
View File
@@ -60,7 +60,7 @@ public class KotlinCoverageExtension(): JavaCoverageEngineExtension() {
} }
// Implements API added in IDEA 14.1 // Implements API added in IDEA 14.1
fun getSummaryCoverageInfo(coverageAnnotator: JavaCoverageAnnotator, override fun getSummaryCoverageInfo(coverageAnnotator: JavaCoverageAnnotator,
element: PsiNamedElement): PackageAnnotator.ClassCoverageInfo? { element: PsiNamedElement): PackageAnnotator.ClassCoverageInfo? {
if (element !is JetFile) { if (element !is JetFile) {
return null return null
@@ -72,13 +72,13 @@ public class KotlinCoverageExtension(): JavaCoverageEngineExtension() {
} }
// Implements API added in IDEA 14.1 // Implements API added in IDEA 14.1
fun keepCoverageInfoForClassWithoutSource(bundle: CoverageSuitesBundle, classFile: File): Boolean { override fun keepCoverageInfoForClassWithoutSource(bundle: CoverageSuitesBundle, classFile: File): Boolean {
// TODO check scope and source roots // TODO check scope and source roots
return true // keep everything, sort it out later return true // keep everything, sort it out later
} }
// Implements API added in IDEA 14.1 // Implements API added in IDEA 14.1
fun ignoreCoverageForClass(bundle: CoverageSuitesBundle, classFile: File): Boolean { override fun ignoreCoverageForClass(bundle: CoverageSuitesBundle, classFile: File): Boolean {
// Ignore classes that only contain bridge methods delegating to package parts. // Ignore classes that only contain bridge methods delegating to package parts.
if (looksLikePackageFacade(classFile)) { if (looksLikePackageFacade(classFile)) {
val classVFile = LocalFileSystem.getInstance().findFileByIoFile(classFile) val classVFile = LocalFileSystem.getInstance().findFileByIoFile(classFile)