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

KT-1256 Error highlighting in IDE should be less annoying

Browse Source 
#KT-1256 fixed
This commit is contained in:
Svetlana Isakova
2012-05-22 18:23:43 +04:00
parent 6a24d0cf6d
commit b63d3905f9
50 changed files with 382 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/checker/Abstract.jet
+18 -18
View File
@@ -2,17 +2,17 @@ package abstract
class MyClass() {
//properties
val <error>a</error>: Int
<error>val a: Int</error>
val a1: Int = 1
<error>abstract</error> val a2: Int
<error>abstract</error> val a3: Int = 1
var <error>b</error>: Int private set
<error>var b: Int</error> private set
var b1: Int = 0; private set
<error>abstract</error> var b2: Int private set
<error>abstract</error> var b3: Int = 0; private set
var <error>c</error>: Int set(v: Int) { $c = v }
<error>var c: Int</error> set(v: Int) { $c = v }
var c1: Int = 0; set(v: Int) { $c1 = v }
<error>abstract</error> var c2: Int set(v: Int) { $c2 = v }
<error>abstract</error> var c3: Int = 0; set(v: Int) { $c3 = v }
@@ -23,7 +23,7 @@ class MyClass() {
<error>abstract</error> val e3: Int = 0; get() = a
//methods
fun <error>f</error>()
<error>fun f()</error>
fun g() {}
<error>abstract</error> fun h()
<error><error>abstract</error></error> fun j() {}
@@ -31,17 +31,17 @@ class MyClass() {
abstract class MyAbstractClass() {
//properties
val <error>a</error>: Int
<error>val a: Int</error>
val a1: Int = 1
abstract val a2: Int
abstract val a3: Int = <error>1</error>
var <error>b</error>: Int private set
<error>var b: Int</error> private set
var b1: Int = 0; private set
abstract var b2: Int private set
abstract var b3: Int = <error>0</error>; private set
var <error>c</error>: Int set(v: Int) { $c = v }
<error>var c: Int</error> set(v: Int) { $c = v }
var c1: Int = 0; set(v: Int) { $c1 = v }
abstract var c2: Int <error>set(v: Int) { $c2 = v }</error>
abstract var c3: Int = <error>0</error>; <error>set(v: Int) { $c3 = v }</error>
@@ -52,7 +52,7 @@ abstract class MyAbstractClass() {
abstract val e3: Int = <error>0</error>; <error>get() = a</error>
//methods
fun <error>f</error>()
<error>fun f()</error>
fun g() {}
abstract fun h()
<error>abstract</error> fun j() {}
@@ -70,8 +70,8 @@ trait MyTrait {
<warning>abstract</warning> var b2: Int private set
<warning>abstract</warning> var b3: Int = <error>0</error>; private set
var <error>c</error>: Int set(v: Int) { $c = v }
var <error>c1</error>: Int = <error>0</error>; set(v: Int) { $c1 = v }
<error>var c: Int</error> set(v: Int) { $c = v }
<error>var c1: Int</error> = <error>0</error>; set(v: Int) { $c1 = v }
<warning>abstract</warning> var c2: Int <error>set(v: Int) { $c2 = v }</error>
<warning>abstract</warning> var c3: Int = <error>0</error>; <error>set(v: Int) { $c3 = v }</error>
@@ -89,17 +89,17 @@ trait MyTrait {
enum class MyEnum() {
//properties
val <error>a</error>: Int
<error>val a: Int</error>
val a1: Int = 1
abstract val a2: Int
abstract val a3: Int = <error>1</error>
var <error>b</error>: Int private set
<error>var b: Int</error> private set
var b1: Int = 0; private set
abstract var b2: Int private set
abstract var b3: Int = <error>0</error>; private set
var <error>c</error>: Int set(v: Int) { $c = v }
<error>var c: Int</error> set(v: Int) { $c = v }
var c1: Int = 0; set(v: Int) { $c1 = v }
abstract var c2: Int <error>set(v: Int) { $c2 = v }</error>
abstract var c3: Int = <error>0</error>; <error>set(v: Int) { $c3 = v }</error>
@@ -110,7 +110,7 @@ enum class MyEnum() {
abstract val e3: Int = <error>0</error>; <error>get() = a</error>
//methods
fun <error>f</error>()
<error>fun f()</error>
fun g() {}
abstract fun h()
<error>abstract</error> fun j() {}
@@ -120,17 +120,17 @@ abstract enum class MyAbstractEnum() {}
//package MyNamespace {
//properties
val <error>a</error>: Int
<error>val a: Int</error>
val a1: Int = 1
<error>abstract</error> val a2: Int
<error>abstract</error> val a3: Int = 1
var <error>b</error>: Int private set
<error>var b: Int</error> private set
var b1: Int = 0; private set
<error>abstract</error> var b2: Int private set
<error>abstract</error> var b3: Int = 0; private set
var <error>c</error>: Int set(v: Int) { $c = v }
<error>var c: Int</error> set(v: Int) { $c = v }
var c1: Int = 0; set(v: Int) { $c1 = v }
<error>abstract</error> var c2: Int set(v: Int) { $c2 = v }
<error>abstract</error> var c3: Int = 0; set(v: Int) { $c3 = v }
@@ -141,7 +141,7 @@ abstract enum class MyAbstractEnum() {}
<error>abstract</error> val e3: Int = 0; get() = a
//methods
fun <error>f</error>()
<error>fun f()</error>
fun g() {}
<error>abstract</error> fun h()
<error>abstract</error> fun j() {}
idea/testData/checker/Constructors.jet
+1 -1
View File
@@ -34,7 +34,7 @@ class Foo() : <error>WithPC0</error>(), <error>this</error>() {
}
class WithCPI_Dup(x : Int) {
var <error>x</error> : Int
<error>var x : Int</error>
}
class WithCPI(x : Int) {
idea/testData/checker/ExtensionFunctions.jet
+1 -1
View File
@@ -33,7 +33,7 @@ fun test() {
val Int.abs : Int
get() = if (this > 0) this else -this;
val <T> T.<error>foo</error> : T
<error>val <T> T.foo : T</error>
fun Int.foo() = this
idea/testData/checker/Override.jet
+2 -2
View File
@@ -26,11 +26,11 @@ package override
}
class <error>MyIllegalClass4</error> : MyTrait, MyAbstractClass() {
fun <error>foo</error>() {}
<error>fun foo()</error> {}
<error>override</error> fun other() {}
}
class MyChildClass1 : MyClass() {
fun <error>foo</error>() {}
<error>fun foo()</error> {}
override fun bar() {}
}
idea/testData/checker/OverridesAndGenerics.jet
+1 -1
View File
@@ -14,7 +14,7 @@
class MyChildClass : MyGenericClass<Int>() {}
class MyChildClass1<T> : MyGenericClass<T>() {}
class MyChildClass2<T> : MyGenericClass<T>() {
fun <error>foo</error>(t: T) = t
<error>fun foo(t: T)</error> = t
override fun bar(t: T) = t
}
idea/testData/checker/PrimaryConstructors.jet
+1 -1
View File
@@ -1,5 +1,5 @@
class X {
val <error>x</error> : Int
<error>val x : Int</error>
}
open class Y() {
idea/testData/checker/infos/PropertiesWithBackingFields.jet
+11 -11
View File
@@ -3,8 +3,8 @@
<info>abstract</info> val x1 : Int <info>get</info>
<info>abstract</info> val x2 : Int <error><info>get</info>() = 1</error>
val <error>a</error> : Int
val <error>b</error> : Int <info>get</info>
<error>val a : Int</error>
<error>val b : Int</error> <info>get</info>
val <info>c</info> = 1
val <info>c1</info> = 1
@@ -15,7 +15,7 @@
<info>get</info>() { return 1 }
val c4 : Int
<info>get</info>() = 1
val <error>c5</error> : Int
<error>val c5 : Int</error>
<info>get</info>() = $c5 + 1
<info>abstract</info> var y : Int
@@ -26,17 +26,17 @@
<info>abstract</info> var y5 : Int <error><info>set</info>(x) {}</error> <error><info>get</info>() = 1</error>
<info>abstract</info> var y6 : Int <error><info>set</info>(x) {}</error>
var <error>v</error> : Int
var <error>v1</error> : Int <info>get</info>
var <error>v2</error> : Int <info>get</info> <info>set</info>
var <error>v3</error> : Int <info>get</info>() = 1; <info>set</info>
<error>var v : Int</error>
<error>var v1 : Int</error> <info>get</info>
<error>var v2 : Int</error> <info>get</info> <info>set</info>
<error>var v3 : Int</error> <info>get</info>() = 1; <info>set</info>
var v4 : Int <info>get</info>() = 1; <info>set</info>(x){}
var <error>v5</error> : Int <info>get</info>() = 1; <info>set</info>(x){$v5 = x}
var <error>v6</error> : Int <info>get</info>() = $v6 + 1; <info>set</info>(x){}
<error>var v5 : Int</error> <info>get</info>() = 1; <info>set</info>(x){$v5 = x}
<error>var v6 : Int</error> <info>get</info>() = $v6 + 1; <info>set</info>(x){}
var <error>v9</error> : Int <info>set</info>
var <error>v10</error> : Int <info>get</info>
<error>var v9 : Int</error> <info>set</info>
<error>var v10 : Int</error> <info>get</info>
}