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

[formatter] moved from java-impl to core, extra ranges calculation now works for every language

Browse Source
This commit is contained in:
Yaroslav Lepenkin
2016-07-01 11:19:55 +03:00
parent b98f40b336
commit 24e5406327
4 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java
-35
View File
@@ -19,8 +19,6 @@ import com.intellij.formatting.*;
import com.intellij.formatting.alignment.AlignmentStrategy;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
@@ -1282,37 +1280,4 @@ public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlo
result.setChildAttributes(new ChildAttributes(getCodeBlockInternalIndent(childrenIndent), null));
return result;
}
@Nullable
@Override
public ExtraReformatRanges getExtraRangesToFormat(FormatTextRanges ranges) {
if (ranges.isInsertedBlock(this) && myNode.textContains('\n')) {
List<TextRange> extra = calculateExtraRanges(myNode);
return new ExtraReformatRanges(extra);
}
return null;
}
@NotNull
private List<TextRange> calculateExtraRanges(@NotNull ASTNode node) {
Document document = retrieveDocument(node, getProject(node));
if (document != null) {
TextRange ranges = node.getTextRange();
return new IndentRangesCalculator(document, ranges).calcIndentRanges();
}
return ContainerUtil.newArrayList(myNode.getTextRange());
}
private static Document retrieveDocument(@NotNull ASTNode node, @NotNull Project project) {
PsiFile file = node.getPsi().getContainingFile();
return PsiDocumentManager.getInstance(project).getDocument(file);
}
@NotNull
private static Project getProject(@NotNull ASTNode node) {
return node.getPsi().getProject();
}
}
java/java-impl/src/com/intellij/psi/formatter/java/IndentRangesCalculator.kt
-45
View File
@@ -1,45 +0,0 @@
/*
* Copyright 2000-2016 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.psi.formatter.java
import com.intellij.openapi.editor.Document
import com.intellij.openapi.util.TextRange
import com.intellij.util.text.CharArrayUtil
class IndentRangesCalculator(private val document: Document,
private val textRange: TextRange)
{
private val startOffset = textRange.startOffset
private val endOffset = textRange.endOffset
fun calcIndentRanges(): List<TextRange> {
val startLine = document.getLineNumber(startOffset)
val endLine = document.getLineNumber(endOffset)
val chars = document.charsSequence
val indentRanges = mutableListOf<TextRange>()
for (line in startLine..endLine) {
val lineStartOffset = document.getLineStartOffset(line)
val lineEndOffset = document.getLineEndOffset(line)
val firstNonWsChar = CharArrayUtil.shiftForward(chars, lineStartOffset, lineEndOffset + 1, " \t")
indentRanges.add(TextRange(lineStartOffset, firstNonWsChar))
}
return indentRanges
}
}