diff --git a/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties b/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties index d6638275285..16201958537 100644 --- a/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties +++ b/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties @@ -2,24 +2,24 @@ fix.insert.delegation.call=Insert ''{0}()'' call fix.introduce.non.null.assertion=Add non-null asserted (!!) call fix.remove.non.null.assertion=Remove unnecessary non-null assertion (!!) fix.add.annotation.target=Add annotation target -fix.add.const.modifier=Add ''const'' modifier +fix.add.const.modifier=Add 'const' modifier fix.add.constructor.parameter=Add constructor parameter ''{0}'' -fix.make.data.class=Make ''{0}'' a ''data'' class -fix.add.default.constructor=Add default constructor to ''expect'' class +fix.make.data.class=Make ''{0}'' data class +fix.add.default.constructor=Add default constructor to 'expect' class fix.add.explicit.import=Add explicit import fix.add.function.body=Add function body fix.add.is.to.when=Add ''is'' before ''{0}'' fix.add.new.line.after.annotations=Add new line after annotations fix.make.type.parameter.reified=Make {0} reified and {1} inline -fix.add.return.last.expression=Add ''return'' to last expression -fix.add.return.before.expression=Add ''return'' before the expression -fix.add.return.before.lambda.expression=Add ''run'' before the lambda expression +fix.add.return.last.expression=Add 'return' to last expression +fix.add.return.before.expression=Add 'return' before the expression +fix.add.return.before.lambda.expression=Add 'run' before the lambda expression fix.add.semicolon.lambda.expression=Terminate preceding call with semicolon -fix.add.spread.operator.after.sam=Add a spread operator before an array passing as ''vararg'' +fix.add.spread.operator.after.sam=Add a spread operator before an array passing as 'vararg' fix.add.else.branch.when=Add else branch fix.replace.with.assign.function.call=Replace with ''{0}'' call fix.assign.to.property=Assign to property -fix.change.mutability.change.to.val=Change ''{0}'' to ''val'' +fix.change.mutability.change.to.val=Change ''{0}'' to val fix.change.type.argument=Change type argument to {0} fix.change.to.function.invocation=Change to function invocation fix.change.to.mutable.type=Change type to {0} @@ -30,14 +30,14 @@ fix.change.to.property.access.family.change=Change to property access fix.change.to.labeled.return.family=Change to return with label fix.change.to.labeled.return.text=Change to ''{0}'' -fix.change.suspend.hierarchy.add=Add ''suspend'' modifier to all functions in hierarchy -fix.change.suspend.hierarchy.remove=Remove ''suspend'' modifier from all functions in hierarchy +fix.change.suspend.hierarchy.add=Add 'suspend' modifier to all functions in hierarchy +fix.change.suspend.hierarchy.remove=Remove 'suspend' modifier from all functions in hierarchy fix.change.progress.looking.inheritors=Looking for class {0} inheritors… fix.change.progress.analyzing.class.hierarchy=Analyzing class hierarchy… fix.change.return.type.family=Change type fix.change.return.type.text.primary.constructor=Change parameter ''{0}'' type of primary constructor of class ''{1}'' to ''{2}'' -fix.change.return.type.text.function=Change parameter ''{0}'' type of function of class ''{1}'' to ''{2}'' +fix.change.return.type.text.function=Change parameter ''{0}'' type of function ''{1}'' to ''{2}'' fix.change.return.type.lambda=Change lambda expression return type to {0} fix.change.return.type.remove.explicit.return.type=Remove explicitly specified return type fix.change.return.type.remove.explicit.return.type.of=Remove explicitly specified return type of {0} @@ -69,9 +69,9 @@ fix.add.remaining.branches.with.star.import=Add remaining branches with * import fix.add.type.annnotation.family=Add type annotation fix.add.type.annnotation.text=Add type ''{0}'' to parameter ''{1}'' -fix.add.tostring.call.family=Add ''toString()'' call -fix.add.tostring.call.text=Add ''toString()'' call -fix.add.tostring.call.text.safe=Add safe ''?.toString()'' call +fix.add.tostring.call.family=Add 'toString()' call +fix.add.tostring.call.text=Add 'toString()' call +fix.add.tostring.call.text.safe=Add safe '?.toString()' call fix.add.star.projection.family=Add star projections fix.add.star.projection.text=Add ''{0}'' @@ -80,7 +80,7 @@ fix.change.to.star.projection.family=Change to star projection fix.change.to.star.projection.text=Change type arguments to {0} fix.change.to.use.spread.operator.family=Change to use spread operator -fix.change.to.use.spread.operator.text=Change ''{0}'' to ''{0}'' +fix.change.to.use.spread.operator.text=Change ''{0}'' to ''{1}'' fix.change.type.family=Change type fix.change.type.text=Change type from ''{0}'' to ''{1}'' @@ -98,15 +98,15 @@ fix.add.property.to.supertype.choose.type=Choose Type fix.add.function.parameters.change.signature.constructor=Change the signature of constructor ''{0}'' fix.add.function.parameters.change.signature.function=Change the signature of function ''{0}'' -fix.add.function.parameters.add.parameter.constructor=Add {0,number,ordinal} {1,choice,1#parameter|2#parameters to constructor {2} -fix.add.function.parameters.add.parameter.function=Add {0,number,ordinal} {1,choice,1#parameter|2#parameters to function {2} -fix.add.function.parameters.add.parameter.generic.constructor=Add parameter to constructor {0} -fix.add.function.parameters.add.parameter.generic.function=Add parameter to function {0} +fix.add.function.parameters.add.parameter.constructor=Add {0,number,ordinal} {1,choice,1#parameter|2#parameters} to constructor ''{2}'' +fix.add.function.parameters.add.parameter.function=Add {0,number,ordinal} {1,choice,1#parameter|2#parameters} to function ''{2}'' +fix.add.function.parameters.add.parameter.generic.constructor=Add {0,choice,1#parameter|2#parameters} to constructor ''{1}'' +fix.add.function.parameters.add.parameter.generic.function=Add {0,choice,1#parameter|2#parameters} to function ''{1}'' fix.change.signature.family=Change signature of function/constructor fix.change.signature.function.family=Change function signature fix.change.signature.function.text=Change function signature to ''{0}'' -fix.change.signature.function.text.generic=Change function signature… +fix.change.signature.function.text.generic=Change function signature... fix.change.signature.function.popup.title=Choose Signature fix.change.signature.lambda=Change the signature of lambda expression fix.change.signature.remove.parameter=Remove parameter ''{0}'' @@ -114,10 +114,10 @@ fix.change.signature.unavailable= fix.change.signature.error= fix.change.signature.unnamed.parameter=parameter -fix.change.object.to.class=Change ''object'' to ''class'' +fix.change.object.to.class=Change 'object' to 'class' fix.add.function.supertype.family=Add function to supertype -fix.add.function.supertype.text=Add function to supertype… +fix.add.function.supertype.text=Add function to supertype... fix.add.function.supertype.progress=Add Function to Type fix.add.function.supertype.choose.type=Choose Type fix.add.function.supertype.add.to=Add ''{0}'' to ''{1}'' @@ -142,8 +142,8 @@ fix.add.modifier.text=Make {0} ''{1}'' fix.add.modifier.text.generic=Add ''{0}'' modifier fix.add.argument.name.family=Add name to argument -fix.add.argument.name.text.generic=Add name to argument… -fix.add.argument.name.text=Add name to argument: {0} +fix.add.argument.name.text.generic=Add name to argument... +fix.add.argument.name.text=Add name to argument: ''{0}'' fix.add.argument.name.step.choose.parameter.name=Choose parameter name fix.change.feature.support.family=Enable/Disable {0} support @@ -154,14 +154,14 @@ fix.change.feature.support.disabled=Disable {0} support fix.create.expect.actual=Create expect / actual declaration fix.create.missing.actual.members=Add missing actual members -fix.create.declaration.error=Can not generate {0}: {1} +fix.create.declaration.error=Cannot generate {0}: {1} fix.create.declaration.error.inaccessible.type=Inaccessible type fix.create.declaration.error.some.types.inaccessible=Some types are not accessible: fix.add.annotation.family=Add annotation -fix.add.annotation.text.self=Add ''{0}'' annotation -fix.add.annotation.text.declaration=Add ''{0}'' annotation to {1} -fix.add.annotation.text.containing.class=Add ''{0}'' annotation to containing class {1} +fix.add.annotation.text.self=Add ''@{0}'' annotation +fix.add.annotation.text.declaration=Add ''@{0}'' annotation to ''{1}'' +fix.add.annotation.text.containing.class=Add ''@{0}'' annotation to containing class ''{1}'' fix.import=Import fix.import.kind.delegate.accessors=Delegate accessors @@ -171,7 +171,7 @@ fix.import.exclude=Exclude ''{0}'' from auto-import fix.move.file.to.package.family=Move file to package-matching directory fix.move.file.to.package.text=Move file to {0} -fix.change.package.family=Change file's package to match directory +fix.change.package.family=file's package to match directory fix.change.package.text=Change file''s package to {0} action.add.import.chooser.title=Imports @@ -294,8 +294,8 @@ plugin.updater.error.cant.find.plugin.version=Couldn't find plugin version in re plugin.updater.error.custom.repository=Checking custom plugin repository {0} failed quick.doc.text.enum.ordinal=Enum constant ordinal: {0} -quick.doc.text.tailrec=''tailrec'' marks a function as tail-recursive (allowing the compiler to replace recursion with iteration) -quick.doc.text.lateinit=''lateinit'' allows initializing a not-null property outside of a constructor +quick.doc.text.tailrec='tailrec' marks a function as tail-recursive (allowing the compiler to replace recursion with iteration) +quick.doc.text.lateinit='lateinit' allows initializing a not-null property outside of a constructor quick.doc.no.documentation=No documentation available quick.doc.section.deprecated=Deprecated: quick.doc.section.replace.with=Replace with: @@ -332,7 +332,7 @@ action.generate.test.support.choose.test.name=Choose test name: action.generate.test.support.edit.template=Edit Template action.generate.test.support.error.no.template.found=No template found for {0}:{1} action.generate.test.support.error.cant.convert.java.template=Couldn't convert Java template to Kotlin -action.generate.test.support.error.cant.generate.method=Can not generate method: {0} +action.generate.test.support.error.cant.generate.method=Cannot generate method: {0} action.generate.tostring.name=Generate toString() action.generate.tostring.template.single=Single template @@ -497,12 +497,12 @@ find.usages.type.value.parameter.type = Parameter type find.usages.type.nonLocal.property.type = Class/object property type find.usages.type.function.return.type = Function return types find.usages.type.superType = Supertype -find.usages.type.is = Target type of ''is'' operation +find.usages.type.is = Target type of 'is' operation find.usages.type.class.object = Nested class/object find.usages.type.companion.object = Companion object find.usages.type.function.call = Function call -find.usages.type.implicit.get = Implicit ''get'' -find.usages.type.implicit.set = Implicit ''set'' +find.usages.type.implicit.get = Implicit 'get' +find.usages.type.implicit.set = Implicit 'set' find.usages.type.implicit.invoke = Implicit 'invoke' find.usages.type.implicit.iteration = Implicit iteration find.usages.type.property.delegation = Property delegation @@ -625,7 +625,7 @@ highlighter.prefix.text.has.actuals.in=Has actuals in highlighter.text.click.for.navigate=Click {0}to navigate highlighter.text.has.functional.implementations=Has functional implementations highlighter.text.implements=Implements -highlighter.text.in={0} in '{1}' +highlighter.text.in={0} in ''{1}'' highlighter.text.modules=\ ({0} modules) highlighter.text.or.press=\ or press {0} highlighter.text.overrides=Overrides @@ -969,7 +969,7 @@ text.pushed.member.will.not.be.available.in.0=Pushed member won''t be available text.qualified.call.will.not.be.processed.0=Qualified call won''t be processed: {0} text.receiver.can.t.be.safely.transformed.to.value.argument=Receiver can''t be safely transformed to value argument: {0} text.receiver=receiver -text.refactoring.can.t.be.performed.on.the.selected.code.element=Refactoring can''t be performed on the selected code element +text.refactoring.can.t.be.performed.on.the.selected.code.element=Refactoring can't be performed on the selected code element text.refactoring.is.not.applicable.to.this.code.fragment=Refactoring is not applicable to this code fragment text.references.in.code.to.0.1.and.its.declarations=References in code to {0} {1} and its declarations text.remove.0.no.longer.used=Remove {0} no longer used @@ -991,7 +991,7 @@ text.select.target.file=Select target file text.the.following=The following text.there.is.already.a.parameter=There is already a parameter ''{0}'' in {1}. It will conflict with the new parameter. text.there.is.already.a.variable.0.in.1.it.will.conflict.with.the.new.parameter=There is already a variable ''{0}'' in {1}. It will conflict with the new parameter. -text.type.alias.cannot.refer.to.types.which.aren.t.accessible.in.the.scope.where.it.s.defined=Type alias cannot refer to types which aren''t accessible in the scope where it''s defined +text.type.alias.cannot.refer.to.types.which.aren.t.accessible.in.the.scope.where.it.s.defined=Type alias cannot refer to types which aren't accessible in the scope where it's defined text.type.alias.name.must.be.a.valid.identifier.0=Type alias name must be a valid identifier: {0} text.type.alias=type alias text.type.already.exists.in.the.target.scope=Type {0} already exists in the target scope diff --git a/idea/idea-core/resources/messages/KotlinIdeaCoreBundle.properties b/idea/idea-core/resources/messages/KotlinIdeaCoreBundle.properties index cbc06835ac4..57b944ebbb2 100644 --- a/idea/idea-core/resources/messages/KotlinIdeaCoreBundle.properties +++ b/idea/idea-core/resources/messages/KotlinIdeaCoreBundle.properties @@ -2,8 +2,8 @@ action.text.implement.as.constructor.parameters=Implement as constructor paramet action.text.implement.members=Implement members hint.text.no.members.to.implement.have.been.found=No members to implement have been found hint.text.no.members.to.override.have.been.found=No members to override have been found -hint.text.surround.with.cannot.perform.action=Cannot perform Surround With action to the current contextsurround.with.function.template={ } -hint.text.surround.with=Surround with +surround.with.error.cannot.perform.action=Cannot perform Surround With action to the current contextsurround.with.function.template={ } +surround.with.title=Surround with notification.action.text.apply.context=Apply context notification.action.text.enable.auto.reload=Enable auto-reload notification.text.there.is.a.new.script.context.available=There is a new script context available. diff --git a/idea/idea-jvm/resources/org/jetbrains/kotlin/idea/KotlinJvmBundle.properties b/idea/idea-jvm/resources/org/jetbrains/kotlin/idea/KotlinJvmBundle.properties index 0ef1baf3759..71e03a6290a 100644 --- a/idea/idea-jvm/resources/org/jetbrains/kotlin/idea/KotlinJvmBundle.properties +++ b/idea/idea-jvm/resources/org/jetbrains/kotlin/idea/KotlinJvmBundle.properties @@ -1,6 +1,6 @@ -classpath.add.reflection=Add ''kotlin-reflect.jar'' to the classpath -classpath.add.script.runtime=Add ''kotlin-script-runtime.jar'' to the classpath -classpath.add.kotlin.test=Add ''kotlin-test.jar'' to the classpath +classpath.add.reflection=Add 'kotlin-reflect.jar' to the classpath +classpath.add.script.runtime=Add 'kotlin-script-runtime.jar' to the classpath +classpath.add.kotlin.test=Add 'kotlin-test.jar' to the classpath scratch.clear.button=Clear results scratch.inlay.output.mode=Inlay output mode\n\nThe output is shown in the code editor right next to the expression. Well suited for a short single-line output. diff --git a/idea/idea-maven/resources/org/jetbrains/kotlin/idea/maven/KotlinMavenBundle.properties b/idea/idea-maven/resources/org/jetbrains/kotlin/idea/maven/KotlinMavenBundle.properties index db13b73d28e..ef736236891 100644 --- a/idea/idea-maven/resources/org/jetbrains/kotlin/idea/maven/KotlinMavenBundle.properties +++ b/idea/idea-maven/resources/org/jetbrains/kotlin/idea/maven/KotlinMavenBundle.properties @@ -29,7 +29,7 @@ inspection.javascript.in.java.module=JavaScript goal configured for module with inspection.jvm.no.stdlib.dependency=Kotlin/JVM compiler configured but no ''{0}'' dependency inspection.javascript.no.stdlib.dependency=Kotlin/JavaScript compiler configured but no ''{0}'' dependency inspection.configured.no.execution=You have {0} configured but no corresponding plugin execution -inspection.same.execution.compile.test=It is not recommended to have both ''compile'' and ''test'' goals in the same execution +inspection.same.execution.compile.test=It is not recommended to have both 'compile' and 'test' goals in the same execution fix.create.execution.name="Create {0} execution fix.create.execution.family="Create Kotlin execution @@ -47,7 +47,7 @@ fix.create.execution.compiler.family=Create Kotlin execution fix.add.maven.dependency.name=Add Maven dependency… -fix.kotlin.test.junit.is.recommended=''kotlin-test-junit'' is recommended +fix.kotlin.test.junit.is.recommended='kotlin-test-junit' is recommended fix.kotlin.test.junit.replace=Replace with ''kotlin-test-junit'' fix.move.to.compile.execution=Move to ''compile'' execution diff --git a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenUpdateConfigurationQuickFixTest.kt b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenUpdateConfigurationQuickFixTest.kt index 66ae4454f19..7d6871df10a 100644 --- a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenUpdateConfigurationQuickFixTest.kt +++ b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenUpdateConfigurationQuickFixTest.kt @@ -89,7 +89,7 @@ class MavenUpdateConfigurationQuickFixTest : MavenImportingTestCase() { @Test fun testAddKotlinReflect() { - doTest("Add kotlin-reflect.jar to the classpath") + doTest("Add 'kotlin-reflect.jar' to the classpath") } private fun doTest(intentionName: String) { diff --git a/idea/idea-maven/testData/maven-inspections/bothCompileAndTestCompileInTheSameExecution.xml b/idea/idea-maven/testData/maven-inspections/bothCompileAndTestCompileInTheSameExecution.xml index fbfbac3416e..17574050be1 100644 --- a/idea/idea-maven/testData/maven-inspections/bothCompileAndTestCompileInTheSameExecution.xml +++ b/idea/idea-maven/testData/maven-inspections/bothCompileAndTestCompileInTheSameExecution.xml @@ -40,4 +40,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/idea/idea-maven/testData/maven-inspections/kotlinTestWithJunit.fixed.1.xml b/idea/idea-maven/testData/maven-inspections/kotlinTestWithJunit.fixed.1.xml index 4e134826a53..5139d8b20e4 100644 --- a/idea/idea-maven/testData/maven-inspections/kotlinTestWithJunit.fixed.1.xml +++ b/idea/idea-maven/testData/maven-inspections/kotlinTestWithJunit.fixed.1.xml @@ -54,4 +54,4 @@ - + diff --git a/idea/idea-maven/testData/maven-inspections/kotlinTestWithJunit.xml b/idea/idea-maven/testData/maven-inspections/kotlinTestWithJunit.xml index 7e2339e2119..6ceda38e861 100644 --- a/idea/idea-maven/testData/maven-inspections/kotlinTestWithJunit.xml +++ b/idea/idea-maven/testData/maven-inspections/kotlinTestWithJunit.xml @@ -54,4 +54,4 @@ - + diff --git a/idea/idea-maven/testData/maven-inspections/missingDependencies.fixed.1.xml b/idea/idea-maven/testData/maven-inspections/missingDependencies.fixed.1.xml index 6d5a2e855f6..b03b3dddcb5 100644 --- a/idea/idea-maven/testData/maven-inspections/missingDependencies.fixed.1.xml +++ b/idea/idea-maven/testData/maven-inspections/missingDependencies.fixed.1.xml @@ -40,5 +40,5 @@ - - + + diff --git a/idea/idea-maven/testData/maven-inspections/missingDependencies.fixed.2.xml b/idea/idea-maven/testData/maven-inspections/missingDependencies.fixed.2.xml index c9f40196ad6..f2bbaca39c7 100644 --- a/idea/idea-maven/testData/maven-inspections/missingDependencies.fixed.2.xml +++ b/idea/idea-maven/testData/maven-inspections/missingDependencies.fixed.2.xml @@ -40,5 +40,5 @@ - - + + diff --git a/idea/idea-maven/testData/maven-inspections/missingDependencies.xml b/idea/idea-maven/testData/maven-inspections/missingDependencies.xml index 78c46f01a5a..44fbf6ec6b0 100644 --- a/idea/idea-maven/testData/maven-inspections/missingDependencies.xml +++ b/idea/idea-maven/testData/maven-inspections/missingDependencies.xml @@ -32,5 +32,5 @@ - - + + diff --git a/idea/jvm-debugger/jvm-debugger-evaluation/resources/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerEvaluationBundle.properties b/idea/jvm-debugger/jvm-debugger-evaluation/resources/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerEvaluationBundle.properties index bc81fc62b88..30d610a3f55 100644 --- a/idea/jvm-debugger/jvm-debugger-evaluation/resources/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerEvaluationBundle.properties +++ b/idea/jvm-debugger/jvm-debugger-evaluation/resources/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerEvaluationBundle.properties @@ -19,5 +19,5 @@ error.coroutine.context.unavailable='coroutineContext' is not available error.not.captured=''{0}'' is not captured error.cant.find.backing.field=Cannot find the backing field ''{0}'' error.parameter.evaluation.default.methods=Parameter evaluation is not supported for '$default' methods -error.cant.find.variable=Can not find local variable ''{0}'' with type {1} -error.cant.find.class=Can not find class ''{0}'' in the current ClassLoader \ No newline at end of file +error.cant.find.variable=Cannot find local variable ''{0}'' with type {1} +error.cant.find.class=Cannot find class ''{0}'' in the current ClassLoader \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionParametersFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionParametersFix.kt index 1fa0f27903b..7ac17b39946 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionParametersFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionParametersFix.kt @@ -84,9 +84,9 @@ class AddFunctionParametersFix( } is Kind.AddParameterGeneric -> { if (isConstructor()) { - KotlinBundle.message("fix.add.function.parameters.add.parameter.generic.constructor", declarationName) + KotlinBundle.message("fix.add.function.parameters.add.parameter.generic.constructor", newParametersCnt, declarationName) } else { - KotlinBundle.message("fix.add.function.parameters.add.parameter.generic.function", declarationName) + KotlinBundle.message("fix.add.function.parameters.add.parameter.generic.function", newParametersCnt, declarationName) } } is Kind.AddParameter -> { diff --git a/idea/testData/editor/quickDoc/Lateinit.kt b/idea/testData/editor/quickDoc/Lateinit.kt index 08ccf735cc3..f66fa1c3344 100644 --- a/idea/testData/editor/quickDoc/Lateinit.kt +++ b/idea/testData/editor/quickDoc/Lateinit.kt @@ -2,4 +2,4 @@ class Foo { lateinit var foo: String } -//INFO: lateinit allows initializing a non-null property outside of a constructor \ No newline at end of file +//INFO: 'lateinit' allows initializing a not-null property outside of a constructor \ No newline at end of file diff --git a/idea/testData/editor/quickDoc/Tailrec.kt b/idea/testData/editor/quickDoc/Tailrec.kt index df930f85075..9b44787d6ae 100644 --- a/idea/testData/editor/quickDoc/Tailrec.kt +++ b/idea/testData/editor/quickDoc/Tailrec.kt @@ -2,4 +2,4 @@ foo() } -//INFO: tailrec marks a function as tail-recursive (allowing the compiler to replace recursion with iteration) \ No newline at end of file +//INFO: 'tailrec' marks a function as tail-recursive (allowing the compiler to replace recursion with iteration) \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/other/actualNoImplementAsConstructorParam/jvm/jvm.kt b/idea/testData/multiModuleQuickFix/other/actualNoImplementAsConstructorParam/jvm/jvm.kt index 9110a9384a0..1f157a2e741 100644 --- a/idea/testData/multiModuleQuickFix/other/actualNoImplementAsConstructorParam/jvm/jvm.kt +++ b/idea/testData/multiModuleQuickFix/other/actualNoImplementAsConstructorParam/jvm/jvm.kt @@ -2,7 +2,7 @@ // ERROR: Class 'End' is not abstract and does not implement abstract member public abstract val a: Int defined in IFoo // ACTION: Create test // ACTION: Implement members -// ACTION: Make 'End' abstract +// ACTION: Make 'End' 'abstract' // ACTION: Rename file to End.kt actual class End actual constructor(i: Int) : IFoo \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/other/makeOpenFromActual/jvm/jvm.kt b/idea/testData/multiModuleQuickFix/other/makeOpenFromActual/jvm/jvm.kt index 481fd1fc2b9..294dd387b7b 100644 --- a/idea/testData/multiModuleQuickFix/other/makeOpenFromActual/jvm/jvm.kt +++ b/idea/testData/multiModuleQuickFix/other/makeOpenFromActual/jvm/jvm.kt @@ -1,4 +1,4 @@ -// "Make 'One' open" "true" +// "Make 'One' 'open'" "true" actual class One class Two : One() \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/other/makeOpenFromActual/jvm/jvm.kt.after b/idea/testData/multiModuleQuickFix/other/makeOpenFromActual/jvm/jvm.kt.after index e6b0e2875bb..4db50839c12 100644 --- a/idea/testData/multiModuleQuickFix/other/makeOpenFromActual/jvm/jvm.kt.after +++ b/idea/testData/multiModuleQuickFix/other/makeOpenFromActual/jvm/jvm.kt.after @@ -1,4 +1,4 @@ -// "Make 'One' open" "true" +// "Make 'One' 'open'" "true" actual open class One class Two : One() \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/other/makeOpenFromExpect/common/common.kt b/idea/testData/multiModuleQuickFix/other/makeOpenFromExpect/common/common.kt index 10e9ad78379..0111abbf785 100644 --- a/idea/testData/multiModuleQuickFix/other/makeOpenFromExpect/common/common.kt +++ b/idea/testData/multiModuleQuickFix/other/makeOpenFromExpect/common/common.kt @@ -1,4 +1,4 @@ -// "Make 'One' open" "true" +// "Make 'One' 'open'" "true" // ERROR: Expected class 'Two' has no actual declaration in module testModule_JVM for JVM expect class One diff --git a/idea/testData/multiModuleQuickFix/other/makeOpenFromExpect/common/common.kt.after b/idea/testData/multiModuleQuickFix/other/makeOpenFromExpect/common/common.kt.after index 0d3a8e8b963..23dc1a2736d 100644 --- a/idea/testData/multiModuleQuickFix/other/makeOpenFromExpect/common/common.kt.after +++ b/idea/testData/multiModuleQuickFix/other/makeOpenFromExpect/common/common.kt.after @@ -1,4 +1,4 @@ -// "Make 'One' open" "true" +// "Make 'One' 'open'" "true" // ERROR: Expected class 'Two' has no actual declaration in module testModule_JVM for JVM expect open class One diff --git a/idea/testData/quickfix/abstract/abstractPropertyInCompanionObject.kt b/idea/testData/quickfix/abstract/abstractPropertyInCompanionObject.kt index ea4726dbf7b..b557e6164bf 100644 --- a/idea/testData/quickfix/abstract/abstractPropertyInCompanionObject.kt +++ b/idea/testData/quickfix/abstract/abstractPropertyInCompanionObject.kt @@ -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 diff --git a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt index 68fa4959c71..0b4e86bfe1e 100644 --- a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt +++ b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt @@ -1,4 +1,4 @@ -// "Make 'A' abstract" "true" +// "Make 'A' 'abstract'" "true" class A() { abstract var i : Int } diff --git a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt.after b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt.after index 945ce429d17..d847caf85e2 100644 --- a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt.after +++ b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt.after @@ -1,4 +1,4 @@ -// "Make 'A' abstract" "true" +// "Make 'A' 'abstract'" "true" abstract class A() { abstract var i : Int } diff --git a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt index 0944fe137dd..ca64a4e54b0 100644 --- a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt +++ b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt @@ -1,4 +1,4 @@ -// "Make 'A' abstract" "true" +// "Make 'A' 'abstract'" "true" public class A() { abstract var i : Int } diff --git a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt.after b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt.after index 3b0dca4c6ac..6ae6136242b 100644 --- a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt.after +++ b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt.after @@ -1,4 +1,4 @@ -// "Make 'A' abstract" "true" +// "Make 'A' 'abstract'" "true" public abstract class A() { abstract var i : Int } diff --git a/idea/testData/quickfix/abstract/makeEnumEntryAbstract.kt b/idea/testData/quickfix/abstract/makeEnumEntryAbstract.kt index 8d34c8a75b2..6e5b2be9af3 100644 --- a/idea/testData/quickfix/abstract/makeEnumEntryAbstract.kt +++ b/idea/testData/quickfix/abstract/makeEnumEntryAbstract.kt @@ -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 diff --git a/idea/testData/quickfix/abstract/makeInlineClassAbstract.kt b/idea/testData/quickfix/abstract/makeInlineClassAbstract.kt index 43d03eb62bc..a41aebfe9d2 100644 --- a/idea/testData/quickfix/abstract/makeInlineClassAbstract.kt +++ b/idea/testData/quickfix/abstract/makeInlineClassAbstract.kt @@ -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 diff --git a/idea/testData/quickfix/abstract/makeObjectMemberAbstract.kt b/idea/testData/quickfix/abstract/makeObjectMemberAbstract.kt index a701c99abf5..2637215996e 100644 --- a/idea/testData/quickfix/abstract/makeObjectMemberAbstract.kt +++ b/idea/testData/quickfix/abstract/makeObjectMemberAbstract.kt @@ -1,4 +1,4 @@ -// "Make 'foo' abstract" "false" +// "Make 'foo' 'abstract'" "false" // ACTION: Add function body // ACTION: Make internal // ACTION: Make private diff --git a/idea/testData/quickfix/abstract/makeTopLevelAbstract.kt b/idea/testData/quickfix/abstract/makeTopLevelAbstract.kt index fd7ed1eb26d..27f891ce35e 100644 --- a/idea/testData/quickfix/abstract/makeTopLevelAbstract.kt +++ b/idea/testData/quickfix/abstract/makeTopLevelAbstract.kt @@ -1,4 +1,4 @@ -// "Make 'foo' abstract" "false" +// "Make 'foo' 'abstract'" "false" // ACTION: Add function body // ACTION: Create test // ACTION: Make internal diff --git a/idea/testData/quickfix/abstract/manyImpl.kt b/idea/testData/quickfix/abstract/manyImpl.kt index 4df489fa7e9..651bb9ea469 100644 --- a/idea/testData/quickfix/abstract/manyImpl.kt +++ b/idea/testData/quickfix/abstract/manyImpl.kt @@ -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 diff --git a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt index 57e7f65c5f0..1e580e0c92b 100644 --- a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt +++ b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt @@ -1,4 +1,4 @@ -// "Make 'i' abstract" "true" +// "Make 'i' 'abstract'" "true" abstract class A() { var i : Int } diff --git a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt.after b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt.after index bdefbb28222..4f5c47a4130 100644 --- a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt.after +++ b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt.after @@ -1,4 +1,4 @@ -// "Make 'i' abstract" "true" +// "Make 'i' 'abstract'" "true" abstract class A() { abstract var i : Int } diff --git a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInFinalClass.kt b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInFinalClass.kt index bb35dd2090c..41e9d0c07e5 100644 --- a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInFinalClass.kt +++ b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInFinalClass.kt @@ -1,4 +1,4 @@ -// "Make 'i' abstract" "true" +// "Make 'i' 'abstract'" "true" class A() { var i : Int } diff --git a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInFinalClass.kt.after b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInFinalClass.kt.after index bdefbb28222..4f5c47a4130 100644 --- a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInFinalClass.kt.after +++ b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInFinalClass.kt.after @@ -1,4 +1,4 @@ -// "Make 'i' abstract" "true" +// "Make 'i' 'abstract'" "true" abstract class A() { abstract var i : Int } diff --git a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInOpenClass.kt b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInOpenClass.kt index b3ca05521a4..9e70f1c1528 100644 --- a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInOpenClass.kt +++ b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInOpenClass.kt @@ -1,4 +1,4 @@ -// "Make 'i' abstract" "true" +// "Make 'i' 'abstract'" "true" open class A() { var i : Int } diff --git a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInOpenClass.kt.after b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInOpenClass.kt.after index bdefbb28222..4f5c47a4130 100644 --- a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInOpenClass.kt.after +++ b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInOpenClass.kt.after @@ -1,4 +1,4 @@ -// "Make 'i' abstract" "true" +// "Make 'i' 'abstract'" "true" abstract class A() { abstract var i : Int } diff --git a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt index e87c0dd4e91..acde93f0824 100644 --- a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt +++ b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt @@ -1,4 +1,4 @@ -// "Make 'i' abstract" "true" +// "Make 'i' 'abstract'" "true" sealed class A() { fun i() : Int } diff --git a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt.after b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt.after index 9565204056e..f80634358e0 100644 --- a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt.after +++ b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt.after @@ -1,4 +1,4 @@ -// "Make 'i' abstract" "true" +// "Make 'i' 'abstract'" "true" sealed class A() { abstract fun i() : Int } diff --git a/idea/testData/quickfix/abstract/notImplementedMember.kt b/idea/testData/quickfix/abstract/notImplementedMember.kt index 37648b2d10c..2bc93859e0a 100644 --- a/idea/testData/quickfix/abstract/notImplementedMember.kt +++ b/idea/testData/quickfix/abstract/notImplementedMember.kt @@ -1,4 +1,4 @@ -// "Make 'A' abstract" "true" +// "Make 'A' 'abstract'" "true" interface I { fun foo() } diff --git a/idea/testData/quickfix/abstract/notImplementedMember.kt.after b/idea/testData/quickfix/abstract/notImplementedMember.kt.after index d8ca62bb8a4..85bac3999b8 100644 --- a/idea/testData/quickfix/abstract/notImplementedMember.kt.after +++ b/idea/testData/quickfix/abstract/notImplementedMember.kt.after @@ -1,4 +1,4 @@ -// "Make 'A' abstract" "true" +// "Make 'A' 'abstract'" "true" interface I { fun foo() } diff --git a/idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt b/idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt index c92c5384456..270fac78b6d 100644 --- a/idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt +++ b/idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt @@ -1,4 +1,4 @@ -// "Make 'B' abstract" "true" +// "Make 'B' 'abstract'" "true" abstract class A { abstract fun foo() } diff --git a/idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt.after b/idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt.after index 19492a0d37c..c62f1f13e37 100644 --- a/idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt.after +++ b/idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt.after @@ -1,4 +1,4 @@ -// "Make 'B' abstract" "true" +// "Make 'B' 'abstract'" "true" abstract class A { abstract fun foo() } diff --git a/idea/testData/quickfix/abstract/replaceOpen.kt b/idea/testData/quickfix/abstract/replaceOpen.kt index 0eac584df28..13f21216b92 100644 --- a/idea/testData/quickfix/abstract/replaceOpen.kt +++ b/idea/testData/quickfix/abstract/replaceOpen.kt @@ -1,4 +1,4 @@ -// "Make 'foo' abstract" "true" +// "Make 'foo' 'abstract'" "true" abstract class B() { open fun foo() } diff --git a/idea/testData/quickfix/abstract/replaceOpen.kt.after b/idea/testData/quickfix/abstract/replaceOpen.kt.after index d9af1d8ce42..6f9b5323658 100644 --- a/idea/testData/quickfix/abstract/replaceOpen.kt.after +++ b/idea/testData/quickfix/abstract/replaceOpen.kt.after @@ -1,4 +1,4 @@ -// "Make 'foo' abstract" "true" +// "Make 'foo' 'abstract'" "true" abstract class B() { abstract fun foo() } diff --git a/idea/testData/quickfix/addDefaultConstructor/expect.kt b/idea/testData/quickfix/addDefaultConstructor/expect.kt index eb8eec14a56..d3f3f7207c7 100644 --- a/idea/testData/quickfix/addDefaultConstructor/expect.kt +++ b/idea/testData/quickfix/addDefaultConstructor/expect.kt @@ -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 diff --git a/idea/testData/quickfix/addDefaultConstructor/expect.kt.after b/idea/testData/quickfix/addDefaultConstructor/expect.kt.after index f63194d078b..34d79cc04e9 100644 --- a/idea/testData/quickfix/addDefaultConstructor/expect.kt.after +++ b/idea/testData/quickfix/addDefaultConstructor/expect.kt.after @@ -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 diff --git a/idea/testData/quickfix/addDefaultConstructor/expectInterface.kt b/idea/testData/quickfix/addDefaultConstructor/expectInterface.kt index f458ac3578d..6155313aef9 100644 --- a/idea/testData/quickfix/addDefaultConstructor/expectInterface.kt +++ b/idea/testData/quickfix/addDefaultConstructor/expectInterface.kt @@ -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 diff --git a/idea/testData/quickfix/addDefaultConstructor/interface.kt b/idea/testData/quickfix/addDefaultConstructor/interface.kt index bfe08c952fd..720055375bd 100644 --- a/idea/testData/quickfix/addDefaultConstructor/interface.kt +++ b/idea/testData/quickfix/addDefaultConstructor/interface.kt @@ -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 diff --git a/idea/testData/quickfix/addJvmDefault/javaDefaultOverride.after.kt b/idea/testData/quickfix/addJvmDefault/javaDefaultOverride.after.kt index 5f8d7dd35f3..fad1593cce2 100644 --- a/idea/testData/quickfix/addJvmDefault/javaDefaultOverride.after.kt +++ b/idea/testData/quickfix/addJvmDefault/javaDefaultOverride.after.kt @@ -1,4 +1,4 @@ -// "Add '@JvmDefault' annotation" "true" +// "Add 'JvmDefault' annotation" "true" // COMPILER_ARGUMENTS: -Xjvm-default=enable // WITH_RUNTIME interface Bar : Foo { diff --git a/idea/testData/quickfix/addJvmDefault/javaDefaultOverride.before.Main.kt b/idea/testData/quickfix/addJvmDefault/javaDefaultOverride.before.Main.kt index bdb2324139d..895bbedf251 100644 --- a/idea/testData/quickfix/addJvmDefault/javaDefaultOverride.before.Main.kt +++ b/idea/testData/quickfix/addJvmDefault/javaDefaultOverride.before.Main.kt @@ -1,4 +1,4 @@ -// "Add '@JvmDefault' annotation" "true" +// "Add 'JvmDefault' annotation" "true" // COMPILER_ARGUMENTS: -Xjvm-default=enable // WITH_RUNTIME interface Bar : Foo { diff --git a/idea/testData/quickfix/addSpreadOperatorForArrayAsVarargAfterSam/withWarning.test b/idea/testData/quickfix/addSpreadOperatorForArrayAsVarargAfterSam/withWarning.test index 0018fa3931b..7abab1f5a15 100644 --- a/idea/testData/quickfix/addSpreadOperatorForArrayAsVarargAfterSam/withWarning.test +++ b/idea/testData/quickfix/addSpreadOperatorForArrayAsVarargAfterSam/withWarning.test @@ -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 diff --git a/idea/testData/quickfix/changeObjectToClass/primaryConstructor.kt b/idea/testData/quickfix/changeObjectToClass/primaryConstructor.kt index aa9087ef1f0..cc0aa87cf19 100644 --- a/idea/testData/quickfix/changeObjectToClass/primaryConstructor.kt +++ b/idea/testData/quickfix/changeObjectToClass/primaryConstructor.kt @@ -1,4 +1,4 @@ -// "Change object to class" "true" +// "Change 'object' to 'class'" "true" annotation class Ann // comment diff --git a/idea/testData/quickfix/changeObjectToClass/primaryConstructor.kt.after b/idea/testData/quickfix/changeObjectToClass/primaryConstructor.kt.after index 7b2ca85acd4..c02b190c1ae 100644 --- a/idea/testData/quickfix/changeObjectToClass/primaryConstructor.kt.after +++ b/idea/testData/quickfix/changeObjectToClass/primaryConstructor.kt.after @@ -1,4 +1,4 @@ -// "Change object to class" "true" +// "Change 'object' to 'class'" "true" annotation class Ann // comment diff --git a/idea/testData/quickfix/changeObjectToClass/secondaryConstructor.kt b/idea/testData/quickfix/changeObjectToClass/secondaryConstructor.kt index 76efb4245ff..efcf43aff12 100644 --- a/idea/testData/quickfix/changeObjectToClass/secondaryConstructor.kt +++ b/idea/testData/quickfix/changeObjectToClass/secondaryConstructor.kt @@ -1,4 +1,4 @@ -// "Change object to class" "true" +// "Change 'object' to 'class'" "true" annotation class Ann // comment diff --git a/idea/testData/quickfix/changeObjectToClass/secondaryConstructor.kt.after b/idea/testData/quickfix/changeObjectToClass/secondaryConstructor.kt.after index 7b2ca85acd4..c02b190c1ae 100644 --- a/idea/testData/quickfix/changeObjectToClass/secondaryConstructor.kt.after +++ b/idea/testData/quickfix/changeObjectToClass/secondaryConstructor.kt.after @@ -1,4 +1,4 @@ -// "Change object to class" "true" +// "Change 'object' to 'class'" "true" annotation class Ann // comment diff --git a/idea/testData/quickfix/leakingThis/accessOpenProperty.kt b/idea/testData/quickfix/leakingThis/accessOpenProperty.kt index 62f32c4093c..d846990c418 100644 --- a/idea/testData/quickfix/leakingThis/accessOpenProperty.kt +++ b/idea/testData/quickfix/leakingThis/accessOpenProperty.kt @@ -1,4 +1,4 @@ -// "Make 'x' final" "true" +// "Make 'x' 'final'" "true" open class My(open val x: Int) { val y = x diff --git a/idea/testData/quickfix/leakingThis/accessOpenProperty.kt.after b/idea/testData/quickfix/leakingThis/accessOpenProperty.kt.after index 403f30724c8..a0b062aeb86 100644 --- a/idea/testData/quickfix/leakingThis/accessOpenProperty.kt.after +++ b/idea/testData/quickfix/leakingThis/accessOpenProperty.kt.after @@ -1,4 +1,4 @@ -// "Make 'x' final" "true" +// "Make 'x' 'final'" "true" open class My(val x: Int) { val y = x diff --git a/idea/testData/quickfix/leakingThis/accessOpenPropertyClass.kt b/idea/testData/quickfix/leakingThis/accessOpenPropertyClass.kt index 3e276be37a4..b38b8e7f4c0 100644 --- a/idea/testData/quickfix/leakingThis/accessOpenPropertyClass.kt +++ b/idea/testData/quickfix/leakingThis/accessOpenPropertyClass.kt @@ -1,4 +1,4 @@ -// "Make 'My' final" "true" +// "Make 'My' 'final'" "true" open class My(open val x: Int) { val y = x diff --git a/idea/testData/quickfix/leakingThis/accessOpenPropertyClass.kt.after b/idea/testData/quickfix/leakingThis/accessOpenPropertyClass.kt.after index 3e118d0283d..d8d0c608472 100644 --- a/idea/testData/quickfix/leakingThis/accessOpenPropertyClass.kt.after +++ b/idea/testData/quickfix/leakingThis/accessOpenPropertyClass.kt.after @@ -1,4 +1,4 @@ -// "Make 'My' final" "true" +// "Make 'My' 'final'" "true" class My(open val x: Int) { val y = x diff --git a/idea/testData/quickfix/leakingThis/callOpenMethod.kt b/idea/testData/quickfix/leakingThis/callOpenMethod.kt index 924156ce9b3..9b99d99c53e 100644 --- a/idea/testData/quickfix/leakingThis/callOpenMethod.kt +++ b/idea/testData/quickfix/leakingThis/callOpenMethod.kt @@ -1,4 +1,4 @@ -// "Make 'init' final" "true" +// "Make 'init' 'final'" "true" open class My { diff --git a/idea/testData/quickfix/leakingThis/callOpenMethod.kt.after b/idea/testData/quickfix/leakingThis/callOpenMethod.kt.after index 6e4acd96a77..ac2079a638e 100644 --- a/idea/testData/quickfix/leakingThis/callOpenMethod.kt.after +++ b/idea/testData/quickfix/leakingThis/callOpenMethod.kt.after @@ -1,4 +1,4 @@ -// "Make 'init' final" "true" +// "Make 'init' 'final'" "true" open class My { diff --git a/idea/testData/quickfix/leakingThis/callOpenMethodClass.kt b/idea/testData/quickfix/leakingThis/callOpenMethodClass.kt index c304bf6b5c1..b18a9633d2a 100644 --- a/idea/testData/quickfix/leakingThis/callOpenMethodClass.kt +++ b/idea/testData/quickfix/leakingThis/callOpenMethodClass.kt @@ -1,4 +1,4 @@ -// "Make 'My' final" "true" +// "Make 'My' 'final'" "true" open class My { diff --git a/idea/testData/quickfix/leakingThis/callOpenMethodClass.kt.after b/idea/testData/quickfix/leakingThis/callOpenMethodClass.kt.after index d874a6195e7..10810aa3d13 100644 --- a/idea/testData/quickfix/leakingThis/callOpenMethodClass.kt.after +++ b/idea/testData/quickfix/leakingThis/callOpenMethodClass.kt.after @@ -1,4 +1,4 @@ -// "Make 'My' final" "true" +// "Make 'My' 'final'" "true" class My { diff --git a/idea/testData/quickfix/leakingThis/inNonFinal.kt b/idea/testData/quickfix/leakingThis/inNonFinal.kt index b1858014365..03473e4a49c 100644 --- a/idea/testData/quickfix/leakingThis/inNonFinal.kt +++ b/idea/testData/quickfix/leakingThis/inNonFinal.kt @@ -1,4 +1,4 @@ -// "Make 'My' final" "true" +// "Make 'My' 'final'" "true" open class My { init { diff --git a/idea/testData/quickfix/leakingThis/inNonFinal.kt.after b/idea/testData/quickfix/leakingThis/inNonFinal.kt.after index 9dd50a0550d..75d01066f26 100644 --- a/idea/testData/quickfix/leakingThis/inNonFinal.kt.after +++ b/idea/testData/quickfix/leakingThis/inNonFinal.kt.after @@ -1,4 +1,4 @@ -// "Make 'My' final" "true" +// "Make 'My' 'final'" "true" class My { init { diff --git a/idea/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt b/idea/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt index d8edc6f4023..dc5f7603ed6 100644 --- a/idea/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt +++ b/idea/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt @@ -1,4 +1,4 @@ -// "Make 'a' private" "true" +// "Make 'a' 'private'" "true" class A(internal val a: String = "") { fun foo() { a diff --git a/idea/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt.after b/idea/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt.after index 7a470eaf759..54161e697ba 100644 --- a/idea/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt.after +++ b/idea/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt.after @@ -1,4 +1,4 @@ -// "Make 'a' private" "true" +// "Make 'a' 'private'" "true" class A(private val a: String = "") { fun foo() { a diff --git a/idea/testData/quickfix/memberVisibilityCanBePrivate/internal.kt b/idea/testData/quickfix/memberVisibilityCanBePrivate/internal.kt index 8bb4d464c8f..5f3e1d89ec7 100644 --- a/idea/testData/quickfix/memberVisibilityCanBePrivate/internal.kt +++ b/idea/testData/quickfix/memberVisibilityCanBePrivate/internal.kt @@ -1,4 +1,4 @@ -// "Make 'a' private" "true" +// "Make 'a' 'private'" "true" class A { internal val a = "" diff --git a/idea/testData/quickfix/memberVisibilityCanBePrivate/internal.kt.after b/idea/testData/quickfix/memberVisibilityCanBePrivate/internal.kt.after index 33cc4209db3..fd628ed27c0 100644 --- a/idea/testData/quickfix/memberVisibilityCanBePrivate/internal.kt.after +++ b/idea/testData/quickfix/memberVisibilityCanBePrivate/internal.kt.after @@ -1,4 +1,4 @@ -// "Make 'a' private" "true" +// "Make 'a' 'private'" "true" class A { private val a = "" diff --git a/idea/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt b/idea/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt index e45acfa81cf..a31c4255f04 100644 --- a/idea/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt +++ b/idea/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt @@ -1,4 +1,4 @@ -// "Make 'a' private" "true" +// "Make 'a' 'private'" "true" class A { val a = "" diff --git a/idea/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt.after b/idea/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt.after index 33cc4209db3..fd628ed27c0 100644 --- a/idea/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt.after +++ b/idea/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt.after @@ -1,4 +1,4 @@ -// "Make 'a' private" "true" +// "Make 'a' 'private'" "true" class A { private val a = "" diff --git a/idea/testData/quickfix/memberVisibilityCanBePrivate/protected.kt b/idea/testData/quickfix/memberVisibilityCanBePrivate/protected.kt index 542838773c0..2dc6c86c581 100644 --- a/idea/testData/quickfix/memberVisibilityCanBePrivate/protected.kt +++ b/idea/testData/quickfix/memberVisibilityCanBePrivate/protected.kt @@ -1,4 +1,4 @@ -// "Make 'a' private" "true" +// "Make 'a' 'private'" "true" open class A { protected val a = "" diff --git a/idea/testData/quickfix/memberVisibilityCanBePrivate/protected.kt.after b/idea/testData/quickfix/memberVisibilityCanBePrivate/protected.kt.after index e38d8e14bf7..3613fb29415 100644 --- a/idea/testData/quickfix/memberVisibilityCanBePrivate/protected.kt.after +++ b/idea/testData/quickfix/memberVisibilityCanBePrivate/protected.kt.after @@ -1,4 +1,4 @@ -// "Make 'a' private" "true" +// "Make 'a' 'private'" "true" open class A { private val a = "" diff --git a/idea/testData/quickfix/memberVisibilityCanBePrivate/public.kt b/idea/testData/quickfix/memberVisibilityCanBePrivate/public.kt index e517e7f7450..c2112e81354 100644 --- a/idea/testData/quickfix/memberVisibilityCanBePrivate/public.kt +++ b/idea/testData/quickfix/memberVisibilityCanBePrivate/public.kt @@ -1,4 +1,4 @@ -// "Make 'a' private" "true" +// "Make 'a' 'private'" "true" class A { public val a = "" diff --git a/idea/testData/quickfix/memberVisibilityCanBePrivate/public.kt.after b/idea/testData/quickfix/memberVisibilityCanBePrivate/public.kt.after index 33cc4209db3..fd628ed27c0 100644 --- a/idea/testData/quickfix/memberVisibilityCanBePrivate/public.kt.after +++ b/idea/testData/quickfix/memberVisibilityCanBePrivate/public.kt.after @@ -1,4 +1,4 @@ -// "Make 'a' private" "true" +// "Make 'a' 'private'" "true" class A { private val a = "" diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalSupertype.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalSupertype.kt index 379fc2e0fe1..c9043c36965 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalSupertype.kt +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalSupertype.kt @@ -1,3 +1,3 @@ -// "Make 'A' open" "true" +// "Make 'A' 'open'" "true" final class A {} class B : A() {} diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalSupertype.kt.after b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalSupertype.kt.after index d801bcb4d7b..65623056249 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalSupertype.kt.after +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalSupertype.kt.after @@ -1,3 +1,3 @@ -// "Make 'A' open" "true" +// "Make 'A' 'open'" "true" open class A {} class B : A() {} diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalUpperBound.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalUpperBound.kt index 46948a6d5de..299eb1629a9 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalUpperBound.kt +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalUpperBound.kt @@ -1,3 +1,3 @@ -// "Make 'A' open" "true" +// "Make 'A' 'open'" "true" final class A {} class B> {} diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalUpperBound.kt.after b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalUpperBound.kt.after index 8d8d70c2d31..92ca15f80fe 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalUpperBound.kt.after +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalUpperBound.kt.after @@ -1,3 +1,3 @@ -// "Make 'A' open" "true" +// "Make 'A' 'open'" "true" open class A {} class B> {} diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalSupertype.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalSupertype.kt index ae4364f7947..71348fa0d1d 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalSupertype.kt +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalSupertype.kt @@ -1,3 +1,3 @@ -// "Make 'A' open" "true" +// "Make 'A' 'open'" "true" class A {} class B : A() {} diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalSupertype.kt.after b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalSupertype.kt.after index d801bcb4d7b..65623056249 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalSupertype.kt.after +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalSupertype.kt.after @@ -1,3 +1,3 @@ -// "Make 'A' open" "true" +// "Make 'A' 'open'" "true" open class A {} class B : A() {} diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalUpperBound.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalUpperBound.kt index 46948a6d5de..299eb1629a9 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalUpperBound.kt +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalUpperBound.kt @@ -1,3 +1,3 @@ -// "Make 'A' open" "true" +// "Make 'A' 'open'" "true" final class A {} class B> {} diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalUpperBound.kt.after b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalUpperBound.kt.after index 8d8d70c2d31..92ca15f80fe 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalUpperBound.kt.after +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalUpperBound.kt.after @@ -1,3 +1,3 @@ -// "Make 'A' open" "true" +// "Make 'A' 'open'" "true" open class A {} class B> {} diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/implementTraitFinalSupertype.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/implementTraitFinalSupertype.kt index 53523c3292a..1bc8e38313f 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/implementTraitFinalSupertype.kt +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/implementTraitFinalSupertype.kt @@ -1,4 +1,4 @@ -// "Make 'A' open" "true" +// "Make 'A' 'open'" "true" interface X {} interface Y {} diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/implementTraitFinalSupertype.kt.after b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/implementTraitFinalSupertype.kt.after index e42400231ba..437f793c67f 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/implementTraitFinalSupertype.kt.after +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/implementTraitFinalSupertype.kt.after @@ -1,4 +1,4 @@ -// "Make 'A' open" "true" +// "Make 'A' 'open'" "true" interface X {} interface Y {} diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/nestedFinalClass.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/nestedFinalClass.kt index 4165c4944af..6c3ab2b7cc2 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/nestedFinalClass.kt +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/nestedFinalClass.kt @@ -1,4 +1,4 @@ -// "Make 'B' open" "true" +// "Make 'B' 'open'" "true" class A { class B } diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/nestedFinalClass.kt.after b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/nestedFinalClass.kt.after index 8705baac1c5..c62bdcc19e8 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/nestedFinalClass.kt.after +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/nestedFinalClass.kt.after @@ -1,4 +1,4 @@ -// "Make 'B' open" "true" +// "Make 'B' 'open'" "true" class A { open class B } diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/openInCompanion.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/openInCompanion.kt index f4f0938af47..468b368c3b7 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/openInCompanion.kt +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/openInCompanion.kt @@ -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 diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInHeader.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInHeader.kt index 683c94923f9..345ca44ef22 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInHeader.kt +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInHeader.kt @@ -1,4 +1,4 @@ -// "Make 'B' open" "true" +// "Make 'B' 'open'" "true" class B { constructor() { } diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInHeader.kt.after b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInHeader.kt.after index bf03e57981d..d2022cbe90a 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInHeader.kt.after +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInHeader.kt.after @@ -1,4 +1,4 @@ -// "Make 'B' open" "true" +// "Make 'B' 'open'" "true" open class B { constructor() { } diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInSecondary.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInSecondary.kt index 825f57f6cee..045dda1cdbc 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInSecondary.kt +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInSecondary.kt @@ -1,4 +1,4 @@ -// "Make 'B' open" "true" +// "Make 'B' 'open'" "true" class B { constructor() { } diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInSecondary.kt.after b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInSecondary.kt.after index 3b7f28e88c6..c270d50f64b 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInSecondary.kt.after +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInSecondary.kt.after @@ -1,4 +1,4 @@ -// "Make 'B' open" "true" +// "Make 'B' 'open'" "true" open class B { constructor() { } diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/withConstructor.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/withConstructor.kt index c5bf42500ec..b740ee64a16 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/withConstructor.kt +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/withConstructor.kt @@ -1,4 +1,4 @@ -// "Make 'A' open" "true" +// "Make 'A' 'open'" "true" class A(val v: Int) class B : A(1) diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/withConstructor.kt.after b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/withConstructor.kt.after index 78386d8671d..8cca4cf83cf 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/withConstructor.kt.after +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/withConstructor.kt.after @@ -1,4 +1,4 @@ -// "Make 'A' open" "true" +// "Make 'A' 'open'" "true" open class A(val v: Int) class B : A(1) diff --git a/idea/testData/quickfix/modifiers/constVal.after.kt b/idea/testData/quickfix/modifiers/constVal.after.kt index 16ea1d430e4..937cc2f104b 100644 --- a/idea/testData/quickfix/modifiers/constVal.after.kt +++ b/idea/testData/quickfix/modifiers/constVal.after.kt @@ -1,4 +1,4 @@ -// "Make 'i' const" "true" +// "Make 'i' 'const'" "true" // ERROR: Only 'const val' can be used in constant expressions package constVal diff --git a/idea/testData/quickfix/modifiers/constVal.before.Main.kt b/idea/testData/quickfix/modifiers/constVal.before.Main.kt index 47f9a5cc296..d022f3e44b6 100644 --- a/idea/testData/quickfix/modifiers/constVal.before.Main.kt +++ b/idea/testData/quickfix/modifiers/constVal.before.Main.kt @@ -1,4 +1,4 @@ -// "Make 'i' const" "true" +// "Make 'i' 'const'" "true" // ERROR: Only 'const val' can be used in constant expressions package constVal diff --git a/idea/testData/quickfix/modifiers/kt10409.kt b/idea/testData/quickfix/modifiers/kt10409.kt index 600ce85262e..5e68ca30c30 100644 --- a/idea/testData/quickfix/modifiers/kt10409.kt +++ b/idea/testData/quickfix/modifiers/kt10409.kt @@ -1,4 +1,4 @@ -// "Make 'IterablePipeline' abstract" "true" +// "Make 'IterablePipeline' 'abstract'" "true" // ERROR: 'pipe' overrides nothing // ERROR: One type argument expected for interface Pipeline diff --git a/idea/testData/quickfix/modifiers/kt10409.kt.after b/idea/testData/quickfix/modifiers/kt10409.kt.after index 679eec09a6d..08373b24e68 100644 --- a/idea/testData/quickfix/modifiers/kt10409.kt.after +++ b/idea/testData/quickfix/modifiers/kt10409.kt.after @@ -1,4 +1,4 @@ -// "Make 'IterablePipeline' abstract" "true" +// "Make 'IterablePipeline' 'abstract'" "true" // ERROR: 'pipe' overrides nothing // ERROR: One type argument expected for interface Pipeline diff --git a/idea/testData/quickfix/modifiers/noLateinitOnNullable.kt b/idea/testData/quickfix/modifiers/noLateinitOnNullable.kt index 0edae1a40bb..7d036855be9 100644 --- a/idea/testData/quickfix/modifiers/noLateinitOnNullable.kt +++ b/idea/testData/quickfix/modifiers/noLateinitOnNullable.kt @@ -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 diff --git a/idea/testData/quickfix/modifiers/noLateinitOnPrimitive.kt b/idea/testData/quickfix/modifiers/noLateinitOnPrimitive.kt index 5bc5a247f63..a27adf5ab72 100644 --- a/idea/testData/quickfix/modifiers/noLateinitOnPrimitive.kt +++ b/idea/testData/quickfix/modifiers/noLateinitOnPrimitive.kt @@ -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 diff --git a/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt b/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt index 7fe2cfa5d53..37f71f77f50 100644 --- a/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt +++ b/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt @@ -1,4 +1,4 @@ -// "Make 'A' open" "true" +// "Make 'A' 'open'" "true" class A() { open fun foo() {} } diff --git a/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt.after b/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt.after index cf2f155fc9a..c121722b204 100644 --- a/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt.after +++ b/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt.after @@ -1,4 +1,4 @@ -// "Make 'A' open" "true" +// "Make 'A' 'open'" "true" open class A() { open fun foo() {} } diff --git a/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt b/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt index aea42c1d0ab..bb75558fb6a 100644 --- a/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt +++ b/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt @@ -1,4 +1,4 @@ -// "Make 'A' open" "true" +// "Make 'A' 'open'" "true" public class A() { open fun foo() {} } diff --git a/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt.after b/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt.after index adb248214fd..6e8dbadb2f3 100644 --- a/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt.after +++ b/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt.after @@ -1,4 +1,4 @@ -// "Make 'A' open" "true" +// "Make 'A' 'open'" "true" public open class A() { open fun foo() {} } diff --git a/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt b/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt index ece575d6bdc..93c0dcb75be 100644 --- a/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt +++ b/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt @@ -1,4 +1,4 @@ -// "Make 'A' open" "true" +// "Make 'A' 'open'" "true" @Deprecated("") class A() { open fun foo() {} } diff --git a/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt.after b/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt.after index 4474a90dfa3..b35f4dc66ba 100644 --- a/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt.after +++ b/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt.after @@ -1,4 +1,4 @@ -// "Make 'A' open" "true" +// "Make 'A' 'open'" "true" @Deprecated("") open class A() { open fun foo() {} diff --git a/idea/testData/quickfix/modifiers/openVarWithPrivateSetter.kt b/idea/testData/quickfix/modifiers/openVarWithPrivateSetter.kt index f691212adef..9adbaedf9e2 100644 --- a/idea/testData/quickfix/modifiers/openVarWithPrivateSetter.kt +++ b/idea/testData/quickfix/modifiers/openVarWithPrivateSetter.kt @@ -1,4 +1,4 @@ -// "Make 'foo' final" "true" +// "Make 'foo' 'final'" "true" open class My { open var foo = 42 private set diff --git a/idea/testData/quickfix/modifiers/openVarWithPrivateSetter.kt.after b/idea/testData/quickfix/modifiers/openVarWithPrivateSetter.kt.after index 47dcb607231..12d5129966f 100644 --- a/idea/testData/quickfix/modifiers/openVarWithPrivateSetter.kt.after +++ b/idea/testData/quickfix/modifiers/openVarWithPrivateSetter.kt.after @@ -1,4 +1,4 @@ -// "Make 'foo' final" "true" +// "Make 'foo' 'final'" "true" open class My { var foo = 42 private set diff --git a/idea/testData/quickfix/modifiers/overrideWithPrivateSetter.kt b/idea/testData/quickfix/modifiers/overrideWithPrivateSetter.kt index 4032e4d1ddc..efbb1fb824a 100644 --- a/idea/testData/quickfix/modifiers/overrideWithPrivateSetter.kt +++ b/idea/testData/quickfix/modifiers/overrideWithPrivateSetter.kt @@ -1,4 +1,4 @@ -// "Make 'bar' final" "true" +// "Make 'bar' 'final'" "true" interface Foo { val bar: String } diff --git a/idea/testData/quickfix/modifiers/overrideWithPrivateSetter.kt.after b/idea/testData/quickfix/modifiers/overrideWithPrivateSetter.kt.after index 84e4daded22..efec91bf5af 100644 --- a/idea/testData/quickfix/modifiers/overrideWithPrivateSetter.kt.after +++ b/idea/testData/quickfix/modifiers/overrideWithPrivateSetter.kt.after @@ -1,4 +1,4 @@ -// "Make 'bar' final" "true" +// "Make 'bar' 'final'" "true" interface Foo { val bar: String } diff --git a/idea/testData/quickfix/override/implemenAsConstructorParameterFunction.kt b/idea/testData/quickfix/override/implemenAsConstructorParameterFunction.kt index 302402e6310..cfa6e1336b6 100644 --- a/idea/testData/quickfix/override/implemenAsConstructorParameterFunction.kt +++ b/idea/testData/quickfix/override/implemenAsConstructorParameterFunction.kt @@ -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 diff --git a/idea/testData/quickfix/typeAddition/publicFunWithoutBody.kt b/idea/testData/quickfix/typeAddition/publicFunWithoutBody.kt index cc725120649..0a4023d45cb 100644 --- a/idea/testData/quickfix/typeAddition/publicFunWithoutBody.kt +++ b/idea/testData/quickfix/typeAddition/publicFunWithoutBody.kt @@ -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 diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt index 28219d43a1d..d27ea625de0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt @@ -70,7 +70,7 @@ class CommonIntentionActionsTest : LightPlatformCodeInsightFixtureTestCase() { myFixture.launchAction( createModifierActions( myFixture.atCaret(), TestModifierRequest(JvmModifier.FINAL, false) - ).findWithText("Make 'bar' open") + ).findWithText("Make 'bar' 'open'") ) myFixture.checkResult( """ @@ -93,7 +93,7 @@ class CommonIntentionActionsTest : LightPlatformCodeInsightFixtureTestCase() { myFixture.launchAction( createModifierActions( myFixture.atCaret(), TestModifierRequest(JvmModifier.PRIVATE, true) - ).findWithText("Make 'Foo' private") + ).findWithText("Make 'Foo' 'private'") ) myFixture.checkResult( """ diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt index 448fd2e62c1..32be65abea7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt @@ -177,7 +177,7 @@ class UpdateConfigurationQuickFixTest : LightPlatformCodeInsightFixtureTestCase( fun y01() = Foo::prop.getter """ ) - myFixture.launchAction(myFixture.findSingleIntention("Add kotlin-reflect.jar to the classpath")) + myFixture.launchAction(myFixture.findSingleIntention("Add 'kotlin-reflect.jar' to the classpath")) val kotlinRuntime = KotlinJavaModuleConfigurator.instance.getKotlinLibrary(module)!! val classes = kotlinRuntime.getFiles(OrderRootType.CLASSES).map { it.name } assertContainsElements(classes, "kotlin-reflect.jar") diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt.191 b/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt.191 index 952522a9e85..31dd5fe8167 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt.191 +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt.191 @@ -180,7 +180,7 @@ class UpdateConfigurationQuickFixTest : LightPlatformCodeInsightFixtureTestCase( fun y01() = Foo::prop.getter """ ) - myFixture.launchAction(myFixture.findSingleIntention("Add kotlin-reflect.jar to the classpath")) + myFixture.launchAction(myFixture.findSingleIntention("Add 'kotlin-reflect.jar' to the classpath")) val kotlinRuntime = KotlinJavaModuleConfigurator.instance.getKotlinLibrary(module)!! val classes = kotlinRuntime.getFiles(OrderRootType.CLASSES).map { it.name } assertContainsElements(classes, "kotlin-reflect.jar")