|
5 | 5 | import com.intellij.codeInsight.completion.*; |
6 | 6 | import com.intellij.codeInsight.lookup.LookupElement; |
7 | 7 | import com.intellij.codeInsight.lookup.LookupElementPresentation; |
| 8 | +import com.intellij.openapi.project.Project; |
8 | 9 | import com.intellij.patterns.PlatformPatterns; |
9 | 10 | import com.intellij.psi.PsiElement; |
10 | 11 | import com.intellij.util.ProcessingContext; |
@@ -39,19 +40,20 @@ protected void addCompletions(@NotNull CompletionParameters parameters, Processi |
39 | 40 | PhpTypedElement variable = (PhpTypedElement) position.getParent().getFirstChild(); |
40 | 41 |
|
41 | 42 | PhpType type = variable.getType(); |
| 43 | + Project project = position.getProject(); |
42 | 44 | type.getTypes().forEach(t -> { |
43 | | - Collection<PhpClass> classesByFQN = PhpIndex.getInstance(position.getProject()).getClassesByFQN(t); |
| 45 | + Collection<PhpClass> classesByFQN = PhpIndex.getInstance(project).getClassesByFQN(t); |
44 | 46 | classesByFQN |
45 | 47 | .stream() |
46 | 48 | .filter(ExtbaseUtils::isRepositoryClass) |
47 | | - .forEach(c -> createLookupElementsForRepository(variable, c, result)); |
| 49 | + .forEach(c -> createLookupElementsForRepository(project, c, result)); |
48 | 50 | }); |
49 | 51 | } |
50 | 52 |
|
51 | | - private void createLookupElementsForRepository(@NotNull PhpTypedElement position, @NotNull PhpClass repositoryClass, @NotNull CompletionResultSet result) { |
| 53 | + private void createLookupElementsForRepository(@NotNull Project project, @NotNull PhpClass repositoryClass, @NotNull CompletionResultSet result) { |
52 | 54 | String potentialModelClass = ExtbaseUtility.convertRepositoryFQNToEntityFQN(repositoryClass.getFQN()); |
53 | 55 |
|
54 | | - Collection<PhpClass> classesByFQN = PhpIndex.getInstance(position.getProject()).getClassesByFQN(potentialModelClass); |
| 56 | + Collection<PhpClass> classesByFQN = PhpIndex.getInstance(project).getClassesByFQN(potentialModelClass); |
55 | 57 | classesByFQN.forEach(c -> { |
56 | 58 | c.getFields().forEach(f -> { |
57 | 59 | if (!ExtbaseUtils.fieldHasMagicFinders(f)) { |
|
0 commit comments