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

Haehnchen · Haehnchen · commit 32d2786104c2 · 2017-06-25T19:39:52.000+02:00
diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyLightCodeInsightFixtureTestCase.java b/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) {
diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ServicesTagStubIndexTest.java b/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"));
     }
 
diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/tagged.services.yml b/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

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,6 @@`
`22`	`22`	`import com.intellij.navigation.GotoRelatedItem;`
`23`	`23`	`import com.intellij.openapi.command.CommandProcessor;`
`24`	`24`	`import com.intellij.openapi.editor.Editor;`
`25`		`-import com.intellij.openapi.editor.LogicalPosition;`
`26`		`-import com.intellij.openapi.editor.event.CaretEvent;`
`27`	`25`	`import com.intellij.openapi.extensions.Extensions;`
`28`	`26`	`import com.intellij.openapi.fileTypes.FileType;`
`29`	`27`	`import com.intellij.openapi.fileTypes.LanguageFileType;`
`@@ -515,7 +513,7 @@ public void assertLocalInspectionNotContains(String filename, String content, St`
`515`	`513`	`}`
`516`	`514`	`}`
`517`	`515`
`518`		`- private Pair<List<ProblemDescriptor>, Integer> getLocalInspectionsAtCaret(String filename, String content) {`
	`516`	`+ private Pair<List<ProblemDescriptor>, Integer> getLocalInspectionsAtCaret(@NotNull String filename, @NotNull String content) {`
`519`	`517`
`520`	`518`	`PsiElement psiFile = myFixture.configureByText(filename, content);`
`521`	`519`
`@@ -545,7 +543,7 @@ public void visitElement(PsiElement element) {`
`545`	`543`	`psiElementVisitor.visitFile(psiFile.getContainingFile());;`
`546`	`544`	`}`
`547`	`545`
`548`		`- return new Pair<List<ProblemDescriptor>, Integer>(problemsHolder.getResults(), caretOffset);`
	`546`	`+ return Pair.create(problemsHolder.getResults(), caretOffset);`
`549`	`547`	`}`
`550`	`548`
`551`	`549`	`protected void assertLocalInspectionIsEmpty(String filename, String content) {`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@ public void testTaggedServiceValueInIndex() {`
`34`	`34`	`assertIndexContainsKeyWithValue(ServicesTagStubIndex.KEY, "foo.tagged.yaml_type", new MyStringContainsAssert("yaml_type_tag"));`
`35`	`35`
`36`	`36`	`assertIndexContainsKeyWithValue(ServicesTagStubIndex.KEY, "foo.tagged.yaml_type2", new MyStringContainsAssert("yaml_type_tag2"));`
	`37`	`+ assertIndexContainsKeyWithValue(ServicesTagStubIndex.KEY, "foo.tagged.yaml_type2", new MyStringContainsAssert("yaml_type_tag21"));`
	`38`	`+`
`37`	`39`	`assertIndexContainsKeyWithValue(ServicesTagStubIndex.KEY, "foo.tagged.yaml_type3", new MyStringContainsAssert("yaml_type_tag3"));`
`38`	`40`	`}`
`39`	`41`