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

Property resolution

Browse Source
This commit is contained in:
Andrey Breslav
2011-03-23 16:04:36 +03:00
parent 3ba947da25
commit cd339fbb1b
19 changed files with 89 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/resolve/JetResolveTest.java
+1 -1
View File
@@ -99,7 +99,7 @@ public class JetResolveTest extends ExtensibleResolveTestCase {
List<ValueParameterDescriptor> unsubstitutedValueParameters = function.getUnsubstitutedValueParameters();
for (int i = 0, unsubstitutedValueParametersSize = unsubstitutedValueParameters.size(); i < unsubstitutedValueParametersSize; i++) {
ValueParameterDescriptor unsubstitutedValueParameter = unsubstitutedValueParameters.get(i);
if (unsubstitutedValueParameter.getType().equals(parameterType[i])) {
if (unsubstitutedValueParameter.getOutType().equals(parameterType[i])) {
return function;
}
}
idea/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java
+2 -2
View File
@@ -333,7 +333,7 @@ public class JetTypeCheckerTest extends LightDaemonAnalyzerTestCase {
assertType("new Props<out Int>().p", "Int");
assertType("new Props<Properties>().p.p", "Int");
assertErrorType("new Props<in Int>().p");
assertErrorType("(return : Props<in Int>).p");
}
public void testOverloads() throws Exception {
@@ -449,7 +449,7 @@ public class JetTypeCheckerTest extends LightDaemonAnalyzerTestCase {
private void assertErrorType(String expression) {
Project project = getProject();
JetExpression jetExpression = JetChangeUtil.createExpression(project, expression);
JetType type = semanticServices.getTypeInferrer(BindingTrace.DUMMY).getType(classDefinitions.BASIC_SCOPE, jetExpression, false);
JetType type = semanticServices.getTypeInferrer(BindingTrace.DUMMY).safeGetType(classDefinitions.BASIC_SCOPE, jetExpression, false);
assertTrue("Error type expected but " + type + " returned", ErrorType.isErrorType(type));
}