|
14 | 14 | import fr.adrienbrault.idea.symfony2plugin.extension.TwigNamespaceExtension;
|
15 | 15 | import fr.adrienbrault.idea.symfony2plugin.extension.TwigNamespaceExtensionParameter;
|
16 | 16 | import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
|
| 17 | +import fr.adrienbrault.idea.symfony2plugin.util.PsiElementUtils; |
17 | 18 | import org.jetbrains.annotations.NotNull;
|
18 | 19 | import org.jetbrains.yaml.psi.YAMLFile;
|
19 | 20 |
|
@@ -42,21 +43,22 @@ public Collection<TwigPath> getNamespaces(@NotNull TwigNamespaceExtensionParamet
|
42 | 43 | return CachedValuesManager.getManager(project).getCachedValue(
|
43 | 44 | project,
|
44 | 45 | CACHE,
|
45 |
| - () -> CachedValueProvider.Result.create(getTwigPaths(parameter), PsiModificationTracker.MODIFICATION_COUNT), |
| 46 | + () -> CachedValueProvider.Result.create(getTwigPaths(project), PsiModificationTracker.MODIFICATION_COUNT), |
46 | 47 | false
|
47 | 48 | );
|
48 | 49 | }
|
49 | 50 |
|
50 | 51 | @NotNull
|
51 |
| - private static Collection<TwigPath> getTwigPaths(@NotNull TwigNamespaceExtensionParameter parameter) { |
| 52 | + private static Collection<TwigPath> getTwigPaths(@NotNull Project project) { |
52 | 53 | Collection<TwigPath> twigPaths = new ArrayList<>();
|
53 | 54 |
|
54 |
| - for (VirtualFile file : ConfigUtil.getConfigurations(parameter.getProject(), "twig")) { |
55 |
| - PsiFile psiFile = PsiManager.getInstance(parameter.getProject()).findFile(file); |
56 |
| - if(!(psiFile instanceof YAMLFile)) { |
57 |
| - continue; |
58 |
| - } |
| 55 | + // file config files a eg ".../app/..." or "../packages/..." |
| 56 | + Collection<PsiFile> psiFiles = PsiElementUtils.convertVirtualFilesToPsiFiles( |
| 57 | + project, |
| 58 | + ConfigUtil.getConfigurations(project, "twig") |
| 59 | + ); |
59 | 60 |
|
| 61 | + for (PsiFile psiFile : psiFiles) { |
60 | 62 | for (Pair<String, String> stringStringPair : TwigUtil.getTwigPathFromYamlConfigResolved((YAMLFile) psiFile)) {
|
61 | 63 | // default path
|
62 | 64 | String first = stringStringPair.getFirst();
|
|
0 commit comments