Skip to content
Open
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -909,4 +909,88 @@ class Mark61 {
formatSource(input, expected);
}

public void testMarkdownAndClassicJoinLinesWhenJoinLinesInCommentsIsFalse() throws JavaModelException {
setComplianceLevel(CompilerOptions.VERSION_23);
this.formatterPrefs.join_lines_in_comments = false;
this.formatterPrefs.comment_line_length = 1000;
String input = """
class Test5 {
/// Lorem ipsum dolor sit amet, consectetur adipiscing elit.
/// Duis sit amet diam nec libero accumsan blandit.
/// Quisque non ornare lacus. Suspendisse porta dolor id diam maximus, sed gravida nunc finibus.
/// Aenean vulputate, mi non iaculis sagittis, erat nibh gravida elit, eget feugiat purus tortor sed sem.
void main() {
}

/**
* Lorem ipsum dolor sit amet, consectetur adipiscing elit.
* Duis sit amet diam nec libero accumsan blandit.
* Quisque non ornare lacus. Suspendisse porta dolor id diam maximus, sed gravida nunc finibus.
* Aenean vulputate, mi non iaculis sagittis, erat nibh gravida elit, eget feugiat purus tortor sed sem.
*/
void main2() {
}
}
""";
String expected = """
class Test5 {
/// Lorem ipsum dolor sit amet, consectetur adipiscing elit.
/// Duis sit amet diam nec libero accumsan blandit.
/// Quisque non ornare lacus. Suspendisse porta dolor id diam maximus, sed gravida nunc finibus.
/// Aenean vulputate, mi non iaculis sagittis, erat nibh gravida elit, eget feugiat purus tortor sed sem.
void main() {
}

/**
* Lorem ipsum dolor sit amet, consectetur adipiscing elit.
* Duis sit amet diam nec libero accumsan blandit.
* Quisque non ornare lacus. Suspendisse porta dolor id diam maximus, sed gravida nunc finibus.
* Aenean vulputate, mi non iaculis sagittis, erat nibh gravida elit, eget feugiat purus tortor sed sem.
*/
void main2() {
}
}
""";
formatSource(input, expected);
}

public void testMarkdownAndClassicJoinLinesWhenJoinLinesInCommentsIsTrue() throws JavaModelException {
setComplianceLevel(CompilerOptions.VERSION_23);
this.formatterPrefs.join_lines_in_comments = true;
this.formatterPrefs.comment_line_length = 1000;
String input = """
class Test5 {
/// Lorem ipsum dolor sit amet, consectetur adipiscing elit.
/// Duis sit amet diam nec libero accumsan blandit.
/// Quisque non ornare lacus. Suspendisse porta dolor id diam maximus, sed gravida nunc finibus.
/// Aenean vulputate, mi non iaculis sagittis, erat nibh gravida elit, eget feugiat purus tortor sed sem.
void main() {
}

/**
* Lorem ipsum dolor sit amet, consectetur adipiscing elit.
* Duis sit amet diam nec libero accumsan blandit.
* Quisque non ornare lacus. Suspendisse porta dolor id diam maximus, sed gravida nunc finibus.
* Aenean vulputate, mi non iaculis sagittis, erat nibh gravida elit, eget feugiat purus tortor sed sem.
*/
void main2() {
}
}
""";
String expected = """
class Test5 {
/// Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis sit amet diam nec libero accumsan blandit. Quisque non ornare lacus. Suspendisse porta dolor id diam maximus, sed gravida nunc finibus. Aenean vulputate, mi non iaculis sagittis, erat nibh gravida elit, eget feugiat purus tortor sed sem.
void main() {
}

/**
* Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis sit amet diam nec libero accumsan blandit. Quisque non ornare lacus. Suspendisse porta dolor id diam maximus, sed gravida nunc finibus. Aenean vulputate, mi non iaculis sagittis, erat nibh gravida elit, eget feugiat purus tortor sed sem.
*/
void main2() {
}
}
""";
formatSource(input, expected);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -1512,7 +1512,7 @@ private boolean tokenizeMultilineComment(Token commentToken) {
if (lineBreaks > 0) {
if (cleanBlankLines && !isMarkdown)
lineBreaks = 1;
if (lineBreaks > 1 || (!this.options.join_lines_in_comments && !isMarkdown))
if (lineBreaks > 1 || !this.options.join_lines_in_comments)
outputToken.putLineBreaksBefore(lineBreaks);
}
if (this.tm.charAt(tokenStart) == '@') {
Expand Down
Loading