From d2ce58e912043fb6b11a495534036d84aed8f512 Mon Sep 17 00:00:00 2001 From: Jack Zhou Date: Wed, 1 May 2013 17:39:53 -0400 Subject: [PATCH] Create from usage: Replaced boilerplate code with NavigationUtil.activateFileWithPsiElement. --- .../jet/plugin/quickfix/CreateMethodFromUsageFix.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/CreateMethodFromUsageFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/CreateMethodFromUsageFix.java index d4a018fcf64..1ce351e8c80 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/CreateMethodFromUsageFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/CreateMethodFromUsageFix.java @@ -19,6 +19,7 @@ package org.jetbrains.jet.plugin.quickfix; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElementBuilder; +import com.intellij.codeInsight.navigation.NavigationUtil; import com.intellij.codeInsight.template.*; import com.intellij.codeInsight.template.impl.TemplateImpl; import com.intellij.codeInsight.template.impl.Variable; @@ -696,11 +697,10 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase { assert classContainingFile instanceof JetFile; containingFile = (JetFile) classContainingFile; - VirtualFile virtualFile = containingFile.getVirtualFile(); - assert virtualFile != null; - FileEditorManager fileEditorManager = FileEditorManager.getInstance(project); - fileEditorManager.openFile(virtualFile, true); - containingFileEditor = fileEditorManager.getSelectedTextEditor(); + if (!ApplicationManager.getApplication().isUnitTestMode()) { + NavigationUtil.activateFileWithPsiElement(containingFile); + } + containingFileEditor = FileEditorManager.getInstance(project).getSelectedTextEditor(); JetClassBody classBody = ownerClass.getBody(); if (classBody == null) {