i18n: fix bundle messages/testData messages where necessary

2020-02-27 14:43:41 +03:00
parent e1cb561398
commit 1dded486f1
115 changed files with 163 additions and 163 deletions
@@ -1,4 +1,4 @@
-// "Make 'Owner' abstract" "false"
+// "Make 'Owner' 'abstract'" "false"
 // ERROR: Abstract property 'x' in non-abstract class 'Companion'
 // ACTION: Make 'x' not abstract
 // ACTION: Make internal
@@ -1,4 +1,4 @@
-// "Make 'A' abstract" "true"
+// "Make 'A' 'abstract'" "true"
 class A() {
    <caret>abstract var i : Int
 }
@@ -1,4 +1,4 @@
-// "Make 'A' abstract" "true"
+// "Make 'A' 'abstract'" "true"
 abstract class A() {
    <caret>abstract var i : Int
 }
@@ -1,4 +1,4 @@
-// "Make 'A' abstract" "true"
+// "Make 'A' 'abstract'" "true"
 public class A() {
    <caret>abstract var i : Int
 }
@@ -1,4 +1,4 @@
-// "Make 'A' abstract" "true"
+// "Make 'A' 'abstract'" "true"
 public abstract class A() {
    <caret>abstract var i : Int
 }
@@ -1,4 +1,4 @@
-// "Make 'A' abstract" "false"
+// "Make 'A' 'abstract'" "false"
 // ACTION: Implement members
 // ERROR: Class 'A' is not abstract and does not implement abstract member public abstract fun foo(): Unit defined in E

@@ -1,4 +1,4 @@
-// "Make 'A' abstract" "false"
+// "Make 'A' 'abstract'" "false"
 // ERROR: Class 'A' is not abstract and does not implement abstract member public abstract fun foo(): String defined in I
 // ERROR: Primary constructor is required for inline class
 // ACTION: Create test
@@ -1,4 +1,4 @@
-// "Make 'foo' abstract" "false"
+// "Make 'foo' 'abstract'" "false"
 // ACTION: Add function body
 // ACTION: Make internal
 // ACTION: Make private
@@ -1,4 +1,4 @@
-// "Make 'foo' abstract" "false"
+// "Make 'foo' 'abstract'" "false"
 // ACTION: Add function body
 // ACTION: Create test
 // ACTION: Make internal
@@ -1,4 +1,4 @@
-// "Make 'A' abstract" "false"
+// "Make 'A' 'abstract'" "false"
 // ERROR: Class 'X' must override public open fun foo(): Unit defined in X because it inherits many implementations of it
 // ACTION: Create test
 // ACTION: Make internal
@@ -1,4 +1,4 @@
-// "Make 'i' abstract" "true"
+// "Make 'i' 'abstract'" "true"
 abstract class A() {
    var <caret>i : Int
 }
@@ -1,4 +1,4 @@
-// "Make 'i' abstract" "true"
+// "Make 'i' 'abstract'" "true"
 abstract class A() {
    abstract var <caret>i : Int
 }
@@ -1,4 +1,4 @@
-// "Make 'i' abstract" "true"
+// "Make 'i' 'abstract'" "true"
 class A() {
    var <caret>i : Int
 }
@@ -1,4 +1,4 @@
-// "Make 'i' abstract" "true"
+// "Make 'i' 'abstract'" "true"
 abstract class A() {
    abstract var <caret>i : Int
 }
@@ -1,4 +1,4 @@
-// "Make 'i' abstract" "true"
+// "Make 'i' 'abstract'" "true"
 open class A() {
    var <caret>i : Int
 }
@@ -1,4 +1,4 @@
-// "Make 'i' abstract" "true"
+// "Make 'i' 'abstract'" "true"
 abstract class A() {
    abstract var <caret>i : Int
 }
@@ -1,4 +1,4 @@
-// "Make 'i' abstract" "true"
+// "Make 'i' 'abstract'" "true"
 sealed class A() {
    fun <caret>i() : Int
 }
@@ -1,4 +1,4 @@
-// "Make 'i' abstract" "true"
+// "Make 'i' 'abstract'" "true"
 sealed class A() {
    abstract fun <caret>i() : Int
 }
@@ -1,4 +1,4 @@
-// "Make 'A' abstract" "true"
+// "Make 'A' 'abstract'" "true"
 interface I {
    fun foo()
 }
@@ -1,4 +1,4 @@
-// "Make 'A' abstract" "true"
+// "Make 'A' 'abstract'" "true"
 interface I {
    fun foo()
 }
@@ -1,4 +1,4 @@
-// "Make 'B' abstract" "true"
+// "Make 'B' 'abstract'" "true"
 abstract class A {
    abstract fun foo()
 }
