Attachment #219961 for bug #378024

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




                "\n" + 
                "import java.util.*; // test\n" + 
                "import java.util.Map.Entry;\n" + 
                "\n" +
                "//comment 2\n" +
                "import java.util.Map.SomethingElse;\n" +
                "// commen 3\n" +

                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
				"/* lead 2*//* lead 1*/ import java.util.*; // test1\n" +
				"import java.util.*;\n" + 
				"// test2\n" +
				"/* lead 1*/ \n" +
				"// test1\n" +
				"/* lead 3*/ \n" +
				"// test3\n" +
				"// commen 3\n" +

                "\n" + 
                "// comment 1\n" +
				"/* lead 1*/ " +
				"import java.util.Map.*; " + 
				"// test1\n" +
				"/* lead 2*/\n" +
				"// test2\n" +

                "// comment 1\n" +
                "/* lead 2*/import java.io.PrintWriter.*; // test2\n" +
                "\n" +
                "/* lead 1*/ " +
                "import java.util.*;\n" + 
                " // test1\n" +
                "// commen 3\n" +
                "import java.util.*;\n" + 
                "\n" + 
                "public class C {\n" + 
                "    public static void main(String[] args) {\n" + 

                "}");
        assertEqualString(cu.getSource(), buf.toString());
    }
    
    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378024
    public void testBug378024() throws Exception {
        IPackageFragment pack1 = this.sourceFolder.createPackageFragment("pack1", false, null);
        StringBuffer buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * keep me with List\n" +
                " *\n" +
                " */\n" +
                "import java.awt.List;// test1\n" +
                "/*\n" +
                " * keep me with Serializable\n" +
                " */\n" +
                "import java.io.Serializable;// test2\n" +
                "/*\n" +
                " * keep me with HashMap\n" +
                " */\n" +
                "import java.util.HashMap;// test3\n" +
                "// commen 3\n" + 
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        List l = new List();\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        ICompilationUnit cu = pack1.createCompilationUnit("C.java", buf.toString(), false, null);

        String[] order = new String[] { "java", "java.awt", "java.io", "java.util" };

        ImportRewrite imports= newImportsRewrite(cu, order, 2, 2, false);
        imports.setUseContextToFilterImplicitImports(true);
        imports.addImport("java.awt.List");
        imports.addImport("java.io.Serializable");
        imports.addImport("java.util.HashMap");

        apply(imports);

        buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * keep me with List\n" +
                " *\n" +
                " */\n" +
                "import java.awt.List;// test1\n\n" +
                "/*\n" +
                " * keep me with Serializable\n" +
                " */\n" +
                "import java.io.Serializable;// test2\n\n" +
                "/*\n" +
                " * keep me with HashMap\n" +
                " */\n" +
                "import java.util.HashMap;// test3\n" +
                "// commen 3\n" + 
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        List l = new List();\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        assertEqualString(cu.getSource(), buf.toString());
    }
    
    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378024
    public void testBug378024b() throws Exception {
        IPackageFragment pack1 = this.sourceFolder.createPackageFragment("pack1", false, null);
        StringBuffer buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "import java.awt.List;// test1\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "import java.io.Serializable;// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "import java.util.HashMap;// test3\n" +
                "// commen 3\n" + 
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        List l = new List();\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        ICompilationUnit cu = pack1.createCompilationUnit("C.java", buf.toString(), false, null);

        String[] order = new String[] { "java", "java.util", "com", "pack" };

        ImportRewrite imports= newImportsRewrite(cu, order, 1, 1, false);
        imports.setUseContextToFilterImplicitImports(true);
        imports.addImport("java.awt.List");
        imports.addImport("java.io.Serializable");
        imports.addImport("java.util.HashMap");

        apply(imports);

        buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "import java.awt.*;// test1\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "import java.io.*;// test2\n" +
                "\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "import java.util.*;// test3\n" +
                "// commen 3\n" + 
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        List l = new List();\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        assertEqualString(cu.getSource(), buf.toString());
    }
    
    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378024
    // leading and trailing comments always move with imports. 
    // comments in between stay where they are
    public void testBug378024c() throws Exception {
        IPackageFragment pack1 = this.sourceFolder.createPackageFragment("pack1", false, null);
        StringBuffer buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "\n" +
                "// lead 1\n" +
                "import java.awt.List;// test1\n" +
                "\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "\n" +
                "// lead 2\n" +
                "import java.io.Serializable;// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "\n" +
                "/*\n" +
                " * don't move me 4\n" +
                " */\n" +
                "\n" +
                "//lead 3\n" +
                "import java.util.HashMap;// test3\n" +
                "// commen 3\n" + 
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        List l = new List();\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        ICompilationUnit cu = pack1.createCompilationUnit("C.java", buf.toString(), false, null);

        String[] order = new String[] { "java", "java.util", "com", "pack" };

        ImportRewrite imports= newImportsRewrite(cu, order, 99, 99, false);
        imports.setUseContextToFilterImplicitImports(true);
        imports.addImport("java.awt.List");
        imports.addImport("java.io.Serializable");
        imports.addImport("java.util.HashMap");

        apply(imports);

        buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "\n" +
                "// lead 1\n" +
                "import java.awt.List;// test1\n" +
                "\n" +
                "//lead 3\n" +
                "import java.util.HashMap;// test3\n" +
                "// commen 3\n" + 
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "// lead 2\n" +
                "import java.io.Serializable;// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "/*\n" +
                " * don't move me 4\n" +
                " */\n" +
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        List l = new List();\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        assertEqualString(cu.getSource(), buf.toString());
    }
    
    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378024
    // leading and trailing comments always move with imports. 
    // comments in between stay where they are
    public void testBug378024c_1() throws Exception {
        IPackageFragment pack1 = this.sourceFolder.createPackageFragment("pack1", false, null);
        StringBuffer buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "\n" +
                "// lead 1\n" +
                "import java.awt.List;// test1\n" +
                "\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "\n" +
                "// lead 2\n" +
                "import java.io.Serializable;// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "\n" +
                "/*\n" +
                " * don't move me 4\n" +
                " */\n" +
                "\n" +
                "//lead 3\n" +
                "import java.util.HashMap;// test3\n" +
                "// commen 3\n" + 
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        List l = new List();\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        ICompilationUnit cu = pack1.createCompilationUnit("C.java", buf.toString(), false, null);

        String[] order = new String[] { "java", "com", "pack" };

        ImportRewrite imports= newImportsRewrite(cu, order, 99, 99, false);
        imports.setUseContextToFilterImplicitImports(true);
        imports.addImport("java.awt.List");
        imports.addImport("java.io.Serializable");
        imports.addImport("java.util.HashMap");

        apply(imports);

        buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "\n" +
                "// lead 1\n" +
                "import java.awt.List;// test1\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "// lead 2\n" +
                "import java.io.Serializable;// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "/*\n" +
                " * don't move me 4\n" +
                " */\n" +
                "//lead 3\n" +
                "import java.util.HashMap;// test3\n" +
                "// commen 3\n" + 
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        List l = new List();\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        assertEqualString(cu.getSource(), buf.toString());
    }
    
    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378024
    // leading and trailing comments always move with imports, even if they get folded. 
    // comments in between stay where they are
    public void testBug378024c_2() throws Exception {
        IPackageFragment pack1 = this.sourceFolder.createPackageFragment("pack1", false, null);
        StringBuffer buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "\n" +
                "// lead 1\n" +
                "import java.awt.List;// test1\n" +
                "\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "\n" +
                "// lead 2\n" +
                "import java.io.Serializable;// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "\n" +
                "/*\n" +
                " * don't move me 4\n" +
                " */\n" +
                "\n" +
                "//lead 3\n" +
                "import java.util.HashMap;// test3\n" +
                "// commen 3\n" + 
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        List l = new List();\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        ICompilationUnit cu = pack1.createCompilationUnit("C.java", buf.toString(), false, null);

        String[] order = new String[] { "java", "com", "pack" };

        ImportRewrite imports= newImportsRewrite(cu, order, 1, 1, false);
        imports.setUseContextToFilterImplicitImports(true);
        imports.addImport("java.awt.List");
        imports.addImport("java.io.Serializable");
        imports.addImport("java.util.HashMap");

        apply(imports);

        buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "\n" +
                "// lead 1\n" +
                "import java.awt.*;// test1\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "// lead 2\n" +
                "import java.io.*;// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "/*\n" +
                " * don't move me 4\n" +
                " */\n" +
                "//lead 3\n" +
                "import java.util.*;// test3\n" +
                "// commen 3\n" + 
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        List l = new List();\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        assertEqualString(cu.getSource(), buf.toString());
    }
    
    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378024
    // not adding an import should preserve its comments and put them at the end.
    public void testBug378024d() throws Exception {
        IPackageFragment pack1 = this.sourceFolder.createPackageFragment("pack1", false, null);
        StringBuffer buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "\n" +
                "// lead 1\n" +
                "import java.awt.List;// test1\n" +
                "\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "\n" +
                "// lead 2\n" +
                "import java.io.Serializable;// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "\n" +
                "/*\n" +
                " * don't move me 4\n" +
                " */\n" +
                "\n" +
                "//lead 3\n" +
                "import java.util.HashMap;// test3\n" +
                "// commen 3\n" + 
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        List l = new List();\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        ICompilationUnit cu = pack1.createCompilationUnit("C.java", buf.toString(), false, null);

        String[] order = new String[] { "java", "java.util", "com", "pack" };

        ImportRewrite imports= newImportsRewrite(cu, order, 1, 1, false);
        imports.setUseContextToFilterImplicitImports(true);
        imports.addImport("java.awt.List");
        imports.addImport("java.util.HashMap");

        apply(imports);

        buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "\n" +
                "// lead 1\n" +
                "import java.awt.*;// test1\n" +
                "\n" +
                "//lead 3\n" +
                "import java.util.*;// test3\n" +
                "// commen 3\n" + 
                "/*\n" +
                " * don't move me 4\n" +
                " */" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "// lead 2\n" +
                "// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "\n" +
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        List l = new List();\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        assertEqualString(cu.getSource(), buf.toString());
    }
    
    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378024
    // adding a new import should not disturb comments and import should be added in its group
    public void testBug378024e() throws Exception {
        IPackageFragment pack1 = this.sourceFolder.createPackageFragment("pack1", false, null);
        StringBuffer buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "\n" +
                "// lead 1\n" +
                "import java.awt.List;// test1\n" +
                "\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "\n" +
                "// lead 2\n" +
                "import java.io.Serializable;// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "\n" +
                "/*\n" +
                " * don't move me 4\n" +
                " */\n" +
                "\n" +
                "//lead 3\n" +
                "import java.util.HashMap;// test3\n" +
                "// commen 3\n" + 
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        List l = new List();\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        ICompilationUnit cu = pack1.createCompilationUnit("C.java", buf.toString(), false, null);

        String[] order = new String[] { "java", "com", "pack" };

        ImportRewrite imports= newImportsRewrite(cu, order, 2, 2, false);
        imports.setUseContextToFilterImplicitImports(true);
        imports.addImport("java.awt.List");
        imports.addImport("java.io.Serializable");
        imports.addImport("java.io.PrintWriter");
        imports.addImport("java.util.HashMap");

        apply(imports);

        buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "\n" +
                "// lead 1\n" +
                "import java.awt.List;// test1\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "// lead 2\n" +
                "import java.io.*;\n" +
                "// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "/*\n" +
                " * don't move me 4\n" +
                " */\n" +
                "//lead 3\n" +
                "import java.util.HashMap;// test3\n" +
                "// commen 3\n" + 
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        List l = new List();\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        assertEqualString(cu.getSource(), buf.toString());
    }
    
    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378024
    // removing an import should preserve its comments at the end, and adding a new import should not disturb
    // existing comments
    public void testBug378024e_1() throws Exception {
        IPackageFragment pack1 = this.sourceFolder.createPackageFragment("pack1", false, null);
        StringBuffer buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "\n" +
                "// lead 1\n" +
                "import java.awt.List;// test1\n" +
                "\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "\n" +
                "// lead 2\n" +
                "import java.io.Serializable;// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "\n" +
                "/*\n" +
                " * don't move me 4\n" +
                " */\n" +
                "\n" +
                "//lead 3\n" +
                "import java.util.HashMap;// test3\n" +
                "// commen 3\n" + 
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        List l = new List();\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        ICompilationUnit cu = pack1.createCompilationUnit("C.java", buf.toString(), false, null);

        String[] order = new String[] { "java", "java.util", "com", "pack" };

        ImportRewrite imports= newImportsRewrite(cu, order, 2, 2, false);
        imports.setUseContextToFilterImplicitImports(true);
        imports.addImport("java.awt.List");
        imports.addImport("java.io.PrintWriter");
        imports.addImport("java.util.HashMap");

        apply(imports);

        buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "\n" +
                "// lead 1\n" +
                "import java.awt.List;// test1\n" +
                "import java.io.PrintWriter;\n" +
                "\n" +
                "//lead 3\n" +
                "import java.util.HashMap;// test3\n" +
                "// commen 3\n" + 
                "/*\n" +
                " * don't move me 4\n" +
                " */" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "// lead 2\n" +
                "// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        List l = new List();\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        assertEqualString(cu.getSource(), buf.toString());
    }
    
    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378024
    // folding imports because of a newly added import should preserve comments
    public void testBug378024f() throws Exception {
        IPackageFragment pack1 = this.sourceFolder.createPackageFragment("pack1", false, null);
        StringBuffer buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "\n" +
                "// lead 1\n" +
                "import java.awt.List;// test1\n" +
                "\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "\n" +
                "// lead 2\n" +
                "import java.io.Serializable;// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "\n" +
                "/*\n" +
                " * don't move me 4\n" +
                " */\n" +
                "\n" +
                "//lead 3\n" +
                "import java.util.HashMap;// test3\n" +
                "// commen 3\n" + 
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        List l = new List();\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        ICompilationUnit cu = pack1.createCompilationUnit("C.java", buf.toString(), false, null);

        String[] order = new String[] { "java", "com", "pack" };

        ImportRewrite imports= newImportsRewrite(cu, order, 2, 2, false);
        imports.setUseContextToFilterImplicitImports(true);
        imports.addImport("java.awt.List");
        imports.addImport("java.io.Serializable");
        imports.addImport("java.io.PrintWriter");
        imports.addImport("java.util.HashMap");

        apply(imports);

        buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "\n" +
                "// lead 1\n" +
                "import java.awt.List;// test1\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "// lead 2\n" +
                "import java.io.*;\n" +
                "// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "/*\n" +
                " * don't move me 4\n" +
                " */\n" +
                "//lead 3\n" +
                "import java.util.HashMap;// test3\n" +
                "// commen 3\n" + 
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        List l = new List();\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        assertEqualString(cu.getSource(), buf.toString());
    }
    
    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378024
    // folding imports because of a newly added import should preserve comments
    public void testBug378024f_1() throws Exception {
        IPackageFragment pack1 = this.sourceFolder.createPackageFragment("pack1", false, null);
        StringBuffer buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * keep me with List\n" +
                " *\n" +
                " */\n" +
                "\n" +
                "// lead 1\n" +
                "import java.awt.List;// test1\n" +
                "\n" +
                "/*\n" +
                " * keep me with Serializable\n" +
                " */\n" +
                "\n" +
                "// lead 2\n" +
                "import java.io.Serializable;// test2\n" +
                "/*\n" +
                " * keep me with Serializable 2\n" +
                " */\n" +
                "\n" +
                "// lead 3\n" +
                "import java.io.PrintWriter;// test3\n" +
                "/*\n" +
                " * keep me with PrintWriter\n" +
                " */\n" +
                "\n" +
                "/*\n" +
                " * don't move me\n" +
                " */\n" +
                "\n" +
                "//lead 4\n" +
                "import java.util.HashMap;// test4\n" +
                "// commen 3\n" + 
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        List l = new List();\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        ICompilationUnit cu = pack1.createCompilationUnit("C.java", buf.toString(), false, null);

        String[] order = new String[] { "java", "java.util", "com", "pack" };

        ImportRewrite imports= newImportsRewrite(cu, order, 2, 2, false);
        imports.setUseContextToFilterImplicitImports(true);
        imports.addImport("java.awt.List");
        imports.addImport("java.io.Serializable");
        imports.addImport("java.io.PrintWriter");
        imports.addImport("java.util.HashMap");

        apply(imports);

        buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * keep me with List\n" +
                " *\n" +
                " */\n" +
                "\n" +
                "// lead 1\n" +
                "import java.awt.List;// test1\n" +
                "\n" +
                "//lead 4\n" +
                "import java.util.HashMap;// test4\n" +
                "// commen 3\n" + 
                "/*\n" +
                " * keep me with Serializable\n" +
                " */\n" +
                "// lead 2\n" +
                "// lead 3\n" +
                "import java.io.*;// test3\n" +
                "/*\n" +
                " * keep me with PrintWriter\n" +
                " */\n" +
                "// test2\n" +
                "/*\n" +
                " * keep me with Serializable 2\n" +
                " */\n" +
                "/*\n" +
                " * don't move me\n" +
                " */\n" +
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        List l = new List();\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        assertEqualString(cu.getSource(), buf.toString());
    }
    
    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378024
    // Re-ordering imports and converting them to *
    public void testBug378024g() throws Exception {
        IPackageFragment pack1 = this.sourceFolder.createPackageFragment("pack1", false, null);
        StringBuffer buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "\n" +
                "// lead 1\n" +
                "import java.awt.List;// test1\n" +
                "\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "\n" +
                "// lead 2\n" +
                "import java.io.Serializable;// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "/*\n" +
                " * don't move me 4\n" +
                " */\n" +
                "\n" +
                "//lead 3\n" +
                "import java.util.HashMap;// test3\n" +
                "// commen 3\n" + 
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        List l = new List();\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        ICompilationUnit cu = pack1.createCompilationUnit("C.java", buf.toString(), false, null);

        String[] order = new String[] { "java", "java.awt", "java.util", "java.io", "com", "pack" };

        ImportRewrite imports= newImportsRewrite(cu, order, 1, 1, false);
        imports.setUseContextToFilterImplicitImports(true);
        imports.addImport("java.awt.List");
        imports.addImport("java.io.Serializable");
        imports.addImport("java.util.HashMap");

        apply(imports);

        StringBuffer buf2 = new StringBuffer();
        buf2.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "\n" +
                "// lead 1\n" +
                "import java.awt.*;// test1\n" +
                "\n" +
                "//lead 3\n" +
                "import java.util.*;// test3\n" +
                "// commen 3\n" + 
                "\n" +
                "// lead 2\n" +
                "import java.io.*;// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "/*\n" +
                " * don't move me 4\n" +
                " */\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        List l = new List();\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        assertEqualString(cu.getSource(), buf2.toString());
    }
    
    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378024
    // Preserve comments when imports are removed in case the restoring of imports is enabled
    // This will test changes in org.eclipse.jdt.internal.core.dom.rewrite.ImportRewriteAnalyzer.removeImport(String, boolean)
    public void testBug378024h() throws Exception {
        IPackageFragment pack1 = this.sourceFolder.createPackageFragment("pack1", false, null);
        StringBuffer buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "\n" +
                "// lead 1\n" +
                "import java.awt.List;// test1\n" +
                "\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "\n" +
                "// lead 2\n" +
                "import java.io.Serializable;// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "\n" +
                "/*\n" +
                " * don't move me 4\n" +
                " */\n" +
                "\n" +
                "//lead 3\n" +
                "import java.util.HashMap;// test3\n" +
                "// commen 3\n" + 
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        ICompilationUnit cu = pack1.createCompilationUnit("C.java", buf.toString(), false, null);

        String[] order = new String[] { "java", "java.util", "com", "pack" };

        ImportRewrite imports= newImportsRewrite(cu, order, 99, 99, true);
        imports.setUseContextToFilterImplicitImports(true);
        imports.removeImport("java.awt.List");

        apply(imports);

        buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "\n" +
                "// lead 1\n" +
                "\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "\n" +
                "// lead 2\n" +
                "import java.io.Serializable;// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "\n" +
                "/*\n" +
                " * don't move me 4\n" +
                " */\n" +
                "\n" +
                "//lead 3\n" +
                "import java.util.HashMap;// test3\n" +
                "// commen 3\n" + 
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        assertEqualString(cu.getSource(), buf.toString());
    }
    
    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378024
    // Preserve comments when imports are removed in case the restoring of imports is enabled
    public void testBug378024h_1() throws Exception {
        IPackageFragment pack1 = this.sourceFolder.createPackageFragment("pack1", false, null);
        StringBuffer buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "// lead 1\n" +
                "import java.awt.List;// test1\n" +
                "/* i am with List */\n" +
                "\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "\n" +
                "// lead 2\n" +
                "import java.io.Serializable;// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "\n" +
                "/*\n" +
                " * don't move me 4\n" +
                " */\n" +
                "\n" +
                "//lead 3\n" +
                "import java.util.HashMap;// test3\n" +
                "// commen 3\n" + 
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        ICompilationUnit cu = pack1.createCompilationUnit("C.java", buf.toString(), false, null);

        String[] order = new String[] { "java", "java.util", "com", "pack" };

        ImportRewrite imports= newImportsRewrite(cu, order, 99, 99, true);
        imports.setUseContextToFilterImplicitImports(true);
        imports.removeImport("java.awt.List");
        imports.addImport("java.util.List");

        apply(imports);

        buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "// lead 1\n" +
                "/* i am with List */\n" +
                "\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "\n" +
                "// lead 2\n" +
                "import java.io.Serializable;// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "\n" +
                "/*\n" +
                " * don't move me 4\n" +
                " */\n" +
                "\n" +
                "//lead 3\n" +
                "import java.util.HashMap;// test3\n" +
                "// commen 3\n" + 
                "import java.util.List;\n" +                
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        assertEqualString(cu.getSource(), buf.toString());
    }
    
    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378024
    // Preserve comments when imports are unfolded.
    public void testBug378024i() throws Exception {
        IPackageFragment pack1 = this.sourceFolder.createPackageFragment("pack1", false, null);
        StringBuffer buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "// lead 1\n" +
                "import java.awt.*;// test1\n" +
                "/* i am with List */\n" +
                "\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "\n" +
                "// lead 2\n" +
                "import java.io.*;// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "\n" +
                "/*\n" +
                " * don't move me 4\n" +
                " */\n" +
                "\n" +
                "//lead 3\n" +
                "import java.util.*;// test3\n" +
                "// commen 3\n" + 
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        HashMap e= null;\n" + 
                "        PrintWriter p= null;\n" + 
                "        List l= null;\n" + 
                "    }\n" + 
                "}");
        ICompilationUnit cu = pack1.createCompilationUnit("C.java", buf.toString(), false, null);

        String[] order = new String[] { "java", "com", "pack" };

        ImportRewrite imports= newImportsRewrite(cu, order, 99, 99, false);
        imports.setUseContextToFilterImplicitImports(true);
        imports.addImport("java.awt.List");
        imports.addImport("java.io.PrintWriter");
        imports.addImport("java.io.Serializable");
        imports.addImport("java.util.HashMap");
        imports.addImport("java.util.Map");
        apply(imports);

        buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "// lead 1\n" +
                "import java.awt.List;// test1\n" +
                "/* i am with List */\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "// lead 2\n" +
                "import java.io.PrintWriter;// test2\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "import java.io.Serializable;\n" +
                "/*\n" +
                " * don't move me 4\n" +
                " */\n" +
                "//lead 3\n" +
                "import java.util.HashMap;// test3\n" +
                "// commen 3\n" + 
                "import java.util.Map;\n" +
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        HashMap e= null;\n" + 
                "        PrintWriter p= null;\n" + 
                "        List l= null;\n" + 
                "    }\n" + 
                "}");
        assertEqualString(cu.getSource(), buf.toString());
    }
    
    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378024
    // Preserve comments when imports are folded but a member type import is present
    public void testBug378024j() throws Exception {
        IPackageFragment pack1 = this.sourceFolder.createPackageFragment("pack1", false, null);
        StringBuffer buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "// lead 1\n" +
                "import java.awt.List;// test1\n" +
                "/* i am with List */\n" +
                "\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */\n" +
                "\n" +
                "//lead 3\n" +
                "import java.util.HashMap;// test3\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "\n" +
                "/*keep me with Map.Entry*/\n" +
                "import java.util.Map.Entry;// member type import\n" +
                "/*keep me with Map.Entry 2*/\n" +
                "\n" +
                "/*\n" +
                " * don't move me 4\n" +
                " */\n" +
                "\n" +
                "// lead 2\n" +
                "import java.io.Serializable;// test2\n" +
                "// commen 3\n" +
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        ICompilationUnit cu = pack1.createCompilationUnit("C.java", buf.toString(), false, null);

        String[] order = new String[] { "java", "java.util", "com", "pack" };

        ImportRewrite imports= newImportsRewrite(cu, order, 1, 1, false);
        imports.setUseContextToFilterImplicitImports(true);
        imports.addImport("java.awt.List");
        imports.addImport("java.util.HashMap");
        imports.addImport("java.util.Map.Entry");
        imports.addImport("java.io.Serializable");

        apply(imports);

        buf = new StringBuffer();
        buf.append(
                "package pack1;\n" + 
                "\n" +
                "// comment 1\n" +
                "/*\n" +
                " * don't move me 1\n" +
                " *\n" +
                " */\n" +
                "// lead 1\n" +
                "import java.awt.*;// test1\n" +
                "/* i am with List */\n" +
                "\n" +
                "//lead 3\n" +
                "import java.util.*;// test3\n" +
                "/*\n" +
                " * don't move me 3\n" +
                " */\n" +
                "/*keep me with Map.Entry*/\n" +
                "import java.util.Map.Entry;// member type import\n" +
                "/*keep me with Map.Entry 2*/\n" +
                "/*\n" +
                " * don't move me 2\n" +
                " */" +
                "/*\n" +
                " * don't move me 4\n" +
                " */\n" +
                "// lead 2\n" +
                "import java.io.*;// test2\n" +
                "// commen 3\n" +
                "\n" + 
                "public class C implements Serializable{\n" + 
                "    public static void main(String[] args) {\n" + 
                "        Map e= null;\n" + 
                "    }\n" + 
                "}");
        assertEqualString(cu.getSource(), buf.toString());
    }

	private void assertAddedAndRemoved(ImportRewrite imports, String[] expectedAdded, String[] expectedRemoved, String[] expectedAddedStatic, String[] expectedRemovedStatic) {
		assertEqualStringsIgnoreOrder(imports.getAddedImports(), expectedAdded);

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/rewrite/ImportRewrite.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2011 IBM Corporation and others.	2	* Copyright (c) 2000, 2012 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 1051-1057 Link Here
1051	if (this.addedImports != null) {	1051	if (this.addedImports != null) {
1052	for (int i= 0; i < this.addedImports.size(); i++) {	1052	for (int i= 0; i < this.addedImports.size(); i++) {
1053	String curr= (String) this.addedImports.get(i);	1053	String curr= (String) this.addedImports.get(i);
1054	computer.addImport(curr.substring(1), STATIC_PREFIX == curr.charAt(0));	1054	computer.addImport(curr.substring(1), STATIC_PREFIX == curr.charAt(0), usedAstRoot, this.restoreExistingImports);
1055	}	1055	}
1056	}	1056	}
1057		1057

Lines 270-282 Link Here

(-)a/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ImportRewriteAnalyzer.java (-15 / +124 lines)
270	int nextOffset= next.getStartPosition();	270	int nextOffset= next.getStartPosition();
271	int nextLength= next.getLength();	271	int nextLength= next.getLength();
272	int nextOffsetLine= root.getLineNumber(nextOffset);	272	int nextOffsetLine= root.getLineNumber(nextOffset);
		273	int nextExtendedOffset = root.getExtendedStartPosition(next);
		274	int nextExtendedOffsetLine = root.getLineNumber(nextExtendedOffset);
273		275
274	int extendedStart = root.getExtendedStartPosition(curr);	276	int extendedStart = root.getExtendedStartPosition(curr);
		277	int extendedLength = root.getExtendedLength(curr);
275	if (extendedStart < this.replaceRange.getOffset()) {	278	if (extendedStart < this.replaceRange.getOffset()) {
276	// don't touch the first comments before the start of import declarations	279	// don't touch the first comments before the start of import declarations
		280	extendedLength -= (currOffset - extendedStart);
277	extendedStart = currOffset;	281	extendedStart = currOffset;
278	}	282	}
279	int extendedLength = root.getExtendedLength(curr);	283
280	// if next import is on a different line, modify the end position to the next line begin offset	284	// if next import is on a different line, modify the end position to the next line begin offset
281	int nextLineOffset = nextOffset; // offset at the start of next line. Next import may not start here	285	int nextLineOffset = nextOffset; // offset at the start of next line. Next import may not start here
282	if (currEndLine < nextOffsetLine) {	286	if (currEndLine < nextOffsetLine) {
Lines 314-319 Link Here
314	nextOffset= root.getPosition(nextOffsetLine, 0);	318	nextOffset= root.getPosition(nextOffsetLine, 0);
315		319
316	currPackage= new PackageEntry(); // create a comment package entry for this	320	currPackage= new PackageEntry(); // create a comment package entry for this
		321	currPackage.setGroupID(packName);
317	this.packageEntries.add(currPackage);	322	this.packageEntries.add(currPackage);
318	currPackage.add(new ImportDeclEntry(packName.length(), null, false, new Region(nextLineOffset, nextOffset - nextLineOffset)));	323	currPackage.add(new ImportDeclEntry(packName.length(), null, false, new Region(nextLineOffset, nextOffset - nextLineOffset)));
319		324
Lines 566-571 Link Here
566	}	571	}
567	String groupId= null;	572	String groupId= null;
568	int longestPrefix= -1;	573	int longestPrefix= -1;
		574	PackageEntry matchingCommentEntry = null;
569	// find the matching group	575	// find the matching group
570	for (int i= 0; i < this.packageEntries.size(); i++) {	576	for (int i= 0; i < this.packageEntries.size(); i++) {
571	PackageEntry curr= (PackageEntry) this.packageEntries.get(i);	577	PackageEntry curr= (PackageEntry) this.packageEntries.get(i);
Lines 573-580 Link Here
573	String currGroup= curr.getGroupID();	579	String currGroup= curr.getGroupID();
574	if (currGroup != null && newName.startsWith(currGroup)) {	580	if (currGroup != null && newName.startsWith(currGroup)) {
575	int prefixLen= currGroup.length();	581	int prefixLen= currGroup.length();
576	if (prefixLen == newName.length()) {	582	if (prefixLen == newName.length() && !curr.isComment()) {
577	return curr; // perfect fit, use entry	583	return curr; // perfect fit, use entry
		584	} else if (curr.isComment()) {
		585	matchingCommentEntry = curr; // may be the only fit if no actual import of this group is already present
		586	continue;
578	}	587	}
579	if ((newName.charAt(prefixLen) == '.' \|\| prefixLen == 0) && prefixLen > longestPrefix) {	588	if ((newName.charAt(prefixLen) == '.' \|\| prefixLen == 0) && prefixLen > longestPrefix) {
580	longestPrefix= prefixLen;	589	longestPrefix= prefixLen;
Lines 582-587 Link Here
582	}	591	}
583	}	592	}
584	}	593	}
		594	}
		595	if (matchingCommentEntry != null) {
		596	return matchingCommentEntry;
585	}	597	}
586	PackageEntry bestMatch= null;	598	PackageEntry bestMatch= null;
587	PackageMatcher matcher= new PackageMatcher();	599	PackageMatcher matcher= new PackageMatcher();
Lines 616-625 Link Here
616	return qualifier.equals(packageName +'.' + mainTypeName);	628	return qualifier.equals(packageName +'.' + mainTypeName);
617	}	629	}
618		630
619	public void addImport(String fullTypeName, boolean isStatic) {	631	public void addImport(String fullTypeName, boolean isStatic, CompilationUnit root, boolean restoreExistingImports) {
620	String typeContainerName= getQualifier(fullTypeName, isStatic);	632	String typeContainerName= getQualifier(fullTypeName, isStatic);
621	ImportDeclEntry decl= new ImportDeclEntry(typeContainerName.length(), fullTypeName, isStatic, null);	633	ImportDeclEntry decl;
		634	if (restoreExistingImports) {
		635	decl = new ImportDeclEntry(typeContainerName.length(), fullTypeName, isStatic, null);
		636	} else {
		637	decl = addImportDeclEntry(typeContainerName, fullTypeName, isStatic, root);
		638	}
622	sortIn(typeContainerName, decl, isStatic);	639	sortIn(typeContainerName, decl, isStatic);
		640	}
		641
		642	/**
		643	* adds the import entry, but if its an existing import entry then preserves the comments surrounding the import
		644	*/
		645	private ImportDeclEntry addImportDeclEntry(String containerName, String fullTypeName, boolean isStatic, CompilationUnit root) {
		646	List/ImportDeclaration/ decls= root.imports();
		647	if (decls.isEmpty() \|\| this.preserveExistingCommentsRanges == null \|\| this.preserveExistingCommentsRanges.length == 0) {
		648	return new ImportDeclEntry(containerName.length(), fullTypeName, isStatic, null);
		649	}
		650	IRegion precedingCommentRange = null;
		651	IRegion trailingCommentRange = null;
		652	int prevOffset = this.replaceRange.getOffset(); // will store offset of the previous import's extended end
		653	int numOfImports = decls.size();
		654	for (int i= 0; i < numOfImports; i++) {
		655	ImportDeclaration curr= (ImportDeclaration) decls.get(i);
		656	int currOffset= curr.getStartPosition();
		657	int currLength= curr.getLength();
		658	int currExtendedStart = root.getExtendedStartPosition(curr);
		659	int currExtendedLen = root.getExtendedLength(curr);
		660	String name= getFullName(curr);
		661	String packName= getQualifier(curr);
		662	if (packName.equals(containerName) && (name.equals(fullTypeName) \|\| name.endsWith("*"))) {//$NON-NLS-1$
		663	int preserveCommentsLen = this.preserveExistingCommentsRanges.length;
		664	for (int j = 0; j < preserveCommentsLen; j++) {
		665	int offset = this.preserveExistingCommentsRanges[j].getOffset();
		666	boolean wasRangeUsed = false;
		667	int existingCommentLength = this.preserveExistingCommentsRanges[j].getLength();
		668	if (offset == currExtendedStart) {
		669	// comments belonging to this import's extended start
		670	precedingCommentRange = new Region(offset, existingCommentLength);
		671	wasRangeUsed = true;
		672	} else if (offset < currExtendedStart && offset > prevOffset) {
		673	// comment between two imports but not inside either's extended ranges
		674	// to preserve the position of these comments add a dummy comment entry
		675	PackageEntry commentEntry = new PackageEntry(); // create a comment package entry for this
		676	commentEntry.setGroupID(packName); // the comment should belong to the current group
		677	this.packageEntries.add(commentEntry);
		678	commentEntry.add(new ImportDeclEntry(packName.length(), null, false, new Region(offset, existingCommentLength)));
		679	wasRangeUsed = true;
		680	} else if ((currExtendedStart + currExtendedLen) != (currOffset + currLength)){
		681	if (offset == currOffset + currLength) {
		682	// comment is in the extended end of the import
		683	trailingCommentRange = new Region(offset, existingCommentLength);
		684	wasRangeUsed = true;
		685	} else if (offset > (currOffset + currLength)) {
		686	break;
		687	}
		688	}
		689	if (wasRangeUsed) {
		690	// remove this comment from preceedingCommnentRange array
		691	IRegion[] tempRegions = new IRegion[preserveCommentsLen = (preserveCommentsLen - 1)];
		692	System.arraycopy(this.preserveExistingCommentsRanges, 0, tempRegions, 0, j);
		693	System.arraycopy(this.preserveExistingCommentsRanges, j+1, tempRegions, j, tempRegions.length - j);
		694	this.preserveExistingCommentsRanges = tempRegions;
		695	j--;
		696	}
		697	}
		698	return new ImportDeclEntry(containerName.length(), fullTypeName, isStatic, null, precedingCommentRange, trailingCommentRange);
		699	}
		700	prevOffset = currExtendedStart + currExtendedLen - 1;
		701	}
		702	return new ImportDeclEntry(containerName.length(), fullTypeName, isStatic, null);
623	}	703	}
624		704
625	public boolean removeImport(String qualifiedName, boolean isStatic) {	705	public boolean removeImport(String qualifiedName, boolean isStatic) {
Lines 758-763 Link Here
758	stringsToInsert.add(lineDelim);	838	stringsToInsert.add(lineDelim);
759	}	839	}
760	}	840	}
		841	} else if (lastPackage != null && lastPackage.isComment() && pack.isSameGroup(lastPackage)) {
		842	// the last pack may be a dummy for a comment which doesn't belong to any extended range
		843	stringsToInsert.add(lineDelim);
761	}	844	}
762	}	845	}
763	lastPackage= pack;	846	lastPackage= pack;
Lines 766-776 Link Here
766	int threshold= isStatic ? this.staticImportOnDemandThreshold : this.importOnDemandThreshold;	849	int threshold= isStatic ? this.staticImportOnDemandThreshold : this.importOnDemandThreshold;
767		850
768	boolean doStarImport= pack.hasStarImport(threshold, onDemandConflicts);	851	boolean doStarImport= pack.hasStarImport(threshold, onDemandConflicts);
		852	boolean allImportsAddedToStar = false;
