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

more descriptorToDeclaration utils

Browse Source 
* custom versions
* normalization code moved out of norializer
* hide DESCRIPTOR_TO_DECLARATION (make package local)
This commit is contained in:
Stepan Koltsov
2012-04-12 00:24:12 +04:00
parent e37f24ce4f
commit 71f89ef130
20 changed files with 124 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+2
View File
@@ -74,6 +74,7 @@ import org.jetbrains.jet.lang.descriptors.Visibility;
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
import org.jetbrains.jet.lang.psi.JetPsiUtil;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.BindingContextUtils;
import org.jetbrains.jet.lang.resolve.BindingTrace;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.FqName;
@@ -1575,6 +1576,7 @@ public class JavaDescriptorResolver {
/*isInline = */ false
);
trace.record(BindingContext.FUNCTION, method.getPsiMethod(), functionDescriptorImpl);
BindingContextUtils.recordFunctionDeclarationToDescriptor(trace, method.getPsiMethod(), functionDescriptorImpl);
FunctionDescriptor substitutedFunctionDescriptor = functionDescriptorImpl;
if (method.getPsiMethod().getContainingClass() != psiClass && !method.isStatic()) {
throw new IllegalStateException("non-static method in subclass");