Source code fix: exposed visibility in object members

This commit is contained in:
Mikhail Glukhikh
2016-01-25 18:00:38 +03:00
parent 22c0ddaa48
commit 0368631aa3
5 changed files with 15 additions and 12 deletions
@@ -28,5 +28,5 @@ object RuntimeSourceElementFactory : JavaSourceElementFactory {
override fun getContainingFile(): SourceFile = SourceFile.NO_SOURCE_FILE
}
override fun source(javaElement: JavaElement) = RuntimeSourceElement(javaElement as ReflectJavaElement)
override fun source(javaElement: JavaElement): JavaSourceElement = RuntimeSourceElement(javaElement as ReflectJavaElement)
}
@@ -937,7 +937,7 @@ public abstract class KotlinBuiltIns {
if (!BUILT_INS_PACKAGE_NAME.equals(first(segments))) return false;
String shortName = last(segments).asString();
return BuiltInFictitiousFunctionClassFactory.parseClassName(shortName, BUILT_INS_PACKAGE_FQ_NAME) != null;
return BuiltInFictitiousFunctionClassFactory.isFunctionClassName(shortName, BUILT_INS_PACKAGE_FQ_NAME);
}
@Nullable
@@ -35,7 +35,7 @@ class BuiltInFictitiousFunctionClassFactory(
private data class KindWithArity(val kind: Kind, val arity: Int)
companion object {
@JvmStatic fun parseClassName(className: String, packageFqName: FqName): KindWithArity? {
private fun parseClassName(className: String, packageFqName: FqName): KindWithArity? {
val kind = FunctionClassDescriptor.Kind.byPackage(packageFqName) ?: return null
val prefix = kind.classNamePrefix
@@ -47,6 +47,9 @@ class BuiltInFictitiousFunctionClassFactory(
return KindWithArity(kind, arity)
}
@JvmStatic fun isFunctionClassName(className: String, packageFqName: FqName) =
parseClassName(className, packageFqName) != null
private fun toInt(s: String): Int? {
if (s.isEmpty()) return null