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-119366 Reformatting only VCS changed code produces unwanted side-effect [CR-IC-4175]

Browse Source
This commit is contained in:
Yaroslav Lepenkin
2014-01-30 17:30:25 +04:00
parent fe79cc47a7
commit 154bc88efc
2 changed files with 63 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterTest.java
+32
View File
@@ -3016,4 +3016,36 @@ public void testSCR260() throws Exception {
settings.FORMATTER_ON_TAG = "end.*fragment";
doTest();
}
public void testDoNotIndentNotSelectedStatement_AfterSelectedOne() {
myTextRange = new TextRange(0, 73);
doTextTest(
"class Test {\n" +
" public static void main(String[] args) {\n" +
" int a = 3;\n" +
" System.out.println(\"AAA\");\n" +
" }\n" +
"}",
"class Test {\n" +
" public static void main(String[] args) {\n" +
" int a = 3;\n" +
" System.out.println(\"AAA\");\n" +
" }\n" +
"}"
);
myTextRange = new TextRange(0, 67);
doTextTest(
" import java.lang.Override;\n" +
" import java.lang.Exception;\n" +
" \n" +
" class Foo {\n" +
"}",
"import java.lang.Override;\n" +
"import java.lang.Exception;\n" +
" \n" +
" class Foo {\n" +
"}"
);
}
}
platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java
+31 -2
View File
@@ -34,6 +34,7 @@ import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
import com.intellij.psi.codeStyle.Indent;
import com.intellij.psi.formatter.FormatterUtil;
import com.intellij.psi.impl.CheckUtil;
import com.intellij.psi.impl.source.PostprocessReformattingAspect;
import com.intellij.psi.impl.source.SourceTreeToPsiMap;
@@ -191,9 +192,13 @@ public class CodeStyleManagerImpl extends CodeStyleManager {
caretKeeper = new CaretPositionKeeper(editor);
}
Collection<TextRange> correctedRanges = FormatterUtil.isFormatterCalledExplicitly()
? removeEndingWhiteSpaceFromEachRange(file, ranges)
: ranges;
final SmartPointerManager smartPointerManager = SmartPointerManager.getInstance(getProject());
List<RangeFormatInfo> infos = new ArrayList<RangeFormatInfo>();
for (TextRange range : ranges) {
for (TextRange range : correctedRanges) {
final PsiElement start = findElementInTreeWithFormatterEnabled(file, range.getStartOffset());
final PsiElement end = findElementInTreeWithFormatterEnabled(file, range.getEndOffset());
if (start != null && !start.isValid()) {
@@ -213,7 +218,7 @@ public class CodeStyleManagerImpl extends CodeStyleManager {
}
FormatTextRanges formatRanges = new FormatTextRanges();
for (TextRange range : ranges) {
for (TextRange range : correctedRanges) {
formatRanges.add(range, true);
}
codeFormatter.processText(file, formatRanges, true);
@@ -233,6 +238,30 @@ public class CodeStyleManagerImpl extends CodeStyleManager {
}
}
@NotNull
private Collection<TextRange> removeEndingWhiteSpaceFromEachRange(@NotNull PsiFile file, @NotNull Collection<TextRange> ranges) {
Collection<TextRange> result = new ArrayList<TextRange>();
for (TextRange range : ranges) {
int rangeStart = range.getStartOffset();
int rangeEnd = range.getEndOffset();
PsiElement lastElementInRange = findElementInTreeWithFormatterEnabled(file, range.getEndOffset());
if (lastElementInRange instanceof PsiWhiteSpace
&& rangeStart < lastElementInRange.getTextRange().getStartOffset())
{
PsiElement prev = lastElementInRange.getPrevSibling();
if (prev != null) {
rangeEnd = prev.getTextRange().getEndOffset();
}
}
result.add(new TextRange(rangeStart, rangeEnd));
}
return result;
}
private PsiElement reformatRangeImpl(final PsiElement element,
final int startOffset,
final int endOffset,