diff --git a/generators/idea-generator/tests/org/jetbrains/kotlin/generators/tests/idea/GenerateTests.kt b/generators/idea-generator/tests/org/jetbrains/kotlin/generators/tests/idea/GenerateTests.kt index 8def30eacea..554de3ffeaf 100644 --- a/generators/idea-generator/tests/org/jetbrains/kotlin/generators/tests/idea/GenerateTests.kt +++ b/generators/idea-generator/tests/org/jetbrains/kotlin/generators/tests/idea/GenerateTests.kt @@ -18,6 +18,7 @@ import org.jetbrains.kotlin.generators.TestGroup import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite import org.jetbrains.kotlin.generators.util.TestGeneratorUtil import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.KT_OR_KTS +import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.KT_WITHOUT_FIR_PREFIX import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.KT_OR_KTS_WITHOUT_DOTS_IN_NAME import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME import org.jetbrains.kotlin.idea.AbstractExpressionSelectionTest @@ -1217,6 +1218,12 @@ fun main(args: Array) { testClass { model("keywords", recursive = false, pattern = KT_WITHOUT_FIR_PREFIX) + model( + "../../idea-fir/testData/completion/keywords", + testClassName = "KeywordsFir", + recursive = false, + pattern = KT_WITHOUT_FIR_PREFIX + ) } } diff --git a/idea/idea-fir/testData/completion/keywords/superWithQualifier.kt b/idea/idea-fir/testData/completion/keywords/superWithQualifier.kt new file mode 100644 index 00000000000..a33254010d7 --- /dev/null +++ b/idea/idea-fir/testData/completion/keywords/superWithQualifier.kt @@ -0,0 +1,12 @@ +// FIR_IDENTICAL +// FIR_COMPARISON +class X: List, Comparable { + init { + sup + } +} + +// EXIST: super +// EXIST: super +// EXIST: super +// NOTHING_ELSE diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/FirKeywordCompletionTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/FirKeywordCompletionTestGenerated.java index fcc392937cb..1756deaf343 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/FirKeywordCompletionTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/FirKeywordCompletionTestGenerated.java @@ -17,595 +17,616 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("idea/idea-completion/testData/keywords") -@TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class FirKeywordCompletionTestGenerated extends AbstractFirKeywordCompletionTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - @TestMetadata("AfterClassName.kt") - public void testAfterClassName() throws Exception { - runTest("idea/idea-completion/testData/keywords/AfterClassName.kt"); - } - - @TestMetadata("AfterClassProperty.kt") - public void testAfterClassProperty() throws Exception { - runTest("idea/idea-completion/testData/keywords/AfterClassProperty.kt"); - } - - @TestMetadata("AfterClasses.kt") - public void testAfterClasses() throws Exception { - runTest("idea/idea-completion/testData/keywords/AfterClasses.kt"); - } - - @TestMetadata("AfterClasses_LangLevel10.kt") - public void testAfterClasses_LangLevel10() throws Exception { - runTest("idea/idea-completion/testData/keywords/AfterClasses_LangLevel10.kt"); - } - - @TestMetadata("AfterClasses_LangLevel11.kt") - public void testAfterClasses_LangLevel11() throws Exception { - runTest("idea/idea-completion/testData/keywords/AfterClasses_LangLevel11.kt"); - } - - @TestMetadata("AfterDot.kt") - public void testAfterDot() throws Exception { - runTest("idea/idea-completion/testData/keywords/AfterDot.kt"); - } - - @TestMetadata("AfterFuns.kt") - public void testAfterFuns() throws Exception { - runTest("idea/idea-completion/testData/keywords/AfterFuns.kt"); - } - - @TestMetadata("AfterIf.kt") - public void testAfterIf() throws Exception { - runTest("idea/idea-completion/testData/keywords/AfterIf.kt"); - } - - @TestMetadata("AfterSafeDot.kt") - public void testAfterSafeDot() throws Exception { - runTest("idea/idea-completion/testData/keywords/AfterSafeDot.kt"); - } - - @TestMetadata("AfterSpaceAndDot.kt") - public void testAfterSpaceAndDot() throws Exception { - runTest("idea/idea-completion/testData/keywords/AfterSpaceAndDot.kt"); - } - - @TestMetadata("AfterTry.kt") - public void testAfterTry() throws Exception { - runTest("idea/idea-completion/testData/keywords/AfterTry.kt"); - } - - @TestMetadata("AfterTryCatch.kt") - public void testAfterTryCatch() throws Exception { - runTest("idea/idea-completion/testData/keywords/AfterTryCatch.kt"); - } - - @TestMetadata("AfterTryFinally.kt") - public void testAfterTryFinally() throws Exception { - runTest("idea/idea-completion/testData/keywords/AfterTryFinally.kt"); - } - - @TestMetadata("AfterTryInAssignment.kt") - public void testAfterTryInAssignment() throws Exception { - runTest("idea/idea-completion/testData/keywords/AfterTryInAssignment.kt"); - } - - public void testAllFilesPresentInKeywords() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/idea-completion/testData/keywords"), Pattern.compile("^(.+)(?