|
17 | 17 | import com.intellij.openapi.project.Project; |
18 | 18 | import com.intellij.openapi.util.Computable; |
19 | 19 | import com.intellij.openapi.vfs.VirtualFile; |
20 | | -import com.intellij.psi.PsiElement; |
21 | | -import com.intellij.psi.PsiFile; |
22 | | -import com.intellij.psi.PsiFileSystemItem; |
23 | 20 | import com.intellij.psi.search.FilenameIndex; |
24 | 21 | import com.intellij.psi.search.GlobalSearchScope; |
25 | | -import com.intellij.psi.util.PsiUtilCore; |
26 | 22 | import com.intellij.util.Processor; |
27 | 23 | import com.intellij.util.indexing.IdFilter; |
28 | 24 |
|
@@ -95,25 +91,18 @@ private List<CommitScope> findNgModules() { |
95 | 91 | ) |
96 | 92 | ).stream() |
97 | 93 | ) |
98 | | - .map(this::toPsiFile) |
99 | 94 | .filter(this::isAngular2Context) |
100 | | - .map(PsiFileSystemItem::getName) |
| 95 | + .map(VirtualFile::getName) |
101 | 96 | .map(String::toLowerCase) |
102 | 97 | .map(fileName -> fileName.replaceFirst(".module.ts$", "")) |
103 | 98 | .sorted() |
104 | 99 | .map(moduleName -> new Angular2CommitScope(moduleName, null)) |
105 | 100 | .collect(Collectors.toList()); |
106 | 101 | } |
107 | 102 |
|
108 | | - private PsiFile toPsiFile(final VirtualFile virtualFile) { |
| 103 | + private boolean isAngular2Context(@NotNull final VirtualFile virtualFile) { |
109 | 104 | return APPLICATION.runReadAction( |
110 | | - (Computable<PsiFile>) () -> PsiUtilCore.getPsiFile(project, virtualFile) |
111 | | - ); |
112 | | - } |
113 | | - |
114 | | - private boolean isAngular2Context(final PsiElement psiFile) { |
115 | | - return APPLICATION.runReadAction( |
116 | | - (Computable<Boolean>) () -> Angular2LangUtil.isAngular2Context(psiFile) |
| 105 | + (Computable<Boolean>) () -> Angular2LangUtil.isAngular2Context(project, virtualFile) |
117 | 106 | ); |
118 | 107 | } |
119 | 108 |
|
|
0 commit comments