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

Wrap diagnostic parameters to double quotes and split by comma instead of semicolon

Browse Source
This commit is contained in:
victor.petukhov
2018-12-28 14:51:55 +03:00
parent 46bd5ba107
commit 30762a450a
55 changed files with 242 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/scopes/visibility.kt
Vendored
+5 -5
View File
@@ -40,8 +40,8 @@ class B {
}
fun test3(a: A) {
a.<!INVISIBLE_MEMBER(v; private; 'A')!>v<!> //todo .bMethod()
a.<!INVISIBLE_MEMBER(f; private; 'A')!>f<!>(0, <!TOO_MANY_ARGUMENTS!>1<!>) //todo .bMethod()
a.<!INVISIBLE_MEMBER("v", "private", "'A'")!>v<!> //todo .bMethod()
a.<!INVISIBLE_MEMBER("f", "private", "'A'")!>f<!>(0, <!TOO_MANY_ARGUMENTS!>1<!>) //todo .bMethod()
}
interface T
@@ -54,7 +54,7 @@ open class C : T {
}
fun test4(c: C) {
c.<!INVISIBLE_MEMBER(i; protected; 'C')!>i<!>++
c.<!INVISIBLE_MEMBER("i", "protected", "'C'")!>i<!>++
}
class D : C() {
@@ -78,7 +78,7 @@ class F : C() {
class G : T {
fun test8(c: C) {
doSmth(c.<!INVISIBLE_MEMBER(i; protected; 'C')!>i<!>)
doSmth(c.<!INVISIBLE_MEMBER("i", "protected", "'C'")!>i<!>)
}
}
@@ -91,5 +91,5 @@ import test_visibility.*
fun test() {
internal_fun()
<!INVISIBLE_MEMBER(private_fun; private; file)!>private_fun<!>()
<!INVISIBLE_MEMBER("private_fun", "private", "file")!>private_fun<!>()
}
compiler/testData/diagnostics/tests/scopes/visibility2.kt
Vendored
+9 -9
View File
@@ -17,23 +17,23 @@ private object PO {}
//+JDK
package b
import a.<!INVISIBLE_REFERENCE(A; private; file)!>A<!>
import a.<!INVISIBLE_REFERENCE(foo; private; file)!>foo<!>
import a.<!INVISIBLE_REFERENCE("A", "private", "file")!>A<!>
import a.<!INVISIBLE_REFERENCE("foo", "private", "file")!>foo<!>
import a.makeA
import a.<!INVISIBLE_REFERENCE(PO; private; file)!>PO<!>
import a.<!INVISIBLE_REFERENCE("PO", "private", "file")!>PO<!>
fun test() {
val y = makeA()
y.<!INVISIBLE_MEMBER(A; private; file)!>bar<!>()
<!INVISIBLE_MEMBER(foo; private; file)!>foo<!>()
y.<!INVISIBLE_MEMBER("A", "private", "file")!>bar<!>()
<!INVISIBLE_MEMBER("foo", "private", "file")!>foo<!>()
val u : <!INVISIBLE_REFERENCE(A; private; file)!>A<!> = <!INVISIBLE_MEMBER(A; private; file)!>A<!>()
val a : java.util.Arrays.<!INVISIBLE_REFERENCE(ArrayList; private; 'Arrays')!>ArrayList<!><Int>;
val u : <!INVISIBLE_REFERENCE("A", "private", "file")!>A<!> = <!INVISIBLE_MEMBER("A", "private", "file")!>A<!>()
val a : java.util.Arrays.<!INVISIBLE_REFERENCE("ArrayList", "private", "'Arrays'")!>ArrayList<!><Int>;
val po = <!INVISIBLE_MEMBER(PO; private; file)!>PO<!>
val po = <!INVISIBLE_MEMBER("PO", "private", "file")!>PO<!>
}
class B : <!EXPOSED_SUPER_CLASS!><!INVISIBLE_MEMBER(A; private; file), INVISIBLE_REFERENCE(A; private; file)!>A<!>()<!> {}
class B : <!EXPOSED_SUPER_CLASS!><!INVISIBLE_MEMBER("A", "private", "file"), INVISIBLE_REFERENCE("A", "private", "file")!>A<!>()<!> {}
class Q {
class W {
compiler/testData/diagnostics/tests/scopes/visibility3.kt
Vendored
+7 -7
View File
@@ -25,18 +25,18 @@ package a
fun test() {
val y = makeA()
y.<!INVISIBLE_MEMBER(A; private; file)!>bar<!>()
<!INVISIBLE_MEMBER(foo; private; file)!>foo<!>()
y.<!INVISIBLE_MEMBER("A", "private", "file")!>bar<!>()
<!INVISIBLE_MEMBER("foo", "private", "file")!>foo<!>()
val u : <!INVISIBLE_REFERENCE(A; private; file)!>A<!> = <!INVISIBLE_MEMBER(A; private; file)!>A<!>()
val u : <!INVISIBLE_REFERENCE("A", "private", "file")!>A<!> = <!INVISIBLE_MEMBER("A", "private", "file")!>A<!>()
val z = <!INVISIBLE_MEMBER(x; private; file)!>x<!>
<!INVISIBLE_MEMBER(x; private; file)!>x<!> = 30
val z = <!INVISIBLE_MEMBER("x", "private", "file")!>x<!>
<!INVISIBLE_MEMBER("x", "private", "file")!>x<!> = 30
val po = <!INVISIBLE_MEMBER(PO; private; file)!>PO<!>
val po = <!INVISIBLE_MEMBER("PO", "private", "file")!>PO<!>
}
class B : <!EXPOSED_SUPER_CLASS!><!INVISIBLE_MEMBER(A; private; file), INVISIBLE_REFERENCE(A; private; file)!>A<!>()<!> {}
class B : <!EXPOSED_SUPER_CLASS!><!INVISIBLE_MEMBER("A", "private", "file"), INVISIBLE_REFERENCE("A", "private", "file")!>A<!>()<!> {}
class Q {
class W {