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

Debugger, minor: Insert type arguments after replacing expression

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-08-14 15:21:43 +04:00
parent 4982e22ec7
commit fbe894ea88
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt
+9 -8
View File
@@ -42,6 +42,7 @@ import org.jetbrains.jet.plugin.intentions.InsertExplicitTypeArguments
import com.intellij.psi.util.PsiTreeUtil import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractionGeneratorOptions import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractionGeneratorOptions
import org.jetbrains.jet.plugin.refactoring.extractFunction.generateDeclaration import org.jetbrains.jet.plugin.refactoring.extractFunction.generateDeclaration
import org.jetbrains.jet.lang.psi.psiUtil.replaced
fun getFunctionForExtractedFragment( fun getFunctionForExtractedFragment(
codeFragment: JetCodeFragment, codeFragment: JetCodeFragment,
@@ -171,19 +172,19 @@ private fun addDebugExpressionBeforeContextElement(codeFragment: JetCodeFragment
return newDebugExpression as JetExpression return newDebugExpression as JetExpression
} }
private fun createRunFunction(body: JetExpression): JetCallExpression { private fun replaceByRunFunction(expression: JetExpression): JetCallExpression {
val callExpression = JetPsiFactory(body).createExpression("run { \n${body.getText()} \n}") as JetCallExpression val callExpression = JetPsiFactory(expression).createExpression("run { \n${expression.getText()} \n}") as JetCallExpression
val typeArguments = InsertExplicitTypeArguments.createTypeArguments(callExpression) val replaced = expression.replaced(callExpression)
val typeArguments = InsertExplicitTypeArguments.createTypeArguments(replaced)
if (typeArguments?.getArguments()?.isNotEmpty() ?: false) { if (typeArguments?.getArguments()?.isNotEmpty() ?: false) {
val calleeExpression = callExpression.getCalleeExpression() val calleeExpression = replaced.getCalleeExpression()
callExpression.addAfter(typeArguments!!, calleeExpression) replaced.addAfter(typeArguments!!, calleeExpression)
} }
return callExpression return replaced
} }
private fun wrapInRunFun(expression: JetExpression): PsiElement? { private fun wrapInRunFun(expression: JetExpression): PsiElement? {
val newBody = createRunFunction(expression) val replacedBody = replaceByRunFunction(expression)
val replacedBody = (expression.replace(newBody) as JetCallExpression)
// Increment modification tracker to clear ResolveCache after changes in function body // Increment modification tracker to clear ResolveCache after changes in function body
(PsiManager.getInstance(expression.getProject()).getModificationTracker() as PsiModificationTrackerImpl).incCounter() (PsiManager.getInstance(expression.getProject()).getModificationTracker() as PsiModificationTrackerImpl).incCounter()