diff options
Diffstat (limited to 'xml/relaxng/src/org')
| -rw-r--r-- | xml/relaxng/src/org/intellij/html/RelaxedHtmlFromRngElementDescriptor.java | 3 | ||||
| -rw-r--r-- | xml/relaxng/src/org/intellij/plugins/relaxNG/convert/ConvertSchemaSettingsImpl.java | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/xml/relaxng/src/org/intellij/html/RelaxedHtmlFromRngElementDescriptor.java b/xml/relaxng/src/org/intellij/html/RelaxedHtmlFromRngElementDescriptor.java index 08ada22129d9..b287e6b50777 100644 --- a/xml/relaxng/src/org/intellij/html/RelaxedHtmlFromRngElementDescriptor.java +++ b/xml/relaxng/src/org/intellij/html/RelaxedHtmlFromRngElementDescriptor.java @@ -69,6 +69,9 @@ public class RelaxedHtmlFromRngElementDescriptor implements XmlElementDescriptor @Override public XmlAttributeDescriptor getAttributeDescriptor(XmlAttribute attribute) { + XmlAttributeDescriptor descriptor = myDelegate.getAttributeDescriptor(attribute); + if (descriptor != null) return descriptor; + return getAttributeDescriptor(attribute.getName(), attribute.getParent()); } diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/ConvertSchemaSettingsImpl.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/ConvertSchemaSettingsImpl.java index 56fe4c92f733..3161c522b586 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/ConvertSchemaSettingsImpl.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/ConvertSchemaSettingsImpl.java @@ -131,7 +131,7 @@ public class ConvertSchemaSettingsImpl implements ConvertSchemaSettings { final int indent = styleSettings.getIndentSize(type); myIndent.setText(String.valueOf(indent)); - myLineLength.setText(String.valueOf(styleSettings.RIGHT_MARGIN)); + myLineLength.setText(String.valueOf(styleSettings.getDefaultRightMargin())); final SchemaType outputType = getOutputType(); myLineLength.setEnabled(outputType == SchemaType.DTD || outputType == SchemaType.RNC); |