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

Changed highlighting range for unresolved annotation name to not include '@'

Browse Source 
#KT-11529 Fixed
This commit is contained in:
Valentin Kipyatkov
2016-03-22 18:34:59 +03:00
parent 0fdba49315
commit f0ef04a6a8
19 changed files with 51 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
import java.util.ArrayList
@<!NONE_APPLICABLE!>ArrayList<!><Int>(1, 1) fun b() {}
<!UNRESOLVED_REFERENCE!>@Xoo<!>(<!UNRESOLVED_REFERENCE!>x<!>) fun c() {}
@<!UNRESOLVED_REFERENCE!>Xoo<!>(<!UNRESOLVED_REFERENCE!>x<!>) fun c() {}
<!DEPRECATED_JAVA_ANNOTATION!>@java.lang.Deprecated(<!UNRESOLVED_REFERENCE, TOO_MANY_ARGUMENTS!>x<!>)<!> fun a() {}
compiler/testData/diagnostics/tests/annotations/AnnotationForObject.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
// Check that there won't be "Rewrite at slice ANNOTATION key" exception - EA-36935
<!UNRESOLVED_REFERENCE!>@someErrorAnnotation<!> object Test {
@<!UNRESOLVED_REFERENCE!>someErrorAnnotation<!> object Test {
}
compiler/testData/diagnostics/tests/annotations/DanglingMixed.kt
Vendored
+9 -9
View File
@@ -4,19 +4,19 @@ annotation class Ann2
class C {
fun foo() {
class Local {
<!UNRESOLVED_REFERENCE!>@Ann0<!>
@Ann <!UNRESOLVED_REFERENCE!>@Ann3<!>
@<!UNRESOLVED_REFERENCE!>Ann0<!>
@Ann @<!UNRESOLVED_REFERENCE!>Ann3<!>
@Ann2(<!TOO_MANY_ARGUMENTS!>1<!>)
<!UNRESOLVED_REFERENCE!>@Ann4<!><!SYNTAX!><!>
@<!UNRESOLVED_REFERENCE!>Ann4<!><!SYNTAX!><!>
}
}
<!UNRESOLVED_REFERENCE!>@Ann0<!>
@Ann <!UNRESOLVED_REFERENCE!>@Ann3<!>
@<!UNRESOLVED_REFERENCE!>Ann0<!>
@Ann @<!UNRESOLVED_REFERENCE!>Ann3<!>
@Ann2(<!TOO_MANY_ARGUMENTS!>1<!>)
<!UNRESOLVED_REFERENCE!>@Ann4<!><!SYNTAX!><!>
@<!UNRESOLVED_REFERENCE!>Ann4<!><!SYNTAX!><!>
}
<!UNRESOLVED_REFERENCE!>@Ann0<!>
@Ann <!UNRESOLVED_REFERENCE!>@Ann3<!>
@<!UNRESOLVED_REFERENCE!>Ann0<!>
@Ann @<!UNRESOLVED_REFERENCE!>Ann3<!>
@Ann2(<!TOO_MANY_ARGUMENTS!>1<!>)
<!UNRESOLVED_REFERENCE!>@Ann4<!SYNTAX!><!><!>
@<!UNRESOLVED_REFERENCE!>Ann4<!SYNTAX!><!><!>
compiler/testData/diagnostics/tests/annotations/MultiDeclaration.kt
Vendored
+1 -1
View File
@@ -4,6 +4,6 @@ data class Pair(val x: Int, val y: Int)
fun foo(): Int {
<!WRONG_ANNOTATION_TARGET!>@Ann<!> val (a, b) = Pair(12, 34)
<!UNRESOLVED_REFERENCE!>@Err<!> val (c, d) = Pair(56, 78)
@<!UNRESOLVED_REFERENCE!>Err<!> val (c, d) = Pair(56, 78)
return a + b + c + d
}
compiler/testData/diagnostics/tests/annotations/UnresolvedAnnotationOnObject.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package test
// Checks that there is no rewrite error at ANNOTATION slice because of resolving annotations for object in lazy resolve and resolving
// object as property (method tries to resolve annotations too).
<!UNRESOLVED_REFERENCE!>@BadAnnotation<!>
@<!UNRESOLVED_REFERENCE!>BadAnnotation<!>
object SomeObject
val some = SomeObject
compiler/testData/diagnostics/tests/annotations/forParameterAnnotationResolve.kt
Vendored
+1 -1
View File
@@ -10,5 +10,5 @@ fun foo() {
for (<!WRONG_ANNOTATION_TARGET!>@Ann(3)<!> (x, @Ann(4) y) in bar()) {}
for (<!UNRESOLVED_REFERENCE!>@Err<!>() (x,y) in bar()) {}
for (@<!UNRESOLVED_REFERENCE!>Err<!>() (x,y) in bar()) {}
}
compiler/testData/diagnostics/tests/annotations/kt1860-negative.kt
Vendored
+4 -4
View File
@@ -1,9 +1,9 @@
fun foo(<!UNRESOLVED_REFERENCE!>@varargs<!> <!UNUSED_PARAMETER!>f<!> : Int) {}
fun foo(@<!UNRESOLVED_REFERENCE!>varargs<!> <!UNUSED_PARAMETER!>f<!> : Int) {}
var bar : Int = 1
set(<!UNRESOLVED_REFERENCE!>@varargs<!> v) {}
set(@<!UNRESOLVED_REFERENCE!>varargs<!> v) {}
val x : (Int) -> Int = {<!UNRESOLVED_REFERENCE!>@varargs<!> <!TYPE_MISMATCH, UNINITIALIZED_VARIABLE!>x<!> <!SYNTAX!>: Int -> x<!>}
val x : (Int) -> Int = {@<!UNRESOLVED_REFERENCE!>varargs<!> <!TYPE_MISMATCH, UNINITIALIZED_VARIABLE!>x<!> <!SYNTAX!>: Int -> x<!>}
class Hello(<!UNRESOLVED_REFERENCE!>@varargs<!> <!UNUSED_PARAMETER!>args<!>: Any) {
class Hello(@<!UNRESOLVED_REFERENCE!>varargs<!> <!UNUSED_PARAMETER!>args<!>: Any) {
}
compiler/testData/diagnostics/tests/annotations/onInitializer.kt
Vendored
+2 -2
View File
@@ -1,11 +1,11 @@
class A {
<!WRONG_ANNOTATION_TARGET!>@ann<!> init {}
<!WRONG_ANNOTATION_TARGET, UNRESOLVED_REFERENCE!>@aaa<!> init {}
<!WRONG_ANNOTATION_TARGET!>@<!UNRESOLVED_REFERENCE!>aaa<!><!> init {}
}
interface T {
<!ANONYMOUS_INITIALIZER_IN_INTERFACE!><!WRONG_ANNOTATION_TARGET!>@ann<!> init {}<!>
<!ANONYMOUS_INITIALIZER_IN_INTERFACE!><!WRONG_ANNOTATION_TARGET, UNRESOLVED_REFERENCE!>@aaa<!> init {}<!>
<!ANONYMOUS_INITIALIZER_IN_INTERFACE!><!WRONG_ANNOTATION_TARGET!>@<!UNRESOLVED_REFERENCE!>aaa<!><!> init {}<!>
}
annotation class ann
compiler/testData/diagnostics/tests/annotations/unresolvedReferenceRange.kt
Vendored
+3 -3
View File
@@ -1,5 +1,5 @@
<!UNRESOLVED_REFERENCE!>@Ann<!> class A
<!UNRESOLVED_REFERENCE!>@Ann<!> class B
<!UNRESOLVED_REFERENCE!>@Ann<!>(1) class C
@<!UNRESOLVED_REFERENCE!>Ann<!> class A
@<!UNRESOLVED_REFERENCE!>Ann<!> class B
@<!UNRESOLVED_REFERENCE!>Ann<!>(1) class C
@kotlin.<!UNRESOLVED_REFERENCE!>Ann<!>(1) class D
@kotlin.annotation.<!UNRESOLVED_REFERENCE!>Ann<!>(1) class E