From 0253fe7c160731b13df3f19b8ed64b38409e24bd Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 13 Apr 2018 10:35:08 +0300 Subject: [PATCH] Bunch: update after "Wire StorageManager into a ..." 934c56a4da9d3415f4a06f7ed447b16276aafaca --- .../quickfix/crossLanguage/KotlinElementActionsFactory.kt.181 | 4 +++- .../quickfix/crossLanguage/KotlinElementActionsFactory.kt.182 | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt.181 b/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt.181 index c46e15500c4..2e9764915cc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt.181 +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt.181 @@ -63,6 +63,7 @@ import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.visibilityModifierType import org.jetbrains.kotlin.resolve.annotations.JVM_FIELD_ANNOTATION_FQ_NAME import org.jetbrains.kotlin.resolve.annotations.JVM_STATIC_ANNOTATION_FQ_NAME +import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.types.typeUtil.supertypes @@ -211,7 +212,8 @@ class KotlinElementActionsFactory : JvmElementActionsFactory() { ClassKind.CLASS, emptyList(), SourceElement.NO_SOURCE, - false + false, + LockBasedStorageManager.NO_LOCKS ) val typeParameterResolver = object : TypeParameterResolver { override fun resolveTypeParameter(javaTypeParameter: JavaTypeParameter): TypeParameterDescriptor? { diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt.182 b/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt.182 index 79e0956448d..0a084e793e6 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt.182 +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt.182 @@ -70,6 +70,7 @@ import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer import org.jetbrains.kotlin.psi.psiUtil.visibilityModifierType import org.jetbrains.kotlin.resolve.annotations.JVM_FIELD_ANNOTATION_FQ_NAME import org.jetbrains.kotlin.resolve.annotations.JVM_STATIC_ANNOTATION_FQ_NAME +import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.types.typeUtil.supertypes @@ -218,7 +219,8 @@ class KotlinElementActionsFactory : JvmElementActionsFactory() { ClassKind.CLASS, emptyList(), SourceElement.NO_SOURCE, - false + false, + LockBasedStorageManager.NO_LOCKS ) val typeParameterResolver = object : TypeParameterResolver { override fun resolveTypeParameter(javaTypeParameter: JavaTypeParameter): TypeParameterDescriptor? {