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

Flipped the wrong condition

Browse Source
This commit is contained in:
Andrey Breslav
2012-06-09 12:54:49 +04:00
parent c6cc6d5e1c
commit aba0302bf7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyTypeParameterDescriptor.java
+3 -3
View File
@@ -106,14 +106,14 @@ public class LazyTypeParameterDescriptor implements TypeParameterDescriptor {
return upperBounds; return upperBounds;
} }
private JetTypeParameter resolveUpperBoundsFromWhereClause(Set<JetType> upperBounds, boolean forClassObject) { private void resolveUpperBoundsFromWhereClause(Set<JetType> upperBounds, boolean forClassObject) {
JetTypeParameter jetTypeParameter = getElement(); JetTypeParameter jetTypeParameter = getElement();
JetClassOrObject classOrObject = PsiTreeUtil.getParentOfType(jetTypeParameter, JetClassOrObject.class); JetClassOrObject classOrObject = PsiTreeUtil.getParentOfType(jetTypeParameter, JetClassOrObject.class);
if (classOrObject instanceof JetClass) { if (classOrObject instanceof JetClass) {
JetClass jetClass = (JetClass) classOrObject; JetClass jetClass = (JetClass) classOrObject;
for (JetTypeConstraint jetTypeConstraint : jetClass.getTypeConstaints()) { for (JetTypeConstraint jetTypeConstraint : jetClass.getTypeConstaints()) {
if (jetTypeConstraint.isClassObjectContraint() == forClassObject) continue; if (jetTypeConstraint.isClassObjectContraint() != forClassObject) continue;
JetSimpleNameExpression constrainedParameterName = jetTypeConstraint.getSubjectTypeParameterName(); JetSimpleNameExpression constrainedParameterName = jetTypeConstraint.getSubjectTypeParameterName();
if (constrainedParameterName != null) { if (constrainedParameterName != null) {
@@ -127,7 +127,7 @@ public class LazyTypeParameterDescriptor implements TypeParameterDescriptor {
} }
} }
} }
return jetTypeParameter;
} }
private JetTypeParameter getElement() { private JetTypeParameter getElement() {