support donenv type cast syntax #1080

Haehnchen · Nov 17, 2017 · eff58f7 · eff58f7
1 parent 6fc281f
commit eff58f7
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 9 deletions.
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/container/util/DotEnvUtil.java b/src/fr/adrienbrault/idea/symfony2plugin/dic/container/util/DotEnvUtil.java
@@ -41,19 +41,25 @@ public class DotEnvUtil {
     /**
      * Provide targets for "%env(FOOBAR)%"
      *
-     * @param parameter %env(FOOBAR)%
+     * @param parameter "%env(FOOBAR)%", "%env(resolve:DB)%"
      */
     @NotNull
     public static Collection<PsiElement> getEnvironmentVariableTargetsForParameter(@NotNull Project project, @NotNull String parameter) {
-        Collection<PsiElement> targets = new ArrayList<>();
+        if(parameter.length() < 7 || !parameter.startsWith("%env(") || !parameter.endsWith(")%")) {
+            return Collections.emptyList();
+        }
 
-        if(parameter.length() > 7 && parameter.startsWith("%env(") && parameter.endsWith(")%")) {
-            targets.addAll(
-                DotEnvUtil.getEnvironmentVariableTargets(project, parameter.substring(5, parameter.length() - 2))
-            );
+        String parameterName = parameter.substring(5, parameter.length() - 2);
+
+        // https://github.com/symfony/symfony/pull/23901 => RegisterEnvVarProcessorsPass
+        // '%env(int:DATABASE_PORT)%'
+        // '%env(resolve:DB)%'
+        Matcher matcher = Pattern.compile("^[\\w]+:(.*)$", Pattern.MULTILINE).matcher(parameterName);
+        if(matcher.find()){
+            parameterName = matcher.group(1);
         }
 
-        return targets;
+        return DotEnvUtil.getEnvironmentVariableTargets(project, parameterName);
     }
 
     @NotNull

diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/XmlReferenceContributorTest.java b/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/XmlReferenceContributorTest.java
@@ -120,6 +120,18 @@ public void testEnvironmentParameter() {
                 "</container>\n",
             PlatformPatterns.psiElement()
         );
+
+        assertReferenceMatch(XmlFileType.INSTANCE, "" +
+                "<?xml version=\"1.0\"?>\n" +
+                "<container>\n" +
+                "    <services>\n" +
+                "        <service>\n" +
+                "            <argument>%env(int:FOOB<caret>AR_ENV)%</argument>\n" +
+                "        </service>\n" +
+                "    </services>\n" +
+                "</container>\n",
+            PlatformPatterns.psiElement()
+        );
     }
 
     public void testServiceIdAsClassReferences() {

diff --git a/...fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlGoToDeclarationHandlerTest.java b/...fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlGoToDeclarationHandlerTest.java
@@ -101,9 +101,9 @@ public void testParameter() {
     public void testEnvironmentParameter() {
         assertNavigationMatch(YAMLFileType.YML, "bar: %env(FOOBA<caret>R_ENV)%");
         assertNavigationMatch(YAMLFileType.YML, "bar: '%env(FOOBA<caret>R_ENV)%'");
+        assertNavigationMatch(YAMLFileType.YML, "bar: '%env(resolve:FOOBA<caret>R_ENV)%'");
     }
 
-
     public void testResourcesInsideSameDirectoryProvidesNavigation() {
         assertNavigationContainsFile(YAMLFileType.YML, "imports:\n" +
                 "    - { resource: config_<caret>foo.yml }",

diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/DotEnvUtilTest.java b/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/DotEnvUtilTest.java
@@ -1,5 +1,6 @@
 package fr.adrienbrault.idea.symfony2plugin.tests.dic.container.util;
 
+import com.intellij.psi.PsiFile;
 import fr.adrienbrault.idea.symfony2plugin.dic.container.util.DotEnvUtil;
 import fr.adrienbrault.idea.symfony2plugin.tests.SymfonyLightCodeInsightFixtureTestCase;
 
@@ -26,6 +27,24 @@ public void testGetEnvironmentVariables() {
     }
 
     public void testGetEnvironmentVariableTargets() {
-        assertTrue(DotEnvUtil.getEnvironmentVariableTargets(getProject(), "foobar").size() > 0);
+        assertEquals(1, DotEnvUtil.getEnvironmentVariableTargets(getProject(), "foobar")
+            .stream()
+            .filter(psiElement -> psiElement instanceof PsiFile && "env.env".equals(((PsiFile) psiElement).getName()))
+            .count()
+        );
+    }
+
+    public void testGetEnvironmentVariableTargetsForParameter() {
+        assertEquals(1, DotEnvUtil.getEnvironmentVariableTargetsForParameter(getProject(), "%env(int:foobar)%")
+            .stream()
+            .filter(psiElement -> psiElement instanceof PsiFile && "env.env".equals(((PsiFile) psiElement).getName()))
+            .count()
+        );
+
+        assertEquals(1, DotEnvUtil.getEnvironmentVariableTargetsForParameter(getProject(), "%env(foobar)%")
+            .stream()
+            .filter(psiElement -> psiElement instanceof PsiFile && "env.env".equals(((PsiFile) psiElement).getName()))
+            .count()
+        );
     }
 }