Fix NPE on equals/hashCode for callable references without kotlin-reflect

#KT-11316 Fixed
 #KT-15847 Fixed
This commit is contained in:
Alexander Udalov
2017-02-03 01:45:24 +03:00
parent 0db60bf6cb
commit b784680fe2
13 changed files with 143 additions and 2 deletions
@@ -0,0 +1,36 @@
/*
* Copyright 2010-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package kotlin.jvm.internal
import kotlin.reflect.KCallable
class PackageReference(
override val jClass: Class<*>,
@Suppress("unused") private val moduleName: String
) : ClassBasedDeclarationContainer {
override val members: Collection<KCallable<*>>
get() = throw KotlinReflectionNotSupportedError()
override fun equals(other: Any?) =
other is PackageReference && jClass == other.jClass
override fun hashCode() =
jClass.hashCode()
override fun toString() =
jClass.toString() + Reflection.REFLECTION_NOT_AVAILABLE
}
@@ -30,7 +30,7 @@ public class ReflectionFactory {
}
public KDeclarationContainer getOrCreateKotlinPackage(Class javaClass, String moduleName) {
return null;
return new PackageReference(javaClass, moduleName);
}
public KClass getOrCreateKotlinClass(Class javaClass) {