Attachment #162313 for bug #293558

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




				}
				case RewriteEvent.REPLACED: {
					ASTNode node= (ASTNode) event.getOriginalValue();
					boolean insertNewLine = false;
					if (endPos == -1) {
						int previousEnd = node.getStartPosition() + node.getLength();
						endPos= getExtendedEnd(node);
						if (endPos != previousEnd) {
							// check if the end is a comment
							int token = TokenScanner.END_OF_FILE;
							try {
								token = getScanner().readNext(previousEnd, false);
							} catch(CoreException e) {
								// ignore
							}
							if (token == TerminalTokens.TokenNameCOMMENT_LINE) {
								insertNewLine = true;
							}
						}
					}
					TextEditGroup editGroup= getEditGroup(event);
					int nodeLen= endPos - offset;

					doTextRemoveAndVisit(offset, nodeLen, node, editGroup);

					String prefix= strings[0];
					String insertedPrefix = prefix;
					if (insertNewLine) {
						insertedPrefix = getLineDelimiter() + this.formatter.createIndentString(indent) + insertedPrefix.trim() + ' ';
					}
					doTextInsert(offset, insertedPrefix, editGroup);
					String lineInPrefix= getCurrentLine(prefix, prefix.length());
					if (prefix.length() != lineInPrefix.length()) {
						// prefix contains a new line: update the indent to the one used in the prefix

		}
		return pos;
	}

	private int rewriteOptionalQualifier(ASTNode parent, StructuralPropertyDescriptor property, int startPos) {
		RewriteEvent event= getEvent(parent, property);
		if (event != null) {





	}

	public void testIfStatementReplaceElse5() 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("    public void foo(int i) {\n");
		buf.append("        if (i == 0) {\n");
		buf.append("            System.beep();\n");
		buf.append("        } else {\n");
		buf.append("            System.beep();\n");
		buf.append("            System.beep();\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= createAST(cu);
		AST ast= astRoot.getAST();
		ASTRewrite rewrite= ASTRewrite.create(ast);

		assertTrue("Parse errors", (astRoot.getFlags() & ASTNode.MALFORMED) == 0);
		TypeDeclaration type= findTypeDeclaration(astRoot, "E");
		MethodDeclaration methodDecl= findMethodDeclaration(type, "foo");
		Block block= methodDecl.getBody();
		List statements= block.statements();
		assertTrue("Number of statements not 1", statements.size() == 1);

		{
			// replace then statement by block , replace else with if statement (block)
			IfStatement ifStatement= (IfStatement) statements.get(0);

			Statement thenStatement= ifStatement.getThenStatement();
			Statement elseStatement= ifStatement.getElseStatement();

			Statement newElseStatement= (Statement) rewrite.createMoveTarget(thenStatement);
			Statement newThenStatement= (Statement) rewrite.createMoveTarget(elseStatement);

			rewrite.set(ifStatement, IfStatement.THEN_STATEMENT_PROPERTY, newThenStatement, null);
			rewrite.set(ifStatement, IfStatement.ELSE_STATEMENT_PROPERTY, newElseStatement, null);
		}
		String preview= evaluateRewrite(cu, rewrite);

		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class E {\n");
		buf.append("    public void foo(int i) {\n");
		buf.append("        if (i == 0) {\n");
		buf.append("            System.beep();\n");
		buf.append("            System.beep();\n");
		buf.append("        }\n");
		buf.append("        // comment\n");
		buf.append("        else {\n");
		buf.append("            System.beep();\n");
		buf.append("        }\n");
		buf.append("    }\n");
		buf.append("}\n");
		assertEqualString(preview, buf.toString());

	}

	public void testLabeledStatement() throws Exception {
		IPackageFragment pack1= this.sourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();

Return to bug 293558

Lines 764-771 Link Here

(-)dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java (-2 / +19 lines)
764	}	764	}
765	case RewriteEvent.REPLACED: {	765	case RewriteEvent.REPLACED: {
766	ASTNode node= (ASTNode) event.getOriginalValue();	766	ASTNode node= (ASTNode) event.getOriginalValue();
		767	boolean insertNewLine = false;
767	if (endPos == -1) {	768	if (endPos == -1) {
		769	int previousEnd = node.getStartPosition() + node.getLength();
768	endPos= getExtendedEnd(node);	770	endPos= getExtendedEnd(node);
		771	if (endPos != previousEnd) {
		772	// check if the end is a comment
		773	int token = TokenScanner.END_OF_FILE;
		774	try {
		775	token = getScanner().readNext(previousEnd, false);
		776	} catch(CoreException e) {
		777	// ignore
		778	}
		779	if (token == TerminalTokens.TokenNameCOMMENT_LINE) {
		780	insertNewLine = true;
		781	}
		782	}
769	}	783	}
770	TextEditGroup editGroup= getEditGroup(event);	784	TextEditGroup editGroup= getEditGroup(event);
771	int nodeLen= endPos - offset;	785	int nodeLen= endPos - offset;
Lines 775-781 Link Here
775	doTextRemoveAndVisit(offset, nodeLen, node, editGroup);	789	doTextRemoveAndVisit(offset, nodeLen, node, editGroup);
776		790
777	String prefix= strings[0];	791	String prefix= strings[0];
778	doTextInsert(offset, prefix, editGroup);	792	String insertedPrefix = prefix;
		793	if (insertNewLine) {
		794	insertedPrefix = getLineDelimiter() + this.formatter.createIndentString(indent) + insertedPrefix.trim() + ' ';
		795	}
		796	doTextInsert(offset, insertedPrefix, editGroup);
779	String lineInPrefix= getCurrentLine(prefix, prefix.length());	797	String lineInPrefix= getCurrentLine(prefix, prefix.length());
780	if (prefix.length() != lineInPrefix.length()) {	798	if (prefix.length() != lineInPrefix.length()) {
781	// prefix contains a new line: update the indent to the one used in the prefix	799	// prefix contains a new line: update the indent to the one used in the prefix
Lines 793-799 Link Here
793	}	811	}
794	return pos;	812	return pos;
795	}	813	}
796
797	private int rewriteOptionalQualifier(ASTNode parent, StructuralPropertyDescriptor property, int startPos) {	814	private int rewriteOptionalQualifier(ASTNode parent, StructuralPropertyDescriptor property, int startPos) {
798	RewriteEvent event= getEvent(parent, property);	815	RewriteEvent event= getEvent(parent, property);
799	if (event != null) {	816	if (event != null) {

Lines 3060-3065 Link Here

(-)src/org/eclipse/jdt/core/tests/rewrite/describing/ASTRewritingStatementsTest.java (+61 lines)
3060		3060
3061	}	3061	}
3062		3062
		3063	public void testIfStatementReplaceElse5() throws Exception {
		3064	IPackageFragment pack1= this.sourceFolder.createPackageFragment("test1", false, null);
		3065	StringBuffer buf= new StringBuffer();
		3066	buf.append("package test1;\n");
		3067	buf.append("public class E {\n");
		3068	buf.append(" public void foo(int i) {\n");
		3069	buf.append(" if (i == 0) {\n");
		3070	buf.append(" System.beep();\n");
		3071	buf.append(" } else {\n");
		3072	buf.append(" System.beep();\n");
		3073	buf.append(" System.beep();\n");
		3074	buf.append(" }\n");
		3075	buf.append(" // comment\n");
		3076	buf.append(" }\n");
		3077	buf.append("}\n");
		3078	ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
		3079
		3080	CompilationUnit astRoot= createAST(cu);
		3081	AST ast= astRoot.getAST();
		3082	ASTRewrite rewrite= ASTRewrite.create(ast);
		3083
		3084	assertTrue("Parse errors", (astRoot.getFlags() & ASTNode.MALFORMED) == 0);
		3085	TypeDeclaration type= findTypeDeclaration(astRoot, "E");
		3086	MethodDeclaration methodDecl= findMethodDeclaration(type, "foo");
		3087	Block block= methodDecl.getBody();
		3088	List statements= block.statements();
		3089	assertTrue("Number of statements not 1", statements.size() == 1);
		3090
		3091	{
		3092	// replace then statement by block , replace else with if statement (block)
		3093	IfStatement ifStatement= (IfStatement) statements.get(0);
		3094
		3095	Statement thenStatement= ifStatement.getThenStatement();
		3096	Statement elseStatement= ifStatement.getElseStatement();
		3097
		3098	Statement newElseStatement= (Statement) rewrite.createMoveTarget(thenStatement);
		3099	Statement newThenStatement= (Statement) rewrite.createMoveTarget(elseStatement);
		3100
		3101	rewrite.set(ifStatement, IfStatement.THEN_STATEMENT_PROPERTY, newThenStatement, null);
		3102	rewrite.set(ifStatement, IfStatement.ELSE_STATEMENT_PROPERTY, newElseStatement, null);
		3103	}
		3104	String preview= evaluateRewrite(cu, rewrite);
		3105
		3106	buf= new StringBuffer();
		3107	buf.append("package test1;\n");
		3108	buf.append("public class E {\n");
		3109	buf.append(" public void foo(int i) {\n");
		3110	buf.append(" if (i == 0) {\n");
		3111	buf.append(" System.beep();\n");
		3112	buf.append(" System.beep();\n");
		3113	buf.append(" }\n");
		3114	buf.append(" // comment\n");
		3115	buf.append(" else {\n");
		3116	buf.append(" System.beep();\n");
		3117	buf.append(" }\n");
		3118	buf.append(" }\n");
		3119	buf.append("}\n");
		3120	assertEqualString(preview, buf.toString());
		3121
		3122	}
		3123
3063	public void testLabeledStatement() throws Exception {	3124	public void testLabeledStatement() throws Exception {
3064	IPackageFragment pack1= this.sourceFolder.createPackageFragment("test1", false, null);	3125	IPackageFragment pack1= this.sourceFolder.createPackageFragment("test1", false, null);
3065	StringBuffer buf= new StringBuffer();	3126	StringBuffer buf= new StringBuffer();