Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test/JavaDoc: fix test config according to title #4533

Merged
merged 1 commit into from
Nov 10, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 30 additions & 28 deletions scalafmt-tests/shared/src/test/resources/test/JavaDoc.stat
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ class Main
* Top line. Indent0 Indent1 Indent2 Indent3 Indent4
*/
class Main
<<< #1403 2: fold Asterisk
<<< #1403 2: oneline=fold Asterisk
docstrings.oneline = fold
docstrings.style = Asterisk
===
Expand All @@ -171,7 +171,7 @@ class Main
>>>
/** Main entry-point. */
class Main
<<< #1403 2: fold SpaceAsterisk
<<< #1403 2: oneline=fold SpaceAsterisk
docstrings.oneline = fold
docstrings.style = SpaceAsterisk
===
Expand All @@ -182,7 +182,7 @@ class Main
>>>
/** Main entry-point. */
class Main
<<< #1403 2: fold AsteriskSpace
<<< #1403 2: oneline=fold AsteriskSpace
docstrings.oneline = fold
docstrings.style = AsteriskSpace
===
Expand All @@ -193,7 +193,7 @@ class Main
>>>
/** Main entry-point. */
class Main
<<< #1403 3: unfold Asterisk
<<< #1403 3: oneline=unfold Asterisk
docstrings.oneline = unfold
docstrings.style = Asterisk
===
Expand All @@ -204,7 +204,7 @@ class Main
* Main entry-point.
*/
class Main
<<< #1403 3: unfold SpaceAsterisk
<<< #1403 3: oneline=unfold SpaceAsterisk
docstrings.oneline = unfold
docstrings.style = SpaceAsterisk
===
Expand All @@ -214,7 +214,7 @@ class Main
/** Main entry-point.
*/
class Main
<<< #1403 3: unfold AsteriskSpace
<<< #1403 3: oneline=unfold AsteriskSpace
docstrings.oneline = unfold
docstrings.style = AsteriskSpace
===
Expand Down Expand Up @@ -1490,7 +1490,7 @@ object a {
*/
class QueueSequentialBenchmark {}
}
<<< #2028 Asterisk keep
<<< #2028 Asterisk oneline=keep
docstrings.style = Asterisk
docstrings.oneline = keep
===
Expand Down Expand Up @@ -1520,7 +1520,7 @@ object a {
* alias for [[literal]]
*/
}
<<< #2028 Asterisk keep, blankFirst
<<< #2028 Asterisk oneline=keep, blankFirst
docstrings.style = Asterisk
docstrings.oneline = keep
docstrings.blankFirstLine = true
Expand Down Expand Up @@ -1551,7 +1551,7 @@ object a {
* alias for [[literal]]
*/
}
<<< #2028 Asterisk keep, !blankFirst
<<< #2028 Asterisk oneline=keep, !blankFirst
docstrings.style = Asterisk
docstrings.oneline = keep
docstrings.blankFirstLine = false
Expand Down Expand Up @@ -1582,7 +1582,7 @@ object a {
* alias for [[literal]]
*/
}
<<< #2028 Asterisk fold
<<< #2028 Asterisk oneline=fold
docstrings.style = Asterisk
docstrings.oneline = fold
===
Expand Down Expand Up @@ -1610,7 +1610,7 @@ object a {
* alias for [[literal]]
*/
}
<<< #2028 Asterisk unfold
<<< #2028 Asterisk oneline=unfold
docstrings.style = Asterisk
docstrings.oneline = unfold
===
Expand Down Expand Up @@ -1642,7 +1642,7 @@ object a {
* alias for [[literal]]
*/
}
<<< #2028 SpaceAsterisk keep
<<< #2028 SpaceAsterisk oneline=keep
docstrings.style = SpaceAsterisk
docstrings.oneline = keep
===
Expand Down Expand Up @@ -1670,7 +1670,7 @@ object a {
* alias for [[literal]]
*/
}
<<< #2028 SpaceAsterisk keep, blankFirst
<<< #2028 SpaceAsterisk oneline=keep, blankFirst
docstrings.style = SpaceAsterisk
docstrings.oneline = keep
docstrings.blankFirstLine = true
Expand Down Expand Up @@ -1701,7 +1701,7 @@ object a {
* alias for [[literal]]
*/
}
<<< #2028 SpaceAsterisk keep, !blankFirst
<<< #2028 SpaceAsterisk oneline=keep, !blankFirst
docstrings.style = SpaceAsterisk
docstrings.oneline = keep
docstrings.blankFirstLine = false
Expand Down Expand Up @@ -1730,7 +1730,7 @@ object a {
* alias for [[literal]]
*/
}
<<< #2028 SpaceAsterisk fold
<<< #2028 SpaceAsterisk oneline=fold
docstrings.style = SpaceAsterisk
docstrings.oneline = fold
===
Expand All @@ -1757,7 +1757,7 @@ object a {
* alias for [[literal]]
*/
}
<<< #2028 SpaceAsterisk unfold
<<< #2028 SpaceAsterisk oneline=unfold
docstrings.style = SpaceAsterisk
docstrings.oneline = unfold
===
Expand Down Expand Up @@ -1786,7 +1786,7 @@ object a {
* alias for [[literal]]
*/
}
<<< #2028 AsteriskSpace keep
<<< #2028 AsteriskSpace oneline=keep
docstrings.style = AsteriskSpace
docstrings.oneline = keep
===
Expand Down Expand Up @@ -1814,7 +1814,7 @@ object a {
* alias for [[literal]]
*/
}
<<< #2028 AsteriskSpace keep, blankFirst
<<< #2028 AsteriskSpace oneline=keep, blankFirst
docstrings.style = AsteriskSpace
docstrings.oneline = keep
docstrings.blankFirstLine = true
Expand Down Expand Up @@ -1845,7 +1845,7 @@ object a {
* alias for [[literal]]
*/
}
<<< #2028 AsteriskSpace keep, !blankFirst
<<< #2028 AsteriskSpace oneline=keep, !blankFirst
docstrings.style = AsteriskSpace
docstrings.oneline = keep
docstrings.blankFirstLine = false
Expand Down Expand Up @@ -1874,7 +1874,7 @@ object a {
* alias for [[literal]]
*/
}
<<< #2028 AsteriskSpace fold
<<< #2028 AsteriskSpace oneline=fold
docstrings.style = AsteriskSpace
docstrings.oneline = fold
===
Expand All @@ -1901,7 +1901,7 @@ object a {
* alias for [[literal]]
*/
}
<<< #2028 AsteriskSpace unfold
<<< #2028 AsteriskSpace oneline=unfold
docstrings.style = AsteriskSpace
docstrings.oneline = unfold
===
Expand Down Expand Up @@ -1930,7 +1930,7 @@ object a {
* alias for [[literal]]
*/
}
<<< #2028 Asterisk long, fold, wrap
<<< #2028 Asterisk long, oneline=fold, wrap
docstrings.style = Asterisk
docstrings.oneline = fold
docstrings.wrap = yes
Expand Down Expand Up @@ -1967,9 +1967,9 @@ object a {
* for [[literal]]
*/
}
<<< #2028 Asterisk long, keep, wrap
<<< #2028 Asterisk long, oneline=keep, wrap
docstrings.style = Asterisk
docstrings.oneline = fold
docstrings.oneline = keep
docstrings.wrap = yes
maxColumn = 25
===
Expand Down Expand Up @@ -2004,7 +2004,7 @@ object a {
* for [[literal]]
*/
}
<<< #2028 Asterisk long, fold, !wrap
<<< #2028 Asterisk long, oneline=fold, !wrap
docstrings.style = Asterisk
docstrings.oneline = fold
docstrings.wrap = no
Expand Down Expand Up @@ -2034,9 +2034,9 @@ object a {
* alias for [[literal]]
*/
}
<<< #2028 Asterisk long, keep, !wrap
<<< #2028 Asterisk long, oneline=keep, !wrap
docstrings.style = Asterisk
docstrings.oneline = fold
docstrings.oneline = keep
docstrings.wrap = no
maxColumn = 25
===
Expand All @@ -2058,7 +2058,9 @@ object a {
object a {

/** alias for [[literal]] */
/** alias for [[literal]] */
/**
* alias for [[literal]]
*/
/**
* alias for [[literal]]
* alias for [[literal]]
Expand Down
Loading