From 5d05012a00d8098a90a85fbab4db937013893c04 Mon Sep 17 00:00:00 2001 From: "Andrey.Cherkasov" Date: Thu, 23 Dec 2021 16:17:21 +0300 Subject: [PATCH] Add a few unicode symbols to Javadoc comment (IJ-CR-18896) GitOrigin-RevId: 8f939fe7d71e8a25067499e2bbf4002ddbd34877 --- .../addJavadoc/afterDifferentParamNames.java | 4 +- .../afterMethodCommentInheritance.java | 69 ++++++++++++++----- .../addJavadoc/beforeDifferentParamNames.java | 2 +- .../beforeMethodCommentInheritance.java | 50 +++++++++++--- 4 files changed, 92 insertions(+), 33 deletions(-) diff --git a/java/java-tests/testData/codeInsight/addJavadoc/afterDifferentParamNames.java b/java/java-tests/testData/codeInsight/addJavadoc/afterDifferentParamNames.java index 7941a8d1bfa2..54527f2f7803 100644 --- a/java/java-tests/testData/codeInsight/addJavadoc/afterDifferentParamNames.java +++ b/java/java-tests/testData/codeInsight/addJavadoc/afterDifferentParamNames.java @@ -5,7 +5,7 @@ class A { * @param b it's a description * for the * second param - * @param a it's a description for the first param + * @param a it's a description for the first param * @param blah it's a description * for a nonexistent parameter * @param c it's a description @@ -16,7 +16,7 @@ class A { class B extends A { /** - * @param x it's a description for the first param + * @param x it's a description for the first param * @param y it's a description * for the * second param diff --git a/java/java-tests/testData/codeInsight/addJavadoc/afterMethodCommentInheritance.java b/java/java-tests/testData/codeInsight/addJavadoc/afterMethodCommentInheritance.java index 69a935f4c601..bc667f2272ef 100644 --- a/java/java-tests/testData/codeInsight/addJavadoc/afterMethodCommentInheritance.java +++ b/java/java-tests/testData/codeInsight/addJavadoc/afterMethodCommentInheritance.java @@ -18,13 +18,14 @@ interface ClazzInterface1Interface2 { /** * @param a blah blah blah - * @param h must be copied to 8th place + * @param h must be copied to 8th place. Just + * a few unicode symbols: <?> * @param b blah blah blah * @param c blah blah blah * @param d blah blah blah * @param g blah blah blah */ - void foo(int a, int b, int c, int d, int e, int f, int g, int h); + void foo(int a, int b, int c, int d, int e, int f, int g, int h, int i, int j); } interface ClazzInterface1Interface1 { @@ -36,7 +37,7 @@ interface ClazzInterface1Interface1 { * @param gg must be copied to 7th place * @param ee blah blah blah */ - void foo(int aa, int bb, int cc, int dd, int ee, int ff, int gg, int hh); + void foo(int aa, int bb, int cc, int dd, int ee, int ff, int gg, int hh, int ii, int jj); } class ClazzClazz { @@ -50,7 +51,8 @@ class ClazzClazz { * @param ccc blah blah blah * @param ggg blah blah blah */ - void foo(int aaa, int bbb, int ccc, int ddd, int eee, int fff, int ggg, int hhh) {} + void foo(int aaa, int bbb, int ccc, int ddd, int eee, int fff, int ggg, int hhh, int iii, int jjj) { + } } interface ClazzInterface1 extends ClazzInterface1Interface1, ClazzInterface1Interface2 { @@ -60,7 +62,7 @@ interface ClazzInterface1 extends ClazzInterface1Interface1, ClazzInterface1Inte * @param bbbb blah blah blah * @param cccc blah blah blah */ - void foo(int aaaa, int bbbb, int cccc, int dddd, int eeee, int ffff, int gggg, int hhhh); + void foo(int aaaa, int bbbb, int cccc, int dddd, int eeee, int ffff, int gggg, int hhhh, int iiii, int jjjj); } interface ClazzInterface2 { @@ -71,7 +73,7 @@ interface ClazzInterface2 { * @param aaaaa blah blah blah * @param eeeee must be copied to 5th place */ - void foo(int aaaaa, int bbbbb, int ccccc, int ddddd, int eeeee, int fffff, int ggggg, int hhhhh); + void foo(int aaaaa, int bbbbb, int ccccc, int ddddd, int eeeee, int fffff, int ggggg, int hhhhh, int iiiii, int jjjjj); } class Clazz extends ClazzClazz implements ClazzInterface1, ClazzInterface2 { @@ -80,14 +82,39 @@ class Clazz extends ClazzClazz implements ClazzInterface1, ClazzInterface2 { * @param bbbbbb blah blah blah * @param cccccc must be copied to 3rd place */ - public void foo(int aaaaaa, int bbbbbb, int cccccc, int dddddd, int eeeeee, int ffffff, int gggggg, int hhhhhh) {} + public void foo(int aaaaaa, int bbbbbb, int cccccc, int dddddd, int eeeeee, int ffffff, int gggggg, int hhhhhh, int iiiiii, int jjjjjj) { + } } -interface Interface1 { +interface Interface1Interface1 { + /** + * @param x10 must be copied to 10th place + */ + void foo(int x1, int x2, int x3, int x4, int x5, int x6, int x7, int x8, int x9, int x10); +} + +interface Interface1Interface2 { + /** + * @param b9 must be copied to 9th place + * @param b10 blah blah blah + */ + void foo(int b1, int b2, int b3, int b4, int b5, int b6, int b7, int b8, int b9, int b10); +} + +interface Interface1 extends Interface1Interface1, Interface1Interface2 { /** * @param parameter1 must be copied to 1st place */ - void foo(int parameter1, int parameter2, int parameter3, int parameter4, int parameter5, int parameter6, int parameter7, int parameter8); + void foo(int parameter1, + int parameter2, + int parameter3, + int parameter4, + int parameter5, + int parameter6, + int parameter7, + int parameter8, + int parameter9, + int parameter10); } interface Interface2 { @@ -95,19 +122,23 @@ interface Interface2 { * @param param2 must be copied to 2nd place * @param param1 blah blah blah */ - void foo(int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8); + void foo(int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, int param10); } class Test extends Clazz implements Interface1, Interface2 { /** - * @param p1 must be copied to 1st place - * @param p2 must be copied to 2nd place - * @param p3 must be copied to 3rd place - * @param p4 must be copied to 4th place - * @param p5 must be copied to 5th place - * @param p6 must be copied to 6th place - * @param p7 must be copied to 7th place - * @param p8 must be copied to 8th place + * @param p1 must be copied to 1st place + * @param p2 must be copied to 2nd place + * @param p3 must be copied to 3rd place + * @param p4 must be copied to 4th place + * @param p5 must be copied to 5th place + * @param p6 must be copied to 6th place + * @param p7 must be copied to 7th place + * @param p8 must be copied to 8th place. Just + * a few unicode symbols: <?> + * @param p9 must be copied to 9th place + * @param p10 must be copied to 10th place */ - public void foo(int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8) {} + public void foo(int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8, int p9, int p10) { + } } \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/addJavadoc/beforeDifferentParamNames.java b/java/java-tests/testData/codeInsight/addJavadoc/beforeDifferentParamNames.java index 16ec8d815dfd..8eb751222799 100644 --- a/java/java-tests/testData/codeInsight/addJavadoc/beforeDifferentParamNames.java +++ b/java/java-tests/testData/codeInsight/addJavadoc/beforeDifferentParamNames.java @@ -5,7 +5,7 @@ class A { * @param b it's a description * for the * second param - * @param a it's a description for the first param + * @param a it's a description for the first param * @param blah it's a description * for a nonexistent parameter * @param c it's a description diff --git a/java/java-tests/testData/codeInsight/addJavadoc/beforeMethodCommentInheritance.java b/java/java-tests/testData/codeInsight/addJavadoc/beforeMethodCommentInheritance.java index f9fbaef2863d..b97195abf294 100644 --- a/java/java-tests/testData/codeInsight/addJavadoc/beforeMethodCommentInheritance.java +++ b/java/java-tests/testData/codeInsight/addJavadoc/beforeMethodCommentInheritance.java @@ -18,13 +18,14 @@ interface ClazzInterface1Interface2 { /** * @param a blah blah blah - * @param h must be copied to 8th place + * @param h must be copied to 8th place. Just + * a few unicode symbols: <?> * @param b blah blah blah * @param c blah blah blah * @param d blah blah blah * @param g blah blah blah */ - void foo(int a, int b, int c, int d, int e, int f, int g, int h); + void foo(int a, int b, int c, int d, int e, int f, int g, int h, int i, int j); } interface ClazzInterface1Interface1 { @@ -36,7 +37,7 @@ interface ClazzInterface1Interface1 { * @param gg must be copied to 7th place * @param ee blah blah blah */ - void foo(int aa, int bb, int cc, int dd, int ee, int ff, int gg, int hh); + void foo(int aa, int bb, int cc, int dd, int ee, int ff, int gg, int hh, int ii, int jj); } class ClazzClazz { @@ -50,7 +51,8 @@ class ClazzClazz { * @param ccc blah blah blah * @param ggg blah blah blah */ - void foo(int aaa, int bbb, int ccc, int ddd, int eee, int fff, int ggg, int hhh) {} + void foo(int aaa, int bbb, int ccc, int ddd, int eee, int fff, int ggg, int hhh, int iii, int jjj) { + } } interface ClazzInterface1 extends ClazzInterface1Interface1, ClazzInterface1Interface2 { @@ -60,7 +62,7 @@ interface ClazzInterface1 extends ClazzInterface1Interface1, ClazzInterface1Inte * @param bbbb blah blah blah * @param cccc blah blah blah */ - void foo(int aaaa, int bbbb, int cccc, int dddd, int eeee, int ffff, int gggg, int hhhh); + void foo(int aaaa, int bbbb, int cccc, int dddd, int eeee, int ffff, int gggg, int hhhh, int iiii, int jjjj); } interface ClazzInterface2 { @@ -71,7 +73,7 @@ interface ClazzInterface2 { * @param aaaaa blah blah blah * @param eeeee must be copied to 5th place */ - void foo(int aaaaa, int bbbbb, int ccccc, int ddddd, int eeeee, int fffff, int ggggg, int hhhhh); + void foo(int aaaaa, int bbbbb, int ccccc, int ddddd, int eeeee, int fffff, int ggggg, int hhhhh, int iiiii, int jjjjj); } class Clazz extends ClazzClazz implements ClazzInterface1, ClazzInterface2 { @@ -80,14 +82,39 @@ class Clazz extends ClazzClazz implements ClazzInterface1, ClazzInterface2 { * @param bbbbbb blah blah blah * @param cccccc must be copied to 3rd place */ - public void foo(int aaaaaa, int bbbbbb, int cccccc, int dddddd, int eeeeee, int ffffff, int gggggg, int hhhhhh) {} + public void foo(int aaaaaa, int bbbbbb, int cccccc, int dddddd, int eeeeee, int ffffff, int gggggg, int hhhhhh, int iiiiii, int jjjjjj) { + } } -interface Interface1 { +interface Interface1Interface1 { + /** + * @param x10 must be copied to 10th place + */ + void foo(int x1, int x2, int x3, int x4, int x5, int x6, int x7, int x8, int x9, int x10); +} + +interface Interface1Interface2 { + /** + * @param b9 must be copied to 9th place + * @param b10 blah blah blah + */ + void foo(int b1, int b2, int b3, int b4, int b5, int b6, int b7, int b8, int b9, int b10); +} + +interface Interface1 extends Interface1Interface1, Interface1Interface2 { /** * @param parameter1 must be copied to 1st place */ - void foo(int parameter1, int parameter2, int parameter3, int parameter4, int parameter5, int parameter6, int parameter7, int parameter8); + void foo(int parameter1, + int parameter2, + int parameter3, + int parameter4, + int parameter5, + int parameter6, + int parameter7, + int parameter8, + int parameter9, + int parameter10); } interface Interface2 { @@ -95,9 +122,10 @@ interface Interface2 { * @param param2 must be copied to 2nd place * @param param1 blah blah blah */ - void foo(int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8); + void foo(int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, int param10); } class Test extends Clazz implements Interface1, Interface2 { - public void foo(int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8) {} + public void foo(int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8, int p9, int p10) { + } } \ No newline at end of file