diff --git a/idea/testData/resolve/references/AnnotationOnFile.kt b/idea/testData/resolve/references/AnnotationOnFile.kt index 491f48d1035..85f6ce26681 100644 --- a/idea/testData/resolve/references/AnnotationOnFile.kt +++ b/idea/testData/resolve/references/AnnotationOnFile.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + @file:[kotlin.Deprecated("message")] package foo diff --git a/idea/testData/resolve/references/AnnotationOnFileWithImport.kt b/idea/testData/resolve/references/AnnotationOnFileWithImport.kt index 8497c5dc2e5..21e0ccdd293 100644 --- a/idea/testData/resolve/references/AnnotationOnFileWithImport.kt +++ b/idea/testData/resolve/references/AnnotationOnFileWithImport.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + @file:[D("message")] package foo diff --git a/idea/testData/resolve/references/ClassNameBeforeDot.kt b/idea/testData/resolve/references/ClassNameBeforeDot.kt index a88fa35b045..7303789a510 100644 --- a/idea/testData/resolve/references/ClassNameBeforeDot.kt +++ b/idea/testData/resolve/references/ClassNameBeforeDot.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + class Foo class C { diff --git a/idea/testData/resolve/references/CollectionLiteralLeft.kt b/idea/testData/resolve/references/CollectionLiteralLeft.kt index 6f14f4872a3..8ce91bd0a38 100644 --- a/idea/testData/resolve/references/CollectionLiteralLeft.kt +++ b/idea/testData/resolve/references/CollectionLiteralLeft.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + val abc = [1, 2, 3] // REF: (kotlin).arrayOf(vararg T) \ No newline at end of file diff --git a/idea/testData/resolve/references/CollectionLiteralRight.kt b/idea/testData/resolve/references/CollectionLiteralRight.kt index ca056e4de81..d78af345064 100644 --- a/idea/testData/resolve/references/CollectionLiteralRight.kt +++ b/idea/testData/resolve/references/CollectionLiteralRight.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + val abc: IntArray = [1, 2, 3] // REF: (kotlin).intArrayOf(vararg kotlin.Int) \ No newline at end of file diff --git a/idea/testData/resolve/references/CoroutineSuspensionPoint.kt b/idea/testData/resolve/references/CoroutineSuspensionPoint.kt index d91db7bd5b2..003e5c67309 100644 --- a/idea/testData/resolve/references/CoroutineSuspensionPoint.kt +++ b/idea/testData/resolve/references/CoroutineSuspensionPoint.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + class Controller { suspend fun suspendHere(x: Continuation) { } diff --git a/idea/testData/resolve/references/CtrlClickResolve.kt b/idea/testData/resolve/references/CtrlClickResolve.kt index b621cd03264..4b014b10977 100644 --- a/idea/testData/resolve/references/CtrlClickResolve.kt +++ b/idea/testData/resolve/references/CtrlClickResolve.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + package ctrl_click fun IntArray(vararg content : Int) : IntArray = content diff --git a/idea/testData/resolve/references/JavaAnnotationParameter.kt b/idea/testData/resolve/references/JavaAnnotationParameter.kt index a740785f725..741ac0bb37f 100644 --- a/idea/testData/resolve/references/JavaAnnotationParameter.kt +++ b/idea/testData/resolve/references/JavaAnnotationParameter.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) annotation class Anno() diff --git a/idea/testData/resolve/references/JavaConstructorNotNullParameter.kt b/idea/testData/resolve/references/JavaConstructorNotNullParameter.kt index 08c278cc629..5f020e30a96 100644 --- a/idea/testData/resolve/references/JavaConstructorNotNullParameter.kt +++ b/idea/testData/resolve/references/JavaConstructorNotNullParameter.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + class A { fun foo() { JavaClass() diff --git a/idea/testData/resolve/references/JavaParameter.kt b/idea/testData/resolve/references/JavaParameter.kt index 09415412879..6a675b9bc44 100644 --- a/idea/testData/resolve/references/JavaParameter.kt +++ b/idea/testData/resolve/references/JavaParameter.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + lateinit var x: java.lang.Readable lateinit var y: java.nio.CharBuffer diff --git a/idea/testData/resolve/references/MultiDeclarationExtension.kt b/idea/testData/resolve/references/MultiDeclarationExtension.kt index 987e62dd8d5..206f13837d4 100644 --- a/idea/testData/resolve/references/MultiDeclarationExtension.kt +++ b/idea/testData/resolve/references/MultiDeclarationExtension.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + package a class A() { diff --git a/idea/testData/resolve/references/MultiDeclarationMember.kt b/idea/testData/resolve/references/MultiDeclarationMember.kt index 0354dc7eadc..2009459d4aa 100644 --- a/idea/testData/resolve/references/MultiDeclarationMember.kt +++ b/idea/testData/resolve/references/MultiDeclarationMember.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + package a class MyPair { diff --git a/idea/testData/resolve/references/ResolvePackageInProperty.kt b/idea/testData/resolve/references/ResolvePackageInProperty.kt index d908e10591a..dd6b0d7da05 100644 --- a/idea/testData/resolve/references/ResolvePackageInProperty.kt +++ b/idea/testData/resolve/references/ResolvePackageInProperty.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + package test1.test2 class Some() diff --git a/idea/testData/resolve/references/SamConstructor.kt b/idea/testData/resolve/references/SamConstructor.kt index a2416fa0833..bef54bd1a78 100644 --- a/idea/testData/resolve/references/SamConstructor.kt +++ b/idea/testData/resolve/references/SamConstructor.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + val c = java.util.Comparator {(x: Int, y: Int) -> 1} // REF: (java.util).Comparator \ No newline at end of file diff --git a/idea/testData/resolve/references/SamConstructorTypeArguments.kt b/idea/testData/resolve/references/SamConstructorTypeArguments.kt index 18d850088b2..9bfd20d38c1 100644 --- a/idea/testData/resolve/references/SamConstructorTypeArguments.kt +++ b/idea/testData/resolve/references/SamConstructorTypeArguments.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + val c = java.util.Comparator { x, y -> 1 } // REF: (java.util).Comparator \ No newline at end of file diff --git a/idea/testData/resolve/references/SeveralOverrides.kt b/idea/testData/resolve/references/SeveralOverrides.kt index 5f05393ad8f..5d05223b0ed 100644 --- a/idea/testData/resolve/references/SeveralOverrides.kt +++ b/idea/testData/resolve/references/SeveralOverrides.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + interface A { fun foo() } diff --git a/idea/testData/resolve/references/SyntheticProperty.kt b/idea/testData/resolve/references/SyntheticProperty.kt index 1a1cfa017d3..f67461e5565 100644 --- a/idea/testData/resolve/references/SyntheticProperty.kt +++ b/idea/testData/resolve/references/SyntheticProperty.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + fun JavaClass.foo(javaClass: JavaClass) { print(javaClass.something) javaClass.something = 1 diff --git a/idea/testData/resolve/references/TypeArgumentBeforeDot2.kt b/idea/testData/resolve/references/TypeArgumentBeforeDot2.kt index 045c03829db..69a780ed8d5 100644 --- a/idea/testData/resolve/references/TypeArgumentBeforeDot2.kt +++ b/idea/testData/resolve/references/TypeArgumentBeforeDot2.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + class Generic class C { diff --git a/idea/testData/resolve/references/TypeArgumentUnresolvedClass.kt b/idea/testData/resolve/references/TypeArgumentUnresolvedClass.kt index e71361f94d8..75f7ff782a7 100644 --- a/idea/testData/resolve/references/TypeArgumentUnresolvedClass.kt +++ b/idea/testData/resolve/references/TypeArgumentUnresolvedClass.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + val v: UnknownClass<String> // REF: (kotlin).String diff --git a/idea/testData/resolve/references/TypeArgumentUnresolvedConstructor.kt b/idea/testData/resolve/references/TypeArgumentUnresolvedConstructor.kt index 52f75931936..5bfe1a0dbf0 100644 --- a/idea/testData/resolve/references/TypeArgumentUnresolvedConstructor.kt +++ b/idea/testData/resolve/references/TypeArgumentUnresolvedConstructor.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + val v: UnknownClass<String>() // REF: (kotlin).String diff --git a/idea/testData/resolve/references/TypeArgumentWrongNumber.kt b/idea/testData/resolve/references/TypeArgumentWrongNumber.kt index 232ee88a284..3d709473b2b 100644 --- a/idea/testData/resolve/references/TypeArgumentWrongNumber.kt +++ b/idea/testData/resolve/references/TypeArgumentWrongNumber.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + class Foo class Bar: Foo<String diff --git a/idea/testData/resolve/references/TypeParameterInFunctionLiteral.kt b/idea/testData/resolve/references/TypeParameterInFunctionLiteral.kt index fc521659ba0..9a9aca5e0a8 100644 --- a/idea/testData/resolve/references/TypeParameterInFunctionLiteral.kt +++ b/idea/testData/resolve/references/TypeParameterInFunctionLiteral.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + package testing class TestClass(val test: (String) -> Int) diff --git a/idea/testData/resolve/references/WrongNumberOfTypeArguments.kt b/idea/testData/resolve/references/WrongNumberOfTypeArguments.kt index fca2ff6eaf0..098725b1a63 100644 --- a/idea/testData/resolve/references/WrongNumberOfTypeArguments.kt +++ b/idea/testData/resolve/references/WrongNumberOfTypeArguments.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + package foo class A diff --git a/idea/testData/resolve/references/WrongNumberOfTypeArguments2.kt b/idea/testData/resolve/references/WrongNumberOfTypeArguments2.kt index 22647bdbf99..c328ab5c241 100644 --- a/idea/testData/resolve/references/WrongNumberOfTypeArguments2.kt +++ b/idea/testData/resolve/references/WrongNumberOfTypeArguments2.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + package foo class A diff --git a/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getExtension.kt b/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getExtension.kt index 94c7a250a24..2516289fe24 100644 --- a/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getExtension.kt +++ b/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getExtension.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + val x: Int by Foo() class Foo diff --git a/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMember.kt b/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMember.kt index e074e1a5fd3..f3cf80871c7 100644 --- a/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMember.kt +++ b/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMember.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + val x: Int by Foo() class Foo { diff --git a/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMultipleDeclarations.kt b/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMultipleDeclarations.kt index 8c0fe7a2657..83d54224766 100644 --- a/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMultipleDeclarations.kt +++ b/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMultipleDeclarations.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + var x : Int by Baz() interface Foo { diff --git a/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getOneFakeOverride.kt b/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getOneFakeOverride.kt index 6123017e9ee..b4ef4c419d8 100644 --- a/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getOneFakeOverride.kt +++ b/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getOneFakeOverride.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + var x : Int by Baz() interface Foo { diff --git a/idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/lazy.kt b/idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/lazy.kt index eb8af609d3d..f223c1e64d2 100644 --- a/idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/lazy.kt +++ b/idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/lazy.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + val x: Int by lazy {1} // REF: (for kotlin.Lazy in kotlin).getValue(kotlin.Any?, kotlin.reflect.KProperty<*>) diff --git a/idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/notNull.kt b/idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/notNull.kt index f396fd7bd65..ab39524681d 100644 --- a/idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/notNull.kt +++ b/idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/notNull.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + import kotlin.properties.Delegates var x: Int by Delegates.notNull() diff --git a/idea/testData/resolve/references/delegatedPropertyAccessors/unresolved.kt b/idea/testData/resolve/references/delegatedPropertyAccessors/unresolved.kt index adc860de12b..a9b1e982a37 100644 --- a/idea/testData/resolve/references/delegatedPropertyAccessors/unresolved.kt +++ b/idea/testData/resolve/references/delegatedPropertyAccessors/unresolved.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + val foo: Int by Bar() class Bar diff --git a/idea/testData/resolve/references/forLoopIn/inBuiltIns/extension.kt b/idea/testData/resolve/references/forLoopIn/inBuiltIns/extension.kt index 118ddc85ebc..b3e859f2b95 100644 --- a/idea/testData/resolve/references/forLoopIn/inBuiltIns/extension.kt +++ b/idea/testData/resolve/references/forLoopIn/inBuiltIns/extension.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + fun main(it: Iterator) { for (i in it.iterator()) {} } diff --git a/idea/testData/resolve/references/forLoopIn/inBuiltIns/member.kt b/idea/testData/resolve/references/forLoopIn/inBuiltIns/member.kt index 81e50d0b7f0..e98e062896f 100644 --- a/idea/testData/resolve/references/forLoopIn/inBuiltIns/member.kt +++ b/idea/testData/resolve/references/forLoopIn/inBuiltIns/member.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + fun main() { for (i in 1..2) {} } diff --git a/idea/testData/resolve/references/forLoopIn/inLibrary/extension.kt b/idea/testData/resolve/references/forLoopIn/inLibrary/extension.kt index d7a39268add..88e5eb80ce2 100644 --- a/idea/testData/resolve/references/forLoopIn/inLibrary/extension.kt +++ b/idea/testData/resolve/references/forLoopIn/inLibrary/extension.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + fun main() { for (i in "") {} } diff --git a/idea/testData/resolve/references/forLoopIn/inSource/allExtensions.kt b/idea/testData/resolve/references/forLoopIn/inSource/allExtensions.kt index 929cd19723e..6bfa6c48698 100644 --- a/idea/testData/resolve/references/forLoopIn/inSource/allExtensions.kt +++ b/idea/testData/resolve/references/forLoopIn/inSource/allExtensions.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + fun test(f: Foo) { for(i in f) {} } diff --git a/idea/testData/resolve/references/forLoopIn/inSource/allMembers.kt b/idea/testData/resolve/references/forLoopIn/inSource/allMembers.kt index 2e4d5154b13..8adabdf2272 100644 --- a/idea/testData/resolve/references/forLoopIn/inSource/allMembers.kt +++ b/idea/testData/resolve/references/forLoopIn/inSource/allMembers.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + fun test(f: Foo) { for(i in f) {} } diff --git a/idea/testData/resolve/references/forLoopIn/inSource/nextMissing.kt b/idea/testData/resolve/references/forLoopIn/inSource/nextMissing.kt index f8ae644f675..94e26ad56cf 100644 --- a/idea/testData/resolve/references/forLoopIn/inSource/nextMissing.kt +++ b/idea/testData/resolve/references/forLoopIn/inSource/nextMissing.kt @@ -1,3 +1,5 @@ +// IGNORE_FIR + fun test(f: Foo) { for(i in f) {} } diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractFirReferenceResolveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractFirReferenceResolveTest.kt index bb0a9317016..d23433b9ad6 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractFirReferenceResolveTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractFirReferenceResolveTest.kt @@ -5,7 +5,9 @@ package org.jetbrains.kotlin.idea.resolve +import org.jetbrains.kotlin.idea.completion.test.configureWithExtraFile import org.jetbrains.kotlin.idea.fir.FirResolution +import org.jetbrains.kotlin.test.InTextDirectivesUtils abstract class AbstractFirReferenceResolveTest : AbstractReferenceResolveTest() { override fun setUp() { @@ -13,6 +15,15 @@ abstract class AbstractFirReferenceResolveTest : AbstractReferenceResolveTest() FirResolution.enabled = true } + override fun doTest(path: String) { + assert(path.endsWith(".kt")) { path } + myFixture.configureWithExtraFile(path, ".Data") + if (InTextDirectivesUtils.isDirectiveDefined(myFixture.file.text, "IGNORE_FIR")) { + return + } + performChecks() + } + override fun tearDown() { FirResolution.enabled = false super.tearDown()