From f257e7ee587ee50d623353cc7702b69e4ef0759a Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Thu, 21 Dec 2017 12:48:29 +0300 Subject: [PATCH] inspection view: check context is disposed EA-94104 --- .../codeInspection/ex/InspectionRVContentProviderImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionRVContentProviderImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionRVContentProviderImpl.java index a348a0af1918..e15ec5cb7086 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionRVContentProviderImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionRVContentProviderImpl.java @@ -4,6 +4,7 @@ package com.intellij.codeInspection.ex; +import com.intellij.analysis.AnalysisScope; import com.intellij.codeInspection.CommonProblemDescriptor; import com.intellij.codeInspection.reference.RefElement; import com.intellij.codeInspection.reference.RefEntity; @@ -36,7 +37,9 @@ public class InspectionRVContentProviderImpl extends InspectionRVContentProvider InspectionToolPresentation presentation = context.getPresentation(toolWrapper); presentation.updateContent(); - final SearchScope searchScope = context.getCurrentScope().toSearchScope(); + AnalysisScope scope = context.getCurrentScope(); + if (scope == null) return false; + final SearchScope searchScope = scope.toSearchScope(); if (searchScope instanceof LocalSearchScope) { final Map> contents = presentation.getContent(); final SynchronizedBidiMultiMap problemElements = presentation.getProblemElements();