diff --git a/xml/impl/src/com/intellij/psi/formatter/xml/SyntheticBlock.java b/xml/impl/src/com/intellij/psi/formatter/xml/SyntheticBlock.java index 967a324513fe..47eaa79f21e4 100644 --- a/xml/impl/src/com/intellij/psi/formatter/xml/SyntheticBlock.java +++ b/xml/impl/src/com/intellij/psi/formatter/xml/SyntheticBlock.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -146,6 +146,11 @@ public class SyntheticBlock extends AbstractSyntheticBlock implements Block, Rea return Spacing.createSpacing(1, 1, 0, myXmlFormattingPolicy.getShouldKeepLineBreaks(), myXmlFormattingPolicy.getKeepBlankLines()); } + if (type1 == XmlTokenType.XML_DATA_CHARACTERS && type2 == XmlTokenType.XML_DATA_CHARACTERS) { + return Spacing.createSpacing(1, 1, 0, + myXmlFormattingPolicy.getShouldKeepLineBreaksInText(), myXmlFormattingPolicy.getKeepBlankLines()); + } + if (((AbstractXmlBlock)child1).isTextElement() && ((AbstractXmlBlock)child2).isTextElement()) { return Spacing.createSafeSpacing(myXmlFormattingPolicy.getShouldKeepLineBreaksInText(), myXmlFormattingPolicy.getKeepBlankLines()); } diff --git a/xml/tests/src/com/intellij/editor/XmlJoinLinesTest.java b/xml/tests/src/com/intellij/editor/XmlJoinLinesTest.java new file mode 100644 index 000000000000..b4eab14021c4 --- /dev/null +++ b/xml/tests/src/com/intellij/editor/XmlJoinLinesTest.java @@ -0,0 +1,33 @@ +/* + * Copyright 2000-2017 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.editor; + +import com.intellij.openapi.actionSystem.IdeActions; +import com.intellij.testFramework.LightCodeInsightTestCase; + +public class XmlJoinLinesTest extends LightCodeInsightTestCase { + public void testJoiningText() { + configureFromFileText(getTestName(true) + ".xml", + "\n" + + " ab\n" + + " cd\n" + + ""); + executeAction(IdeActions.ACTION_EDITOR_JOIN_LINES); + checkResultByText("\n" + + " ab cd\n" + + ""); + } +}