### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.core.tests.model --- src/org/eclipse/jdt/core/tests/formatter/comment/JavaDocTestCase.java +++ src/org/eclipse/jdt/core/tests/formatter/comment/JavaDocTestCase.java @@ -822,4 +822,37 @@ String result=testFormat(input, options); assertEquals(expected, result); } + + public void test197169() { + Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings(); + + String input = "/**" + DELIMITER + + " *
" + DELIMITER + 
+				" * @Anno1 class Foo {" + DELIMITER + 
+				" * @Anno1 class Bar {}" + DELIMITER + 
+				" * }" + DELIMITER + 
+				" * @Anno2(@Anno1) class Baz {}" + DELIMITER + 
+				" * 
" + DELIMITER + + " */"; + + String expected = "/**" + DELIMITER + + " *
" + DELIMITER + 
+				// Initial @ left alone.
+				" * @Anno1" + DELIMITER + 
+				" * class Foo {" + DELIMITER + 
+				// Left alone even after whitespace.
+				" * 	@Anno1" + DELIMITER + 
+				" * 	class Bar {" + DELIMITER + 
+				" * 	}" + DELIMITER + 
+				" * }" + DELIMITER + 
+				" * " + DELIMITER + 
+				// Non-initial @ expanded.
+				" * @Anno2(@Anno1)" + DELIMITER + 
+				" * class Baz {" + DELIMITER + 
+				" * }" + DELIMITER + 
+				" * 
" + DELIMITER + + " */"; + String result=testFormat(input, options); + assertEquals(expected, result); + } }