Skip to content

Commit c1404eb

Browse files
committed
Fixing NullPointerException during MergeModuleStatementsFix adding in ModuleHighlightUtil.
1 parent abcb6fe commit c1404eb

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

  • java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis

java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/ModuleHighlightUtil.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,13 +197,16 @@ private static <T extends PsiElement> void checkDuplicateRefs(
197197
for (T statement : statements) {
198198
String refText = ref.apply(statement).orElse(null);
199199
if (refText != null && !filter.add(refText)) {
200-
HighlightInfo info = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR)
200+
HighlightInfo.Builder hlBuilder = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR)
201201
.range(statement)
202202
.descriptionAndTooltip(descriptionTemplate.apply(refText))
203-
.registerFix(factory().createDeleteFix(statement))
204-
.registerFix(MergeModuleStatementsFix.createFix(statement))
205-
.create();
206-
results.add(info);
203+
.registerFix(factory().createDeleteFix(statement));
204+
205+
MergeModuleStatementsFix mergeModuleStatementsFix = MergeModuleStatementsFix.createFix(statement);
206+
if (mergeModuleStatementsFix != null) {
207+
hlBuilder.registerFix(mergeModuleStatementsFix);
208+
}
209+
results.add(hlBuilder.create());
207210
}
208211
}
209212
}

0 commit comments

Comments
 (0)