FIR IDE: Add more tests for type conflicts

idea/idea-fir/tests/org/jetbrains/kotlin/shortenRefs/FirShortenRefsTestGenerated.java

@@ -56,9 +56,39 @@ public class FirShortenRefsTestGenerated extends AbstractFirShortenRefsTest {
             runTest("idea/testData/shortenRefsFir/types/ParameterTypeGenericTypes.kt");
         }
 
+        @TestMetadata("ParameterTypeImportedTypeWins.kt")
+        public void testParameterTypeImportedTypeWins() throws Exception {
+            runTest("idea/testData/shortenRefsFir/types/ParameterTypeImportedTypeWins.kt");
+        }
+
         @TestMetadata("ParameterTypeNestedType.kt")
         public void testParameterTypeNestedType() throws Exception {
             runTest("idea/testData/shortenRefsFir/types/ParameterTypeNestedType.kt");
         }
+
+        @TestMetadata("ParameterTypeStarImportedTypeLoses.kt")
+        public void testParameterTypeStarImportedTypeLoses() throws Exception {
+            runTest("idea/testData/shortenRefsFir/types/ParameterTypeStarImportedTypeLoses.kt");
+        }
+
+        @TestMetadata("ParameterTypeTopLevelTypeLoses.kt")
+        public void testParameterTypeTopLevelTypeLoses() throws Exception {
+            runTest("idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeLoses.kt");
+        }
+
+        @TestMetadata("ParameterTypeTopLevelTypeWins.kt")
+        public void testParameterTypeTopLevelTypeWins() throws Exception {
+            runTest("idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeWins.kt");
+        }
+
+        @TestMetadata("VariableType.kt")
+        public void testVariableType() throws Exception {
+            runTest("idea/testData/shortenRefsFir/types/VariableType.kt");
+        }
+
+        @TestMetadata("VariableTypeConflictWithLocalType.kt")
+        public void testVariableTypeConflictWithLocalType() throws Exception {
+            runTest("idea/testData/shortenRefsFir/types/VariableTypeConflictWithLocalType.kt");
+        }
     }
 }

idea/testData/shortenRefsFir/types/ParameterTypeImportedTypeWins.dependency.kt

@@ -0,0 +1,3 @@
+package dependency
+
+class T

idea/testData/shortenRefsFir/types/ParameterTypeImportedTypeWins.kt

@@ -0,0 +1,8 @@
+// FIR_COMPARISON
+package test
+
+import dependency.T
+
+class T
+
+<selection>fun foo(t: dependency.T) {}</selection>

idea/testData/shortenRefsFir/types/ParameterTypeImportedTypeWins.kt.after

@@ -0,0 +1,8 @@
+// FIR_COMPARISON
+package test
+
+import dependency.T
+
+class T
+
+fun foo(t: T) {}

idea/testData/shortenRefsFir/types/ParameterTypeStarImportedTypeLoses.dependency.kt

@@ -0,0 +1,3 @@
+package dependency
+
+class T

idea/testData/shortenRefsFir/types/ParameterTypeStarImportedTypeLoses.kt

@@ -0,0 +1,8 @@
+// FIR_COMPARISON
+package test
+
+import dependency.*
+
+class T
+
+<selection>fun foo(t: dependency.T) {}</selection>

idea/testData/shortenRefsFir/types/ParameterTypeStarImportedTypeLoses.kt.after

@@ -0,0 +1,8 @@
+// FIR_COMPARISON
+package test
+
+import dependency.*
+
+class T
+
+fun foo(t: dependency.T) {}

idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeLoses.dependency.kt

@@ -0,0 +1,3 @@
+package dependency
+
+class T

idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeLoses.kt

@@ -0,0 +1,8 @@
+// FIR_COMPARISON
+package test
+
+import dependency.T
+
+class T
+
+<selection>fun foo(t: test.T) {}</selection>

idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeLoses.kt.after

@@ -0,0 +1,8 @@
+// FIR_COMPARISON
+package test
+
+import dependency.T
+
+class T
+
+fun foo(t: test.T) {}

idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeWins.dependency.kt

@@ -0,0 +1,3 @@
+package dependency
+
+class T

idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeWins.kt

@@ -0,0 +1,8 @@
+// FIR_COMPARISON
+package test
+
+import dependency.*
+
+class T
+
+<selection>fun foo(t: test.T) {}</selection>

idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeWins.kt.after

@@ -0,0 +1,8 @@
+// FIR_COMPARISON
+package test
+
+import dependency.*
+
+class T
+
+fun foo(t: T) {}

idea/testData/shortenRefsFir/types/VariableType.kt

@@ -0,0 +1,8 @@
+// FIR_COMPARISON
+package test
+
+class T
+
+fun foo() {
+    <selection>var t: test.T</selection>
+}

idea/testData/shortenRefsFir/types/VariableType.kt.after

@@ -0,0 +1,8 @@
+// FIR_COMPARISON
+package test
+
+class T
+
+fun foo() {
+    var t: T
+}

idea/testData/shortenRefsFir/types/VariableTypeConflictWithLocalType.kt

@@ -0,0 +1,10 @@
+// FIR_COMPARISON
+package test
+
+class T
+
+fun foo() {
+    class T
+
+    <selection>var t: test.T</selection>
+}

idea/testData/shortenRefsFir/types/VariableTypeConflictWithLocalType.kt.after

@@ -0,0 +1,10 @@
+// FIR_COMPARISON
+package test
+
+class T
+
+fun foo() {
+    class T
+
+    var t: test.T
+}