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-21113: Formatting for auto-generated CDATA section in mx:Script blocks

Browse Source
This commit is contained in:
Rustam.Vishnyakov
2010-08-05 12:10:30 +04:00
parent a3366f371c
commit b466cc4026
10 changed files with 91 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java
+8
View File
@@ -1095,6 +1095,11 @@ public class CodeStyleSettings implements Cloneable, JDOMExternalizable {
// ---------------------------------- XML formatting options -------------------------
public final static int WS_AROUND_CDATA_PRESERVE = 0;
public final static int WS_AROUND_CDATA_NONE = 1;
public final static int WS_AROUND_CDATA_NEW_LINES = 2;
public boolean XML_KEEP_WHITESPACES = false;
public int XML_ATTRIBUTE_WRAP = WRAP_AS_NEEDED;
public int XML_TEXT_WRAP = WRAP_AS_NEEDED;
@@ -1110,6 +1115,9 @@ public class CodeStyleSettings implements Cloneable, JDOMExternalizable {
public boolean XML_SPACE_AFTER_TAG_NAME = false;
public boolean XML_SPACE_INSIDE_EMPTY_TAG = false;
public boolean XML_KEEP_WHITE_SPACES_INSIDE_CDATA = false;
public int XML_WHITE_SPACE_AROUND_CDATA = WS_AROUND_CDATA_PRESERVE;
// ---------------------------------------------------------------------------------------
// ---------------------------------- HTML formatting options -------------------------
xml/impl/src/com/intellij/psi/formatter/xml/AbstractSyntheticBlock.java
+5
View File
@@ -198,6 +198,11 @@ public abstract class AbstractSyntheticBlock implements Block {
return node != null && node.getElementType() == XmlElementType.XML_CDATA;
}
public boolean containsCDATA() {
return myStartTreeNode.getElementType() == XmlElementType.XML_CDATA_START &&
myEndTreeNode.getElementType() == XmlElementType.XML_CDATA_END;
}
public boolean endsWithCDATA() {
return isCDATA(myStartTreeNode.getLastChildNode());
}
xml/impl/src/com/intellij/psi/formatter/xml/AbstractXmlBlock.java
+9
View File
@@ -414,4 +414,13 @@ public abstract class AbstractXmlBlock extends AbstractBlock {
return false;
}
public boolean isCDATAStart() {
return myNode.getElementType() == XmlElementType.XML_CDATA_START;
}
public boolean isCDATAEnd() {
return myNode.getElementType() == XmlElementType.XML_CDATA_END;
}
}
xml/impl/src/com/intellij/psi/formatter/xml/HtmlPolicy.java
+10
View File
@@ -211,6 +211,16 @@ public class HtmlPolicy extends XmlFormattingPolicy {
return mySettings.HTML_KEEP_LINE_BREAKS_IN_TEXT;
}
@Override
public boolean getKeepWhiteSpacesInsideCDATA() {
return true;
}
@Override
public int getWhiteSpaceAroundCDATAOption() {
return CodeStyleSettings.WS_AROUND_CDATA_PRESERVE;
}
public CodeStyleSettings getSettings() {
return mySettings;
}
xml/impl/src/com/intellij/psi/formatter/xml/SyntheticBlock.java
+13
View File
@@ -62,6 +62,19 @@ public class SyntheticBlock extends AbstractSyntheticBlock implements Block, Rea
boolean firstIsText = isTextFragment(node1);
boolean secondIsText = isTextFragment(node2);
if (type1 == XmlElementType.XML_CDATA_START || type2 == XmlElementType.XML_CDATA_END) {
if (myXmlFormattingPolicy.getKeepWhiteSpacesInsideCDATA()) {
return Spacing.getReadOnlySpacing();
}
if (type1 == XmlElementType.XML_CDATA_START && type2 == XmlElementType.XML_CDATA_END) {
return Spacing.createSpacing(0, 0, 0, myXmlFormattingPolicy.getShouldKeepLineBreaks(), 0);
}
if (type1 == XmlElementType.XML_CDATA_START && child2 instanceof AnotherLanguageBlockWrapper ||
type2 == XmlElementType.XML_CDATA_END && child1 instanceof AnotherLanguageBlockWrapper) {
return Spacing.createSpacing(0, 0, 1, myXmlFormattingPolicy.getShouldKeepLineBreaks(), 0);
}
}
boolean firstIsTag = node1.getPsi() instanceof XmlTag && !firstIsText;
boolean secondIsTag = node2.getPsi() instanceof XmlTag && !secondIsText;
xml/impl/src/com/intellij/psi/formatter/xml/XmlBlock.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class XmlBlock extends AbstractXmlBlock {
@NotNull
public TextRange getTextRange() {
if (myTextRange != null) {
if (myTextRange != null && !(isCDATAStart() || isCDATAEnd())) {
return myTextRange;
}
else {
xml/impl/src/com/intellij/psi/formatter/xml/XmlFormattingPolicy.java
+4
View File
@@ -115,6 +115,10 @@ public abstract class XmlFormattingPolicy {
public abstract boolean getShouldKeepLineBreaksInText();
public abstract boolean getKeepWhiteSpacesInsideCDATA();
public abstract int getWhiteSpaceAroundCDATAOption();
public abstract CodeStyleSettings getSettings();
public boolean processJsp() {
xml/impl/src/com/intellij/psi/formatter/xml/XmlPolicy.java
+10
View File
@@ -102,6 +102,16 @@ public class XmlPolicy extends XmlFormattingPolicy{
return mySettings.XML_KEEP_LINE_BREAKS_IN_TEXT;
}
@Override
public boolean getKeepWhiteSpacesInsideCDATA() {
return mySettings.XML_KEEP_WHITE_SPACES_INSIDE_CDATA;
}
@Override
public int getWhiteSpaceAroundCDATAOption() {
return mySettings.XML_WHITE_SPACE_AROUND_CDATA;
}
public CodeStyleSettings getSettings() {
return mySettings;
}
xml/impl/src/com/intellij/psi/formatter/xml/XmlTagBlock.java
+19
View File
@@ -18,6 +18,7 @@ package com.intellij.psi.formatter.xml;
import com.intellij.formatting.*;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElement;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.formatter.FormatterUtil;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.xml.XmlElementType;
@@ -206,6 +207,24 @@ public class XmlTagBlock extends AbstractXmlBlock{
return Spacing.getReadOnlySpacing();
}
if (syntheticBlock1.containsCDATA() && syntheticBlock2.isTagDescription()
|| syntheticBlock1.isTagDescription() && syntheticBlock2.containsCDATA()) {
int lineFeeds = 0;
switch(myXmlFormattingPolicy.getWhiteSpaceAroundCDATAOption()) {
case CodeStyleSettings.WS_AROUND_CDATA_NONE:
break;
case CodeStyleSettings.WS_AROUND_CDATA_NEW_LINES:
lineFeeds = 1;
break;
case CodeStyleSettings.WS_AROUND_CDATA_PRESERVE:
return Spacing.getReadOnlySpacing();
default:
assert false : "Unexpected whitespace around CDATA code style option.";
}
return Spacing.createSpacing(0, 0, lineFeeds, myXmlFormattingPolicy.getShouldKeepLineBreaks(),
myXmlFormattingPolicy.getKeepBlankLines());
}
if (syntheticBlock2.isJspTextBlock() || syntheticBlock1.isJspTextBlock()) {
return Spacing.createSafeSpacing(myXmlFormattingPolicy.getShouldKeepLineBreaks(), myXmlFormattingPolicy.getKeepBlankLines());
}
xml/impl/src/com/intellij/psi/impl/source/xml/XmlTextImpl.java
+12 -4
View File
@@ -366,15 +366,23 @@ public class XmlTextImpl extends XmlElementImpl implements XmlText, PsiLanguageI
public TextRange getCDATAInterior() {
PsiElement[] elements = getChildren();
int start = 0;
if (elements.length != 0 && elements[0].getNode().getElementType() == XmlElementType.XML_CDATA) {
ASTNode startNode = elements[0].getNode().findChildByType(XmlTokenType.XML_CDATA_START);
int first = 0;
if (elements.length > 0 && elements[0] instanceof PsiWhiteSpace) {
first ++;
}
if (elements.length > first && elements[first].getNode().getElementType() == XmlElementType.XML_CDATA) {
ASTNode startNode = elements[first].getNode().findChildByType(XmlTokenType.XML_CDATA_START);
if (startNode != null) {
start = startNode.getTextRange().getEndOffset() - getTextRange().getStartOffset();
}
}
int end = getTextLength();
if (elements.length != 0 && elements[elements.length-1].getNode().getElementType() == XmlElementType.XML_CDATA) {
ASTNode startNode = elements[elements.length-1].getNode().findChildByType(XmlTokenType.XML_CDATA_END);
int last = elements.length - 1;
if (last > 0 && elements[last] instanceof PsiWhiteSpace) {
last --;
}
if (last >= 0 && elements[last].getNode().getElementType() == XmlElementType.XML_CDATA) {
ASTNode startNode = elements[last].getNode().findChildByType(XmlTokenType.XML_CDATA_END);
if (startNode != null) {
end = startNode.getTextRange().getStartOffset() - getTextRange().getStartOffset();
}