769	if (doStarImport && (pack.find("*") == null)) { //$NON-NLS-1$	853	if (doStarImport && (pack.find("*") == null)) { //$NON-NLS-1$
770	String[] imports = getNewImportStrings(buffer, pack, isStatic, lineDelim);	854	String[] imports = getNewImportStrings(buffer, pack, isStatic, lineDelim);
771	for (int j = 0, max = imports.length; j < max; j++) {	855	for (int j = 0, max = imports.length; j < max; j++) {
772	stringsToInsert.add(imports[j]);	856	stringsToInsert.add(imports[j]);
773	}	857	}
		858	allImportsAddedToStar = true;
774	}	859	}
775		860
776	for (int k= 0; k < nImports; k++) {	861	for (int k= 0; k < nImports; k++) {
Lines 779-787 Link Here
779		864
780	if (region == null) { // new entry	865	if (region == null) { // new entry
781	if (!doStarImport \|\| currDecl.isOnDemand() \|\| (onDemandConflicts != null && onDemandConflicts.contains(currDecl.getSimpleName()))) {	866	if (!doStarImport \|\| currDecl.isOnDemand() \|\| (onDemandConflicts != null && onDemandConflicts.contains(currDecl.getSimpleName()))) {
782	String str= getNewImportString(currDecl.getElementName(), isStatic, lineDelim);	867	IRegion rangeBefore = currDecl.getPrecedingCommentRange();
		868	IRegion rangeAfter = currDecl.getTrailingCommentRange();
		869	if (rangeBefore != null) {
		870	stringsToInsert.add(buffer.getText(rangeBefore.getOffset(), rangeBefore.getLength()));
		871	}
		872
		873	String trailingComment = null;
		874	if (rangeAfter != null) {
		875	trailingComment = buffer.getText(rangeAfter.getOffset(), rangeAfter.getLength());
		876	}
		877	String str= getNewImportString(currDecl.getElementName(), isStatic, trailingComment, lineDelim);
783	stringsToInsert.add(str);	878	stringsToInsert.add(str);
784	} else if (doStarImport && !currDecl.isOnDemand()) {	879	} else if (doStarImport && !currDecl.isOnDemand() && !allImportsAddedToStar) {
785	String simpleName = currDecl.getTypeQualifiedName();	880	String simpleName = currDecl.getTypeQualifiedName();
786	if (simpleName.indexOf('.') != -1) {	881	if (simpleName.indexOf('.') != -1) {
787	String str= getNewImportString(currDecl.getElementName(), isStatic, lineDelim);	882	String str= getNewImportString(currDecl.getElementName(), isStatic, lineDelim);
Lines 830-836 Link Here
830		925
831	// insert back all existing imports comments since existing imports were not preserved	926	// insert back all existing imports comments since existing imports were not preserved
832	if (this.preserveExistingCommentsRanges != null) {	927	if (this.preserveExistingCommentsRanges != null) {
833	for (int i = 0, max = this.preserveExistingCommentsRanges.length; i < max; i++) {	928	for (int i = 0, max = this.preserveExistingCommentsRanges.length; (i < max && this.preserveExistingCommentsRanges[i] != null); i++) {
834	IRegion region = this.preserveExistingCommentsRanges[i];	929	IRegion region = this.preserveExistingCommentsRanges[i];
835	String text = buffer.getText(region.getOffset(), region.getLength());	930	String text = buffer.getText(region.getOffset(), region.getLength());
836	// remove preceding whitespaces	931	// remove preceding whitespaces
Lines 1012-1017 Link Here
1012	List allImports = new ArrayList();	1107	List allImports = new ArrayList();
1013	int nImports = packageEntry.getNumberOfImports();	1108	int nImports = packageEntry.getNumberOfImports();
1014	StringBuffer allComments = null;	1109	StringBuffer allComments = null;
		1110	StringBuffer allCommentsLead = null;
1015	for (int i= 0; i < nImports; i++) {	1111	for (int i= 0; i < nImports; i++) {
1016	ImportDeclEntry curr= packageEntry.getImportAt(i);	1112	ImportDeclEntry curr= packageEntry.getImportAt(i);
1017	String simpleName = curr.getTypeQualifiedName();	1113	String simpleName = curr.getTypeQualifiedName();
Lines 1029-1056 Link Here
1029	allImports.add(getNewImportString(curr.getElementName(), isStatic, trailingComment, lineDelim));	1125	allImports.add(getNewImportString(curr.getElementName(), isStatic, trailingComment, lineDelim));
1030	} else if (!isStarImportAdded) {	1126	} else if (!isStarImportAdded) {
1031	String starImportString= packageEntry.getName() + ".*"; //$NON-NLS-1$	1127	String starImportString= packageEntry.getName() + ".*"; //$NON-NLS-1$
1032	allImports.add(getNewImportString(starImportString, isStatic, lineDelim));	1128	// collect all comments
		1129	IRegion rangeBefore = curr.getPrecedingCommentRange();
		1130	if (rangeBefore != null) {
		1131	allImports.add(buffer.getText(rangeBefore.getOffset(), rangeBefore.getLength()));
		1132	}
		1133	IRegion rangeAfter = curr.getTrailingCommentRange();
		1134	String trailComments = null;
		1135	if (rangeAfter != null) {
		1136	trailComments = buffer.getText(rangeAfter.getOffset(), rangeAfter.getLength());
		1137	}
		1138	allImports.add(getNewImportString(starImportString, isStatic, trailComments, lineDelim));
1033	isStarImportAdded = true;	1139	isStarImportAdded = true;
1034	} else {	1140	} else {
1035	// collect all comments	1141	// collect all comments
1036	IRegion rangeBefore = curr.getPrecedingCommentRange();	1142	IRegion rangeBefore = curr.getPrecedingCommentRange();
1037	if (rangeBefore != null) {	1143	if (rangeBefore != null) {
1038	if (allComments == null) {	1144	if (allCommentsLead == null) {
1039	allComments = new StringBuffer();	1145	allCommentsLead = new StringBuffer();
1040	}	1146	}
1041	allComments.append(buffer.getText(rangeBefore.getOffset(), rangeBefore.getLength())).append(lineDelim);	1147	allCommentsLead.append(buffer.getText(rangeBefore.getOffset(), rangeBefore.getLength()));
1042	}	1148	}
1043	IRegion rangeAfter = curr.getTrailingCommentRange();	1149	IRegion rangeAfter = curr.getTrailingCommentRange();
1044	if (rangeAfter != null) {	1150	if (rangeAfter != null) {
1045	if (allComments == null) {	1151	if (allComments == null) {
1046	allComments = new StringBuffer();	1152	allComments = new StringBuffer();
1047	}	1153	}
1048	allComments.append(buffer.getText(rangeAfter.getOffset(), rangeAfter.getLength())).append(lineDelim);	1154	allComments.append(buffer.getText(rangeAfter.getOffset(), rangeAfter.getLength()));
1049	}	1155	}
1050	}	1156	}
1051	}	1157	}
		1158	if (allCommentsLead != null) {
		1159	allImports.add(0, String.valueOf(allCommentsLead));
		1160	}
1052	if (allComments != null) {	1161	if (allComments != null) {
1053	allImports.add(0, String.valueOf(allComments));	1162	allImports.add(String.valueOf(allComments.append(lineDelim)));
1054	}	1163	}
1055	return (String[]) allImports.toArray(new String[allImports.size()]);	1164	return (String[]) allImports.toArray(new String[allImports.size()]);
1056	}	1165	}
Lines 1110-1117 Link Here
1110	private IRegion sourceRange;	1219	private IRegion sourceRange;
1111	private final boolean isStatic;	1220	private final boolean isStatic;
1112	private int containerNameLength;	1221	private int containerNameLength;
1113	private IRegion precedingCommentRange;	1222	IRegion precedingCommentRange;
1114	private IRegion trailingCommentRange;	1223	IRegion trailingCommentRange;
1115		1224
1116	public ImportDeclEntry(	1225	public ImportDeclEntry(
1117	int containerNameLength,	1226	int containerNameLength,

Return to bug 378024