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

Account for script classes in getAllDescriptors()

Browse Source
This commit is contained in:
Andrey Breslav
2014-04-01 19:47:59 +04:00
parent d51fd634df
commit 363fdf4045
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java
+4
View File
@@ -26,6 +26,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.BindingTrace;
import org.jetbrains.jet.lang.resolve.ScriptNameUtil;
import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo;
import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession;
import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo; import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo;
@@ -241,6 +242,9 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
JetParameter parameter = (JetParameter) declaration; JetParameter parameter = (JetParameter) declaration;
result.addAll(getProperties(safeNameForLazyResolve(parameter))); result.addAll(getProperties(safeNameForLazyResolve(parameter)));
} }
else if (declaration instanceof JetScript) {
result.addAll(classDescriptors.invoke(ScriptNameUtil.classNameForScript((JetScript) declaration).shortName()));
}
else if (declaration instanceof JetTypedef || declaration instanceof JetMultiDeclaration) { else if (declaration instanceof JetTypedef || declaration instanceof JetMultiDeclaration) {
// Do nothing for typedefs as they are not supported. // Do nothing for typedefs as they are not supported.
// MultiDeclarations are not supported on global level too. // MultiDeclarations are not supported on global level too.