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

DeclarationJoinLinesHandler: RExpression null-check

Browse Source
This commit is contained in:
Tagir Valeev
2018-04-19 13:24:32 +07:00
parent eb75cfe87e
commit 4f4e89a064
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/editorActions/DeclarationJoinLinesHandler.java
+4 -1
View File
@@ -62,7 +62,10 @@ public class DeclarationJoinLinesHandler implements JoinLinesHandlerDelegate {
PsiAssignmentExpression assignment = (PsiAssignmentExpression)ref.getParent();
if (!(assignment.getParent() instanceof PsiExpressionStatement)) return -1;
if (ReferencesSearch.search(var, new LocalSearchScope(assignment.getRExpression()), false).findFirst() != null) {
PsiExpression rExpression = assignment.getRExpression();
if (rExpression == null) return -1;
if (ReferencesSearch.search(var, new LocalSearchScope(rExpression), false).findFirst() != null) {
return -1;
}