Minor. simplified creation of simple type with default scope.

This commit is contained in:
Stanislav Erokhin
2016-06-04 02:21:06 +03:00
parent 0bec639b07
commit de97bc2a05
8 changed files with 19 additions and 25 deletions
@@ -44,7 +44,7 @@ class JavaClassOnCompanionChecker : CallChecker {
val arguments = listOf(TypeProjectionImpl(containingClass.defaultType))
val expectedType = KotlinTypeFactory.simpleType(Annotations.EMPTY, javaLangClass.typeConstructor, arguments,
actualType.isMarkedNullable, javaLangClass.getMemberScope(arguments))
actualType.isMarkedNullable)
context.trace.report(ErrorsJvm.JAVA_CLASS_ON_COMPANION.on(resolvedCall.call.callElement, actualType, expectedType))
}
}
@@ -471,7 +471,7 @@ class TypeResolver(
}
return if (c.abbreviated) {
val abbreviatedType = KotlinTypeFactory.simpleType(annotations, descriptor.typeConstructor, arguments, false, MemberScope.Empty)
val abbreviatedType = KotlinTypeFactory.simpleType(annotations, descriptor.typeConstructor, arguments, false)
type(abbreviatedType)
}
else {
@@ -220,7 +220,7 @@ class DoubleColonExpressionResolver(
val arguments = descriptor.typeConstructor.parameters.map(TypeUtils::makeStarProjection)
KotlinTypeFactory.simpleType(
Annotations.EMPTY, descriptor.typeConstructor, arguments,
possiblyBareType.isNullable || doubleColonExpression.hasQuestionMarks, descriptor.getMemberScope(arguments)
possiblyBareType.isNullable || doubleColonExpression.hasQuestionMarks
)
}
else {