Attachment #39676 for bug #95839

View | Details | Raw Unified | Return to bug 95839
Collapse All | Expand All




	private final ASTRewriteFormatter formatter;
	private final NodeInfoStore nodeInfos;
	private final TargetSourceRangeComputer extendedSourceRangeComputer;
	private final LineCommentEndOffsets lineCommentEndOffsets;
	
	/**
	 * Constructor for ASTRewriteAnalyzer.
	 * @param content the content of the compilation unit to rewrite.
	 * @param lineInfo line information for the content of the compilation unit to rewrite.
	 * @param rootEdit the edit to add all generated edits to
	 * @param eventStore the event store containing the description of changes
	 * @param nodeInfos annotations to nodes, such as if a node is a string placeholder or a copy target
	 * @param comments list of comments of the compilation unit to rewrite (elements of type <code>Comment</code>) or <code>null</code>.
	 * 	@param options the current jdt.core options (formatting/compliance) or <code>null</code>.
	 * 	@param extendedSourceRangeComputer the source range computer to use
	 */
	public ASTRewriteAnalyzer(char[] content, LineInformation lineInfo, String lineDelim, TextEdit rootEdit, RewriteEventStore eventStore, NodeInfoStore nodeInfos, List comments, Map options, TargetSourceRangeComputer extendedSourceRangeComputer) {
		this.eventStore= eventStore;
		this.content= content;
		this.lineInfo= lineInfo;

		this.formatter= new ASTRewriteFormatter(nodeInfos, eventStore, options, lineDelim);
		
		this.extendedSourceRangeComputer = extendedSourceRangeComputer;
		this.lineCommentEndOffsets= new LineCommentEndOffsets(comments);
	}
		
	final TokenScanner getScanner() {

	
	final void doTextInsert(int offset, String insertString, TextEditGroup editGroup) {
		if (insertString.length() > 0) {
			// bug fix for 95839: problem with inserting at the end of a line comment
			if (this.lineCommentEndOffsets.isEndOfLineComment(offset, this.content)) {
				if (!insertString.startsWith(getLineDelimiter())) {
					TextEdit edit= new InsertEdit(offset, getLineDelimiter());  // add a line delimiter
					addEdit(edit);
					if (editGroup != null) {
						addEditGroup(editGroup, edit);
					}
				}
				this.lineCommentEndOffsets.remove(offset); // only one line delimiter per line comment required
			}
			TextEdit edit= new InsertEdit(offset, insertString);
			addEdit(edit);
			if (editGroup != null) {

Lines 87-94 Link Here

(-)dom/org/eclipse/jdt/core/dom/InternalASTRewrite.java (-1 / +2 lines)
87	char[] content= document.get().toCharArray();	87	char[] content= document.get().toCharArray();
88	LineInformation lineInfo= LineInformation.create(document);	88	LineInformation lineInfo= LineInformation.create(document);
89	String lineDelim= TextUtilities.getDefaultLineDelimiter(document);	89	String lineDelim= TextUtilities.getDefaultLineDelimiter(document);
		90	List comments= rootNode.getCommentList();
90		91
91	ASTRewriteAnalyzer visitor = new ASTRewriteAnalyzer(content, lineInfo, lineDelim, result, this.eventStore, this.nodeStore, options, xsrComputer);	92	ASTRewriteAnalyzer visitor = new ASTRewriteAnalyzer(content, lineInfo, lineDelim, result, this.eventStore, this.nodeStore, comments, options, xsrComputer);
92	rootNode.accept(visitor);	93	rootNode.accept(visitor);
93	}	94	}
94	return result;	95	return result;




/*******************************************************************************
 * Copyright (c) 2000, 2006 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Common Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.jdt.internal.core.dom.rewrite;

import java.util.Arrays;
import java.util.List;

import org.eclipse.jdt.core.dom.LineComment;
import org.eclipse.jdt.core.formatter.IndentManipulation;

public class LineCommentEndOffsets {
	
	private int[] offsets;
	private final List commentList;
	
	public LineCommentEndOffsets(List commentList) {
		this.commentList= commentList;
		this.offsets= null; // create on demand
	}
	
	private int[] getOffsets() {
		if (this.offsets == null) {
			if (this.commentList != null) {
				int nComments= this.commentList.size();
				// count the number of line comments
				int count= 0;
				for (int i= 0; i < nComments; i++) {
					Object curr= this.commentList.get(i);
					if (curr instanceof LineComment) {
						count++;
					}
				}
				// fill the offset table
				this.offsets= new int[count];
				for (int i= 0, k= 0; i < nComments; i++) {
					Object curr= this.commentList.get(i);
					if (curr instanceof LineComment) {
						LineComment comment= (LineComment) curr;
						this.offsets[k++]= comment.getStartPosition() + comment.getLength();
					}
				}
			} else {
				this.offsets= new int[0];
			}
		}
		return this.offsets;
	}
	
	public boolean isEndOfLineComment(int offset) {
		return offset >= 0 && Arrays.binarySearch(getOffsets(), offset) >= 0;
	}
	
	public boolean isEndOfLineComment(int offset, char[] content) {
		if (offset < 0 || (offset < content.length && !IndentManipulation.isLineDelimiterChar(content[offset]))) {
			return false;
		}
		return Arrays.binarySearch(getOffsets(), offset) >= 0;
	}
	
	public boolean remove(int offset) {
		int[] offsetArray= getOffsets(); // returns the shared array
		int index= Arrays.binarySearch(offsetArray, offset);
		if (index >= 0) {
			if (index > 0) {
				// shift from the beginning and insert -1 (smallest number) at the beginning
				// 1, 2, 3, x, 4, 5 -> -1, 1, 2, 3, 4, 5
				System.arraycopy(offsetArray, 0, offsetArray, 1, index);
			}
			offsetArray[0]= -1;
			return true;
		}
		return false;
	}
	
}

Lines 61-66 Link Here

(-)src/org/eclipse/jdt/core/tests/rewrite/describing/ASTRewritingTest.java (+1 lines)
61	suite.addTest(ASTRewritingGroupNodeTest.allTests());	61	suite.addTest(ASTRewritingGroupNodeTest.allTests());
62	suite.addTest(SourceModifierTest.allTests());	62	suite.addTest(SourceModifierTest.allTests());
63	suite.addTest(ImportRewriteTest.allTests());	63	suite.addTest(ImportRewriteTest.allTests());
		64	suite.addTest(LineCommentOffsetsTest.allTests());
64	return suite;	65	return suite;
65	}	66	}
66		67




/*******************************************************************************
 * Copyright (c) 2000, 2006 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.core.tests.rewrite.describing;

import java.util.HashSet;

import junit.framework.Test;
import junit.framework.TestSuite;

import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.dom.*;
import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
import org.eclipse.jdt.core.dom.rewrite.ListRewrite;
import org.eclipse.jdt.internal.core.dom.rewrite.LineCommentEndOffsets;

/**
 *
 */
public class LineCommentOffsetsTest extends ASTRewritingTest {
	
	private static final Class THIS= LineCommentOffsetsTest.class;

	public LineCommentOffsetsTest(String name) {
		super(name);
	}

	public static Test allTests() {
		return new Suite(THIS);
	}
	
	public static Test setUpTest(Test someTest) {
		TestSuite suite= new Suite("one test");
		suite.addTest(someTest);
		return suite;
	}
	
	public static Test suite() {
		return allTests();
	}
	
	public void testEmptyLineComments() throws Exception {
		
		StringBuffer buf= new StringBuffer();
		buf.append("\n");
		
		LineCommentEndOffsets offsets= new LineCommentEndOffsets(null);
		boolean res= offsets.isEndOfLineComment(0);
		assertFalse(res);
		res= offsets.remove(0);
		assertFalse(res);
	}
	
	public void testRemove() throws Exception {
		
		IPackageFragment pack1= this.sourceFolder.createPackageFragment("test1", false, null);

		StringBuffer buf= new StringBuffer();
		buf.append("package test1;//comment Y\n");
		buf.append("public class E//comment Y\n");
		buf.append("{//comment Y\n");
		buf.append("}//comment Y");	
		String contents= buf.toString();
		ICompilationUnit cu= pack1.createCompilationUnit("E.java", contents, false, null);
		
		CompilationUnit astRoot= createAST3(cu);
		
		LineCommentEndOffsets offsets= new LineCommentEndOffsets(astRoot.getCommentList());

		int p1= contents.indexOf('Y') + 1;
		int p2= contents.indexOf('Y', p1) + 1;
		int p3= contents.indexOf('Y', p2) + 1;
		int p4= contents.indexOf('Y', p3) + 1;
		
		assertFalse(offsets.isEndOfLineComment(0));
		assertTrue(offsets.isEndOfLineComment(p1));
		assertTrue(offsets.isEndOfLineComment(p2));
		assertTrue(offsets.isEndOfLineComment(p3));
		assertTrue(offsets.isEndOfLineComment(p4));
		
		boolean res= offsets.remove(p2);
		assertTrue(res);
		
		res= offsets.remove(p2);
		assertFalse(res);
		
		assertFalse(offsets.isEndOfLineComment(0));
		assertTrue(offsets.isEndOfLineComment(p1));
		assertFalse(offsets.isEndOfLineComment(p2));
		assertTrue(offsets.isEndOfLineComment(p3));
		assertTrue(offsets.isEndOfLineComment(p4));
		
		res= offsets.remove(p4);
		assertTrue(res);
		
		assertFalse(offsets.isEndOfLineComment(0));
		assertTrue(offsets.isEndOfLineComment(p1));
		assertFalse(offsets.isEndOfLineComment(p2));
		assertTrue(offsets.isEndOfLineComment(p3));
		assertFalse(offsets.isEndOfLineComment(p4));
		
		res= offsets.remove(p1);
		assertTrue(res);
		
		assertFalse(offsets.isEndOfLineComment(0));
		assertFalse(offsets.isEndOfLineComment(p1));
		assertFalse(offsets.isEndOfLineComment(p2));
		assertTrue(offsets.isEndOfLineComment(p3));
		assertFalse(offsets.isEndOfLineComment(p4));
	}
	
	
	
	public void testLineCommentEndOffsets() throws Exception {
		IPackageFragment pack1= this.sourceFolder.createPackageFragment("test1", false, null);
		
		
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("/* comment */\n");
		buf.append("// comment Y\n");
		buf.append("public class E {\n");
		buf.append("    public void foo() {\n");
		buf.append("        while (i == 0) {\n");
		buf.append("            foo();\n");
		buf.append("            i++; // comment Y\n");
		buf.append("            i++;\n");
		buf.append("        }// comment// comment Y\n");
		buf.append("        return;\n");
		buf.append("    }\n");
		buf.append("} // comment Y");
		String content= buf.toString();
		
		ICompilationUnit cu= pack1.createCompilationUnit("E.java", content, false, null);
		CompilationUnit astRoot= createAST(cu);
		
		LineCommentEndOffsets offsets= new LineCommentEndOffsets(astRoot.getCommentList());
		HashSet expectedOffsets= new HashSet();

		for (int i= 0; i < content.length(); i++) {
			char ch= content.charAt(i);
			if (ch == 'Y') {
				expectedOffsets.add(new Integer(i + 1));
			}
		}
		
		int count= 0;
		
		char[] charContent= content.toCharArray();
		for (int i= 0; i <= content.length() + 5; i++) {
			boolean expected= i > 0 && i <= content.length() && charContent[i - 1] == 'Y';
			boolean actual= offsets.isEndOfLineComment(i, charContent);
			assertEquals(expected, actual);
			
			actual= offsets.isEndOfLineComment(i);
			assertEquals(expected, actual);
			
			if (expected) {
				count++;
			}
			
		}
		assertEquals(4, count);
	}
	
	public void testLineCommentEndOffsetsMixedLineDelimiter() throws Exception {
		IPackageFragment pack1= this.sourceFolder.createPackageFragment("test1", false, null);
		
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("/* comment */\r\n");
		buf.append("// comment Y\n");
		buf.append("public class E {\r\n");
		buf.append("    public void foo() {\n");
		buf.append("        while (i == 0) {\n");
		buf.append("            foo();\n");
		buf.append("            i++; // comment Y\r\n");
		buf.append("            i++;\n");
		buf.append("        }// comment// comment Y\r");
		buf.append("        return;\n");
		buf.append("    }\r\n");
		buf.append("} // comment Y");
		String content= buf.toString();
		
		ICompilationUnit cu= pack1.createCompilationUnit("E.java", content, false, null);
		CompilationUnit astRoot= createAST(cu);
		
		LineCommentEndOffsets offsets= new LineCommentEndOffsets(astRoot.getCommentList());
		HashSet expectedOffsets= new HashSet();

		for (int i= 0; i < content.length(); i++) {
			char ch= content.charAt(i);
			if (ch == 'Y') {
				expectedOffsets.add(new Integer(i + 1));
			}
		}
		
		int count= 0;
		
		char[] charContent= content.toCharArray();
		for (int i= 0; i <= content.length() + 5; i++) {
			boolean expected= i > 0 && i <= content.length() && charContent[i - 1] == 'Y';
			boolean actual= offsets.isEndOfLineComment(i, charContent);
			assertEquals(expected, actual);
			if (expected) {
				count++;
			}
			
		}
		assertEquals(4, count);
	}
	
	public void testCommentInLists() throws Exception {
		
		IPackageFragment pack1= this.sourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class E implements A //comment\n");
		buf.append("{\n");
		buf.append("}\n");	
		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
		
		CompilationUnit astRoot= createAST3(cu);
		ASTRewrite rewrite= ASTRewrite.create(astRoot.getAST());
		
		AST ast= astRoot.getAST();
		
		assertTrue("Parse errors", (astRoot.getFlags() & ASTNode.MALFORMED) == 0);
		TypeDeclaration type= findTypeDeclaration(astRoot, "E");
		
		ListRewrite listRewrite= rewrite.getListRewrite(type, TypeDeclaration.SUPER_INTERFACE_TYPES_PROPERTY);
		SimpleType newInterface= ast.newSimpleType(ast.newSimpleName("B"));
		listRewrite.insertLast(newInterface, null);
			
		String preview= evaluateRewrite(cu, rewrite);
		
		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class E implements A //comment\n");
		buf.append(", B\n");
		buf.append("{\n");
		buf.append("}\n");	
		assertEqualString(preview, buf.toString());
	}
	
	public void testCommentInType() throws Exception {
		
		IPackageFragment pack1= this.sourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class E //comment\n");
		buf.append("{\n");
		buf.append("}\n");	
		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
		
		CompilationUnit astRoot= createAST3(cu);
		ASTRewrite rewrite= ASTRewrite.create(astRoot.getAST());
		
		AST ast= astRoot.getAST();
		
		assertTrue("Parse errors", (astRoot.getFlags() & ASTNode.MALFORMED) == 0);
		TypeDeclaration type= findTypeDeclaration(astRoot, "E");
		
		ListRewrite listRewrite= rewrite.getListRewrite(type, TypeDeclaration.SUPER_INTERFACE_TYPES_PROPERTY);
		SimpleType newInterface= ast.newSimpleType(ast.newSimpleName("B"));
		listRewrite.insertLast(newInterface, null);
			
		String preview= evaluateRewrite(cu, rewrite);
		
		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class E //comment\n");
		buf.append(" implements B\n");
		buf.append("{\n");
		buf.append("}\n");	
		assertEqualString(preview, buf.toString());
	}
	
	public void testBug103340() throws Exception {
		
		IPackageFragment pack1= this.sourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class E //implements List\n");
		buf.append("{\n");
		buf.append("}\n");	
		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
		
		CompilationUnit astRoot= createAST3(cu);
		ASTRewrite rewrite= ASTRewrite.create(astRoot.getAST());
		
		AST ast= astRoot.getAST();
		
		assertTrue("Parse errors", (astRoot.getFlags() & ASTNode.MALFORMED) == 0);
		TypeDeclaration type= findTypeDeclaration(astRoot, "E");
		
		ListRewrite listRewrite= rewrite.getListRewrite(type, TypeDeclaration.TYPE_PARAMETERS_PROPERTY);
		TypeParameter newType= ast.newTypeParameter();
		newType.setName(ast.newSimpleName("X"));
		listRewrite.insertLast(newType, null);
			
		String preview= evaluateRewrite(cu, rewrite);
		
		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class E //implements List\n");
		buf.append("<X>\n");
		buf.append("{\n");
		buf.append("}\n");	
		assertEqualString(preview, buf.toString());
	}
	
	public void testBug95839() throws Exception {
		
		IPackageFragment pack1= this.sourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class E {\n");
		buf.append("  void foo() {\n");
		buf.append("    object.method(\n");
		buf.append("      param1, // text about param1\n");
		buf.append("      param2  // text about param2\n");
		buf.append("    );\n");
		buf.append("  }\n");	
		buf.append("}\n");	
		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
		
		CompilationUnit astRoot= createAST3(cu);
		ASTRewrite rewrite= ASTRewrite.create(astRoot.getAST());
		
		AST ast= astRoot.getAST();
		
		assertTrue("Parse errors", (astRoot.getFlags() & ASTNode.MALFORMED) == 0);
		TypeDeclaration type= findTypeDeclaration(astRoot, "E");
		ExpressionStatement statement= (ExpressionStatement) ((MethodDeclaration) type.bodyDeclarations().get(0)).getBody().statements().get(0);
		MethodInvocation inv= (MethodInvocation) statement.getExpression();
		
		ListRewrite listRewrite= rewrite.getListRewrite(inv, MethodInvocation.ARGUMENTS_PROPERTY);
		listRewrite.insertLast(ast.newSimpleName("param3"), null);
			
		String preview= evaluateRewrite(cu, rewrite);
		
		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class E {\n");
		buf.append("  void foo() {\n");
		buf.append("    object.method(\n");
		buf.append("      param1, // text about param1\n");
		buf.append("      param2  // text about param2\n");
		buf.append(", param3\n");
		buf.append("    );\n");
		buf.append("  }\n");	
		buf.append("}\n");	
		assertEqualString(preview, buf.toString());
	}
	
	public void testBug114418() throws Exception {
		
		IPackageFragment pack1= this.sourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class E {\n");
		buf.append("  void foo() {\n");
		buf.append("    try {\n");
		buf.append("    } catch (IOException e) {\n");
		buf.append("    }\n");
		buf.append("    // comment\n");	
		buf.append("  }\n");	
		buf.append("}\n");	
		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
		
		CompilationUnit astRoot= createAST3(cu);
		ASTRewrite rewrite= ASTRewrite.create(astRoot.getAST());
		
		AST ast= astRoot.getAST();
		
		assertTrue("Parse errors", (astRoot.getFlags() & ASTNode.MALFORMED) == 0);
		TypeDeclaration type= findTypeDeclaration(astRoot, "E");
		TryStatement statement= (TryStatement) ((MethodDeclaration) type.bodyDeclarations().get(0)).getBody().statements().get(0);
		
		ListRewrite listRewrite= rewrite.getListRewrite(statement, TryStatement.CATCH_CLAUSES_PROPERTY);
		CatchClause clause= ast.newCatchClause();
		SingleVariableDeclaration newSingleVariableDeclaration= ast.newSingleVariableDeclaration();
		newSingleVariableDeclaration.setName(ast.newSimpleName("e"));
		newSingleVariableDeclaration.setType(ast.newSimpleType(ast.newSimpleName("MyException")));
		clause.setException(newSingleVariableDeclaration);
		
		listRewrite.insertLast(clause, null);
			
		String preview= evaluateRewrite(cu, rewrite);
		
		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class E {\n");
		buf.append("  void foo() {\n");
		buf.append("    try {\n");
		buf.append("    } catch (IOException e) {\n");
		buf.append("    }\n");
		buf.append("    // comment\n");
		buf.append(" catch (MyException e) {\n");
		buf.append("    }\n");
		buf.append("  }\n");	
		buf.append("}\n");	
		assertEqualString(preview, buf.toString());
	}
	
	public void testBug128818() throws Exception {
		
		IPackageFragment pack1= this.sourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class E {\n");
		buf.append("  void foo() {\n");
		buf.append("    if (true) {\n");
		buf.append("    } // comment\n");
		buf.append("    else\n");
		buf.append("      return;\n");
		buf.append("  }\n");	
		buf.append("}\n");	
		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
		
		CompilationUnit astRoot= createAST3(cu);
		ASTRewrite rewrite= ASTRewrite.create(astRoot.getAST());
		
		AST ast= astRoot.getAST();
		
		assertTrue("Parse errors", (astRoot.getFlags() & ASTNode.MALFORMED) == 0);
		TypeDeclaration type= findTypeDeclaration(astRoot, "E");
		IfStatement statement= (IfStatement) ((MethodDeclaration) type.bodyDeclarations().get(0)).getBody().statements().get(0);
		
		rewrite.set(statement, IfStatement.ELSE_STATEMENT_PROPERTY, ast.newBlock(), null);
			
		String preview= evaluateRewrite(cu, rewrite);
		
		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class E {\n");
		buf.append("  void foo() {\n");
		buf.append("    if (true) {\n");
		buf.append("    } // comment\n");
		buf.append(" else {\n");
		buf.append("    }\n");
		buf.append("  }\n");	
		buf.append("}\n");	
		assertEqualString(preview, buf.toString());
	}
	
	/* not yet working
	public void testBug128422() throws Exception {
		
		IPackageFragment pack1= this.sourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class E {\n");
		buf.append("  void foo() {\n");
		buf.append("    if (i != 0 //I don't like 0\n");
		buf.append("                 && i != 10) {\n");
		buf.append("    }\n");
		buf.append("  }\n");	
		buf.append("}\n");	
		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
		
		CompilationUnit astRoot= createAST3(cu);
		ASTRewrite rewrite= ASTRewrite.create(astRoot.getAST());
		
		AST ast= astRoot.getAST();
		
		assertTrue("Parse errors", (astRoot.getFlags() & ASTNode.MALFORMED) == 0);
		TypeDeclaration type= findTypeDeclaration(astRoot, "E");
		IfStatement statement= (IfStatement) ((MethodDeclaration) type.bodyDeclarations().get(0)).getBody().statements().get(0);
		Expression expression= ((InfixExpression) statement.getExpression()).getLeftOperand();
		
		ParenthesizedExpression parenthesizedExpression= ast.newParenthesizedExpression();
		parenthesizedExpression.setExpression( (Expression) rewrite.createCopyTarget(expression));
		rewrite.replace(expression, parenthesizedExpression, null);
			
		String preview= evaluateRewrite(cu, rewrite);
		
		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class E {\n");
		buf.append("  void foo() {\n");
		buf.append("    if ((i != 0 //I don't like 0\n");
		buf.append(")\n");
		buf.append("                 && i != 10) {\n");
		buf.append("    }\n");
		buf.append("  }\n");	
		buf.append("}\n");	
		assertEqualString(preview, buf.toString());
	}*/
	
	public void testCommentAtEnd() throws Exception {
		
		IPackageFragment pack1= this.sourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class E \n");
		buf.append("{\n");
		buf.append("}//comment");	
		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
		
		CompilationUnit astRoot= createAST3(cu);
		ASTRewrite rewrite= ASTRewrite.create(astRoot.getAST());
		
		AST ast= astRoot.getAST();
		
		assertTrue("Parse errors", (astRoot.getFlags() & ASTNode.MALFORMED) == 0);
		
		ListRewrite listRewrite= rewrite.getListRewrite(astRoot, CompilationUnit.TYPES_PROPERTY);
		TypeDeclaration newType= ast.newTypeDeclaration();
		newType.setName(ast.newSimpleName("B"));
		listRewrite.insertLast(newType, null);
			
		String preview= evaluateRewrite(cu, rewrite);
		
		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class E \n");
		buf.append("{\n");
		buf.append("}//comment\n");
		buf.append("\n");
		buf.append("class B {\n");
		buf.append("}");
		assertEqualString(preview, buf.toString());
	}
	

	
}

Return to bug 95839

Lines 11-16 Link Here

(-)dom/org/eclipse/jdt/core/dom/rewrite/ASTRewrite.java (-4 / +7 lines)
11	package org.eclipse.jdt.core.dom.rewrite;	11	package org.eclipse.jdt.core.dom.rewrite;
12		12
13	import java.util.Iterator;	13	import java.util.Iterator;
		14	import java.util.List;
14	import java.util.Map;	15	import java.util.Map;
15		16
16	import org.eclipse.jdt.core.ICompilationUnit;	17	import org.eclipse.jdt.core.ICompilationUnit;
Lines 182-188 Link Here
182	LineInformation lineInfo= LineInformation.create(document);	183	LineInformation lineInfo= LineInformation.create(document);
183	String lineDelim= TextUtilities.getDefaultLineDelimiter(document);	184	String lineDelim= TextUtilities.getDefaultLineDelimiter(document);
184		185
185	return internalRewriteAST(content, lineInfo, lineDelim, options, rootNode);	186	ASTNode astRoot= rootNode.getRoot();
		187	List commentNodes= astRoot instanceof CompilationUnit ? ((CompilationUnit) astRoot).getCommentList() : null;
		188	return internalRewriteAST(content, lineInfo, lineDelim, commentNodes, options, rootNode);
186	}	189	}
187		190
188	/**	191	/**
Lines 238-254 Link Here
238	String lineDelim= cu.findRecommendedLineSeparator();	241	String lineDelim= cu.findRecommendedLineSeparator();
239	Map options= cu.getJavaProject().getOptions(true);	242	Map options= cu.getJavaProject().getOptions(true);
240		243
241	return internalRewriteAST(content, lineInfo, lineDelim, options, rootNode);	244	return internalRewriteAST(content, lineInfo, lineDelim, astRoot.getCommentList(), options, rootNode);
242	}	245	}
243		246
244	private TextEdit internalRewriteAST(char[] content, LineInformation lineInfo, String lineDelim, Map options, ASTNode rootNode) {	247	private TextEdit internalRewriteAST(char[] content, LineInformation lineInfo, String lineDelim, List commentNodes, Map options, ASTNode rootNode) {
245	TextEdit result= new MultiTextEdit();	248	TextEdit result= new MultiTextEdit();
246	//validateASTNotModified(rootNode);	249	//validateASTNotModified(rootNode);
247		250
248	TargetSourceRangeComputer sourceRangeComputer= getExtendedSourceRangeComputer();	251	TargetSourceRangeComputer sourceRangeComputer= getExtendedSourceRangeComputer();
249	this.eventStore.prepareMovedNodes(sourceRangeComputer);	252	this.eventStore.prepareMovedNodes(sourceRangeComputer);
250		253
251	ASTRewriteAnalyzer visitor= new ASTRewriteAnalyzer(content, lineInfo, lineDelim, result, this.eventStore, this.nodeStore, options, sourceRangeComputer);	254	ASTRewriteAnalyzer visitor= new ASTRewriteAnalyzer(content, lineInfo, lineDelim, result, this.eventStore, this.nodeStore, commentNodes, options, sourceRangeComputer);
252	rootNode.accept(visitor); // throws IllegalArgumentException	255	rootNode.accept(visitor); // throws IllegalArgumentException
253		256
254	this.eventStore.revertMovedNodes();	257	this.eventStore.revertMovedNodes();

Lines 67-77 Link Here

(-)dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java (-2 / +23 lines)
67	private final ASTRewriteFormatter formatter;	67	private final ASTRewriteFormatter formatter;
68	private final NodeInfoStore nodeInfos;	68	private final NodeInfoStore nodeInfos;
69	private final TargetSourceRangeComputer extendedSourceRangeComputer;	69	private final TargetSourceRangeComputer extendedSourceRangeComputer;
		70	private final LineCommentEndOffsets lineCommentEndOffsets;
70		71
71	/*	72	/**
72	* Constructor for ASTRewriteAnalyzer.	73	* Constructor for ASTRewriteAnalyzer.
		74	* @param content the content of the compilation unit to rewrite.
		75	* @param lineInfo line information for the content of the compilation unit to rewrite.
		76	* @param rootEdit the edit to add all generated edits to
		77	* @param eventStore the event store containing the description of changes
		78	* @param nodeInfos annotations to nodes, such as if a node is a string placeholder or a copy target
		79	* @param comments list of comments of the compilation unit to rewrite (elements of type <code>Comment</code>) or <code>null</code>.
		80	* @param options the current jdt.core options (formatting/compliance) or <code>null</code>.
		81	* @param extendedSourceRangeComputer the source range computer to use
73	*/	82	*/
74	public ASTRewriteAnalyzer(char[] content, LineInformation lineInfo, String lineDelim, TextEdit rootEdit, RewriteEventStore eventStore, NodeInfoStore nodeInfos, Map options, TargetSourceRangeComputer extendedSourceRangeComputer) {	83	public ASTRewriteAnalyzer(char[] content, LineInformation lineInfo, String lineDelim, TextEdit rootEdit, RewriteEventStore eventStore, NodeInfoStore nodeInfos, List comments, Map options, TargetSourceRangeComputer extendedSourceRangeComputer) {
75	this.eventStore= eventStore;	84	this.eventStore= eventStore;
76	this.content= content;	85	this.content= content;
77	this.lineInfo= lineInfo;	86	this.lineInfo= lineInfo;
Lines 84-89 Link Here
84	this.formatter= new ASTRewriteFormatter(nodeInfos, eventStore, options, lineDelim);	93	this.formatter= new ASTRewriteFormatter(nodeInfos, eventStore, options, lineDelim);
85		94
86	this.extendedSourceRangeComputer = extendedSourceRangeComputer;	95	this.extendedSourceRangeComputer = extendedSourceRangeComputer;
		96	this.lineCommentEndOffsets= new LineCommentEndOffsets(comments);
87	}	97	}
88		98
89	final TokenScanner getScanner() {	99	final TokenScanner getScanner() {
Lines 230-235 Link Here
230		240
231	final void doTextInsert(int offset, String insertString, TextEditGroup editGroup) {	241	final void doTextInsert(int offset, String insertString, TextEditGroup editGroup) {
232	if (insertString.length() > 0) {	242	if (insertString.length() > 0) {
		243	// bug fix for 95839: problem with inserting at the end of a line comment
		244	if (this.lineCommentEndOffsets.isEndOfLineComment(offset, this.content)) {
		245	if (!insertString.startsWith(getLineDelimiter())) {
		246	TextEdit edit= new InsertEdit(offset, getLineDelimiter()); // add a line delimiter
		247	addEdit(edit);
		248	if (editGroup != null) {
		249	addEditGroup(editGroup, edit);
		250	}
		251	}
		252	this.lineCommentEndOffsets.remove(offset); // only one line delimiter per line comment required
		253	}
233	TextEdit edit= new InsertEdit(offset, insertString);	254	TextEdit edit= new InsertEdit(offset, insertString);
234	addEdit(edit);	255	addEdit(edit);
235	if (editGroup != null) {	256	if (editGroup != null) {

Added Link Here

(-)dom/org/eclipse/jdt/internal/core/dom/rewrite/LineCommentEndOffsets.java (+84 lines)
1	/*******************************************************************************
2	* Copyright (c) 2000, 2006 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Common Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11
12	package org.eclipse.jdt.internal.core.dom.rewrite;
13
14	import java.util.Arrays;
15	import java.util.List;
16
17	import org.eclipse.jdt.core.dom.LineComment;
18	import org.eclipse.jdt.core.formatter.IndentManipulation;
19
20	public class LineCommentEndOffsets {
21
22	private int[] offsets;
23	private final List commentList;
24
25	public LineCommentEndOffsets(List commentList) {
26	this.commentList= commentList;
27	this.offsets= null; // create on demand
28	}
29
30	private int[] getOffsets() {
31	if (this.offsets == null) {
32	if (this.commentList != null) {
33	int nComments= this.commentList.size();
34	// count the number of line comments
35	int count= 0;
36	for (int i= 0; i < nComments; i++) {
37	Object curr= this.commentList.get(i);
38	if (curr instanceof LineComment) {
39	count++;
40	}
41	}
42	// fill the offset table
43	this.offsets= new int[count];
44	for (int i= 0, k= 0; i < nComments; i++) {
45	Object curr= this.commentList.get(i);
46	if (curr instanceof LineComment) {
47	LineComment comment= (LineComment) curr;
48	this.offsets[k++]= comment.getStartPosition() + comment.getLength();
49	}
50	}
51	} else {
52	this.offsets= new int[0];
53	}
54	}
55	return this.offsets;
56	}
57
58	public boolean isEndOfLineComment(int offset) {
59	return offset >= 0 && Arrays.binarySearch(getOffsets(), offset) >= 0;
60	}
61
62	public boolean isEndOfLineComment(int offset, char[] content) {
63	if (offset < 0 \|\| (offset < content.length && !IndentManipulation.isLineDelimiterChar(content[offset]))) {
64	return false;
65	}
66	return Arrays.binarySearch(getOffsets(), offset) >= 0;
67	}
68
69	public boolean remove(int offset) {
70	int[] offsetArray= getOffsets(); // returns the shared array
71	int index= Arrays.binarySearch(offsetArray, offset);
72	if (index >= 0) {
73	if (index > 0) {
74	// shift from the beginning and insert -1 (smallest number) at the beginning
75	// 1, 2, 3, x, 4, 5 -> -1, 1, 2, 3, 4, 5
76	System.arraycopy(offsetArray, 0, offsetArray, 1, index);
77	}
78	offsetArray[0]= -1;
79	return true;
80	}
81	return false;
82	}
83
84	}