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

Reformat: AddActualFix

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-06-27 16:39:45 +03:00
parent 16c6d63b10
commit 082c3e6767
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/AddActualFix.kt
+5 -5
View File
@@ -32,8 +32,8 @@ import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer
import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
class AddActualFix( class AddActualFix(
actualClassOrObject: KtClassOrObject, actualClassOrObject: KtClassOrObject,
expectedClassOrObject: KtClassOrObject expectedClassOrObject: KtClassOrObject
) : KotlinQuickFixAction<KtClassOrObject>(actualClassOrObject) { ) : KotlinQuickFixAction<KtClassOrObject>(actualClassOrObject) {
private val expectedClassPointer = expectedClassOrObject.createSmartPointer() private val expectedClassPointer = expectedClassOrObject.createSmartPointer()
@@ -47,7 +47,7 @@ class AddActualFix(
val expectedClass = expectedClassPointer.element ?: return val expectedClass = expectedClassPointer.element ?: return
val factory = KtPsiFactory(element) val factory = KtPsiFactory(element)
val pureActualClass = factory.generateClassOrObjectByExpectedClass( val pureActualClass = factory.generateClassOrObjectByExpectedClass(
project, expectedClass, actualNeeded = true, existingDeclarations = element.declarations project, expectedClass, actualNeeded = true, existingDeclarations = element.declarations
) )
for (declaration in pureActualClass.declarations) { for (declaration in pureActualClass.declarations) {
element.addDeclaration(declaration) element.addDeclaration(declaration)
@@ -62,9 +62,9 @@ class AddActualFix(
override fun createAction(diagnostic: Diagnostic): IntentionAction? { override fun createAction(diagnostic: Diagnostic): IntentionAction? {
val incompatibleMap = DiagnosticFactory.cast(diagnostic, Errors.NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS).b val incompatibleMap = DiagnosticFactory.cast(diagnostic, Errors.NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS).b
val expectedClassDescriptor = incompatibleMap.firstOrNull()?.first?.containingDeclaration as? ClassDescriptor val expectedClassDescriptor = incompatibleMap.firstOrNull()?.first?.containingDeclaration as? ClassDescriptor
?: return null ?: return null
val expectedClassOrObject = DescriptorToSourceUtils.descriptorToDeclaration(expectedClassDescriptor) as? KtClassOrObject val expectedClassOrObject = DescriptorToSourceUtils.descriptorToDeclaration(expectedClassDescriptor) as? KtClassOrObject
?: return null ?: return null
return (diagnostic.psiElement as? KtClassOrObject)?.let { AddActualFix(it, expectedClassOrObject) } return (diagnostic.psiElement as? KtClassOrObject)?.let { AddActualFix(it, expectedClassOrObject) }
} }
} }