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-178621 Join lines works incorrectly for HTML text

Browse Source
This commit is contained in:
Dmitry Batrak
2017-09-11 15:18:55 +03:00
parent 3a8ba36954
commit cfd73481cc
2 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/psi/formatter/xml/SyntheticBlock.java
+6 -1
View File
@@ -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());
}
xml/tests/src/com/intellij/editor/XmlJoinLinesTest.java
+33
View File
@@ -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",
"<body>\n" +
" a<caret>b\n" +
" cd\n" +
"</body>");
executeAction(IdeActions.ACTION_EDITOR_JOIN_LINES);
checkResultByText("<body>\n" +
" ab cd\n" +
"</body>");
}
}