Attachment 160956 Details for Bug 304656 – Proposed fix + regression test

[patch] Proposed fix + regression test

patch_304656.txt (text/plain), 14.03 KB, created by Olivier Thomann

on 2010-03-04 11:45:21 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2010-03-04 11:45:21 EST

Size: 14.03 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java,v
>retrieving revision 1.68
>diff -u -r1.68 ASTRewriteAnalyzer.java
>--- dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java	7 Jan 2010 20:18:49 -0000	1.68
>+++ dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java	4 Mar 2010 16:43:01 -0000
>@@ -1163,9 +1163,12 @@
> 			NodeMarker curr= (NodeMarker) markers.get(i);
> 
> 			int offset= curr.offset;
>-			if (offset != currPos) {
>+			if (offset >= currPos) {
> 				String insertStr= formatted.substring(currPos, offset);
> 				doTextInsert(insertOffset, insertStr, editGroup); // insert until the marker's begin
>+			} else {
>+				// already processed
>+				continue;
> 			}
> 
> 			Object data= curr.data;
>#P org.eclipse.jdt.core.tests.model
>Index: src/org/eclipse/jdt/core/tests/rewrite/modifying/ASTRewritingModifyingCopyTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/rewrite/modifying/ASTRewritingModifyingCopyTest.java,v
>retrieving revision 1.15
>diff -u -r1.15 ASTRewritingModifyingCopyTest.java
>--- src/org/eclipse/jdt/core/tests/rewrite/modifying/ASTRewritingModifyingCopyTest.java	28 Apr 2009 17:49:27 -0000	1.15
>+++ src/org/eclipse/jdt/core/tests/rewrite/modifying/ASTRewritingModifyingCopyTest.java	4 Mar 2010 16:43:01 -0000
>@@ -14,10 +14,29 @@
> 
> import junit.framework.Test;
> 
>+import org.eclipse.core.runtime.NullProgressMonitor;
> import org.eclipse.jdt.core.ICompilationUnit;
> import org.eclipse.jdt.core.IPackageFragment;
>-
>-import org.eclipse.jdt.core.dom.*;
>+import org.eclipse.jdt.core.dom.AST;
>+import org.eclipse.jdt.core.dom.ASTNode;
>+import org.eclipse.jdt.core.dom.ASTParser;
>+import org.eclipse.jdt.core.dom.Block;
>+import org.eclipse.jdt.core.dom.CatchClause;
>+import org.eclipse.jdt.core.dom.CompilationUnit;
>+import org.eclipse.jdt.core.dom.Expression;
>+import org.eclipse.jdt.core.dom.ExpressionStatement;
>+import org.eclipse.jdt.core.dom.FieldAccess;
>+import org.eclipse.jdt.core.dom.MethodDeclaration;
>+import org.eclipse.jdt.core.dom.MethodInvocation;
>+import org.eclipse.jdt.core.dom.Name;
>+import org.eclipse.jdt.core.dom.PrimitiveType;
>+import org.eclipse.jdt.core.dom.QualifiedName;
>+import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
>+import org.eclipse.jdt.core.dom.Statement;
>+import org.eclipse.jdt.core.dom.StructuralPropertyDescriptor;
>+import org.eclipse.jdt.core.dom.ThrowStatement;
>+import org.eclipse.jdt.core.dom.TryStatement;
>+import org.eclipse.jdt.core.dom.TypeDeclaration;
> import org.eclipse.jdt.core.tests.util.Util;
> 
> public class ASTRewritingModifyingCopyTest extends ASTRewritingModifyingTest {
>@@ -342,30 +361,30 @@
> 		astRoot.recordModifications();
> 
> 		TypeDeclaration type = (TypeDeclaration) astRoot.types().get(0);
>-        AST ast = type.getAST();
>+		AST ast = type.getAST();
> 
>-        MethodDeclaration m = ast.newMethodDeclaration();
>-        type.bodyDeclarations().add(m);
>+		MethodDeclaration m = ast.newMethodDeclaration();
>+		type.bodyDeclarations().add(m);
> 
>-        Block block = ast.newBlock();
>-        m.setName(ast.newSimpleName("foo"));
>-        m.setReturnType(ast.newPrimitiveType(PrimitiveType.VOID));
>-        m.setBody(block);
>-
>-        FieldAccess fa = ast.newFieldAccess();
>-        fa.setExpression(ast.newThisExpression());
>-        fa.setName(ast.newSimpleName("x"));
>-        MethodInvocation mi = ast.newMethodInvocation();
>-        mi.setExpression(fa);
>-        mi.setName(ast.newSimpleName("llall"));
>-
>-        ExpressionStatement exp = ast.newExpressionStatement(mi);
>-        block.statements().add(exp);
>-
>-        StructuralPropertyDescriptor loc = mi.getLocationInParent();
>-        //This will cause the bug
>-        ASTNode node = ASTNode.copySubtree(ast, fa);
>-        exp.setStructuralProperty(loc, node);
>+		Block block = ast.newBlock();
>+		m.setName(ast.newSimpleName("foo"));
>+		m.setReturnType(ast.newPrimitiveType(PrimitiveType.VOID));
>+		m.setBody(block);
>+
>+		FieldAccess fa = ast.newFieldAccess();
>+		fa.setExpression(ast.newThisExpression());
>+		fa.setName(ast.newSimpleName("x"));
>+		MethodInvocation mi = ast.newMethodInvocation();
>+		mi.setExpression(fa);
>+		mi.setName(ast.newSimpleName("llall"));
>+
>+		ExpressionStatement exp = ast.newExpressionStatement(mi);
>+		block.statements().add(exp);
>+
>+		StructuralPropertyDescriptor loc = mi.getLocationInParent();
>+		//This will cause the bug
>+		ASTNode node = ASTNode.copySubtree(ast, fa);
>+		exp.setStructuralProperty(loc, node);
> 
> 		String preview = evaluateRewrite(cu, astRoot);
> 
>@@ -375,58 +394,179 @@
> 		buf.append("    void foo(){this.x;} }");
> 		assertEqualString(Util.convertToIndependantLineDelimiter(preview), Util.convertToIndependantLineDelimiter(buf.toString()));
> 	}
>+	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=304656
>+	public void test0008() throws Exception {
>+		IPackageFragment pack1= this.sourceFolder.createPackageFragment("test0008", false, null);
>+		StringBuffer buf= new StringBuffer();
>+		buf.append("package test0008;\n" + 
>+				"\n" + 
>+				"public class TestClass {\n" + 
>+				"    Thread t = new Thread(new Runnable(){\n" + 
>+				"\n" + 
>+				"        @Override\n" + 
>+				"        public void run() {\n" + 
>+				"            try {\n" + 
>+				"                Thread.currentThread().sleep(1000);\n" + 
>+				"            } catch (InterruptedException e) {\n" + 
>+				"                e.printStackTrace();\n" + 
>+				"            }\n" + 
>+				"        }\n" + 
>+				"        \n" + 
>+				"    });\n" + 
>+				"\n" + 
>+				"    public void testMethod(){\n" + 
>+				"        t.start();\n" + 
>+				"    }\n" + 
>+				"\n" + 
>+				"    public static Thread staticTestMethod(Thread thread){\n" + 
>+				"        return thread;\n" + 
>+				"    }\n" + 
>+				"}");
>+		ICompilationUnit cu = pack1.createCompilationUnit("Test.java", buf.toString(), false, null);
>+
>+		ASTParser astParser = ASTParser.newParser(AST.JLS3);
>+		astParser.setSource(cu);
>+		ASTNode root = astParser.createAST(new NullProgressMonitor());
>+		AST ast = root.getAST();
>+
>+		CompilationUnit compilationUnit = (CompilationUnit) root;
>+		compilationUnit.recordModifications();
>+		List types = compilationUnit.types();
>+		for (int i = 0, max = types.size(); i < max; i++) {
>+			TypeDeclaration td = (TypeDeclaration) types.get(i);
>+			MethodDeclaration[] methods = td.getMethods();
>+			for (int j = 0, max2 = methods.length; j < max2; j++) {
>+				MethodDeclaration md = methods[j];
>+				if (md.getName().getFullyQualifiedName().equals("testMethod")) {
>+					List statements = md.getBody().statements();
>+					ExpressionStatement es = (ExpressionStatement) statements.get(0);
>+					MethodInvocation mi = (MethodInvocation) es.getExpression();
>+					Expression existingExpression = mi.getExpression();
>+					MethodInvocation threadNameInvocation = ast.newMethodInvocation();
>+					threadNameInvocation.setExpression(null);
>+					threadNameInvocation.setName(ast.newSimpleName("staticTestMethod"));
>+					existingExpression.delete();
>+					threadNameInvocation.arguments().add(existingExpression);
>+					mi.setExpression(threadNameInvocation);
>+
>+
>+					Block code = md.getBody();
>+					TryStatement tryStatement = ast.newTryStatement();
>+					List catches = tryStatement.catchClauses();
>+					// create catch clause
>+					CatchClause catchClause = ast.newCatchClause();
>+					// exception to catch
>+					SingleVariableDeclaration svd = ast.newSingleVariableDeclaration();
>+					svd.setType(ast.newSimpleType(ast.newName("Throwable")));
>+					svd.setName(ast.newSimpleName("e"));
>+					catchClause.setException(svd);
>+					// code to run on catch
>+					Block catchBody = ast.newBlock();
>+					List catchStatements = catchBody.statements();
>+					// throw statement
>+					ThrowStatement throwStatement = ast.newThrowStatement();
>+					Expression throwExpression = ast.newName("e");
>+					throwStatement.setExpression(throwExpression);
>+					catchStatements.add(throwStatement);
>+					catches.add(catchClause);
>+					// create finally statement
>+					Block finallyBlock = ast.newBlock();
>+					statements = code.statements();
>+					tryStatement.setFinally(finallyBlock);
>+					code.delete();
>+					tryStatement.setBody(code);
>+					Block tryBlock = ast.newBlock();
>+					tryBlock.statements().add(tryStatement);
>+					md.setBody(tryBlock);
>+				}
>+			}
>+
>+		}
>+		String preview = evaluateRewrite(cu, compilationUnit);
>+
>+		buf= new StringBuffer();
>+		buf.append("package test0008;\n");
>+		buf.append("\n");
>+		buf.append("public class TestClass {\n");
>+		buf.append("    Thread t = new Thread(new Runnable(){\n");
>+		buf.append("\n");
>+		buf.append("        @Override\n");
>+		buf.append("        public void run() {\n");
>+		buf.append("            try {\n");
>+		buf.append("                Thread.currentThread().sleep(1000);\n");
>+		buf.append("            } catch (InterruptedException e) {\n");
>+		buf.append("                e.printStackTrace();\n");
>+		buf.append("            }\n");
>+		buf.append("        }\n");
>+		buf.append("        \n");
>+		buf.append("    });\n");
>+		buf.append("\n");
>+		buf.append("    public void testMethod(){\n");
>+		buf.append("        try {\n");
>+		buf.append("            staticTestMethod(t).start();\n");
>+		buf.append("        } catch (Throwable e) {\n");
>+		buf.append("        } finally {\n");
>+		buf.append("        }\n");
>+		buf.append("    }\n");
>+		buf.append("\n");
>+		buf.append("    public static Thread staticTestMethod(Thread thread){\n");
>+		buf.append("        return thread;\n");
>+		buf.append("    }\n");
>+		buf.append("}");
>+		assertEqualString(Util.convertToIndependantLineDelimiter(preview), Util.convertToIndependantLineDelimiter(buf.toString()));
>+	}
> 
>-//	public void test0007() throws Exception {
>-//		IPackageFragment pack1= fSourceFolder.createPackageFragment("test0007", false, null);
>-//		StringBuffer buf= new StringBuffer();
>-//		buf.append("package test0007;\n");
>-//		buf.append("\n");
>-//		buf.append("public class X {\n");
>-//		buf.append("    /**\n");
>-//		buf.append("     * NOTHING\n");
>-//		buf.append("     */\n");
>-//		buf.append("    void foo() {\n");
>-//		buf.append("    \n");
>-//		buf.append("    }\n");
>-//		buf.append("    void bar() {\n");
>-//		buf.append("    \n");
>-//		buf.append("    }\n");
>-//		buf.append("}\n");
>-//		ICompilationUnit cu= pack1.createCompilationUnit("X.java", buf.toString(), false, null);
>-//
>-//		CompilationUnit astRoot= parseCompilationUnit(cu, false);
>-//
>-//		astRoot.recordModifications();
>-//
>-//		AST a = astRoot.getAST();
>-//
>-//		List types = astRoot.types();
>-//		TypeDeclaration typeDeclaration = (TypeDeclaration)types.get(0);
>-//		MethodDeclaration methodDeclaration1 = typeDeclaration.getMethods()[0];
>-//		MethodDeclaration methodDeclaration2 = typeDeclaration.getMethods()[1];
>-//		Javadoc javadoc1 = methodDeclaration1.getJavadoc();
>-//		Javadoc javadoc2 = (Javadoc)ASTNode.copySubtree(a, javadoc1);
>-//		methodDeclaration2.setJavadoc(javadoc2);
>-//
>-//		String preview = evaluateRewrite(cu, astRoot);
>-//
>-//		buf= new StringBuffer();
>-//		buf.append("package test0007;\n");
>-//		buf.append("\n");
>-//		buf.append("public class X {\n");
>-//		buf.append("    /**\n");
>-//		buf.append("     * NOTHING\n");
>-//		buf.append("     */\n");
>-//		buf.append("    void foo() {\n");
>-//		buf.append("    \n");
>-//		buf.append("    }\n");
>-//		buf.append("    /**\n");
>-//		buf.append("     * NOTHING\n");
>-//		buf.append("     */\n");
>-//		buf.append("    void bar() {\n");
>-//		buf.append("    \n");
>-//		buf.append("    }\n");
>-//		buf.append("}\n");
>-//		assertEqualString(Util.convertToIndependantLineDelimiter(preview), Util.convertToIndependantLineDelimiter(buf.toString()));
>-//	}
>+	//	public void test0007() throws Exception {
>+	//		IPackageFragment pack1= fSourceFolder.createPackageFragment("test0007", false, null);
>+	//		StringBuffer buf= new StringBuffer();
>+	//		buf.append("package test0007;\n");
>+	//		buf.append("\n");
>+	//		buf.append("public class X {\n");
>+	//		buf.append("    /**\n");
>+	//		buf.append("     * NOTHING\n");
>+	//		buf.append("     */\n");
>+	//		buf.append("    void foo() {\n");
>+	//		buf.append("    \n");
>+	//		buf.append("    }\n");
>+	//		buf.append("    void bar() {\n");
>+	//		buf.append("    \n");
>+	//		buf.append("    }\n");
>+	//		buf.append("}\n");
>+	//		ICompilationUnit cu= pack1.createCompilationUnit("X.java", buf.toString(), false, null);
>+	//
>+	//		CompilationUnit astRoot= parseCompilationUnit(cu, false);
>+	//
>+	//		astRoot.recordModifications();
>+	//
>+	//		AST a = astRoot.getAST();
>+	//
>+	//		List types = astRoot.types();
>+	//		TypeDeclaration typeDeclaration = (TypeDeclaration)types.get(0);
>+	//		MethodDeclaration methodDeclaration1 = typeDeclaration.getMethods()[0];
>+	//		MethodDeclaration methodDeclaration2 = typeDeclaration.getMethods()[1];
>+	//		Javadoc javadoc1 = methodDeclaration1.getJavadoc();
>+	//		Javadoc javadoc2 = (Javadoc)ASTNode.copySubtree(a, javadoc1);
>+	//		methodDeclaration2.setJavadoc(javadoc2);
>+	//
>+	//		String preview = evaluateRewrite(cu, astRoot);
>+	//
>+	//		buf= new StringBuffer();
>+	//		buf.append("package test0007;\n");
>+	//		buf.append("\n");
>+	//		buf.append("public class X {\n");
>+	//		buf.append("    /**\n");
>+	//		buf.append("     * NOTHING\n");
>+	//		buf.append("     */\n");
>+	//		buf.append("    void foo() {\n");
>+	//		buf.append("    \n");
>+	//		buf.append("    }\n");
>+	//		buf.append("    /**\n");
>+	//		buf.append("     * NOTHING\n");
>+	//		buf.append("     */\n");
>+	//		buf.append("    void bar() {\n");
>+	//		buf.append("    \n");
>+	//		buf.append("    }\n");
>+	//		buf.append("}\n");
>+	//		assertEqualString(Util.convertToIndependantLineDelimiter(preview), Util.convertToIndependantLineDelimiter(buf.toString()));
>+	//	}
> }

Actions: View | Diff

Attachments on bug 304656: 160919 | 160920 | 160956