diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java index 89a8c557cefa..4034afbacbd9 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java @@ -334,12 +334,11 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextBase imp @Override public void visitFile(final PsiFile file) { final VirtualFile virtualFile = file.getVirtualFile(); - if (virtualFile != null) { - incrementJobDoneAmount(getStdJobDescriptors().LOCAL_ANALYSIS, ProjectUtilCore.displayUrlRelativeToProject(virtualFile, virtualFile - .getPresentableUrl(), getProject(), true, false)); - if (SingleRootFileViewProvider.isTooLargeForIntelligence(virtualFile)) return; - if (localScopeFiles != null && !localScopeFiles.add(virtualFile)) return; - } + if (virtualFile == null) return; + String url = ProjectUtilCore.displayUrlRelativeToProject(virtualFile, virtualFile.getPresentableUrl(), getProject(), true, false); + incrementJobDoneAmount(getStdJobDescriptors().LOCAL_ANALYSIS, url); + if (SingleRootFileViewProvider.isTooLargeForIntelligence(virtualFile)) return; + if (localScopeFiles != null && !localScopeFiles.add(virtualFile)) return; final FileViewProvider viewProvider = psiManager.findViewProvider(virtualFile); final com.intellij.openapi.editor.Document document = viewProvider == null ? null : viewProvider.getDocument(); @@ -368,11 +367,10 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextBase imp } catch (ProcessCanceledException e) { final Throwable cause = e.getCause(); - if (cause != null) { - LOG.error("In file: " + file, cause); - } else { + if (cause == null) { throw e; } + LOG.error("In file: " + file, cause); } catch (IndexNotReadyException e) { throw e;