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

cleanup: drop isAutoExpand() where not needed

Browse Source
This commit is contained in:
Gregory.Shrago
2017-12-01 00:31:10 +03:00
parent 0b68820c1e
commit 8199382ac1
5 changed files with 9 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/src/com/intellij/json/structureView/JsonStructureViewModel.java
+1 -12
View File
@@ -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;
}
}
plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundleStructureViewModel.java
+1 -12
View File
@@ -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;
}
}
python/python-rest/test/com/jetbrains/rest/RestStructureViewTest.java
+5 -1
View File
@@ -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);
});
}
}
python/rest/src/com/jetbrains/rest/structureView/RestStructureViewModel.java
+1 -11
View File
@@ -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;
}
}
python/src/com/jetbrains/python/structureView/PyStructureViewModel.java
+1 -11
View File
@@ -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;
}
}