diff --git a/ChangeLog.md b/ChangeLog.md index 94bcf8845c9..9ab05575d27 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -100,6 +100,7 @@ These artifacts include extensions for the types available in the latter JDKs, s - [`KT-13542`](https://youtrack.jetbrains.com/issue/KT-13542) Rename: Do not search parameter text occurrences outside of its containing declaration - [`KT-8672`](https://youtrack.jetbrains.com/issue/KT-8672) Rename: Optimize search of parameter references in calls with named arguments - [`KT-9285`](https://youtrack.jetbrains.com/issue/KT-9285) Rename: Optimize search of private class members +- [`KT-13589`](https://youtrack.jetbrains.com/issue/KT-13589) Use TODO() consistently in implementation stubs #### Intention actions, inspections and quickfixes diff --git a/idea/idea-completion/testData/handlers/basic/override/AfterValKeyword.kt.after b/idea/idea-completion/testData/handlers/basic/override/AfterValKeyword.kt.after index 14b57b1755e..bb50e5c06e6 100644 --- a/idea/idea-completion/testData/handlers/basic/override/AfterValKeyword.kt.after +++ b/idea/idea-completion/testData/handlers/basic/override/AfterValKeyword.kt.after @@ -4,7 +4,7 @@ interface I { class A : I { override val someVal: String? - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. } // ELEMENT_TEXT: "override val someVal: String?" diff --git a/idea/idea-completion/testData/handlers/basic/override/ImplementVal.kt.after b/idea/idea-completion/testData/handlers/basic/override/ImplementVal.kt.after index 14b57b1755e..bb50e5c06e6 100644 --- a/idea/idea-completion/testData/handlers/basic/override/ImplementVal.kt.after +++ b/idea/idea-completion/testData/handlers/basic/override/ImplementVal.kt.after @@ -4,7 +4,7 @@ interface I { class A : I { override val someVal: String? - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. } // ELEMENT_TEXT: "override val someVal: String?" diff --git a/idea/idea-completion/testData/handlers/basic/override/ImplementVar.kt.after b/idea/idea-completion/testData/handlers/basic/override/ImplementVar.kt.after index a9f35a12854..4ae6c9b4b7e 100644 --- a/idea/idea-completion/testData/handlers/basic/override/ImplementVar.kt.after +++ b/idea/idea-completion/testData/handlers/basic/override/ImplementVar.kt.after @@ -4,7 +4,7 @@ interface I { class A : I { override var someVar: String - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. set(value) { } } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt index d4187dcc0df..10d36b3b800 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt @@ -182,9 +182,9 @@ fun generateUnsupportedOrSuperCall( bodyType: OverrideMemberChooserObject.BodyType ): String { if (bodyType == OverrideMemberChooserObject.BodyType.EMPTY) { - if (descriptor !is FunctionDescriptor) return "throw UnsupportedOperationException()" + val templateKind = if (descriptor is FunctionDescriptor) TemplateKind.FUNCTION else TemplateKind.PROPERTY_INITIALIZER return getFunctionBodyTextFromTemplate(project, - TemplateKind.FUNCTION, + templateKind, descriptor.name.asString(), descriptor.returnType?.let { IdeDescriptorRenderers.SOURCE_CODE.renderType(it) } ?: "Unit", null) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/templates.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/templates.kt index 0fca809ce91..86213d655fb 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/templates.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/templates.kt @@ -25,11 +25,15 @@ import org.jetbrains.kotlin.name.FqName import java.util.* private val FUNCTION_BODY_TEMPLATE = "New Kotlin Function Body.kt" +private val PROPERTY_INITIALIZER_TEMPLATE = "New Kotlin Property Initializer.kt" private val SECONDARY_CONSTRUCTOR_BODY_TEMPLATE = "New Kotlin Secondary Constructor Body.kt" private val ATTRIBUTE_FUNCTION_NAME = "FUNCTION_NAME" +private val ATTRIBUTE_PROPERTY_NAME = "PROPERTY_NAME" enum class TemplateKind(val templateFileName: String) { - FUNCTION(FUNCTION_BODY_TEMPLATE), SECONDARY_CONSTRUCTOR(SECONDARY_CONSTRUCTOR_BODY_TEMPLATE) + FUNCTION(FUNCTION_BODY_TEMPLATE), + SECONDARY_CONSTRUCTOR(SECONDARY_CONSTRUCTOR_BODY_TEMPLATE), + PROPERTY_INITIALIZER(PROPERTY_INITIALIZER_TEMPLATE) } fun getFunctionBodyTextFromTemplate( @@ -48,7 +52,11 @@ fun getFunctionBodyTextFromTemplate( properties.setProperty(FileTemplate.ATTRIBUTE_SIMPLE_CLASS_NAME, classFqName.shortName().asString()) } if (name != null) { - properties.setProperty(ATTRIBUTE_FUNCTION_NAME, name) + val attribute = when (kind) { + TemplateKind.FUNCTION, TemplateKind.SECONDARY_CONSTRUCTOR -> ATTRIBUTE_FUNCTION_NAME + TemplateKind.PROPERTY_INITIALIZER -> ATTRIBUTE_PROPERTY_NAME + } + properties.setProperty(attribute, name) } return try { diff --git a/idea/resources/fileTemplates/code/New Kotlin Property Initializer.kt.ft b/idea/resources/fileTemplates/code/New Kotlin Property Initializer.kt.ft new file mode 100644 index 00000000000..a10ffae38af --- /dev/null +++ b/idea/resources/fileTemplates/code/New Kotlin Property Initializer.kt.ft @@ -0,0 +1 @@ +TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. \ No newline at end of file diff --git a/idea/resources/fileTemplates/code/New Kotlin Property Initializer.kt.html b/idea/resources/fileTemplates/code/New Kotlin Property Initializer.kt.html new file mode 100644 index 00000000000..6cd244fdc6c --- /dev/null +++ b/idea/resources/fileTemplates/code/New Kotlin Property Initializer.kt.html @@ -0,0 +1,38 @@ + + + + + + +
This is a built-in template used for filling the initializer of a Kotlin property + each time it is generated by the program, e.g. when using the Create Property from Usage intention action.
+ The template is editable. Along with Kotlin expressions and comments, you can also use the predefined variables + that will be then expanded into the corresponding values. +
+ + + + + + + + + + + + + + + + + + + + + + + + +
Predefined variables will take the following values:
${RETURN_TYPE} a type of a created property
${PROPERTY_NAME} name of the created property
${CLASS_NAME} qualified name of the class where property is created
${SIMPLE_CLASS_NAME} non-qualified name of the class where property is created
+ + \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtensionIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtensionIntention.kt index 55532b3dc20..1be2d8199c0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtensionIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtensionIntention.kt @@ -28,14 +28,18 @@ import com.intellij.util.SmartList import org.jetbrains.kotlin.asJava.toLightMethods import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor -import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention -import org.jetbrains.kotlin.idea.intentions.setReceiverType +import org.jetbrains.kotlin.idea.core.TemplateKind +import org.jetbrains.kotlin.idea.core.getFunctionBodyTextFromTemplate import org.jetbrains.kotlin.idea.core.moveCaret import org.jetbrains.kotlin.idea.core.unblockDocument +import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention +import org.jetbrains.kotlin.idea.intentions.setReceiverType +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.getReturnTypeReference import org.jetbrains.kotlin.idea.references.KtReference import org.jetbrains.kotlin.idea.util.ImportInsertHelper import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject import org.jetbrains.kotlin.utils.addIfNotNull class ConvertMemberToExtensionIntention : SelfTargetingRangeIntention(KtCallableDeclaration::class.java, "Convert member to extension"), LowPriorityAction { @@ -110,17 +114,25 @@ class ConvertMemberToExtensionIntention : SelfTargetingRangeIntention { if (!extension.hasBody()) { //TODO: methods in PSI for setBody - extension.add(psiFactory.createBlock(THROW_UNSUPPORTED_OPERATION_EXCEPTION)) + extension.add(psiFactory.createBlock(bodyText)) selectBody(extension) } } is KtProperty -> { - val templateProperty = psiFactory.createDeclaration("var v: Any\nget()=$THROW_UNSUPPORTED_OPERATION_EXCEPTION\nset(value){$THROW_UNSUPPORTED_OPERATION_EXCEPTION}") + val templateProperty = psiFactory.createDeclaration("var v: Any\nget()=$bodyText\nset(value){\n$bodyText\n}") val templateGetter = templateProperty.getter!! val templateSetter = templateProperty.setter!! @@ -185,9 +197,6 @@ class ConvertMemberToExtensionIntention : SelfTargetingRangeIntention Unit? - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. } } diff --git a/idea/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after b/idea/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after index 0a5a5a40168..5b20c6e95c4 100644 --- a/idea/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after +++ b/idea/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after @@ -4,5 +4,5 @@ interface A { class B : A { override val String.prop: Int - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. } diff --git a/idea/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt.after b/idea/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt.after index ad024669fdc..e7ff794f5f9 100644 --- a/idea/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt.after +++ b/idea/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt.after @@ -4,7 +4,7 @@ interface A { class B : A { override var Int.foo: Double - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. set(value) { } } diff --git a/idea/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after b/idea/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after index 5960f4336ec..fd5051d66f4 100644 --- a/idea/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after +++ b/idea/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after @@ -11,19 +11,19 @@ interface T { class C : T { override val a1: Byte - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. override val a2: Short - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. override val a3: Int - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. override val a4: Long - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. override val a5: Float - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. override val a6: Double - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. override val a7: Char - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. override val a8: Boolean - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. } \ No newline at end of file diff --git a/idea/testData/codeInsight/overrideImplement/property.kt.after b/idea/testData/codeInsight/overrideImplement/property.kt.after index 46c15873f2e..d7f38071365 100644 --- a/idea/testData/codeInsight/overrideImplement/property.kt.after +++ b/idea/testData/codeInsight/overrideImplement/property.kt.after @@ -4,5 +4,5 @@ interface T { class GC() : T { override val v: Int - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. } diff --git a/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after b/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after index be5a975d16b..f3cb91a9575 100644 --- a/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after +++ b/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after @@ -10,7 +10,7 @@ class SomeTest : Test { } override val testProp: Int - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. /** * test diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/abstract.kt.after b/idea/testData/intentions/declarations/convertMemberToExtension/abstract.kt.after index 2a7452c830d..d521c6a64e6 100644 --- a/idea/testData/intentions/declarations/convertMemberToExtension/abstract.kt.after +++ b/idea/testData/intentions/declarations/convertMemberToExtension/abstract.kt.after @@ -3,5 +3,5 @@ abstract class Owner { } fun Owner.f() { - throw UnsupportedOperationException() + TODO("not implemented") //To change body of created functions use File | Settings | File Templates. } \ No newline at end of file diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/abstractProperty.kt.after b/idea/testData/intentions/declarations/convertMemberToExtension/abstractProperty.kt.after index c75b26d07f8..80cf2649b95 100644 --- a/idea/testData/intentions/declarations/convertMemberToExtension/abstractProperty.kt.after +++ b/idea/testData/intentions/declarations/convertMemberToExtension/abstractProperty.kt.after @@ -3,4 +3,4 @@ abstract class Owner { } val Owner.p: Int - get() = throw UnsupportedOperationException() \ No newline at end of file + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. \ No newline at end of file diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt.after b/idea/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt.after index edf32305ad9..8af138a25c2 100644 --- a/idea/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt.after +++ b/idea/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt.after @@ -4,4 +4,4 @@ class Owner { } val Owner.p: Int - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt.after b/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt.after index 6a3895e1f6b..9e4e16f0a70 100644 --- a/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt.after +++ b/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt.after @@ -4,7 +4,7 @@ class Owner { } var Owner.p: Int - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. set(value) { - throw UnsupportedOperationException() + TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. } diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt.after b/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt.after index d69df4aa479..9d6a9daf8ab 100644 --- a/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt.after +++ b/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt.after @@ -6,5 +6,5 @@ class Owner { var Owner.p: Int get() = 1 set(value) { - throw UnsupportedOperationException() + TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. } diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt.after b/idea/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt.after index 944a8da8d83..13937015939 100644 --- a/idea/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt.after +++ b/idea/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt.after @@ -6,5 +6,5 @@ class Owner { var Owner.p: Int get() { return 1 } set(value) { - throw UnsupportedOperationException() + TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. } diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt.after b/idea/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt.after index ee631943851..1cb7e9c6be8 100644 --- a/idea/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt.after +++ b/idea/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt.after @@ -5,5 +5,5 @@ class Owner { } var Owner.p: Int - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. set(v) {} diff --git a/idea/testData/intentions/implementAbstractMember/property/enumClass.kt.after b/idea/testData/intentions/implementAbstractMember/property/enumClass.kt.after index c666bbea2c2..fb8df42279f 100644 --- a/idea/testData/intentions/implementAbstractMember/property/enumClass.kt.after +++ b/idea/testData/intentions/implementAbstractMember/property/enumClass.kt.after @@ -8,5 +8,5 @@ enum class E : T { A, B, C; override val foo: Int - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. } \ No newline at end of file diff --git a/idea/testData/intentions/implementAbstractMember/property/enumClassWithSemicolon.kt.after b/idea/testData/intentions/implementAbstractMember/property/enumClassWithSemicolon.kt.after index c666bbea2c2..fb8df42279f 100644 --- a/idea/testData/intentions/implementAbstractMember/property/enumClassWithSemicolon.kt.after +++ b/idea/testData/intentions/implementAbstractMember/property/enumClassWithSemicolon.kt.after @@ -8,5 +8,5 @@ enum class E : T { A, B, C; override val foo: Int - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. } \ No newline at end of file diff --git a/idea/testData/intentions/implementAbstractMember/property/enumClassWithSemicolonAndMembers.kt.after b/idea/testData/intentions/implementAbstractMember/property/enumClassWithSemicolonAndMembers.kt.after index 9dd8c910f53..e1d51ca4b75 100644 --- a/idea/testData/intentions/implementAbstractMember/property/enumClassWithSemicolonAndMembers.kt.after +++ b/idea/testData/intentions/implementAbstractMember/property/enumClassWithSemicolonAndMembers.kt.after @@ -8,7 +8,7 @@ enum class E : T { A, B, C; override val foo: Int - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. val bar = 1 diff --git a/idea/testData/intentions/implementAbstractMember/property/enumEntries.kt.after b/idea/testData/intentions/implementAbstractMember/property/enumEntries.kt.after index 5cfc7f4a0f8..4616d59c80e 100644 --- a/idea/testData/intentions/implementAbstractMember/property/enumEntries.kt.after +++ b/idea/testData/intentions/implementAbstractMember/property/enumEntries.kt.after @@ -3,13 +3,13 @@ enum class E { A { override val foo: Int - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. }, B { override val foo: Int - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. }, C { override val foo: Int - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. }; abstract val foo: Int diff --git a/idea/testData/intentions/implementAbstractMember/property/enumEntriesWithArgs.kt.after b/idea/testData/intentions/implementAbstractMember/property/enumEntriesWithArgs.kt.after index 683d006bac1..7e423727184 100644 --- a/idea/testData/intentions/implementAbstractMember/property/enumEntriesWithArgs.kt.after +++ b/idea/testData/intentions/implementAbstractMember/property/enumEntriesWithArgs.kt.after @@ -3,13 +3,13 @@ enum class E(n: Int) { A(1) { override val foo: Int - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. }, B(2) { override val foo: Int - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. }, C(3) { override val foo: Int - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. }; abstract val foo: Int diff --git a/idea/testData/intentions/implementAbstractMember/property/implementAll.kt.after b/idea/testData/intentions/implementAbstractMember/property/implementAll.kt.after index 1ace2941432..ad1962607c8 100644 --- a/idea/testData/intentions/implementAbstractMember/property/implementAll.kt.after +++ b/idea/testData/intentions/implementAbstractMember/property/implementAll.kt.after @@ -6,13 +6,13 @@ interface T { class U : T { override val foo: String - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. } class V : T { override val foo: Int - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. } diff --git a/idea/testData/multiFileIntentions/convertMemberToExtension/addImports/after/x/test.kt b/idea/testData/multiFileIntentions/convertMemberToExtension/addImports/after/x/test.kt index c3a3e501416..8a91e2ba5b0 100644 --- a/idea/testData/multiFileIntentions/convertMemberToExtension/addImports/after/x/test.kt +++ b/idea/testData/multiFileIntentions/convertMemberToExtension/addImports/after/x/test.kt @@ -4,5 +4,5 @@ interface A { } fun A.foo(n: Int) { - throw UnsupportedOperationException() + TODO("not implemented") //To change body of created functions use File | Settings | File Templates. } \ No newline at end of file diff --git a/idea/testData/quickfix/implement/abstract.kt.after b/idea/testData/quickfix/implement/abstract.kt.after index adf07835cf5..9b6dd54fbe9 100644 --- a/idea/testData/quickfix/implement/abstract.kt.after +++ b/idea/testData/quickfix/implement/abstract.kt.after @@ -10,7 +10,7 @@ private abstract class Base { private class BaseImpl : Base() { override var x: Int - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. set(value) { } diff --git a/idea/testData/quickfix/implement/nested.kt.after b/idea/testData/quickfix/implement/nested.kt.after index a612ae3f007..4c63b30047a 100644 --- a/idea/testData/quickfix/implement/nested.kt.after +++ b/idea/testData/quickfix/implement/nested.kt.after @@ -17,7 +17,7 @@ class Container { class BaseImpl : Container.Base { override val x: Boolean - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. override fun bar(z: Int): String { TODO("not implemented") //To change body of created functions use File | Settings | File Templates. diff --git a/idea/testData/quickfix/implement/nestedPrivateInterface.kt.after b/idea/testData/quickfix/implement/nestedPrivateInterface.kt.after index d45f99652b5..709e0b9ad03 100644 --- a/idea/testData/quickfix/implement/nestedPrivateInterface.kt.after +++ b/idea/testData/quickfix/implement/nestedPrivateInterface.kt.after @@ -9,7 +9,7 @@ class Container { class BaseImpl : Base { override var z: Double - get() = throw UnsupportedOperationException() + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. set(value) { } } diff --git a/idea/testData/quickfix/override/nothingToOverride/addFunctionNonUnitReturnType.kt.after b/idea/testData/quickfix/override/nothingToOverride/addFunctionNonUnitReturnType.kt.after index f8605bae559..b431dbbe9f6 100644 --- a/idea/testData/quickfix/override/nothingToOverride/addFunctionNonUnitReturnType.kt.after +++ b/idea/testData/quickfix/override/nothingToOverride/addFunctionNonUnitReturnType.kt.after @@ -2,8 +2,7 @@ // WITH_RUNTIME open class A { open fun f(): Int { - throw UnsupportedOperationException() - } + TODO("not implemented") //To change body of created functions use File | Settings | File Templates. } } class B : A() { override fun f(): Int = 5