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

Create from Usage: Drop "Create package" quick-fix

Browse Source 
#KT-7138 Fixed
This commit is contained in:
Alexey Sedunov
2015-09-07 12:31:55 +03:00
parent cc1a756cab
commit 9e11a20006
3 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt
+1 -1
View File
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getCall
import java.util.Arrays import java.util.Arrays
import java.util.Collections import java.util.Collections
public object CreateClassFromReferenceExpressionActionFactory : CreateClassFromUsageFactory<JetSimpleNameExpression>(true) { public object CreateClassFromReferenceExpressionActionFactory : CreateClassFromUsageFactory<JetSimpleNameExpression>() {
override fun getElementOfInterest(diagnostic: Diagnostic): JetSimpleNameExpression? { override fun getElementOfInterest(diagnostic: Diagnostic): JetSimpleNameExpression? {
val refExpr = diagnostic.psiElement as? JetSimpleNameExpression ?: return null val refExpr = diagnostic.psiElement as? JetSimpleNameExpression ?: return null
if (refExpr.getNonStrictParentOfType<JetTypeReference>() != null) return null if (refExpr.getNonStrictParentOfType<JetTypeReference>() != null) return null
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt
+1 -1
View File
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.types.Variance
import java.util.Collections import java.util.Collections
public object CreateClassFromTypeReferenceActionFactory : CreateClassFromUsageFactory<JetUserType>(true) { public object CreateClassFromTypeReferenceActionFactory : CreateClassFromUsageFactory<JetUserType>() {
override fun getElementOfInterest(diagnostic: Diagnostic): JetUserType? { override fun getElementOfInterest(diagnostic: Diagnostic): JetUserType? {
return QuickFixUtil.getParentElementOfType(diagnostic, javaClass<JetUserType>()) return QuickFixUtil.getParentElementOfType(diagnostic, javaClass<JetUserType>())
} }
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFactory.kt
+2 -13
View File
@@ -22,11 +22,8 @@ import org.jetbrains.kotlin.idea.quickfix.NullQuickFix
import org.jetbrains.kotlin.idea.quickfix.QuickFixWithDelegateFactory import org.jetbrains.kotlin.idea.quickfix.QuickFixWithDelegateFactory
import org.jetbrains.kotlin.idea.quickfix.createFromUsage.CreateFromUsageFactory import org.jetbrains.kotlin.idea.quickfix.createFromUsage.CreateFromUsageFactory
import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetElement
import org.jetbrains.kotlin.psi.JetUserType
abstract class CreateClassFromUsageFactory<E : JetElement>( abstract class CreateClassFromUsageFactory<E : JetElement> : CreateFromUsageFactory<E, ClassInfo>() {
val createPackageIsAvailable: Boolean = false
) : CreateFromUsageFactory<E, ClassInfo>() {
protected abstract fun getPossibleClassKinds(element: E, diagnostic: Diagnostic): List<ClassKind> protected abstract fun getPossibleClassKinds(element: E, diagnostic: Diagnostic): List<ClassKind>
override fun createQuickFixes( override fun createQuickFixes(
@@ -46,14 +43,6 @@ abstract class CreateClassFromUsageFactory<E : JetElement>(
} }
} }
if (!createPackageIsAvailable) return classFixes return classFixes
val refExpr = (originalElement as? JetUserType)?.referenceExpression ?: return classFixes
val packageFix = QuickFixWithDelegateFactory {
quickFixDataFactory(originalElementPointer)?.let {
refExpr.getCreatePackageFixIfApplicable(it.targetParent)
} ?: NullQuickFix
}
return classFixes + packageFix
} }
} }