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

Fix multiline links in javadoc and wrong linebreaking of <pre> bodies #1518

Merged
merged 3 commits into from
Oct 8, 2020

Conversation

BarkingBad
Copy link
Contributor

@BarkingBad BarkingBad commented Oct 1, 2020

I decided to do that in one PR, because fixes implementation depends on same code sections

Multiline links

/**
 * Here comes some comment
 *
 * {@link example.SomeClassToLink#someFunc(int, Object) someName(ads,
 * dsa)}
 *
 * longer comment
 */
public class SomeJavaDocExample {
}

obraz

Pre tags bodies formatting

/**
 * <pre class="prettyprint">
 * class MyFragment extends Fragment {
 *   public MyFragment() {
 *     super(R.layout.fragment_main);
 *   }
 * }
 * </pre>
 */

obraz

@BarkingBad BarkingBad linked an issue Oct 1, 2020 that may be closed by this pull request
@BarkingBad BarkingBad force-pushed the multiline-doctags branch 2 times, most recently from 951d66b to ac9fe0e Compare October 1, 2020 08:54
@BarkingBad BarkingBad linked an issue Oct 1, 2020 that may be closed by this pull request
@BarkingBad BarkingBad changed the title Fix multiline links in javadoc Fix multiline links in javadoc and wrong linebreaking of <pre> bodies Oct 1, 2020
} ?: Pair(listOf(defaultLabel()), "UNRESOLVED_PSI_ELEMENT")).let { (label, dri) ->
"""<a data-dri=$dri>${label.joinToString(" ") { it.text }}</a>"""
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's add data-unresolved-dri-link instead for unresolved elements

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to do that we would need to have a dri for that, which in this case is not possible

@kamildoleglo kamildoleglo force-pushed the multiline-doctags branch 9 times, most recently from db42f5e to 591b1bd Compare October 8, 2020 17:14
@MarcinAman MarcinAman merged commit 75f572b into master Oct 8, 2020
@MarcinAman MarcinAman deleted the multiline-doctags branch October 8, 2020 18:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Multiline doc tags don't parse correctly Some pre tags in javadoc still being parsed incorrectly
4 participants