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

More correct suppression of error

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-08-10 19:16:59 +03:00
parent bce691bf8c
commit 209281fbab
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java
+1 -3
View File
@@ -554,6 +554,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
} }
else { else {
JetType actualType = possiblyBareType.getActualType(); JetType actualType = possiblyBareType.getActualType();
if (actualType.isError()) return null;
if (isAllowedInClassLiteral(actualType)) { if (isAllowedInClassLiteral(actualType)) {
type = actualType; type = actualType;
} }
@@ -591,9 +592,6 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
TypeConstructor typeConstructor = type.getConstructor(); TypeConstructor typeConstructor = type.getConstructor();
ClassifierDescriptor typeDeclarationDescriptor = typeConstructor.getDeclarationDescriptor(); ClassifierDescriptor typeDeclarationDescriptor = typeConstructor.getDeclarationDescriptor();
// no need to report error if unresolved
if (typeDeclarationDescriptor == null || ErrorUtils.isError(typeDeclarationDescriptor)) return true;
if (typeDeclarationDescriptor instanceof ClassDescriptor) { if (typeDeclarationDescriptor instanceof ClassDescriptor) {
List<TypeParameterDescriptor> parameters = typeConstructor.getParameters(); List<TypeParameterDescriptor> parameters = typeConstructor.getParameters();
if (parameters.size() != type.getArguments().size()) return false; if (parameters.size() != type.getArguments().size()) return false;