From 4a3fbcc16e87c2c91529fa5ae828e387d4ac43ec Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Fri, 7 Aug 2015 14:24:56 +0300 Subject: [PATCH] Make project compilable after fixes about generic nullability --- .../src/org/jetbrains/kotlin/container/Container.kt | 4 ++-- .../src/org/jetbrains/kotlin/container/Dsl.kt | 8 ++++---- .../diagnostics/rendering/DiagnosticRendererUtil.kt | 2 +- .../storage/LockBasedLazyResolveStorageManager.kt | 4 ++-- .../util/src/org/jetbrains/kotlin/config/Services.kt | 2 +- .../org/jetbrains/kotlin/resolve/scopes/JetScope.kt | 2 +- .../src/org/jetbrains/kotlin/util/scopeUtils.kt | 2 +- .../src/kotlin/reflect/KClassExtensions.kt | 8 ++++---- .../src/kotlin/reflect/jvm/_Deprecated.kt | 12 ++++++------ .../kotlin/reflect/jvm/internal/foreignKClasses.kt | 2 +- .../reflection.jvm/src/kotlin/reflect/jvm/mapping.kt | 2 +- .../src/org/jetbrains/kotlin/storage/storage.kt | 2 +- eval4j/src/org/jetbrains/eval4j/values.kt | 2 +- .../kotlin/idea/resolve/ResolutionFacade.kt | 12 ++++++------ .../kotlin/idea/caches/resolve/KotlinCacheService.kt | 2 +- .../idea/caches/resolve/ProjectResolutionFacade.kt | 10 +++++----- .../idea/quickfix/JetWholeProjectModalAction.kt | 4 ++-- .../createFromUsage/CreateFromUsageFactory.kt | 8 ++++---- .../CreateCallableMemberFromUsageFactory.kt | 4 ++-- .../createClass/CreateClassFromUsageFactory.kt | 2 +- .../CreateParameterFromUsageFactory.kt | 2 +- .../kotlin/js/inline/ExpressionDecomposer.kt | 2 +- libraries/stdlib/src/kotlin/collections/Sequence.kt | 2 +- libraries/stdlib/src/kotlin/jvm/JvmClassMapping.kt | 4 ++-- 24 files changed, 52 insertions(+), 52 deletions(-) diff --git a/compiler/container/src/org/jetbrains/kotlin/container/Container.kt b/compiler/container/src/org/jetbrains/kotlin/container/Container.kt index 07cf81861a0..43f6add43e2 100644 --- a/compiler/container/src/org/jetbrains/kotlin/container/Container.kt +++ b/compiler/container/src/org/jetbrains/kotlin/container/Container.kt @@ -111,10 +111,10 @@ public fun StorageComponentContainer.registerInstance(instance: Any): StorageCom return registerDescriptors(listOf(InstanceComponentDescriptor(instance))) } -public inline fun StorageComponentContainer.resolve(context: ValueResolveContext = unknownContext): ValueDescriptor? { +public inline fun StorageComponentContainer.resolve(context: ValueResolveContext = unknownContext): ValueDescriptor? { return resolve(javaClass(), context) } -public inline fun StorageComponentContainer.resolveMultiple(context: ValueResolveContext = unknownContext): Iterable { +public inline fun StorageComponentContainer.resolveMultiple(context: ValueResolveContext = unknownContext): Iterable { return resolveMultiple(javaClass(), context) } diff --git a/compiler/container/src/org/jetbrains/kotlin/container/Dsl.kt b/compiler/container/src/org/jetbrains/kotlin/container/Dsl.kt index 0663327fa17..83e893268b5 100644 --- a/compiler/container/src/org/jetbrains/kotlin/container/Dsl.kt +++ b/compiler/container/src/org/jetbrains/kotlin/container/Dsl.kt @@ -23,16 +23,16 @@ public fun createContainer(id: String, init: StorageComponentContainer.() -> Uni return c } -public inline fun StorageComponentContainer.useImpl() { +public inline fun StorageComponentContainer.useImpl() { registerSingleton(javaClass()) } -public inline fun ComponentProvider.get(): T { +public inline fun ComponentProvider.get(): T { return getService(javaClass()) } @suppress("UNCHECKED_CAST") -public fun ComponentProvider.getService(request: Class): T { +public fun ComponentProvider.getService(request: Class): T { return resolve(request)!!.getValue() as T } @@ -40,6 +40,6 @@ public fun StorageComponentContainer.useInstance(instance: Any) { registerInstance(instance) } -public inline fun ComponentProvider.get(thisRef: Any?, desc: PropertyMetadata): T { +public inline fun ComponentProvider.get(thisRef: Any?, desc: PropertyMetadata): T { return getService(javaClass()) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticRendererUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticRendererUtil.kt index 16aa31fcdf9..c80f63cee19 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticRendererUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticRendererUtil.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.renderer.Renderer -public fun

renderParameter(parameter: P, renderer: Renderer

?): Any = renderer?.render(parameter) ?: parameter +public fun

renderParameter(parameter: P, renderer: Renderer

?): Any = renderer?.render(parameter) ?: parameter public fun ClassDescriptor.renderKindWithName(): String = DescriptorRenderer.getClassKindPrefix(this) + " '" + getName() + "'" diff --git a/compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt b/compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt index 4255d781a34..35ca14e496e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt @@ -29,10 +29,10 @@ import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.types.JetType public class LockBasedLazyResolveStorageManager(private val storageManager: StorageManager): StorageManager by storageManager, LazyResolveStorageManager { - override fun createSoftlyRetainedMemoizedFunction(compute: Function1) = + override fun createSoftlyRetainedMemoizedFunction(compute: Function1) = storageManager.createMemoizedFunction(compute, ContainerUtil.createConcurrentSoftValueMap()) - override fun createSoftlyRetainedMemoizedFunctionWithNullableValues(compute: Function1) = + override fun createSoftlyRetainedMemoizedFunctionWithNullableValues(compute: Function1) = storageManager.createMemoizedFunctionWithNullableValues(compute, ContainerUtil.createConcurrentSoftValueMap()) override fun createSafeTrace(originalTrace: BindingTrace) = diff --git a/compiler/util/src/org/jetbrains/kotlin/config/Services.kt b/compiler/util/src/org/jetbrains/kotlin/config/Services.kt index 70976807196..d9ef72bfc89 100644 --- a/compiler/util/src/org/jetbrains/kotlin/config/Services.kt +++ b/compiler/util/src/org/jetbrains/kotlin/config/Services.kt @@ -32,7 +32,7 @@ public class Services private constructor(private val map: Map, Any>) { private val map = HashMap, Any>() - public fun register(interfaceClass: Class, implementation: T): Builder { + public fun register(interfaceClass: Class, implementation: T): Builder { map.put(interfaceClass, implementation) return this } diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt index c93d6db7f28..fe557d1691a 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt @@ -205,7 +205,7 @@ public class DescriptorKindFilter( .filterNotNull() .toReadOnlyList() - private inline fun staticFields() = javaClass().getFields().filter { Modifier.isStatic(it.getModifiers()) } + private inline fun staticFields() = javaClass().getFields().filter { Modifier.isStatic(it.getModifiers()) } } } diff --git a/core/descriptors/src/org/jetbrains/kotlin/util/scopeUtils.kt b/core/descriptors/src/org/jetbrains/kotlin/util/scopeUtils.kt index 7b3d2354baa..985b1bbed9f 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/util/scopeUtils.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/util/scopeUtils.kt @@ -62,7 +62,7 @@ public inline fun getFromAllScopes(scopes: Array, callback: return result ?: emptySet() } -public inline fun getFirstMatch(scopes: Array, callback: (Scope) -> T): T { +public inline fun getFirstMatch(scopes: Array, callback: (Scope) -> T?): T? { // NOTE: This is performance-sensitive; please don't replace with map().firstOrNull() for (scope in scopes) { val result = callback(scope) diff --git a/core/reflection.jvm/src/kotlin/reflect/KClassExtensions.kt b/core/reflection.jvm/src/kotlin/reflect/KClassExtensions.kt index 3fe2a57ff52..fc3d768916e 100644 --- a/core/reflection.jvm/src/kotlin/reflect/KClassExtensions.kt +++ b/core/reflection.jvm/src/kotlin/reflect/KClassExtensions.kt @@ -43,7 +43,7 @@ public val KClass<*>.declaredFunctions: Collection> /** * Returns non-extension properties declared in this class and all of its superclasses. */ -public val KClass.memberProperties: Collection> +public val KClass.memberProperties: Collection> get() = (this as KClassImpl) .getMembers(declaredOnly = false, nonExtensions = true, extensions = false) .filterIsInstance>() @@ -52,7 +52,7 @@ public val KClass.memberProperties: Collection> /** * Returns extension properties declared in this class and all of its superclasses. */ -public val KClass.memberExtensionProperties: Collection> +public val KClass.memberExtensionProperties: Collection> get() = (this as KClassImpl) .getMembers(declaredOnly = false, nonExtensions = false, extensions = true) .filterIsInstance>() @@ -61,7 +61,7 @@ public val KClass.memberExtensionProperties: Collection KClass.declaredMemberProperties: Collection> +public val KClass.declaredMemberProperties: Collection> get() = (this as KClassImpl) .getMembers(declaredOnly = true, nonExtensions = true, extensions = false) .filterIsInstance>() @@ -70,7 +70,7 @@ public val KClass.declaredMemberProperties: Collection> /** * Returns extension properties declared in this class. */ -public val KClass.declaredMemberExtensionProperties: Collection> +public val KClass.declaredMemberExtensionProperties: Collection> get() = (this as KClassImpl) .getMembers(declaredOnly = true, nonExtensions = false, extensions = true) .filterIsInstance>() diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/_Deprecated.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/_Deprecated.kt index 508077db2c0..58b684da4af 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/_Deprecated.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/_Deprecated.kt @@ -25,19 +25,19 @@ public val Field.kotlin: KProperty<*>? @deprecated("Use memberProperties instead.", ReplaceWith("memberProperties")) -public val KClass.properties: Collection> +public val KClass.properties: Collection> get() = memberProperties @deprecated("Use extensionProperties instead.", ReplaceWith("extensionProperties")) -public val KClass.extensionProperties: Collection> +public val KClass.extensionProperties: Collection> get() = memberExtensionProperties @deprecated("Use declaredMemberProperties instead.", ReplaceWith("declaredMemberProperties")) -public val KClass.declaredProperties: Collection> +public val KClass.declaredProperties: Collection> get() = declaredMemberProperties @deprecated("Use declaredMemberExtensionProperties instead.", ReplaceWith("declaredMemberExtensionProperties")) -public val KClass.declaredExtensionProperties: Collection> +public val KClass.declaredExtensionProperties: Collection> get() = declaredMemberExtensionProperties @@ -48,11 +48,11 @@ public var KProperty<*>.accessible: Boolean @deprecated("Use .java instead.", ReplaceWith("java")) -public val KClass.__java: Class +public val KClass.__java: Class @jvmName("getJava") get() = this.java @deprecated("Use .kotlin instead.", ReplaceWith("kotlin")) -public val Class.__kotlin: KClass +public val Class.__kotlin: KClass @jvmName("getKotlin") get() = this.kotlin diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/foreignKClasses.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/foreignKClasses.kt index 695dd69fa0d..c3aff97f77b 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/foreignKClasses.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/foreignKClasses.kt @@ -27,7 +27,7 @@ import kotlin.reflect.jvm.internal.pcollections.HashPMap private var FOREIGN_K_CLASSES = HashPMap.empty() // This function is invoked on each reflection access to Java classes, properties, etc. Performance is critical here. -fun foreignKotlinClass(jClass: Class): KClassImpl { +fun foreignKotlinClass(jClass: Class): KClassImpl { val name = jClass.getName() val cached = FOREIGN_K_CLASSES[name] if (cached is WeakReference<*>) { diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/mapping.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/mapping.kt index 8905edd7da7..9b584af2082 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/mapping.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/mapping.kt @@ -131,7 +131,7 @@ public val Method.kotlinFunction: KFunction<*>? * or `null` if this constructor cannot be represented by a Kotlin function * (for example, if it is a synthetic constructor). */ -public val Constructor.kotlinFunction: KFunction? +public val Constructor.kotlinFunction: KFunction? get() { if (isSynthetic()) return null diff --git a/core/util.runtime/src/org/jetbrains/kotlin/storage/storage.kt b/core/util.runtime/src/org/jetbrains/kotlin/storage/storage.kt index 00baa01cc5a..9584dc3c806 100644 --- a/core/util.runtime/src/org/jetbrains/kotlin/storage/storage.kt +++ b/core/util.runtime/src/org/jetbrains/kotlin/storage/storage.kt @@ -32,4 +32,4 @@ public interface NullableLazyValue : Function0 { public fun isComputed(): Boolean } -public fun NotNullLazyValue.get(_this: Any?, p: PropertyMetadata): T = invoke() +public fun NotNullLazyValue.get(_this: Any?, p: PropertyMetadata): T = invoke() diff --git a/eval4j/src/org/jetbrains/eval4j/values.kt b/eval4j/src/org/jetbrains/eval4j/values.kt index dab6f43fe83..8ecef6767b9 100644 --- a/eval4j/src/org/jetbrains/eval4j/values.kt +++ b/eval4j/src/org/jetbrains/eval4j/values.kt @@ -68,7 +68,7 @@ abstract class AbstractValueBase( } override fun hashCode(): Int { - return value.hashCode() + 17 * asmType.hashCode() + return value!!.hashCode() + 17 * asmType.hashCode() } } diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/resolve/ResolutionFacade.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/resolve/ResolutionFacade.kt index e55e740ae0b..5ef843ada8b 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/idea/resolve/ResolutionFacade.kt +++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/resolve/ResolutionFacade.kt @@ -38,19 +38,19 @@ public interface ResolutionFacade { public val moduleDescriptor: ModuleDescriptor // get service for the module this resolution was created for - public fun getFrontendService(serviceClass: Class): T + public fun getFrontendService(serviceClass: Class): T - public fun getIdeService(serviceClass: Class): T + public fun getIdeService(serviceClass: Class): T // get service for the module defined by PsiElement/ModuleDescriptor passed as parameter - public fun getFrontendService(element: PsiElement, serviceClass: Class): T + public fun getFrontendService(element: PsiElement, serviceClass: Class): T - public fun getFrontendService(moduleDescriptor: ModuleDescriptor, serviceClass: Class): T + public fun getFrontendService(moduleDescriptor: ModuleDescriptor, serviceClass: Class): T } -public inline fun ResolutionFacade.frontendService(): T +public inline fun ResolutionFacade.frontendService(): T = this.getFrontendService(javaClass()) -public inline fun ResolutionFacade.ideService(): T +public inline fun ResolutionFacade.ideService(): T = this.getIdeService(javaClass()) \ No newline at end of file diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt index e2fab453752..81630b85866 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt @@ -77,7 +77,7 @@ public class KotlinCacheService(val project: Project) { } deprecated("Use JetElement.getResolutionFacade(), please avoid introducing new usages") - public fun getProjectService(platform: TargetPlatform, ideaModuleInfo: IdeaModuleInfo, serviceClass: Class): T { + public fun getProjectService(platform: TargetPlatform, ideaModuleInfo: IdeaModuleInfo, serviceClass: Class): T { return globalFacade(platform).resolverForModuleInfo(ideaModuleInfo).componentProvider.getService(serviceClass) } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt index 6bdd47b0018..ad799721f61 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt @@ -110,21 +110,21 @@ private class ResolutionFacadeImpl( return resolveSession.resolveToDescriptor(declaration) } - override fun getFrontendService(serviceClass: Class): T = getFrontendService(moduleInfo, serviceClass) + override fun getFrontendService(serviceClass: Class): T = getFrontendService(moduleInfo, serviceClass) - override fun getIdeService(serviceClass: Class): T { + override fun getIdeService(serviceClass: Class): T { return projectFacade.resolverForModuleInfo(moduleInfo).componentProvider.create(serviceClass) } - override fun getFrontendService(element: PsiElement, serviceClass: Class): T { + override fun getFrontendService(element: PsiElement, serviceClass: Class): T { return getFrontendService(element.getModuleInfo(), serviceClass) } - fun getFrontendService(ideaModuleInfo: IdeaModuleInfo, serviceClass: Class): T { + fun getFrontendService(ideaModuleInfo: IdeaModuleInfo, serviceClass: Class): T { return projectFacade.resolverForModuleInfo(ideaModuleInfo).componentProvider.getService(serviceClass) } - override fun getFrontendService(moduleDescriptor: ModuleDescriptor, serviceClass: Class): T { + override fun getFrontendService(moduleDescriptor: ModuleDescriptor, serviceClass: Class): T { return projectFacade.resolverForDescriptor(moduleDescriptor).componentProvider.getService(serviceClass) } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/JetWholeProjectModalAction.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/JetWholeProjectModalAction.kt index 66b1ab0c2ac..76158f5371d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/JetWholeProjectModalAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/JetWholeProjectModalAction.kt @@ -112,7 +112,7 @@ public abstract class JetWholeProjectModalByCollectionAction(modalT abstract fun collectTasksForFile(project: Project, file: JetFile, accumulator: MutableCollection) } -class JetWholeProjectForEachElementOfTypeFix private constructor( +class JetWholeProjectForEachElementOfTypeFix private constructor( private val collectingVisitorFactory: (MutableCollection) -> JetVisitorVoid, private val tasksProcessor: (Collection) -> Unit, private val name: String, @@ -148,7 +148,7 @@ class JetWholeProjectForEachElementOfTypeFix private constructor( name = name ) - inline fun createForMultiTaskOnElement( + inline fun createForMultiTaskOnElement( noinline tasksFactory: (TElement) -> Collection, noinline tasksProcessor: (Collection) -> Unit, name: String diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/CreateFromUsageFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/CreateFromUsageFactory.kt index 2e921b36f3b..58cb0e5c535 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/CreateFromUsageFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/CreateFromUsageFactory.kt @@ -29,22 +29,22 @@ import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.utils.singletonOrEmptyList -public abstract class CreateFromUsageFactory : JetIntentionActionsFactory() { +public abstract class CreateFromUsageFactory : JetIntentionActionsFactory() { protected abstract fun getElementOfInterest(diagnostic: Diagnostic): E? protected open fun createQuickFix( originalElementPointer: SmartPsiElementPointer, diagnostic: Diagnostic, - quickFixDataFactory: (SmartPsiElementPointer) -> D + quickFixDataFactory: (SmartPsiElementPointer) -> D? ): QuickFixWithDelegateFactory? = null protected open fun createQuickFixes( originalElementPointer: SmartPsiElementPointer, diagnostic: Diagnostic, - quickFixDataFactory: (SmartPsiElementPointer) -> D + quickFixDataFactory: (SmartPsiElementPointer) -> D? ): List = createQuickFix(originalElementPointer, diagnostic, quickFixDataFactory).singletonOrEmptyList() - protected abstract fun createQuickFixData(element: E, diagnostic: Diagnostic): D + protected abstract fun createQuickFixData(element: E, diagnostic: Diagnostic): D? override final fun doCreateActions(diagnostic: Diagnostic): List? { val diagnosticMessage = DefaultErrorMessages.render(diagnostic) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableMemberFromUsageFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableMemberFromUsageFactory.kt index 0b803f3a6ce..0ad53a42df9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableMemberFromUsageFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableMemberFromUsageFactory.kt @@ -30,7 +30,7 @@ public abstract class CreateCallableMemberFromUsageFactory( ) : CreateFromUsageFactory>() { private fun newCallableQuickFix( originalElementPointer: SmartPsiElementPointer, - quickFixDataFactory: (SmartPsiElementPointer) -> List, + quickFixDataFactory: (SmartPsiElementPointer) -> List?, quickFixFactory: (E, List) -> CreateCallableFromUsageFixBase ): QuickFixWithDelegateFactory { return QuickFixWithDelegateFactory { @@ -48,7 +48,7 @@ public abstract class CreateCallableMemberFromUsageFactory( override fun createQuickFixes( originalElementPointer: SmartPsiElementPointer, diagnostic: Diagnostic, - quickFixDataFactory: (SmartPsiElementPointer) -> List + quickFixDataFactory: (SmartPsiElementPointer) -> List? ): List { val memberFix = newCallableQuickFix(originalElementPointer, quickFixDataFactory) { element, data -> CreateCallableFromUsageFix(element, data) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFactory.kt index 6c7194d856b..0e09f736997 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFactory.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetUserType abstract class CreateClassFromUsageFactory( val createPackageIsAvailable: Boolean = false -) : CreateFromUsageFactory() { +) : CreateFromUsageFactory() { protected abstract fun getPossibleClassKinds(element: E, diagnostic: Diagnostic): List override fun createQuickFixes( diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFactory.kt index 56b99adf5cd..fc278b183bb 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFactory.kt @@ -32,7 +32,7 @@ data class CreateParameterData( val originalExpression: E ) -abstract class CreateParameterFromUsageFactory: CreateFromUsageFactory?>() { +abstract class CreateParameterFromUsageFactory: CreateFromUsageFactory>() { override fun createQuickFix( originalElementPointer: SmartPsiElementPointer, diagnostic: Diagnostic, diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt index 9f7dafd40c1..188dc63ec67 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt @@ -414,7 +414,7 @@ private fun JsNode.match(predicate: (JsNode) -> Boolean): Set { val visitor = object : JsExpressionVisitor() { val matched = IdentitySet() - override fun doTraverse(node: R, ctx: JsContext<*>?) { + override fun doTraverse(node: R, ctx: JsContext<*>?) { super.doTraverse(node, ctx) if (node !in matched && predicate(node)) { diff --git a/libraries/stdlib/src/kotlin/collections/Sequence.kt b/libraries/stdlib/src/kotlin/collections/Sequence.kt index 38499ee2de6..935169b342e 100644 --- a/libraries/stdlib/src/kotlin/collections/Sequence.kt +++ b/libraries/stdlib/src/kotlin/collections/Sequence.kt @@ -43,7 +43,7 @@ public fun sequenceOf(vararg elements: T): Sequence = if (elements.isEmpt /** * Creates a sequence that returns all values in the specified [progression]. */ -public fun sequenceOf(progression: Progression): Sequence = object : Sequence { +public fun sequenceOf(progression: Progression): Sequence = object : Sequence { override fun iterator(): Iterator = progression.iterator() } diff --git a/libraries/stdlib/src/kotlin/jvm/JvmClassMapping.kt b/libraries/stdlib/src/kotlin/jvm/JvmClassMapping.kt index cd99de48fab..a6295cb0e76 100644 --- a/libraries/stdlib/src/kotlin/jvm/JvmClassMapping.kt +++ b/libraries/stdlib/src/kotlin/jvm/JvmClassMapping.kt @@ -25,11 +25,11 @@ import kotlin.reflect.KClass * Returns a Java [Class] instance corresponding to the given [KClass] instance. */ @Intrinsic("kotlin.KClass.java.property") -public val KClass.java: Class +public val KClass.java: Class get() = (this as ClassBasedDeclarationContainer).jClass as Class /** * Returns a [KClass] instance corresponding to the given Java [Class] instance. */ -public val Class.kotlin: KClass +public val Class.kotlin: KClass get() = Reflection.createKotlinClass(this) as KClass