diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOpenModifierToClassDeclarationFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOpenModifierToClassDeclarationFix.java index 0677d59c19d..f195ad412f7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOpenModifierToClassDeclarationFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOpenModifierToClassDeclarationFix.java @@ -29,10 +29,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.idea.JetBundle; import org.jetbrains.kotlin.lexer.JetTokens; -import org.jetbrains.kotlin.psi.JetClass; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.kotlin.psi.JetSimpleNameExpression; -import org.jetbrains.kotlin.psi.JetTypeReference; +import org.jetbrains.kotlin.psi.*; public class AddOpenModifierToClassDeclarationFix extends JetIntentionAction { private JetClass classDeclaration; @@ -55,6 +52,9 @@ public class AddOpenModifierToClassDeclarationFix extends JetIntentionActionB() diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/afterSecondaryCtrDelegationInSecondary.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/afterSecondaryCtrDelegationInSecondary.kt new file mode 100644 index 00000000000..c4d8c08c93a --- /dev/null +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/afterSecondaryCtrDelegationInSecondary.kt @@ -0,0 +1,9 @@ +// "Make B open" "true" +open class B { + constructor() { + } +} + +class A : B { + constructor() {} +} diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeSecondaryCtrDelegationInHeader.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeSecondaryCtrDelegationInHeader.kt new file mode 100644 index 00000000000..2919f62d66f --- /dev/null +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeSecondaryCtrDelegationInHeader.kt @@ -0,0 +1,7 @@ +// "Make B open" "true" +class B { + constructor() { + } +} + +class A : B() diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeSecondaryCtrDelegationInSecondary.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeSecondaryCtrDelegationInSecondary.kt new file mode 100644 index 00000000000..728fb349dc2 --- /dev/null +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeSecondaryCtrDelegationInSecondary.kt @@ -0,0 +1,9 @@ +// "Make B open" "true" +class B { + constructor() { + } +} + +class A : B { + constructor() {} +} diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java index 23ddb779f60..099cd88c5de 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java @@ -3222,6 +3222,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { doTest(fileName); } + @TestMetadata("beforeSecondaryCtrDelegationInHeader.kt") + public void testSecondaryCtrDelegationInHeader() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeSecondaryCtrDelegationInHeader.kt"); + doTest(fileName); + } + + @TestMetadata("beforeSecondaryCtrDelegationInSecondary.kt") + public void testSecondaryCtrDelegationInSecondary() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeSecondaryCtrDelegationInSecondary.kt"); + doTest(fileName); + } + @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({