Skip to content

Commit 4f5b756

Browse files
committed
refactor: simplify file context check
1 parent 772e1f0 commit 4f5b756

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

src/main/java/com/github/lppedd/cc/angular2/Angular2CommitScopeProvider.java

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,8 @@
1717
import com.intellij.openapi.project.Project;
1818
import com.intellij.openapi.util.Computable;
1919
import com.intellij.openapi.vfs.VirtualFile;
20-
import com.intellij.psi.PsiElement;
21-
import com.intellij.psi.PsiFile;
22-
import com.intellij.psi.PsiFileSystemItem;
2320
import com.intellij.psi.search.FilenameIndex;
2421
import com.intellij.psi.search.GlobalSearchScope;
25-
import com.intellij.psi.util.PsiUtilCore;
2622
import com.intellij.util.Processor;
2723
import com.intellij.util.indexing.IdFilter;
2824

@@ -95,25 +91,18 @@ private List<CommitScope> findNgModules() {
9591
)
9692
).stream()
9793
)
98-
.map(this::toPsiFile)
9994
.filter(this::isAngular2Context)
100-
.map(PsiFileSystemItem::getName)
95+
.map(VirtualFile::getName)
10196
.map(String::toLowerCase)
10297
.map(fileName -> fileName.replaceFirst(".module.ts$", ""))
10398
.sorted()
10499
.map(moduleName -> new Angular2CommitScope(moduleName, null))
105100
.collect(Collectors.toList());
106101
}
107102

108-
private PsiFile toPsiFile(final VirtualFile virtualFile) {
103+
private boolean isAngular2Context(@NotNull final VirtualFile virtualFile) {
109104
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)
117106
);
118107
}
119108

0 commit comments

Comments
 (0)