Merge pull request #2389 from Haehnchen/feature/route-name-attribute

Haehnchen · web-flow · commit 04c6588a780b · 2024-08-03T10:26:58.000+02:00
support "\\Symfony\\Component\\Routing\\Attribute\\Route" for route url and naming completion
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/annotation/RouteNameAnnotationCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/annotation/RouteNameAnnotationCompletionProvider.java
@@ -27,7 +27,7 @@
 public class RouteNameAnnotationCompletionProvider implements PhpAnnotationCompletionProvider {
     @Override
     public void getPropertyValueCompletions(AnnotationPropertyParameter annotationPropertyParameter, AnnotationCompletionProviderParameter annotationCompletionProviderParameter) {
-        if (!Symfony2ProjectComponent.isEnabled(annotationPropertyParameter.getProject()) || !PhpElementsUtil.isInstanceOf(annotationPropertyParameter.getPhpClass(), "\\Symfony\\Component\\Routing\\Annotation\\Route", "\\Symfony\\Component\\Routing\\Annotation\\Route")) {
+        if (!Symfony2ProjectComponent.isEnabled(annotationPropertyParameter.getProject()) || !PhpElementsUtil.isInstanceOf(annotationPropertyParameter.getPhpClass(), "\\Symfony\\Component\\Routing\\Annotation\\Route", "\\Symfony\\Component\\Routing\\Annotation\\Route", "\\Symfony\\Component\\Routing\\Attribute\\Route")) {
             return;
         }
 
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/annotation/RouteUrlAnnotationCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/annotation/RouteUrlAnnotationCompletionProvider.java
@@ -15,7 +15,7 @@
 public class RouteUrlAnnotationCompletionProvider implements PhpAnnotationCompletionProvider {
     @Override
     public void getPropertyValueCompletions(AnnotationPropertyParameter annotationPropertyParameter, AnnotationCompletionProviderParameter annotationCompletionProviderParameter) {
-        if (!Symfony2ProjectComponent.isEnabled(annotationPropertyParameter.getProject()) || !PhpElementsUtil.isInstanceOf(annotationPropertyParameter.getPhpClass(), "\\Symfony\\Component\\Routing\\Annotation\\Route", "\\Symfony\\Component\\Routing\\Annotation\\Route")) {
+        if (!Symfony2ProjectComponent.isEnabled(annotationPropertyParameter.getProject()) || !PhpElementsUtil.isInstanceOf(annotationPropertyParameter.getPhpClass(), "\\Symfony\\Component\\Routing\\Annotation\\Route", "\\Symfony\\Component\\Routing\\Attribute\\Route")) {
             return;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`public class RouteNameAnnotationCompletionProvider implements PhpAnnotationCompletionProvider {`
`28`	`28`	`@Override`
`29`	`29`	`public void getPropertyValueCompletions(AnnotationPropertyParameter annotationPropertyParameter, AnnotationCompletionProviderParameter annotationCompletionProviderParameter) {`
`30`		`- if (!Symfony2ProjectComponent.isEnabled(annotationPropertyParameter.getProject()) \|\| !PhpElementsUtil.isInstanceOf(annotationPropertyParameter.getPhpClass(), "\\Symfony\\Component\\Routing\\Annotation\\Route", "\\Symfony\\Component\\Routing\\Annotation\\Route")) {`
	`30`	`+ if (!Symfony2ProjectComponent.isEnabled(annotationPropertyParameter.getProject()) \|\| !PhpElementsUtil.isInstanceOf(annotationPropertyParameter.getPhpClass(), "\\Symfony\\Component\\Routing\\Annotation\\Route", "\\Symfony\\Component\\Routing\\Annotation\\Route", "\\Symfony\\Component\\Routing\\Attribute\\Route")) {`
`31`	`31`	`return;`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`public class RouteUrlAnnotationCompletionProvider implements PhpAnnotationCompletionProvider {`
`16`	`16`	`@Override`
`17`	`17`	`public void getPropertyValueCompletions(AnnotationPropertyParameter annotationPropertyParameter, AnnotationCompletionProviderParameter annotationCompletionProviderParameter) {`
`18`		`- if (!Symfony2ProjectComponent.isEnabled(annotationPropertyParameter.getProject()) \|\| !PhpElementsUtil.isInstanceOf(annotationPropertyParameter.getPhpClass(), "\\Symfony\\Component\\Routing\\Annotation\\Route", "\\Symfony\\Component\\Routing\\Annotation\\Route")) {`
	`18`	`+ if (!Symfony2ProjectComponent.isEnabled(annotationPropertyParameter.getProject()) \|\| !PhpElementsUtil.isInstanceOf(annotationPropertyParameter.getPhpClass(), "\\Symfony\\Component\\Routing\\Annotation\\Route", "\\Symfony\\Component\\Routing\\Attribute\\Route")) {`
`19`	`19`	`return;`
`20`	`20`	`}`
`21`	`21`