From 16b9a376b6d702d081ceef80195153d3127b654c Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Tue, 7 Nov 2017 16:51:13 +0300 Subject: [PATCH] Android Lint: Run AnalysisScope.toSearchScope under read action --- .../klint/AndroidLintGlobalInspectionContext.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/AndroidLintGlobalInspectionContext.java b/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/AndroidLintGlobalInspectionContext.java index 93e52436c58..e213e543b00 100644 --- a/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/AndroidLintGlobalInspectionContext.java +++ b/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/AndroidLintGlobalInspectionContext.java @@ -21,6 +21,7 @@ import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.progress.util.ProgressWrapper; import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.Key; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; @@ -104,7 +105,9 @@ class AndroidLintGlobalInspectionContext implements GlobalInspectionContextExten case AnalysisScope.VIRTUAL_FILES: case AnalysisScope.UNCOMMITTED_FILES: { files = Lists.newArrayList(); - SearchScope searchScope = scope.toSearchScope(); + SearchScope searchScope = ApplicationManager + .getApplication() + .runReadAction((Computable) scope::toSearchScope); if (searchScope instanceof LocalSearchScope) { final LocalSearchScope localSearchScope = (LocalSearchScope)searchScope; final PsiElement[] elements = localSearchScope.getScope();