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

AssignmentSequenceJoinLinesHandler, ChainCallJoinLinesHandler: check that last character is semicolon

Browse Source
This commit is contained in:
Tagir Valeev
2018-04-19 17:03:09 +07:00
parent 302ae45d72
commit fd8c022a0e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/editorActions/AssignmentSequenceJoinLinesHandler.java
+1 -1
View File
@@ -23,7 +23,7 @@ public class AssignmentSequenceJoinLinesHandler implements JoinLinesHandlerDeleg
@Override
public int tryJoinLines(@NotNull final Document document, @NotNull final PsiFile psiFile, final int start, final int end) {
PsiJavaToken elementAtStartLineEnd = tryCast(psiFile.findElementAt(start), PsiJavaToken.class);
if (elementAtStartLineEnd == null) return CANNOT_JOIN;
if (elementAtStartLineEnd == null || !elementAtStartLineEnd.getTokenType().equals(JavaTokenType.SEMICOLON)) return CANNOT_JOIN;
PsiElement firstElement = elementAtStartLineEnd.getParent();
PsiExpression firstValue = null;
PsiVariable variable = null;
java/java-impl/src/com/intellij/codeInsight/editorActions/ChainCallJoinLinesHandler.java
+1 -1
View File
@@ -25,7 +25,7 @@ public class ChainCallJoinLinesHandler implements JoinLinesHandlerDelegate {
@Override
public int tryJoinLines(@NotNull final Document document, @NotNull final PsiFile psiFile, final int start, final int end) {
PsiJavaToken elementAtStartLineEnd = tryCast(psiFile.findElementAt(start), PsiJavaToken.class);
if (elementAtStartLineEnd == null) return CANNOT_JOIN;
if (elementAtStartLineEnd == null || !elementAtStartLineEnd.getTokenType().equals(JavaTokenType.SEMICOLON)) return CANNOT_JOIN;
PsiExpressionStatement secondStatement = PsiTreeUtil.getParentOfType(psiFile.findElementAt(end), PsiExpressionStatement.class);
if (secondStatement == null) return CANNOT_JOIN;
PsiMethodCallExpression secondCall = tryCast(secondStatement.getExpression(), PsiMethodCallExpression.class);