fix wrong cast in service builder class scope extraction Haehnchen#989

Haehnchen · Haehnchen · commit 766f148db9a8 · 2017-07-31T16:59:55.000+02:00
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/SymfonyContainerServiceBuilder.java b/src/fr/adrienbrault/idea/symfony2plugin/action/SymfonyContainerServiceBuilder.java
@@ -88,19 +88,30 @@ private Pair<PsiFile, PhpClass> findPhpClass(@NotNull AnActionEvent event) {
             return null;
         }
 
+        // menu item like ProjectView
         if("ProjectViewPopup".equals(event.getPlace())) {
-            // menu item
-            return Pair.create(psiFile, PhpElementsUtil.getFirstClassFromFile((PhpFile) psiFile));
-        } else {
-            PsiElement psiElement = event.getData(PlatformDataKeys.PSI_ELEMENT);
-            if(psiElement instanceof PhpClass) {
-                // directly got the class
-                return Pair.create(psiFile, (PhpClass) psiElement);
-            } else {
-                // click inside class
-                return Pair.create(psiFile, PhpElementsUtil.getFirstClassFromFile((PhpFile) psiFile));
+            // fins php class on scope
+            PhpClass phpClass = null;
+            if(psiFile instanceof PhpFile) {
+                phpClass = PhpElementsUtil.getFirstClassFromFile((PhpFile) psiFile);
             }
+
+            return Pair.create(psiFile, phpClass);
+        }
+
+        // directly got the class
+        PsiElement psiElement = event.getData(PlatformDataKeys.PSI_ELEMENT);
+        if(psiElement instanceof PhpClass) {
+            return Pair.create(psiFile, (PhpClass) psiElement);
         }
+
+        // click inside class
+        PhpClass phpClass = null;
+        if(psiFile instanceof PhpFile) {
+            phpClass = PhpElementsUtil.getFirstClassFromFile((PhpFile) psiFile);
+        }
+
+        return Pair.create(psiFile, phpClass);
     }
 }
 
diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/action/SymfonyContainerServiceBuilderTest.java b/tests/fr/adrienbrault/idea/symfony2plugin/tests/action/SymfonyContainerServiceBuilderTest.java
@@ -14,4 +14,14 @@ public void testActionAvailableForFileScope() {
 
         assertTrue(myFixture.testAction(new SymfonyContainerServiceBuilder()).isEnabledAndVisible());
     }
+
+    public void testActionAvailableForXmlFile() {
+        myFixture.configureByText("test.xml", "");
+        assertTrue(myFixture.testAction(new SymfonyContainerServiceBuilder()).isEnabledAndVisible());
+    }
+
+    public void testActionAvailableForYmlFile() {
+        myFixture.configureByText("test.yml", "");
+        assertTrue(myFixture.testAction(new SymfonyContainerServiceBuilder()).isEnabledAndVisible());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,14 @@ public void testActionAvailableForFileScope() {`
`14`	`14`
`15`	`15`	`assertTrue(myFixture.testAction(new SymfonyContainerServiceBuilder()).isEnabledAndVisible());`
`16`	`16`	`}`
	`17`	`+`
	`18`	`+ public void testActionAvailableForXmlFile() {`
	`19`	`+ myFixture.configureByText("test.xml", "");`
	`20`	`+ assertTrue(myFixture.testAction(new SymfonyContainerServiceBuilder()).isEnabledAndVisible());`
	`21`	`+ }`
	`22`	`+`
	`23`	`+ public void testActionAvailableForYmlFile() {`
	`24`	`+ myFixture.configureByText("test.yml", "");`
	`25`	`+ assertTrue(myFixture.testAction(new SymfonyContainerServiceBuilder()).isEnabledAndVisible());`
	`26`	`+ }`
`17`	`27`	`}`