Merge pull request #1820 from Haehnchen/feature/block-complete

provide incomple block completion

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java

@@ -435,6 +435,13 @@ public void addCompletions(@NotNull CompletionParameters parameters, ProcessingC
             new IncompleteEmbedCompletionProvider()
         );
 
+        // {% bl => {% block '...'
+        extend(
+            CompletionType.BASIC,
+            PlatformPatterns.psiElement(TwigTokenTypes.TAG_NAME),
+            new IncompleteBlockCompletionProvider()
+        );
+
         // {{ in => {{ include('...')
         extend(
             CompletionType.BASIC,
@@ -933,6 +940,41 @@ public boolean accepts(@NotNull String s, ProcessingContext processingContext) {
         }
     }
 
+    /**
+     * {% bl => {% block '...'
+     */
+    private class IncompleteBlockCompletionProvider extends CompletionProvider<CompletionParameters> {
+        @Override
+        protected void addCompletions(@NotNull CompletionParameters completionParameters, @NotNull ProcessingContext processingContext, @NotNull CompletionResultSet resultSet) {
+            PsiElement position = completionParameters.getOriginalPosition();
+            if(!Symfony2ProjectComponent.isEnabled(position)) {
+                return;
+            }
+
+            resultSet.restartCompletionOnPrefixChange(StandardPatterns.string().longerThan(1).with(new PatternCondition<>("embed startsWith") {
+                @Override
+                public boolean accepts(@NotNull String s, ProcessingContext processingContext) {
+                    return "block".startsWith(s);
+                }
+            }));
+
+            if (!isCompletionStartingMatch("block", completionParameters, 2)) {
+                return;
+            }
+
+            Pair<Collection<PsiFile>, Boolean> scopedContext = TwigUtil.findScopedFile(position);
+
+            Collection<LookupElement> blockLookupElements = TwigUtil.getBlockLookupElements(
+                position.getProject(),
+                TwigFileUtil.collectParentFiles(scopedContext.getSecond(), scopedContext.getFirst())
+            );
+
+            for (LookupElement blockLookupElement : blockLookupElements) {
+                resultSet.addElement(LookupElementBuilder.create("block " + blockLookupElement.getLookupString()).withIcon(TwigIcons.TwigFileIcon));
+            }
+        }
+    }
+
     @NotNull
     private Collection<LookupElement> processVariables(@NotNull PsiElement psiElement, @NotNull Predicate<PhpType> filter, @NotNull Function<Map.Entry<String, Pair<String, LookupElement>>, String> map) {
         Project project = psiElement.getProject();

src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/utils/TwigFileUtil.java

@@ -52,6 +52,12 @@ private static void visitParentFiles(@NotNull PsiFile file, int depth, Collectio
             return;
         }
 
+        // secure loading
+        VirtualFile virtualFile1 = file.getVirtualFile();
+        if (virtualFile1 == null) {
+            return;
+        }
+
         Set<VirtualFile> myVirtualFiles = new HashSet<>();
         Set<String> templates = new HashSet<>();
 
@@ -60,7 +66,7 @@ private static void visitParentFiles(@NotNull PsiFile file, int depth, Collectio
             .forEach(templates::addAll);
 
         FileBasedIndex.getInstance()
-            .getFileData(TwigExtendsStubIndex.KEY, file.getVirtualFile(), file.getProject())
+            .getFileData(TwigExtendsStubIndex.KEY, virtualFile1, file.getProject())
             .forEach((templateName, aVoid) -> templates.add(templateName));
 
         for (String template : templates) {