Get rid of FIELD_IDENTIFIER at syntax level, two errors dropped, a set of tests fixed / deleted #KT-9539 Fixed

2015-10-20 13:55:37 +03:00
parent 8ea0501a30
commit d6988ad69e
97 changed files with 177 additions and 792 deletions
@@ -11,10 +11,8 @@ interface NoC {
 }

 class WithC() {
-  val x : Int
+  val x : Int = 42
  init {
-    <error>$x</error> = 1
-    <error>$y</error> = 2
    val <warning>b</warning> = x

  }
@@ -24,7 +22,6 @@ class WithC() {
  init {
    val <warning>z</warning> = <error>b</error>
    val <warning>zz</warning> = x
-    val <warning>zzz</warning> = <error>$a</error>
  }

 }
@@ -28,7 +28,6 @@ class WithCPI_Dup(<warning>x</warning> : Int) {

 class WithCPI(x : Int) {
  val a = 1
-  val b : Int = <error>$a</error>
  val xy : Int = x
 }

@@ -1,6 +0,0 @@
-// JET-17 Do not infer property types by the initializer before the containing scope is ready
-
-class WithC() {
-  val a = 1
-  val b = <error>$a</error> // error here, but must not be
-}
@@ -39,12 +39,6 @@ annotation class Fancy(val param: Int)

@Fancy(<caret>i) class D

-class Foo {
-    var x: Int = 0
-        get = $x
-        set(value) { $x = value }
-}
-
 class CustomDelegate {
    operator fun get(thisRef: Any?, prop: PropertyMetadata): String = ""
    operator fun set(thisRef: Any?, prop: PropertyMetadata, value: String) {}
@@ -39,12 +39,6 @@ annotation class Fancy(val param: Int)

@Fancy(i) class D

-class Foo {
-    var x: Int = 0
-        get = field
-        set(value) { field = value }
-}
-
 class CustomDelegate {
    operator fun getValue(thisRef: Any?, prop: KProperty<*>): String = ""
    operator fun setValue(thisRef: Any?, prop: KProperty<*>, value: String) {}
@@ -1,5 +1,5 @@
 // "Remove getter and initializer from property" "true"
 abstract class B {
    abstract val i = <caret>0
-        get() = $i
+        get() = field
 }
@@ -1,7 +0,0 @@
-// "Migrate backing field syntax" "true"
-
-class Foo {
-    var a: Int = 0
-        get() = 0
-        set(v) { $<caret>a = v }
-}
@@ -1,7 +0,0 @@
-// "Migrate backing field syntax" "true"
-
-class Foo {
-    var a: Int = 0
-        get() = 0
-        set(v) { field = v }
-}
@@ -1,11 +0,0 @@
-// "Introduce backing property" "true"
-
-class Foo {
-    var x = ""
-        get() = $x + "!"
-        set(value) { $x = value + "!" }
-
-    fun foo(): String {
-        return $<caret>x
-    }
-}
@@ -1,12 +0,0 @@
-// "Introduce backing property" "true"
-
-class Foo {
-    private var _x = ""
-    var x: String
-        get() = _x + "!"
-        set(value) { _x = value + "!" }
-
-    fun foo(): String {
-        return _x
-    }
-}
@@ -1,7 +0,0 @@
-// "Replace with property access" "true"
-
-class A {
-    var foo: Int = 0
-
-    fun bar() = $f<caret>oo
-}
@@ -1,7 +0,0 @@
-// "Replace with property access" "true"
-
-class A {
-    var foo: Int = 0
-
-    fun bar() = foo
-}
@@ -1,5 +0,0 @@
-// "Change '$foo' to 'foo'" "true"
-abstract class Foo {
-    abstract var foo : String
-    fun bar() = <caret>$foo + "bar"
-}
@@ -1,5 +0,0 @@
-// "Change '$foo' to 'foo'" "true"
-abstract class Foo {
-    abstract var foo : String
-    fun bar() = <caret>foo + "bar"
-}
@@ -1,5 +0,0 @@
-// "Change '$bar' to 'bar'" "true"
-abstract class Bar {
-    abstract var bar : String
-    fun foo() = "foo" + this.<caret>$bar
-}
@@ -1,5 +0,0 @@
-// "Change '$bar' to 'bar'" "true"
-abstract class Bar {
-    abstract var bar : String
-    fun foo() = "foo" + this.<caret>bar
-}
@@ -1,7 +0,0 @@
-// "Change '$foo' to 'foo'" "true"
-class A {
-    val foo : Int
-        get() = 5
-    val bar : Int
-        get() = $<caret>foo
-}
@@ -1,7 +0,0 @@
-// "Change '$foo' to 'foo'" "true"
-class A {
-    val foo : Int
-        get() = 5
-    val bar : Int
-        get() = <caret>foo
-}
@@ -1,5 +0,0 @@
-// "Change '$a' to 'a'" "true"
-val a = 5
-class A {
-    val b = <caret>$a
-}
@@ -1,5 +0,0 @@
-// "Change '$a' to 'a'" "true"
-val a = 5
-class A {
-    val b = <caret>a
-}
@@ -1,6 +0,0 @@
-// "Change '$a' to 'a'" "true"
-package foo
-val a = 5
-class A {
-    val b = foo.<caret>$a
-}
@@ -1,6 +0,0 @@
-// "Change '$a' to 'a'" "true"
-package foo
-val a = 5
-class A {
-    val b = foo.<caret>a
-}
@@ -1,6 +1,6 @@
 class aClass(){
    var myF<caret>ield: Int = 0;
        set(value){
-            $myField=value
+            field=value
        }
 }
@@ -1,6 +1,6 @@
 class aClass(){
    var renamed: Int = 0;
        set(value){
-            $renamed =value
+            field=value
        }
 }
@@ -1,6 +1,6 @@
 class aClass(){
    var myField: Int = 0;
        set(value){
-            $myFi<caret>eld=value
+            fi<caret>eld=value
        }
 }
@@ -1,6 +1,6 @@
 class aClass(){
    var anotherRenamed: Int = 0;
        set(value){
-            $anotherRenamed =value
+            field=value
        }
 }