MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (minor optimization)

Browse Source
This commit is contained in:
Roman Shevchenko
2017-11-22 13:32:45 +01:00
parent 54c4d65fb4
commit 8b2e7c5cd6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
+4 -3
View File
@@ -914,7 +914,8 @@ public class JavaCompletionContributor extends CompletionContributor {
private static void addModuleReferences(PsiElement moduleRef, PsiFile originalFile, CompletionResultSet result) {
PsiElement statement = moduleRef.getParent();
if (statement instanceof PsiRequiresStatement || statement instanceof PsiPackageAccessibilityStatement) {
boolean requires;
if ((requires = statement instanceof PsiRequiresStatement) || statement instanceof PsiPackageAccessibilityStatement) {
PsiElement parent = statement.getParent();
if (parent != null) {
Project project = moduleRef.getProject();
@@ -926,12 +927,12 @@ public class JavaCompletionContributor extends CompletionContributor {
for (String name : index.getAllKeys(project)) {
if (index.get(name, project, scope).size() > 0 && filter.add(name)) {
LookupElement lookup = LookupElementBuilder.create(name).withIcon(AllIcons.Nodes.JavaModule);
if (statement instanceof PsiRequiresStatement) lookup = TailTypeDecorator.withTail(lookup, TailType.SEMICOLON);
if (requires) lookup = TailTypeDecorator.withTail(lookup, TailType.SEMICOLON);
result.addElement(lookup);
}
}
if (statement instanceof PsiRequiresStatement) {
if (requires) {
Module module = ModuleUtilCore.findModuleForFile(originalFile);
if (module != null) {
VirtualFile[] roots = ModuleRootManager.getInstance(module).orderEntries().withoutSdk().librariesOnly().getClassesRoots();