MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-26 19:06:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

Replaced checking for ClsFileImpl/PsiCompiledElement with checking for PsiCompiledFile & invoking getDecompiledPsiFile() instead of getMirror()

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-03-13 17:09:06 +04:00
parent 9f35f07f73
commit 4f9a41d964
9 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeEditor/JavaEditorFileSwapper.java
+2 -3
View File
@@ -23,7 +23,6 @@ import com.intellij.openapi.util.Pair;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.psi.impl.compiled.ClsClassImpl;
import com.intellij.psi.impl.compiled.ClsFileImpl;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.Nullable;
@@ -39,7 +38,7 @@ public class JavaEditorFileSwapper extends EditorFileSwapper {
TextEditorImpl oldEditor = findSinglePsiAwareEditor(editorWithProviderComposite.getEditors());
if (oldEditor != null) {
ClsFileImpl clsFile = (ClsFileImpl)PsiManager.getInstance(project).findFile(file);
PsiCompiledFile clsFile = (PsiCompiledFile)PsiManager.getInstance(project).findFile(file);
assert clsFile != null;
int offset = oldEditor.getEditor().getCaretModel().getOffset();
@@ -79,7 +78,7 @@ public class JavaEditorFileSwapper extends EditorFileSwapper {
@Nullable
public static VirtualFile findSourceFile(Project project, VirtualFile eachFile) {
PsiFile psiFile = PsiManager.getInstance(project).findFile(eachFile);
if (!(psiFile instanceof ClsFileImpl)) return null;
if (!(psiFile instanceof PsiCompiledFile)) return null;
String fqn = getFQN(psiFile);
if (fqn == null) return null;
java/java-impl/src/com/intellij/codeInsight/editorActions/CopyPasteReferenceProcessor.java
+2 -2
View File
@@ -43,8 +43,8 @@ public abstract class CopyPasteReferenceProcessor<TRef extends PsiElement> imple
private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.editorActions.CopyPasteReferenceProcessor");
public ReferenceTransferableData collectTransferableData(PsiFile file, final Editor editor, final int[] startOffsets, final int[] endOffsets) {
if (file instanceof PsiCompiledElement) {
file = (PsiFile) ((PsiCompiledElement) file).getMirror();
if (file instanceof PsiCompiledFile) {
file = ((PsiCompiledFile) file).getDecompiledPsiFile();
}
if (!(file instanceof PsiClassOwner)) {
return null;