Fix local conflicts in 'Introduce import alias'

2019-03-19 00:31:22 +07:00
parent 9659453351
commit ccb1ae13ea
4 changed files with 62 additions and 5 deletions
@@ -0,0 +1,22 @@
+import Outer.Middle.Inner.Companion.foo
+
+class Outer {
+    class Middle {
+        class Inner {
+            companion object {
+                fun foo() {}
+            }
+        }
+    }
+}
+
+class Test() {
+    fun test2() {
+        val foo2 = 42
+        foo()
+    }
+    fun test() {
+        val foo1 = 1
+        foo<caret>()
+    }
+}
@@ -0,0 +1,22 @@
+import Outer.Middle.Inner.Companion.foo as foo3
+
+class Outer {
+    class Middle {
+        class Inner {
+            companion object {
+                fun foo() {}
+            }
+        }
+    }
+}
+
+class Test() {
+    fun test2() {
+        val foo2 = 42
+        foo3()
+    }
+    fun test() {
+        val foo1 = 1
+        foo3()
+    }
+}