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

folding: don't check for simple property accessor if both simple accessor and method foldings are off

Browse Source
This commit is contained in:
Anna Kozlova
2015-12-07 10:35:33 +01:00
parent e7f65a6e49
commit c9285488b7
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilderBase.java
+9 -2
View File
@@ -682,8 +682,15 @@ public abstract class JavaFoldingBuilderBase extends CustomFoldingBuilder implem
return settings.isCollapseImports();
}
else if (element instanceof PsiMethod || element instanceof PsiClassInitializer || element instanceof PsiCodeBlock) {
if (element instanceof PsiMethod && isSimplePropertyAccessor((PsiMethod)element)) {
return settings.isCollapseAccessors();
if (element instanceof PsiMethod) {
if (!settings.isCollapseAccessors() && !settings.isCollapseMethods()) {
return false;
}
if (isSimplePropertyAccessor((PsiMethod)element)) {
return settings.isCollapseAccessors();
}
}
return settings.isCollapseMethods();
}