### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.core Index: dom/org/eclipse/jdt/core/dom/DefaultCommentMapper.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/DefaultCommentMapper.java,v retrieving revision 1.28 diff -u -r1.28 DefaultCommentMapper.java --- dom/org/eclipse/jdt/core/dom/DefaultCommentMapper.java 17 Nov 2006 15:39:21 -0000 1.28 +++ dom/org/eclipse/jdt/core/dom/DefaultCommentMapper.java 17 Nov 2006 16:06:43 -0000 @@ -558,6 +558,11 @@ } } + // Stop visit for malformed node (see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=84049) + if ((node.typeAndFlags & ASTNode.MALFORMED) != 0) { + return false; + } + // Compute leading comments for current node try { storeLeadingComments(node, previousEnd); #P org.eclipse.jdt.core.tests.model Index: src/org/eclipse/jdt/core/tests/dom/ASTConverterJavadocTest.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTConverterJavadocTest.java,v retrieving revision 1.73 diff -u -r1.73 ASTConverterJavadocTest.java --- src/org/eclipse/jdt/core/tests/dom/ASTConverterJavadocTest.java 6 Nov 2006 14:13:58 -0000 1.73 +++ src/org/eclipse/jdt/core/tests/dom/ASTConverterJavadocTest.java 17 Nov 2006 16:06:45 -0000 @@ -114,7 +114,7 @@ // Run test cases subset COPY_DIR = false; System.err.println("WARNING: only subset of tests will be executed!!!"); - suite.addTest(new ASTConverterJavadocTest("testBug103304")); + suite.addTest(new ASTConverterJavadocTest("testBug70892_JLS3")); return suite; } @@ -911,7 +911,7 @@ } } else { if (previousFragment.getNodeType() == ASTNode.TEXT_ELEMENT) { - assumeTrue(prefix+"Wrong length at <"+previousFragment.getStartPosition()+"> for text element "+previousFragment, (source[tagStart] == '\r' && source[tagStart+1] == '\n' || source[tagStart] == '\n')); + assumeTrue(prefix+"Wrong length at <"+previousFragment.getStartPosition()+"> for text element "+previousFragment, (source[tagStart] == '\r' /* && source[tagStart+1] == '\n' */ || source[tagStart] == '\n')); while (source[tagStart] == '*' || Character.isWhitespace(source[tagStart])) { tagStart++; // purge non-stored characters } @@ -2481,7 +2481,6 @@ assertNotNull("MethodDeclaration have a javadoc comment", methodJavadoc); int javadocStart = methodJavadoc.getStartPosition(); assertEquals("Method declaration should include javadoc comment", methodDeclaration.getStartPosition(), javadocStart); - /* TODO (frederic) Enable this block when bug will be fixed... SimpleName methodName = methodDeclaration.getName(); int nameStart = methodName.getStartPosition(); assertTrue("Method simple name should not include javadoc comment", nameStart > javadocStart+methodJavadoc.getLength()); @@ -2489,7 +2488,6 @@ assertEquals("Method simple name start position should not be extended!", nameStart, extendedStart); int extendedLength = compilUnit.getExtendedLength(methodName); assertEquals("Method simple name length should not be extended!", methodName.getLength(), extendedLength); - */ } }