change Pair creation for getLocalInspectionsAtCaret; provide additional array test for yaml tag shortcut

Author: Haehnchen

tests/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyLightCodeInsightFixtureTestCase.java

@@ -22,8 +22,6 @@
 import com.intellij.navigation.GotoRelatedItem;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.LogicalPosition;
-import com.intellij.openapi.editor.event.CaretEvent;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.LanguageFileType;
@@ -515,7 +513,7 @@ public void assertLocalInspectionNotContains(String filename, String content, St
  }
  }
 
- private Pair<List<ProblemDescriptor>, Integer> getLocalInspectionsAtCaret(String filename, String content) {
+ private Pair<List<ProblemDescriptor>, Integer> getLocalInspectionsAtCaret(@NotNull String filename, @NotNull String content) {
 
  PsiElement psiFile = myFixture.configureByText(filename, content);
 
@@ -545,7 +543,7 @@ public void visitElement(PsiElement element) {
  psiElementVisitor.visitFile(psiFile.getContainingFile());;
  }
 
- return new Pair<List<ProblemDescriptor>, Integer>(problemsHolder.getResults(), caretOffset);
+ return Pair.create(problemsHolder.getResults(), caretOffset);
  }
 
  protected void assertLocalInspectionIsEmpty(String filename, String content) {

tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ServicesTagStubIndexTest.java

@@ -34,6 +34,8 @@ public void testTaggedServiceValueInIndex() {
  assertIndexContainsKeyWithValue(ServicesTagStubIndex.KEY, "foo.tagged.yaml_type", new MyStringContainsAssert("yaml_type_tag"));
 
  assertIndexContainsKeyWithValue(ServicesTagStubIndex.KEY, "foo.tagged.yaml_type2", new MyStringContainsAssert("yaml_type_tag2"));
+ assertIndexContainsKeyWithValue(ServicesTagStubIndex.KEY, "foo.tagged.yaml_type2", new MyStringContainsAssert("yaml_type_tag21"));
+
  assertIndexContainsKeyWithValue(ServicesTagStubIndex.KEY, "foo.tagged.yaml_type3", new MyStringContainsAssert("yaml_type_tag3"));
  }
 

tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/tagged.services.yml

@@ -6,7 +6,7 @@ services:
 
  foo.tagged.yaml_type2:
  class: AppBundle\Controller\DefaultController
- tags: [ yaml_type_tag2 ]
+ tags: [ yaml_type_tag2, yaml_type_tag21 ]
 
  foo.tagged.yaml_type3:
  class: AppBundle\Controller\DefaultController