Merge pull request #1748 from Haehnchen/feature/macro-tests

Haehnchen · web-flow · commit c730dcdc82e1 · 2021-12-16T17:49:45.000+01:00
provide pattern tests for Twig macro syntax
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigPattern.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigPattern.java
@@ -1016,7 +1016,7 @@ public static ElementPattern<PsiElement> getTemplateImportFileReferenceTagPatter
 
         //noinspection unchecked
         return PlatformPatterns
-            .psiElement(TwigTokenTypes.IDENTIFIER)
+            .psiElement()
             .withParent(PlatformPatterns.psiElement(TwigElementTypes.IMPORT_TAG))
             .afterLeafSkipping(
                 PlatformPatterns.or(
@@ -1028,11 +1028,12 @@ public static ElementPattern<PsiElement> getTemplateImportFileReferenceTagPatter
                 ),
                 PlatformPatterns.psiElement(TwigTokenTypes.IMPORT_KEYWORD)
             ).andNot(PlatformPatterns
-                    .psiElement(TwigTokenTypes.IDENTIFIER)
+                    .psiElement()
                     .afterLeafSkipping(
                         PlatformPatterns.or(
                             PlatformPatterns.psiElement(PsiWhiteSpace.class),
-                            PlatformPatterns.psiElement(TwigTokenTypes.WHITE_SPACE)
+                            PlatformPatterns.psiElement(TwigTokenTypes.WHITE_SPACE),
+                            PlatformPatterns.psiElement(TwigTokenTypes.IDENTIFIER)
                         ),
                         PlatformPatterns.psiElement(TwigTokenTypes.AS_KEYWORD)
                     )
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java
@@ -122,32 +122,32 @@ public void addCompletions(@NotNull CompletionParameters parameters, ProcessingC
             CompletionType.BASIC,
             TwigPattern.getTemplateImportFileReferenceTagPattern(),
 
-            new CompletionProvider<CompletionParameters>() {
+            new CompletionProvider<>() {
                 public void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet resultSet) {
 
-                    if(!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) {
+                    if (!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) {
                         return;
                     }
 
                     // find {% from "<template.name>"
                     PsiElement psiElement = PsiElementUtils.getPrevSiblingOfType(parameters.getPosition(), TwigPattern.getFromTemplateElementPattern());
-                    if(psiElement == null) {
+                    if (psiElement == null) {
                         return;
                     }
 
                     // {% from _self
-                    if(psiElement.getNode().getElementType() == TwigTokenTypes.RESERVED_ID) {
+                    if (psiElement.getNode().getElementType() == TwigTokenTypes.RESERVED_ID) {
                         attachLookupElements(resultSet, Collections.singletonList(psiElement.getContainingFile()));
                         return;
                     }
 
                     String templateName = psiElement.getText();
-                    if(StringUtils.isBlank(templateName)) {
+                    if (StringUtils.isBlank(templateName)) {
                         return;
                     }
 
                     Collection<PsiFile> twigFilesByName = TwigUtil.getTemplatePsiElements(parameters.getPosition().getProject(), templateName);
-                    if(twigFilesByName.size() == 0) {
+                    if (twigFilesByName.size() == 0) {
                         return;
                     }
 
@@ -156,7 +156,7 @@ public void addCompletions(@NotNull CompletionParameters parameters, ProcessingC
 
                 private void attachLookupElements(@NotNull CompletionResultSet resultSet, Collection<PsiFile> psiFiles) {
                     for (PsiFile psiFile : psiFiles) {
-                        for (TwigMacroTagInterface entry: TwigUtil.getMacros(psiFile)) {
+                        for (TwigMacroTagInterface entry : TwigUtil.getMacros(psiFile)) {
                             resultSet.addElement(LookupElementBuilder.create(entry.getName()).withTypeText(entry.getParameters(), true).withIcon(TwigIcons.TwigFileIcon));
                         }
                     }
diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigPatternTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigPatternTest.java
@@ -269,6 +269,44 @@ public void testGetFunctionWithSecondParameterAsKeyLiteralPattern() {
         ));
     }
 
+    /**
+     * @see fr.adrienbrault.idea.symfony2plugin.templating.TwigPattern#getTemplateImportFileReferenceTagPattern
+     */
+    public void testGetTemplateImportFileReferenceTagPattern() {
+        assertTrue(fr.adrienbrault.idea.symfony2plugin.templating.TwigPattern.getTemplateImportFileReferenceTagPattern().accepts(
+            findElementAt(TwigFileType.INSTANCE, "{% from 'foo.html.twig' import <caret> %}")
+        ));
+
+        assertTrue(fr.adrienbrault.idea.symfony2plugin.templating.TwigPattern.getTemplateImportFileReferenceTagPattern().accepts(
+            findElementAt(TwigFileType.INSTANCE, "{% from 'foo.html.twig' import <caret> %}")
+        ));
+
+        assertTrue(fr.adrienbrault.idea.symfony2plugin.templating.TwigPattern.getTemplateImportFileReferenceTagPattern().accepts(
+            findElementAt(TwigFileType.INSTANCE, "{% from 'foo.html.twig' import foo, <caret> %}")
+        ));
+
+        assertFalse(fr.adrienbrault.idea.symfony2plugin.templating.TwigPattern.getTemplateImportFileReferenceTagPattern().accepts(
+            findElementAt(TwigFileType.INSTANCE, "{% from 'foo.html.twig' import foo as <caret> %}")
+        ));
+
+        assertFalse(fr.adrienbrault.idea.symfony2plugin.templating.TwigPattern.getTemplateImportFileReferenceTagPattern().accepts(
+            findElementAt(TwigFileType.INSTANCE, "{% from 'foo.html.twig' import foo as a<caret> %}")
+        ));
+    }
+
+    /**
+     * @see fr.adrienbrault.idea.symfony2plugin.templating.TwigPattern#getFromTemplateElementPattern
+     */
+    public void testGetFromTemplateElementPattern() {
+        assertTrue(fr.adrienbrault.idea.symfony2plugin.templating.TwigPattern.getFromTemplateElementPattern().accepts(
+            findElementAt(TwigFileType.INSTANCE, "{% from 'foo.ht<caret>ml.twig' import aa %}")
+        ));
+
+        assertTrue(fr.adrienbrault.idea.symfony2plugin.templating.TwigPattern.getFromTemplateElementPattern().accepts(
+            findElementAt(TwigFileType.INSTANCE, "{% from _se<caret>lf import foo %}")
+        ));
+    }
+
     /**
      * @see fr.adrienbrault.idea.symfony2plugin.templating.TwigPattern#getPathAfterLeafPattern
      */

Original file line number	Diff line number	Diff line change
`@@ -122,32 +122,32 @@ public void addCompletions(@NotNull CompletionParameters parameters, ProcessingC`
`122`	`122`	`CompletionType.BASIC,`
`123`	`123`	`TwigPattern.getTemplateImportFileReferenceTagPattern(),`
`124`	`124`
`125`		`- new CompletionProvider<CompletionParameters>() {`
	`125`	`+ new CompletionProvider<>() {`
`126`	`126`	`public void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet resultSet) {`
`127`	`127`
`128`		`- if(!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) {`
	`128`	`+ if (!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) {`
`129`	`129`	`return;`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`// find {% from "<template.name>"`
`133`	`133`	`PsiElement psiElement = PsiElementUtils.getPrevSiblingOfType(parameters.getPosition(), TwigPattern.getFromTemplateElementPattern());`
`134`		`- if(psiElement == null) {`
	`134`	`+ if (psiElement == null) {`
`135`	`135`	`return;`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`// {% from _self`
`139`		`- if(psiElement.getNode().getElementType() == TwigTokenTypes.RESERVED_ID) {`
	`139`	`+ if (psiElement.getNode().getElementType() == TwigTokenTypes.RESERVED_ID) {`
`140`	`140`	`attachLookupElements(resultSet, Collections.singletonList(psiElement.getContainingFile()));`
`141`	`141`	`return;`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`String templateName = psiElement.getText();`
`145`		`- if(StringUtils.isBlank(templateName)) {`
	`145`	`+ if (StringUtils.isBlank(templateName)) {`
`146`	`146`	`return;`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`Collection<PsiFile> twigFilesByName = TwigUtil.getTemplatePsiElements(parameters.getPosition().getProject(), templateName);`
`150`		`- if(twigFilesByName.size() == 0) {`
	`150`	`+ if (twigFilesByName.size() == 0) {`
`151`	`151`	`return;`
`152`	`152`	`}`
`153`	`153`
`@@ -156,7 +156,7 @@ public void addCompletions(@NotNull CompletionParameters parameters, ProcessingC`
`156`	`156`
`157`	`157`	`private void attachLookupElements(@NotNull CompletionResultSet resultSet, Collection<PsiFile> psiFiles) {`
`158`	`158`	`for (PsiFile psiFile : psiFiles) {`
`159`		`- for (TwigMacroTagInterface entry: TwigUtil.getMacros(psiFile)) {`
	`159`	`+ for (TwigMacroTagInterface entry : TwigUtil.getMacros(psiFile)) {`
`160`	`160`	`resultSet.addElement(LookupElementBuilder.create(entry.getName()).withTypeText(entry.getParameters(), true).withIcon(TwigIcons.TwigFileIcon));`
`161`	`161`	`}`
`162`	`162`	`}`