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

Cleanup (warnings)

Browse Source
This commit is contained in:
Roman Shevchenko
2017-08-24 12:54:08 +03:00
parent 6e4f740bd6
commit c44e5b68fb
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/formatter/java/CodeBlockBlock.java
+7 -8
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 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.
@@ -239,15 +239,19 @@ public class CodeBlockBlock extends AbstractJavaBlock {
private Indent calcCurrentIndent(final ASTNode child, final int state) {
IElementType elementType = child.getElementType();
if (isRBrace(child) || elementType == JavaTokenType.AT) {
return Indent.getNoneIndent();
}
if (state == BEFORE_FIRST) return Indent.getNoneIndent();
if (state == BEFORE_FIRST) {
return Indent.getNoneIndent();
}
if (elementType == JavaElementType.SWITCH_LABEL_STATEMENT) {
return getCodeBlockInternalIndent(myChildrenIndent);
}
if (state == BEFORE_LBRACE) {
if (elementType == JavaTokenType.LBRACE
|| elementType == JavaTokenType.CLASS_KEYWORD
@@ -262,12 +266,7 @@ public class CodeBlockBlock extends AbstractJavaBlock {
}
}
else {
if (isRBrace(child)) {
return Indent.getNoneIndent();
}
else {
return getCodeBlockInternalIndent(myChildrenIndent);
}
return getCodeBlockInternalIndent(myChildrenIndent);
}
}