Attachment #54077 for bug #84049

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

Lines 558-563 Link Here

(-)dom/org/eclipse/jdt/core/dom/DefaultCommentMapper.java (+5 lines)
558	}	558	}
559	}	559	}
560		560
		561	// Stop visit for malformed node (see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=84049)
		562	if ((node.typeAndFlags & ASTNode.MALFORMED) != 0) {
		563	return false;
		564	}
		565
561	// Compute leading comments for current node	566	// Compute leading comments for current node
562	try {	567	try {
563	storeLeadingComments(node, previousEnd);	568	storeLeadingComments(node, previousEnd);




		// Run test cases subset
		COPY_DIR = false;
		System.err.println("WARNING: only subset of tests will be executed!!!");
		suite.addTest(new ASTConverterJavadocTest("testBug70892_JLS3"));
		return suite;
	}


						}
					} 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'));
							while (source[tagStart] == '*' || Character.isWhitespace(source[tagStart])) {
								tagStart++; // purge non-stored characters
							}

			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());

			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);
			*/
		}
	}


Return to bug 84049

Lines 114-120 Link Here

(-)src/org/eclipse/jdt/core/tests/dom/ASTConverterJavadocTest.java (-4 / +2 lines)
114	// Run test cases subset	114	// Run test cases subset
115	COPY_DIR = false;	115	COPY_DIR = false;
116	System.err.println("WARNING: only subset of tests will be executed!!!");	116	System.err.println("WARNING: only subset of tests will be executed!!!");
117	suite.addTest(new ASTConverterJavadocTest("testBug103304"));	117	suite.addTest(new ASTConverterJavadocTest("testBug70892_JLS3"));
118	return suite;	118	return suite;
119	}	119	}
120		120
Lines 911-917 Link Here
911	}	911	}
912	} else {	912	} else {
913	if (previousFragment.getNodeType() == ASTNode.TEXT_ELEMENT) {	913	if (previousFragment.getNodeType() == ASTNode.TEXT_ELEMENT) {
914	assumeTrue(prefix+"Wrong length at <"+previousFragment.getStartPosition()+"> for text element "+previousFragment, (source[tagStart] == '\r' && source[tagStart+1] == '\n' \|\| source[tagStart] == '\n'));	914	assumeTrue(prefix+"Wrong length at <"+previousFragment.getStartPosition()+"> for text element "+previousFragment, (source[tagStart] == '\r' /* && source[tagStart+1] == '\n' */ \|\| source[tagStart] == '\n'));
915	while (source[tagStart] == '*' \|\| Character.isWhitespace(source[tagStart])) {	915	while (source[tagStart] == '*' \|\| Character.isWhitespace(source[tagStart])) {
916	tagStart++; // purge non-stored characters	916	tagStart++; // purge non-stored characters
917	}	917	}
Lines 2481-2487 Link Here
2481	assertNotNull("MethodDeclaration have a javadoc comment", methodJavadoc);	2481	assertNotNull("MethodDeclaration have a javadoc comment", methodJavadoc);
2482	int javadocStart = methodJavadoc.getStartPosition();	2482	int javadocStart = methodJavadoc.getStartPosition();
2483	assertEquals("Method declaration should include javadoc comment", methodDeclaration.getStartPosition(), javadocStart);	2483	assertEquals("Method declaration should include javadoc comment", methodDeclaration.getStartPosition(), javadocStart);
2484	/* TODO (frederic) Enable this block when bug will be fixed...
2485	SimpleName methodName = methodDeclaration.getName();	2484	SimpleName methodName = methodDeclaration.getName();
2486	int nameStart = methodName.getStartPosition();	2485	int nameStart = methodName.getStartPosition();
2487	assertTrue("Method simple name should not include javadoc comment", nameStart > javadocStart+methodJavadoc.getLength());	2486	assertTrue("Method simple name should not include javadoc comment", nameStart > javadocStart+methodJavadoc.getLength());
Lines 2489-2495 Link Here
2489	assertEquals("Method simple name start position should not be extended!", nameStart, extendedStart);	2488	assertEquals("Method simple name start position should not be extended!", nameStart, extendedStart);
2490	int extendedLength = compilUnit.getExtendedLength(methodName);	2489	int extendedLength = compilUnit.getExtendedLength(methodName);
2491	assertEquals("Method simple name length should not be extended!", methodName.getLength(), extendedLength);	2490	assertEquals("Method simple name length should not be extended!", methodName.getLength(), extendedLength);
2492	*/
2493	}	2491	}
2494	}	2492	}
2495		2493