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

Properly handle accessors of top-level properties

Browse Source
This commit is contained in:
Andrey Breslav
2014-06-05 13:54:32 +04:00
parent 3bc404a80e
commit 1343e59eb9
1 changed files with 4 additions and 4 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
+4 -4
View File
@@ -32,16 +32,16 @@ import org.jetbrains.jet.lang.diagnostics.Errors.*
public fun getJvmSignatureDiagnostics(element: PsiElement, otherDiagnostics: Diagnostics): Diagnostics? { public fun getJvmSignatureDiagnostics(element: PsiElement, otherDiagnostics: Diagnostics): Diagnostics? {
fun doGetDiagnostics(): Diagnostics? { fun doGetDiagnostics(): Diagnostics? {
var parent = element.getParent() var parent = element.getParent()
if (element is JetPropertyAccessor) {
parent = parent?.getParent()
}
if (parent is JetFile) { if (parent is JetFile) {
if (element is JetClassOrObject) { if (element is JetClassOrObject) {
return getDiagnosticsForNonLocalClass(element) return getDiagnosticsForNonLocalClass(element)
} }
return getDiagnosticsForPackage(parent as JetFile) return getDiagnosticsForPackage(parent as JetFile)
} }
else
if (element is JetPropertyAccessor) {
parent = parent?.getParent()
}
if (parent is JetClassBody) { if (parent is JetClassBody) {
val parentsParent = parent?.getParent() val parentsParent = parent?.getParent()