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

JavaTextBlockIndentPass: take last line indent chars into consideration(IDEA-225003)

Browse Source 
GitOrigin-RevId: d7f7d7ad34a36b7c1f4062f7a50367b284317ee3
This commit is contained in:
Artemiy Sartakov
2019-10-24 13:48:43 +00:00
committed by intellij-monorepo-bot
parent 3e391e0006
commit af895ef068
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/JavaTextBlockIndentPass.java
+9 -3
View File
@@ -225,9 +225,11 @@ public class JavaTextBlockIndentPass extends TextEditorHighlightingPass {
@Nullable
private static IndentType findIndentType(@NotNull String[] lines, int indent) {
IndentType indentType = null;
for (String line : lines) {
for (int i = 0; i < indent; i++) {
char c = line.charAt(i);
for (int i = 0; i < lines.length; i++) {
String line = lines[i];
if (!isContentPart(lines, i, line)) continue;
for (int j = 0; j < indent; j++) {
char c = line.charAt(j);
IndentType currentType = IndentType.of(c);
if (currentType == null) return null;
if (indentType == null) {
@@ -241,6 +243,10 @@ public class JavaTextBlockIndentPass extends TextEditorHighlightingPass {
return indentType;
}
private static boolean isContentPart(@NotNull String[] lines, int i, String line) {
return !line.isEmpty() && (i == lines.length - 1 || !line.chars().allMatch(Character::isWhitespace));
}
private enum IndentType {
SPACES,
TABS;