From 60b4dd470d70cbc0fb5cfc7a4eb466e11fa2b409 Mon Sep 17 00:00:00 2001 From: Alexander Zolotov Date: Mon, 27 Aug 2012 20:18:44 +0400 Subject: [PATCH] IDEA-90595 Android Designer: remove collapse for style attributes #IDEA-90595 fixed --- .../src/messages/ApplicationBundle.properties | 2 +- .../options/editor/XmlCodeFoldingOptionsProvider.java | 2 +- .../application/options/editor/XmlFoldingSettings.java | 10 +++++----- .../src/com/intellij/lang/xml/XmlFoldingBuilder.java | 9 +++++---- xml/tests/src/com/intellij/xml/XmlFoldingTest.java | 7 ++++++- xml/tests/testData/folding/styleAttributeFolding2.xml | 3 +++ 6 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 xml/tests/testData/folding/styleAttributeFolding2.xml diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties index 2d0ee4ea5971..53c1c55ecc12 100644 --- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties +++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties @@ -335,7 +335,7 @@ checkbox.caret.blinking.ms=Caret blinking (ms): checkbox.mark.modified.tabs.with.asterisk=Mark modified tabs with asterisk group.code.folding=Code Folding checkbox.collapse.xml.tags=XML tags -checkbox.collapse.xml.attributes=XML 'style' attribute +checkbox.collapse.html.style.attribute=HTML 'style' attribute checkbox.collapse.anonymous.classes=Anonymous classes checkbox.collapse.closures="Closures" (anonymous classes implementing one method) checkbox.collapse.generic.constructor.parameters=Generic constructor and method parameters diff --git a/xml/impl/src/com/intellij/application/options/editor/XmlCodeFoldingOptionsProvider.java b/xml/impl/src/com/intellij/application/options/editor/XmlCodeFoldingOptionsProvider.java index 5cc77a906d40..2c685dfa2faa 100644 --- a/xml/impl/src/com/intellij/application/options/editor/XmlCodeFoldingOptionsProvider.java +++ b/xml/impl/src/com/intellij/application/options/editor/XmlCodeFoldingOptionsProvider.java @@ -27,6 +27,6 @@ public class XmlCodeFoldingOptionsProvider extends BeanConfigurable> + +> \ No newline at end of file