From ec15d5fee43e2067457701412816bd8622356911 Mon Sep 17 00:00:00 2001 From: Jack Zhou Date: Wed, 1 May 2013 17:58:25 -0400 Subject: [PATCH] Create from usage: Renamed all references of 'method' to 'function'. --- .../code/New Kotlin Function Body.kt.ft | 1 + ....html => New Kotlin Function Body.kt.html} | 14 ++--- .../code/New Kotlin Method Body.kt.ft | 1 - .../jetbrains/jet/plugin/JetBundle.properties | 2 +- ...x.java => CreateFunctionFromUsageFix.java} | 58 ++++++++++--------- .../jet/plugin/quickfix/QuickFixes.java | 12 ++-- .../afterCreateComponentFromUsage1.kt | 4 +- .../afterCreateComponentFromUsage2.kt | 4 +- .../beforeCreateComponentFromUsage1.kt | 2 +- .../beforeCreateComponentFromUsage2.kt | 2 +- .../get/afterCreateGetFromUsage1.kt | 4 +- .../get/afterCreateGetFromUsage10.kt | 4 +- .../get/afterCreateGetFromUsage11.kt | 4 +- .../get/afterCreateGetFromUsage12.kt | 4 +- .../get/afterCreateGetFromUsage13.kt | 4 +- .../get/afterCreateGetFromUsage2.kt | 4 +- .../get/afterCreateGetFromUsage3.kt | 4 +- .../get/afterCreateGetFromUsage4.kt | 4 +- .../get/afterCreateGetFromUsage5.kt | 4 +- .../get/afterCreateGetFromUsage6.kt | 4 +- .../get/afterCreateGetFromUsage7.kt | 4 +- .../get/afterCreateGetFromUsage8.kt | 4 +- .../get/afterCreateGetFromUsage9.kt | 4 +- .../get/beforeCreateGetFromUsage1.kt | 2 +- .../get/beforeCreateGetFromUsage10.kt | 2 +- .../get/beforeCreateGetFromUsage11.kt | 2 +- .../get/beforeCreateGetFromUsage12.kt | 2 +- .../get/beforeCreateGetFromUsage13.kt | 2 +- .../get/beforeCreateGetFromUsage2.kt | 2 +- .../get/beforeCreateGetFromUsage3.kt | 2 +- .../get/beforeCreateGetFromUsage4.kt | 2 +- .../get/beforeCreateGetFromUsage5.kt | 2 +- .../get/beforeCreateGetFromUsage6.kt | 2 +- .../get/beforeCreateGetFromUsage7.kt | 2 +- .../get/beforeCreateGetFromUsage8.kt | 2 +- .../get/beforeCreateGetFromUsage9.kt | 2 +- .../hasNext/afterCreateHasNextFromUsage1.kt | 4 +- .../hasNext/afterCreateHasNextFromUsage2.kt | 4 +- .../hasNext/beforeCreateHasNextFromUsage1.kt | 2 +- .../hasNext/beforeCreateHasNextFromUsage2.kt | 2 +- .../iterator/afterCreateIteratorFromUsage1.kt | 4 +- .../iterator/afterCreateIteratorFromUsage2.kt | 4 +- .../beforeCreateIteratorFromUsage1.kt | 2 +- .../beforeCreateIteratorFromUsage2.kt | 2 +- .../next/afterCreateNextFromUsage1.kt | 4 +- .../next/afterCreateNextFromUsage2.kt | 4 +- .../next/beforeCreateNextFromUsage1.kt | 2 +- .../next/beforeCreateNextFromUsage2.kt | 2 +- .../set/afterCreateSetFromUsage1.kt | 4 +- .../set/afterCreateSetFromUsage2.kt | 4 +- .../set/beforeCreateSetFromUsage1.kt | 2 +- .../set/beforeCreateSetFromUsage2.kt | 2 +- 52 files changed, 114 insertions(+), 112 deletions(-) create mode 100644 idea/resources/fileTemplates/code/New Kotlin Function Body.kt.ft rename idea/resources/fileTemplates/code/{New Kotlin Method Body.kt.html => New Kotlin Function Body.kt.html} (81%) delete mode 100644 idea/resources/fileTemplates/code/New Kotlin Method Body.kt.ft rename idea/src/org/jetbrains/jet/plugin/quickfix/{CreateMethodFromUsageFix.java => CreateFunctionFromUsageFix.java} (96%) diff --git a/idea/resources/fileTemplates/code/New Kotlin Function Body.kt.ft b/idea/resources/fileTemplates/code/New Kotlin Function Body.kt.ft new file mode 100644 index 00000000000..8c5a4e426d1 --- /dev/null +++ b/idea/resources/fileTemplates/code/New Kotlin Function Body.kt.ft @@ -0,0 +1 @@ +throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. \ No newline at end of file diff --git a/idea/resources/fileTemplates/code/New Kotlin Method Body.kt.html b/idea/resources/fileTemplates/code/New Kotlin Function Body.kt.html similarity index 81% rename from idea/resources/fileTemplates/code/New Kotlin Method Body.kt.html rename to idea/resources/fileTemplates/code/New Kotlin Function Body.kt.html index c3526f30920..44f331d71f9 100644 --- a/idea/resources/fileTemplates/code/New Kotlin Method Body.kt.html +++ b/idea/resources/fileTemplates/code/New Kotlin Function Body.kt.html @@ -2,8 +2,8 @@ - @@ -16,22 +16,22 @@ - + - + - + - + - +
This is a built-in template used for filling the body of a Kotlin method - each time it is generated by the program, e.g. when using the Create Method from Usage intention action.
+ 		This is a built-in template used for filling the body of a Kotlin function + each time it is generated by the program, e.g. when using the Create Function 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.
${RETURN_TYPE}  a return type of a created methoda return type of a created function
${METHOD_NAME}${FUNCTION_NAME}  name of the created methodname of the created function
${CLASS_NAME}  qualified name of the class where method is createdqualified name of the class where function is created
${SIMPLE_CLASS_NAME}  non-qualified name of the class where method is implementednon-qualified name of the class where function is implemented
diff --git a/idea/resources/fileTemplates/code/New Kotlin Method Body.kt.ft b/idea/resources/fileTemplates/code/New Kotlin Method Body.kt.ft deleted file mode 100644 index e5364a5698f..00000000000 --- a/idea/resources/fileTemplates/code/New Kotlin Method Body.kt.ft +++ /dev/null @@ -1 +0,0 @@ -throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. \ No newline at end of file diff --git a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties index 22535d9d944..bdd50b3a5f4 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties +++ b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties @@ -144,7 +144,7 @@ map.platform.class.to.kotlin.multiple=Change all usages of ''{0}'' in this file map.platform.class.to.kotlin.advertisement=Choose an appropriate Kotlin class map.platform.class.to.kotlin.family=Change to Kotlin class create.from.usage.family=Create from usage -create.method.from.usage=Create method ''{0}'' from usage +create.function.from.usage=Create function ''{0}'' from usage choose.target.class.or.trait.title=Choose target class or trait surround.with=Surround with surround.with.string.template="${expr}" diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/CreateMethodFromUsageFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/CreateFunctionFromUsageFix.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/quickfix/CreateMethodFromUsageFix.java rename to idea/src/org/jetbrains/jet/plugin/quickfix/CreateFunctionFromUsageFix.java index 1ce351e8c80..3ab5e083522 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/CreateMethodFromUsageFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/CreateFunctionFromUsageFix.java @@ -36,7 +36,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.popup.PopupChooserBuilder; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; @@ -78,9 +77,10 @@ import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class CreateMethodFromUsageFix extends CreateFromUsageFixBase { +public class CreateFunctionFromUsageFix extends CreateFromUsageFixBase { private static final String TYPE_PARAMETER_LIST_VARIABLE_NAME = "typeParameterList"; - private static final String TEMPLATE_FROM_USAGE_METHOD_BODY = "New Kotlin Method Body.kt"; + private static final String TEMPLATE_FROM_USAGE_FUNCTION_BODY = "New Kotlin Function Body.kt"; + private static final String ATTRIBUTE_FUNCTION_NAME = "FUNCTION_NAME"; private static final Pattern COMPONENT_FUNCTION_PATTERN = Pattern.compile("^component(\\d+)$"); /** @@ -272,7 +272,7 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase { } /** - * Encapsulates information about a method parameter that is going to be created. + * Encapsulates information about a function parameter that is going to be created. */ private static class Parameter { private final String preferredName; @@ -522,7 +522,7 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase { } } - private final String methodName; + private final String functionName; private final TypeOrExpressionThereof ownerType; private final TypeOrExpressionThereof returnType; private final List parameters; @@ -539,10 +539,12 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase { private TypeCandidate selectedReceiverType; private Map typeParameterNameMap; - public CreateMethodFromUsageFix(@NotNull PsiElement element, @NotNull TypeOrExpressionThereof ownerType, @NotNull String methodName, - @NotNull TypeOrExpressionThereof returnType, @NotNull List parameters) { + public CreateFunctionFromUsageFix( + @NotNull PsiElement element, @NotNull TypeOrExpressionThereof ownerType, @NotNull String functionName, + @NotNull TypeOrExpressionThereof returnType, @NotNull List parameters + ) { super(element); - this.methodName = methodName; + this.functionName = functionName; this.ownerType = ownerType; this.returnType = returnType; this.parameters = parameters; @@ -551,7 +553,7 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase { @NotNull @Override public String getText() { - return JetBundle.message("create.method.from.usage", methodName); + return JetBundle.message("create.function.from.usage", functionName); } @Override @@ -685,14 +687,14 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase { String returnTypeString = isUnit ? "" : ": Any"; if (isExtension) { // create as extension function String ownerTypeString = selectedReceiverType.getRenderedType(); - String methodText = String.format("fun %s.%s(%s)%s { }", ownerTypeString, methodName, parametersString, returnTypeString); - func = JetPsiFactory.createFunction(project, methodText); + String functionText = String.format("fun %s.%s(%s)%s { }", ownerTypeString, functionName, parametersString, returnTypeString); + func = JetPsiFactory.createFunction(project, functionText); containingFile = currentFile; containingFileEditor = currentFileEditor; func = (JetNamedFunction) currentFile.add(func); - } else { // create as method - String methodText = String.format("fun %s(%s)%s { }", methodName, parametersString, returnTypeString); - func = JetPsiFactory.createFunction(project, methodText); + } else { // create as regular function + String functionText = String.format("fun %s(%s)%s { }", functionName, parametersString, returnTypeString); + func = JetPsiFactory.createFunction(project, functionText); PsiFile classContainingFile = ownerClass.getContainingFile(); assert classContainingFile instanceof JetFile; containingFile = (JetFile) classContainingFile; @@ -862,7 +864,7 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase { } private void setupFunctionBody(@NotNull Project project, @NotNull JetNamedFunction func) { - FileTemplate fileTemplate = FileTemplateManager.getInstance().getCodeTemplate(TEMPLATE_FROM_USAGE_METHOD_BODY); + FileTemplate fileTemplate = FileTemplateManager.getInstance().getCodeTemplate(TEMPLATE_FROM_USAGE_FUNCTION_BODY); Properties properties = new Properties(); if (isUnit) { properties.setProperty(FileTemplate.ATTRIBUTE_RETURN_TYPE, "Unit"); @@ -873,7 +875,7 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase { } properties.setProperty(FileTemplate.ATTRIBUTE_CLASS_NAME, DescriptorUtils.getFQName(ownerClassDescriptor).getFqName()); properties.setProperty(FileTemplate.ATTRIBUTE_SIMPLE_CLASS_NAME, ownerClassDescriptor.getName().getName()); - properties.setProperty(FileTemplate.ATTRIBUTE_METHOD_NAME, methodName); + properties.setProperty(ATTRIBUTE_FUNCTION_NAME, functionName); @NonNls String bodyText; try { @@ -1204,7 +1206,7 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase { } @NotNull - public static JetIntentionActionFactory createCreateGetMethodFromUsageFactory() { + public static JetIntentionActionFactory createCreateGetFunctionFromUsageFactory() { return new JetIntentionActionFactory() { @Nullable @Override @@ -1223,13 +1225,13 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase { } TypeOrExpressionThereof returnType = new TypeOrExpressionThereof(accessExpr, Variance.OUT_VARIANCE); - return new CreateMethodFromUsageFix(accessExpr, arrayType, "get", returnType, parameters); + return new CreateFunctionFromUsageFix(accessExpr, arrayType, "get", returnType, parameters); } }; } @NotNull - public static JetIntentionActionFactory createCreateSetMethodFromUsageFactory() { + public static JetIntentionActionFactory createCreateSetFunctionFromUsageFactory() { return new JetIntentionActionFactory() { @Nullable @Override @@ -1255,13 +1257,13 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase { parameters.add(new Parameter("value", valType)); TypeOrExpressionThereof returnType = new TypeOrExpressionThereof(KotlinBuiltIns.getInstance().getUnitType(), Variance.OUT_VARIANCE); - return new CreateMethodFromUsageFix(accessExpr, arrayType, "set", returnType, parameters); + return new CreateFunctionFromUsageFix(accessExpr, arrayType, "set", returnType, parameters); } }; } @NotNull - public static JetIntentionActionFactory createCreateHasNextMethodFromUsageFactory() { + public static JetIntentionActionFactory createCreateHasNextFunctionFromUsageFactory() { return new JetIntentionActionFactory() { @Nullable @Override @@ -1276,13 +1278,13 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase { JetForExpression forExpr = QuickFixUtil.getParentElementOfType(diagnostic, JetForExpression.class); if (forExpr == null) return null; TypeOrExpressionThereof returnType = new TypeOrExpressionThereof(KotlinBuiltIns.getInstance().getBooleanType(), Variance.OUT_VARIANCE); - return new CreateMethodFromUsageFix(forExpr, ownerType, "hasNext", returnType, new ArrayList()); + return new CreateFunctionFromUsageFix(forExpr, ownerType, "hasNext", returnType, new ArrayList()); } }; } @NotNull - public static JetIntentionActionFactory createCreateNextMethodFromUsageFactory() { + public static JetIntentionActionFactory createCreateNextFunctionFromUsageFactory() { return new JetIntentionActionFactory() { @Nullable @Override @@ -1298,13 +1300,13 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase { JetExpression variableExpr = forExpr.getLoopParameter(); if (variableExpr == null) return null; TypeOrExpressionThereof returnType = new TypeOrExpressionThereof(variableExpr, Variance.OUT_VARIANCE); - return new CreateMethodFromUsageFix(forExpr, ownerType, "next", returnType, new ArrayList()); + return new CreateFunctionFromUsageFix(forExpr, ownerType, "next", returnType, new ArrayList()); } }; } @NotNull - public static JetIntentionActionFactory createCreateIteratorMethodFromUsageFactory() { + public static JetIntentionActionFactory createCreateIteratorFunctionFromUsageFactory() { return new JetIntentionActionFactory() { @Nullable @Override @@ -1331,13 +1333,13 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase { returnJetType = new JetTypeImpl(returnJetType.getAnnotations(), returnJetType.getConstructor(), returnJetType.isNullable(), returnJetTypeArguments, returnJetType.getMemberScope()); TypeOrExpressionThereof returnType = new TypeOrExpressionThereof(returnJetType, Variance.OUT_VARIANCE); - return new CreateMethodFromUsageFix(forExpr, iterableType, "iterator", returnType, new ArrayList()); + return new CreateFunctionFromUsageFix(forExpr, iterableType, "iterator", returnType, new ArrayList()); } }; } @NotNull - public static JetIntentionActionFactory createCreateComponentMethodFromUsageFactory() { + public static JetIntentionActionFactory createCreateComponentFunctionFromUsageFactory() { return new JetIntentionActionFactory() { @Nullable @Override @@ -1362,7 +1364,7 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase { if (rhs == null) return null; TypeOrExpressionThereof ownerType = new TypeOrExpressionThereof(rhs); - return new CreateMethodFromUsageFix(multiDeclaration, ownerType, name.getIdentifier(), returnType, new ArrayList()); + return new CreateFunctionFromUsageFix(multiDeclaration, ownerType, name.getIdentifier(), returnType, new ArrayList()); } }; } diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java index eeb9d63bde6..8974e83f6da 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java @@ -240,15 +240,15 @@ public class QuickFixes { factories.put(MANY_CLASSES_IN_SUPERTYPE_LIST, RemoveSupertypeFix.createFactory()); - factories.put(NO_GET_METHOD, CreateMethodFromUsageFix.createCreateGetMethodFromUsageFactory()); - factories.put(NO_SET_METHOD, CreateMethodFromUsageFix.createCreateSetMethodFromUsageFactory()); - JetIntentionActionFactory createHasNextFromUsageFactory = CreateMethodFromUsageFix.createCreateHasNextMethodFromUsageFactory(); + factories.put(NO_GET_METHOD, CreateFunctionFromUsageFix.createCreateGetFunctionFromUsageFactory()); + factories.put(NO_SET_METHOD, CreateFunctionFromUsageFix.createCreateSetFunctionFromUsageFactory()); + JetIntentionActionFactory createHasNextFromUsageFactory = CreateFunctionFromUsageFix.createCreateHasNextFunctionFromUsageFactory(); factories.put(HAS_NEXT_MISSING, createHasNextFromUsageFactory); factories.put(HAS_NEXT_FUNCTION_NONE_APPLICABLE, createHasNextFromUsageFactory); - JetIntentionActionFactory createNextFromUsageFactory = CreateMethodFromUsageFix.createCreateNextMethodFromUsageFactory(); + JetIntentionActionFactory createNextFromUsageFactory = CreateFunctionFromUsageFix.createCreateNextFunctionFromUsageFactory(); factories.put(NEXT_MISSING, createNextFromUsageFactory); factories.put(NEXT_NONE_APPLICABLE, createNextFromUsageFactory); - factories.put(ITERATOR_MISSING, CreateMethodFromUsageFix.createCreateIteratorMethodFromUsageFactory()); - factories.put(COMPONENT_FUNCTION_MISSING, CreateMethodFromUsageFix.createCreateComponentMethodFromUsageFactory()); + factories.put(ITERATOR_MISSING, CreateFunctionFromUsageFix.createCreateIteratorFunctionFromUsageFactory()); + factories.put(COMPONENT_FUNCTION_MISSING, CreateFunctionFromUsageFix.createCreateComponentFunctionFromUsageFactory()); } } diff --git a/idea/testData/quickfix/createFromUsage/component/afterCreateComponentFromUsage1.kt b/idea/testData/quickfix/createFromUsage/component/afterCreateComponentFromUsage1.kt index 07f9a9c89cc..fea659b5f7f 100644 --- a/idea/testData/quickfix/createFromUsage/component/afterCreateComponentFromUsage1.kt +++ b/idea/testData/quickfix/createFromUsage/component/afterCreateComponentFromUsage1.kt @@ -1,9 +1,9 @@ -// "Create method 'component3' from usage" "true" +// "Create function 'component3' from usage" "true" class Foo { fun component1(): Int { return 0 } fun component2(): Int { return 0 } fun component3(): Any { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } } fun foo() { diff --git a/idea/testData/quickfix/createFromUsage/component/afterCreateComponentFromUsage2.kt b/idea/testData/quickfix/createFromUsage/component/afterCreateComponentFromUsage2.kt index a0b58ed7311..654b2b0f728 100644 --- a/idea/testData/quickfix/createFromUsage/component/afterCreateComponentFromUsage2.kt +++ b/idea/testData/quickfix/createFromUsage/component/afterCreateComponentFromUsage2.kt @@ -1,9 +1,9 @@ -// "Create method 'component3' from usage" "true" +// "Create function 'component3' from usage" "true" class Foo { fun component1(): Int { return 0 } fun component2(): Int { return 0 } fun component3(): String { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } } fun foo() { diff --git a/idea/testData/quickfix/createFromUsage/component/beforeCreateComponentFromUsage1.kt b/idea/testData/quickfix/createFromUsage/component/beforeCreateComponentFromUsage1.kt index 8d1bf4515a7..69d48c6d639 100644 --- a/idea/testData/quickfix/createFromUsage/component/beforeCreateComponentFromUsage1.kt +++ b/idea/testData/quickfix/createFromUsage/component/beforeCreateComponentFromUsage1.kt @@ -1,4 +1,4 @@ -// "Create method 'component3' from usage" "true" +// "Create function 'component3' from usage" "true" class Foo { fun component1(): Int { return 0 } fun component2(): Int { return 0 } diff --git a/idea/testData/quickfix/createFromUsage/component/beforeCreateComponentFromUsage2.kt b/idea/testData/quickfix/createFromUsage/component/beforeCreateComponentFromUsage2.kt index 5ec47c32c3b..f2aa8b37e21 100644 --- a/idea/testData/quickfix/createFromUsage/component/beforeCreateComponentFromUsage2.kt +++ b/idea/testData/quickfix/createFromUsage/component/beforeCreateComponentFromUsage2.kt @@ -1,4 +1,4 @@ -// "Create method 'component3' from usage" "true" +// "Create function 'component3' from usage" "true" class Foo { fun component1(): Int { return 0 } fun component2(): Int { return 0 } diff --git a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage1.kt b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage1.kt index 2743d727be0..b9bba27b830 100644 --- a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage1.kt +++ b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage1.kt @@ -1,9 +1,9 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" class Foo { fun x (y: Foo>) { val z: Iterable = y[""] } fun get(s: String): T { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } } diff --git a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage10.kt b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage10.kt index dca15cbc5c5..c382e8ea21f 100644 --- a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage10.kt +++ b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage10.kt @@ -1,9 +1,9 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" class Foo { fun x (y: Foo>, w: java.util.ArrayList) { val z: Iterable = y["", w] } fun get(s: String, w: T): T { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } } diff --git a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage11.kt b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage11.kt index 0427e0f0ff2..6c30fb1b38e 100644 --- a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage11.kt +++ b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage11.kt @@ -1,7 +1,7 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" class Foo { fun get(s: String, w: T): T { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } } fun x (y: Foo>, w: java.util.ArrayList) { diff --git a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage12.kt b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage12.kt index cdcba5fb1ff..7045315ec0a 100644 --- a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage12.kt +++ b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage12.kt @@ -1,7 +1,7 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" class Foo { fun get(s: String, w: T): Any { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } } fun x (y: Foo>, w: java.util.ArrayList) { diff --git a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage13.kt b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage13.kt index 025bce56aa3..9326291c2b7 100644 --- a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage13.kt +++ b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage13.kt @@ -1,4 +1,4 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" import java.util.ArrayList class Foo { @@ -8,6 +8,6 @@ class Foo { bar(z) } fun get(s: String, w: ArrayList): String { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } } diff --git a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage2.kt b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage2.kt index 6a383097550..bb3346e55ff 100644 --- a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage2.kt +++ b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage2.kt @@ -1,7 +1,7 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" fun x (y: Any) { val z: Any = y[""] } fun Any.get(s: String): Any { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("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/createFromUsage/get/afterCreateGetFromUsage3.kt b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage3.kt index 932974dafdb..7e2eda1e05a 100644 --- a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage3.kt +++ b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage3.kt @@ -1,9 +1,9 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" class Foo { fun x (y: Foo>) { val z: Iterable = y[""] } fun get(s: String): T { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } } diff --git a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage4.kt b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage4.kt index 896f28e678e..1a7a9c74bf6 100644 --- a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage4.kt +++ b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage4.kt @@ -1,9 +1,9 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" class Foo> { fun x (y: Foo>) { val z: U = y[""] } fun get(s: String): T { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } } diff --git a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage5.kt b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage5.kt index c3870922212..b04845a5917 100644 --- a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage5.kt +++ b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage5.kt @@ -1,9 +1,9 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" class Foo { fun x (y: Foo>, w: Iterable) { val z: Iterable = y["", w] } fun get(s: String, w: Iterable): T { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } } diff --git a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage6.kt b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage6.kt index 5302f028434..0a7c6bd4cae 100644 --- a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage6.kt +++ b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage6.kt @@ -1,4 +1,4 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" import java.util.ArrayList class Foo { @@ -7,5 +7,5 @@ class Foo { } } fun ArrayList.get(s: String, w: ArrayList): Boolean { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("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/createFromUsage/get/afterCreateGetFromUsage7.kt b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage7.kt index 6f52661137a..1c4b070d6f2 100644 --- a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage7.kt +++ b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage7.kt @@ -1,4 +1,4 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" import java.util.ArrayList class Foo { @@ -6,6 +6,6 @@ class Foo { val z: Iterable = y["", w] } fun get(s: String, w: ArrayList): T { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } } diff --git a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage8.kt b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage8.kt index 0c87aa0374d..5697c984d88 100644 --- a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage8.kt +++ b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage8.kt @@ -1,4 +1,4 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" import java.util.ArrayList class Foo { @@ -6,6 +6,6 @@ class Foo { val z: Iterable = y["", w] } fun get(s: String, w: T): T { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } } diff --git a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage9.kt b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage9.kt index ed68a3b30d8..595ca53ddba 100644 --- a/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage9.kt +++ b/idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage9.kt @@ -1,4 +1,4 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" import java.util.ArrayList class Foo { @@ -6,6 +6,6 @@ class Foo { val z: Iterable = y["", w] } fun get(s: String, w: S): S { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } } diff --git a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage1.kt b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage1.kt index 1f3f356d134..45cf33ed64a 100644 --- a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage1.kt +++ b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage1.kt @@ -1,4 +1,4 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" class Foo { fun x (y: Foo>) { val z: Iterable = y[""] diff --git a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage10.kt b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage10.kt index dfe91efecb6..9827749a27d 100644 --- a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage10.kt +++ b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage10.kt @@ -1,4 +1,4 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" class Foo { fun x (y: Foo>, w: java.util.ArrayList) { val z: Iterable = y["", w] diff --git a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage11.kt b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage11.kt index 1962cc4865a..76e5a86ca5a 100644 --- a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage11.kt +++ b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage11.kt @@ -1,4 +1,4 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" class Foo fun x (y: Foo>, w: java.util.ArrayList) { val z: Iterable = y["", w] diff --git a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage12.kt b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage12.kt index 9a13b753aca..878d2a3a8f1 100644 --- a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage12.kt +++ b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage12.kt @@ -1,4 +1,4 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" class Foo fun x (y: Foo>, w: java.util.ArrayList) { val z = y["", w] diff --git a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage13.kt b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage13.kt index 9986981854f..908af6d8dcb 100644 --- a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage13.kt +++ b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage13.kt @@ -1,4 +1,4 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" import java.util.ArrayList class Foo { diff --git a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage2.kt b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage2.kt index 9d2682fbcc1..323a9d89ddf 100644 --- a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage2.kt +++ b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage2.kt @@ -1,4 +1,4 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" fun x (y: Any) { val z: Any = y[""] } diff --git a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage3.kt b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage3.kt index 044c3f30c02..75ddb82a2dd 100644 --- a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage3.kt +++ b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage3.kt @@ -1,4 +1,4 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" class Foo { fun x (y: Foo>) { val z: Iterable = y[""] diff --git a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage4.kt b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage4.kt index 06e54a609fb..9da2c52f293 100644 --- a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage4.kt +++ b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage4.kt @@ -1,4 +1,4 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" class Foo> { fun x (y: Foo>) { val z: U = y[""] diff --git a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage5.kt b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage5.kt index 606253ab6dd..bc03671e4b4 100644 --- a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage5.kt +++ b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage5.kt @@ -1,4 +1,4 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" class Foo { fun x (y: Foo>, w: Iterable) { val z: Iterable = y["", w] diff --git a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage6.kt b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage6.kt index 6df19aaf1fb..5ebce16d067 100644 --- a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage6.kt +++ b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage6.kt @@ -1,4 +1,4 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" class Foo { fun x (y: java.util.ArrayList, w: java.util.ArrayList) { val z: java.util.ArrayList? = if (y["", w]) null else null diff --git a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage7.kt b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage7.kt index 585766c4eeb..1c06f9503ad 100644 --- a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage7.kt +++ b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage7.kt @@ -1,4 +1,4 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" import java.util.ArrayList class Foo { diff --git a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage8.kt b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage8.kt index 7daa508dd1d..283b22d0e9d 100644 --- a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage8.kt +++ b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage8.kt @@ -1,4 +1,4 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" import java.util.ArrayList class Foo { diff --git a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage9.kt b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage9.kt index e6fb8ae0da4..e41c0004c8d 100644 --- a/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage9.kt +++ b/idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage9.kt @@ -1,4 +1,4 @@ -// "Create method 'get' from usage" "true" +// "Create function 'get' from usage" "true" import java.util.ArrayList class Foo { diff --git a/idea/testData/quickfix/createFromUsage/hasNext/afterCreateHasNextFromUsage1.kt b/idea/testData/quickfix/createFromUsage/hasNext/afterCreateHasNextFromUsage1.kt index f88d808c6e3..61499fd5802 100644 --- a/idea/testData/quickfix/createFromUsage/hasNext/afterCreateHasNextFromUsage1.kt +++ b/idea/testData/quickfix/createFromUsage/hasNext/afterCreateHasNextFromUsage1.kt @@ -1,10 +1,10 @@ -// "Create method 'hasNext' from usage" "true" +// "Create function 'hasNext' from usage" "true" class FooIterator { fun next(): Int { throw Exception("not implemented") } fun hasNext(): Boolean { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } } class Foo { diff --git a/idea/testData/quickfix/createFromUsage/hasNext/afterCreateHasNextFromUsage2.kt b/idea/testData/quickfix/createFromUsage/hasNext/afterCreateHasNextFromUsage2.kt index d9e4dff154f..3ae6aac17ee 100644 --- a/idea/testData/quickfix/createFromUsage/hasNext/afterCreateHasNextFromUsage2.kt +++ b/idea/testData/quickfix/createFromUsage/hasNext/afterCreateHasNextFromUsage2.kt @@ -1,10 +1,10 @@ -// "Create method 'hasNext' from usage" "true" +// "Create function 'hasNext' from usage" "true" class FooIterator { fun next(): T { throw Exception("not implemented") } fun hasNext(): Boolean { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } } class Foo { diff --git a/idea/testData/quickfix/createFromUsage/hasNext/beforeCreateHasNextFromUsage1.kt b/idea/testData/quickfix/createFromUsage/hasNext/beforeCreateHasNextFromUsage1.kt index 33e316a58dc..7c7a684a3b7 100644 --- a/idea/testData/quickfix/createFromUsage/hasNext/beforeCreateHasNextFromUsage1.kt +++ b/idea/testData/quickfix/createFromUsage/hasNext/beforeCreateHasNextFromUsage1.kt @@ -1,4 +1,4 @@ -// "Create method 'hasNext' from usage" "true" +// "Create function 'hasNext' from usage" "true" class FooIterator { fun next(): Int { throw Exception("not implemented") diff --git a/idea/testData/quickfix/createFromUsage/hasNext/beforeCreateHasNextFromUsage2.kt b/idea/testData/quickfix/createFromUsage/hasNext/beforeCreateHasNextFromUsage2.kt index e51b24ecefc..a0111a9cf93 100644 --- a/idea/testData/quickfix/createFromUsage/hasNext/beforeCreateHasNextFromUsage2.kt +++ b/idea/testData/quickfix/createFromUsage/hasNext/beforeCreateHasNextFromUsage2.kt @@ -1,4 +1,4 @@ -// "Create method 'hasNext' from usage" "true" +// "Create function 'hasNext' from usage" "true" class FooIterator { fun next(): T { throw Exception("not implemented") diff --git a/idea/testData/quickfix/createFromUsage/iterator/afterCreateIteratorFromUsage1.kt b/idea/testData/quickfix/createFromUsage/iterator/afterCreateIteratorFromUsage1.kt index c3392c5e2ef..56368bda717 100644 --- a/idea/testData/quickfix/createFromUsage/iterator/afterCreateIteratorFromUsage1.kt +++ b/idea/testData/quickfix/createFromUsage/iterator/afterCreateIteratorFromUsage1.kt @@ -1,7 +1,7 @@ -// "Create method 'iterator' from usage" "true" +// "Create function 'iterator' from usage" "true" class Foo { fun iterator(): Iterator { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } } fun foo() { diff --git a/idea/testData/quickfix/createFromUsage/iterator/afterCreateIteratorFromUsage2.kt b/idea/testData/quickfix/createFromUsage/iterator/afterCreateIteratorFromUsage2.kt index 48e3b81e83f..745e922b240 100644 --- a/idea/testData/quickfix/createFromUsage/iterator/afterCreateIteratorFromUsage2.kt +++ b/idea/testData/quickfix/createFromUsage/iterator/afterCreateIteratorFromUsage2.kt @@ -1,7 +1,7 @@ -// "Create method 'iterator' from usage" "true" +// "Create function 'iterator' from usage" "true" class Foo { fun iterator(): Iterator { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } } fun foo() { diff --git a/idea/testData/quickfix/createFromUsage/iterator/beforeCreateIteratorFromUsage1.kt b/idea/testData/quickfix/createFromUsage/iterator/beforeCreateIteratorFromUsage1.kt index e369b20bfd1..9638ae6649c 100644 --- a/idea/testData/quickfix/createFromUsage/iterator/beforeCreateIteratorFromUsage1.kt +++ b/idea/testData/quickfix/createFromUsage/iterator/beforeCreateIteratorFromUsage1.kt @@ -1,4 +1,4 @@ -// "Create method 'iterator' from usage" "true" +// "Create function 'iterator' from usage" "true" class Foo fun foo() { for (i: Int in Foo()) { } diff --git a/idea/testData/quickfix/createFromUsage/iterator/beforeCreateIteratorFromUsage2.kt b/idea/testData/quickfix/createFromUsage/iterator/beforeCreateIteratorFromUsage2.kt index dfbec160ce3..ac6103d86e4 100644 --- a/idea/testData/quickfix/createFromUsage/iterator/beforeCreateIteratorFromUsage2.kt +++ b/idea/testData/quickfix/createFromUsage/iterator/beforeCreateIteratorFromUsage2.kt @@ -1,4 +1,4 @@ -// "Create method 'iterator' from usage" "true" +// "Create function 'iterator' from usage" "true" class Foo fun foo() { for (i in Foo()) { diff --git a/idea/testData/quickfix/createFromUsage/next/afterCreateNextFromUsage1.kt b/idea/testData/quickfix/createFromUsage/next/afterCreateNextFromUsage1.kt index 84973737408..c4af609d658 100644 --- a/idea/testData/quickfix/createFromUsage/next/afterCreateNextFromUsage1.kt +++ b/idea/testData/quickfix/createFromUsage/next/afterCreateNextFromUsage1.kt @@ -1,8 +1,8 @@ -// "Create method 'next' from usage" "true" +// "Create function 'next' from usage" "true" class FooIterator { fun hasNext(): Boolean { return false } fun next(): Int { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } } class Foo { diff --git a/idea/testData/quickfix/createFromUsage/next/afterCreateNextFromUsage2.kt b/idea/testData/quickfix/createFromUsage/next/afterCreateNextFromUsage2.kt index 65fd4e50922..f1232096bc7 100644 --- a/idea/testData/quickfix/createFromUsage/next/afterCreateNextFromUsage2.kt +++ b/idea/testData/quickfix/createFromUsage/next/afterCreateNextFromUsage2.kt @@ -1,8 +1,8 @@ -// "Create method 'next' from usage" "true" +// "Create function 'next' from usage" "true" class FooIterator { fun hasNext(): Boolean { return false } fun next(): T { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } } class Foo { diff --git a/idea/testData/quickfix/createFromUsage/next/beforeCreateNextFromUsage1.kt b/idea/testData/quickfix/createFromUsage/next/beforeCreateNextFromUsage1.kt index c4b57554e31..687a980b4b0 100644 --- a/idea/testData/quickfix/createFromUsage/next/beforeCreateNextFromUsage1.kt +++ b/idea/testData/quickfix/createFromUsage/next/beforeCreateNextFromUsage1.kt @@ -1,4 +1,4 @@ -// "Create method 'next' from usage" "true" +// "Create function 'next' from usage" "true" class FooIterator { fun hasNext(): Boolean { return false } } diff --git a/idea/testData/quickfix/createFromUsage/next/beforeCreateNextFromUsage2.kt b/idea/testData/quickfix/createFromUsage/next/beforeCreateNextFromUsage2.kt index 401cdf419c5..8470052011f 100644 --- a/idea/testData/quickfix/createFromUsage/next/beforeCreateNextFromUsage2.kt +++ b/idea/testData/quickfix/createFromUsage/next/beforeCreateNextFromUsage2.kt @@ -1,4 +1,4 @@ -// "Create method 'next' from usage" "true" +// "Create function 'next' from usage" "true" class FooIterator { fun hasNext(): Boolean { return false } } diff --git a/idea/testData/quickfix/createFromUsage/set/afterCreateSetFromUsage1.kt b/idea/testData/quickfix/createFromUsage/set/afterCreateSetFromUsage1.kt index 24563965899..89f11450828 100644 --- a/idea/testData/quickfix/createFromUsage/set/afterCreateSetFromUsage1.kt +++ b/idea/testData/quickfix/createFromUsage/set/afterCreateSetFromUsage1.kt @@ -1,9 +1,9 @@ -// "Create method 'set' from usage" "true" +// "Create function 'set' from usage" "true" class Foo { fun x (y: Foo>, w: java.util.ArrayList) { y["", w] = w } fun set(s: String, w: T, value: T) { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } } diff --git a/idea/testData/quickfix/createFromUsage/set/afterCreateSetFromUsage2.kt b/idea/testData/quickfix/createFromUsage/set/afterCreateSetFromUsage2.kt index 9312ab89375..f66da360eab 100644 --- a/idea/testData/quickfix/createFromUsage/set/afterCreateSetFromUsage2.kt +++ b/idea/testData/quickfix/createFromUsage/set/afterCreateSetFromUsage2.kt @@ -1,4 +1,4 @@ -// "Create method 'set' from usage" "true" +// "Create function 'set' from usage" "true" import java.util.ArrayList class Foo { @@ -7,5 +7,5 @@ class Foo { } } fun Any.set(s: String, w: ArrayList, value: ArrayList) { - throw UnsupportedOperationException("not implemented") //To change body of created methods use File | Settings | File Templates. + throw UnsupportedOperationException("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/createFromUsage/set/beforeCreateSetFromUsage1.kt b/idea/testData/quickfix/createFromUsage/set/beforeCreateSetFromUsage1.kt index 1cb5ce5e854..273dceb72a2 100644 --- a/idea/testData/quickfix/createFromUsage/set/beforeCreateSetFromUsage1.kt +++ b/idea/testData/quickfix/createFromUsage/set/beforeCreateSetFromUsage1.kt @@ -1,4 +1,4 @@ -// "Create method 'set' from usage" "true" +// "Create function 'set' from usage" "true" class Foo { fun x (y: Foo>, w: java.util.ArrayList) { y["", w] = w diff --git a/idea/testData/quickfix/createFromUsage/set/beforeCreateSetFromUsage2.kt b/idea/testData/quickfix/createFromUsage/set/beforeCreateSetFromUsage2.kt index 528ebc67bb2..dfdab89d714 100644 --- a/idea/testData/quickfix/createFromUsage/set/beforeCreateSetFromUsage2.kt +++ b/idea/testData/quickfix/createFromUsage/set/beforeCreateSetFromUsage2.kt @@ -1,4 +1,4 @@ -// "Create method 'set' from usage" "true" +// "Create function 'set' from usage" "true" class Foo { fun x (y: Any, w: java.util.ArrayList) { y["", w] = w