MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-181529 remove redundant code and simplify MySelectInContext

Browse Source
This commit is contained in:
Sergey Malenkov
2018-03-07 20:10:54 +03:00
parent 3856b513ff
commit 8e7e6dad7c
1 changed files with 17 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
+17 -37
View File
@@ -1845,41 +1845,26 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo
selectElementAtCaretNotLosingFocus(editor);
}
else {
SelectInTarget target = getCurrentSelectInTarget();
if (target != null) {
PsiFile psiFile = getPsiFile(getVirtualFile(fileEditor));
if (psiFile != null) {
MySelectInContext selectInContext = new MySelectInContext(psiFile, null);
if (selectInContext.getPsiFile() != null && target.canSelect(selectInContext)) {
target.selectIn(selectInContext, false);
}
}
PsiFile psiFile = getPsiFile(getVirtualFile(fileEditor));
if (psiFile != null) {
new MySelectInContext(psiFile, null).selectInCurrentTarget();
}
}
}
}
public void scrollFromSource() {
final FileEditorManager fileEditorManager = FileEditorManager.getInstance(myProject);
final Editor selectedTextEditor = fileEditorManager.getSelectedTextEditor();
if (selectedTextEditor != null) {
selectElementAtCaret(selectedTextEditor);
return;
}
final FileEditor[] editors = fileEditorManager.getSelectedEditors();
for (FileEditor fileEditor : editors) {
for (FileEditor fileEditor : FileEditorManager.getInstance(myProject).getSelectedEditors()) {
if (fileEditor instanceof TextEditor) {
Editor editor = ((TextEditor)fileEditor).getEditor();
selectElementAtCaret(editor);
return;
}
VirtualFile file = getVirtualFile(fileEditor);
if (scrollFromFile(file)) return;
}
final VirtualFile[] selectedFiles = fileEditorManager.getSelectedFiles();
for (VirtualFile file : selectedFiles) {
if (scrollFromFile(file)) return;
PsiFile psiFile = getPsiFile(getVirtualFile(fileEditor));
if (psiFile != null) {
scrollFromFile(psiFile, null);
return;
}
}
}
@@ -1905,21 +1890,9 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo
scrollFromFile(file, editor);
}
private boolean scrollFromFile(@Nullable VirtualFile file) {
PsiFile psiFile = getPsiFile(file);
if (psiFile == null) return false;
scrollFromFile(psiFile, null);
return true;
}
private void scrollFromFile(@NotNull PsiFile file, @Nullable Editor editor) {
MySelectInContext selectInContext = new MySelectInContext(file, editor);
PsiDocumentManager.getInstance(myProject).performLaterWhenAllCommitted(() -> {
SelectInTarget target = getCurrentSelectInTarget();
if (target != null && selectInContext.getPsiFile() != null && target.canSelect(selectInContext)) {
target.selectIn(selectInContext, false);
}
});
PsiDocumentManager.getInstance(myProject).performLaterWhenAllCommitted(selectInContext::selectInCurrentTarget);
}
@Override
@@ -1970,6 +1943,13 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo
}
return file;
}
void selectInCurrentTarget() {
SelectInTarget target = getCurrentSelectInTarget();
if (target != null && getPsiFile() != null && target.canSelect(this)) {
target.selectIn(this, false);
}
}
}
}