Create function/property from usage: added "member" when appropriate + changed order

This commit is contained in:
Valentin Kipyatkov
2015-06-23 17:04:37 +03:00
parent b691ed2494
commit 2bd1362be6
216 changed files with 246 additions and 230 deletions
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T)
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
fun foo(t: T): A<T> {
@@ -1,4 +1,4 @@
// "Create function 'compareTo'" "true"
// "Create member function 'compareTo'" "true"
class A<T>(val n: T)
@@ -1,4 +1,4 @@
// "Create function 'compareTo'" "true"
// "Create member function 'compareTo'" "true"
class A<T>(val n: T) {
fun compareTo(t: T): Int {
@@ -1,4 +1,4 @@
// "Create function 'contains'" "true"
// "Create member function 'contains'" "true"
class A<T>(val n: T)
@@ -1,4 +1,4 @@
// "Create function 'contains'" "true"
// "Create member function 'contains'" "true"
class A<T>(val n: T) {
fun contains(t: T): Boolean {
@@ -1,4 +1,4 @@
// "Create function 'compareTo'" "true"
// "Create member function 'compareTo'" "true"
class A<T>(val n: T)
@@ -1,4 +1,4 @@
// "Create function 'compareTo'" "true"
// "Create member function 'compareTo'" "true"
class A<T>(val n: T) {
fun compareTo(t: T): Int {
@@ -1,4 +1,4 @@
// "Create function 'contains'" "true"
// "Create member function 'contains'" "true"
class A<T>(val n: T)
@@ -1,4 +1,4 @@
// "Create function 'contains'" "true"
// "Create member function 'contains'" "true"
class A<T>(val n: T) {
fun contains(t: T): Boolean {
@@ -1,4 +1,4 @@
// "Create function 'plusAssign'" "true"
// "Create member function 'plusAssign'" "true"
class A<T>(val n: T)
@@ -1,4 +1,4 @@
// "Create function 'plusAssign'" "true"
// "Create member function 'plusAssign'" "true"
class A<T>(val n: T) {
fun plusAssign(t: T) {
@@ -1,4 +1,4 @@
// "Create function 'plus'" "true"
// "Create member function 'plus'" "true"
class A<T>(val n: T) {
fun plus(): A<T> = throw Exception()
@@ -1,4 +1,4 @@
// "Create function 'plus'" "true"
// "Create member function 'plus'" "true"
class A<T>(val n: T) {
fun plus(): A<T> = throw Exception()
@@ -1,4 +1,4 @@
// "Create function 'plus'" "true"
// "Create member function 'plus'" "true"
class A<T>(val n: T)
@@ -1,4 +1,4 @@
// "Create function 'plus'" "true"
// "Create member function 'plus'" "true"
class A<T>(val n: T) {
fun plus(t: T): A<T> {
@@ -1,4 +1,4 @@
// "Create function 'plus'" "true"
// "Create member function 'plus'" "true"
class A<T>(val n: T) {
fun plus(i: Int, s: String): A<T> = throw Exception()
@@ -1,4 +1,4 @@
// "Create function 'plus'" "true"
// "Create member function 'plus'" "true"
class A<T>(val n: T) {
fun plus(i: Int, s: String): A<T> = throw Exception()
@@ -1,4 +1,4 @@
// "Create function 'plus'" "true"
// "Create member function 'plus'" "true"
class A<T>(val n: T)
@@ -1,4 +1,4 @@
// "Create function 'plus'" "true"
// "Create member function 'plus'" "true"
class A<T>(val n: T) {
fun plus(t: T): A<T> {
@@ -1,4 +1,4 @@
// "Create function 'plus'" "true"
// "Create member function 'plus'" "true"
class A<T>(val n: T)
@@ -1,4 +1,4 @@
// "Create function 'plus'" "true"
// "Create member function 'plus'" "true"
class A<T>(val n: T) {
fun plus(i: Int): A<T> {
@@ -1,4 +1,4 @@
// "Create function 'contains'" "true"
// "Create member function 'contains'" "true"
class A<T>(val n: T)
@@ -1,4 +1,4 @@
// "Create function 'contains'" "true"
// "Create member function 'contains'" "true"
class A<T>(val n: T) {
fun contains(t: T): Boolean {
@@ -1,4 +1,4 @@
// "Create function 'contains'" "true"
// "Create member function 'contains'" "true"
class A<T>(val n: T)
@@ -1,4 +1,4 @@
// "Create function 'contains'" "true"
// "Create member function 'contains'" "true"
class A<T>(val n: T) {
fun contains(t: T): Boolean {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
fun foo(t: T, s: String, function: Function1<T, T>): A<T> {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
fun foo(function: Function1<T, T>): A<T> {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class Settings
fun isModified(settings: Settings, c: C) = c.<caret>foo(settings)
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class Settings
fun isModified(settings: Settings, c: C) = c.foo(settings)
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
fun foo(a: Int): A<T> = throw Exception()
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
fun foo(a: Int): A<T> = throw Exception()
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
fun foo(i: Int, s: String): A<T> = throw Exception()
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
fun foo(i: Int, s: String): A<T> = throw Exception()
@@ -1,4 +1,4 @@
// "Create function 'foo'" "false"
// "Create member function 'foo'" "false"
// ERROR: Unresolved reference: foo
class A<T>(val n: T)
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
companion object {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
companion object {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "false"
// "Create member function 'foo'" "false"
// ACTION: Convert to expression body
// ACTION: Create extension function 'foo'
// ERROR: Unresolved reference: foo
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
// ERROR: Unresolved reference: foo
fun test(a: A): Int? {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
// ERROR: Unresolved reference: foo
fun test(a: A): Int? {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
// ERROR: Unresolved reference: foo
fun test(): Int? {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
// ERROR: Unresolved reference: foo
fun test(): Int? {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
interface T
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
interface T {
fun foo(s: String, i: Int): Boolean
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
object A
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
object A {
fun foo(i: Int): Int {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T)
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
fun foo(t: T): A<T> {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class F {
fun bar() {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class F {
fun bar() {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T)
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
fun foo(u: T): A<T> {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T)
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
fun foo(abc: T, ghi: A<T>, def: String): A<T> {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T)
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
fun foo(t: T?): A<Int> {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T)
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
fun foo(t: T): A<T>? {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T)
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
fun foo(t: T): A<String> {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
// ERROR: Unresolved reference: foo
fun test(): Int {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
// ERROR: Unresolved reference: foo
fun test(): Int {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Int</td></tr><tr><td>Found:</td><td>A&lt;kotlin.Int&gt;</td></tr></table></html>
class A<T>(val n: T)
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Int</td></tr><tr><td>Found:</td><td>A&lt;kotlin.Int&gt;</td></tr></table></html>
class A<T>(val n: T) {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "false"
// "Create member function 'foo'" "false"
// ACTION: Convert to expression body
// ACTION: Replace with infix function call
// ERROR: Unresolved reference: x
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A {
fun foo(): String {
@@ -1,5 +1,5 @@
// "Create extension function 'foo'" "false"
// ACTION: Create function 'foo'
// ACTION: Create member function 'foo'
// ERROR: Unresolved reference: foo
fun test() {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
// ERROR: Unresolved reference: foo
fun test() {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
// ERROR: Unresolved reference: foo
fun test() {
@@ -1,4 +1,5 @@
// "Create function 'foo'" "false"
// "Create member function 'foo'" "false"
// ERROR: Unresolved reference: foo
fun test() {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class SetOptions
fun isModified(setOptions: SetOptions, c: C) = c.<caret>foo(setOptions)
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class SetOptions
fun isModified(setOptions: SetOptions, c: C) = c.foo(setOptions)
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
fun test(): A<Int> {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
fun test(): A<Int> {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T)
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
fun foo(i: Int, s: String): A<Int> {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
inner class B<U>(val m: U) {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
inner class B<U>(val m: U) {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
inner class B<U>(val m: U) {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class A<T>(val n: T) {
inner class B<U>(val m: U) {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class B<T>(val t: T) {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class B<T>(val t: T) {
fun <U, V> foo(u: U, v: V): U {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class B<T>(val t: T) {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class B<T>(val t: T) {
fun <U> foo(i: Int, u: U): Int {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class B<T>(val t: T) {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
class B<T>(val t: T) {
fun <U, V> foo(u: U, v: V): U {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
// ERROR: Unresolved reference: foo
class A<T>(val b: B<T>) {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
// ERROR: Unresolved reference: foo
class A<T>(val b: B<T>) {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
// ERROR: Unresolved reference: foo
class A<T>(val b: B<T>) {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
// ERROR: Unresolved reference: foo
class A<T>(val b: B<T>) {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
// ERROR: Unresolved reference: foo
class A<T>(val b: B<T>) {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
// ERROR: Unresolved reference: foo
class A<T>(val b: B<T>) {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
// ERROR: Unresolved reference: s
class A<T>(val n: T)
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
// ERROR: Unresolved reference: s
class A<T>(val n: T) {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
// ERROR: Unresolved reference: B
class A: B {
@@ -1,4 +1,4 @@
// "Create function 'foo'" "true"
// "Create member function 'foo'" "true"
// ERROR: Unresolved reference: B
class A: B {
@@ -1,4 +1,4 @@
// "Create function 'component3'" "true"
// "Create member function 'component3'" "true"
class Foo<T> {
fun component1(): Int { return 0 }
fun component2(): Int { return 0 }

Some files were not shown because too many files have changed in this diff Show More