cleanup template packages and some code styling

Haehnchen · Haehnchen · commit b360a631d86f · 2017-12-15T20:02:26.000+01:00
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -176,10 +176,6 @@
                              nonDefaultProject="true"
         />
 
-        <!--
-        <iconProvider implementation="fr.adrienbrault.idea.symfony2plugin.templating.TwigFileIconProvider" />
-        -->
-
         <psi.referenceContributor implementation="fr.adrienbrault.idea.symfony2plugin.config.SymfonyPhpReferenceContributor"/>
         <psi.referenceContributor implementation="fr.adrienbrault.idea.symfony2plugin.translation.TranslationReferenceContributor"/>
         <psi.referenceContributor implementation="fr.adrienbrault.idea.symfony2plugin.routing.PhpRouteReferenceContributor"/>
@@ -193,7 +189,7 @@
         <gotoDeclarationHandler implementation="fr.adrienbrault.idea.symfony2plugin.templating.TwigTemplateGoToDeclarationHandler"/>
         <gotoDeclarationHandler implementation="fr.adrienbrault.idea.symfony2plugin.config.yaml.YamlGoToDeclarationHandler"/>
         <gotoDeclarationHandler implementation="fr.adrienbrault.idea.symfony2plugin.asset.AssetGoToDeclarationHandler"/>
-        <gotoDeclarationHandler implementation="fr.adrienbrault.idea.symfony2plugin.templating.PhpTemplateGlobalStringGoToDeclarationHandler"/>
+        <gotoDeclarationHandler implementation="fr.adrienbrault.idea.symfony2plugin.twig.PhpTemplateGlobalStringGoToDeclarationHandler"/>
         <gotoDeclarationHandler implementation="fr.adrienbrault.idea.symfony2plugin.config.PhpClassServiceGotoDeclarationHandler"/>
         <gotoDeclarationHandler implementation="fr.adrienbrault.idea.symfony2plugin.doctrine.querybuilder.QueryBuilderGotoDeclarationHandler"/>
 
@@ -565,9 +561,9 @@
         <ControllerActionGotoRelatedCollector implementation="fr.adrienbrault.idea.symfony2plugin.navigation.controller.TemplatesControllerRelatedGotoCollector"/>
 
         <GotoCompletionRegistrar implementation="fr.adrienbrault.idea.symfony2plugin.form.FormOptionGotoCompletionRegistrar"/>
-        <GotoCompletionRegistrar implementation="fr.adrienbrault.idea.symfony2plugin.templating.BlockCompletionRegistrar"/>
-        <GotoCompletionRegistrar implementation="fr.adrienbrault.idea.symfony2plugin.templating.FilterCompletionRegistrar"/>
-        <GotoCompletionRegistrar implementation="fr.adrienbrault.idea.symfony2plugin.templating.TranslationTagCompletionRegistrar"/>
+        <GotoCompletionRegistrar implementation="fr.adrienbrault.idea.symfony2plugin.templating.BlockGotoCompletionRegistrar"/>
+        <GotoCompletionRegistrar implementation="fr.adrienbrault.idea.symfony2plugin.templating.FilterGotoCompletionRegistrar"/>
+        <GotoCompletionRegistrar implementation="fr.adrienbrault.idea.symfony2plugin.templating.TranslationTagGotoCompletionRegistrar"/>
         <GotoCompletionRegistrar implementation="fr.adrienbrault.idea.symfony2plugin.form.FormGotoCompletionRegistrar"/>
         <GotoCompletionRegistrar implementation="fr.adrienbrault.idea.symfony2plugin.config.php.PhpEventDispatcherGotoCompletionRegistrar"/>
         <GotoCompletionRegistrar implementation="fr.adrienbrault.idea.symfony2plugin.completion.command.PhpCommandGotoCompletionRegistrar"/>
@@ -671,7 +667,7 @@
             <add-to-group group-id="GenerateGroup" anchor="last" />
         </action>
 
