From c9285488b75a71e4fc814654fee5b96b645091b7 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 4 Dec 2015 11:49:33 +0100
Subject: [PATCH] folding: don't check for simple property accessor if both
 simple accessor and method foldings are off

---
 .../folding/impl/JavaFoldingBuilderBase.java          | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilderBase.java b/java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilderBase.java
index 8d54f2b952fe..8800579563e2 100644
--- a/java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilderBase.java
+++ b/java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilderBase.java
@@ -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();
     }