Applied suggestions from self QA ;-)

Haehnchen · Jul 3, 2021 · 774e536 · 774e536
1 parent 20fd411
commit 774e536
Show file tree

Hide file tree

Showing 3 changed files with 186 additions and 159 deletions.
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/lang/StringLiteralLanguageInjector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/lang/StringLiteralLanguageInjector.java
@@ -47,22 +47,21 @@ public class StringLiteralLanguageInjector implements MultiHostInjector {
             .matchingFunctionCallArgument("\\Symfony\\Component\\DependencyInjection\\Loader\\Configurator\\expr", "expression", 0)
             .matchingMethodCallArgument("\\Symfony\\Component\\ExpressionLanguage\\ExpressionLanguage", "evaluate", "expression", 0)
             .matchingMethodCallArgument("\\Symfony\\Component\\ExpressionLanguage\\ExpressionLanguage", "compile", "expression", 0)
+            .matchingMethodCallArgument("\\Symfony\\Component\\ExpressionLanguage\\ExpressionLanguage", "parse", "expression", 0)
             .matchingMethodCallArgument("\\Symfony\\Component\\Routing\\Loader\\Configurator\\Traits\\RouteTrait", "condition", "condition", 0)
             .matchingAttributeArgument("\\Symfony\\Component\\Validator\\Constraints\\Expression", "expression", 0)
             .matchingAttributeArgument("\\Symfony\\Component\\Routing\\Annotation\\Route", "condition", 9)
             .matchingAttributeArgument("\\Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Cache", "lastModified", 7)
             .matchingAttributeArgument("\\Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Cache", "etag", 8)
             .matchingAttributeArgument("\\Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Security", "data", 0)
             .matchingAttributeArgument("\\Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Entity", "expr", 1)
-            .matchingAttributeArgument("\\Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\ParamConverter", "expr", 1)
-            .matchingAttributeArgument("\\Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Route", "condition", 9)
             .matchingAnnotationProperty("\\Symfony\\Component\\Validator\\Constraints\\Expression", "expression", true)
             .matchingAnnotationProperty("\\Symfony\\Component\\Routing\\Annotation\\Route", "condition", false)
+            .matchingAnnotationProperty("\\Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Route", "condition", false)
             .matchingAnnotationProperty("\\Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Security", "expression", true)
             .matchingAnnotationProperty("\\Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Cache", "lastModified", false)
             .matchingAnnotationProperty("\\Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Cache", "Etag", false)
             .matchingAnnotationProperty("\\Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Entity", "expr", false)
-            .matchingAnnotationProperty("\\Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\ParamConverter", "expr", false)
             .build()
     };