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

Fix constructors redeclaration message

Browse Source 
#KT-6966 Fixed
This commit is contained in:
Denis Zharkov
2015-03-12 21:19:47 +03:00
parent 22425de5cb
commit 6c46606f2b
8 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.java
+7 -1
View File
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.psi.JetClassOrObject;
import org.jetbrains.kotlin.psi.JetDeclaration;
import org.jetbrains.kotlin.psi.JetObjectDeclaration;
import org.jetbrains.kotlin.psi.JetSecondaryConstructor;
import javax.inject.Inject;
import java.util.Collection;
@@ -201,7 +202,12 @@ public class OverloadResolver {
trace.report(Errors.REDECLARATION.on(jetDeclaration, memberDescriptor.getName().asString()));
}
else {
trace.report(Errors.CONFLICTING_OVERLOADS.on(jetDeclaration, memberDescriptor, functionContainer));
String containingClassName = jetDeclaration instanceof JetSecondaryConstructor ?
((JetSecondaryConstructor) jetDeclaration).getClassOrObject().getName() : null;
trace.report(Errors.CONFLICTING_OVERLOADS.on(
jetDeclaration, memberDescriptor,
containingClassName != null ? containingClassName : functionContainer));
}
}
}