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

tests for incomplete code exceptions

Browse Source
This commit is contained in:
Svetlana Isakova
2012-04-06 11:56:37 +04:00
parent 8d5965649b
commit 1372d70466
5 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java
+6 -3
View File
@@ -75,8 +75,11 @@ public class JetArrayAccessExpression extends JetReferenceExpression {
}
public List<TextRange> getBracketRanges() {
TextRange lBracket = getIndicesNode().findChildByType(JetTokens.LBRACKET).getTextRange();
TextRange rBracket = getIndicesNode().findChildByType(JetTokens.RBRACKET).getTextRange();
return Lists.newArrayList(lBracket, rBracket);
PsiElement lBracket = getIndicesNode().findChildByType(JetTokens.LBRACKET);
PsiElement rBracket = getIndicesNode().findChildByType(JetTokens.RBRACKET);
if (lBracket == null || rBracket == null) {
return Collections.emptyList();
}
return Lists.newArrayList(lBracket.getTextRange(), rBracket.getTextRange());
}
}
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
+2 -6
View File
@@ -1084,14 +1084,10 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
arrayAccessExpression,
isGet ? "get" : "set");
if (!functionResults.isSuccess()) {
traceForResolveResult.report(isGet
? NO_GET_METHOD.on(arrayAccessExpression)
: NO_SET_METHOD.on(arrayAccessExpression));
traceForResolveResult.report(isGet ? NO_GET_METHOD.on(arrayAccessExpression) : NO_SET_METHOD.on(arrayAccessExpression));
return null;
}
traceForResolveResult.record(isGet
? INDEXED_LVALUE_GET
: INDEXED_LVALUE_SET, arrayAccessExpression, functionResults.getResultingCall());
traceForResolveResult.record(isGet ? INDEXED_LVALUE_GET : INDEXED_LVALUE_SET, arrayAccessExpression, functionResults.getResultingCall());
return functionResults.getResultingDescriptor().getReturnType();
}
}