don't use property foldings if user unset collapse by default

This commit is contained in:
Konstantin Bulenkov
2009-10-08 20:38:20 +04:00
parent b0794da4f1
commit 4eddca275a
@@ -24,7 +24,7 @@ public class PropertyFoldingBuilder extends FoldingBuilderEx {
@NotNull
public FoldingDescriptor[] buildFoldRegions(@NotNull PsiElement element, @NotNull Document document, boolean quick) {
if (!(element instanceof PsiJavaFile) || quick) {
if (!(element instanceof PsiJavaFile) || quick || !isFoldingsOn()) {
return FoldingDescriptor.EMPTY;
}
final PsiJavaFile file = (PsiJavaFile) element;
@@ -46,6 +46,10 @@ public class PropertyFoldingBuilder extends FoldingBuilderEx {
return result.toArray(new FoldingDescriptor[result.size()]);
}
private static boolean isFoldingsOn() {
return JavaCodeFoldingSettings.getInstance().isCollapseI18nMessages();
}
private static void checkLiteral(PsiLiteralExpression expression, List<FoldingDescriptor> result) {
if (isI18nProperty(expression)) {
final String msg = getI18nMessage(expression);
@@ -147,7 +151,7 @@ public class PropertyFoldingBuilder extends FoldingBuilderEx {
}
public boolean isCollapsedByDefault(@NotNull ASTNode node) {
return JavaCodeFoldingSettings.getInstance().isCollapseI18nMessages();
return isFoldingsOn();
}