diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/AbstractCommentParser.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/AbstractCommentParser.java index 70a929a5a89..bcba8987e98 100644 --- a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/AbstractCommentParser.java +++ b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/AbstractCommentParser.java @@ -504,7 +504,7 @@ protected boolean commentParse() { } refreshInlineTagPosition(textEndPosition); setInlineTagStarted(false); - } else if (this.lineStarted && this.textStart != -1 && this.textStart <= textEndPosition && (this.textStart < this.starPosition || this.starPosition == lastStarPosition)) { + } else if (this.lineStarted && this.textStart != -1 && this.textStart <= textEndPosition && (this.textStart < this.starPosition || this.starPosition == lastStarPosition || this.markdown)) { pushText(this.textStart, textEndPosition); } updateDocComment(); diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTConverterJavadocTest.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTConverterJavadocTest.java index ac1af78b689..4db59cac6e7 100644 --- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTConverterJavadocTest.java +++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTConverterJavadocTest.java @@ -79,7 +79,7 @@ * create one or several CUs and put them in org.eclipse.jdt.core.model.tests/workspace/Converter/src/javadoc/testXXX * folder and add the corresponding test in this class: * 
- * public void _testXXX() throws JavaModelException {
+ * public void testXXX() throws JavaModelException {
  * 	verifyComments("testXXX");
  * }
  *
@@ -1330,77 +1330,77 @@ public void test000() throws JavaModelException { /** * Check javadoc for invalid syntax */ - public void _test001() throws JavaModelException { + public void test001() throws JavaModelException { verifyComments("test001"); } /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=50781" */ - public void _test002() throws JavaModelException { + public void test002() throws JavaModelException { verifyComments("test002"); } /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=50784" */ - public void _test003() throws JavaModelException { + public void test003() throws JavaModelException { verifyComments("test003"); } /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=50785" */ - public void _test004() throws JavaModelException { + public void test004() throws JavaModelException { verifyComments("test004"); } /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=50838" */ - public void _test005() throws JavaModelException { + public void test005() throws JavaModelException { verifyComments("test005"); } /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=50877" */ - public void _test006() throws JavaModelException { + public void test006() throws JavaModelException { verifyComments("test006"); } /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=50877" */ - public void _test007() throws JavaModelException { + public void test007() throws JavaModelException { verifyComments("test007"); } /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=50877" */ - public void _test008() throws JavaModelException { + public void test008() throws JavaModelException { verifyComments("test008"); } /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=50877" */ - public void _test009() throws JavaModelException { + public void test009() throws JavaModelException { verifyComments("test009"); } /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=50880" */ - public void _test010() throws JavaModelException { + public void test010() throws JavaModelException { verifyComments("test010"); } /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=47396" */ - public void _test011() throws JavaModelException { + public void test011() throws JavaModelException { this.problems = new StringBuilder(); this.sourceUnit = getCompilationUnit("Converter" , "src", "javadoc.test011", "Test.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ASTNode result = runConversion(this.sourceUnit, true); @@ -1410,14 +1410,14 @@ public void _test011() throws JavaModelException { /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=50938" */ - public void _test012() throws JavaModelException { + public void test012() throws JavaModelException { verifyComments("test012"); } /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=51104" */ - public void _test013() throws JavaModelException { + public void test013() throws JavaModelException { verifyComments("test013"); } @@ -1425,7 +1425,7 @@ public void _test013() throws JavaModelException { * Verify that text on next line following empty tag element * is well positionned. */ - public void _test014() throws JavaModelException { + public void test014() throws JavaModelException { verifyComments("test014"); } @@ -1433,7 +1433,7 @@ public void _test014() throws JavaModelException { * Verify that we do not report failure when types are written on several lines * in Javadoc comments. */ - public void _test015() throws JavaModelException { + public void test015() throws JavaModelException { verifyComments("test015"); } @@ -1495,38 +1495,38 @@ protected void verifyMapper(String folder, int count, int[] indexes) throws Java * Verify DefaultCommentMapper heuristic to get leading and trailing comments * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=53445" */ - public void _test100() throws JavaModelException { + public void test100() throws JavaModelException { verifyMapper("test100", 16, new int[] {2,7,8,15}); } - public void _test101() throws JavaModelException { + public void test101() throws JavaModelException { verifyMapper("test101", 8, new int[] {1,3,4,7}); } - public void _test102() throws JavaModelException { + public void test102() throws JavaModelException { verifyMapper("test102", 16, new int[] {4,9,10,13}); } - public void _test103() throws JavaModelException { + public void test103() throws JavaModelException { verifyMapper("test103", 8, new int[] {2,4,5,6}); } - public void _test104() throws JavaModelException { + public void test104() throws JavaModelException { verifyMapper("test104", 16, new int[] {2,7,8,15}); } - public void _test105() throws JavaModelException { + public void test105() throws JavaModelException { verifyMapper("test105", 16, new int[] {-1,11,-1,15}); } - public void _test106() throws JavaModelException { + public void test106() throws JavaModelException { verifyMapper("test106", 8, new int[] {-1,5,-1,7}); } - public void _test107() throws JavaModelException { + public void test107() throws JavaModelException { verifyMapper("test107", 16, new int[] {2,7,8,-1}); } - public void _test108() throws JavaModelException { + public void test108() throws JavaModelException { verifyMapper("test108", 8, new int[] {1,3,4,-1}); } /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=54776" */ - public void _testBug54776() throws JavaModelException { + public void testBug54776() throws JavaModelException { this.sourceUnit = getCompilationUnit("Converter" , "src", "javadoc.testBug54776", "Test.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ASTNode result = runConversion(this.sourceUnit, false); final CompilationUnit compilUnit = (CompilationUnit) result; @@ -1559,7 +1559,7 @@ public void _testBug54776() throws JavaModelException { /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=55221" */ - public void _testBug55221a() throws JavaModelException { + public void testBug55221a() throws JavaModelException { this.sourceUnit = getCompilationUnit("Converter" , "src", "javadoc.testBug55221.a", "Test.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ASTNode result = runConversion(this.sourceUnit, false); final CompilationUnit compilUnit = (CompilationUnit) result; @@ -1596,7 +1596,7 @@ public void _testBug55221a() throws JavaModelException { // verify that second method start includes comment assumeEquals("Method declaration "+method+" does not start at the right position", commentStart, method.getStartPosition()); } - public void _testBug55221b() throws JavaModelException { + public void testBug55221b() throws JavaModelException { this.sourceUnit = getCompilationUnit("Converter" , "src", "javadoc.testBug55221.b", "Test.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ASTNode result = runConversion(this.sourceUnit, false); final CompilationUnit compilUnit = (CompilationUnit) result; @@ -1633,7 +1633,7 @@ public void _testBug55221b() throws JavaModelException { // verify that second method start includes comment assumeEquals("Method declaration "+method+" does not start at the right position", commentStart, method.getStartPosition()); } - public void _testBug55221c() throws JavaModelException { + public void testBug55221c() throws JavaModelException { this.sourceUnit = getCompilationUnit("Converter" , "src", "javadoc.testBug55221.c", "Test.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ASTNode result = runConversion(this.sourceUnit, false); final CompilationUnit compilUnit = (CompilationUnit) result; @@ -1675,7 +1675,7 @@ public void _testBug55221c() throws JavaModelException { assumeEquals("Method declaration "+method+" does not end at the right position",method.getLength(), methodLength); } /** @deprecated using deprecated code */ - public void _testBug55221d() throws JavaModelException { + public void testBug55221d() throws JavaModelException { this.sourceUnit = getCompilationUnit("Converter" , "src", "javadoc.testBug55221.d", "Test.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ASTNode result = runConversion(this.sourceUnit, false); final CompilationUnit compilUnit = (CompilationUnit) result; @@ -1702,7 +1702,7 @@ public void _testBug55221d() throws JavaModelException { int returnLength = compilUnit.getExtendedLength(returnType); assumeEquals("Return type "+returnType+" does not have the right length", returnType.getLength(), returnLength); } - public void _testBug55223a() throws JavaModelException { + public void testBug55223a() throws JavaModelException { // stopOnFailure = false; this.sourceUnit = getCompilationUnit("Converter" , "src", "javadoc.testBug55223", "TestA.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ASTNode result = runConversion(this.sourceUnit, false); @@ -1742,7 +1742,7 @@ public void _testBug55223a() throws JavaModelException { } } /** @deprecated using deprecated code */ - public void _testBug55223b() throws JavaModelException { + public void testBug55223b() throws JavaModelException { this.sourceUnit = getCompilationUnit("Converter" , "src", "javadoc.testBug55223", "TestB.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ASTNode result = runConversion(this.sourceUnit, false); final CompilationUnit compilUnit = (CompilationUnit) result; @@ -1774,14 +1774,14 @@ public void _testBug55223b() throws JavaModelException { /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=48489" */ - public void _testBug48489() throws JavaModelException { + public void testBug48489() throws JavaModelException { verifyComments("testBug48489"); } /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=50898" */ - public void _testBug50898() throws JavaModelException { + public void testBug50898() throws JavaModelException { ICompilationUnit unit = getCompilationUnit("Converter" , "src", "javadoc.testBug50898", "Test.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ this.packageBinding = false; verifyComments(unit); @@ -1790,7 +1790,7 @@ public void _testBug50898() throws JavaModelException { /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=51226" */ - public void _testBug51226() throws JavaModelException { + public void testBug51226() throws JavaModelException { ICompilationUnit[] units = getCompilationUnits("Converter" , "src", "javadoc.testBug51226"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ for (int i=0; i comment.getStartPosition()+comment.getLength()); } } - public void _testBug93880_14a() throws JavaModelException { + public void testBug93880_14a() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b93880/Test.java", @@ -2604,7 +2604,7 @@ public void _testBug93880_14a() throws JavaModelException { assertEquals("Source range of PackageDeclaration should include Javadoc child", docComment.getStartPosition(), packDecl.getStartPosition()); } } - public void _testBug93880_14b() throws JavaModelException { + public void testBug93880_14b() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b93880/package-info.java", @@ -2623,7 +2623,7 @@ public void _testBug93880_14b() throws JavaModelException { assertEquals("Source range of PackageDeclaration should include Javadoc child", docComment.getStartPosition(), packDecl.getStartPosition()); } } - public void _testBug93880_14c() throws JavaModelException { + public void testBug93880_14c() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b93880/package-info.java", @@ -2642,7 +2642,7 @@ public void _testBug93880_14c() throws JavaModelException { assertEquals("Source range of PackageDeclaration should include Javadoc child", docComment.getStartPosition(), packDecl.getStartPosition()); } } - public void _testBug93880_14d() throws JavaModelException { + public void testBug93880_14d() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b93880/package-info.java", @@ -2663,7 +2663,7 @@ public void _testBug93880_14d() throws JavaModelException { assertEquals("Source range of PackageDeclaration should include Javadoc child", docComment.getStartPosition(), packDecl.getStartPosition()); } } - public void _testBug93880_14e() throws JavaModelException { + public void testBug93880_14e() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b93880/package-info.java", @@ -2689,7 +2689,7 @@ public void _testBug93880_14e() throws JavaModelException { * Bug 94150: [javadoc][dom] Extended ranges wrong for method name without return type * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=94150" */ - public void _testBug94150() throws JavaModelException { + public void testBug94150() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b94150/Category.java", @@ -2730,7 +2730,7 @@ public void _testBug94150() throws JavaModelException { * Bug 99507: [javadoc] Infinit loop in DocCommentParser * @see "http://bugs.eclipse.org/bugs/show_bug.cgi?id=99507" */ - public void _testBug99507() throws JavaModelException { + public void testBug99507() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b99507/X.java", "package javadoc.b99507;\n" + @@ -2740,7 +2740,7 @@ public void _testBug99507() throws JavaModelException { ); verifyComments(this.workingCopies[0]); } - public void _testBug99507b() throws JavaModelException { + public void testBug99507b() throws JavaModelException { String source = "/**\n@param country*/"; ASTParser parser = ASTParser.newParser(getJLS3()); parser.setKind(ASTParser.K_COMPILATION_UNIT); @@ -2752,7 +2752,7 @@ public void _testBug99507b() throws JavaModelException { * Bug 100041: [javadoc] Infinit loop in DocCommentParser * @see "http://bugs.eclipse.org/bugs/show_bug.cgi?id=100041" */ - public void _testBug100041() throws JavaModelException { + public void testBug100041() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b100041/X.java", "package javadoc.b100041;\n" + @@ -2794,7 +2794,7 @@ public void _testBug100041() throws JavaModelException { assertTrue("Invalid start position for : VariableDeclarationStatement"+varDecl, varDecl.getStartPosition() > commentEnd); } } - public void _testBug100041b() throws JavaModelException { + public void testBug100041b() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b100041/X.java", "package javadoc.b100041;\n" + @@ -2829,7 +2829,7 @@ public void _testBug100041b() throws JavaModelException { assertTrue("Invalid start position for Block: "+returnStatement, returnStatement.getStartPosition() > commentEnd); } } - public void _testBug100041c() throws JavaModelException { + public void testBug100041c() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b100041/Z.java", "package javadoc.b100041;\n" + @@ -2913,7 +2913,7 @@ public void _testBug100041c() throws JavaModelException { * bug103304: [Javadoc] Wrong reference proposal for inner classes. * @see "http://bugs.eclipse.org/bugs/show_bug.cgi?id=103304" */ - public void _testBug103304() throws JavaModelException { + public void testBug103304() throws JavaModelException { this.packageBinding = false; // do NOT verify that qualification only can be package name this.workingCopies = new ICompilationUnit[1]; this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b103304/Test.java", @@ -2959,7 +2959,7 @@ public void _testBug103304() throws JavaModelException { * Bug 106581: [javadoc] null type binding for parameter in javadoc * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=106581" */ - public void _testBug106581() throws JavaModelException { + public void testBug106581() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b106581/A.java", @@ -2994,7 +2994,7 @@ public void _testBug106581() throws JavaModelException { * Bug 108622: [javadoc][dom] ASTNode not including javadoc * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=108622" */ - public void _testBug108622() throws JavaModelException { + public void testBug108622() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b108622/Test.java", @@ -3043,7 +3043,7 @@ public void _testBug108622() throws JavaModelException { * Bug 113108: [API][comments] CompilationUnit.getNodeComments(ASTNode) * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=113108" */ - public void _testBug113108a() throws JavaModelException { + public void testBug113108a() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b113108/Test.java", @@ -3080,7 +3080,7 @@ public void _testBug113108a() throws JavaModelException { assertEquals("Invalid last trailing comment for "+methodDeclaration, 7, index); } } - public void _testBug113108b() throws JavaModelException { + public void testBug113108b() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b113108/Test.java", @@ -3117,7 +3117,7 @@ public void _testBug113108b() throws JavaModelException { assertEquals("Invalid last trailing comment for "+methodDeclaration, 7, index); } } - public void _testBug113108c() throws JavaModelException { + public void testBug113108c() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b113108/Test.java", @@ -3159,7 +3159,7 @@ public void _testBug113108c() throws JavaModelException { * bug125676: [javadoc] @category should not read beyond end of line * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=125676" */ - public void _testBug125676() throws JavaModelException { + public void testBug125676() throws JavaModelException { this.workingCopies = new ICompilationUnit[3]; this.astLevel = getJLS3(); this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b125676/A.java", @@ -3222,7 +3222,7 @@ public void _testBug125676() throws JavaModelException { * bug125903: [javadoc] Treat whitespace in javadoc tags as invalid tags * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=125903" */ - public void _testBug125903() throws JavaModelException { + public void testBug125903() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b125903/Test.java", @@ -3257,7 +3257,7 @@ public void _testBug125903() throws JavaModelException { * bug130752: [comments] first BlockComment parsed as LineComment * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=130752" */ - public void _testBug130752() throws JavaModelException { + public void testBug130752() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b130752/Test.java", "/* Ceci n'est pas\n" + @@ -3276,7 +3276,7 @@ public void _testBug130752() throws JavaModelException { assertEquals("Comment should be javadoc", comment.getNodeType(), ASTNode.BLOCK_COMMENT); } } - public void _testBug130752b() throws JavaModelException { + public void testBug130752b() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b130752/Test.java", "// Line comment\n" + @@ -3294,7 +3294,7 @@ public void _testBug130752b() throws JavaModelException { assertEquals("Comment should be javadoc", comment.getNodeType(), ASTNode.LINE_COMMENT); } } - public void _testBug130752c() throws JavaModelException { + public void testBug130752c() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b130752/Test.java", "/** Javadoc comment */\n" + @@ -3318,7 +3318,7 @@ public void _testBug130752c() throws JavaModelException { * test Ensure that extended ranges are correct for enum constants and last comments of enum declaration * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=165525" */ - public void _testBug165525() throws JavaModelException { + public void testBug165525() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b165525/Test.java", "package javadoc.b165525;\n" + @@ -3374,21 +3374,21 @@ public void _testBug165525() throws JavaModelException { * bug228648: AST: no binding for Javadoc reference to inner class * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=228648" */ - public void _testBug228648() throws JavaModelException { + public void testBug228648() throws JavaModelException { ICompilationUnit unit = getCompilationUnit("Converter" , "src", "javadoc.testBug228648", "A.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ verifyComments(unit); } // https://bugs.eclipse.org/bugs/show_bug.cgi?id=196714 - public void _test109() throws JavaModelException { + public void test109() throws JavaModelException { verifyComments("test109"); } // https://bugs.eclipse.org/bugs/show_bug.cgi?id=336821 - public void _testBug336821() throws JavaModelException { + public void testBug336821() throws JavaModelException { ICompilationUnit unit = getCompilationUnit("Converter" , "src", "javadoc.testBug336821", "Try.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ verifyComments(unit); } - public void _testBug347100() throws Exception { + public void testBug347100() throws Exception { ICompilationUnit unit = getCompilationUnit("Converter" , "src", "javadoc.testBug347100", "X.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ CompilationUnit compilUnit = verifyComments(unit); if (this.docCommentSupport.equals(JavaCore.ENABLED)) { @@ -3419,7 +3419,7 @@ public void _testBug347100() throws Exception { /** * https://bugs.eclipse.org/481143 - [parser] Parser missing some line comments */ - public void _testBug481143a() throws JavaModelException { + public void testBug481143a() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/a/X.java", "package a;\n" + @@ -3435,7 +3435,7 @@ public void _testBug481143a() throws JavaModelException { /** * https://bugs.eclipse.org/481143 - [parser] Parser missing some line comments */ - public void _testBug481143b() throws JavaModelException { + public void testBug481143b() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/a/X.java", "package a;\n" + @@ -3449,7 +3449,7 @@ public void _testBug481143b() throws JavaModelException { /** * https://bugs.eclipse.org/481143 - [parser] Parser missing some line comments */ - public void _testBug481143c() throws JavaModelException { + public void testBug481143c() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/a/X.java", "package a;\n" + @@ -3466,7 +3466,7 @@ public void _testBug481143c() throws JavaModelException { * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=206345" * @deprecated */ - public void _testBug206345a() throws JavaModelException { + public void testBug206345a() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = AST.JLS3; this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b206345/X.java", @@ -3513,7 +3513,7 @@ public void _testBug206345a() throws JavaModelException { * * @deprecated */ - public void _testBug206345b() throws JavaModelException { + public void testBug206345b() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = AST.JLS3; this.workingCopies[0] = getWorkingCopy("/Converter15/src/javadoc/b206345/X.java", diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTConverterMarkdownTest.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTConverterMarkdownTest.java index 18dbe66a8dc..4f8257741ac 100644 --- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTConverterMarkdownTest.java +++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTConverterMarkdownTest.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; -import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; @@ -38,8 +37,6 @@ import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jdt.core.dom.EnumConstantDeclaration; import org.eclipse.jdt.core.dom.EnumDeclaration; -import org.eclipse.jdt.core.dom.Expression; -import org.eclipse.jdt.core.dom.ExpressionStatement; import org.eclipse.jdt.core.dom.FieldDeclaration; import org.eclipse.jdt.core.dom.IBinding; import org.eclipse.jdt.core.dom.IPackageBinding; @@ -48,12 +45,10 @@ import org.eclipse.jdt.core.dom.Javadoc; import org.eclipse.jdt.core.dom.MemberRef; import org.eclipse.jdt.core.dom.MethodDeclaration; -import org.eclipse.jdt.core.dom.MethodInvocation; import org.eclipse.jdt.core.dom.MethodRef; import org.eclipse.jdt.core.dom.MethodRefParameter; import org.eclipse.jdt.core.dom.Name; import org.eclipse.jdt.core.dom.PackageDeclaration; -import org.eclipse.jdt.core.dom.PrimitiveType; import org.eclipse.jdt.core.dom.QualifiedName; import org.eclipse.jdt.core.dom.ReturnStatement; import org.eclipse.jdt.core.dom.SimpleName; @@ -64,7 +59,6 @@ import org.eclipse.jdt.core.dom.Type; import org.eclipse.jdt.core.dom.TypeDeclaration; import org.eclipse.jdt.core.dom.TypeDeclarationStatement; -import org.eclipse.jdt.core.dom.VariableDeclarationFragment; import org.eclipse.jdt.core.dom.VariableDeclarationStatement; import org.eclipse.jdt.internal.compiler.parser.ScannerHelper; @@ -75,10 +69,10 @@ * Class to test DOM/AST nodes built for markdown comments. * * Most of tests are 'automatic'. It means that to add a new tests, you only need to - * create one or several CUs and put them in org.eclipse.jdt.core.model.tests/workspace/Converter/src/javadoc/testXXX + * create one or several CUs and put them in org.eclipse.jdt.core.model.tests/workspace/Converter/src/markdown/testXXX * folder and add the corresponding test in this class: * 
- * public void _testXXX() throws JavaModelException {
+ * public void testXXX() throws JavaModelException {
  * 	verifyComments("testXXX");
  * }
  *
@@ -230,6 +224,7 @@ protected void copyDirectory(File sourceDir, File targetDir) throws IOException protected void setUp() throws Exception { super.setUp(); TEST_COUNTERS[0]++; + setCompliancesLevel(); this.failures = new ArrayList(); this.problems = new StringBuilder(); this.workingCopies = null; @@ -285,7 +280,10 @@ public void tearDownSuite() throws Exception { System.out.println(" - "+intFormat.format(TEST_COUNTERS[3])+" tests failed."); } } - + @Override + public ASTNode runConversion(ICompilationUnit unit, boolean resolveBindings) { + return runConversion(AST.JLS23, unit, resolveBindings); + } @Override public ASTNode runConversion(char[] source, String unitName, IJavaProject project) { ASTParser parser = ASTParser.newParser(this.astLevel); @@ -332,7 +330,7 @@ private char getNextChar(char[] source, int idx) { return ch; } /* - * Convert Javadoc source to match Javadoc.toString(). + * Convert Javadoc source to match markdown.toString(). * Store converted comments and their corresponding tags respectively * in comments and allTags fields */ @@ -527,7 +525,7 @@ protected void setSourceComment(char[] source) throws ArrayIndexOutOfBoundsExcep } /* - * Convert Javadoc source to match Javadoc.toString(). + * Convert Javadoc source to match markdown.toString(). * Store converted comments and their corresponding tags respectively * in comments and allTags fields */ @@ -571,7 +569,7 @@ char[] getUnicodeSource(char[] source) { } /* - * Convert Javadoc source to match Javadoc.toString(). + * Convert Javadoc source to match markdown.toString(). * Store converted comments and their corresponding tags respectively * in comments and allTags fields */ @@ -737,17 +735,17 @@ private void verifyPositions(TagElement tagElement, char[] source) { String tagName = tagElement.getTagName(); int tagStart = tagElement.getStartPosition(); if (tagElement.isNested()) { - assumeEquals(this.prefix+"Wrong start position <"+tagStart+"> for "+tagElement, '[', source[tagStart]); - } - if (tagName != null) { - if (tagName.equals("@link")) { - assumeEquals(this.prefix+"Wrong start position <"+tagStart+"> for "+tagElement, ']', source[tagStart+tagElement.getLength()-2]); + if (tagName.equals("@link") && source[tagStart] == '[') { + assumeEquals(this.prefix+"Wrong start position <"+tagStart+"> for "+tagElement, '[', source[tagStart++]); } else { - text= new String(source, tagStart, tagName.length()); - assumeEquals(this.prefix+"Misplaced tag name at <"+tagStart+">: ", tagName, text); - tagStart += tagName.length(); + assumeEquals(this.prefix+"Wrong start position <"+tagStart+"> for "+tagElement, '{', source[tagStart++]); } } + if (tagName != null) { + text= new String(source, tagStart, tagName.length()); + assumeEquals(this.prefix+"Misplaced tag name at <"+tagStart+">: ", tagName, text); + tagStart += tagName.length(); + } // Verify each fragment ASTNode previousFragment = null; Iterator elements = tagElement.fragments().listIterator(); @@ -977,8 +975,10 @@ private void verifyPositions(TagElement tagElement, char[] source) { } } private int getLinkTagStartPosition(String tagName, char[] source, int tagStart) { - while (source[tagStart] == '[' || source[tagStart] == ']') { - tagStart++; // purge non-stored characters + if (tagName != null && tagName.equals("@link")) { + while (source[tagStart] == '[' || source[tagStart] == ']') { + tagStart++; // purge non-stored characters + } } return tagStart; } @@ -1228,6 +1228,14 @@ protected CompilationUnit verifyComments(String fileName, char[] source) { return verifyComments(fileName, source, null); } + private void setCompliancesLevel() { + if (this.currentProject != null) { + this.currentProject.setOption(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_23); + this.currentProject.setOption(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_23); + this.currentProject.setOption(JavaCore.COMPILER_PB_ENABLE_PREVIEW_FEATURES, JavaCore.ENABLED); + } + this.astLevel = AST.JLS23; + } protected CompilationUnit verifyComments(String fileName, char[] source, Map options) { // Verify comments either in unicode or not @@ -1246,15 +1254,7 @@ else if (this.unix) { // Create DOM AST nodes hierarchy List unitComments = null; - String sourceLevel = null; - String complianceLevel = null; - if (this.currentProject != null) { - complianceLevel = this.currentProject.getOption(JavaCore.COMPILER_COMPLIANCE, true); - sourceLevel = this.currentProject.getOption(JavaCore.COMPILER_SOURCE, true); - this.currentProject.setOption(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_23); - this.currentProject.setOption(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_23); - this.currentProject.setOption(JavaCore.COMPILER_PB_ENABLE_PREVIEW_FEATURES, JavaCore.ENABLED); - } + setCompliancesLevel(); CompilationUnit compilUnit = (CompilationUnit) runConversion(testedSource, fileName, this.currentProject, options); if (this.compilerOption.equals(JavaCore.ERROR)) { assumeEquals(this.prefix+"Unexpected problems", 0, compilUnit.getProblems().length); //$NON-NLS-1$ @@ -1310,10 +1310,6 @@ else if (this.unix) { } */ - if (sourceLevel != null) { - this.currentProject.setOption(JavaCore.COMPILER_COMPLIANCE, complianceLevel); - this.currentProject.setOption(JavaCore.COMPILER_SOURCE, sourceLevel); - } // Return compilation unit for possible further verifications return compilUnit; } @@ -1341,7 +1337,7 @@ public void test000a() throws JavaModelException { /** * Check javadoc for invalid syntax */ - public void _test001() throws JavaModelException { + public void test001() throws JavaModelException { verifyComments("test001"); } @@ -1376,44 +1372,45 @@ public void test005() throws JavaModelException { /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=50877" */ - public void _test006() throws JavaModelException { + public void test006() throws JavaModelException { verifyComments("test006"); } /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=50877" */ - public void _test007() throws JavaModelException { + public void test007() throws JavaModelException { verifyComments("test007"); } /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=50877" */ - public void _test008() throws JavaModelException { + public void test008() throws JavaModelException { verifyComments("test008"); } /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=50877" */ - public void _test009() throws JavaModelException { + public void test009() throws JavaModelException { verifyComments("test009"); } /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=50880" */ - public void _test010() throws JavaModelException { + public void test010() throws JavaModelException { verifyComments("test010"); } /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=47396" */ - public void _test011() throws JavaModelException { + public void test011() throws JavaModelException { this.problems = new StringBuilder(); - this.sourceUnit = getCompilationUnit("Converter_23" , "src", "javadoc.test011", "Test.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + this.sourceUnit = getCompilationUnit("Converter_23" , "src", "markdown.test011", "Test.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + setCompliancesLevel(); ASTNode result = runConversion(this.sourceUnit, true); assumeNotNull("No compilation unit", result); } @@ -1421,14 +1418,14 @@ public void _test011() throws JavaModelException { /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=50938" */ - public void _test012() throws JavaModelException { + public void test012() throws JavaModelException { verifyComments("test012"); } /** * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=51104" */ - public void _test013() throws JavaModelException { + public void test013() throws JavaModelException { verifyComments("test013"); } @@ -1436,7 +1433,7 @@ public void _test013() throws JavaModelException { * Verify that text on next line following empty tag element * is well positionned. */ - public void _test014() throws JavaModelException { + public void test014() throws JavaModelException { verifyComments("test014"); } @@ -1444,7 +1441,7 @@ public void _test014() throws JavaModelException { * Verify that we do not report failure when types are written on several lines * in Javadoc comments. */ - public void _test015() throws JavaModelException { + public void test015() throws JavaModelException { verifyComments("test015"); } @@ -1452,7 +1449,7 @@ public void _test015() throws JavaModelException { * Verify DefaultCommentMapper heuristic to get leading and trailing comments */ protected void verifyMapper(String folder, int count, int[] indexes) throws JavaModelException { - ICompilationUnit[] units = getCompilationUnits("Converter_23" , "src", "javadoc."+folder); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ICompilationUnit[] units = getCompilationUnits("Converter_23" , "src", "markdown."+folder); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ for (int i=0; i Class type parameter\n" + " * @see Object\n" + @@ -2224,11 +1912,11 @@ public void _testBug79809() throws JavaModelException { "}\n"); verifyWorkingCopiesComments(); } - public void _testBug79809b() throws JavaModelException { + public void testBug79809b() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); - this.workingCopies[0] = getWorkingCopy("/Converter/src/javadoc/b79809/Test.java", - "package javadoc.b79809;\n" + + this.workingCopies[0] = getWorkingCopy("/Converter/src/markdown/b79809/Test.java", + "package markdown.b79809;\n" + "\n" + "/**\n" + " * New tags for 5.0\n" + @@ -2246,11 +1934,11 @@ public void _testBug79809b() throws JavaModelException { * Bug 79904: [1.5][dom][javadoc] TagElement range not complete for type parameter tags * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=79904" */ - public void _testBug79904() throws JavaModelException { + public void testBug79904() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); - this.workingCopies[0] = getWorkingCopy("/Converter/src/javadoc/b79904/Test.java", - "package javadoc.b79904;\n" + + this.workingCopies[0] = getWorkingCopy("/Converter/src/markdown/b79904/Test.java", + "package markdown.b79904;\n" + "/**\n" + " * @param \n" + " * @see Object\n" + @@ -2269,11 +1957,11 @@ public void _testBug79904() throws JavaModelException { * Bug 80221: [1.5][dom][javadoc] Need better support for type parameter Javadoc tags * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=80221" */ - public void _testBug80221() throws JavaModelException { + public void testBug80221() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); - this.workingCopies[0] = getWorkingCopy("/Converter/src/javadoc/b80221/Test.java", - "package javadoc.b80221;\n" + + this.workingCopies[0] = getWorkingCopy("/Converter/src/markdown/b80221/Test.java", + "package markdown.b80221;\n" + "public class Test {\n" + " /**\n" + " * @see Object Unknown: ref is not resolved due to compile error...\n" + @@ -2290,11 +1978,11 @@ public void _testBug80221() throws JavaModelException { * Bug 80257: [1.5][javadoc][dom] Type references in javadocs should have generic binding, not raw * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=80257" */ - public void _testBug80257() throws JavaModelException { + public void testBug80257() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); - this.workingCopies[0] = getWorkingCopy("/Converter_23/src/javadoc/b80257/Test.java", - "package javadoc.b80257;\n" + + this.workingCopies[0] = getWorkingCopy("/Converter_23/src/markdown/b80257/Test.java", + "package markdown.b80257;\n" + "import java.util.*;\n" + "public class Test {\n" + " /**\n" + @@ -2344,34 +2032,15 @@ public void _testBug80257() throws JavaModelException { } } - /** - * Bug 83804: [1.5][javadoc] Missing Javadoc node for package declaration - * @see "http://bugs.eclipse.org/bugs/show_bug.cgi?id=83804" - */ - public void _testBug83804() throws CoreException, JavaModelException { - this.astLevel = getJLS3(); - this.workingCopies = new ICompilationUnit[2]; - this.workingCopies[0] = getCompilationUnit("Converter_23", "src", "javadoc.b83804", "package-info.java"); - this.workingCopies[1] = getCompilationUnit("Converter_23", "src", "javadoc.b83804", "Test.java"); - verifyWorkingCopiesComments(); - } - public void _testBug83804a() throws CoreException, JavaModelException { - this.astLevel = getJLS3(); - this.workingCopies = new ICompilationUnit[2]; - this.workingCopies[0] = getCompilationUnit("Converter_23", "src", "javadoc.b83804a", "package-info.java"); - this.workingCopies[1] = getCompilationUnit("Converter_23", "src", "javadoc.b83804a", "Test.java"); - verifyWorkingCopiesComments(); - } - /** * Bug 84049: [javadoc][dom] Extended ranges wrong for method name without return type * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=84049" */ - public void _testBug84049() throws JavaModelException { + public void testBug84049() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); - this.workingCopies[0] = getWorkingCopy("/Converter_23/src/javadoc/b84049/Test.java", - "package javadoc.b84049;\n" + + this.workingCopies[0] = getWorkingCopy("/Converter_23/src/markdown/b84049/Test.java", + "package markdown.b84049;\n" + "public class Test {\n" + " /**\n" + " * @see Object\n" + @@ -2403,11 +2072,11 @@ public void _testBug84049() throws JavaModelException { * Bug 87845: [1.5][javadoc][dom] Type references in javadocs should have generic binding, not raw * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=87845" */ - public void _testBug87845() throws JavaModelException { + public void testBug87845() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); - this.workingCopies[0] = getWorkingCopy("/Converter_23/src/javadoc/b87845/Test.java", - "package javadoc.b87845;\n" + + this.workingCopies[0] = getWorkingCopy("/Converter_23/src/markdown/b87845/Test.java", + "package markdown.b87845;\n" + "public class Test {\n" + " public void foo(int a, int b) {} \n" + " public void foo(int a, int... args) {}\n" + @@ -2478,14 +2147,14 @@ public void _testBug87845() throws JavaModelException { * Bug 93880: [1.5][javadoc] Source range of PackageDeclaration does not include Javadoc child * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=93880" */ - public void _testBug93880_15a() throws JavaModelException { + public void testBug93880_15a() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); - this.workingCopies[0] = getWorkingCopy("/Converter_23/src/javadoc/b93880/Test.java", + this.workingCopies[0] = getWorkingCopy("/Converter_23/src/markdown/b93880/Test.java", "/**\n" + " * Javadoc\n" + " */\n" + - "package javadoc.b93880;\n" + + "package markdown.b93880;\n" + "public class Test {\n" + "}\n" ); @@ -2502,14 +2171,14 @@ public void _testBug93880_15a() throws JavaModelException { assertEquals("Source range of PackageDeclaration should include Javadoc child", docComment.getStartPosition(), packDecl.getStartPosition()); } } - public void _testBug93880_15b() throws JavaModelException { + public void testBug93880_15b() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); - this.workingCopies[0] = getWorkingCopy("/Converter_23/src/javadoc/b93880/package-info.java", + this.workingCopies[0] = getWorkingCopy("/Converter_23/src/markdown/b93880/package-info.java", "/**\n" + " * Javadoc for all package\n" + " */\n" + - "package javadoc.b93880;" + "package markdown.b93880;" ); CompilationUnit compilUnit = verifyComments(this.workingCopies[0]); if (this.docCommentSupport.equals(JavaCore.ENABLED)) { @@ -2524,14 +2193,14 @@ public void _testBug93880_15b() throws JavaModelException { assertEquals("Source range of PackageDeclaration should include Javadoc child", docComment.getStartPosition(), packDecl.getStartPosition()); } } - public void _testBug93880_15c() throws JavaModelException { + public void testBug93880_15c() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); - this.workingCopies[0] = getWorkingCopy("/Converter_23/src/javadoc/b93880/package-info.java", + this.workingCopies[0] = getWorkingCopy("/Converter_23/src/markdown/b93880/package-info.java", "/**\n" + " * Javadoc for all package\n" + " */\n" + - "private package javadoc.b93880;" + "private package markdown.b93880;" ); CompilationUnit compilUnit = verifyComments(this.workingCopies[0]); if (this.docCommentSupport.equals(JavaCore.ENABLED)) { @@ -2546,15 +2215,15 @@ public void _testBug93880_15c() throws JavaModelException { assertEquals("Source range of PackageDeclaration should include Javadoc child", docComment.getStartPosition(), packDecl.getStartPosition()); } } - public void _testBug93880_15d() throws JavaModelException { + public void testBug93880_15d() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); - this.workingCopies[0] = getWorkingCopy("/Converter_23/src/javadoc/b93880/package-info.java", + this.workingCopies[0] = getWorkingCopy("/Converter_23/src/markdown/b93880/package-info.java", "/**\n" + " * Javadoc for all package\n" + " */\n" + "@Deprecated\n" + - "package javadoc.b93880;" + "package markdown.b93880;" ); CompilationUnit compilUnit = verifyComments(this.workingCopies[0]); if (this.docCommentSupport.equals(JavaCore.ENABLED)) { @@ -2570,14 +2239,14 @@ public void _testBug93880_15d() throws JavaModelException { assertEquals("Source range of PackageDeclaration should include Javadoc child", docComment.getStartPosition(), packDecl.getStartPosition()); } } - public void _testBug93880_15e() throws JavaModelException { + public void testBug93880_15e() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); - this.workingCopies[0] = getWorkingCopy("/Converter_23/src/javadoc/b93880/package-info.java", + this.workingCopies[0] = getWorkingCopy("/Converter_23/src/markdown/b93880/package-info.java", "/* (non-javadoc)\n" + " * No comment\n" + " */\n" + - "package javadoc.b93880;" + "package markdown.b93880;" ); CompilationUnit compilUnit = verifyComments(this.workingCopies[0]); if (this.docCommentSupport.equals(JavaCore.ENABLED)) { @@ -2594,14 +2263,14 @@ public void _testBug93880_15e() throws JavaModelException { assertTrue("Source range of PackageDeclaration should NOT include Javadoc child", packDecl.getStartPosition() > comment.getStartPosition()+comment.getLength()); } } - public void _testBug93880_14a() throws JavaModelException { + public void testBug93880_14a() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); - this.workingCopies[0] = getWorkingCopy("/Converter_23/src/javadoc/b93880/Test.java", + this.workingCopies[0] = getWorkingCopy("/Converter_23/src/markdown/b93880/Test.java", "/**\n" + " * Javadoc\n" + " */\n" + - "package javadoc.b93880;\n" + + "package markdown.b93880;\n" + "public class Test {\n" + "}\n" ); @@ -2615,14 +2284,14 @@ public void _testBug93880_14a() throws JavaModelException { assertEquals("Source range of PackageDeclaration should include Javadoc child", docComment.getStartPosition(), packDecl.getStartPosition()); } } - public void _testBug93880_14b() throws JavaModelException { + public void testBug93880_14b() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); - this.workingCopies[0] = getWorkingCopy("/Converter_23/src/javadoc/b93880/package-info.java", + this.workingCopies[0] = getWorkingCopy("/Converter_23/src/markdown/b93880/package-info.java", "/**\n" + " * Javadoc for all package\n" + " */\n" + - "package javadoc.b93880;" + "package markdown.b93880;" ); CompilationUnit compilUnit = verifyComments(this.workingCopies[0]); if (this.docCommentSupport.equals(JavaCore.ENABLED)) { @@ -2634,14 +2303,14 @@ public void _testBug93880_14b() throws JavaModelException { assertEquals("Source range of PackageDeclaration should include Javadoc child", docComment.getStartPosition(), packDecl.getStartPosition()); } } - public void _testBug93880_14c() throws JavaModelException { + public void testBug93880_14c() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); - this.workingCopies[0] = getWorkingCopy("/Converter_23/src/javadoc/b93880/package-info.java", + this.workingCopies[0] = getWorkingCopy("/Converter_23/src/markdown/b93880/package-info.java", "/**\n" + " * Javadoc for all package\n" + " */\n" + - "private package javadoc.b93880;" + "private package markdown.b93880;" ); CompilationUnit compilUnit = verifyComments(this.workingCopies[0]); if (this.docCommentSupport.equals(JavaCore.ENABLED)) { @@ -2653,15 +2322,15 @@ public void _testBug93880_14c() throws JavaModelException { assertEquals("Source range of PackageDeclaration should include Javadoc child", docComment.getStartPosition(), packDecl.getStartPosition()); } } - public void _testBug93880_14d() throws JavaModelException { + public void testBug93880_14d() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); - this.workingCopies[0] = getWorkingCopy("/Converter_23/src/javadoc/b93880/package-info.java", + this.workingCopies[0] = getWorkingCopy("/Converter_23/src/markdown/b93880/package-info.java", "/**\n" + " * Javadoc for all package\n" + " */\n" + "@Deprecated\n" + - "package javadoc.b93880;" + "package markdown.b93880;" ); CompilationUnit compilUnit = verifyComments(this.workingCopies[0]); if (this.docCommentSupport.equals(JavaCore.ENABLED)) { @@ -2674,14 +2343,14 @@ public void _testBug93880_14d() throws JavaModelException { assertEquals("Source range of PackageDeclaration should include Javadoc child", docComment.getStartPosition(), packDecl.getStartPosition()); } } - public void _testBug93880_14e() throws JavaModelException { + public void testBug93880_14e() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); - this.workingCopies[0] = getWorkingCopy("/Converter_23/src/javadoc/b93880/package-info.java", + this.workingCopies[0] = getWorkingCopy("/Converter_23/src/markdown/b93880/package-info.java", "/* (non-javadoc)\n" + " * No comment\n" + " */\n" + - "package javadoc.b93880;" + "package markdown.b93880;" ); CompilationUnit compilUnit = verifyComments(this.workingCopies[0]); if (this.docCommentSupport.equals(JavaCore.ENABLED)) { @@ -2700,21 +2369,21 @@ public void _testBug93880_14e() throws JavaModelException { * Bug 94150: [javadoc][dom] Extended ranges wrong for method name without return type * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=94150" */ - public void _testBug94150() throws JavaModelException { + public void testBug94150() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; this.astLevel = getJLS3(); - this.workingCopies[0] = getWorkingCopy("/Converter_23/src/javadoc/b94150/Category.java", - "package javadoc.b94150;\n" + + this.workingCopies[0] = getWorkingCopy("/Converter_23/src/markdown/b94150/Category.java", + "package markdown.b94150;\n" + "public enum Category {\n" + - " /**\n" + - " * history style\n" + - " * @see Object\n" + - " */ \n" + + " ///\n" + + " /// history style\n" + + " /// @see Object\n" + + " /// \n" + " HISTORY,\n" + "\n" + - " /**\n" + - " * war style\n" + - " */ \n" + + " ///\n" + + " /// war style\n" + + " /// \n" + " WAR;\n" + "}\n" ); @@ -2741,17 +2410,17 @@ public void _testBug94150() throws JavaModelException { * Bug 99507: [javadoc] Infinit loop in DocCommentParser * @see "http://bugs.eclipse.org/bugs/show_bug.cgi?id=99507" */ - public void _testBug99507() throws JavaModelException { + public void testBug99507() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; - this.workingCopies[0] = getWorkingCopy("/Converter_23/src/javadoc/b99507/X.java", - "package javadoc.b99507;\n" + + this.workingCopies[0] = getWorkingCopy("/Converter_23/src/markdown/b99507/X.java", + "package markdown.b99507;\n" + "public class X {\n" + "}\n" + "/** @param test*/" ); verifyComments(this.workingCopies[0]); } - public void _testBug99507b() throws JavaModelException { + public void testBug99507b() throws JavaModelException { String source = "/**\n@param country*/"; ASTParser parser = ASTParser.newParser(getJLS3()); parser.setKind(ASTParser.K_COMPILATION_UNIT); @@ -2763,10 +2432,10 @@ public void _testBug99507b() throws JavaModelException { * Bug 100041: [javadoc] Infinit loop in DocCommentParser * @see "http://bugs.eclipse.org/bugs/show_bug.cgi?id=100041" */ - public void _testBug100041() throws JavaModelException { + public void testBug100041() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; - this.workingCopies[0] = getWorkingCopy("/Converter_23/src/javadoc/b100041/X.java", - "package javadoc.b100041;\n" + + this.workingCopies[0] = getWorkingCopy("/Converter_23/src/markdown/b100041/X.java", + "package markdown.b100041;\n" + "class X {\n" + " static Object object;\n" + " static void foo() {\n" + @@ -2805,10 +2474,10 @@ public void _testBug100041() throws JavaModelException { assertTrue("Invalid start position for : VariableDeclarationStatement"+varDecl, varDecl.getStartPosition() > commentEnd); } } - public void _testBug100041b() throws JavaModelException { + public void testBug100041b() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; - this.workingCopies[0] = getWorkingCopy("/Converter_23/src/javadoc/b100041/X.java", - "package javadoc.b100041;\n" + + this.workingCopies[0] = getWorkingCopy("/Converter_23/src/markdown/b100041/X.java", + "package markdown.b100041;\n" + "class X {\n" + " static Object object;\n" + " static void foo() {\n" + @@ -2840,10 +2509,10 @@ public void _testBug100041b() throws JavaModelException { assertTrue("Invalid start position for Block: "+returnStatement, returnStatement.getStartPosition() > commentEnd); } } - public void _testBug100041c() throws JavaModelException { + public void testBug100041c() throws JavaModelException { this.workingCopies = new ICompilationUnit[1]; - this.workingCopies[0] = getWorkingCopy("/Converter_23/src/javadoc/b100041/Z.java", - "package javadoc.b100041;\n" + + this.workingCopies[0] = getWorkingCopy("/Converter_23/src/markdown/b100041/Z.java", + "package markdown.b100041;\n" + "public class Z {\n" + " /** C1 */\n" + " class Z1 {}\n" + @@ -2924,11 +2593,11 @@ public void _testBug100041c() throws JavaModelException { * bug103304: [Javadoc] Wrong reference proposal for inner classes. * @see "http://bugs.eclipse.org/bugs/show_bug.cgi?id=103304" */ - public void _testBug103304() throws JavaModelException { + public void testBug103304() throws JavaModelException { this.packageBinding = false; // do NOT verify that qualification only can be package name this.workingCopies = new ICompilationUnit[1]; - this.workingCopies[0] = getWorkingCopy("/Converter_23/src/javadoc/b103304/Test.java", - "package javadoc.b103304;\n" + + this.workingCopies[0] = getWorkingCopy("/Converter_23/src/markdown/b103304/Test.java", + "package markdown.b103304;\n" + "interface IAFAState {\n" + " public class ValidationException extends Exception {\n" + " public ValidationException(String variableName, IAFAState subformula) {\n" + @@ -2951,13 +2620,13 @@ public void _testBug103304() throws JavaModelException { while (unitComments.hasNext()) { Comment comment = (Comment) unitComments.next(); assertEquals("Comment should be javadoc", comment.getNodeType(), ASTNode.JAVADOC); - Javadoc javadoc = (Javadoc) comment; + Javadoc markdown = (Javadoc) comment; // Verify that there's always a method reference in tags - List tags = javadoc.tags(); + List tags = markdown.tags(); int size = tags.size(); for (int i=0; ivalidateEdit for the given resource on IWorkspace. - * - * @param list Liste of things - * @see #foo(java.util. - * Vector) - */ + /// + /// is + /// calling + /// IWorkspace. + /// + /// things + /// #foo(java.util. + /// Vector) + /// public void foo(java.util.Vector list) {} } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test100/TestB1.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test100/TestB1.java deleted file mode 100644 index edf452735da..00000000000 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test100/TestB1.java +++ /dev/null @@ -1,11 +0,0 @@ -package javadoc.test100; -public class TestB1 { /* C0 */ /* C1 */ - /* C2 */ /* C3 */ - /* C4 */ /* C5 */ - void foo() {} /* C6 */ /* C7 */ - /* C8 */ /* C9 */ - /* C10 */ /* C11 */ - void bar() {} - /* C12 */ /* C13 */ - /* C14 */ /* C15 */ -} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test100/TestB2.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test100/TestB2.java deleted file mode 100644 index a399fcd91d0..00000000000 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test100/TestB2.java +++ /dev/null @@ -1,11 +0,0 @@ -package javadoc.test100; -public class TestB2 { /* C0 */ // C1 */ - /* C2 */ // C3 */ - /* C4 */ // C5 */ - void foo() {} /* C6 */ // C7 */ - /* C8 */ // C9 */ - /* C10 */ // C11 */ - void bar() {} - /* C12 */ // C13 */ - /* C14 */ // C15 */ -} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test100/TestD1.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test100/TestD1.java deleted file mode 100644 index 454b2e8dfe3..00000000000 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test100/TestD1.java +++ /dev/null @@ -1,11 +0,0 @@ -package javadoc.test100; -public class TestD1 { /** C0 */ /** C1 */ - /** C2 */ /** C3 */ - /** C4 */ /** C5 */ - void foo() {} /** C6 */ /** C7 */ - /** C8 */ /** C9 */ - /** C10 */ /** C11 */ - void bar() {} - /** C12 */ /** C13 */ - /** C14 */ /** C15 */ -} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test100/TestD2.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test100/TestD2.java deleted file mode 100644 index e11fbf9e485..00000000000 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test100/TestD2.java +++ /dev/null @@ -1,11 +0,0 @@ -package javadoc.test100; -public class TestD2 { /** C0 */ // C1 */ - /** C2 */ // C3 */ - /** C4 */ // C5 */ - void foo() {} /** C6 */ // C7 */ - /** C8 */ // C9 */ - /** C10 */ // C11 */ - void bar() {} - /** C12 */ // C13 */ - /** C14 */ // C15 */ -} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test101/Test.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test101/Test.java deleted file mode 100644 index 9c0b9b5bc90..00000000000 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test101/Test.java +++ /dev/null @@ -1,11 +0,0 @@ -package javadoc.test101; -public class Test { // C0 */ // C0b */ - // C1 */ // C1b */ - // C2 */ // C2b */ - void foo() {} // C3 */ // C3b */ - // C4 */ // C4b */ - // C5 */ // C5b */ - void bar() {} - // C6 */ // C6b */ - // C7 */ // C7b */ -} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test102/TestB1.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test102/TestB1.java deleted file mode 100644 index 8806a5ec636..00000000000 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test102/TestB1.java +++ /dev/null @@ -1,14 +0,0 @@ -package javadoc.test102; -public class TestB1 { /* C0 */ /* C1 */ - /* C2 */ /* C3 */ - - /* C4 */ /* C5 */ - void foo() {} /* C6 */ /* C7 */ - /* C8 */ /* C9 */ - - /* C10 */ /* C11 */ - void bar() {} - /* C12 */ /* C13 */ - - /* C14 */ /* C15 */ -} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test102/TestB2.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test102/TestB2.java deleted file mode 100644 index e4f7bcd6f18..00000000000 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test102/TestB2.java +++ /dev/null @@ -1,14 +0,0 @@ -package javadoc.test102; -public class TestB2 { /* C0 */ // C1 */ - /* C2 */ // C3 */ - - /* C4 */ // C5 */ - void foo() {} /* C6 */ // C7 */ - /* C8 */ // C9 */ - - /* C10 */ // C11 */ - void bar() {} - /* C12 */ // C13 */ - - /* C14 */ // C15 */ -} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test102/TestD1.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test102/TestD1.java deleted file mode 100644 index 587cb57356d..00000000000 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test102/TestD1.java +++ /dev/null @@ -1,14 +0,0 @@ -package javadoc.test102; -public class TestD1 { /** C0 */ /** C1 */ - /** C2 */ /** C3 */ - - /** C4 */ /** C5 */ - void foo() {} /** C6 */ /** C7 */ - /** C8 */ /** C9 */ - - /** C10 */ /** C11 */ - void bar() {} - /** C12 */ /** C13 */ - - /** C14 */ /** C15 */ -} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test102/TestD2.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test102/TestD2.java deleted file mode 100644 index 90f3552e893..00000000000 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test102/TestD2.java +++ /dev/null @@ -1,14 +0,0 @@ -package javadoc.test102; -public class TestD2 { /** C0 */ // C1 */ - /** C2 */ // C3 */ - - /** C4 */ // C5 */ - void foo() {} /** C6 */ // C7 */ - /** C8 */ // C9 */ - - /** C10 */ // C11 */ - void bar() {} - /** C12 */ // C13 */ - - /** C14 */ // C15 */ -} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test103/Test.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test103/Test.java deleted file mode 100644 index 125b2963fcd..00000000000 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test103/Test.java +++ /dev/null @@ -1,14 +0,0 @@ -package javadoc.test103; -public class Test { // C0 */ // C0b */ - // C1 */ // C1b */ - - // C2 */ // C2b */ - void foo() {} // C3 */ // C3b */ - // C4 */ // C4b */ - - // C5 */ // C5b */ - void bar() {} - // C6 */ // C6b */ - - // C7 */ // C7b */ -} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test104/TestD1.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test104/TestD1.java deleted file mode 100644 index bbea44fc709..00000000000 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test104/TestD1.java +++ /dev/null @@ -1,13 +0,0 @@ -package javadoc.test104; -public class TestD1 { /** C0 */ /** C1 */ - /** C2 */ /** C3 */ - /** C4 */ /** C5 */ - - void foo() {} /** C6 */ /** C7 */ - /** C8 */ /** C9 */ - /** C10 */ /** C11 */ - - void bar() {} - /** C12 */ /** C13 */ - /** C14 */ /** C15 */ -} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test104/TestD2.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test104/TestD2.java deleted file mode 100644 index a8db31c06bb..00000000000 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test104/TestD2.java +++ /dev/null @@ -1,13 +0,0 @@ -package javadoc.test104; -public class TestD2 { /** C0 */ // C1 */ - /** C2 */ // C3 */ - /** C4 */ // C5 */ - - void foo() {} /** C6 */ // C7 */ - /** C8 */ // C9 */ - /** C10 */ // C11 */ - - void bar() {} - /** C12 */ // C13 */ - /** C14 */ // C15 */ -} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test105/TestB1.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test105/TestB1.java deleted file mode 100644 index 62330343722..00000000000 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test105/TestB1.java +++ /dev/null @@ -1,13 +0,0 @@ -package javadoc.test105; -public class TestB1 { /* C0 */ /* C1 */ - /* C2 */ /* C3 */ - /* C4 */ /* C5 */ - - void foo() {} /* C6 */ /* C7 */ - /* C8 */ /* C9 */ - /* C10 */ /* C11 */ - - void bar() {} - /* C12 */ /* C13 */ - /* C14 */ /* C15 */ -} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test105/TestB2.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test105/TestB2.java deleted file mode 100644 index 608815cb71d..00000000000 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test105/TestB2.java +++ /dev/null @@ -1,13 +0,0 @@ -package javadoc.test105; -public class TestB2 { /* C0 */ // C1 */ - /* C2 */ // C3 */ - /* C4 */ // C5 */ - - void foo() {} /* C6 */ // C7 */ - /* C8 */ // C9 */ - /* C10 */ // C11 */ - - void bar() {} - /* C12 */ // C13 */ - /* C14 */ // C15 */ -} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test106/Test.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test106/Test.java deleted file mode 100644 index f4c7e73a961..00000000000 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test106/Test.java +++ /dev/null @@ -1,13 +0,0 @@ -package javadoc.test106; -public class Test { // C0 */ // C0b */ - // C1 */ // C1b */ - // C2 */ // C2b */ - - void foo() {} // C3 */ // C3b */ - // C4 */ // C4b */ - // C5 */ // C5b */ - - void bar() {} - // C6 */ // C6b */ - // C7 */ // C7b */ -} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test107/TestB1.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test107/TestB1.java deleted file mode 100644 index 7a5724635ea..00000000000 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test107/TestB1.java +++ /dev/null @@ -1,14 +0,0 @@ -package javadoc.test107; -public class TestB1 { /* C0 */ /* C1 */ - - /* C2 */ /* C3 */ - /* C4 */ /* C5 */ - void foo() {} /* C6 */ /* C7 */ - - /* C8 */ /* C9 */ - /* C10 */ /* C11 */ - void bar() {} - - /* C12 */ /* C13 */ - /* C14 */ /* C15 */ -} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test107/TestB2.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test107/TestB2.java deleted file mode 100644 index a41e4469035..00000000000 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test107/TestB2.java +++ /dev/null @@ -1,14 +0,0 @@ -package javadoc.test107; -public class TestB2 { /* C0 */ // C1 */ - - /* C2 */ // C3 */ - /* C4 */ // C5 */ - void foo() {} /* C6 */ // C7 */ - - /* C8 */ // C9 */ - /* C10 */ // C11 */ - void bar() {} - - /* C12 */ // C13 */ - /* C14 */ // C15 */ -} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test107/TestD1.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test107/TestD1.java deleted file mode 100644 index 47bea7066a8..00000000000 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test107/TestD1.java +++ /dev/null @@ -1,14 +0,0 @@ -package javadoc.test107; -public class TestD1 { /** C0 */ /** C1 */ - - /** C2 */ /** C3 */ - /** C4 */ /** C5 */ - void foo() {} /** C6 */ /** C7 */ - - /** C8 */ /** C9 */ - /** C10 */ /** C11 */ - void bar() {} - - /** C12 */ /** C13 */ - /** C14 */ /** C15 */ -} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test107/TestD2.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test107/TestD2.java deleted file mode 100644 index 860da71f6dc..00000000000 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test107/TestD2.java +++ /dev/null @@ -1,14 +0,0 @@ -package javadoc.test107; -public class TestD2 { /** C0 */ // C1 */ - - /** C2 */ // C3 */ - /** C4 */ // C5 */ - void foo() {} /** C6 */ // C7 */ - - /** C8 */ // C9 */ - /** C10 */ // C11 */ - void bar() {} - - /** C12 */ // C13 */ - /** C14 */ // C15 */ -} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test108/Test.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test108/Test.java deleted file mode 100644 index 0ed666d8ca6..00000000000 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test108/Test.java +++ /dev/null @@ -1,14 +0,0 @@ -package javadoc.test108; -public class Test { // C0 */ // C0b */ - - // C1 */ // C1b */ - // C2 */ // C2b */ - void foo() {} // C3 */ // C3b */ - - // C4 */ // C4b */ - // C5 */ // C5b */ - void bar() {} - - // C6 */ // C6b */ - // C7 */ // C7b */ -} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test109/Test.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test109/Test.java index 9f3d9fad201..9bdf1fe7f66 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test109/Test.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/test109/Test.java @@ -1,7 +1,7 @@ public class SAMPLE_UTF8 { - /** - * @param nDataCount\uff1a\uff10 - */ + /// + /// @param nDataCount\uff1a\uff10 + /// public static void main(String[] args) { } } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug228648/A.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug228648/A.java index 3c082e7bfbe..53eab06a581 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug228648/A.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug228648/A.java @@ -1,12 +1,12 @@ package javadoc.testBug228648; import javadoc.testBug228648.B.Inner; -/** - * {@link #foo(Inner)} - * {@link #foo2(B)} - */ +/// +/// #foo(Inner)} +/// #foo2(B)} +/// public class A { - public void foo(Inner inner) { - } - public void foo2(B b) { - } + public void foo(Inner inner) { + } + public void foo2(B b) { + } } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug336821/Try.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug336821/Try.java index baff0ca5306..d5cba97149b 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug336821/Try.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug336821/Try.java @@ -1,10 +1,10 @@ package javadoc.testBug336821; -/** - * First ref should resolve to constructor - * @see #Try - * @see #Try(int, String) - * @see #foo - */ +/// +/// constructor +/// #Try +/// String) +/// #foo +/// public class Try { public Try(int i, String message) { System.out.println(message + i); diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug347100/X.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug347100/X.java index 33df576562f..34f32f7c8ea 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug347100/X.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug347100/X.java @@ -1,12 +1,12 @@ package javadoc.testBug347100; -/** - * Link to {@link javadoc},
- * link to {@link "Hello World"},
- * and {@link package documentation} - * - * @see javadoc - * @see "Hello World" - * @see package documentation - */ +/// +/// javadoc},
+/// World"},
+/// documentation} +/// +/// javadoc +/// World" +/// documentation +/// public class X { } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug48489/TestA.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug48489/TestA.java index 71f05fb2295..3c7195a825c 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug48489/TestA.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug48489/TestA.java @@ -1,9 +1,9 @@ package javadoc.testBug48489; import java.util.*; public class TestA { - /** - * Javadoc comment - */ + /// + /// comment + /// public static void main(String[] args) { /* method main */ System.out.println("Hello" + " world"); // comment diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug48489/TestB.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug48489/TestB.java index 6042e42a4cd..26e50d676ed 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug48489/TestB.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug48489/TestB.java @@ -1,8 +1,8 @@ package javadoc.testBug48489; import java.util.*; public class TestB { - /** - * Javadoc - */ + /// + /// Javadoc + /// public static final /* */ String s = "NULL", s2="";// line comment } \ No newline at end of file diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug48489/TestC.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug48489/TestC.java index 53cc3e973fc..78f77bb13b3 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug48489/TestC.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug48489/TestC.java @@ -1,9 +1,9 @@ package javadoc.testBug48489; import java.util.*; public class TestC { - /** - * Javadoc - */ + /// + /// Javadoc + /// static { /* */ System.out.println("Hello" + " world"); // line comment diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug48489/TestD.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug48489/TestD.java index 945fe0de53b..02405f6cb2a 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug48489/TestD.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug48489/TestD.java @@ -1,9 +1,9 @@ package javadoc.testBug48489; import java.util.*; public class TestD { - /** - * Javadoc - */ + /// + /// Javadoc + /// public static void main(String[] args) { System.out./* */println("Hello" + " world"); } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug48489/TestE.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug48489/TestE.java index 1caa7558d29..e7d040f0d78 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug48489/TestE.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug48489/TestE.java @@ -1,9 +1,9 @@ package javadoc.testBug48489; import java.util.*; public class TestE { - /** - * Javadoc - */ + /// + /// Javadoc + /// public static void main(String[] args) { System.out.println("Hello" + /* */ " world"); } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug50898/Test.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug50898/Test.java index 2ab1e697203..2e1d7c1ea9f 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug50898/Test.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug50898/Test.java @@ -1,8 +1,8 @@ package javadoc.testBug50898; public class Test { - /** - * @see G.Inner - */ + /// + /// @see G.Inner + /// public void foo() { } } \ No newline at end of file diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51241/X.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51241/X.java deleted file mode 100644 index e97c9ab0654..00000000000 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51241/X.java +++ /dev/null @@ -1,20 +0,0 @@ -package javadoc.testBug51241; -public class X { - // First class line comment - int i; - // C1 - - void foo() { - int x; - // C2 - int y; - // First method line comment - } - // Syntax error here! - int z - - // Second class line comment - void bar() { - // Second method line comment - } -} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51476/X1.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51476/X1.java index 49bb6b11da1..9242f59a4bb 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51476/X1.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51476/X1.java @@ -1,7 +1,7 @@ package javadoc.testBug51476; -/** - * @see "Test class X" - * @see Valid URL - */ +/// +/// @see "Test class X" +/// @see Valid URL +/// public class X1 { } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51476/X2.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51476/X2.java index af70b734334..ce979dca65d 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51476/X2.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51476/X2.java @@ -1,6 +1,6 @@ package javadoc.testBug51476; -/** - * @see "Test class X" - */ +/// +/// @see "Test class X" +/// public class X2 { } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51476/X3.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51476/X3.java index 75138f44fe5..a48e8bb784f 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51476/X3.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51476/X3.java @@ -1,6 +1,6 @@ package javadoc.testBug51476; -/** - * @see Valid URL - */ +/// +/// @see Valid URL +/// public class X3 { } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51478/X1.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51478/X1.java index b10c28d9146..a5eecc31192 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51478/X1.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51478/X1.java @@ -1,7 +1,7 @@ package javadoc.testBug51478; -/** - * {@inheritDoc} - * @deprecated - */ +/// +/// {@inheritDoc} +/// @deprecated +/// public class X1 { } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51478/X2.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51478/X2.java index 382683ecca5..b712fea6269 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51478/X2.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51478/X2.java @@ -1,6 +1,6 @@ package javadoc.testBug51478; -/** - * {@inheritDoc} - */ +/// +/// {@inheritDoc} +/// public class X2 { } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51478/X3.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51478/X3.java index 8f1c92ee280..e87951274c2 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51478/X3.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51478/X3.java @@ -1,6 +1,6 @@ package javadoc.testBug51478; -/** - * @deprecated - */ +/// +/// @deprecated +/// public class X3 { } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51508/X.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51508/X.java index 3f9d55f96a5..e7379f7a153 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51508/X.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51508/X.java @@ -1,7 +1,7 @@ package javadoc.testBug51508; -/** - * @see java - * @see java.util - */ +/// +/// @see java +/// @see java.util +/// public class X { } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51600/Test.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51600/Test.java index 2737b0faa29..2596326957b 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51600/Test.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51600/Test.java @@ -1,17 +1,17 @@ package javadoc.testBug51600; public class Test { - /** - * @param str - * @param - * @param str - * @see - * @see - * @see # - * @see "Invalid - * @return String - * @return - * @return String - */ + /// + /// @param str + /// @param + /// @param str + /// @see + /// @see + /// @see # + /// @see "Invalid + /// @return String + /// @return + /// @return String + /// String foo(String str) { return ""; } } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51617/Test.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51617/Test.java index 4ca05bdd408..5c82f6ffecf 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51617/Test.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51617/Test.java @@ -1,10 +1,10 @@ package javadoc.testBug51617; public class Test { - /** - * Set in separated folder as we have an unbound reference... - * @exception e - * @param name The name to set - */ + /// + /// Set in separated folder as we have an unbound reference... + /// @exception e + /// @param name The name to set + /// public void setName1(String name) { } } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51650/X.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51650/X.java index cc98705d69d..4265865e01b 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51650/X.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51650/X.java @@ -1,9 +1,9 @@ package javadoc.testBug51650; public class X { - /** - * @see Exception - * {@link Exception} - */ + /// + /// @see Exception + /// {@link Exception} + /// public void foo() { } } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51660/Test.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51660/Test.java index 630cfe5f5af..b80bf02910d 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51660/Test.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51660/Test.java @@ -1,37 +1,37 @@ package javadoc.testBug51660; -/** - * @ejb!bean test non-java id character '!' (val=33) in tag name - * @ejb"bean test non-java id character '"' (val=34) in tag name - * @ejb#bean test non-java id character '#' (val=35) in tag name - * @ejb%bean test non-java id character '%' (val=37) in tag name - * @ejb&bean test non-java id character '&' (val=38) in tag name - * @ejb'bean test non-java id character ''' (val=39) in tag name - * @ejb(bean test non-java id character '(' (val=40) in tag name - * @ejb)bean test non-java id character ')' (val=41) in tag name - * @ejb*bean test non-java id character '*' (val=42) in tag name - * @ejb+bean test non-java id character '+' (val=43) in tag name - * @ejb,bean test non-java id character ',' (val=44) in tag name - * @ejb-bean test non-java id character '-' (val=45) in tag name - * @ejb.bean test non-java id character '.' (val=46) in tag name - * @ejb/bean test non-java id character '/' (val=47) in tag name - * @ejb:bean test non-java id character ':' (val=58) in tag name - * @ejb;bean test non-java id character ';' (val=59) in tag name - * @ejb' (val=62) in tag name - * @ejb?bean test non-java id character '?' (val=63) in tag name - * @ejb@bean test non-java id character '@' (val=64) in tag name - * @ejb[bean test non-java id character '[' (val=91) in tag name - * @ejb\bean test non-java id character '\' (val=92) in tag name - * @ejb]bean test non-java id character ']' (val=93) in tag name - * @ejb^bean test non-java id character '^' (val=94) in tag name - * @ejb`bean test non-java id character '`' (val=96) in tag name - * @ejb{bean test non-java id character '{' (val=123) in tag name - * @ejb|bean test non-java id character '|' (val=124) in tag name - * @ejb}bean test non-java id character '}' (val=125) in tag name - * @ejb~bean test non-java id character '~' (val=126) in tag name - * @unknown test java id - */ +/// +/// @ejb!bean test non-java id character '!' (val=33) in tag name +/// @ejb"bean test non-java id character '"' (val=34) in tag name +/// @ejb#bean test non-java id character '#' (val=35) in tag name +/// @ejb%bean test non-java id character '%' (val=37) in tag name +/// @ejb&bean test non-java id character '&' (val=38) in tag name +/// @ejb'bean test non-java id character ''' (val=39) in tag name +/// @ejb(bean test non-java id character '(' (val=40) in tag name +/// @ejb)bean test non-java id character ')' (val=41) in tag name +/// @ejb*bean test non-java id character '*' (val=42) in tag name +/// @ejb+bean test non-java id character '+' (val=43) in tag name +/// @ejb,bean test non-java id character ',' (val=44) in tag name +/// @ejb-bean test non-java id character '-' (val=45) in tag name +/// @ejb.bean test non-java id character '.' (val=46) in tag name +/// @ejb/bean test non-java id character '/' (val=47) in tag name +/// @ejb:bean test non-java id character ':' (val=58) in tag name +/// @ejb;bean test non-java id character ';' (val=59) in tag name +/// @ejb' (val=62) in tag name +/// @ejb?bean test non-java id character '?' (val=63) in tag name +/// @ejb@bean test non-java id character '@' (val=64) in tag name +/// @ejb[bean test non-java id character '[' (val=91) in tag name +/// @ejb\bean test non-java id character '\' (val=92) in tag name +/// @ejb]bean test non-java id character ']' (val=93) in tag name +/// @ejb^bean test non-java id character '^' (val=94) in tag name +/// @ejb`bean test non-java id character '`' (val=96) in tag name +/// @ejb{bean test non-java id character '{' (val=123) in tag name +/// @ejb|bean test non-java id character '|' (val=124) in tag name +/// @ejb}bean test non-java id character '}' (val=125) in tag name +/// @ejb~bean test non-java id character '~' (val=126) in tag name +/// @unknown test java id +/// public class Test { } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51770/X.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51770/X.java index 7725030c4dd..66250f874ae 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51770/X.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51770/X.java @@ -1,6 +1,6 @@ package javadoc.testBug51770; -/** - * @see java.util.Vector - */ +/// +/// @see java.util.Vector +/// public class X { } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51911/TestInvalid.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51911/TestInvalid.java index 4a1b58264ec..1ba8eb8171b 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51911/TestInvalid.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51911/TestInvalid.java @@ -1,7 +1,7 @@ package javadoc.testBug51911; -/** - * @see #foo - */ +/// +/// @see #foo +/// public class TestInvalid { public void foo(int i, float f) {} public void foo(String str) {} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51911/TestValid1.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51911/TestValid1.java index 5a62a696606..81dfad349d5 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51911/TestValid1.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51911/TestValid1.java @@ -1,7 +1,7 @@ package javadoc.testBug51911; -/** - * @see #foo - */ +/// +/// @see #foo +/// public class TestValid1 { public int foo; public void foo(String str) {} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51911/TestValid2.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51911/TestValid2.java index 68c04b6ba64..b2f5bfc0c72 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51911/TestValid2.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51911/TestValid2.java @@ -1,7 +1,7 @@ package javadoc.testBug51911; -/** - * @see #foo - */ +/// +/// @see #foo +/// public class TestValid2 { public void foo(String str) {} } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51911/TestValid3.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51911/TestValid3.java index 07408c1a018..53d1f6fbcc9 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51911/TestValid3.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug51911/TestValid3.java @@ -1,7 +1,7 @@ package javadoc.testBug51911; -/** - * @see #foo - */ +/// +/// @see #foo +/// public class TestValid3 { public int foo; public void foo() {} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug52908/X.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug52908/X.java index 78edb122255..bbd012ef2c6 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug52908/X.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug52908/X.java @@ -1,47 +1,47 @@ package javadoc.testBug52908; public class X { - /** - * Text element starting with a - * { caused troubles in its position - * if the bug is not fixed - * @see Object - */ + /// + /// Text element starting with a + /// { caused troubles in its position + /// if the bug is not fixed + /// @see Object + //// Object x1; - /** - * Text element ending with a } - * caused troubles in its position - * if the bug is not fixed - * @see Object - */ + /// + /// Text element ending with a } + /// caused troubles in its position + /// if the bug is not fixed + /// @see Object + //// Object x2; - /** - * Text element starting with a - * } caused troubles in its position - * if the bug is not fixed - * @see Object - */ + /// + /// Text element starting with a + /// } caused troubles in its position + /// if the bug is not fixed + /// @see Object + //// Object x3; - /** - * Text element ending with a { - * caused troubles in its position - * if the bug is not fixed - * @see Object - */ + /// + /// Text element ending with a { + /// caused troubles in its position + /// if the bug is not fixed + /// @see Object + //// Object x4; - /** - * Text element starting with - * { and ending with } - * caused troubles in its position - * if the bug is not fixed - * @see Object - */ + /// + /// Text element starting with + /// { and ending with } + /// caused troubles in its position + /// if the bug is not fixed + /// @see Object + //// Object x6; - /** - * Text element starting with - * } and ending with { - * caused troubles in its position - * if the bug is not fixed - * @see Object - */ + /// + /// Text element starting with + /// } and ending with { + /// caused troubles in its position + /// if the bug is not fixed + /// @see Object + //// Object x7; } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug52908/Y.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug52908/Y.java index 5eabbb2990e..f0703e357c4 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug52908/Y.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug52908/Y.java @@ -1,14 +1,14 @@ package javadoc.testBug52908; public class Y { - /** - * while (true) - * { - * int token = scanner.getNextToken(); - * if (token == ITerminalSymbols.TokenNameEOF) break; - * System.out.println(token + " : " + new String(scanner.getCurrentTokenSource())); - * } - * 
-	 *
- */ + /// + /// while (true) + /// { + /// int token = scanner.getNextToken(); + /// if (token == ITerminalSymbols.TokenNameEOF) break; + /// System.out.println(token + " : " + new String(scanner.getCurrentTokenSource())); + /// } + /// 
+	///
+ //// void foo() {} } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug52908a/Test.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug52908a/Test.java index e56eafbce9e..31669ac479e 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug52908a/Test.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug52908a/Test.java @@ -1,15 +1,15 @@ package javadoc.testBug52908a; -import java.util.Vector; +import java.util.List; -/** - * AST node for a parameter within a method reference ({@link Object}). - * These nodes only occur within doc comments ({@link Vector}). - * 
- * MethodRefParameter:
- * 		Type [ Identifier ]
- *
- * - * @see Vector - * @since 3.0 - */ +/// +/// AST node for a parameter within a method reference ([Object]). +/// These nodes only occur within doc comments ([List]). +/// 
+/// MethodRefParameter:
+/// 		Type [ Identifier ]
+///
+/// +/// @see List +/// @since 3.0 +//// public class Test {} diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug52908unicode/X.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug52908unicode/X.java index 63150437c97..f378b163f50 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug52908unicode/X.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug52908unicode/X.java @@ -1,47 +1,47 @@ package javadoc.testBug52908unicode; public class X { - /** - * Text element starting with a - * \u007b caused troubles in its position - * if the bug is not fixed - * @see Object - */ + /// + /// Text element starting with a + /// \u007b caused troubles in its position + /// if the bug is not fixed + /// @see Object + //// Object x1; - /** - * Text element ending with a \u007d - * caused troubles in its position - * if the bug is not fixed - * @see Object - */ + /// + /// Text element ending with a \u007d + /// caused troubles in its position + /// if the bug is not fixed + /// @see Object + //// Object x2; - /** - * Text element starting with a - * \u007d caused troubles in its position - * if the bug is not fixed - * @see Object - */ + /// + /// Text element starting with a + /// \u007d caused troubles in its position + /// if the bug is not fixed + /// @see Object + //// Object x3; - /** - * Text element ending with a \u007b - * caused troubles in its position - * if the bug is not fixed - * @see Object - */ + /// + /// Text element ending with a \u007b + /// caused troubles in its position + /// if the bug is not fixed + /// @see Object + //// Object x4; - /** - * Text element starting with - * \u007b and ending with \u007d - * caused troubles in its position - * if the bug is not fixed - * @see Object - */ + /// + /// Text element starting with + /// \u007b and ending with \u007d + /// caused troubles in its position + /// if the bug is not fixed + /// @see Object + //// Object x6; - /** - * Text element starting with - * \u007d and ending with \u007b - * caused troubles in its position - * if the bug is not fixed - * @see Object - */ + /// + /// Text element starting with + /// \u007d and ending with \u007b + /// caused troubles in its position + /// if the bug is not fixed + /// @see Object + //// Object x7; } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug52908unicode/Y.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug52908unicode/Y.java index 12fd5feb9af..acbfb9eaf91 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug52908unicode/Y.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug52908unicode/Y.java @@ -1,14 +1,14 @@ package javadoc.testBug52908unicode; public class Y { - /** - * while (true) - * \u007b - * int token = scanner.getNextToken(); - * if (token == ITerminalSymbols.TokenNameEOF) break; - * System.out.println(token + " : " + new String(scanner.getCurrentTokenSource())); - * \u007d - * 
-	 *
- */ + /// + /// while (true) + /// \u007b + /// int token = scanner.getNextToken(); + /// if (token == ITerminalSymbols.TokenNameEOF) break; + /// System.out.println(token + " : " + new String(scanner.getCurrentTokenSource())); + /// \u007d + /// 
+	///
+ //// void foo() {} } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug53075/X.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug53075/X.java index 49c7974eff5..ef68946a793 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug53075/X.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug53075/X.java @@ -1,9 +1,9 @@ package javadoc.testBug53075; class X { -/** - * @link aggregates - * [... some more ...] - * @linkplain plain aggregates - */ +/// +/// @link aggregates +/// [... some more ...] +/// @linkplain plain aggregates +//// void foo() {} } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug53276/TestA.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug53276/TestA.java index 46099bbee5c..8eac6c060ce 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug53276/TestA.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug53276/TestA.java @@ -1,15 +1,15 @@ package javadoc.testBug53276; public interface TestA { - /** - * Return the string specifying the pattern of this ignore. The string - * may include the wildcard characters '*' and '?'. If you wish to - * include either of these characters verbatim (i.e. you do not wish - * them to expand to wildcards), you must escape them with a backslash '\'. - *

- * If you are using string literals in Java to represent the patterns, don't - * forget escape characters are represented by "\\". - * - * @return the pattern represented by this ignore info - */ + /// + /// Return the string specifying the pattern of this ignore. The string + /// may include the wildcard characters '*' and '?'. If you wish to + /// include either of these characters verbatim (i.e. you do not wish + /// them to expand to wildcards), you must escape them with a backslash '\'. + ///

+ /// If you are using string literals in Java to represent the patterns, don't + /// forget escape characters are represented by "\\". + /// + /// @return the pattern represented by this ignore info + //// public String getPattern(); } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug53276/TestB.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug53276/TestB.java index b04fb60deee..2b6d0e71755 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug53276/TestB.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug53276/TestB.java @@ -1,23 +1,23 @@ package javadoc.testBug53276; -/** - * Handles a "Removed" response from the CVS server. - *

- * Suppose as a result of performing a command the CVS server responds - * as follows:
- * 

- *   [...]
- *   Removed ??? \n
- *   [...]
- *
- * Then - *

- */ +/// +/// Handles a "Removed" response from the CVS server. +///

+/// Suppose as a result of performing a command the CVS server responds +/// as follows:
+/// 

+///   [...]
+///   Removed ??? \n
+///   [...]
+///
+/// Then +///

+/// -/** - * It removes the file from both the entries of the parent-folder - * and from the local filesystem. - */ +/// +/// It removes the file from both the entries of the parent-folder +/// and from the local filesystem. +/// public class TestB { } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug53276/TestC.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug53276/TestC.java index fc34792901c..b7e6c7487f4 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug53276/TestC.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug53276/TestC.java @@ -1,12 +1,12 @@ package javadoc.testBug53276; public class TestC { - /** - * Returns the progress monitor. It there is no progress monitor the monitor\ - * is set to the NullProgressMonitor. - * - * @return the progress monitor - */ + /// + /// Returns the progress monitor. It there is no progress monitor the monitor\ + /// is set to the NullProgressMonitor. + /// + /// @return the progress monitor + /// public Object foo() { return null; } } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug53757/Test.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug53757/Test.java index 5be71b599d5..fc3bf3afed1 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug53757/Test.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug53757/Test.java @@ -1,55 +1,55 @@ package javadoc.testBug53757; public class Test { - /** - * Test all grammar keywords - * @abstract = 60, - * @assert = 71, - * @boolean = 31, - * @break = 72, - * @byte = 32, - * @case = 83, - * @catch = 86, - * @char = 33, - * @class = 81, - * @continue = 73, - * @default = 84, - * @do = 74, - * @double = 34, - * @else = 87, - * @extends = 91, - * @false = 44, - * @final = 61, - * @finally = 88, - * @float = 35, - * @for = 75, - * @if = 76, - * @implements = 103, - * @import = 82, - * @instanceof = 13, - * @int = 36, - * @interface = 89, - * @long = 37, - * @native = 62, - * @new = 41, - * @null = 45, - * @package = 85, - * @private = 63, - * @protected = 64, - * @public = 65, - * @short = 38, - * @static = 57, - * @strictfp = 66, - * @super = 42, - * @switch = 78, - * @synchronized = 55, - * @this = 43, - * @throw = 79, - * @transient = 67, - * @true = 46, - * @try = 80, - * @void = 39, - * @volatile = 68, - * @while = 70, - */ + /// + /// Test all grammar keywords + /// @abstract = 60, + /// @assert = 71, + /// @boolean = 31, + /// @break = 72, + /// @byte = 32, + /// @case = 83, + /// @catch = 86, + /// @char = 33, + /// @class = 81, + /// @continue = 73, + /// @default = 84, + /// @do = 74, + /// @double = 34, + /// @else = 87, + /// @extends = 91, + /// @false = 44, + /// @final = 61, + /// @finally = 88, + /// @float = 35, + /// @for = 75, + /// @if = 76, + /// @implements = 103, + /// @import = 82, + /// @instanceof = 13, + /// @int = 36, + /// @interface = 89, + /// @long = 37, + /// @native = 62, + /// @new = 41, + /// @null = 45, + /// @package = 85, + /// @private = 63, + /// @protected = 64, + /// @public = 65, + /// @short = 38, + /// @static = 57, + /// @strictfp = 66, + /// @super = 42, + /// @switch = 78, + /// @synchronized = 55, + /// @this = 43, + /// @throw = 79, + /// @transient = 67, + /// @true = 46, + /// @try = 80, + /// @void = 39, + /// @volatile = 68, + /// @while = 70, + /// void foo() {} } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug54424/Test.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug54424/Test.java index 2fa14a76d27..8ae30977f4e 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug54424/Test.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug54424/Test.java @@ -3,23 +3,23 @@ import java.util.ArrayList; public class Test { - /** - * @param - * @param tho {@link getList(int, long)} - * @version throwaway - * @param from 1st param of {@link A#getList(int, long, boolean) me} - * @see #getList(Object, java.util.AbstractList) - * @param from 2nd - * @see #getList(int from, tho long) - * @see #getList(int from, long tho) - * @param - * @return the list - * @see #getList(..) - * @param to - * @throws .IOException - * @deprecated - * @throws IOException. - * @todo it - */ + /// + /// @param + /// @param tho {@link getList(int, long)} + /// @version throwaway + /// @param from 1st param of {@link A#getList(int, long, boolean) me} + /// @see #getList(Object, java.util.AbstractList) + /// @param from 2nd + /// @see #getList(int from, tho long) + /// @see #getList(int from, long tho) + /// @param + /// @return the list + /// @see #getList(..) + /// @param to + /// @throws .IOException + /// @deprecated + /// @throws IOException. + /// @todo it + /// public ArrayList getList(int from, long to) throws IOException {return null;} } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug55221/a/Test.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug55221/a/Test.java index d27c9030d61..ef3fe10d8a7 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug55221/a/Test.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug55221/a/Test.java @@ -9,10 +9,10 @@ public int bar() { } return x; } - /** - * This comment should not be attached to previous method body! - * @return int - */ + /// + /// This comment should not be attached to previous method body! + /// @return int + /// public int foo() { return 1; } } \ No newline at end of file diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug55221/b/Test.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug55221/b/Test.java index c3d81a62a47..e5ad2828ead 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug55221/b/Test.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug55221/b/Test.java @@ -8,10 +8,10 @@ public int bar() { x=2; } return x; - } /** - * This comment should not be attached to previous method body! - * @return int - */ + } /// + /// This comment should not be attached to previous method body! + /// @return int + /// public int foo() { return 1; } } \ No newline at end of file diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug55221/d/Test.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug55221/d/Test.java index 63538888420..4b0c63817f7 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug55221/d/Test.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug55221/d/Test.java @@ -1,7 +1,7 @@ package javadoc.testBug55221.d; public class Test { - /** - * Javadoc comment - */// Line comment + /// + /// Javadoc comment + ///// Line comment boolean foo() { return false; } } \ No newline at end of file diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug55223/TestB.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug55223/TestB.java index 32e13763df3..ee7f9829c6a 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug55223/TestB.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug55223/TestB.java @@ -1,10 +1,10 @@ package javadoc.testBug55223; public class TestB { - /** - * Returns all of the filter elements of this shortcut as a List of String Pairs. - * - * @return all of the filter elements of this shortcut, or null if not - * specified - */ + /// + /// Returns all of the filter elements of this shortcut as a List of String Pairs. + /// + /// @return all of the filter elements of this shortcut, or null if not + /// specified + /// public /* */ Object getFilters() { return null; } } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug63044/Test.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug63044/Test.java index eaa92532389..723d8862ebd 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug63044/Test.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug63044/Test.java @@ -1,9 +1,9 @@ package javadoc.testBug63044; -/** - * @see #Test() - * @see Test#Test() - * @see javadoc.testBug63044.Test#Test() - */ +/// +/// @see #Test() +/// @see Test#Test() +/// @see javadoc.testBug63044.Test#Test() +/// public class Test{ Test( ){ new Test(); diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug65174/Test.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug65174/Test.java index a14d8f2728d..ab39abc637f 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug65174/Test.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug65174/Test.java @@ -1,39 +1,39 @@ package javadoc.testBug65174; public class Test { - /** - * Comment with no error: {@link - * Object valid} because it's not on first line - */ + /// + /// Comment with no error: {@link + /// Object valid} because it's not on first line + //// void foo_ok() {} - /** Comment previously with error: {@link - * Object valid} because tag is on comment very first line - */ + /// Comment previously with error: {@link + /// Object valid} because tag is on comment very first line + //// void foo_ko() {} - /** - * Comment with no error: {@link - * Object valid} because it's not on first line - */ + /// + /// Comment with no error: {@link + /// Object valid} because it's not on first line + //// void fooA_ok() {} - /** Comment previously with error: {@link - * Object valid} because tag is on comment very first line - */ + /// Comment previously with error: {@link + /// Object valid} because tag is on comment very first line + //// void fooA_ko() {} - /** - * Comment with no error: {@link java.lang. - * Object valid} because it's not on first line - */ + /// + /// Comment with no error: {@link java.lang. + /// Object valid} because it's not on first line + //// void fooB_ok() {} - /** Comment previously with error: {@link java.lang. - * Object valid} because tag is on comment very first line - */ + /// Comment previously with error: {@link java.lang. + /// Object valid} because tag is on comment very first line + //// void fooB_ko() {} - /** - * Comment with no error: {@link Object - * valid} because it's not on first line - */ + /// + /// Comment with no error: {@link Object + /// valid} because it's not on first line + //// void fooC_ok() {} - /** Comment previously with error: {@link Object - * valid} because tag is on comment very first line - */ + /// Comment previously with error: {@link Object + /// valid} because tag is on comment very first line + //// void fooC_ko() {} } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug65253/Test.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug65253/Test.java index bde49a611c6..4581a56187c 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug65253/Test.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug65253/Test.java @@ -1,14 +1,14 @@ package javadoc.testBug65253; -/** - * Comment - * @@@@see Unknown Should not complain on ref - */ +/// +/// Comment +/// @@@@see Unknown Should not complain on ref +/// public class Test { - /** - * Comment - * @@@param xxx Should not complain on param - * @@return int Should not be '@return' tag element - */ + /// + /// Comment + /// @@@param xxx Should not complain on param + /// @@return int Should not be '@return' tag element + /// int foo() { // should warn on missing tag for return type return 0; } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug65253/TestD.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug65253/TestD.java index 82d22c46a7e..e950eb1efc9 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug65253/TestD.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug65253/TestD.java @@ -1,21 +1,21 @@ package javadoc.testBug65253; public class TestD { - /** Comment previously with no error: {@link Object valid} comment on one line */ + /// Comment previously with no error: {@link Object valid} comment on one line void foo1() {} - /** Comment previously with no error: {@link Object valid} */ + /// Comment previously with no error: {@link Object valid} void foo2() {} - /** Comment previously with no error: {@link Object valid}*/ + /// Comment previously with no error: {@link Object valid} void foo3() {} - /** {@link Object valid} comment on one line */ + /// {@link Object valid} comment on one line void foo4() {} - /**{@link Object valid} comment on one line */ + ///{@link Object valid} comment on one line void foo5() {} - /** {@link Object valid} */ + /// {@link Object valid} void foo6() {} - /**{@link Object valid} */ + ///{@link Object valid} void foo7() {} - /** {@link Object valid}*/ + /// {@link Object valid} void foo8() {} - /**{@link Object valid}*/ + ///{@link Object valid} void foo9() {} } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug65288/Test.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug65288/Test.java index 59cb55a5e34..d7d1ac06de1 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug65288/Test.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug65288/Test.java @@ -1,7 +1,7 @@ package javadoc.testBug65288; -/** - * @see - * @see*/ +/// +/// @see +/// @see public class Test { } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68017/TestInvalid.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68017/TestInvalid.java index 7cfd712a20b..ba3bd02e436 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68017/TestInvalid.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68017/TestInvalid.java @@ -1,13 +1,13 @@ package javadoc.testBug68017; public class TestInvalid { - /**@return*/ + ///@return public int foo1() {return 0; } - /**@return */ + ///@return public int foo2() {return 0; } - /**@return****/ + ///@return public int foo3() {return 0; } - /** - * @return - */ + /// + /// @return + /// public int foo4() {return 0; } } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68017/TestValid.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68017/TestValid.java index 9ae41b22c75..f68e185fd9e 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68017/TestValid.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68017/TestValid.java @@ -1,9 +1,9 @@ package javadoc.testBug68017; public class TestValid { - /**@return integer*/ + ///@return integer public int foo1() {return 0; } - /** - * @return # - */ + /// + /// @return # + /// public int foo2() {return 0; } } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68017/TestWarn1.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68017/TestWarn1.java index 1d69e95dc74..64b55f5b55f 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68017/TestWarn1.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68017/TestWarn1.java @@ -1,8 +1,8 @@ package javadoc.testBug68017; public class TestWarn1 { - /** - * @return* */ + /// + // @return public int foo1() {return 0; } - /**@return** **/ + ///@return** public int foo2() {return 0; } } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68017/TestWarn2.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68017/TestWarn2.java index 7c63b404b1c..19dab1fe6bc 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68017/TestWarn2.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68017/TestWarn2.java @@ -1,7 +1,7 @@ package javadoc.testBug68017; public class TestWarn2 { - /** - * @return# - */ + /// + /// @return# + /// public int foo() {return 0; } } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68025/TestA.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68025/TestA.java index db9750c0b5b..074e897bc47 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68025/TestA.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68025/TestA.java @@ -2,11 +2,11 @@ package javadoc.testBug68025; public class TestA { - /** - * @see IJavaElement#getElementName#bug - * or closer to the reality (COPY is a constant): - * @see org.eclipse.ui.actions.ActionFactory#COPY#getId - */ + /// + /// @see IJavaElement#getElementName#bug + /// or closer to the reality (COPY is a constant): + /// @see org.eclipse.ui.actions.ActionFactory#COPY#getId + //// void foo() { } } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68025/TestB.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68025/TestB.java index d8a82577d92..021bc9594a0 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68025/TestB.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68025/TestB.java @@ -2,16 +2,16 @@ public class TestB { public int field; public void foo() {} - /** - * @see #field#invalid - * @see #foo#invalid - */ + /// + /// @see #field#invalid + /// @see #foo#invalid + /// public void foo1() {} - /**@see Y#field# invalid*/ + ///@see Y#field# invalid public void foo2() {} - /**@see Y#foo# invalid*/ + ///@see Y#foo# invalid public void foo3() {} - /**@see Y#foo()# - *valid*/ + ///@see Y#foo()# + ///valid*/ public void foo4() {} } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68726/TestBug68726conform1.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68726/TestBug68726conform1.java index 48fb7c5586d..1eb3559d2b5 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68726/TestBug68726conform1.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68726/TestBug68726conform1.java @@ -1,9 +1,9 @@ package javadoc.testBug68726; public class TestBug68726conform1 { - /** - * @see Object Eclipse - */ + /// + /// @see Object Eclipse + /// void foo1() {} - /**@see Object Eclipse*/ + ///@see Object Eclipse void foo2() {} } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68726/TestBug68726conform2.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68726/TestBug68726conform2.java index 33b0c66cf26..3fcff633f2c 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68726/TestBug68726conform2.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68726/TestBug68726conform2.java @@ -1,20 +1,20 @@ package javadoc.testBug68726; -/** - * @see IBM Home Page - * @see - * IBM Home Page - * @see - * IBM Home Page - * - * @see - * - * IBM - * - * Home Page - * - * - * - * @see Object - */ +/// + /// @see IBM Home Page + /// @see + /// IBM Home Page + /// @see + /// IBM Home Page + /// + /// @see + /// + /// IBM + /// + /// Home Page + /// + /// + /// + /// @see Object + /// public class TestBug68726conform2 { } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68726/TestBug68726negative1.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68726/TestBug68726negative1.java index b5ff34ad022..5ee058ae4fa 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68726/TestBug68726negative1.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68726/TestBug68726negative1.java @@ -1,21 +1,21 @@ package javadoc.testBug68726; public class TestBug68726negative1 { - /** - * Invalid URL link references - * - * @see - * @see - * @see invalid - * @see invalid< - * @see invalidinvalidinvalid no text allowed after the href - */ + /// + /// Invalid URL link references + /// + /// @see + /// @see + /// @see invalid + /// @see invalid< + /// @see invalidinvalidinvalid no text allowed after the href + /// public void s_foo() { } } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68726/TestBug68726negative2.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68726/TestBug68726negative2.java index 227874ae286..e013c8f47d7 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68726/TestBug68726negative2.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug68726/TestBug68726negative2.java @@ -1,20 +1,20 @@ package javadoc.testBug68726; -/** - * @see IBM Home Page - * @see - * IBM Home Page - * @see - * IBM Home Page< - * /a> - * @see - * - * IBM - * - * Home Page - * - * - * - * @see Unknown Unknown reference - */ +/// + /// @see IBM Home Page + /// @see + /// IBM Home Page + /// @see + /// IBM Home Page< + /// /a> + /// @see + /// + /// IBM + /// + /// Home Page + /// + /// + /// + /// @see Unknown Unknown reference + /// public class TestBug68726negative2 { } diff --git a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug69272/TestClassInvalid.java b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug69272/TestClassInvalid.java index 6fa53837b98..6fbe7aae66e 100644 --- a/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug69272/TestClassInvalid.java +++ b/org.eclipse.jdt.core.tests.model/workspace/Converter_23/src/markdown/testBug69272/TestClassInvalid.java @@ -1,10 +1,10 @@ package javadoc.testBug69272; public class TestClassInvalid { - /**@see Object* */ + ///@see Object* public void foo1() {} - /**@see Object*** ***/ + ///@see Object*** public void foo2() {} - /**@see Object*** - */ + ///@see Object*** + /// public void foo3() {} } diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/DocCommentParser.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/DocCommentParser.java index c125d440e1c..67699c11e0c 100644 --- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/DocCommentParser.java +++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/DocCommentParser.java @@ -761,8 +761,7 @@ protected boolean parseMarkdownLinks(int previousPosition) throws InvalidInputEx // Both tag elements must get the same source range. TagElement previousTag = (TagElement) this.astStack[this.astPtr]; int parentStart = previousTag.getStartPosition(); - int length = this.index - previousPosition + 1; - previousTag.setSourceRange(parentStart, this.index - parentStart + 1); + previousTag.setSourceRange(parentStart, this.index - parentStart); List fragments = previousTag.fragments(); int size = fragments.size(); if (size == 0) { @@ -774,7 +773,6 @@ protected boolean parseMarkdownLinks(int previousPosition) throws InvalidInputEx // If last fragment is a tag, then use it as previous tag ASTNode lastFragment = (ASTNode) fragments.get(size-1); if (lastFragment.getNodeType() == ASTNode.TAG_ELEMENT) { - //lastFragment.setSourceRange(lastFragment.getStartPosition(), length); previousTag = (TagElement) lastFragment; } } diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaConventions.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaConventions.java index b4652340fbf..6c468305214 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaConventions.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaConventions.java @@ -126,7 +126,7 @@ private static synchronized char[] scannedIdentifier(String id, String sourceLev // Set scanner for given source and compliance levels SCANNER.sourceLevel = sourceLevel == null ? ClassFileConstants.JDK1_3 : CompilerOptions.versionToJdkLevel(sourceLevel); SCANNER.complianceLevel = complianceLevel == null ? ClassFileConstants.JDK1_3 : CompilerOptions.versionToJdkLevel(complianceLevel); - SCANNER.previewEnabled = previewEnabled == null ? true : JavaCore.ENABLED.equals(previewEnabled); + SCANNER.previewEnabled = previewEnabled == null ? false : JavaCore.ENABLED.equals(previewEnabled); try { SCANNER.setSource(id.toCharArray()); diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Util.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Util.java index a24bef801ff..ed7cb186e8f 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Util.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Util.java @@ -1772,6 +1772,7 @@ public static boolean isValidCompilationUnitName(String name, String sourceLevel public static boolean isValidFolderNameForPackage(String folderName, String sourceLevel, String complianceLevel) { return JavaConventions.validateIdentifier(folderName, sourceLevel, complianceLevel).getSeverity() != IStatus.ERROR; } + /** * Returns true if the given method signature is valid, * false if it is not.