azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Working on new imports insertion on copy/paste

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-02-11 20:33:55 +03:00
parent 4031357ae4
commit 6acba00599
35 changed files with 279 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/copyPaste/imports/AlreadyImportedViaStar.expected.kt
+3 -10
View File
@@ -1,21 +1,14 @@
package to
import a.*
import a.E.ENTRY
import a.Outer.Inner
import a.Outer.Nested
import a.Outer.NestedEnum
import a.Outer.NestedObj
import a.Outer.NestedTrait
import a.Outer.NestedAnnotation
fun f(a: A, t: T) {
fun f(p: A, t: T) {
g(A(c).ext())
O1.f()
O2
ENTRY
E.ENTRY
}
fun f2(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedTrait, a: NestedAnnotation) {
fun f2(i: Outer.Inner, n: Outer.Nested, e: Outer.NestedEnum, o: Outer.NestedObj, t: Outer.NestedTrait, a: Outer.NestedAnnotation) {
ClassObject
}
idea/testData/copyPaste/imports/AlreadyImportedViaStar.kt
+1 -1
View File
@@ -44,7 +44,7 @@ class ClassObject {
}
}
<selection>fun f(a: A, t: T) {
<selection>fun f(p: A, t: T) {
g(A(c).ext())
O1.f()
O2
idea/testData/copyPaste/imports/ClassObjectInner.expected.kt
+2 -7
View File
@@ -1,11 +1,6 @@
package to
import a.Outer.Inner
import a.Outer.Nested
import a.Outer.NestedEnum
import a.Outer.NestedObj
import a.Outer.NestedTrait
import a.Outer.NestedAnnotation
import a.Outer
fun f(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedTrait, a: NestedAnnotation) {
fun f(i: Outer.Inner, n: Outer.Nested, e: Outer.NestedEnum, o: Outer.NestedObj, t: Outer.NestedTrait, a: Outer.NestedAnnotation) {
}
idea/testData/copyPaste/imports/ClassResolvedToPackage.expected.kt
+1 -1
View File
@@ -3,6 +3,6 @@ package to
import a.a
fun f(i: a) {
a.a
a
a()
}
idea/testData/copyPaste/imports/ConflictForTypeWithTypeParameter.expected.kt
+2
View File
@@ -3,5 +3,7 @@ package to
class A<T> {
}
val a: A<String>? = null
fun f(b: a.A<Int>) {
}
idea/testData/copyPaste/imports/ConflictForTypeWithTypeParameter.to.kt
+2
View File
@@ -3,4 +3,6 @@ package to
class A<T> {
}
val a: A<String>? = null
<caret>
idea/testData/copyPaste/imports/ConflictWithClass.expected.kt
+2
View File
@@ -3,5 +3,7 @@ package to
class A() {
}
val a: A? = null
fun f(a: a.A) {
}
idea/testData/copyPaste/imports/ConflictWithClass.to.kt
+2
View File
@@ -3,4 +3,6 @@ package to
class A() {
}
val a: A? = null
<caret>
idea/testData/copyPaste/imports/DeepInnerClasses.expected.kt
+3 -9
View File
@@ -1,20 +1,14 @@
package to
import a.Outer.Nested.NN
import a.Outer.Nested.NI
import a.Outer.Inner.IN
import a.Outer.Inner.II
import a.Outer.Nested.NN2
import a.with
import a.Outer
import a.Outer.Inner.IN2
fun f(p1: NN, p2: NI, p3: IN, p4: II) {
NN2()
fun f(p1: Outer.Nested.NN, p2: Outer.Nested.NI, p3: Outer.Inner.IN, p4: Outer.Inner.II) {
Outer.Nested.NN2()
with(Outer.Nested()) {
NI2()
}
IN2()
Outer.Inner.IN2()
with(Outer().Inner()) {
II2()
}
idea/testData/copyPaste/imports/DelegatedProperty.expected.kt
+2 -2
View File
@@ -1,9 +1,9 @@
package to
import a.A
import a.get
import a.set
import a.A
class B {
var a by A()
var v by A()
}
idea/testData/copyPaste/imports/DelegatedProperty.kt
+1 -1
View File
@@ -12,5 +12,5 @@ fun T.set(thisRef: B, desc: PropertyMetadata, value: Int) {
class A(): T
<selection>class B {
var a by A()
var v by A()
}</selection>
idea/testData/copyPaste/imports/DependencyOnJava.dependency.java
+1 -1
View File
@@ -11,6 +11,6 @@ public class JavaClass {
public class InnerClass {
}
public class NestedClass {
public static class NestedClass {
}
}
idea/testData/copyPaste/imports/DependencyOnJava.expected.kt
+2 -4
View File
@@ -1,12 +1,10 @@
package to
import java.JavaClass
import java.JavaClass.staticMethod
import java.JavaClass.NestedClass
fun f(c: JavaClass) {
staticMethod()
JavaClass.staticMethod()
c.method()
c.InnerClass()
NestedClass()
JavaClass.NestedClass()
}
idea/testData/copyPaste/imports/DependencyOnKotlinLibrary.expected.kt
+6 -11
View File
@@ -1,28 +1,23 @@
package to
import d.A
import d.T
import d.g
import d.c
import d.ext
import d.A
import d.T
import d.Outer
import d.O1
import d.O2
import d.E.ENTRY
import d.Outer.Inner
import d.Outer.Nested
import d.Outer.NestedEnum
import d.Outer.NestedObj
import d.Outer.NestedTrait
import d.Outer.NestedAnnotation
import d.E
import d.ClassObject
fun f(a: A, t: T) {
g(A(c).ext())
O1.f()
O2
ENTRY
E.ENTRY
}
fun f2(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedTrait, a: NestedAnnotation) {
fun f2(i: Outer.Inner, n: Outer.Nested, e: Outer.NestedEnum, o: Outer.NestedObj, t: Outer.NestedTrait, a: Outer.NestedAnnotation) {
ClassObject
}
idea/testData/copyPaste/imports/EnumEntries.expected.kt
+4 -6
View File
@@ -1,11 +1,9 @@
package to
import a.A.A
import a.A.B
import a.A.C
import a.A
fun f() {
A
B
C
A.A
A.B
A.C
}
idea/testData/copyPaste/imports/ExtensionAsInfixOrOperator.expected.kt
+1 -1
View File
@@ -1,8 +1,8 @@
package to
import a.A
import a.plus
import a.infix
import a.A
fun f(a: A) {
a + a
idea/testData/copyPaste/imports/ExtensionCannotBeImportedOrLengthened.expected.kt
+2
View File
@@ -1,6 +1,8 @@
package to
import a.A
import a.ext
import a.p
fun A.ext() {
}
idea/testData/copyPaste/imports/ExtensionConflict.expected.kt
+5
View File
@@ -1,6 +1,11 @@
package to
import a.A
import a.ext
import a.plus
import a.infix
import a.minus
import a.p
fun A.ext() {
}
idea/testData/copyPaste/imports/ForLoop.expected.kt
+1 -1
View File
@@ -1,9 +1,9 @@
package to
import a.A
import a.iterator
import a.next
import a.hasNext
import a.A
fun f() {
for (i in A()) {
idea/testData/copyPaste/imports/GetExpression.expected.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package to
import a.A
import a.get
import a.A
fun f() {
A()[""]
idea/testData/copyPaste/imports/ImportDependency.expected.kt
+6 -11
View File
@@ -1,28 +1,23 @@
package to
import d.A
import d.T
import d.g
import d.c
import d.ext
import d.A
import d.T
import d.Outer
import d.O1
import d.O2
import d.E.ENTRY
import d.Outer.Inner
import d.Outer.Nested
import d.Outer.NestedEnum
import d.Outer.NestedObj
import d.Outer.NestedTrait
import d.Outer.NestedAnnotation
import d.E
import d.ClassObject
fun f(a: A, t: T) {
g(A(c).ext())
O1.f()
O2
ENTRY
E.ENTRY
}
fun f2(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedTrait, a: NestedAnnotation) {
fun f2(i: Outer.Inner, n: Outer.Nested, e: Outer.NestedEnum, o: Outer.NestedObj, t: Outer.NestedTrait, a: Outer.NestedAnnotation) {
ClassObject
}
idea/testData/copyPaste/imports/Inner.expected.kt
+1 -7
View File
@@ -1,13 +1,7 @@
package to
import a.Outer.Inner
import a.Outer.Nested
import a.Outer.NestedEnum
import a.Outer.NestedObj
import a.Outer.NestedTrait
import a.Outer.NestedAnnotation
import a.Outer
fun f(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedTrait, a: NestedAnnotation) {
fun f(i: Outer.Inner, n: Outer.Nested, e: Outer.NestedEnum, o: Outer.NestedObj, t: Outer.NestedTrait, aa: Outer.NestedAnnotation) {
Outer().Inner2()
}
idea/testData/copyPaste/imports/Inner.kt
+1 -1
View File
@@ -18,6 +18,6 @@ class Outer {
annotation class NestedAnnotation
}
<selection>fun f(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedTrait, a: NestedAnnotation) {
<selection>fun f(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedTrait, aa: NestedAnnotation) {
Outer().Inner2()
}</selection>
idea/testData/copyPaste/imports/Invoke.expected.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package to
import a.A
import a.invoke
import a.A
fun f(a: A) {
a()
idea/testData/copyPaste/imports/MultiDeclaration.expected.kt
+1 -1
View File
@@ -1,8 +1,8 @@
package to
import a.A
import a.component1
import a.component2
import a.A
fun f() {
val (a, b) = A()
idea/testData/copyPaste/imports/MultiReferencePartiallyCopied.expected.kt
+2 -2
View File
@@ -1,9 +1,9 @@
package to
import a.A
import a.B
import a.next
import a.hasNext
import a.A
import a.B
fun A.iterator() = B()
idea/testData/copyPaste/imports/NoImportForSamePackage.expected.kt
+3 -11
View File
@@ -1,20 +1,12 @@
package a
import a.E.ENTRY
import a.Outer.Inner
import a.Outer.Nested
import a.Outer.NestedEnum
import a.Outer.NestedObj
import a.Outer.NestedTrait
import a.Outer.NestedAnnotation
fun f(a: A, t: T) {
fun f(p: A, t: T) {
g(A(c).ext())
O1.f()
O2
ENTRY
E.ENTRY
}
fun f2(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedTrait, a: NestedAnnotation) {
fun f2(i: Outer.Inner, n: Outer.Nested, e: Outer.NestedEnum, o: Outer.NestedObj, t: Outer.NestedTrait, a: Outer.NestedAnnotation) {
ClassObject
}
idea/testData/copyPaste/imports/NoImportForSamePackage.kt
+1 -1
View File
@@ -44,7 +44,7 @@ class ClassObject {
}
}
<selection>fun f(a: A, t: T) {
<selection>fun f(p: A, t: T) {
g(A(c).ext())
O1.f()
O2
idea/testData/copyPaste/imports/QualifiedTypeConflict.expected.kt
+2
View File
@@ -5,5 +5,7 @@ class A {
}
}
val v: A? = null
fun f(p: a.A.B) {
}
idea/testData/copyPaste/imports/QualifiedTypeConflict.to.kt
+2
View File
@@ -5,4 +5,6 @@ class A {
}
}
val v: A? = null
<caret>
idea/testData/copyPaste/imports/TypeParameter.expected.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package to
import a.T
import a.A
import a.T
fun f(): T<A>