Skip to content

support resource namespace navigation for xml prototype #1934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 17, 2022
Merged

support resource namespace navigation for xml prototype #1934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/XmlHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,12 @@ public static PsiElement getLocalServiceName(PsiFile psiFile, String serviceName
for(XmlTag servicesTag: xmlTag.getSubTags()) {
if(servicesTag.getName().equals("services")) {
for(XmlTag serviceTag: servicesTag.getSubTags()) {
String serviceNameId = serviceTag.getAttributeValue("id");
String name = serviceTag.getName();
// we know the attributes and context, but rebuild it like yaml
String serviceNameId = "prototype".equals(name)
? serviceTag.getAttributeValue("namespace")
: serviceTag.getAttributeValue("id");

if(serviceNameId != null && serviceNameId.equalsIgnoreCase(serviceName)) {
return serviceTag;
}
Expand Down
10 changes: 10 additions & 0 deletions src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/ServiceIndexUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,16 @@ public void testFindServiceDefinitionsForStringInsideXml() {
));
}

public void testFindServiceDefinitionsForNamespacePrototype() {
assertTrue(ServiceIndexUtil.findServiceDefinitions(getProject(), "App\\").stream()
.anyMatch(psiElement -> psiElement instanceof XmlTag && "App\\".equalsIgnoreCase(((XmlTag) psiElement).getAttributeValue("namespace")))
);

assertTrue(ServiceIndexUtil.findServiceDefinitions(getProject(), "app\\").stream()
.anyMatch(psiElement -> psiElement instanceof XmlTag && "App\\".equalsIgnoreCase(((XmlTag) psiElement).getAttributeValue("namespace")))
);
}

public void testFindServiceDefinitionsForStringInsideXmlUpperCase() {
assertNotNull(ContainerUtil.find(
ServiceIndexUtil.findServiceDefinitions(getProject(), "foo.xml_id.upper"),
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/services.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<services>
<service id="foo.xml_id" class="My\Foo\Service\Targets" parent="foo.xml_id.parent"/>
<service id="foo.xml_id.UPPER" class="My\Foo\Service\Targets"/>

<prototype namespace="App\" resource="../src/*" exclude="../src/{DependencyInjection,Entity,Tests,Kernel.php}"/>
</services>

</container>