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

Migration: hasImpl -> hasExpectedModifier (OverrideMemberChooserObject)

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-09-14 20:00:53 +03:00
parent 280a60af6f
commit 89c8ee8614
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt
+2 -1
View File
@@ -35,6 +35,7 @@ import org.jetbrains.kotlin.idea.util.approximateFlexibleTypes
import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.findDocComment.findDocComment import org.jetbrains.kotlin.psi.findDocComment.findDocComment
import org.jetbrains.kotlin.psi.psiUtil.hasActualModifier
import org.jetbrains.kotlin.psi.psiUtil.hasExpectModifier import org.jetbrains.kotlin.psi.psiUtil.hasExpectModifier
import org.jetbrains.kotlin.renderer.* import org.jetbrains.kotlin.renderer.*
import org.jetbrains.kotlin.resolve.descriptorUtil.setSingleOverridden import org.jetbrains.kotlin.resolve.descriptorUtil.setSingleOverridden
@@ -111,7 +112,7 @@ fun OverrideMemberChooserObject.generateMember(targetClass: KtClassOrObject, cop
else -> error("Unknown member to override: $descriptor") else -> error("Unknown member to override: $descriptor")
} }
if (!targetClass.hasModifier(KtTokens.IMPL_KEYWORD)) { if (!targetClass.hasActualModifier()) {
newMember.removeModifier(KtTokens.IMPL_KEYWORD) newMember.removeModifier(KtTokens.IMPL_KEYWORD)
} }