diff --git a/idea/resources/META-INF/plugin-common.xml b/idea/resources/META-INF/plugin-common.xml index ab1ee50bd93..a6c06a09262 100644 --- a/idea/resources/META-INF/plugin-common.xml +++ b/idea/resources/META-INF/plugin-common.xml @@ -998,11 +998,6 @@ Kotlin - - org.jetbrains.kotlin.idea.intentions.RemoveCurlyBracesFromTemplateIntention - Kotlin - - org.jetbrains.kotlin.idea.intentions.InsertCurlyBracesToTemplateIntention Kotlin @@ -1824,7 +1819,7 @@ language="kotlin" /> - "$x" -} \ No newline at end of file diff --git a/idea/resources/intentionDescriptions/RemoveCurlyBracesFromTemplateIntention/before.kt.template b/idea/resources/intentionDescriptions/RemoveCurlyBracesFromTemplateIntention/before.kt.template deleted file mode 100644 index 0eb64254baa..00000000000 --- a/idea/resources/intentionDescriptions/RemoveCurlyBracesFromTemplateIntention/before.kt.template +++ /dev/null @@ -1,3 +0,0 @@ -fun foo() { - val y = "${x}" -} \ No newline at end of file diff --git a/idea/resources/intentionDescriptions/RemoveCurlyBracesFromTemplateIntention/description.html b/idea/resources/intentionDescriptions/RemoveCurlyBracesFromTemplateIntention/description.html deleted file mode 100644 index 2b4d906b78c..00000000000 --- a/idea/resources/intentionDescriptions/RemoveCurlyBracesFromTemplateIntention/description.html +++ /dev/null @@ -1,5 +0,0 @@ - - -This intention removes unnecessary curly braces around simple names in string templates. - - \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInliner/ReplacementPerformer.kt b/idea/src/org/jetbrains/kotlin/idea/codeInliner/ReplacementPerformer.kt index d09921a87d4..14e67cfbdc0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInliner/ReplacementPerformer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/codeInliner/ReplacementPerformer.kt @@ -20,10 +20,10 @@ import com.intellij.openapi.util.Key import com.intellij.psi.PsiTreeChangeAdapter import com.intellij.psi.PsiTreeChangeEvent import org.jetbrains.kotlin.idea.caches.resolve.analyze +import org.jetbrains.kotlin.idea.core.canDropBraces import org.jetbrains.kotlin.idea.core.dropBraces import org.jetbrains.kotlin.idea.core.replaced import org.jetbrains.kotlin.idea.intentions.ConvertToBlockBodyIntention -import org.jetbrains.kotlin.idea.intentions.RemoveCurlyBracesFromTemplateIntention import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.PsiChildRange import org.jetbrains.kotlin.psi.psiUtil.canPlaceAfterSimpleNameEntry @@ -163,12 +163,8 @@ internal class ExpressionReplacementPerformer( // simplify "${x}" to "$x" val templateEntry = resultExpression?.parent as? KtBlockStringTemplateEntry - if (templateEntry != null) { - val intention = RemoveCurlyBracesFromTemplateIntention() - if (intention.isApplicableTo(templateEntry)) { - val newEntry = templateEntry.dropBraces() - return newEntry.expression - } + if (templateEntry?.canDropBraces() == true) { + return templateEntry.dropBraces().expression } return resultExpression ?: range.last as? KtExpression diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/RemoveCurlyBracesFromTemplateInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/RemoveCurlyBracesFromTemplateInspection.kt new file mode 100644 index 00000000000..805d8f3fec7 --- /dev/null +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/RemoveCurlyBracesFromTemplateInspection.kt @@ -0,0 +1,26 @@ +/* + * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.idea.inspections + +import com.intellij.openapi.editor.Editor +import com.intellij.openapi.project.Project +import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.idea.core.canDropBraces +import org.jetbrains.kotlin.idea.core.dropBraces +import org.jetbrains.kotlin.psi.KtBlockStringTemplateEntry + +class RemoveCurlyBracesFromTemplateInspection : + AbstractApplicabilityBasedInspection(KtBlockStringTemplateEntry::class.java) { + override fun inspectionText(element: KtBlockStringTemplateEntry): String = "Redundant curly braces in string template" + + override val defaultFixText: String = "Remove curly braces" + + override fun isApplicable(element: KtBlockStringTemplateEntry): Boolean = element.canDropBraces() + + override fun applyTo(element: PsiElement, project: Project, editor: Editor?) { + (element as KtBlockStringTemplateEntry).dropBraces() + } +} diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveCurlyBracesFromTemplateIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveCurlyBracesFromTemplateIntention.kt deleted file mode 100644 index 747cff474f8..00000000000 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveCurlyBracesFromTemplateIntention.kt +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.idea.intentions - -import com.intellij.openapi.editor.Editor -import org.jetbrains.kotlin.idea.core.canDropBraces -import org.jetbrains.kotlin.idea.core.dropBraces -import org.jetbrains.kotlin.idea.inspections.IntentionBasedInspection -import org.jetbrains.kotlin.psi.KtBlockStringTemplateEntry - -@Suppress("DEPRECATION") -class RemoveCurlyBracesFromTemplateInspection : - IntentionBasedInspection(RemoveCurlyBracesFromTemplateIntention::class) - -class RemoveCurlyBracesFromTemplateIntention : - SelfTargetingOffsetIndependentIntention(KtBlockStringTemplateEntry::class.java, "Remove curly braces") { - override fun isApplicableTo(element: KtBlockStringTemplateEntry) = element.canDropBraces() - - override fun applyTo(element: KtBlockStringTemplateEntry, editor: Editor?) { - element.dropBraces() - } -} diff --git a/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/.inspection b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/.inspection new file mode 100644 index 00000000000..29e1e4958e7 --- /dev/null +++ b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/.inspection @@ -0,0 +1 @@ +org.jetbrains.kotlin.idea.inspections.RemoveCurlyBracesFromTemplateInspection \ No newline at end of file diff --git a/idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets1.kt b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets1.kt similarity index 72% rename from idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets1.kt rename to idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets1.kt index ba0e7fbdcc9..eb80ff31d66 100644 --- a/idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets1.kt +++ b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets1.kt @@ -1,4 +1,4 @@ -// IS_APPLICABLE: false +// PROBLEM: none fun foo() { val x = "x" val y = "${x.length}" diff --git a/idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets2.kt b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets2.kt similarity index 82% rename from idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets2.kt rename to idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets2.kt index ccc52f8f145..0fd37e4a0a0 100644 --- a/idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets2.kt +++ b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets2.kt @@ -1,4 +1,4 @@ -// IS_APPLICABLE: false +// PROBLEM: none fun foo() { val x = X() val y = "${x.bar()}" diff --git a/idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets3.kt b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets3.kt similarity index 74% rename from idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets3.kt rename to idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets3.kt index a5a34a8780a..fe39e48928e 100644 --- a/idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets3.kt +++ b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets3.kt @@ -1,4 +1,4 @@ -// IS_APPLICABLE: false +// PROBLEM: none fun foo() { val x = 3 val z = 4 diff --git a/idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets4.kt b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets4.kt similarity index 69% rename from idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets4.kt rename to idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets4.kt index 53b3b3a0f25..483bd43b503 100644 --- a/idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets4.kt +++ b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets4.kt @@ -1,4 +1,4 @@ -// IS_APPLICABLE: false +// PROBLEM: none fun foo() { val x = 3 val y = "${x}y" diff --git a/idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets5.kt b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets5.kt similarity index 69% rename from idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets5.kt rename to idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets5.kt index de584c430a4..e7654efebf7 100644 --- a/idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets5.kt +++ b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets5.kt @@ -1,4 +1,4 @@ -// IS_APPLICABLE: false +// PROBLEM: none fun foo() { val x = 3 val y = "${x}_y" diff --git a/idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets6.kt b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets6.kt similarity index 73% rename from idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets6.kt rename to idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets6.kt index d2631e4010a..9b4089206fc 100644 --- a/idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets6.kt +++ b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets6.kt @@ -1,4 +1,4 @@ -// IS_APPLICABLE: false +// PROBLEM: none fun foo() { val x = 3 val y = "${x}コトリン" diff --git a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets1.kt b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets1.kt similarity index 69% rename from idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets1.kt rename to idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets1.kt index 84f54b4364a..668aad75c37 100644 --- a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets1.kt +++ b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets1.kt @@ -1,4 +1,4 @@ -// IS_APPLICABLE: true + fun foo() { val x = 4 val y = "${x}" diff --git a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets1.kt.after b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets1.kt.after similarity index 65% rename from idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets1.kt.after rename to idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets1.kt.after index d6e0e379ba1..090fcf2f765 100644 --- a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets1.kt.after +++ b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets1.kt.after @@ -1,4 +1,4 @@ -// IS_APPLICABLE: true + fun foo() { val x = 4 val y = "$x" diff --git a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets2.kt b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets2.kt similarity index 72% rename from idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets2.kt rename to idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets2.kt index 2b78e48accc..e5470887996 100644 --- a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets2.kt +++ b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets2.kt @@ -1,4 +1,4 @@ -// IS_APPLICABLE: true + fun foo() { val x = 4 val y = "${x}.moretext" diff --git a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets2.kt.after b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets2.kt.after similarity index 72% rename from idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets2.kt.after rename to idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets2.kt.after index 5547900cae0..cfdeba2aa3d 100644 --- a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets2.kt.after +++ b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets2.kt.after @@ -1,4 +1,4 @@ -// IS_APPLICABLE: true + fun foo() { val x = 4 val y = "$x.moretext" diff --git a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets3.kt b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets3.kt similarity index 70% rename from idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets3.kt rename to idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets3.kt index 51b8a3f27ae..3c2d421a6cf 100644 --- a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets3.kt +++ b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets3.kt @@ -1,4 +1,4 @@ -// IS_APPLICABLE: true + fun foo() { val x = 4 val y = "${x}\n" diff --git a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets3.kt.after b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets3.kt.after similarity index 66% rename from idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets3.kt.after rename to idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets3.kt.after index 3b42f03b97c..c0583a56623 100644 --- a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets3.kt.after +++ b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets3.kt.after @@ -1,4 +1,4 @@ -// IS_APPLICABLE: true + fun foo() { val x = 4 val y = "$x\n" diff --git a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets4.kt b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets4.kt similarity index 83% rename from idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets4.kt rename to idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets4.kt index 5e8bc0b6a6d..6c3d93f840a 100644 --- a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets4.kt +++ b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets4.kt @@ -1,4 +1,4 @@ -// IS_APPLICABLE: true + fun foo() { val x = 4 val y = "${x}() this is okay, x will not be thought of as a function call" diff --git a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets4.kt.after b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets4.kt.after similarity index 81% rename from idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets4.kt.after rename to idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets4.kt.after index 4010a13a6af..05e666efc59 100644 --- a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets4.kt.after +++ b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets4.kt.after @@ -1,4 +1,4 @@ -// IS_APPLICABLE: true + fun foo() { val x = 4 val y = "$x() this is okay, x will not be thought of as a function call" diff --git a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets5.kt b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets5.kt similarity index 74% rename from idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets5.kt rename to idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets5.kt index 1e52205de80..eda17cd3840 100644 --- a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets5.kt +++ b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets5.kt @@ -1,4 +1,4 @@ -// IS_APPLICABLE: true + fun foo() { val x = 4 val y = "text${x} moretext" diff --git a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets5.kt.after b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets5.kt.after similarity index 71% rename from idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets5.kt.after rename to idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets5.kt.after index a92d97efb88..0e151976ce1 100644 --- a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets5.kt.after +++ b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets5.kt.after @@ -1,4 +1,4 @@ -// IS_APPLICABLE: true + fun foo() { val x = 4 val y = "text$x moretext" diff --git a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets6.kt b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets6.kt similarity index 75% rename from idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets6.kt rename to idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets6.kt index 7958bebc8ac..d3ce1d4ede7 100644 --- a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets6.kt +++ b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets6.kt @@ -1,4 +1,4 @@ -// IS_APPLICABLE: true + fun foo() { val x = 4 val y = """text${x} moretext""" diff --git a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets6.kt.after b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets6.kt.after similarity index 72% rename from idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets6.kt.after rename to idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets6.kt.after index 339265a80dc..bc81387889d 100644 --- a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets6.kt.after +++ b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets6.kt.after @@ -1,4 +1,4 @@ -// IS_APPLICABLE: true + fun foo() { val x = 4 val y = """text$x moretext""" diff --git a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets7.kt b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets7.kt similarity index 72% rename from idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets7.kt rename to idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets7.kt index 955cf8046cb..b56448e1b9c 100644 --- a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets7.kt +++ b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets7.kt @@ -1,4 +1,4 @@ -// IS_APPLICABLE: true + fun foo(`object`: Any) { val bar = "${`object`}" } \ No newline at end of file diff --git a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets7.kt.after b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets7.kt.after similarity index 69% rename from idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets7.kt.after rename to idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets7.kt.after index 02bb6835ee3..bec984cd2f1 100644 --- a/idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets7.kt.after +++ b/idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets7.kt.after @@ -1,4 +1,4 @@ -// IS_APPLICABLE: true + fun foo(`object`: Any) { val bar = "$`object`" } \ No newline at end of file diff --git a/idea/testData/intentions/removeCurlyBracesFromTemplate/.intention b/idea/testData/intentions/removeCurlyBracesFromTemplate/.intention deleted file mode 100644 index 5820ee4d359..00000000000 --- a/idea/testData/intentions/removeCurlyBracesFromTemplate/.intention +++ /dev/null @@ -1 +0,0 @@ -org.jetbrains.kotlin.idea.intentions.RemoveCurlyBracesFromTemplateIntention diff --git a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java index 594b4a90369..618345da153 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java @@ -6684,6 +6684,84 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest { } } + @TestMetadata("idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class RemoveCurlyBracesFromTemplate extends AbstractLocalInspectionTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInRemoveCurlyBracesFromTemplate() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), TargetBackend.ANY, true); + } + + @TestMetadata("necessaryBrackets1.kt") + public void testNecessaryBrackets1() throws Exception { + runTest("idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets1.kt"); + } + + @TestMetadata("necessaryBrackets2.kt") + public void testNecessaryBrackets2() throws Exception { + runTest("idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets2.kt"); + } + + @TestMetadata("necessaryBrackets3.kt") + public void testNecessaryBrackets3() throws Exception { + runTest("idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets3.kt"); + } + + @TestMetadata("necessaryBrackets4.kt") + public void testNecessaryBrackets4() throws Exception { + runTest("idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets4.kt"); + } + + @TestMetadata("necessaryBrackets5.kt") + public void testNecessaryBrackets5() throws Exception { + runTest("idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets5.kt"); + } + + @TestMetadata("necessaryBrackets6.kt") + public void testNecessaryBrackets6() throws Exception { + runTest("idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/necessaryBrackets6.kt"); + } + + @TestMetadata("unnecessaryBrackets1.kt") + public void testUnnecessaryBrackets1() throws Exception { + runTest("idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets1.kt"); + } + + @TestMetadata("unnecessaryBrackets2.kt") + public void testUnnecessaryBrackets2() throws Exception { + runTest("idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets2.kt"); + } + + @TestMetadata("unnecessaryBrackets3.kt") + public void testUnnecessaryBrackets3() throws Exception { + runTest("idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets3.kt"); + } + + @TestMetadata("unnecessaryBrackets4.kt") + public void testUnnecessaryBrackets4() throws Exception { + runTest("idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets4.kt"); + } + + @TestMetadata("unnecessaryBrackets5.kt") + public void testUnnecessaryBrackets5() throws Exception { + runTest("idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets5.kt"); + } + + @TestMetadata("unnecessaryBrackets6.kt") + public void testUnnecessaryBrackets6() throws Exception { + runTest("idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets6.kt"); + } + + @TestMetadata("unnecessaryBrackets7.kt") + public void testUnnecessaryBrackets7() throws Exception { + runTest("idea/testData/inspectionsLocal/removeCurlyBracesFromTemplate/unnecessaryBrackets7.kt"); + } + } + @TestMetadata("idea/testData/inspectionsLocal/removeEmptyParenthesesFromAnnotationEntry") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java index d992c1eddd1..96a5dcd3c70 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java @@ -13276,84 +13276,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { } } - @TestMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class RemoveCurlyBracesFromTemplate extends AbstractIntentionTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); - } - - public void testAllFilesPresentInRemoveCurlyBracesFromTemplate() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeCurlyBracesFromTemplate"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), TargetBackend.ANY, true); - } - - @TestMetadata("necessaryBrackets1.kt") - public void testNecessaryBrackets1() throws Exception { - runTest("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets1.kt"); - } - - @TestMetadata("necessaryBrackets2.kt") - public void testNecessaryBrackets2() throws Exception { - runTest("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets2.kt"); - } - - @TestMetadata("necessaryBrackets3.kt") - public void testNecessaryBrackets3() throws Exception { - runTest("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets3.kt"); - } - - @TestMetadata("necessaryBrackets4.kt") - public void testNecessaryBrackets4() throws Exception { - runTest("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets4.kt"); - } - - @TestMetadata("necessaryBrackets5.kt") - public void testNecessaryBrackets5() throws Exception { - runTest("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets5.kt"); - } - - @TestMetadata("necessaryBrackets6.kt") - public void testNecessaryBrackets6() throws Exception { - runTest("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets6.kt"); - } - - @TestMetadata("unnecessaryBrackets1.kt") - public void testUnnecessaryBrackets1() throws Exception { - runTest("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets1.kt"); - } - - @TestMetadata("unnecessaryBrackets2.kt") - public void testUnnecessaryBrackets2() throws Exception { - runTest("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets2.kt"); - } - - @TestMetadata("unnecessaryBrackets3.kt") - public void testUnnecessaryBrackets3() throws Exception { - runTest("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets3.kt"); - } - - @TestMetadata("unnecessaryBrackets4.kt") - public void testUnnecessaryBrackets4() throws Exception { - runTest("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets4.kt"); - } - - @TestMetadata("unnecessaryBrackets5.kt") - public void testUnnecessaryBrackets5() throws Exception { - runTest("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets5.kt"); - } - - @TestMetadata("unnecessaryBrackets6.kt") - public void testUnnecessaryBrackets6() throws Exception { - runTest("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets6.kt"); - } - - @TestMetadata("unnecessaryBrackets7.kt") - public void testUnnecessaryBrackets7() throws Exception { - runTest("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets7.kt"); - } - } - @TestMetadata("idea/testData/intentions/removeEmptyClassBody") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)