From e26f40bd8f5391b1e16b7dea8577f430088a6345 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 2 Oct 2019 17:10:56 +0300 Subject: [PATCH] cleanup obscure code GitOrigin-RevId: 348d57dce08ae6a92a49f49b0f7292ff6e570311 --- .../daemon/impl/analysis/HighlightVisitorImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java index 1a3de7f25581..0d27654a70c8 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java @@ -163,9 +163,9 @@ public class HighlightVisitorImpl extends JavaElementVisitor implements Highligh myRefCountHolder = refCountHolder; Project project = file.getProject(); Document document = PsiDocumentManager.getInstance(project).getDocument(file); - TextRange dirtyScope = Optional.ofNullable(document) - .map(doc -> DaemonCodeAnalyzerEx.getInstanceEx(project).getFileStatusMap().getFileDirtyScope(doc, Pass.UPDATE_ALL)) - .orElse(file.getTextRange()); + TextRange dirtyScope = document == null ? null : DaemonCodeAnalyzerEx.getInstanceEx(project).getFileStatusMap().getFileDirtyScope(document, Pass.UPDATE_ALL); + if (dirtyScope == null) dirtyScope = file.getTextRange(); + success = refCountHolder.analyze(file, dirtyScope, progress, () -> { highlight.run(); ProgressManager.checkCanceled();