From 3caad4b199aeacac36af4405149a82a9d408fb63 Mon Sep 17 00:00:00 2001 From: Jack Zhou Date: Mon, 8 Apr 2013 21:25:39 -0400 Subject: [PATCH] Create from usage: Fixed a runWriteAction. --- .../jet/plugin/quickfix/CreateMethodFromUsageFix.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/CreateMethodFromUsageFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/CreateMethodFromUsageFix.java index 55d7a444144..a7f2c42e04f 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/CreateMethodFromUsageFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/CreateMethodFromUsageFix.java @@ -24,6 +24,7 @@ import com.intellij.codeInsight.template.impl.TemplateImpl; import com.intellij.codeInsight.template.impl.Variable; import com.intellij.ide.fileTemplates.FileTemplate; import com.intellij.ide.fileTemplates.FileTemplateManager; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.editor.CaretModel; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.progress.ProcessCanceledException; @@ -464,9 +465,14 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase { @Override public void templateFinished(Template _, boolean brokenOff) { int offset = template.getSegmentOffset(0); - JetNamedFunction func = PsiTreeUtil.findElementOfClassAtOffset(containingFile, offset, JetNamedFunction.class, false); + final JetNamedFunction func = PsiTreeUtil.findElementOfClassAtOffset(containingFile, offset, JetNamedFunction.class, false); assert func != null; - setupFunctionBody(project, func, isUnit, ownerTypeDescriptor); + ApplicationManager.getApplication().runWriteAction(new Runnable() { + @Override + public void run() { + setupFunctionBody(project, func, isUnit, ownerTypeDescriptor); + } + }); caretModel.moveToOffset(oldOffset); }