Bug 574794 - [17][quick fix] quick fix to add permitted types of a
sealed type does not add import statement.
Change-Id: I1fc50246e3e7886b3610c6c7e5c952f9602fa2d6
Signed-off-by: Kalyan Prasad Tatavarthi <kalyan_prasad@in.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/jdt/eclipse.jdt.ui/+/182968
Tested-by: JDT Bot <jdt-bot@eclipse.org>
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTestPreview.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTestPreview.java
index 88cfe61..9ae15b7 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTestPreview.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTestPreview.java
@@ -314,6 +314,68 @@
}
@Test
+ public void testAddSealedAsDirectSuperTypeProposal4() throws Exception {
+ fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin");
+ fJProject1.setRawClasspath(projectsetup.getDefaultClasspath(), null);
+ JavaProjectHelper.set16CompilerOptions(fJProject1, true);
+
+ Map<String, String> options= fJProject1.getOptions(false);
+ options.put(JavaCore.COMPILER_PB_REPORT_PREVIEW_FEATURES, JavaCore.IGNORE);
+ fJProject1.setOptions(options);
+
+ fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
+
+ IPackageFragment def= fSourceFolder.createPackageFragment("", false, null);
+ def.createCompilationUnit("module-info.java", MODULE_INFO_FILE_CONTENT, false, null);
+
+ IPackageFragment pack1= fSourceFolder.createPackageFragment("test", false, null);
+
+ String test= "" +
+ "package test;\n" +
+ "\n" +
+ "public sealed interface Shape permits Square {\n" +
+ "}\n";
+ pack1.createCompilationUnit("Shape.java", test, false, null);
+
+ test= "" +
+ "package test;\n" +
+ "\n" +
+ "public non-sealed class Square implements Shape {\n" +
+ "}\n";
+ pack1.createCompilationUnit("Square.java", test, false, null);
+
+
+ IPackageFragment pack2= fSourceFolder.createPackageFragment("test2", false, null);
+
+ test= "" +
+ "package test2;\n" +
+ "\n" +
+ "import test.Shape;\n" +
+ "\n" +
+ "public non-sealed interface Circle extends Shape {\n" +
+ "}\n";
+ ICompilationUnit cu2= pack2.createCompilationUnit("Circle.java", test, false, null);
+
+ CompilationUnit astRoot= getASTRoot(cu2);
+ ArrayList<IJavaCompletionProposal> proposals= collectCorrections(cu2, astRoot, 1);
+ assertNumberOfProposals(proposals, 1);
+ assertCorrectLabels(proposals);
+
+ CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
+ String preview= getPreviewContent(proposal);
+
+ String expected= "" +
+ "package test;\n" +
+ "\n" +
+ "import test2.Circle;\n" +
+ "\n" +
+ "public sealed interface Shape permits Square, Circle {\n" +
+ "}\n";
+
+ assertEqualString(preview, expected);
+ }
+
+ @Test
public void testAddSealedAsDirectSuperInterface1() throws Exception {
fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin");
fJProject1.setRawClasspath(projectsetup.getDefaultClasspath(), null);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/LocalCorrectionsSubProcessor.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/LocalCorrectionsSubProcessor.java
index 92fcf8e..23cd185 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/LocalCorrectionsSubProcessor.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/LocalCorrectionsSubProcessor.java
@@ -1322,7 +1322,7 @@
return;
}
TypeDeclaration subType= (TypeDeclaration) selectedNode.getParent();
-
+ ITypeBinding subTypeBinding= subType.resolveBinding();
IJavaElement sealedTypeElement= null;
if (selectedNode instanceof SimpleType) {
ITypeBinding typeBinding= ((SimpleType) selectedNode).resolveBinding();
@@ -1355,7 +1355,14 @@
String label= Messages.format(CorrectionMessages.LocalCorrectionsSubProcessor_declareSubClassAsPermitsSealedClass_description, new String[] { subTypeName, sealedTypeName });
Image image= JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_ADD);
ASTRewriteCorrectionProposal proposal= new ASTRewriteCorrectionProposal(label, compilationUnit, astRewrite, IProposalRelevance.DECLARE_SEALED_AS_DIRECT_SUPER_TYPE, image);
- proposals.add(proposal);
+ ImportRewrite importRewrite= proposal.getImportRewrite();
+ if (importRewrite == null) {
+ importRewrite= StubUtility.createImportRewrite(compilationUnit, true);
+ }
+
+ ImportRewriteContext importRewriteContext= new ContextSensitiveImportRewriteContext(declaration.getRoot(), importRewrite);
+ importRewrite.addImport(subTypeBinding, astRewrite.getAST(), importRewriteContext);
+ proposal.setImportRewrite(importRewrite); proposals.add(proposal);
}
public static void addSealedAsDirectSuperTypeProposal(IInvocationContext context, IProblemLocation problem, Collection<ICommandAccess> proposals) throws JavaModelException {