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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Yann Cébron
2016-11-09 11:28:46 +01:00
parent 298f5770d7 fea1de9262
commit b827473eba
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/editorActions/JavaLineIndentProvider.java
+1
View File
@@ -51,6 +51,7 @@ public class JavaLineIndentProvider extends JavaLikeLangLineIndentProvider {
SYNTAX_MAP.put(JavaTokenType.IF_KEYWORD, IfKeyword);
SYNTAX_MAP.put(JavaTokenType.ELSE_KEYWORD, ElseKeyword);
SYNTAX_MAP.put(JavaTokenType.FOR_KEYWORD, ForKeyword);
SYNTAX_MAP.put(JavaTokenType.DO_KEYWORD, DoKeyword);
SYNTAX_MAP.put(JavaTokenType.C_STYLE_COMMENT, BlockComment);
SYNTAX_MAP.put(JavaDocTokenType.DOC_COMMENT_START, DocBlockStart);
SYNTAX_MAP.put(JavaDocTokenType.DOC_COMMENT_END, DocBlockEnd);
platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/lineIndent/JavaLikeLangLineIndentProvider.java
+2 -1
View File
@@ -53,6 +53,7 @@ public abstract class JavaLikeLangLineIndentProvider implements LineIndentProvid
ElseKeyword,
IfKeyword,
ForKeyword,
DoKeyword,
BlockComment,
DocBlockStart,
DocBlockEnd,
@@ -135,7 +136,7 @@ public abstract class JavaLikeLangLineIndentProvider implements LineIndentProvid
else if (getPosition(editor, offset).matchesRule(
position -> position.before().isAt(Colon) && position.isAfterOnSameLine(SwitchCase, SwitchDefault)
) || getPosition(editor, offset).matchesRule(
position -> position.before().isAt(ElseKeyword)
position -> position.before().isAtAnyOf(ElseKeyword, DoKeyword)
)) {
return myFactory.createIndentCalculator(NORMAL, IndentCalculator.LINE_BEFORE);
}