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

Merge branch 'master' of git.labs.intellij.net:idea/community

Browse Source
This commit is contained in:
Rustam.Vishnyakov
2010-03-03 19:00:34 +03:00
parent 90ad3331e6 73aefce3b8
commit 6979b6a1fa
8 changed files with 76 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java
+34 -10
View File
@@ -43,7 +43,6 @@ import com.intellij.openapi.wm.ToolWindowId;
import com.intellij.openapi.wm.ToolWindowManager;
import com.intellij.openapi.wm.ex.IdeFocusTraversalPolicy;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.util.Alarm;
import com.intellij.util.ui.UIUtil;
import com.intellij.util.ui.update.MergingUpdateQueue;
import com.intellij.util.ui.update.Update;
@@ -74,6 +73,8 @@ public class StructureViewWrapperImpl implements StructureViewWrapper, Disposabl
// Constructor
// -------------------------------------------------------------------------
private Runnable myPendingSelection;
public StructureViewWrapperImpl(Project project) {
myProject = project;
myPanel = new ContentPanel();
@@ -140,17 +141,34 @@ public class StructureViewWrapperImpl implements StructureViewWrapper, Disposabl
rebuild();
}
public boolean selectCurrentElement(FileEditor fileEditor, VirtualFile file, boolean requestFocus) {
if (myStructureView != null) {
if (!Comparing.equal(myStructureView.getFileEditor(), fileEditor)) {
myFile = file;
rebuild();
public boolean selectCurrentElement(final FileEditor fileEditor, final VirtualFile file, final boolean requestFocus) {
//todo [kirillk]
// this is dirty hack since some bright minds decided to used different TreeUi every time, so selection may be followed
// by rebuild on completely different instance of TreeUi
Runnable runnable = new Runnable() {
public void run() {
if (myStructureView != null) {
if (!Comparing.equal(myStructureView.getFileEditor(), fileEditor)) {
myFile = file;
rebuild();
}
myStructureView.navigateToSelectedElement(requestFocus);
}
}
return myStructureView.navigateToSelectedElement(requestFocus);
}
else {
return false;
};
if (isStructureViewShowing()) {
if (myUpdateQueue.isEmpty()) {
runnable.run();
} else {
myPendingSelection = runnable;
}
} else {
myPendingSelection = runnable;
}
return true;
}
private void scheduleRebuild() {
@@ -243,6 +261,12 @@ public class StructureViewWrapperImpl implements StructureViewWrapper, Disposabl
myPanel.validate();
myPanel.repaint();
if (myPendingSelection != null) {
Runnable selection = myPendingSelection;
myPendingSelection = null;
selection.run();
}
}
@Nullable
platform/lang-impl/src/com/intellij/ide/structureView/impl/StructureViewComposite.java
+1
View File
@@ -114,4 +114,5 @@ public class StructureViewComposite implements StructureView {
public StructureViewModel getTreeModel() {
return getSelectedStructureView().getTreeModel();
}
}
platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java
+30 -51
View File
@@ -24,7 +24,6 @@ import com.intellij.ide.structureView.*;
import com.intellij.ide.structureView.impl.StructureViewFactoryImpl;
import com.intellij.ide.structureView.impl.StructureViewState;
import com.intellij.ide.structureView.impl.common.PsiTreeElementBase;
import com.intellij.ide.ui.customization.CustomActionsSchema;
import com.intellij.ide.ui.customization.CustomizationUtil;
import com.intellij.ide.util.treeView.*;
import com.intellij.ide.util.treeView.smartTree.*;
@@ -37,10 +36,8 @@ import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.SimpleToolWindowPanel;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.ModificationTracker;
import com.intellij.openapi.util.*;
import com.intellij.openapi.wm.IdeFocusManager;
import com.intellij.pom.Navigatable;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiElement;
@@ -402,59 +399,40 @@ public class StructureViewComponent extends SimpleToolWindowPanel implements Tre
return myFileEditor;
}
public DefaultMutableTreeNode expandPathToElement(Object element) {
if (myAbstractTreeBuilder == null) return null;
public AsyncResult<AbstractTreeNode> expandPathToElement(Object element) {
if (myAbstractTreeBuilder == null) return new AsyncResult.Rejected<AbstractTreeNode>();
ArrayList<AbstractTreeNode> pathToElement = getPathToElement(element);
if (pathToElement.isEmpty()) return new AsyncResult.Rejected<AbstractTreeNode>();
if (pathToElement.isEmpty()) return null;
final AsyncResult<AbstractTreeNode> result = new AsyncResult<AbstractTreeNode>();
final AbstractTreeNode toExpand = pathToElement.get(pathToElement.size() - 1);
myAbstractTreeBuilder.expand(toExpand, new Runnable() {
public void run() {
result.setDone(toExpand);
}
});
JTree tree = myAbstractTreeBuilder.getTree();
if (pathToElement.size() == 1) {
return (DefaultMutableTreeNode)tree.getModel().getRoot();
}
DefaultMutableTreeNode currentTreeNode = (DefaultMutableTreeNode)tree.getModel().getRoot();
pathToElement.remove(0);
DefaultMutableTreeNode result = null;
while (currentTreeNode != null) {
AbstractTreeNode topPathElement;
if (!pathToElement.isEmpty()) {
topPathElement = pathToElement.get(0);
pathToElement.remove(0);
}
else {
topPathElement = null;
}
TreePath treePath = new TreePath(currentTreeNode.getPath());
if (!tree.isExpanded(treePath)) {
tree.expandPath(treePath);
}
if (topPathElement != null) {
currentTreeNode = findInChildren(currentTreeNode, topPathElement);
result = currentTreeNode;
}
else {
currentTreeNode = null;
}
}
return result;
}
public boolean select(Object element, boolean requestFocus) {
DefaultMutableTreeNode currentTreeNode = expandPathToElement(element);
if (currentTreeNode != null) {
TreeUtil.selectInTree(currentTreeNode, requestFocus, getTree());
myAutoScrollToSourceHandler.setShouldAutoScroll(false);
TreePath path = new TreePath(currentTreeNode.getPath());
TreeUtil.showRowCentered(getTree(), getTree().getRowForPath(path), false);
myAutoScrollToSourceHandler.setShouldAutoScroll(true);
centerSelectedRow();
return true;
}
return false;
public boolean select(final Object element, final boolean requestFocus) {
myAbstractTreeBuilder.getReady(this).doWhenDone(new Runnable() {
public void run() {
expandPathToElement(element).doWhenDone(new AsyncResult.Handler<AbstractTreeNode>() {
public void run(AbstractTreeNode abstractTreeNode) {
myAbstractTreeBuilder.select(abstractTreeNode, new Runnable() {
public void run() {
if (requestFocus) {
IdeFocusManager.getInstance(myProject).requestFocus(myAbstractTreeBuilder.getTree(), false);
}
}
});
}
});
}
});
return true;
}
private ArrayList<AbstractTreeNode> getPathToElement(Object element) {
@@ -826,4 +804,5 @@ public class StructureViewComponent extends SimpleToolWindowPanel implements Tre
public String getHelpID() {
return ourHelpID;
}
}
platform/lang-impl/src/com/intellij/openapi/paths/GlobalPathReferenceProvider.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class GlobalPathReferenceProvider implements PathReferenceProvider {
}
final TextRange range = manipulator.getRangeInElement(psiElement);
final String s = range.substring(psiElement.getText());
if (s.contains("://") || s.startsWith(MAILTO_PREFIX)) {
if (s.contains("://") || s.startsWith(MAILTO_PREFIX) || s.startsWith("//")) {
final PsiReference reference = PsiReferenceBase.createSelfReference(psiElement, psiElement);
references.add(reference);
return true;
platform/platform-api/src/com/intellij/ide/structureView/StructureView.java
+1
View File
@@ -17,6 +17,7 @@ package com.intellij.ide.structureView;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.util.ActionCallback;
import javax.swing.*;
platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java
+2 -1
View File
@@ -1562,7 +1562,8 @@ public class AbstractTreeUi {
}
if (myInitialized.isDone()) {
for (ActionCallback each : getReadyCallbacks(true)) {
ActionCallback[] ready = getReadyCallbacks(true);
for (ActionCallback each : ready) {
each.setDone();
}
}
platform/platform-api/src/com/intellij/util/ui/update/MergingUpdateQueue.java
+4
View File
@@ -117,6 +117,9 @@ public class MergingUpdateQueue implements Runnable, Disposable, Activatable {
public void cancelAllUpdates() {
synchronized (myScheduledUpdates) {
for (Update each : myScheduledUpdates.keySet()) {
each.setRejected();
}
myScheduledUpdates.clear();
}
}
@@ -317,6 +320,7 @@ public class MergingUpdateQueue implements Runnable, Disposable, Activatable {
}
if (update.canEat(eachInQueue)) {
myScheduledUpdates.remove(eachInQueue);
eachInQueue.setRejected();
}
}
return false;
xml/dom-impl/src/com/intellij/util/xml/structure/DomStructureViewBuilder.java
+3 -3
View File
@@ -20,8 +20,10 @@ import com.intellij.ide.structureView.StructureView;
import com.intellij.ide.structureView.StructureViewModel;
import com.intellij.ide.structureView.TreeBasedStructureViewBuilder;
import com.intellij.ide.structureView.newStructureView.StructureViewComponent;
import com.intellij.ide.util.treeView.AbstractTreeNode;
import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.AsyncResult;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.xml.XmlElement;
import com.intellij.psi.xml.XmlTag;
@@ -32,8 +34,6 @@ import com.intellij.util.xml.DomManager;
import com.intellij.util.xml.DomService;
import org.jetbrains.annotations.NotNull;
import javax.swing.tree.DefaultMutableTreeNode;
public class DomStructureViewBuilder extends TreeBasedStructureViewBuilder {
private final Function<DomElement, DomService.StructureViewMode> myDescriptor;
private final XmlFile myFile;
@@ -55,7 +55,7 @@ public class DomStructureViewBuilder extends TreeBasedStructureViewBuilder {
@NotNull
public StructureView createStructureView(final FileEditor fileEditor, final Project project) {
return new StructureViewComponent(fileEditor, createStructureViewModel(), project) {
public DefaultMutableTreeNode expandPathToElement(final Object element) {
public AsyncResult<AbstractTreeNode> expandPathToElement(final Object element) {
if (element instanceof XmlElement) {
final XmlElement xmlElement = (XmlElement)element;
XmlTag tag = PsiTreeUtil.getParentOfType(xmlElement, XmlTag.class, false);