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

IDEA-82080 (Try to keep the file position after "Download sources")

Browse Source
This commit is contained in:
Sergey Evdokimov
2012-03-07 16:50:20 +04:00
parent 9bbce017b5
commit c33bcff51c
3 changed files with 100 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeEditor/JavaEditorFileSwapper.java
+51 -6
View File
@@ -16,17 +16,64 @@
package com.intellij.codeEditor;
import com.intellij.openapi.fileEditor.impl.EditorFileSwapper;
import com.intellij.openapi.fileEditor.impl.EditorWithProviderComposite;
import com.intellij.openapi.fileEditor.impl.text.TextEditorImpl;
import com.intellij.openapi.project.Project;
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;
public class JavaEditorFileSwapper implements EditorFileSwapper {
public VirtualFile getFileToSwapTo(Project project, VirtualFile original) {
return findSourceFile(project, original);
public class JavaEditorFileSwapper extends EditorFileSwapper {
public Pair<VirtualFile, Integer> getFileToSwapTo(Project project, EditorWithProviderComposite editorWithProviderComposite) {
VirtualFile file = editorWithProviderComposite.getFile();
VirtualFile sourceFile = findSourceFile(project, file);
if (sourceFile == null) return null;
Integer position = null;
TextEditorImpl oldEditor = findSinglePsiAwareEditor(editorWithProviderComposite.getEditors());
if (oldEditor != null) {
ClsFileImpl clsFile = (ClsFileImpl)PsiManager.getInstance(project).findFile(file);
assert clsFile != null;
int offset = oldEditor.getEditor().getCaretModel().getOffset();
PsiElement elementAt = clsFile.findElementAt(offset);
PsiMember member = PsiTreeUtil.getParentOfType(elementAt, PsiMember.class, false);
if (member instanceof PsiClass) {
boolean isFirstMember = true;
for (PsiElement e = member.getFirstChild(); e != null; e = e.getNextSibling()) {
if (e instanceof PsiMember) {
if (offset < e.getTextRange().getEndOffset()) {
if (!isFirstMember) {
member = (PsiMember)e;
}
break;
}
isFirstMember = false;
}
}
}
if (member != null) {
PsiElement navigationElement = member.getNavigationElement();
if (navigationElement.getContainingFile().getVirtualFile() == sourceFile) {
position = navigationElement.getTextOffset();
}
}
}
return Pair.create(sourceFile, position);
}
@Nullable
@@ -53,8 +100,6 @@ public class JavaEditorFileSwapper implements EditorFileSwapper {
if (!(psiFile instanceof PsiJavaFile)) return null;
PsiClass[] classes = ((PsiJavaFile)psiFile).getClasses();
if (classes.length == 0) return null;
final String fqn = classes[0].getQualifiedName();
if (fqn == null) return null;
return fqn;
return classes[0].getQualifiedName();
}
}