-        <action id="Symfony.TwigTranslationGenerator" class="fr.adrienbrault.idea.symfony2plugin.templating.TwigTranslationGeneratorAction" text="Translation" icon="SymfonyIcons.Translation">
+        <action id="Symfony.TwigTranslationGenerator" class="fr.adrienbrault.idea.symfony2plugin.twig.action.TwigTranslationGeneratorAction" text="Translation" icon="SymfonyIcons.Translation">
             <add-to-group group-id="GenerateGroup" anchor="last" />
         </action>
 
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionRegistrar.java
@@ -1,8 +1,10 @@
 package fr.adrienbrault.idea.symfony2plugin.codeInsight;
 
+import org.jetbrains.annotations.NotNull;
+
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
 public interface GotoCompletionRegistrar {
-    void register(GotoCompletionRegistrarParameter registrar);
+    void register(@NotNull GotoCompletionRegistrarParameter registrar);
 }
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/completion/command/ConsoleHelperGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/completion/command/ConsoleHelperGotoCompletionRegistrar.java
@@ -29,7 +29,7 @@ public class ConsoleHelperGotoCompletionRegistrar implements GotoCompletionRegis
     };
 
     @Override
-    public void register(GotoCompletionRegistrarParameter registrar) {
+    public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
         registrar.register(PlatformPatterns.psiElement().withParent(StringLiteralExpression.class).withLanguage(PhpLanguage.INSTANCE), psiElement -> {
             PsiElement context = psiElement.getContext();
             if (!(context instanceof StringLiteralExpression)) {
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/completion/command/PhpCommandGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/completion/command/PhpCommandGotoCompletionRegistrar.java
@@ -31,7 +31,7 @@
 public class PhpCommandGotoCompletionRegistrar implements GotoCompletionRegistrar {
 
     @Override
-    public void register(GotoCompletionRegistrarParameter registrar) {
+    public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
 
         registrar.register(PlatformPatterns.psiElement().withParent(StringLiteralExpression.class).withLanguage(PhpLanguage.INSTANCE), psiElement -> {
             PsiElement context = psiElement.getContext();
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/completion/xml/XmlGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/completion/xml/XmlGotoCompletionRegistrar.java
@@ -46,7 +46,7 @@
 public class XmlGotoCompletionRegistrar implements GotoCompletionRegistrar  {
 
     @Override
-    public void register(GotoCompletionRegistrarParameter registrar) {
+    public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
         // <import resource="config_foo.xml"/>
         registrar.register(
             XmlPatterns.psiElement().withParent(XmlHelper.getImportResourcePattern()),
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/completion/yaml/YamlGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/completion/yaml/YamlGotoCompletionRegistrar.java
@@ -19,7 +19,7 @@
 public class YamlGotoCompletionRegistrar implements GotoCompletionRegistrar  {
 
     @Override
-    public void register(GotoCompletionRegistrarParameter registrar) {
+    public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
         // defaults:
         //   route: <caret>
         registrar.register(
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/php/PhpEventDispatcherGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/config/php/PhpEventDispatcherGotoCompletionRegistrar.java
@@ -37,7 +37,7 @@ public class PhpEventDispatcherGotoCompletionRegistrar implements GotoCompletion
      * ');
      *
      */
-    public void register(GotoCompletionRegistrarParameter registrar) {
+    public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
 
         registrar.register(PlatformPatterns.psiElement().withParent(StringLiteralExpression.class).withLanguage(PhpLanguage.INSTANCE), psiElement -> {
             PsiElement parent = psiElement.getParent();
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/TaggedParameterGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/dic/TaggedParameterGotoCompletionRegistrar.java
@@ -24,7 +24,7 @@
  */
 public class TaggedParameterGotoCompletionRegistrar implements GotoCompletionRegistrar {
     @Override
-    public void register(GotoCompletionRegistrarParameter registrar) {
+    public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
         // arguments: [!tagged twig.extension]
         // <argument type="tagged" tag="foobar" />
         registrar.register(
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/registrar/DicGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/dic/registrar/DicGotoCompletionRegistrar.java
@@ -27,7 +27,7 @@
 public class DicGotoCompletionRegistrar implements GotoCompletionRegistrar {
 
     @Override
-    public void register(GotoCompletionRegistrarParameter registrar) {
+    public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
 
         // getParameter('FOO')
         registrar.register(
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineXmlGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineXmlGotoCompletionRegistrar.java
@@ -23,7 +23,7 @@
 public class DoctrineXmlGotoCompletionRegistrar implements GotoCompletionRegistrar {
 
     @Override
-    public void register(GotoCompletionRegistrarParameter registrar) {
+    public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
 
         registrar.register(XmlPatterns.psiElement().withParent(PlatformPatterns.or(
             DoctrineMetadataPattern.getXmlModelClass(),
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineYamlGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineYamlGotoCompletionRegistrar.java
@@ -22,7 +22,7 @@
  */
 public class DoctrineYamlGotoCompletionRegistrar implements GotoCompletionRegistrar {
     @Override
-    public void register(GotoCompletionRegistrarParameter registrar) {
+    public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
         registrar.register(PlatformPatterns.or(
             YamlElementPatternHelper.getOrmSingleLineScalarKey("repositoryClass")
         ), ClassGotoCompletionProvider::new);
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/ObjectRepositoryFindGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/ObjectRepositoryFindGotoCompletionRegistrar.java
@@ -28,7 +28,7 @@
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
 public class ObjectRepositoryFindGotoCompletionRegistrar implements GotoCompletionRegistrar {
-    public void register(GotoCompletionRegistrarParameter registrar) {
+    public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
 
         // "@var $om \Doctrine\Common\Persistence\ObjectManager"
         // "$om->getRepository('Foo\Bar')->" + s + "(['foo' => 'foo', '<caret>' => 'foo'])"
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/type/DoctrineTypeGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/type/DoctrineTypeGotoCompletionRegistrar.java
@@ -32,7 +32,7 @@
 public class DoctrineTypeGotoCompletionRegistrar implements GotoCompletionRegistrar {
 
     @Override
-    public void register(GotoCompletionRegistrarParameter registrar) {
+    public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
 
         // <field type="string" />
         registrar.register(
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dbal/DoctrineDbalQbGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dbal/DoctrineDbalQbGotoCompletionRegistrar.java
@@ -28,7 +28,7 @@
  */
 public class DoctrineDbalQbGotoCompletionRegistrar implements GotoCompletionRegistrar {
     @Override
-    public void register(GotoCompletionRegistrarParameter registrar) {
+    public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
 
         // table name completion on method eg:
         // Doctrine\DBAL\Connection::insert
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/FormGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/form/FormGotoCompletionRegistrar.java
@@ -40,7 +40,7 @@ public class FormGotoCompletionRegistrar implements GotoCompletionRegistrar {
         new PhpMethodReferenceCall("Symfony\\Component\\Form\\FormInterface", 2, "add", "create")
     );
 
-    public void register(GotoCompletionRegistrarParameter registrar) {
+    public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
 
         // FormBuilderInterface:add("", "type")
         registrar.register(PlatformPatterns.psiElement().withParent(StringLiteralExpression.class).withLanguage(PhpLanguage.INSTANCE), psiElement -> {
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/FormOptionGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/form/FormOptionGotoCompletionRegistrar.java
@@ -39,7 +39,7 @@ public class FormOptionGotoCompletionRegistrar implements GotoCompletionRegistra
         "Symfony\\Component\\Form\\Extension\\Core\\Type\\FormType"
     };
 
-    public void register(GotoCompletionRegistrarParameter registrar) {
+    public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
         registrar.register(
             PlatformPatterns.psiElement().withLanguage(PhpLanguage.INSTANCE),
             new FormOptionBuilderCompletionContributor()
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/security/VoterGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/security/VoterGotoCompletionRegistrar.java
@@ -26,7 +26,7 @@
  */
 public class VoterGotoCompletionRegistrar implements GotoCompletionRegistrar {
     @Override
-    public void register(GotoCompletionRegistrarParameter registrar) {
+    public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
         // {% is_granted('foobar') %}
         // {% is_granted({'foobar'}) %}
         // {% is_granted(['foobar']) %}
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/BlockGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/BlockGotoCompletionRegistrar.java
@@ -20,9 +20,9 @@
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
-public class BlockCompletionRegistrar implements GotoCompletionRegistrar {
+public class BlockGotoCompletionRegistrar implements GotoCompletionRegistrar {
 
-    public void register(GotoCompletionRegistrarParameter registrar) {
+    public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
 
         // {{ block('foo_block') }}
         registrar.register(TwigHelper.getPrintBlockFunctionPattern("block"), psiElement -> {
@@ -77,6 +77,5 @@ public Collection<LookupElement> getLookupElements() {
 
             return lookupElements;
         }
-
     }
 }
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/FilterGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/FilterGotoCompletionRegistrar.java
@@ -22,8 +22,8 @@
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
-public class FilterCompletionRegistrar implements GotoCompletionRegistrar {
-    public void register(GotoCompletionRegistrarParameter registrar) {
+public class FilterGotoCompletionRegistrar implements GotoCompletionRegistrar {
+    public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
         // {% trans foo<caret>bar %}
         registrar.register(TwigHelper.getFilterTagPattern(), psiElement -> {
             if (!Symfony2ProjectComponent.isEnabled(psiElement)) {
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/PhpTwigMethodLookupElement.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/PhpTwigMethodLookupElement.java
@@ -46,5 +46,4 @@ public String getLookupString() {
 
         return lookupString;
     }
-
 }
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/README.md b/src/fr/adrienbrault/idea/symfony2plugin/templating/README.md
@@ -0,0 +1,6 @@
+# Twig Plugin Split
+
+https://github.com/Haehnchen/idea-twig-plugin
+
+
+
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/RenderParameterGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/RenderParameterGotoCompletionRegistrar.java
@@ -40,7 +40,7 @@ public class RenderParameterGotoCompletionRegistrar implements GotoCompletionReg
     ));
 
     @Override
-    public void register(GotoCompletionRegistrarParameter registrar) {
+    public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
         registrar.register(
             PlatformPatterns.psiElement().withParent(StringLiteralExpression.class),
             MyTemplateVariablesGotoCompletionProvider::new
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/TemplateReference.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/TemplateReference.java
@@ -8,14 +8,12 @@
 import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigHelper;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
+ * @author Daniel Espendiller <daniel@espendiller.net>
  * @author Adrien Brault <adrien.brault@gmail.com>
  */
 public class TemplateReference extends PsiPolyVariantReferenceBase<PsiElement> {
-
+    @NotNull
     private String templateName;
 
     public TemplateReference(@NotNull StringLiteralExpression element) {
@@ -32,14 +30,7 @@ public Object[] getVariants() {
     @NotNull
     @Override
     public ResolveResult[] multiResolve(boolean incompleteCode) {
-
-        PsiElement[] psiElements = TwigHelper.getTemplatePsiElements(getElement().getProject(), templateName);
-        List<ResolveResult> results = new ArrayList<>();
-
-        for (PsiElement psiElement : psiElements) {
-            results.add(new PsiElementResolveResult(psiElement));
-        }
-
-        return results.toArray(new ResolveResult[results.size()]);
+        return PsiElementResolveResult
+            .createResults(TwigHelper.getTemplatePsiElements(getElement().getProject(), templateName));
     }
 }
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/TranslationTagGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/TranslationTagGotoCompletionRegistrar.java
@@ -23,11 +23,14 @@
 import java.util.Collections;
 
 /**
+  * {% trans from "app" %}<caret>{% endtrans %}
+ *  {% trans_default_domain "app" %}{% trans %}<caret>{% endtrans %}
+ *
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
-public class TranslationTagCompletionRegistrar implements GotoCompletionRegistrar {
+public class TranslationTagGotoCompletionRegistrar implements GotoCompletionRegistrar {
     @Override
-    public void register(GotoCompletionRegistrarParameter registrar) {
+    public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
         // {% trans from "app" %}<caret>{% endtrans %}
         registrar.register(
             getTranslationTagValuePattern(), psiElement -> {
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/TwigFileIconProvider.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/TwigFileIconProvider.java
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/TwigLineMarkerProvider.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/TwigLineMarkerProvider.java
@@ -157,10 +157,6 @@ private LineMarkerInfo attachOverwrites(@NotNull TwigFile twigFile) {
         return getRelatedPopover("Overwrites", "Overwrite", twigFile, gotoRelatedItems, Symfony2Icons.TWIG_LINE_OVERWRITE);
     }
 
-    private LineMarkerInfo getRelatedPopover(String singleItemTitle, String singleItemTooltipPrefix, PsiElement lineMarkerTarget, List<GotoRelatedItem> gotoRelatedItems) {
-        return getRelatedPopover(singleItemTitle, singleItemTooltipPrefix, lineMarkerTarget, gotoRelatedItems, PhpIcons.IMPLEMENTED);
-    }
-
     private LineMarkerInfo getRelatedPopover(String singleItemTitle, String singleItemTooltipPrefix, PsiElement lineMarkerTarget, List<GotoRelatedItem> gotoRelatedItems, Icon icon) {
 
         // single item has no popup
@@ -195,8 +191,7 @@ private LineMarkerInfo attachBlockImplements(@NotNull PsiElement psiElement) {
             gotoRelatedItems.add(new RelatedPopupGotoLineMarker.PopupGotoRelatedItem(blockTag, TwigUtil.getPresentableTemplateName(blockTag, true)).withIcon(TwigIcons.TwigFileIcon, Symfony2Icons.TWIG_LINE_MARKER));
         }
 
-        return getRelatedPopover("Implementations", "Impl: ", psiElement, gotoRelatedItems);
-
+        return getRelatedPopover("Implementations", "Impl: ", psiElement, gotoRelatedItems, PhpIcons.IMPLEMENTED);
     }
 
     @Nullable
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigHelper.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigHelper.java
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/TranslationPlaceholderGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/translation/TranslationPlaceholderGotoCompletionRegistrar.java
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/ValidatorTranslationGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/translation/ValidatorTranslationGotoCompletionRegistrar.java
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/action/TwigTranslationGeneratorAction.java b/src/fr/adrienbrault/idea/symfony2plugin/twig/action/TwigTranslationGeneratorAction.java
diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/FilterGotoCompletionRegistrarTest.java b/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/FilterGotoCompletionRegistrarTest.java
diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TranslationTagGotoCompletionRegistrarTest.java b/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TranslationTagGotoCompletionRegistrarTest.java
diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigTranslationGeneratorActionTest.java b/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigTranslationGeneratorActionTest.java
diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/FilterGotoCompletionRegistrarTest.php b/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/FilterGotoCompletionRegistrarTest.php

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public class PhpEventDispatcherGotoCompletionRegistrar implements GotoCompletion`
`37`	`37`	`* ');`
`38`	`38`	`*`
`39`	`39`	`*/`
`40`		`- public void register(GotoCompletionRegistrarParameter registrar) {`
	`40`	`+ public void register(@NotNull GotoCompletionRegistrarParameter registrar) {`
`41`	`41`
`42`	`42`	`registrar.register(PlatformPatterns.psiElement().withParent(StringLiteralExpression.class).withLanguage(PhpLanguage.INSTANCE), psiElement -> {`
`43`	`43`	`PsiElement parent = psiElement.getParent();`