From 8199382ac1b9952c69530ec3ffaf60d0200e381d Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Thu, 30 Nov 2017 22:55:34 +0300 Subject: [PATCH] cleanup: drop isAutoExpand() where not needed --- .../json/structureView/JsonStructureViewModel.java | 13 +------------ .../editor/ResourceBundleStructureViewModel.java | 13 +------------ .../com/jetbrains/rest/RestStructureViewTest.java | 6 +++++- .../rest/structureView/RestStructureViewModel.java | 12 +----------- .../python/structureView/PyStructureViewModel.java | 12 +----------- 5 files changed, 9 insertions(+), 47 deletions(-) diff --git a/json/src/com/intellij/json/structureView/JsonStructureViewModel.java b/json/src/com/intellij/json/structureView/JsonStructureViewModel.java index ea79fbd9cf39..a3bcf62b5fff 100644 --- a/json/src/com/intellij/json/structureView/JsonStructureViewModel.java +++ b/json/src/com/intellij/json/structureView/JsonStructureViewModel.java @@ -8,7 +8,6 @@ import com.intellij.json.psi.JsonArray; import com.intellij.json.psi.JsonFile; import com.intellij.json.psi.JsonObject; import com.intellij.json.psi.JsonProperty; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; @@ -17,7 +16,7 @@ import org.jetbrains.annotations.Nullable; /** * @author Mikhail Golubev */ -public class JsonStructureViewModel extends StructureViewModelBase implements StructureViewModel.ElementInfoProvider, StructureViewModel.ExpandInfoProvider{ +public class JsonStructureViewModel extends StructureViewModelBase implements StructureViewModel.ElementInfoProvider { public JsonStructureViewModel(@NotNull PsiFile psiFile, @Nullable Editor editor) { super(psiFile, editor, new JsonStructureViewElement((JsonFile)psiFile)); @@ -35,14 +34,4 @@ public class JsonStructureViewModel extends StructureViewModelBase implements St return false; } - @Override - public boolean isAutoExpand(@NotNull StructureViewTreeElement element) { - // TODO Actually root element for file won't be collapsed even without the following check. Find out how to fix it. - return element.getValue() instanceof PsiFile || ApplicationManager.getApplication().isUnitTestMode(); - } - - @Override - public boolean isSmartExpand() { - return false; - } } diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundleStructureViewModel.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundleStructureViewModel.java index ba6a85a1ee7f..efa65d476e90 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundleStructureViewModel.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundleStructureViewModel.java @@ -17,7 +17,6 @@ package com.intellij.lang.properties.editor; import com.intellij.ide.structureView.FileEditorPositionListener; import com.intellij.ide.structureView.ModelListener; -import com.intellij.ide.structureView.StructureViewModel; import com.intellij.ide.structureView.StructureViewTreeElement; import com.intellij.ide.util.treeView.smartTree.Filter; import com.intellij.ide.util.treeView.smartTree.Grouper; @@ -30,7 +29,7 @@ import org.jetbrains.annotations.NotNull; /** * @author max */ -public class ResourceBundleStructureViewModel implements PropertiesGroupingStructureViewModel, StructureViewModel.ExpandInfoProvider { +public class ResourceBundleStructureViewModel implements PropertiesGroupingStructureViewModel { private final ResourceBundle myResourceBundle; private final GroupByWordPrefixes myByWordPrefixesGrouper; private final ResourceBundleFileStructureViewElement myRoot; @@ -117,14 +116,4 @@ public class ResourceBundleStructureViewModel implements PropertiesGroupingStruc public boolean isAlwaysLeaf(final StructureViewTreeElement element) { return element instanceof ResourceBundlePropertyStructureViewElement; } - - @Override - public boolean isAutoExpand(@NotNull StructureViewTreeElement element) { - return getRoot() == element; - } - - @Override - public boolean isSmartExpand() { - return false; - } } diff --git a/python/python-rest/test/com/jetbrains/rest/RestStructureViewTest.java b/python/python-rest/test/com/jetbrains/rest/RestStructureViewTest.java index c58fd22e8f99..98aac43df584 100644 --- a/python/python-rest/test/com/jetbrains/rest/RestStructureViewTest.java +++ b/python/python-rest/test/com/jetbrains/rest/RestStructureViewTest.java @@ -15,6 +15,7 @@ */ package com.jetbrains.rest; +import com.intellij.util.ui.tree.TreeUtil; import com.jetbrains.rest.fixtures.RestFixtureTestCase; import static com.intellij.testFramework.PlatformTestUtil.assertTreeEqual; @@ -58,6 +59,9 @@ public class RestStructureViewTest extends RestFixtureTestCase { private void doTest(final String expected) { myFixture.configureByFile("/structureView/" + getTestName(true) + ".rst"); - myFixture.testStructureView(svc -> assertTreeEqual(svc.getTree(), expected)); + myFixture.testStructureView(svc -> { + TreeUtil.expandAll(svc.getTree()); + assertTreeEqual(svc.getTree(), expected); + }); } } diff --git a/python/rest/src/com/jetbrains/rest/structureView/RestStructureViewModel.java b/python/rest/src/com/jetbrains/rest/structureView/RestStructureViewModel.java index c2d77ee7df18..e70b01eb5c42 100644 --- a/python/rest/src/com/jetbrains/rest/structureView/RestStructureViewModel.java +++ b/python/rest/src/com/jetbrains/rest/structureView/RestStructureViewModel.java @@ -19,7 +19,6 @@ import com.intellij.ide.structureView.StructureViewModel; import com.intellij.ide.structureView.StructureViewModelBase; import com.intellij.ide.structureView.StructureViewTreeElement; import com.intellij.ide.util.treeView.smartTree.Sorter; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiFile; import com.jetbrains.rest.RestFile; @@ -30,7 +29,7 @@ import org.jetbrains.annotations.Nullable; /** * User : catherine */ -public class RestStructureViewModel extends StructureViewModelBase implements StructureViewModel.ElementInfoProvider, StructureViewModel.ExpandInfoProvider { +public class RestStructureViewModel extends StructureViewModelBase implements StructureViewModel.ElementInfoProvider { public RestStructureViewModel(@NotNull PsiFile psiFile, @Nullable Editor editor) { super(psiFile, editor, new RestStructureViewElement(psiFile)); withSorters(Sorter.ALPHA_SORTER); @@ -48,13 +47,4 @@ public class RestStructureViewModel extends StructureViewModelBase implements St return element.getChildren().length == 0; } - @Override - public boolean isAutoExpand(@NotNull StructureViewTreeElement element) { - return element.getValue() instanceof PsiFile || ApplicationManager.getApplication().isUnitTestMode(); - } - - @Override - public boolean isSmartExpand() { - return false; - } } diff --git a/python/src/com/jetbrains/python/structureView/PyStructureViewModel.java b/python/src/com/jetbrains/python/structureView/PyStructureViewModel.java index 3e8e4f177568..1ecb8f5d3057 100644 --- a/python/src/com/jetbrains/python/structureView/PyStructureViewModel.java +++ b/python/src/com/jetbrains/python/structureView/PyStructureViewModel.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.Nullable; /** * @author yole */ -public class PyStructureViewModel extends StructureViewModelBase implements StructureViewModel.ElementInfoProvider, StructureViewModel.ExpandInfoProvider { +public class PyStructureViewModel extends StructureViewModelBase implements StructureViewModel.ElementInfoProvider { public PyStructureViewModel(@NotNull PsiFile psiFile, @Nullable Editor editor) { this(psiFile, editor, new PyStructureViewElement((PyElement) psiFile)); withSorters(Sorter.ALPHA_SORTER); @@ -64,14 +64,4 @@ public class PyStructureViewModel extends StructureViewModelBase implements Stru new PyFieldsFilter(), }; } - - @Override - public boolean isAutoExpand(@NotNull StructureViewTreeElement element) { - return element.getValue() instanceof PsiFile; - } - - @Override - public boolean isSmartExpand() { - return false; - } }