Snap for 8709740 from 94136e97c59789b2242f8eee1cd8abde4fe323d4 to studio-dolphin-releasestudio-2021.3.1-betastudio-beta

Change-Id: I60acba3629ba543acf77426e415cd999c5252307

12 files changed, 208 insertions, 154 deletions

diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/AbstractFirLegacyUastIdentifiersTest.kt b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/AbstractFirLegacyUastIdentifiersTest.kt
index 2d07a114f282..44982401d9f7 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/AbstractFirLegacyUastIdentifiersTest.kt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/AbstractFirLegacyUastIdentifiersTest.kt
@@ -12,12 +12,12 @@ abstract class AbstractFirLegacyUastIdentifiersTest : AbstractFirUastIdentifiers
     @OptIn(ExperimentalPathApi::class)
     private val whitelist : Set<String> = setOf(
         // TODO: Also failed with FE1.0 UAST
-        "uast-kotlin/testData/DestructuringDeclaration.kt",
-        "uast-kotlin/testData/LambdaReturn.kt",
-        "uast-kotlin/testData/WhenAndDestructing.kt",
+        "uast-kotlin/tests/testData/DestructuringDeclaration.kt",
+        "uast-kotlin/tests/testData/LambdaReturn.kt",
+        "uast-kotlin/tests/testData/WhenAndDestructing.kt",
 
         // TODO: this file fails 'testIdentifiersParents' check
-        "uast-kotlin/testData/DataClassInheritsAbstractClassWithEquals.kt",
+        "uast-kotlin/tests/testData/DataClassInheritsAbstractClassWithEquals.kt",
     ).mapTo(mutableSetOf()) { KotlinRoot.DIR_PATH.resolve("uast").resolve(it).absolute().normalize().toString() }
 
     override fun isExpectedToFail(filePath: String): Boolean {
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastDeclarationTestGenerated.java b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastDeclarationTestGenerated.java
index b9e0fa84ec32..bbcb46102db8 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastDeclarationTestGenerated.java
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastDeclarationTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.uast;
 
@@ -98,11 +98,6 @@ public class FirLegacyUastDeclarationTestGenerated extends AbstractFirLegacyUast
         runTest("../uast-kotlin/tests/testData/CycleInTypeParameters.kt");
     }
 
-    @TestMetadata("DataClassInheritsAbstractClassWithEquals.kt")
-    public void testDataClassInheritsAbstractClassWithEquals() throws Exception {
-        runTest("../uast-kotlin/testData/DataClassInheritsAbstractClassWithEquals.kt");
-    }
-
     @TestMetadata("DefaultImpls.kt")
     public void testDefaultImpls() throws Exception {
         runTest("../uast-kotlin/tests/testData/DefaultImpls.kt");
@@ -183,6 +178,11 @@ public class FirLegacyUastDeclarationTestGenerated extends AbstractFirLegacyUast
         runTest("../uast-kotlin/tests/testData/InnerNonFixedTypeVariable.kt");
     }
 
+    @TestMetadata("LambdaExpressionFunctionalInterfaceType.kt")
+    public void testLambdaExpressionFunctionalInterfaceType() throws Exception {
+        runTest("../uast-kotlin/tests/testData/LambdaExpressionFunctionalInterfaceType.kt");
+    }
+
     @TestMetadata("LambdaParameters.kt")
     public void testLambdaParameters() throws Exception {
         runTest("../uast-kotlin/tests/testData/LambdaParameters.kt");
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastIdentifiersTestGenerated.java b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastIdentifiersTestGenerated.java
index 9ebc5bebc6b5..807afcc4e0f9 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastIdentifiersTestGenerated.java
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastIdentifiersTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.uast;
 
@@ -98,11 +98,6 @@ public class FirLegacyUastIdentifiersTestGenerated extends AbstractFirLegacyUast
         runTest("../uast-kotlin/tests/testData/CycleInTypeParameters.kt");
     }
 
-    @TestMetadata("DataClassInheritsAbstractClassWithEquals.kt")
-    public void testDataClassInheritsAbstractClassWithEquals() throws Exception {
-        runTest("../uast-kotlin/testData/DataClassInheritsAbstractClassWithEquals.kt");
-    }
-
     @TestMetadata("DefaultImpls.kt")
     public void testDefaultImpls() throws Exception {
         runTest("../uast-kotlin/tests/testData/DefaultImpls.kt");
@@ -183,6 +178,11 @@ public class FirLegacyUastIdentifiersTestGenerated extends AbstractFirLegacyUast
         runTest("../uast-kotlin/tests/testData/InnerNonFixedTypeVariable.kt");
     }
 
