replace 'trait' keyword with 'interface' in user-visible messages and code generation tools
This commit is contained in:
+1
-1
@@ -1,5 +1,5 @@
|
||||
// "Create class 'A'" "false"
|
||||
// ACTION: Create trait 'A'
|
||||
// ACTION: Create interface 'A'
|
||||
// ERROR: Unresolved reference: A
|
||||
package p
|
||||
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
// "Create trait 'A'" "false"
|
||||
// "Create interface 'A'" "false"
|
||||
// ERROR: Unresolved reference: A
|
||||
class Foo: J.<caret>A {
|
||||
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
// "Create trait 'A'" "true"
|
||||
// "Create interface 'A'" "true"
|
||||
// ERROR: Unresolved reference: A
|
||||
class Foo: J.A {
|
||||
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
// "Create trait 'A'" "true"
|
||||
// "Create interface 'A'" "true"
|
||||
// ERROR: Unresolved reference: A
|
||||
class Foo: J.<caret>A {
|
||||
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
// "Create trait 'A'" "true"
|
||||
// "Create interface 'A'" "true"
|
||||
package p
|
||||
|
||||
class Foo: <caret>A {
|
||||
|
||||
+2
-2
@@ -1,10 +1,10 @@
|
||||
// "Create trait 'A'" "true"
|
||||
// "Create interface 'A'" "true"
|
||||
package p
|
||||
|
||||
class Foo: A {
|
||||
|
||||
}
|
||||
|
||||
trait A {
|
||||
interface A {
|
||||
|
||||
}
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
// ACTION: Create annotation 'A'
|
||||
// ACTION: Create class 'A'
|
||||
// ACTION: Create enum 'A'
|
||||
// ACTION: Create trait 'A'
|
||||
// ACTION: Create interface 'A'
|
||||
// ERROR: Unresolved reference: A
|
||||
import E.<caret>A
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
// "Create enum constant 'A'" "false"
|
||||
// ACTION: Create class 'A'
|
||||
// ACTION: Create trait 'A'
|
||||
// ACTION: Create interface 'A'
|
||||
// ACTION: Create object 'A'
|
||||
// ACTION: Create enum 'A'
|
||||
// ACTION: Create annotation 'A'
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
// "Create enum constant 'A'" "false"
|
||||
// ACTION: Create class 'A'
|
||||
// ACTION: Create trait 'A'
|
||||
// ACTION: Create interface 'A'
|
||||
// ACTION: Create object 'A'
|
||||
// ACTION: Create enum 'A'
|
||||
// ACTION: Create annotation 'A'
|
||||
|
||||
+1
-1
@@ -2,8 +2,8 @@
|
||||
// ERROR: Unresolved reference: A
|
||||
// ACTION: Create annotation 'A'
|
||||
// ACTION: Create class 'A'
|
||||
// ACTION: Create interface 'A'
|
||||
// ACTION: Create enum 'A'
|
||||
// ACTION: Create trait 'A'
|
||||
import J.<caret>A
|
||||
|
||||
class X {
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
// "Create trait 'A'" "true"
|
||||
// "Create interface 'A'" "true"
|
||||
package p
|
||||
|
||||
import p.<caret>A
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
// "Create trait 'A'" "true"
|
||||
// "Create interface 'A'" "true"
|
||||
package p
|
||||
|
||||
import p.A
|
||||
|
||||
trait A {
|
||||
interface A {
|
||||
|
||||
}
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
// "Create trait 'A'" "true"
|
||||
// "Create interface 'A'" "true"
|
||||
// ERROR: Unresolved reference: A
|
||||
import J.A
|
||||
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
// "Create trait 'A'" "true"
|
||||
// "Create interface 'A'" "true"
|
||||
// ERROR: Unresolved reference: A
|
||||
import J.<caret>A
|
||||
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
// "Create trait 'A'" "true"
|
||||
// "Create interface 'A'" "true"
|
||||
package p
|
||||
|
||||
import p.X.<caret>A
|
||||
|
||||
+2
-2
@@ -1,10 +1,10 @@
|
||||
// "Create trait 'A'" "true"
|
||||
// "Create interface 'A'" "true"
|
||||
package p
|
||||
|
||||
import p.X.A
|
||||
|
||||
class X {
|
||||
trait A {
|
||||
interface A {
|
||||
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
// "Create trait 'A'" "true"
|
||||
// "Create interface 'A'" "true"
|
||||
// ERROR: Unresolved reference: A
|
||||
fun foo() = J.A.B
|
||||
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
// "Create trait 'A'" "true"
|
||||
// "Create interface 'A'" "true"
|
||||
// ERROR: Unresolved reference: A
|
||||
fun foo() = J.<caret>A.B
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
// "Create trait 'A'" "true"
|
||||
// "Create interface 'A'" "true"
|
||||
// ERROR: Unresolved reference: B
|
||||
package p
|
||||
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
// "Create trait 'A'" "true"
|
||||
// "Create interface 'A'" "true"
|
||||
// ERROR: Unresolved reference: B
|
||||
package p
|
||||
|
||||
fun foo() = A.B
|
||||
|
||||
trait A {
|
||||
interface A {
|
||||
|
||||
}
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
// "Create trait 'A'" "false"
|
||||
// "Create interface 'A'" "false"
|
||||
// ACTION: Create object 'A'
|
||||
// ACTION: Create local variable 'A'
|
||||
// ACTION: Create parameter 'A'
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
// "Create annotation 'A'" "false"
|
||||
// ACTION: Create class 'A'
|
||||
// ACTION: Create trait 'A'
|
||||
// ACTION: Create interface 'A'
|
||||
// ACTION: Convert to block body
|
||||
// ERROR: Unresolved reference: A
|
||||
package p
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
// "Create annotation 'A'" "false"
|
||||
// ACTION: Create class 'A'
|
||||
// ACTION: Create object 'A'
|
||||
// ACTION: Create trait 'A'
|
||||
// ACTION: Create interface 'A'
|
||||
// ACTION: Create enum 'A'
|
||||
// ACTION: Convert to block body
|
||||
// ERROR: Unresolved reference: A
|
||||
|
||||
+1
-1
@@ -3,6 +3,6 @@
|
||||
// ACTION: Create annotation 'A'
|
||||
// ACTION: Create class 'A'
|
||||
// ACTION: Create enum 'A'
|
||||
// ACTION: Create trait 'A'
|
||||
// ACTION: Create interface 'A'
|
||||
// ERROR: Unresolved reference: A
|
||||
fun foo(): J.<caret>A = throw Throwable("")
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
// "Create enum constant 'A'" "false"
|
||||
// ACTION: Create annotation 'A'
|
||||
// ACTION: Create class 'A'
|
||||
// ACTION: Create trait 'A'
|
||||
// ACTION: Create interface 'A'
|
||||
// ACTION: Create enum 'A'
|
||||
// ACTION: Convert to block body
|
||||
// ERROR: Unresolved reference: A
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
// "Create enum 'A'" "false"
|
||||
// ACTION: Create class 'A'
|
||||
// ACTION: Create trait 'A'
|
||||
// ACTION: Create interface 'A'
|
||||
// ACTION: Convert to block body
|
||||
// ERROR: Unresolved reference: A
|
||||
package p
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
// "Create object 'A'" "false"
|
||||
// ACTION: Create annotation 'A'
|
||||
// ACTION: Create class 'A'
|
||||
// ACTION: Create trait 'A'
|
||||
// ACTION: Create interface 'A'
|
||||
// ACTION: Create enum 'A'
|
||||
// ACTION: Convert to block body
|
||||
// ERROR: Unresolved reference: A
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
// "Create object 'A'" "false"
|
||||
// ACTION: Create class 'A'
|
||||
// ACTION: Create trait 'A'
|
||||
// ACTION: Create interface 'A'
|
||||
// ACTION: Convert to block body
|
||||
// ERROR: Unresolved reference: A
|
||||
package p
|
||||
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
// "Create trait 'A'" "true"
|
||||
// "Create interface 'A'" "true"
|
||||
// ERROR: Unresolved reference: A
|
||||
fun foo(): J.A = throw Throwable("")
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
// "Create trait 'A'" "true"
|
||||
// "Create interface 'A'" "true"
|
||||
// ERROR: Unresolved reference: A
|
||||
fun foo(): J.<caret>A = throw Throwable("")
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
// "Create trait 'A'" "true"
|
||||
// "Create interface 'A'" "true"
|
||||
package p
|
||||
|
||||
fun foo(): <caret>A = throw Throwable("")
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
// "Create trait 'A'" "true"
|
||||
// "Create interface 'A'" "true"
|
||||
package p
|
||||
|
||||
fun foo(): A = throw Throwable("")
|
||||
|
||||
trait A {
|
||||
interface A {
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user