azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-06-15 19:22:14 +03:00
parent 81f5a29526
commit c3f3392f0c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/MakeOverriddenMemberOpenFix.kt
+4 -3
View File
@@ -40,7 +40,8 @@ import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
private typealias DeclPtr = SmartPsiElementPointer<KtCallableDeclaration> private typealias DeclarationPointer = SmartPsiElementPointer<KtCallableDeclaration>
class MakeOverriddenMemberOpenFix(declaration: KtDeclaration) : KotlinQuickFixAction<KtDeclaration>(declaration) { class MakeOverriddenMemberOpenFix(declaration: KtDeclaration) : KotlinQuickFixAction<KtDeclaration>(declaration) {
private val myQuickFixInfo: QuickFixInfo by CachedValue(declaration.project) { private val myQuickFixInfo: QuickFixInfo by CachedValue(declaration.project) {
@@ -55,7 +56,7 @@ class MakeOverriddenMemberOpenFix(declaration: KtDeclaration) : KotlinQuickFixAc
private fun computeInfo(): QuickFixInfo { private fun computeInfo(): QuickFixInfo {
val element = element ?: return QUICKFIX_UNAVAILABLE val element = element ?: return QUICKFIX_UNAVAILABLE
val overriddenNonOverridableMembers = mutableListOf<DeclPtr>() val overriddenNonOverridableMembers = mutableListOf<DeclarationPointer>()
val containingDeclarationsNames = mutableListOf<String>() val containingDeclarationsNames = mutableListOf<String>()
val descriptor = element.resolveToDescriptorIfAny(BodyResolveMode.FULL) as? CallableMemberDescriptor ?: return QUICKFIX_UNAVAILABLE val descriptor = element.resolveToDescriptorIfAny(BodyResolveMode.FULL) as? CallableMemberDescriptor ?: return QUICKFIX_UNAVAILABLE
@@ -103,7 +104,7 @@ class MakeOverriddenMemberOpenFix(declaration: KtDeclaration) : KotlinQuickFixAc
} }
companion object : KotlinSingleIntentionActionFactory() { companion object : KotlinSingleIntentionActionFactory() {
private data class QuickFixInfo(val declarations: List<DeclPtr>, val declNames: List<String>) private data class QuickFixInfo(val declarations: List<DeclarationPointer>, val declNames: List<String>)
private val QUICKFIX_UNAVAILABLE = QuickFixInfo(emptyList(), emptyList()) private val QUICKFIX_UNAVAILABLE = QuickFixInfo(emptyList(), emptyList())