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

Fixed testdata -- removed package import

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-09-13 04:27:53 +03:00
parent 387d16d1d5
commit 8efbf4fc32
56 changed files with 58 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/addImport/DropExplicitImports.kt
Vendored
-1
View File
@@ -5,7 +5,6 @@ import java.sql.*
import java.util.ArrayList // maybe dropped on adding import with *
import java.util.Date // should not be dropped because of conflicting java.sql.Date class
import java.util.HashSet as JavaHashSet // alias import should not be dropped
import java.util.concurrent // import of package should not be dropped because packages are not imported by *
fun foo() {
val v1 = JavaHashSet()
idea/testData/addImport/DropExplicitImports.kt.after
Vendored
-1
View File
@@ -5,7 +5,6 @@ import java.sql.*
import java.util.*
import java.util.Date
import java.util.HashSet as JavaHashSet // alias import should not be dropped
import java.util.concurrent // import of package should not be dropped because packages are not imported by *
fun foo() {
val v1 = JavaHashSet()
idea/testData/addImport/ImportPackage.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
// IMPORT: java.util
package p
fun foo(): util.ArrayList<String> {}
idea/testData/addImport/ImportPackage.kt.after
Vendored
-6
View File
@@ -1,6 +0,0 @@
// IMPORT: java.util
package p
import java.util
fun foo(): util.ArrayList<String> {}
idea/testData/addImport/PackageAlreadyImported.kt
Vendored
-6
View File
@@ -1,6 +0,0 @@
// IMPORT: java.util
package p
import java.util
fun foo(): util.ArrayList<String> {}
idea/testData/addImport/PackageAlreadyImported.kt.after
Vendored
-6
View File
@@ -1,6 +0,0 @@
// IMPORT: java.util
package p
import java.util
fun foo(): util.ArrayList<String> {}
idea/testData/checker/ResolveToJava.kt
Vendored
+1 -2
View File
@@ -1,6 +1,5 @@
import java.*
import java.util.*
import java.util
import <error>utils</error>.*
import java.io.PrintStream
@@ -14,7 +13,7 @@ fun test(<warning>l</warning> : List<Int>) {
val <warning>x</warning> : java.<error>List</error>
val <warning>y</warning> : List<Int>
val <warning>b</warning> : <warning>java.lang.Object</warning>
val <warning>a</warning> : <warning>util.List<Int></warning>
val <warning>a</warning> : <warning>java.util.List<Int></warning>
val <warning>z</warning> : java.<error>utils</error>.<error>List</error><Int>
val <warning>f</warning> : java.io.File? = null
idea/testData/copyPaste/imports/PackageView.expected.kt
Vendored
+1 -3
View File
@@ -1,5 +1,3 @@
package to
import a.b
val c = b.B()
val c = a.b.B()
idea/testData/copyPaste/imports/PackageView.expected.names
Vendored
-1
View File
@@ -1 +0,0 @@
a.b
idea/testData/copyPaste/imports/PackageView.kt
Vendored
+1 -3
View File
@@ -1,5 +1,3 @@
package a
import a.b
<selection>val c = b.B()</selection>
<selection>val c = a.b.B()</selection>
idea/testData/decompiler/navigation/library/extra.kt
Vendored
+1 -3
View File
@@ -1,6 +1,4 @@
package testData.libraries
import kotlin as gogland
public fun func(str : gogland.String) {
public fun func(str : kotlin.String) {
}
idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt
Vendored
+1 -1
View File
@@ -6,6 +6,6 @@ fun foo() {
}
// extra.kt
//public fun <1>func(str : gogland.String) {
//public fun <1>func(str : kotlin.String) {
// main.kt
//public fun <2>func(a : Int, b : String = "55") {
idea/testData/editor/optimizeImports/CurrentPackage.kt
Vendored
+1 -2
View File
@@ -1,9 +1,8 @@
package ppp
import ppp.*
import ppp.ppp1
open class C
class D : C()
class E : ppp1.C1()
class E : ppp.ppp1.C1()
idea/testData/editor/optimizeImports/CurrentPackage.kt.after
Vendored
+1 -3
View File
@@ -1,8 +1,6 @@
package ppp
import ppp.ppp1
open class C
class D : C()
class E : ppp1.C1()
class E : ppp.ppp1.C1()
idea/testData/editor/optimizeImports/KotlinPackage.dependency.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
package test1.test2.test3
public class Class1 {
}
idea/testData/editor/optimizeImports/KotlinPackage.kt
Vendored
-6
View File
@@ -1,6 +0,0 @@
import test1
import test1.test2
import test1.test2.test3
import test1.test2.test3.Class1
val s: test2.test3.Class1? = null
idea/testData/editor/optimizeImports/KotlinPackage.kt.after
Vendored
-3
View File
@@ -1,3 +0,0 @@
import test1.test2
val s: test2.test3.Class1? = null
idea/testData/editor/optimizeImports/PartiallyQualified.kt
Vendored
-6
View File
@@ -1,6 +0,0 @@
import java
import java.util
import java.util.Map
import java.util.Map.Entry
var x : util.Map.Entry<util.List<String>, String>? = null
idea/testData/editor/optimizeImports/PartiallyQualified.kt.after
Vendored
-3
View File
@@ -1,3 +0,0 @@
import java.util
var x : util.Map.Entry<util.List<String>, String>? = null
idea/testData/intentions/specifyTypeExplicitly/classNameClashing.kt.after
Vendored
+1 -3
View File
@@ -1,9 +1,7 @@
import java.sql
// WITH_RUNTIME
fun getEntry() : Map.Entry<kotlin.Array<String>, java.sql.Array> {
throw Error()
}
val x: Map.Entry<Array<String>, sql.Array> = getEntry()
val x: Map.Entry<Array<String>, java.sql.Array> = getEntry()
idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin1.kt
Vendored
+2 -4
View File
@@ -3,14 +3,12 @@ import java.lang.*
import java.lang.Comparable
import java.lang.Comparable
import java.lang.Comparable as Foo
import java.lang
import java.lang as jl
fun <T> a() : java.lang.Comparable<T><caret>? {
return null
}
fun b() : lang.Comparable<String> {
fun b() : java.lang.Comparable<String> {
throw Exception()
}
@@ -18,7 +16,7 @@ fun c() : Foo<String> {
throw Exception()
}
fun d() : jl.Comparable<String>? {
fun d() : java.lang.Comparable<String>? {
return null
}
idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin1.kt.after
Vendored
-2
View File
@@ -1,7 +1,5 @@
// "Change all usages of 'java.lang.Comparable<T>' in this file to 'kotlin.Comparable<T>'" "true"
import java.lang.*
import java.lang
import java.lang as jl
fun <T> a() : Comparable<T>? {
return null
idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin2.kt
Vendored
+2 -4
View File
@@ -3,14 +3,12 @@ import java.lang.*
import java.lang.Comparable
import java.lang.Comparable
import java.lang.Comparable as Foo
import java.lang
import java.lang as jl
fun <T> a() : java.lang.Comparable<T>? {
return null
}
fun b() : lang.Comparable<String> {
fun b() : java.lang.Comparable<String> {
throw Exception()
}
@@ -18,7 +16,7 @@ fun c() : Foo<String> {
throw Exception()
}
fun d() : jl.Comparable<String><caret>? {
fun d() : java.lang.Comparable<String><caret>? {
return null
}
idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin2.kt.after
Vendored
-2
View File
@@ -1,7 +1,5 @@
// "Change all usages of 'java.lang.Comparable<T>' in this file to 'kotlin.Comparable<T>'" "true"
import java.lang.*
import java.lang
import java.lang as jl
fun <T> a() : Comparable<T>? {
return null
idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin3.kt
Vendored
+2 -4
View File
@@ -3,14 +3,12 @@ import java.lang.*
import java.lang.Comparable
import java.lang.Comparable
import java.lang.Comparable<caret> as Foo
import java.lang
import java.lang as jl
fun <T> a() : java.lang.Comparable<T>? {
return null
}
fun b() : lang.Comparable<String> {
fun b() : java.lang.Comparable<String> {
throw Exception()
}
@@ -18,7 +16,7 @@ fun c() : Foo<String> {
throw Exception()
}
fun d() : jl.Comparable<String>? {
fun d() : java.lang.Comparable<String>? {
return null
}
idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin3.kt.after
Vendored
-2
View File
@@ -1,7 +1,5 @@
// "Change all usages of 'java.lang.Comparable<T>' in this file to 'kotlin.Comparable<T>'" "true"
import java.lang.*
import java.lang
import java.lang as jl
fun <T> a() : Comparable<T>? {
return null
idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin4.kt
Vendored
+2 -4
View File
@@ -3,14 +3,12 @@ import java.lang.*
import java.lang.Iterable
import java.lang.Iterable
import java.lang.Iterable as Foo
import java.lang
import java.lang as jl
fun <T> a() : java.lang.Iterable<T>? {
return null
}
fun b() : lang.Iterable<String>? {
fun b() : java.lang.Iterable<String>? {
return null
}
@@ -18,7 +16,7 @@ fun c() : Foo<String><caret> {
throw Exception()
}
fun d() : jl.Iterable<String>? {
fun d() : java.lang.Iterable<String>? {
return null
}
idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin4.kt.after
Vendored
-2
View File
@@ -1,7 +1,5 @@
// "Change all usages of 'java.lang.Iterable<T>' in this file to a Kotlin class" "true"
import java.lang.*
import java.lang
import java.lang as jl
fun <T> a() : Iterable<T>? {
return null
idea/testData/refactoring/move/java/movePackage/movePackageToAnotherPackage/after/c/noImports.kt
Vendored
+1 -3
View File
@@ -1,5 +1,3 @@
import b.a
fun bar() {
val t: a.A = a.A()
val t: b.a.A = b.a.A()
}
idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/noImports.kt
Vendored
+4 -6
View File
@@ -1,10 +1,8 @@
package c
import b.a
fun bar() {
val t: a.A = a.A()
a.foo()
println(a.x)
a.x = ""
val t: b.a.A = b.a.A()
b.a.foo()
println(b.a.x)
b.a.x = ""
}
idea/testData/refactoring/rename/renameKotlinClass/after/Second.kt
Vendored
+1 -2
View File
@@ -1,14 +1,13 @@
package testing.rename2
import testing.rename.Third
import testing.rename
import java.util.ArrayList
// Extends testing.rename.Third
public class Second : Third() {
val temp : testing.rename.Third = Third()
fun tempName(param : Third) : rename.Third {
fun tempName(param : Third) : testing.rename.Third {
val local = Third()
val otherLocal = param
val arr = ArrayList<Third>()
idea/testData/refactoring/rename/renameKotlinClass/before/Second.kt
Vendored
+1 -2
View File
@@ -1,14 +1,13 @@
package testing.rename2
import testing.rename.First
import testing.rename
import java.util.ArrayList
// Extends testing.rename.First
public class Second : First() {
val temp : testing.rename.First = First()
fun tempName(param : First) : rename.First {
fun tempName(param : First) : testing.rename.First {
val local = First()
val otherLocal = param
val arr = ArrayList<First>()
idea/testData/shortenRefs/ClassNameConflict.kt.after
Vendored
+1 -3
View File
@@ -1,5 +1,3 @@
import java.lang.reflect
fun foo(array: Array<String>){}
val v: reflect.Array
val v: java.lang.reflect.Array
idea/testData/shortenRefs/constructor/LeaveQualified.kt.after
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
import java.sql
import java.util.Date
val x = sql.Date(1)
val x = java.sql.Date(1)
idea/testData/shortenRefs/constructor/LeaveQualified1.kt.after
Vendored
+1 -3
View File
@@ -1,7 +1,5 @@
import java.io
fun File(): String = ""
class A {
val x = io.File()
val x = java.io.File()
}
idea/testData/shortenRefs/constructor/LeaveQualified2.kt.after
Vendored
+1 -3
View File
@@ -1,7 +1,5 @@
import java.util
fun Random(): Int = 1
class A {
val x = util.Random()
val x = java.util.Random()
}
idea/testData/shortenRefs/constructor/LeaveQualified3.kt.after
Vendored
+1 -3
View File
@@ -1,6 +1,4 @@
import java.util
fun foo(){
val Random = {}
val x = util.Random()
val x = java.util.Random()
}
idea/testData/shortenRefs/constructor/LeaveQualified5.kt.after
Vendored
+1 -3
View File
@@ -1,8 +1,6 @@
import java.io
fun File(p: Int): String = ""
fun File(p: String): String = ""
class A {
val x = io.File()
val x = java.io.File()
}
idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt.after
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
import java.sql
import java.util.Date
val x = sql.Date(1)
val x = java.sql.Date(1)
idea/testData/shortenRefs/imports/leaveQualifiedType.kt.after
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
import java.sql
import java.util.Date
class A : sql.Date
class A : java.sql.Date
idea/testData/shortenRefs/type/GenericType3.kt.after
Vendored
+1 -3
View File
@@ -1,3 +1 @@
import java.sql
val x: Map.Entry<Array<String>, sql.Array>
val x: Map.Entry<Array<String>, java.sql.Array>
idea/testData/shortenRefs/type/LeaveQualified.kt.after
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
import java.sql
import java.util.Date
class A : sql.Date
class A : java.sql.Date
idea/testData/shortenRefs/type/TwoClassesSameNames.kt.after
Vendored
+1 -2
View File
@@ -1,7 +1,6 @@
import java.sql
import java.util.Date
import java.util.HashMap
class A {
val x: HashMap<Date, sql.Date>
val x: HashMap<Date, java.sql.Date>
}