azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android Lint: Run AnalysisScope.toSearchScope under read action

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2017-11-07 16:51:13 +03:00
parent d6d20a5b5d
commit 16b9a376b6
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/AndroidLintGlobalInspectionContext.java
+4 -1
View File
@@ -21,6 +21,7 @@ import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.util.ProgressWrapper; import com.intellij.openapi.progress.util.ProgressWrapper;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.Key; import com.intellij.openapi.util.Key;
import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
@@ -104,7 +105,9 @@ class AndroidLintGlobalInspectionContext implements GlobalInspectionContextExten
case AnalysisScope.VIRTUAL_FILES: case AnalysisScope.VIRTUAL_FILES:
case AnalysisScope.UNCOMMITTED_FILES: { case AnalysisScope.UNCOMMITTED_FILES: {
files = Lists.newArrayList(); files = Lists.newArrayList();
SearchScope searchScope = scope.toSearchScope(); SearchScope searchScope = ApplicationManager
.getApplication()
.runReadAction((Computable<SearchScope>) scope::toSearchScope);
if (searchScope instanceof LocalSearchScope) { if (searchScope instanceof LocalSearchScope) {
final LocalSearchScope localSearchScope = (LocalSearchScope)searchScope; final LocalSearchScope localSearchScope = (LocalSearchScope)searchScope;
final PsiElement[] elements = localSearchScope.getScope(); final PsiElement[] elements = localSearchScope.getScope();