strip leading slash in service generation and limit event name index size

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyCreateService.java

@@ -322,7 +322,7 @@ private void navigateToElement(TextRange[] textRange) {
  private String createServiceAsText(@NotNull ServiceBuilder.OutputType outputType) {
  return new ServiceBuilder(this.modelList.getItems(), this.project).build(
  outputType,
- classCompletionPanelWrapper.getClassName(),
+ StringUtils.stripStart(classCompletionPanelWrapper.getClassName(), "\\"),
  textFieldServiceName.getText()
  );
  }

src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/EventAnnotationStubIndex.java

@@ -147,7 +147,7 @@ private String findClassInstance(@NotNull PhpDocComment phpDocComment, @NotNull
  PsiElement childrenOfType = PsiElementUtils.getChildrenOfType(phpDocAttributeList, PlatformPatterns.psiElement(PhpDocElementTypes.phpDocString));
  if(childrenOfType instanceof StringLiteralExpression) {
  String contents = StringUtils.stripStart(((StringLiteralExpression) childrenOfType).getContents(), "\\");
- if(StringUtils.isNotBlank(contents)) {
+ if(StringUtils.isNotBlank(contents) && contents.length() < 350) {
  return contents;
  }
  }

src/fr/adrienbrault/idea/symfony2plugin/stubs/util/EventDispatcherUtil.java

@@ -25,7 +25,13 @@ public static String extractEventClassInstance(@Nullable String contents) {
  return null;
  }
 
- return StringUtils.stripStart(matcher.group(1).trim(), "\\");
+ // dont let index long stuff
+ String group = matcher.group(1);
+ if(group.length() > 350) {
+ return null;
+ }
+
+ return StringUtils.stripStart(group.trim(), "\\");
  }
 
 }

tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/util/EventDispatcherUtilTest.java

@@ -1,6 +1,7 @@
 package fr.adrienbrault.idea.symfony2plugin.tests.stubs.util;
 
 import fr.adrienbrault.idea.symfony2plugin.stubs.util.EventDispatcherUtil;
+import org.apache.commons.lang.StringUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -13,6 +14,7 @@ public class EventDispatcherUtilTest extends Assert {
  public void testTextInstanceExtraction() {
  String[] strings = {
  "The event listener method receives a Symfony\\Component\\Form\\FormEvent instance.",
+ "The event listener method receives a \\Symfony\\Component\\Form\\FormEvent instance.",
  "The event listener method receives an Symfony\\Component\\Form\\FormEvent instance.",
  "The event listener method receive an Symfony\\Component\\Form\\FormEvent instance.",
  " method receive f Symfony\\Component\\Form\\FormEvent instance.",
@@ -29,4 +31,17 @@ public void testTextInstanceExtraction() {
  );
  }
  }
+ @Test
+ public void testTextInstanceExtractionForUnderline() {
+ assertEquals("Symfony\\Compo_nent\\Form\\FormEvent", EventDispatcherUtil.extractEventClassInstance(
+ "The event listener method receives a Symfony\\Compo_nent\\Form\\FormEvent instance."
+ ));
+ }
+
+ @Test
+ public void testTextInstanceExtractionForLongStringShouldBeNull() {
+ assertNull(EventDispatcherUtil.extractEventClassInstance(
+ "The event listener method receives a " + StringUtils.repeat("a", 500) + " instance."
+ ));
+ }
 }