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

Filtering duplicate diagnostics for trait implementations

Browse Source
This commit is contained in:
Andrey Breslav
2014-06-03 19:57:44 +04:00
parent a966bc7ce7
commit 74deb58734
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/duplicateJvmSignatureUtil.kt
+6 -2
View File
@@ -63,7 +63,7 @@ public fun getJvmSignatureDiagnostics(element: PsiElement): Diagnostics? {
val filtered = arrayListOf<Diagnostic>()
conflicting.groupBy {
CONFLICTING_JVM_DECLARATIONS.cast(it).getA().signature
CONFLICTING_JVM_DECLARATIONS.cast(it).getA().signature.name
}.forEach {
val diagnostics = it.getValue()
if (diagnostics.size <= 1) {
@@ -89,7 +89,11 @@ public fun getJvmSignatureDiagnostics(element: PsiElement): Diagnostics? {
}
private fun ConflictingJvmDeclarationsData.higherThan(other: ConflictingJvmDeclarationsData): Boolean {
return this.classOrigin.originKind == PACKAGE_FACADE && other.classOrigin.originKind == PACKAGE_PART
return when (other.classOrigin.originKind) {
PACKAGE_PART -> this.classOrigin.originKind == PACKAGE_FACADE
TRAIT_IMPL -> this.classOrigin.originKind != TRAIT_IMPL
else -> false
}
}
private fun getDiagnosticsForPackage(file: JetFile): Diagnostics? {