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

IDEA-89620 Collapse inline CSS: add option to disable

Browse Source 
#IDEA-89620 fixed
This commit is contained in:
Alexander Zolotov
2012-08-02 15:57:42 +04:00
parent 3385e4a6b4
commit 6927d100f9
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources-en/src/messages/ApplicationBundle.properties
+1
View File
@@ -335,6 +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.anonymous.classes=<html>Anonymous classes</html>
checkbox.collapse.closures=<html>"Closures" (anonymous classes implementing one method)</html>
checkbox.collapse.generic.constructor.parameters=<html>Generic constructor and method parameters</html>
xml/impl/src/com/intellij/application/options/editor/XmlCodeFoldingOptionsProvider.java
+1
View File
@@ -27,5 +27,6 @@ public class XmlCodeFoldingOptionsProvider extends BeanConfigurable<XmlFoldingSe
public XmlCodeFoldingOptionsProvider() {
super(XmlFoldingSettings.getInstance());
checkBox("COLLAPSE_XML_TAGS", ApplicationBundle.message("checkbox.collapse.xml.tags"));
checkBox("COLLAPSE_XML_ATTRIBUTES", ApplicationBundle.message("checkbox.collapse.xml.attributes"));
}
}
xml/impl/src/com/intellij/application/options/editor/XmlFoldingSettings.java
+9
View File
@@ -46,7 +46,16 @@ public class XmlFoldingSettings implements PersistentStateComponent<XmlFoldingSe
COLLAPSE_XML_TAGS = value;
}
public boolean isCollapseXmlAttributes() {
return COLLAPSE_XML_ATTRIBUTES;
}
public void setCollapseStyleAttribute(boolean value) {
this.COLLAPSE_XML_ATTRIBUTES = value;
}
@SuppressWarnings({"WeakerAccess"}) public boolean COLLAPSE_XML_TAGS = false;
@SuppressWarnings({"WeakerAccess"}) public boolean COLLAPSE_XML_ATTRIBUTES = true;
@NotNull
public File[] getExportFiles() {
xml/impl/src/com/intellij/lang/xml/XmlFoldingBuilder.java
+3 -2
View File
@@ -230,8 +230,9 @@ public class XmlFoldingBuilder implements FoldingBuilder, DumbAware {
public boolean isCollapsedByDefault(@NotNull ASTNode node) {
final PsiElement psi = node.getPsi();
return psi instanceof XmlTag && XmlFoldingSettings.getInstance().isCollapseXmlTags()
|| psi instanceof XmlAttribute;
final XmlFoldingSettings foldingSettings = XmlFoldingSettings.getInstance();
return (psi instanceof XmlTag && foldingSettings.isCollapseXmlTags())
|| (psi instanceof XmlAttribute && foldingSettings.isCollapseXmlAttributes());
}
private static boolean isAttributeShouldBeFolded(XmlAttribute child) {