@@ -1,4 +1,4 @@
-// "Make 'B' abstract" "true"
+// "Make 'B' 'abstract'" "true"
 abstract class A {
    abstract fun foo()
 }
@@ -1,4 +1,4 @@
-// "Make 'foo' abstract" "true"
+// "Make 'foo' 'abstract'" "true"
 abstract class B() {
    open fun <caret>foo()
 }
@@ -1,4 +1,4 @@
-// "Make 'foo' abstract" "true"
+// "Make 'foo' 'abstract'" "true"
 abstract class B() {
    abstract fun <caret>foo()
 }
@@ -1,4 +1,4 @@
-// "Add default constructor to expect class" "true"
+// "Add default constructor to 'expect' class" "true"
 // ENABLE_MULTIPLATFORM
 // ERROR: Expected class 'A' has no actual declaration in module light_idea_test_case for JVM

@@ -1,4 +1,4 @@
-// "Add default constructor to expect class" "true"
+// "Add default constructor to 'expect' class" "true"
 // ENABLE_MULTIPLATFORM
 // ERROR: Expected class 'A' has no actual declaration in module light_idea_test_case for JVM

@@ -1,4 +1,4 @@
-// "Add default constructor to expect class" "false"
+// "Add default constructor to 'expect' class" "false"
 // ENABLE_MULTIPLATFORM
 // ACTION: Create subclass
 // ACTION: Introduce import alias
@@ -1,4 +1,4 @@
-// "Add default constructor to expect class" "false"
+// "Add default constructor to 'expect' class" "false"
 // ACTION: Create subclass
 // ACTION: Introduce import alias
 // ACTION: Remove constructor call
