also index tag attributes of services

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/config/ServiceLineMarkerProvider.java

@@ -111,6 +111,14 @@ private void classNameMarker(PsiElement psiElement, Collection<? super RelatedIt
  ContainerCollectionResolver.ServiceCollector serviceCollector = ContainerCollectionResolver.ServiceCollector.create(psiElement.getProject());
  for (String convertClassNameToService : serviceCollector.convertClassNameToServices(((PhpClass) phpClassContext).getFQN())) {
  tags.addAll(ServiceUtil.getServiceTags(phpClassContext.getProject(), convertClassNameToService));
+
+ ContainerService containerService = serviceCollector.getServices().get(convertClassNameToService);
+ if (containerService != null) {
+ ServiceInterface service = containerService.getService();
+ if (service != null) {
+ tags.addAll(service.getTags());
+ }
+ }
  }
  }
 

src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/AttributeValueAbstract.java

@@ -4,6 +4,9 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collection;
+import java.util.Collections;
+
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
@@ -39,6 +42,12 @@ public Boolean getBoolean(@NotNull String key, @Nullable Boolean defaultValue) {
  return aBoolean != null ? aBoolean : defaultValue;
  }
 
+ @NotNull
+ @Override
+ public Collection<String> getTags() {
+ return Collections.emptyList();
+ }
+
  @Nullable
  @Override
  public String getString(@NotNull String key, @Nullable String defaultValue) {

src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/AttributeValueInterface.java

@@ -4,6 +4,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collection;
+
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
@@ -21,6 +23,9 @@ public interface AttributeValueInterface {
  @Nullable
  Boolean getBoolean(@NotNull String key, @Nullable Boolean defaultValue);
 
+ @NotNull
+ Collection<String> getTags();
+
  @NotNull
  PsiElement getPsiElement();
 }

src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/DummyAttributeValue.java

@@ -4,6 +4,9 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collection;
+import java.util.Collections;
+
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
@@ -40,6 +43,12 @@ public Boolean getBoolean(@NotNull String key, Boolean defaultValue) {
  return defaultValue;
  }
 
+ @NotNull
+ @Override
+ public Collection<String> getTags() {
+ return Collections.emptySet();
+ }
+
  @NotNull
  @Override
  public PsiElement getPsiElement() {

src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/XmlTagAttributeValue.java

@@ -5,11 +5,14 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
 public class XmlTagAttributeValue extends AttributeValueAbstract {
-
  @NotNull
  private final XmlTag xmlTag;
 
@@ -28,4 +31,14 @@ public String getString(@NotNull String key) {
 
  return value;
  }
+
+ @NotNull
+ @Override
+ public Collection<String> getTags() {
+ return Arrays.stream(xmlTag.getSubTags())
+ .filter(subTag -> "tag".equals(subTag.getName()))
+ .map(subTag -> subTag.getAttributeValue("name"))
+ .filter(StringUtils::isNotBlank)
+ .collect(Collectors.toSet());
+ }
 }

src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/YamlKeyValueAttributeValue.java

@@ -6,6 +6,8 @@
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.yaml.psi.YAMLKeyValue;
 
+import java.util.Collection;
+
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
@@ -29,4 +31,10 @@ public String getString(@NotNull String key) {
 
  return value;
  }
+
+ @NotNull
+ @Override
+ public Collection<String> getTags() {
+ return YamlHelper.collectServiceTags(yamlKeyValue);
+ }
 }

src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/ImmutableDecoratorService.java

@@ -3,6 +3,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collection;
+
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  *
@@ -88,4 +90,10 @@ public String getResource() {
  public String getExclude() {
  return service.getExclude();
  }
+
+ @NotNull
+ @Override
+ public Collection<String> getTags() {
+ return service.getTags();
+ }
 }

src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/SerializableService.java

@@ -5,6 +5,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.Objects;
 
 /**
@@ -62,6 +64,10 @@ public class SerializableService implements ServiceSerializable {
  @SerializedName("exclude")
  private String exclude;
 
+ @NotNull
+ @SerializedName("tags")
+ private Collection<String> tags = new HashSet<>();
+
  public SerializableService(@NotNull String id) {
  this.id = id;
  }
@@ -189,6 +195,17 @@ public String getExclude() {
  return this.exclude;
  }
 
+ @NotNull
+ @Override
+ public Collection<String> getTags() {
+ return tags;
+ }
+
+ public SerializableService setTags(@NotNull Collection<String> tags) {
+ this.tags = tags;
+ return this;
+ }
+
  public SerializableService setResource(@Nullable String resource) {
  this.resource = resource;
  return this;
@@ -216,6 +233,7 @@ public int hashCode() {
  .append(this.parent)
  .append(this.resource)
  .append(this.exclude)
+ .append(new HashSet<>(this.tags))
  .toHashCode()
  ;
  }
@@ -236,7 +254,8 @@ public boolean equals(Object obj) {
  Objects.equals(((SerializableService) obj).decorationInnerName, this.decorationInnerName) &&
  Objects.equals(((SerializableService) obj).parent, this.parent) &&
  Objects.equals(((SerializableService) obj).resource, this.resource) &&
- Objects.equals(((SerializableService) obj).exclude, this.exclude)
+ Objects.equals(((SerializableService) obj).exclude, this.exclude) &&
+ Objects.equals(new HashSet<>(((SerializableService) obj).tags), new HashSet<>(this.tags))
  ;
  }
 }

src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/ServiceInterface.java

@@ -3,6 +3,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collection;
+
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
@@ -41,4 +43,7 @@ public interface ServiceInterface {
 
  @Nullable
  String getExclude();
+
+ @NotNull
+ Collection<String> getTags();
 }

src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/XmlService.java

@@ -4,6 +4,10 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import java.util.Collection;
+import java.util.HashSet;
 
 /**
  * Create a service definition on a compiled debug xml file
@@ -22,6 +26,9 @@ public class XmlService implements ServiceInterface {
 
  private String alias = null;
 
+ @NotNull
+ private Collection<String> tags = new HashSet<>();
+
  private XmlService(@NotNull String id) {
  this.id = id;
  }
@@ -99,6 +106,12 @@ public String getExclude() {
  return null;
  }
 
+ @NotNull
+ @Override
+ public Collection<String> getTags() {
+ return this.tags;
+ }
+
  @Nullable
  public static XmlService createFromXml(@NotNull Element node) {
  // empty id does not interest us
@@ -143,6 +156,21 @@ public static XmlService createFromXml(@NotNull Element node) {
  xmlService.alias = alias;
  }
 
+ // <tag name="xml_type_tag"/>
+ Collection<String> myTags = new HashSet<>();
+ NodeList tags = node.getElementsByTagName("tag");
+ int numTags = tags.getLength();
+ for (int i = 0; i < numTags; i++) {
+ Element section = (Element) tags.item(i);
+
+ String name = section.getAttribute("name");
+ if (StringUtils.isNotBlank(name)) {
+ myTags.add(name);
+ }
+ }
+
+ xmlService.tags = myTags;
+
  return xmlService;
  }