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

Refactoring (clone remove) of LiftAssignmentOutOfTryFix

Browse Source 
Related to KT-18830
This commit is contained in:
Mikhail Glukhikh
2017-07-11 15:19:42 +03:00
parent 8cc9330e63
commit 0ca5c0fcc6
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/LiftAssignmentOutOfTryFix.kt
+3 -18
View File
@@ -30,19 +30,7 @@ class LiftAssignmentOutOfTryFix(element: KtTryExpression): KotlinQuickFixAction<
override fun invoke(project: Project, editor: Editor?, file: KtFile) {
val element = element ?: return
val tryAssignment = BranchedFoldingUtils.getFoldableBranchedAssignment(element.tryBlock) ?: return
val op = tryAssignment.operationReference.text
val leftText = tryAssignment.left?.text ?: return
tryAssignment.replace(tryAssignment.right ?: return)
for (catchClause in element.catchClauses) {
val catchAssignment = BranchedFoldingUtils.getFoldableBranchedAssignment(catchClause.catchBody)
catchAssignment?.replace(catchAssignment.right!!)
}
element.replace(KtPsiFactory(element).createExpressionByPattern("$0 $1 $2", leftText, op, element))
BranchedFoldingUtils.foldToAssignment(element)
}
companion object : KotlinSingleIntentionActionFactory() {
@@ -51,11 +39,8 @@ class LiftAssignmentOutOfTryFix(element: KtTryExpression): KotlinQuickFixAction<
val expression = diagnostic.psiElement as? KtExpression ?: return null
val originalCatch = expression.parent.parent?.parent as? KtCatchClause ?: return null
val tryExpression = originalCatch.parent as? KtTryExpression ?: return null
val tryAssignment = BranchedFoldingUtils.getFoldableBranchedAssignment(tryExpression.tryBlock) ?: return null
for (catchClause in tryExpression.catchClauses) {
val catchAssignment = BranchedFoldingUtils.getFoldableBranchedAssignment(catchClause.catchBody) ?: return null
if (!BranchedFoldingUtils.checkAssignmentsMatch(tryAssignment, catchAssignment)) return null
}
if (BranchedFoldingUtils.getFoldableAssignmentNumber(tryExpression) < 1) return null
return LiftAssignmentOutOfTryFix(tryExpression)
}
}