From d9bb3b8fb737c9f730b379c8db0473ce7f8e31e5 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 19 Jul 2013 22:30:34 +0400 Subject: [PATCH] Minor. Reformatted. --- .../inline/KotlinInlineLocalHandler.java | 60 ++++++++++--------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineLocalHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineLocalHandler.java index 25755a25495..c453a375e95 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineLocalHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineLocalHandler.java @@ -124,38 +124,42 @@ public class KotlinInlineLocalHandler extends InlineActionHandler { } final List inlinedExpressions = Lists.newArrayList(); - CommandProcessor.getInstance().executeCommand(project, new Runnable() { - @Override - public void run() { - ApplicationManager.getApplication().runWriteAction(new Runnable() { + CommandProcessor.getInstance().executeCommand( + project, + new Runnable() { @Override public void run() { - for (PsiReference reference : references) { - PsiElement referenceElement = reference.getElement(); - if (assignments.contains(referenceElement.getParent())) { - continue; + ApplicationManager.getApplication().runWriteAction(new Runnable() { + @Override + public void run() { + for (PsiReference reference : references) { + PsiElement referenceElement = reference.getElement(); + if (assignments.contains(referenceElement.getParent())) { + continue; + } + + inlinedExpressions.add(replaceExpression(referenceElement, initializer)); + } + + for (PsiElement assignment : assignments) { + assignment.delete(); + } + + val.delete(); + + if (typeArgumentsForCall != null) { + addTypeArguments(typeArgumentsForCall, inlinedExpressions); + } + + if (parametersForFunctionLiteral != null) { + addFunctionLiteralParameterTypes(parametersForFunctionLiteral, inlinedExpressions); + } } - - inlinedExpressions.add(replaceExpression(referenceElement, initializer)); - } - - for (PsiElement assignment : assignments) { - assignment.delete(); - } - - val.delete(); - - if (typeArgumentsForCall != null) { - addTypeArguments(typeArgumentsForCall, inlinedExpressions); - } - - if (parametersForFunctionLiteral != null) { - addFunctionLiteralParameterTypes(parametersForFunctionLiteral, inlinedExpressions); - } + }); } - }); - } - }, RefactoringBundle.message("inline.command", name), null); + }, + RefactoringBundle.message("inline.command", name), + null); } private static boolean showDialog(Project project, String name, Collection references) {