Create from usage: Replaced boilerplate code with NavigationUtil.activateFileWithPsiElement.

This commit is contained in:
Jack Zhou
2013-05-01 17:39:53 -04:00
parent e53feac26d
commit d2ce58e912
@@ -19,6 +19,7 @@ package org.jetbrains.jet.plugin.quickfix;
import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupElementBuilder; import com.intellij.codeInsight.lookup.LookupElementBuilder;
import com.intellij.codeInsight.navigation.NavigationUtil;
import com.intellij.codeInsight.template.*; import com.intellij.codeInsight.template.*;
import com.intellij.codeInsight.template.impl.TemplateImpl; import com.intellij.codeInsight.template.impl.TemplateImpl;
import com.intellij.codeInsight.template.impl.Variable; import com.intellij.codeInsight.template.impl.Variable;
@@ -696,11 +697,10 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
assert classContainingFile instanceof JetFile; assert classContainingFile instanceof JetFile;
containingFile = (JetFile) classContainingFile; containingFile = (JetFile) classContainingFile;
VirtualFile virtualFile = containingFile.getVirtualFile(); if (!ApplicationManager.getApplication().isUnitTestMode()) {
assert virtualFile != null; NavigationUtil.activateFileWithPsiElement(containingFile);
FileEditorManager fileEditorManager = FileEditorManager.getInstance(project); }
fileEditorManager.openFile(virtualFile, true); containingFileEditor = FileEditorManager.getInstance(project).getSelectedTextEditor();
containingFileEditor = fileEditorManager.getSelectedTextEditor();
JetClassBody classBody = ownerClass.getBody(); JetClassBody classBody = ownerClass.getBody();
if (classBody == null) { if (classBody == null) {