diff --git a/idea/testData/navigation/gotoClass/builtInAny.kt b/idea/testData/navigation/gotoClass/builtInAny.kt new file mode 100644 index 00000000000..b31d6875233 --- /dev/null +++ b/idea/testData/navigation/gotoClass/builtInAny.kt @@ -0,0 +1,4 @@ +// RUNTIME_WITH_SOURCES +// CHECK_BOX +// SEARCH_TEXT: Any +// REF: (kotlin).Any \ No newline at end of file diff --git a/idea/testData/navigation/gotoClass/builtInInt.kt b/idea/testData/navigation/gotoClass/builtInInt.kt new file mode 100644 index 00000000000..0a372b66857 --- /dev/null +++ b/idea/testData/navigation/gotoClass/builtInInt.kt @@ -0,0 +1,5 @@ +// RUNTIME_WITH_SOURCES +// CHECK_BOX +// SEARCH_TEXT: Int +// ALLOW_MORE_RESULTS +// REF: (kotlin).Int \ No newline at end of file diff --git a/idea/testData/navigation/gotoSymbol/builtInArrayOfNulls.kt b/idea/testData/navigation/gotoSymbol/builtInArrayOfNulls.kt new file mode 100644 index 00000000000..e66c35df978 --- /dev/null +++ b/idea/testData/navigation/gotoSymbol/builtInArrayOfNulls.kt @@ -0,0 +1,5 @@ +// RUNTIME_WITH_SOURCES +// CHECK_BOX +// SEARCH_TEXT: arrayOfNulls +// ALLOW_MORE_RESULTS +// REF: (kotlin).arrayOfNulls(kotlin.Int) \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java index f0b377cfa59..c9b32b5efd7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java @@ -115,6 +115,13 @@ public abstract class AbstractKotlinGotoTest extends KotlinLightCodeInsightFixtu } }); - UsefulTestCase.assertOrderedEquals(Ordering.natural().sortedCopy(renderedElements), expectedReferences); + boolean inexactMatching = InTextDirectivesUtils.isDirectiveDefined(documentText, "// ALLOW_MORE_RESULTS"); + + if (inexactMatching) { + UsefulTestCase.assertContainsElements(renderedElements, expectedReferences); + } + else { + UsefulTestCase.assertOrderedEquals(Ordering.natural().sortedCopy(renderedElements), expectedReferences); + } } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoTestGenerated.java index 8b39af83783..cb5099b0b74 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoTestGenerated.java @@ -37,6 +37,18 @@ public class KotlinGotoTestGenerated extends AbstractKotlinGotoTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/gotoClass"), Pattern.compile("^(.+)\\.kt$"), true); } + @TestMetadata("builtInAny.kt") + public void testBuiltInAny() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/builtInAny.kt"); + doClassTest(fileName); + } + + @TestMetadata("builtInInt.kt") + public void testBuiltInInt() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/builtInInt.kt"); + doClassTest(fileName); + } + @TestMetadata("enumEntries.kt") public void testEnumEntries() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/enumEntries.kt"); @@ -94,6 +106,12 @@ public class KotlinGotoTestGenerated extends AbstractKotlinGotoTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/gotoSymbol"), Pattern.compile("^(.+)\\.kt$"), true); } + @TestMetadata("builtInArrayOfNulls.kt") + public void testBuiltInArrayOfNulls() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoSymbol/builtInArrayOfNulls.kt"); + doSymbolTest(fileName); + } + @TestMetadata("functions.kt") public void testFunctions() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoSymbol/functions.kt");