+    @TestMetadata("LambdaExpressionFunctionalInterfaceType.kt")
+    public void testLambdaExpressionFunctionalInterfaceType() throws Exception {
+        runTest("../uast-kotlin/tests/testData/LambdaExpressionFunctionalInterfaceType.kt");
+    }
+
     @TestMetadata("LambdaParameters.kt")
     public void testLambdaParameters() throws Exception {
         runTest("../uast-kotlin/tests/testData/LambdaParameters.kt");
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastResolveEverythingTestGenerated.java b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastResolveEverythingTestGenerated.java
index 5f37194ad714..971de87f0d0f 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastResolveEverythingTestGenerated.java
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastResolveEverythingTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.uast;
 
@@ -9,15 +9,15 @@ import org.jetbrains.kotlin.test.TestMetadata;
 import org.jetbrains.kotlin.idea.test.TestRoot;
 import org.junit.runner.RunWith;
 
-/*
- * This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}.
+/**
+ * This class is generated by {@link org.jetbrains.kotlin.testGenerator.generator.TestGenerator}.
  * DO NOT MODIFY MANUALLY.
  */
 @SuppressWarnings("all")
 @TestRoot("uast/uast-kotlin-fir")
 @TestDataPath("$CONTENT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
-@TestMetadata("../uast-kotlin/testData")
+@TestMetadata("../uast-kotlin/tests/testData")
 public class FirLegacyUastResolveEverythingTestGenerated extends AbstractFirLegacyUastResolveEverythingTest {
     private void runTest(String testDataFilePath) throws Exception {
         KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
@@ -25,376 +25,386 @@ public class FirLegacyUastResolveEverythingTestGenerated extends AbstractFirLega
 
     @TestMetadata("AnnotatedExpressions.kt")
     public void testAnnotatedExpressions() throws Exception {
-        runTest("../uast-kotlin/testData/AnnotatedExpressions.kt");
+        runTest("../uast-kotlin/tests/testData/AnnotatedExpressions.kt");
+    }
+
+    @TestMetadata("AnnotatedTypes.kt")
+    public void testAnnotatedTypes() throws Exception {
+        runTest("../uast-kotlin/tests/testData/AnnotatedTypes.kt");
     }
 
     @TestMetadata("AnnotationComplex.kt")
     public void testAnnotationComplex() throws Exception {
-        runTest("../uast-kotlin/testData/AnnotationComplex.kt");
+        runTest("../uast-kotlin/tests/testData/AnnotationComplex.kt");
     }
 
     @TestMetadata("AnnotationParameters.kt")
     public void testAnnotationParameters() throws Exception {
-        runTest("../uast-kotlin/testData/AnnotationParameters.kt");
+        runTest("../uast-kotlin/tests/testData/AnnotationParameters.kt");
     }
 
     @TestMetadata("Anonymous.kt")
     public void testAnonymous() throws Exception {
-        runTest("../uast-kotlin/testData/Anonymous.kt");
+        runTest("../uast-kotlin/tests/testData/Anonymous.kt");
     }
 
     @TestMetadata("Assertion.kt")
     public void testAssertion() throws Exception {
-        runTest("../uast-kotlin/testData/Assertion.kt");
+        runTest("../uast-kotlin/tests/testData/Assertion.kt");
     }
 
     @TestMetadata("Bitwise.kt")
     public void testBitwise() throws Exception {
-        runTest("../uast-kotlin/testData/Bitwise.kt");
+        runTest("../uast-kotlin/tests/testData/Bitwise.kt");
+    }
+
+    @TestMetadata("BrokenDataClass.kt")
+    public void testBrokenDataClass() throws Exception {
+        runTest("../uast-kotlin/tests/testData/BrokenDataClass.kt");
     }
 
     @TestMetadata("BrokenMethod.kt")
     public void testBrokenMethod() throws Exception {
-        runTest("../uast-kotlin/testData/BrokenMethod.kt");
+        runTest("../uast-kotlin/tests/testData/BrokenMethod.kt");
     }
 
     @TestMetadata("ClassAnnotation.kt")
     public void testClassAnnotation() throws Exception {
-        runTest("../uast-kotlin/testData/ClassAnnotation.kt");
+        runTest("../uast-kotlin/tests/testData/ClassAnnotation.kt");
     }
 
     @TestMetadata("CommentOwners.kt")
     public void testCommentOwners() throws Exception {
-        runTest("../uast-kotlin/testData/CommentOwners.kt");
+        runTest("../uast-kotlin/tests/testData/CommentOwners.kt");
     }
 
     @TestMetadata("Comments.kt")
     public void testComments() throws Exception {
-        runTest("../uast-kotlin/testData/Comments.kt");
+        runTest("../uast-kotlin/tests/testData/Comments.kt");
     }
 
     @TestMetadata("ConstructorDelegate.kt")
     public void testConstructorDelegate() throws Exception {
-        runTest("../uast-kotlin/testData/ConstructorDelegate.kt");
+        runTest("../uast-kotlin/tests/testData/ConstructorDelegate.kt");
     }
 
     @TestMetadata("Constructors.kt")
     public void testConstructors() throws Exception {
-        runTest("../uast-kotlin/testData/Constructors.kt");
+        runTest("../uast-kotlin/tests/testData/Constructors.kt");
     }
 
     @TestMetadata("CycleInTypeParameters.kt")
     public void testCycleInTypeParameters() throws Exception {
-        runTest("../uast-kotlin/testData/CycleInTypeParameters.kt");
-    }
-
-    @TestMetadata("DataClassInheritsAbstractClassWithEquals.kt")
-    public void testDataClassInheritsAbstractClassWithEquals() throws Exception {
-        runTest("../uast-kotlin/testData/DataClassInheritsAbstractClassWithEquals.kt");
+        runTest("../uast-kotlin/tests/testData/CycleInTypeParameters.kt");
     }
 
     @TestMetadata("DefaultImpls.kt")
     public void testDefaultImpls() throws Exception {
-        runTest("../uast-kotlin/testData/DefaultImpls.kt");
+        runTest("../uast-kotlin/tests/testData/DefaultImpls.kt");
     }
 
     @TestMetadata("DefaultParameterValues.kt")
     public void testDefaultParameterValues() throws Exception {
-        runTest("../uast-kotlin/testData/DefaultParameterValues.kt");
+        runTest("../uast-kotlin/tests/testData/DefaultParameterValues.kt");
     }
 
     @TestMetadata("Delegate.kt")
     public void testDelegate() throws Exception {
-        runTest("../uast-kotlin/testData/Delegate.kt");
+        runTest("../uast-kotlin/tests/testData/Delegate.kt");
     }
 
     @TestMetadata("DeprecatedHidden.kt")
     public void testDeprecatedHidden() throws Exception {
-        runTest("../uast-kotlin/testData/DeprecatedHidden.kt");
+        runTest("../uast-kotlin/tests/testData/DeprecatedHidden.kt");
     }
 
     @TestMetadata("DestructuringDeclaration.kt")
     public void testDestructuringDeclaration() throws Exception {
-        runTest("../uast-kotlin/testData/DestructuringDeclaration.kt");
+        runTest("../uast-kotlin/tests/testData/DestructuringDeclaration.kt");
     }
 
     @TestMetadata("ea101715.kt")
     public void testEa101715() throws Exception {
-        runTest("../uast-kotlin/testData/ea101715.kt");
+        runTest("../uast-kotlin/tests/testData/ea101715.kt");
     }
 
     @TestMetadata("Elvis.kt")
     public void testElvis() throws Exception {
-        runTest("../uast-kotlin/testData/Elvis.kt");
+        runTest("../uast-kotlin/tests/testData/Elvis.kt");
     }
 
     @TestMetadata("ElvisType.kt")
     public void testElvisType() throws Exception {
-        runTest("../uast-kotlin/testData/ElvisType.kt");
+        runTest("../uast-kotlin/tests/testData/ElvisType.kt");
     }
 
     @TestMetadata("EnumValueMembers.kt")
     public void testEnumValueMembers() throws Exception {
-        runTest("../uast-kotlin/testData/EnumValueMembers.kt");
+        runTest("../uast-kotlin/tests/testData/EnumValueMembers.kt");
     }
 
     @TestMetadata("EnumValuesConstructors.kt")
     public void testEnumValuesConstructors() throws Exception {
-        runTest("../uast-kotlin/testData/EnumValuesConstructors.kt");
+        runTest("../uast-kotlin/tests/testData/EnumValuesConstructors.kt");
     }
 
     @TestMetadata("IfStatement.kt")
     public void testIfStatement() throws Exception {
-        runTest("../uast-kotlin/testData/IfStatement.kt");
+        runTest("../uast-kotlin/tests/testData/IfStatement.kt");
     }
 
     @TestMetadata("Imports.kt")
     public void testImports() throws Exception {
-        runTest("../uast-kotlin/testData/Imports.kt");
+        runTest("../uast-kotlin/tests/testData/Imports.kt");
     }
 
     @TestMetadata("In.kt")
     public void testIn() throws Exception {
-        runTest("../uast-kotlin/testData/In.kt");
+        runTest("../uast-kotlin/tests/testData/In.kt");
     }
 
     @TestMetadata("InferenceInsideUnresolvedConstructor.kt")
     public void testInferenceInsideUnresolvedConstructor() throws Exception {
-        runTest("../uast-kotlin/testData/InferenceInsideUnresolvedConstructor.kt");
+        runTest("../uast-kotlin/tests/testData/InferenceInsideUnresolvedConstructor.kt");
     }
 
     @TestMetadata("InnerClasses.kt")
     public void testInnerClasses() throws Exception {
-        runTest("../uast-kotlin/testData/InnerClasses.kt");
+        runTest("../uast-kotlin/tests/testData/InnerClasses.kt");
     }
 
     @TestMetadata("InnerNonFixedTypeVariable.kt")
     public void testInnerNonFixedTypeVariable() throws Exception {
-        runTest("../uast-kotlin/testData/InnerNonFixedTypeVariable.kt");
+        runTest("../uast-kotlin/tests/testData/InnerNonFixedTypeVariable.kt");
+    }
+
+    @TestMetadata("LambdaExpressionFunctionalInterfaceType.kt")
+    public void testLambdaExpressionFunctionalInterfaceType() throws Exception {
+        runTest("../uast-kotlin/tests/testData/LambdaExpressionFunctionalInterfaceType.kt");
     }
 
     @TestMetadata("LambdaParameters.kt")
     public void testLambdaParameters() throws Exception {
-        runTest("../uast-kotlin/testData/LambdaParameters.kt");
+        runTest("../uast-kotlin/tests/testData/LambdaParameters.kt");
     }
 
     @TestMetadata("LambdaReturn.kt")
     public void testLambdaReturn() throws Exception {
-        runTest("../uast-kotlin/testData/LambdaReturn.kt");
+        runTest("../uast-kotlin/tests/testData/LambdaReturn.kt");
     }
 
     @TestMetadata("Lambdas.kt")
     public void testLambdas() throws Exception {
-        runTest("../uast-kotlin/testData/Lambdas.kt");
+        runTest("../uast-kotlin/tests/testData/Lambdas.kt");
     }
 
     @TestMetadata("LocalDeclarations.kt")
     public void testLocalDeclarations() throws Exception {
-        runTest("../uast-kotlin/testData/LocalDeclarations.kt");
+        runTest("../uast-kotlin/tests/testData/LocalDeclarations.kt");
     }
 
     @TestMetadata("LocalVariableWithAnnotation.kt")
     public void testLocalVariableWithAnnotation() throws Exception {
-        runTest("../uast-kotlin/testData/LocalVariableWithAnnotation.kt");
+        runTest("../uast-kotlin/tests/testData/LocalVariableWithAnnotation.kt");
     }
 
     @TestMetadata("ManyAlternatives.kt")
     public void testManyAlternatives() throws Exception {
-        runTest("../uast-kotlin/testData/ManyAlternatives.kt");
+        runTest("../uast-kotlin/tests/testData/ManyAlternatives.kt");
     }
 
     @TestMetadata("MethodReference.kt")
     public void testMethodReference() throws Exception {
-        runTest("../uast-kotlin/testData/MethodReference.kt");
+        runTest("../uast-kotlin/tests/testData/MethodReference.kt");
     }
 
     @TestMetadata("NameContainingFile.kt")
     public void testNameContainingFile() throws Exception {
-        runTest("../uast-kotlin/testData/NameContainingFile.kt");
+        runTest("../uast-kotlin/tests/testData/NameContainingFile.kt");
     }
 
     @TestMetadata("NonTrivialIdentifiers.kt")
     public void testNonTrivialIdentifiers() throws Exception {
-        runTest("../uast-kotlin/testData/NonTrivialIdentifiers.kt");
+        runTest("../uast-kotlin/tests/testData/NonTrivialIdentifiers.kt");
     }
 
     @TestMetadata("ParameterPropertyWithAnnotation.kt")
     public void testParameterPropertyWithAnnotation() throws Exception {
-        runTest("../uast-kotlin/testData/ParameterPropertyWithAnnotation.kt");
+        runTest("../uast-kotlin/tests/testData/ParameterPropertyWithAnnotation.kt");
     }
 
     @TestMetadata("ParametersDisorder.kt")
     public void testParametersDisorder() throws Exception {
-        runTest("../uast-kotlin/testData/ParametersDisorder.kt");
+        runTest("../uast-kotlin/tests/testData/ParametersDisorder.kt");
     }
 
     @TestMetadata("ParametersWithDefaultValues.kt")
     public void testParametersWithDefaultValues() throws Exception {
-        runTest("../uast-kotlin/testData/ParametersWithDefaultValues.kt");
+        runTest("../uast-kotlin/tests/testData/ParametersWithDefaultValues.kt");
     }
 
     @TestMetadata("PropertyAccessors.kt")
     public void testPropertyAccessors() throws Exception {
-        runTest("../uast-kotlin/testData/PropertyAccessors.kt");
+        runTest("../uast-kotlin/tests/testData/PropertyAccessors.kt");
     }
 
     @TestMetadata("PropertyDelegate.kt")
     public void testPropertyDelegate() throws Exception {
-        runTest("../uast-kotlin/testData/PropertyDelegate.kt");
+        runTest("../uast-kotlin/tests/testData/PropertyDelegate.kt");
     }
 
     @TestMetadata("PropertyInitializer.kt")
     public void testPropertyInitializer() throws Exception {
-        runTest("../uast-kotlin/testData/PropertyInitializer.kt");
+        runTest("../uast-kotlin/tests/testData/PropertyInitializer.kt");
     }
 
     @TestMetadata("PropertyInitializerWithoutSetter.kt")
     public void testPropertyInitializerWithoutSetter() throws Exception {
-        runTest("../uast-kotlin/testData/PropertyInitializerWithoutSetter.kt");
+        runTest("../uast-kotlin/tests/testData/PropertyInitializerWithoutSetter.kt");
     }
 
     @TestMetadata("PropertyReferences.kt")
     public void testPropertyReferences() throws Exception {
-        runTest("../uast-kotlin/testData/PropertyReferences.kt");
+        runTest("../uast-kotlin/tests/testData/PropertyReferences.kt");
     }
 
     @TestMetadata("PropertyWithAnnotation.kt")
     public void testPropertyWithAnnotation() throws Exception {
-        runTest("../uast-kotlin/testData/PropertyWithAnnotation.kt");
+        runTest("../uast-kotlin/tests/testData/PropertyWithAnnotation.kt");
     }
 
     @TestMetadata("QualifiedConstructorCall.kt")
     public void testQualifiedConstructorCall() throws Exception {
-        runTest("../uast-kotlin/testData/QualifiedConstructorCall.kt");
+        runTest("../uast-kotlin/tests/testData/QualifiedConstructorCall.kt");
     }
 
     @TestMetadata("ReceiverFun.kt")
     public void testReceiverFun() throws Exception {
-        runTest("../uast-kotlin/testData/ReceiverFun.kt");
+        runTest("../uast-kotlin/tests/testData/ReceiverFun.kt");
     }
 
     @TestMetadata("Reified.kt")
     public void testReified() throws Exception {
-        runTest("../uast-kotlin/testData/Reified.kt");
+        runTest("../uast-kotlin/tests/testData/Reified.kt");
     }
 
     @TestMetadata("ReifiedParameters.kt")
     public void testReifiedParameters() throws Exception {
-        runTest("../uast-kotlin/testData/ReifiedParameters.kt");
+        runTest("../uast-kotlin/tests/testData/ReifiedParameters.kt");
     }
 
     @TestMetadata("ReifiedResolve.kt")
     public void testReifiedResolve() throws Exception {
-        runTest("../uast-kotlin/testData/ReifiedResolve.kt");
+        runTest("../uast-kotlin/tests/testData/ReifiedResolve.kt");
     }
 
     @TestMetadata("ReifiedReturnType.kt")
     public void testReifiedReturnType() throws Exception {
-        runTest("../uast-kotlin/testData/ReifiedReturnType.kt");
+        runTest("../uast-kotlin/tests/testData/ReifiedReturnType.kt");
     }
 
     @TestMetadata("Resolve.kt")
     public void testResolve() throws Exception {
-        runTest("../uast-kotlin/testData/Resolve.kt");
+        runTest("../uast-kotlin/tests/testData/Resolve.kt");
     }
 
     @TestMetadata("SAM.kt")
     public void testSAM() throws Exception {
-        runTest("../uast-kotlin/testData/SAM.kt");
+        runTest("../uast-kotlin/tests/testData/SAM.kt");
     }
 
     @TestMetadata("Simple.kt")
     public void testSimple() throws Exception {
-        runTest("../uast-kotlin/testData/Simple.kt");
+        runTest("../uast-kotlin/tests/testData/Simple.kt");
     }
 
     @TestMetadata("SimpleAnnotated.kt")
     public void testSimpleAnnotated() throws Exception {
-        runTest("../uast-kotlin/testData/SimpleAnnotated.kt");
+        runTest("../uast-kotlin/tests/testData/SimpleAnnotated.kt");
     }
 
     @TestMetadata("StringTemplate.kt")
     public void testStringTemplate() throws Exception {
-        runTest("../uast-kotlin/testData/StringTemplate.kt");
+        runTest("../uast-kotlin/tests/testData/StringTemplate.kt");
     }
 
     @TestMetadata("StringTemplateComplex.kt")
     public void testStringTemplateComplex() throws Exception {
-        runTest("../uast-kotlin/testData/StringTemplateComplex.kt");
+        runTest("../uast-kotlin/tests/testData/StringTemplateComplex.kt");
     }
 
     @TestMetadata("StringTemplateComplexForUInjectionHost.kt")
     public void testStringTemplateComplexForUInjectionHost() throws Exception {
-        runTest("../uast-kotlin/testData/StringTemplateComplexForUInjectionHost.kt");
+        runTest("../uast-kotlin/tests/testData/StringTemplateComplexForUInjectionHost.kt");
     }
 
     @TestMetadata("StringTemplateInClass.kt")
     public void testStringTemplateInClass() throws Exception {
-        runTest("../uast-kotlin/testData/StringTemplateInClass.kt");
+        runTest("../uast-kotlin/tests/testData/StringTemplateInClass.kt");
     }
 
     @TestMetadata("StringTemplateWithVar.kt")
     public void testStringTemplateWithVar() throws Exception {
-        runTest("../uast-kotlin/testData/StringTemplateWithVar.kt");
+        runTest("../uast-kotlin/tests/testData/StringTemplateWithVar.kt");
     }
 
     @TestMetadata("SuperCalls.kt")
     public void testSuperCalls() throws Exception {
-        runTest("../uast-kotlin/testData/SuperCalls.kt");
+        runTest("../uast-kotlin/tests/testData/SuperCalls.kt");
     }
 
     @TestMetadata("Suspend.kt")
     public void testSuspend() throws Exception {
-        runTest("../uast-kotlin/testData/Suspend.kt");
+        runTest("../uast-kotlin/tests/testData/Suspend.kt");
     }
 
     @TestMetadata("TryCatch.kt")
     public void testTryCatch() throws Exception {
-        runTest("../uast-kotlin/testData/TryCatch.kt");
+        runTest("../uast-kotlin/tests/testData/TryCatch.kt");
     }
 
     @TestMetadata("TypeAliasConstructorReference.kt")
     public void testTypeAliasConstructorReference() throws Exception {
-        runTest("../uast-kotlin/testData/TypeAliasConstructorReference.kt");
+        runTest("../uast-kotlin/tests/testData/TypeAliasConstructorReference.kt");
     }
 
     @TestMetadata("TypeAliasExpansionWithOtherAliasInArgument.kt")
     public void testTypeAliasExpansionWithOtherAliasInArgument() throws Exception {
-        runTest("../uast-kotlin/testData/TypeAliasExpansionWithOtherAliasInArgument.kt");
+        runTest("../uast-kotlin/tests/testData/TypeAliasExpansionWithOtherAliasInArgument.kt");
     }
 
     @TestMetadata("TypeAliases.kt")
     public void testTypeAliases() throws Exception {
-        runTest("../uast-kotlin/testData/TypeAliases.kt");
+        runTest("../uast-kotlin/tests/testData/TypeAliases.kt");
     }
 
     @TestMetadata("TypeInAnnotation.kt")
     public void testTypeInAnnotation() throws Exception {
-        runTest("../uast-kotlin/testData/TypeInAnnotation.kt");
+        runTest("../uast-kotlin/tests/testData/TypeInAnnotation.kt");
     }
 
     @TestMetadata("TypeReferences.kt")
     public void testTypeReferences() throws Exception {
-        runTest("../uast-kotlin/testData/TypeReferences.kt");
+        runTest("../uast-kotlin/tests/testData/TypeReferences.kt");
     }
 
     @TestMetadata("UnexpectedContainerException.kt")
     public void testUnexpectedContainerException() throws Exception {
-        runTest("../uast-kotlin/testData/UnexpectedContainerException.kt");
+        runTest("../uast-kotlin/tests/testData/UnexpectedContainerException.kt");
     }
 
     @TestMetadata("WhenAndDestructing.kt")
     public void testWhenAndDestructing() throws Exception {
-        runTest("../uast-kotlin/testData/WhenAndDestructing.kt");
+        runTest("../uast-kotlin/tests/testData/WhenAndDestructing.kt");
     }
 
     @TestMetadata("WhenIs.kt")
     public void testWhenIs() throws Exception {
-        runTest("../uast-kotlin/testData/WhenIs.kt");
+        runTest("../uast-kotlin/tests/testData/WhenIs.kt");
     }
 
     @TestMetadata("WhenStringLiteral.kt")
     public void testWhenStringLiteral() throws Exception {
-        runTest("../uast-kotlin/testData/WhenStringLiteral.kt");
+        runTest("../uast-kotlin/tests/testData/WhenStringLiteral.kt");
     }
 }
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastTypesTestGenerated.java b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastTypesTestGenerated.java
index 8ad70c2ca87e..eacc2ec1c293 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastTypesTestGenerated.java
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastTypesTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.uast;
 
@@ -98,11 +98,6 @@ public class FirLegacyUastTypesTestGenerated extends AbstractFirLegacyUastTypesT
         runTest("../uast-kotlin/tests/testData/CycleInTypeParameters.kt");
     }
 
-    @TestMetadata("DataClassInheritsAbstractClassWithEquals.kt")
-    public void testDataClassInheritsAbstractClassWithEquals() throws Exception {
-        runTest("../uast-kotlin/testData/DataClassInheritsAbstractClassWithEquals.kt");
-    }
-
     @TestMetadata("DefaultImpls.kt")
     public void testDefaultImpls() throws Exception {
         runTest("../uast-kotlin/tests/testData/DefaultImpls.kt");
@@ -183,6 +178,11 @@ public class FirLegacyUastTypesTestGenerated extends AbstractFirLegacyUastTypesT
         runTest("../uast-kotlin/tests/testData/InnerNonFixedTypeVariable.kt");
     }
 
+    @TestMetadata("LambdaExpressionFunctionalInterfaceType.kt")
+    public void testLambdaExpressionFunctionalInterfaceType() throws Exception {
+        runTest("../uast-kotlin/tests/testData/LambdaExpressionFunctionalInterfaceType.kt");
+    }
+
     @TestMetadata("LambdaParameters.kt")
     public void testLambdaParameters() throws Exception {
         runTest("../uast-kotlin/tests/testData/LambdaParameters.kt");
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastValuesTestGenerated.java b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastValuesTestGenerated.java
index 25f5dabd3d65..e616c8185eb7 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastValuesTestGenerated.java
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastValuesTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.uast;
 
@@ -98,11 +98,6 @@ public class FirLegacyUastValuesTestGenerated extends AbstractFirLegacyUastValue
         runTest("../uast-kotlin/tests/testData/CycleInTypeParameters.kt");
     }
 
-    @TestMetadata("DataClassInheritsAbstractClassWithEquals.kt")
-    public void testDataClassInheritsAbstractClassWithEquals() throws Exception {
-        runTest("../uast-kotlin/testData/DataClassInheritsAbstractClassWithEquals.kt");
-    }
-
     @TestMetadata("DefaultImpls.kt")
     public void testDefaultImpls() throws Exception {
         runTest("../uast-kotlin/tests/testData/DefaultImpls.kt");
@@ -183,6 +178,11 @@ public class FirLegacyUastValuesTestGenerated extends AbstractFirLegacyUastValue
         runTest("../uast-kotlin/tests/testData/InnerNonFixedTypeVariable.kt");
     }
 
+    @TestMetadata("LambdaExpressionFunctionalInterfaceType.kt")
+    public void testLambdaExpressionFunctionalInterfaceType() throws Exception {
+        runTest("../uast-kotlin/tests/testData/LambdaExpressionFunctionalInterfaceType.kt");
+    }
+
     @TestMetadata("LambdaParameters.kt")
     public void testLambdaParameters() throws Exception {
         runTest("../uast-kotlin/tests/testData/LambdaParameters.kt");
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastApiTest.kt b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastApiTest.kt
index c42c3a51f8a3..1f2c64c7d809 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastApiTest.kt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastApiTest.kt
@@ -26,12 +26,10 @@ open class FirUastApiTest : AbstractFirUastTest() {
     private val whitelist : Set<String> = setOf(
         // TODO: resolve to inline and stdlib
         "uast-kotlin/testData/Resolve.kt",
-        // TODO: resolve to local declarations/constructors
-        "uast-kotlin/testData/LocalDeclarations.kt",
         // TODO: return type of inline functions
-        "uast-kotlin/testData/ReifiedReturnType.kt",
+        "uast-kotlin/tests/testData/ReifiedReturnType.kt",
         // TODO: PsiMethod -> getFunctionalInterfaceMethod
-        "uast-kotlin/testData/LambdaParameters.kt",
+        "uast-kotlin/tests/testData/LambdaParameters.kt",
     )
 
     override fun isExpectedToFail(filePath: String, fileContent: String): Boolean {
@@ -54,7 +52,7 @@ open class FirUastApiTest : AbstractFirUastTest() {
         }
     }
 
-    @TestMetadata("../uast-kotlin/testData")
+    @TestMetadata("../uast-kotlin/tests/testData")
     @TestDataPath("\$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners::class)
     class Legacy : FirUastApiTest(), UastApiTestBase {
@@ -66,152 +64,152 @@ open class FirUastApiTest : AbstractFirUastTest() {
 
         @TestMetadata("AnnotationParameters.kt")
         fun testAnnotationParameters() {
-            doCheck("uast-kotlin/testData/AnnotationParameters.kt", ::checkCallbackForAnnotationParameters)
+            doCheck("uast-kotlin/tests/testData/AnnotationParameters.kt", ::checkCallbackForAnnotationParameters)
         }
 
         @TestMetadata("StringTemplateInClass.kt")
         fun testStringTemplateInClass() {
-            doCheck("uast-kotlin/testData/StringTemplateInClass.kt", ::checkCallbackForStringTemplateInClass)
+            doCheck("uast-kotlin/tests/testData/StringTemplateInClass.kt", ::checkCallbackForStringTemplateInClass)
         }
 
         @TestMetadata("StringTemplateWithVar.kt")
         fun testStringTemplateWithVar() {
-            doCheck("uast-kotlin/testData/StringTemplateWithVar.kt", ::checkCallbackForStringTemplateWithVar)
+            doCheck("uast-kotlin/tests/testData/StringTemplateWithVar.kt", ::checkCallbackForStringTemplateWithVar)
         }
 
         @TestMetadata("NameContainingFile.kt")
         fun testNameContainingFile() {
-            doCheck("uast-kotlin/testData/NameContainingFile.kt", ::checkCallbackForNameContainingFile)
+            doCheck("uast-kotlin/tests/testData/NameContainingFile.kt", ::checkCallbackForNameContainingFile)
         }
 
         @TestMetadata("DefaultImpls.kt")
         fun testDefaultImpls() {
-            doCheck("uast-kotlin/testData/DefaultImpls.kt", ::checkCallbackForDefaultImpls)
+            doCheck("uast-kotlin/tests/testData/DefaultImpls.kt", ::checkCallbackForDefaultImpls)
         }
 
         @TestMetadata("ParameterPropertyWithAnnotation.kt")
         fun testParameterPropertyWithAnnotation() {
-            doCheck("uast-kotlin/testData/ParameterPropertyWithAnnotation.kt", ::checkCallbackForParameterPropertyWithAnnotation)
+            doCheck("uast-kotlin/tests/testData/ParameterPropertyWithAnnotation.kt", ::checkCallbackForParameterPropertyWithAnnotation)
         }
 
         @TestMetadata("TypeInAnnotation.kt")
         fun testTypeInAnnotation() {
-            doCheck("uast-kotlin/testData/TypeInAnnotation.kt", ::checkCallbackForTypeInAnnotation)
+            doCheck("uast-kotlin/tests/testData/TypeInAnnotation.kt", ::checkCallbackForTypeInAnnotation)
         }
 
         @TestMetadata("ElvisType.kt")
         fun testElvisType() {
-            doCheck("uast-kotlin/testData/ElvisType.kt", ::checkCallbackForElvisType)
+            doCheck("uast-kotlin/tests/testData/ElvisType.kt", ::checkCallbackForElvisType)
         }
 
         @TestMetadata("IfStatement.kt")
         fun testIfStatement() {
-            doCheck("uast-kotlin/testData/IfStatement.kt", ::checkCallbackForIfStatement)
+            doCheck("uast-kotlin/tests/testData/IfStatement.kt", ::checkCallbackForIfStatement)
         }
 
         @TestMetadata("WhenStringLiteral.kt")
         fun testWhenStringLiteral() {
-            doCheck("uast-kotlin/testData/WhenStringLiteral.kt", ::checkCallbackForWhenStringLiteral)
+            doCheck("uast-kotlin/tests/testData/WhenStringLiteral.kt", ::checkCallbackForWhenStringLiteral)
         }
 
         @TestMetadata("WhenAndDestructing.kt")
         fun testWhenAndDestructing() {
-            doCheck("uast-kotlin/testData/WhenAndDestructing.kt", ::checkCallbackForWhenAndDestructing)
+            doCheck("uast-kotlin/tests/testData/WhenAndDestructing.kt", ::checkCallbackForWhenAndDestructing)
         }
 
         @TestMetadata("BrokenMethod.kt")
         fun testBrokenMethod() {
-            doCheck("uast-kotlin/testData/BrokenMethod.kt", ::checkCallbackForBrokenMethod)
+            doCheck("uast-kotlin/tests/testData/BrokenMethod.kt", ::checkCallbackForBrokenMethod)
         }
 
         @TestMetadata("EnumValuesConstructors.kt")
         fun testEnumValuesConstructors() {
-            doCheck("uast-kotlin/testData/EnumValuesConstructors.kt", ::checkCallbackForEnumValuesConstructors)
+            doCheck("uast-kotlin/tests/testData/EnumValuesConstructors.kt", ::checkCallbackForEnumValuesConstructors)
         }
 
         @TestMetadata("EnumValueMembers.kt")
         fun testEnumValueMembers() {
-            doCheck("uast-kotlin/testData/EnumValueMembers.kt", ::checkCallbackForEnumValueMembers)
+            doCheck("uast-kotlin/tests/testData/EnumValueMembers.kt", ::checkCallbackForEnumValueMembers)
         }
 
         @TestMetadata("SimpleAnnotated.kt")
         fun testSimpleAnnotated() {
-            doCheck("uast-kotlin/testData/SimpleAnnotated.kt", ::checkCallbackForSimpleAnnotated)
+            doCheck("uast-kotlin/tests/testData/SimpleAnnotated.kt", ::checkCallbackForSimpleAnnotated)
         }
 
         @TestMetadata("SuperCalls.kt")
         fun testSuperCalls() {
-            doCheck("uast-kotlin/testData/SuperCalls.kt", ::checkCallbackForSuperCalls)
+            doCheck("uast-kotlin/tests/testData/SuperCalls.kt", ::checkCallbackForSuperCalls)
         }
 
         @TestMetadata("Anonymous.kt")
         fun testAnonymous() {
-            doCheck("uast-kotlin/testData/Anonymous.kt", ::checkCallbackForAnonymous)
+            doCheck("uast-kotlin/tests/testData/Anonymous.kt", ::checkCallbackForAnonymous)
         }
 
         @TestMetadata("TypeAliases.kt")
         fun testTypeAliases() {
-            doCheck("uast-kotlin/testData/TypeAliases.kt", ::checkCallbackForTypeAliases)
+            doCheck("uast-kotlin/tests/testData/TypeAliases.kt", ::checkCallbackForTypeAliases)
         }
 
         @TestMetadata("AnnotationComplex.kt")
         fun testAnnotationComplex() {
-            doCheck("uast-kotlin/testData/AnnotationComplex.kt", ::checkCallbackForAnnotationComplex)
+            doCheck("uast-kotlin/tests/testData/AnnotationComplex.kt", ::checkCallbackForAnnotationComplex)
         }
 
         @TestMetadata("ParametersDisorder.kt")
         fun testParametersDisorder() {
-            doCheck("uast-kotlin/testData/ParametersDisorder.kt", ::checkCallbackForParametersDisorder)
+            doCheck("uast-kotlin/tests/testData/ParametersDisorder.kt", ::checkCallbackForParametersDisorder)
         }
 
         @TestMetadata("Resolve.kt")
         fun testResolve() {
-            doCheck("uast-kotlin/testData/Resolve.kt", ::checkCallbackForResolve)
+            doCheck("uast-kotlin/tests/testData/Resolve.kt", ::checkCallbackForResolve)
         }
 
         @TestMetadata("Lambdas.kt")
         fun testLambdas() {
-            doCheck("uast-kotlin/testData/Lambdas.kt", ::checkCallbackForLambdas)
+            doCheck("uast-kotlin/tests/testData/Lambdas.kt", ::checkCallbackForLambdas)
         }
 
         @TestMetadata("LocalDeclarations.kt")
         fun testLocalDeclarations() {
-            doCheck("uast-kotlin/testData/LocalDeclarations.kt", ::checkCallbackForLocalDeclarations)
+            doCheck("uast-kotlin/tests/testData/LocalDeclarations.kt", ::checkCallbackForLocalDeclarations)
         }
 
         @TestMetadata("Elvis.kt")
         fun testElvis() {
-            doCheck("uast-kotlin/testData/Elvis.kt", ::checkCallbackForElvis)
+            doCheck("uast-kotlin/tests/testData/Elvis.kt", ::checkCallbackForElvis)
         }
 
         @TestMetadata("TypeReferences.kt")
         fun testTypeReferences() {
-            doCheck("uast-kotlin/testData/TypeReferences.kt", ::checkCallbackForTypeReferences)
+            doCheck("uast-kotlin/tests/testData/TypeReferences.kt", ::checkCallbackForTypeReferences)
         }
 
         @TestMetadata("ReifiedReturnType.kt")
         fun testReifiedReturnType() {
-            doCheck("uast-kotlin/testData/ReifiedReturnType.kt", ::checkCallbackForReifiedReturnType)
+            doCheck("uast-kotlin/tests/testData/ReifiedReturnType.kt", ::checkCallbackForReifiedReturnType)
         }
 
         @TestMetadata("ReifiedParameters.kt")
         fun testReifiedParameters() {
-          doCheck("uast-kotlin/testData/ReifiedParameters.kt", ::checkCallbackForReifiedParameters)
+          doCheck("uast-kotlin/tests/testData/ReifiedParameters.kt", ::checkCallbackForReifiedParameters)
         }
 
         @TestMetadata("LambdaParameters.kt")
         fun testLambdaParameters() {
-            doCheck("uast-kotlin/testData/LambdaParameters.kt", ::checkCallbackForLambdaParameters)
+            doCheck("uast-kotlin/tests/testData/LambdaParameters.kt", ::checkCallbackForLambdaParameters)
         }
 
         @TestMetadata("SAM.kt")
         fun testSAM() {
-            doCheck("uast-kotlin/testData/SAM.kt", ::checkCallbackForSAM)
+            doCheck("uast-kotlin/tests/testData/SAM.kt", ::checkCallbackForSAM)
         }
 
         @TestMetadata("Simple.kt")
         fun testSimple() {
-            doCheck("uast-kotlin/testData/Simple.kt", ::checkCallbackForSimple)
+            doCheck("uast-kotlin/tests/testData/Simple.kt", ::checkCallbackForSimple)
         }
     }
 }
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastCommentsTest.java b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastCommentsTest.java
index 365e4532cbd8..77410b3f6bea 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastCommentsTest.java
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastCommentsTest.java
@@ -18,6 +18,11 @@ public class FirUastCommentsTest extends AbstractFirUastCommentsTest {
         KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
     }
 
+    @TestMetadata("commentsOnProperties.kt")
+    public void testCommentsOnProperties() throws Exception {
+        runTest("testData/declaration/commentsOnProperties.kt");
+    }
+
     @TestMetadata("facade.kt")
     public void testFacade() throws Exception {
         runTest("testData/declaration/facade.kt");
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastDeclarationTestGenerated.java b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastDeclarationTestGenerated.java
index d3b789696ada..5192824829ae 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastDeclarationTestGenerated.java
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastDeclarationTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.uast;
 
@@ -28,6 +28,11 @@ public class FirUastDeclarationTestGenerated extends AbstractFirUastDeclarationT
         runTest("testData/declaration/annotationOnElvis.kt");
     }
 
+    @TestMetadata("commentsOnProperties.kt")
+    public void testCommentsOnProperties() throws Exception {
+        runTest("testData/declaration/commentsOnProperties.kt");
+    }
+
     @TestMetadata("doWhile.kt")
     public void testDoWhile() throws Exception {
         runTest("testData/declaration/doWhile.kt");
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastResolveApiFixtureTest.kt b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastResolveApiFixtureTest.kt
index 741fd133e2b7..84cbfa07354e 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastResolveApiFixtureTest.kt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastResolveApiFixtureTest.kt
@@ -35,8 +35,6 @@ class FirUastResolveApiFixtureTest : KotlinLightCodeInsightFixtureTestCase(), Ua
         "MultiInvokableObjectResolve",
         // TODO: multiResolve
         "MultiResolveJvmOverloads",
-        // TODO: local resolution
-        "LocalResolve",
         // TODO: resolve annotation param to annotation ctor ??
         "ResolveCompiledAnnotation",
     )
@@ -111,10 +109,18 @@ class FirUastResolveApiFixtureTest : KotlinLightCodeInsightFixtureTestCase(), Ua
         doCheck("LocalResolve", ::checkLocalResolve)
     }
 
+    fun testResolveLocalDefaultConstructor() {
+        doCheck("ResolveLocalDefaultConstructor", ::checkResolveLocalDefaultConstructor)
+    }
+
     fun testResolveCompiledAnnotation() {
         doCheck("ResolveCompiledAnnotation", ::checkResolveCompiledAnnotation)
     }
 
+    fun testResolveSyntheticMethod() {
+        doCheck("ResolveSyntheticMethod", ::checkResolveSyntheticMethod)
+    }
+
     fun testAssigningArrayElementType() {
         doCheck("AssigningArrayElementType", ::checkAssigningArrayElementType)
     }
@@ -126,4 +132,8 @@ class FirUastResolveApiFixtureTest : KotlinLightCodeInsightFixtureTestCase(), Ua
     fun testDetailsOfDeprecatedHidden() {
         doCheck("DetailsOfDeprecatedHidden", ::checkDetailsOfDeprecatedHidden)
     }
+
+    fun testSyntheticEnumMethods() {
+        doCheck("SyntheticEnumMethods", ::checkSyntheticEnumMethods)
+    }
 }
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastResolveApiTest.kt b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastResolveApiTest.kt
index 1bc70ae60bf8..dfd5847f1bdf 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastResolveApiTest.kt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastResolveApiTest.kt
@@ -58,7 +58,23 @@ open class FirUastResolveApiTest : AbstractFirUastTest() {
         }
     }
 
-    @TestMetadata("../uast-kotlin/testData")
+    @TestMetadata("plugins/uast-kotlin-fir/testData/type")
+    @TestDataPath("\$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners::class)
+    class Type : FirUastResolveApiTest(), UastResolveApiTestBase {
+        override val isFirUastPlugin: Boolean = true
+
+        override fun check(filePath: String, file: UFile) {
+            // Bogus
+        }
+
+        @TestMetadata("threadSafe.kt")
+        fun testThreadSafe() {
+            doCheck("uast-kotlin-fir/testData/type/threadSafe.kt", ::checkThreadSafe)
+        }
+    }
+
+    @TestMetadata("../uast-kotlin/tests/testData")
     @TestDataPath("\$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners::class)
     class Legacy : FirUastResolveApiTest(), UastResolveApiTestBase {
@@ -70,16 +86,16 @@ open class FirUastResolveApiTest : AbstractFirUastTest() {
 
         @TestMetadata("MethodReference.kt")
         fun testMethodReference() {
-            doCheck("uast-kotlin/testData/MethodReference.kt", ::checkCallbackForMethodReference)
+            doCheck("uast-kotlin/tests/testData/MethodReference.kt", ::checkCallbackForMethodReference)
         }
 
         @TestMetadata("Imports.kt")
         fun testImports() {
-            doCheck("uast-kotlin/testData/Imports.kt", ::checkCallbackForImports)
+            doCheck("uast-kotlin/tests/testData/Imports.kt", ::checkCallbackForImports)
         }
 
         fun testReceiverFun() {
-            doCheck("uast-kotlin/testData/ReceiverFun.kt", ::checkCallbackForReceiverFun)
+            doCheck("uast-kotlin/tests/testData/ReceiverFun.kt", ::checkCallbackForReceiverFun)
         }
     }
 }
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastTypesTestGenerated.java b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastTypesTestGenerated.java
index 903995bf7b09..5dd3f48d46f8 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastTypesTestGenerated.java
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastTypesTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.uast;
 
@@ -43,6 +43,16 @@ public class FirUastTypesTestGenerated extends AbstractFirUastTypesTest {
         runTest("testData/type/classLiteral.kt");
     }
 
+    @TestMetadata("objectLiteral.kt")
+    public void testObjectLiteral() throws Exception {
+        runTest("testData/type/objectLiteral.kt");
+    }
+
+    @TestMetadata("threadSafe.kt")
+    public void testThreadSafe() throws Exception {
+        runTest("testData/type/threadSafe.kt");
+    }
+
     @TestMetadata("typeCast.kt")
     public void testTypeCast() throws Exception {
         runTest("testData/type/typeCast.kt");