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

Don't try to search for component function if asked completely different function

Browse Source
This commit is contained in:
Nikolay Krasko
2014-09-11 12:40:45 +04:00
parent c3f44d5030
commit b6abd6442a
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.java
+8 -1
View File
@@ -162,14 +162,19 @@ public class LazyClassMemberScope extends AbstractLazyMemberScope<LazyClassDescr
assert constructor.getValueParameters().size() == primaryConstructorParameters.size() assert constructor.getValueParameters().size() == primaryConstructorParameters.size()
: "From descriptor: " + constructor.getValueParameters().size() + " but from PSI: " + primaryConstructorParameters.size(); : "From descriptor: " + constructor.getValueParameters().size() + " but from PSI: " + primaryConstructorParameters.size();
if (DataClassUtilsPackage.isComponentLike(name)) {
int componentIndex = 0; int componentIndex = 0;
for (ValueParameterDescriptor parameter : constructor.getValueParameters()) { for (ValueParameterDescriptor parameter : constructor.getValueParameters()) {
if (parameter.getType().isError()) continue; if (parameter.getType().isError()) continue;
if (!primaryConstructorParameters.get(parameter.getIndex()).hasValOrVarNode()) continue; if (!primaryConstructorParameters.get(parameter.getIndex()).hasValOrVarNode()) continue;
Set<VariableDescriptor> properties = getProperties(parameter.getName()); Set<VariableDescriptor> properties = getProperties(parameter.getName());
if (properties.isEmpty()) continue; if (properties.isEmpty()) continue;
assert properties.size() == 1 : "A constructor parameter is resolved to more than one (" + properties.size() + ") property: " + parameter;
assert properties.size() == 1 :
"A constructor parameter is resolved to more than one (" + properties.size() + ") property: " + parameter;
PropertyDescriptor property = (PropertyDescriptor) properties.iterator().next(); PropertyDescriptor property = (PropertyDescriptor) properties.iterator().next();
if (property == null) continue; if (property == null) continue;
@@ -182,6 +187,8 @@ public class LazyClassMemberScope extends AbstractLazyMemberScope<LazyClassDescr
break; break;
} }
} }
}
if (name.equals(DescriptorResolver.COPY_METHOD_NAME)) { if (name.equals(DescriptorResolver.COPY_METHOD_NAME)) {
SimpleFunctionDescriptor copyFunctionDescriptor = DescriptorResolver.createCopyFunctionDescriptor( SimpleFunctionDescriptor copyFunctionDescriptor = DescriptorResolver.createCopyFunctionDescriptor(
constructor.getValueParameters(), constructor.getValueParameters(),