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

Don't allow to call constructors of singletons

Browse Source 
This fixes testKt2014
This commit is contained in:
Alexander Udalov
2013-12-02 16:21:00 +04:00
parent 080bd42f88
commit 2c2e212d0a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/CallableDescriptorCollectors.java
+6 -2
View File
@@ -72,9 +72,13 @@ public class CallableDescriptorCollectors {
private static void addConstructors(JetScope scope, Name name, Collection<FunctionDescriptor> functions) { private static void addConstructors(JetScope scope, Name name, Collection<FunctionDescriptor> functions) {
ClassifierDescriptor classifier = scope.getClassifier(name); ClassifierDescriptor classifier = scope.getClassifier(name);
if (classifier instanceof ClassDescriptor && !ErrorUtils.isError(classifier)) { if (!(classifier instanceof ClassDescriptor) || ErrorUtils.isError(classifier)) return;
functions.addAll(((ClassDescriptor) classifier).getConstructors()); ClassDescriptor classDescriptor = (ClassDescriptor) classifier;
if (classDescriptor.getKind().isSingleton()) {
// Constructors of singletons shouldn't be callable from the code
return;
} }
functions.addAll(classDescriptor.getConstructors());
} }
@Override @Override