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

Migrating scopes onto ReceierParameterDescriptor

Browse Source 
Getting rid of getImplicitReceiver() in JetScope
This commit is contained in:
Andrey Breslav
2012-10-30 18:38:08 +04:00
parent dc25d00c9e
commit 555ac07b55
22 changed files with 83 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java
+6 -4
View File
@@ -37,7 +37,6 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.resolve.scopes.*;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
import org.jetbrains.jet.lang.types.CommonSupertypes;
import org.jetbrains.jet.lang.types.ErrorUtils;
import org.jetbrains.jet.lang.types.JetType;
@@ -572,10 +571,13 @@ public class JetTypeCheckerTest extends JetLiteFixture {
private void assertType(String contextType, final String expression, String expectedType) {
final JetType thisType = makeType(contextType);
JetScope scope = new JetScopeAdapter(classDefinitions.BASIC_SCOPE) {
@NotNull
@Override
public ReceiverDescriptor getImplicitReceiver() {
return new ExpressionReceiver(JetPsiFactory.createExpression(getProject(), expression), thisType);
public void getImplicitReceiversHierarchy(@NotNull List<ReceiverParameterDescriptor> result) {
result.add(new ReceiverParameterDescriptorImpl(
classDefinitions.BASIC_SCOPE.getContainingDeclaration(),
thisType,
new ExpressionReceiver(JetPsiFactory.createExpression(getProject(), expression), thisType)
));
}
};
assertType(scope, expression, expectedType);