MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

Reformat with context: collect all alignments from blocks, standing after reformatted range end, but before end of line.

Browse Source 
Say we renamed some method:
xxx(a,       xxxxxx(a,
    b)           b)

 Because alignment "a" comes after modified xxx and before end of line, we collect it, and then mark all blocks with same alignment as NOT read only, so they can be realigned accordingly. So actual result will be:
xxxxxx(a,
       b)
This commit is contained in:
Yaroslav Lepenkin
2015-07-07 17:24:06 +03:00
parent c50ae0af75
commit 2df44a4293
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/formatting/InitialInfoBuilder.java
+22 -4
View File
@@ -19,6 +19,7 @@ package com.intellij.formatting;
import com.intellij.diagnostic.LogMessageEx;
import com.intellij.lang.LanguageFormatting;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiFile;
import com.intellij.psi.codeStyle.CodeStyleSettings;
@@ -191,9 +192,8 @@ class InitialInfoBuilder {
myCurrentWhiteSpace.append(blockStartOffset, myModel, myOptions);
boolean isInsideFormattingRanges = isInsideFormattingRanges(rootBlock, rootBlockIsRightBlock);
if (myCollectAlignmentsInsideFormattingRange && rootBlock.getAlignment() != null
&& isInsideFormattingRanges && !myInsideFormatRestrictingTag)
&& isAffectedByFormatting(rootBlock) && !myInsideFormatRestrictingTag)
{
myAlignmentsInsideRangeToModify.add(rootBlock.getAlignment());
}
@@ -386,9 +386,27 @@ class InitialInfoBuilder {
}
}
private boolean isInsideFormattingRanges(final Block block, boolean rootIsRightBlock) {
private boolean isAffectedByFormatting(final Block block) {
if (myAffectedRanges == null) return true;
return !myAffectedRanges.isReadOnly(block.getTextRange(), rootIsRightBlock);
List<FormatTextRanges.FormatTextRange> allRanges = myAffectedRanges.getRanges();
Document document = myModel.getDocument();
int docLength = document.getTextLength();
for (FormatTextRanges.FormatTextRange range : allRanges) {
int startOffset = range.getStartOffset();
if (startOffset >= docLength) continue;
int lineNumber = document.getLineNumber(startOffset);
int lineEndOffset = document.getLineEndOffset(lineNumber);
int blockStartOffset = block.getTextRange().getStartOffset();
if (blockStartOffset >= startOffset && blockStartOffset < lineEndOffset) {
return true;
}
}
return false;
}
public Map<AbstractBlockWrapper, Block> getBlockToInfoMap() {