@@ -1,4 +1,4 @@
-// "Add '@JvmDefault' annotation" "true"
+// "Add 'JvmDefault' annotation" "true"
 // COMPILER_ARGUMENTS: -Xjvm-default=enable
 // WITH_RUNTIME
 interface Bar : Foo {
@@ -1,4 +1,4 @@
-// "Add '@JvmDefault' annotation" "true"
+// "Add 'JvmDefault' annotation" "true"
 // COMPILER_ARGUMENTS: -Xjvm-default=enable
 // WITH_RUNTIME
 interface Bar : Foo {
@@ -1,5 +1,5 @@
 // FILE: test.before.kt
-// "Add a spread operator before an array passing as vararg" "true"
+// "Add a spread operator before an array passing as 'vararg'" "true"
 // WARNING: Please use spread operator to pass an array as vararg. It will be an error in 1.5.
 // COMPILER_ARGUMENTS: -XXLanguage:-ProhibitVarargAsArrayAfterSamArgument
 // WITH_RUNTIME
@@ -16,7 +16,7 @@ public class Test {
 }

 // FILE: test.after.kt
-// "Add a spread operator before an array passing as vararg" "true"
+// "Add a spread operator before an array passing as 'vararg'" "true"
 // WARNING: Please use spread operator to pass an array as vararg. It will be an error in 1.5.
 // COMPILER_ARGUMENTS: -XXLanguage:-ProhibitVarargAsArrayAfterSamArgument
 // WITH_RUNTIME
@@ -1,4 +1,4 @@
-// "Change object to class" "true"
+// "Change 'object' to 'class'" "true"
 annotation class Ann

 // comment
@@ -1,4 +1,4 @@
-// "Change object to class" "true"
+// "Change 'object' to 'class'" "true"
 annotation class Ann

 // comment
@@ -1,4 +1,4 @@
-// "Change object to class" "true"
+// "Change 'object' to 'class'" "true"
 annotation class Ann

 // comment
@@ -1,4 +1,4 @@
-// "Change object to class" "true"
+// "Change 'object' to 'class'" "true"
 annotation class Ann

 // comment
@@ -1,4 +1,4 @@
-// "Make 'x' final" "true"
+// "Make 'x' 'final'" "true"

 open class My(open val x: Int) {
    val y = <caret>x
@@ -1,4 +1,4 @@
-// "Make 'x' final" "true"
+// "Make 'x' 'final'" "true"

 open class My(val x: Int) {
    val y = x
@@ -1,4 +1,4 @@
-// "Make 'My' final" "true"
+// "Make 'My' 'final'" "true"

 open class My(open val x: Int) {
    val y = <caret>x
@@ -1,4 +1,4 @@
-// "Make 'My' final" "true"
+// "Make 'My' 'final'" "true"

 class My(open val x: Int) {
    val y = x
@@ -1,4 +1,4 @@
-// "Make 'init' final" "true"
+// "Make 'init' 'final'" "true"

 open class My {

@@ -1,4 +1,4 @@
-// "Make 'init' final" "true"
+// "Make 'init' 'final'" "true"

 open class My {

@@ -1,4 +1,4 @@
-// "Make 'My' final" "true"
+// "Make 'My' 'final'" "true"

 open class My {

@@ -1,4 +1,4 @@
-// "Make 'My' final" "true"
+// "Make 'My' 'final'" "true"

 class My {

@@ -1,4 +1,4 @@
-// "Make 'My' final" "true"
+// "Make 'My' 'final'" "true"

 open class My {
    init {
@@ -1,4 +1,4 @@
-// "Make 'My' final" "true"
+// "Make 'My' 'final'" "true"

 class My {
    init {
@@ -1,4 +1,4 @@
-// "Make 'a' private" "true"
+// "Make 'a' 'private'" "true"
 class A(<caret>internal val a: String = "") {
    fun foo() {
        a
@@ -1,4 +1,4 @@
-// "Make 'a' private" "true"
+// "Make 'a' 'private'" "true"
 class A(private val a: String = "") {
    fun foo() {
        a
@@ -1,4 +1,4 @@
-// "Make 'a' private" "true"
+// "Make 'a' 'private'" "true"
 class A {
    <caret>internal val a = ""

@@ -1,4 +1,4 @@
-// "Make 'a' private" "true"
+// "Make 'a' 'private'" "true"
 class A {
    private val a = ""

@@ -1,4 +1,4 @@
-// "Make 'a' private" "true"
+// "Make 'a' 'private'" "true"
 class A {
    val <caret>a = ""

@@ -1,4 +1,4 @@
-// "Make 'a' private" "true"
+// "Make 'a' 'private'" "true"
 class A {
    private val a = ""

@@ -1,4 +1,4 @@
-// "Make 'a' private" "true"
+// "Make 'a' 'private'" "true"
 open class A {
    <caret>protected val a = ""

@@ -1,4 +1,4 @@
-// "Make 'a' private" "true"
+// "Make 'a' 'private'" "true"
 open class A {
    private val a = ""

@@ -1,4 +1,4 @@
-// "Make 'a' private" "true"
+// "Make 'a' 'private'" "true"
 class A {
    <caret>public val a = ""

@@ -1,4 +1,4 @@
-// "Make 'a' private" "true"
+// "Make 'a' 'private'" "true"
 class A {
    private val a = ""

@@ -1,3 +1,3 @@
-// "Make 'A' open" "true"
+// "Make 'A' 'open'" "true"
 final class A {}
 class B : A<caret>() {}
@@ -1,3 +1,3 @@
-// "Make 'A' open" "true"
+// "Make 'A' 'open'" "true"
 open class A {}
 class B : A<caret>() {}
@@ -1,3 +1,3 @@
-// "Make 'A' open" "true"
+// "Make 'A' 'open'" "true"
 final class A {}
 class B<T : A<caret>> {}
@@ -1,3 +1,3 @@
-// "Make 'A' open" "true"
+// "Make 'A' 'open'" "true"
 open class A {}
 class B<T : A<caret>> {}
@@ -1,3 +1,3 @@
-// "Make 'A' open" "true"
+// "Make 'A' 'open'" "true"
 class A {}
 class B : A<caret>() {}
@@ -1,3 +1,3 @@
-// "Make 'A' open" "true"
+// "Make 'A' 'open'" "true"
 open class A {}
 class B : A<caret>() {}
@@ -1,3 +1,3 @@
-// "Make 'A' open" "true"
+// "Make 'A' 'open'" "true"
 final class A {}
 class B<T : A<caret>> {}
@@ -1,3 +1,3 @@
-// "Make 'A' open" "true"
+// "Make 'A' 'open'" "true"
 open class A {}
 class B<T : A<caret>> {}
@@ -1,4 +1,4 @@
-// "Make 'A' open" "true"
+// "Make 'A' 'open'" "true"
 interface X {}
 interface Y {}

@@ -1,4 +1,4 @@
-// "Make 'A' open" "true"
+// "Make 'A' 'open'" "true"
 interface X {}
 interface Y {}

@@ -1,4 +1,4 @@
-// "Make 'B' open" "true"
+// "Make 'B' 'open'" "true"
 class A {
    class B
 }
@@ -1,4 +1,4 @@
-// "Make 'B' open" "true"
+// "Make 'B' 'open'" "true"
 class A {
    open class B
 }
@@ -1,4 +1,4 @@
-// "Make 'MyClass' open" "false"
+// "Make 'MyClass' 'open'" "false"
 // ACTION: Convert to lazy property
 // ACTION: Make 'y' not open
 // ACTION: Add 'const' modifier
@@ -1,4 +1,4 @@
-// "Make 'B' open" "true"
+// "Make 'B' 'open'" "true"
 class B {
    constructor() {
    }
@@ -1,4 +1,4 @@
-// "Make 'B' open" "true"
+// "Make 'B' 'open'" "true"
 open class B {
    constructor() {
    }
@@ -1,4 +1,4 @@
-// "Make 'B' open" "true"
+// "Make 'B' 'open'" "true"
 class B {
    constructor() {
    }
@@ -1,4 +1,4 @@
-// "Make 'B' open" "true"
+// "Make 'B' 'open'" "true"
 open class B {
    constructor() {
    }
@@ -1,4 +1,4 @@
-// "Make 'A' open" "true"
+// "Make 'A' 'open'" "true"
 class A(val v: Int)

 class B : A<caret>(1)
@@ -1,4 +1,4 @@
-// "Make 'A' open" "true"
+// "Make 'A' 'open'" "true"
 open class A(val v: Int)

 class B : A<caret>(1)
@@ -1,4 +1,4 @@
-// "Make 'i' const" "true"
+// "Make 'i' 'const'" "true"
 // ERROR: Only 'const val' can be used in constant expressions

 package constVal
@@ -1,4 +1,4 @@
-// "Make 'i' const" "true"
+// "Make 'i' 'const'" "true"
 // ERROR: Only 'const val' can be used in constant expressions

 package constVal
@@ -1,4 +1,4 @@
-// "Make 'IterablePipeline' abstract" "true"
+// "Make 'IterablePipeline' 'abstract'" "true"
 // ERROR: 'pipe' overrides nothing
 // ERROR: One type argument expected for interface Pipeline<TPipeline>

@@ -1,4 +1,4 @@
-// "Make 'IterablePipeline' abstract" "true"
+// "Make 'IterablePipeline' 'abstract'" "true"
 // ERROR: 'pipe' overrides nothing
 // ERROR: One type argument expected for interface Pipeline<TPipeline>

@@ -1,6 +1,6 @@
 // "Add 'lateinit' modifier" "false"
 // ACTION: Add initializer
-// ACTION: Make 'a' abstract
+// ACTION: Make 'a' 'abstract'
 // ACTION: Move to constructor parameters
 // ACTION: Move to constructor
 // ACTION: Add getter
@@ -1,7 +1,7 @@
 // "Add 'lateinit' modifier" "false"
 // ACTION: Add initializer
 // ACTION: Introduce import alias
-// ACTION: Make 'a' abstract
+// ACTION: Make 'a' 'abstract'
 // ACTION: Move to constructor parameters
 // ACTION: Move to constructor
 // ACTION: Add getter
@@ -1,4 +1,4 @@
-// "Make 'A' open" "true"
+// "Make 'A' 'open'" "true"
 class A() {
    <caret>open fun foo() {}
 }
@@ -1,4 +1,4 @@
-// "Make 'A' open" "true"
+// "Make 'A' 'open'" "true"
 open class A() {
    <caret>open fun foo() {}
 }
@@ -1,4 +1,4 @@
-// "Make 'A' open" "true"
+// "Make 'A' 'open'" "true"
 public class A() {
    <caret>open fun foo() {}
 }
@@ -1,4 +1,4 @@
-// "Make 'A' open" "true"
+// "Make 'A' 'open'" "true"
 public open class A() {
    <caret>open fun foo() {}
 }
@@ -1,4 +1,4 @@
-// "Make 'A' open" "true"
+// "Make 'A' 'open'" "true"
@Deprecated("") class A() {
    <caret>open fun foo() {}
 }
@@ -1,4 +1,4 @@
-// "Make 'A' open" "true"
+// "Make 'A' 'open'" "true"
@Deprecated("")
 open class A() {
    open fun foo() {}
@@ -1,4 +1,4 @@
-// "Make 'foo' final" "true"
+// "Make 'foo' 'final'" "true"
 open class My {
    open var foo = 42
        <caret>private set
@@ -1,4 +1,4 @@
-// "Make 'foo' final" "true"
+// "Make 'foo' 'final'" "true"
 open class My {
    var foo = 42
        <caret>private set
@@ -1,4 +1,4 @@
-// "Make 'bar' final" "true"
+// "Make 'bar' 'final'" "true"
 interface Foo {
    val bar: String
 }
@@ -1,4 +1,4 @@
-// "Make 'bar' final" "true"
+// "Make 'bar' 'final'" "true"
 interface Foo {
    val bar: String
 }
@@ -1,7 +1,7 @@
 // "Implement as constructor parameters" "false"
 // ACTION: Create test
 // ACTION: Implement members
-// ACTION: Make 'A' abstract
+// ACTION: Make 'A' 'abstract'
 // ACTION: Make internal
 // ACTION: Make private
 // ACTION: Extract 'A' from current file
@@ -1,7 +1,7 @@
 // "Specify return type explicitly" "false"
 // ERROR: Function 'foo' without a body must be abstract
 // ACTION: Add function body
-// ACTION: Make 'foo' abstract
+// ACTION: Make 'foo' 'abstract'
 // ACTION: Convert member to extension

 package a