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

Description list support for JavaDocs (#2213) #2259

Merged
merged 3 commits into from Dec 14, 2021

Conversation

IgnatBeresnev
Copy link
Member

@IgnatBeresnev IgnatBeresnev commented Dec 6, 2021

Comment on lines +361 to +372
/**
* If used within [DescriptionList] context, specifies a term in a description
* or definition list, usually followed by [DescriptionDetails] for one or more
* terms. Formatting example: see `<dt>` html tag
*/
DescriptionTerm,

/**
* If used within [DescriptionList] context, provides the definition or other
* related text associated with [DescriptionTerm]. Formatting example: see `<dd>` html tag
*/
DescriptionDetails
Copy link
Member Author

Choose a reason for hiding this comment

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

I thought about extracting it to a separate enum ListContentStyle, but it seems unlikely that we'll ever add anything else there, so probably not worth it

Copy link
Member

@vmishenev vmishenev left a comment

Choose a reason for hiding this comment

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

  • This does not work with:
<dl>
    <div>
        <dt>Term1</dt>
        <dd>Desc2</dd>
    </div>
    <div>
        <dt>Term2</dt>
        <dd>Desc2</dd>
    </div>
</dl> 
  • What is about another tags, e.g. dfn?

@IgnatBeresnev
Copy link
Member Author

This does not work with:

<dl>
  <div>
       <dt>Term1</dt>
       <dd>Desc2</dd>
   </div>
   <div>
       <dt>Term2</dt>
       <dd>Desc2</dd>
   </div>
</dl> 

Unfortunately, it seems to be the limitation of the content model in general since there's no separate content type for list items, which are now handled as ContentGroup. For instance, for ul/ol, we consider all children to be li, even if they're not. In javadocs it results in this

    /**
     * <ul>
     *     <div>one</div>
     *     <div>two</div>
     * </ul>
     */

being rendered as

  • one
  • two

As for description lists, dl is ContentList and dt/dd are ContentGroup with a list style, and just like for ol/ul, I only look for list items among the top level children. If we want to be able to render nested dd/dt using the current content model, I see the following options:

  • Map dt/dd into ContentList (but this won't work for ol/ul due to nested lists)
  • Add an if (node.hasStyle(DescriptionTag)) into buildGroup

And I don't like either solution :)

We could extend the content model and introduce ContentListItem and render it separately, but I would expect you not to like it ;)

All in all, I don't see an easy way out, let me know if you do. Hopefully your example is a rare case and the solution can be postponed

@IgnatBeresnev
Copy link
Member Author

What is about another tags, e.g. dfn?

It seems like dfn can indeed be used within description lists, but it's not exclusive to that, so I think it falls more under "support more javadoc html tags", which I indeed didn't do. We can plan it as a separate issue/pr

@vmishenev
Copy link
Member

vmishenev commented Dec 7, 2021

It seems like dfn can indeed be used within description lists, but it's not exclusive to that

It is a good case to think about the design of styles beforehand.

We can plan it as a separate issue/pr

Can you open an issue for it?

@vmishenev
Copy link
Member

    /**
     * <ul>
     *     <div>one</div>
     *     <div>two</div>
     * </ul>
     */

It is impossible for HTML scheme.
See https://html.spec.whatwg.org/multipage/grouping-content.html#the-ul-element

@IgnatBeresnev IgnatBeresnev linked an issue Dec 8, 2021 that may be closed by this pull request
Copy link
Member

@vmishenev vmishenev left a comment

Choose a reason for hiding this comment

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

Please add my case to tests

kodiakhq bot pushed a commit to RBusarow/Dispatch that referenced this pull request Jul 16, 2022
[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.jetbrains.dokka](https://togithub.com/Kotlin/dokka) | `1.5.31` -> `1.7.10` | [![age](https://badges.renovateapi.com/packages/maven/org.jetbrains.dokka/1.7.10/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.jetbrains.dokka/1.7.10/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.jetbrains.dokka/1.7.10/compatibility-slim/1.5.31)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.jetbrains.dokka/1.7.10/confidence-slim/1.5.31)](https://docs.renovatebot.com/merge-confidence/) |
| [org.jetbrains.dokka:dokka-gradle-plugin](https://togithub.com/Kotlin/dokka) | `1.5.31` -> `1.7.10` | [![age](https://badges.renovateapi.com/packages/maven/org.jetbrains.dokka:dokka-gradle-plugin/1.7.10/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.jetbrains.dokka:dokka-gradle-plugin/1.7.10/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.jetbrains.dokka:dokka-gradle-plugin/1.7.10/compatibility-slim/1.5.31)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.jetbrains.dokka:dokka-gradle-plugin/1.7.10/confidence-slim/1.5.31)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes

<details>
<summary>Kotlin/dokka</summary>

### [`v1.7.10`](https://togithub.com/Kotlin/dokka/releases/tag/v1.7.10)

Bugfix release that addresses several blockers and regressions.

##### General

-   Support `Kotlin` 1.7.10

##### Gradle plugin

-   Do not expose `Kotlin` stdlib in plugin dependencies, this should fix errors like `Module was compiled with an incompatible version of Kotlin` when using `Dokka`. Thanks to [@&#8203;martinbonnin](https://togithub.com/martinbonnin) ([#&#8203;2543](https://togithub.com/Kotlin/dokka/issues/2543))

##### Java sources

-   Fixed build failure caused by having configured source links for `Java` code ([#&#8203;2544](https://togithub.com/Kotlin/dokka/issues/2544))
-   Fixed several exotic problems that led to build failures, all related to using annotation in `Java` sources ([#&#8203;2509](https://togithub.com/Kotlin/dokka/issues/2509), [#&#8203;2551](https://togithub.com/Kotlin/dokka/issues/2551), [#&#8203;2350](https://togithub.com/Kotlin/dokka/issues/2350))
-   Fixed `IntelliJ` platform `WARN: Attempt to load key` messages that appeared when analyzing `Java` sources ([#&#8203;2559](https://togithub.com/Kotlin/dokka/issues/2559))

### [`v1.7.0`](https://togithub.com/Kotlin/dokka/releases/tag/v1.7.0)

##### Improvements

##### General

-   Update to `Kotlin` 1.7.0, `IntelliJ` Platform 213
-   Support [definitely non-nullable types](https://kotlinlang.org/docs/whatsnew17.html#stable-definitely-non-nullable-types) ([Kotlin/dokka#2520)
-   Don't expose enum entry constructor arguments, thanks to [@&#8203;ebraminio](https://togithub.com/ebraminio) ([Kotlin/dokka#2497)
-   Preserve ordering of enum entries as in source code, previously reversed ([Kotlin/dokka#2469)
-   Improve support for inherited `Java` fields with accessors, now properly interpreted as `val`/`var` properties ([Kotlin/dokka#2481, [Kotlin/dokka#2532, [Kotlin/dokka#2540)
-   Skip `@Deprecated` members with `HIDDEN` level ([Kotlin/dokka#2486)
-   Make rendered default value dependent on source set for expect/actual declarations ([Kotlin/dokka#2449)

##### HTML format

-   Render quotes as blockquotes instead of code blocks, thanks to [@&#8203;TheOnlyTails](https://togithub.com/TheOnlyTails) ([Kotlin/dokka#2496)

##### Javadoc format

-   Make `Javadoc` pages generation deterministic ([Kotlin/dokka#2479)
-   Update shipped `jQuery` to avoid multiple CVEs, thanks to [@&#8203;ToppleTheNun](https://togithub.com/ToppleTheNun) ([Kotlin/dokka#1938)

##### GFM format

-   Support rendering of code blocks and inline code used in KDocs, thanks to [@&#8203;cosinekitty](https://togithub.com/cosinekitty) ([Kotlin/dokka#2485)

##### Kotlin-as-Java plugin

-   Include `Java` access modifiers into function signatures, thanks to [@&#8203;tripolkaandrey](https://togithub.com/tripolkaandrey) ([Kotlin/dokka#2510)

##### Gradle runner

-   Make `dokka-analysis` dependency `compileOnly`, this should help avoid compatibility problems if different versions of `Kotlin` are bundled in `Gradle` and `Dokka` ([Kotlin/dokka#2521)
-   Enable stricter validation for cacheable `Gradle` tasks, thanks to [@&#8203;3flex](https://togithub.com/3flex) ([Kotlin/dokka#2500)
-   Remove unused & redundant dependencies for `Gradle` runner, thanks to [@&#8203;3flex](https://togithub.com/3flex) ([Kotlin/dokka#2502)
-   Remove outdated suppression in `Gradle` runner, thanks to [@&#8203;3flex](https://togithub.com/3flex) ([Kotlin/dokka#2501)

##### Fixes

##### General bugfixes

-   Fixed a compiler deadlock issue which led to stalling builds in some KMP projects ([Kotlin/dokka#2480)
-   Fixed incorrect argument names of functional type parameters ([Kotlin/dokka#2478)
-   Fixed missing external docs for AndroidX libraries, thanks to [@&#8203;EdricChan03](https://togithub.com/EdricChan03) ([Kotlin/dokka#2456)
-   Fixed tests failing on Windows, thanks to [@&#8203;3flex](https://togithub.com/3flex) ([Kotlin/dokka#2507)

##### Security

-   Get rid of bundled `log4j` 1.2 that came as a transitive dependency ([Kotlin/dokka#2488)
-   Update Jackson to avoid [CVE-2020-36518](https://nvd.nist.gov/vuln/detail/CVE-2020-36518), thanks to [@&#8203;1mt](https://togithub.com/1mt) ([Kotlin/dokka#2525)

##### Plugin API

-   Decompose `base.ftl` template: now `header.ftl`, `footer.ftl` and `page_metadata.ftl` can be overridden individually ([Kotlin/dokka#2432)

##### Other

-   Add Kotlin stability & support badges, thanks to [@&#8203;etolstoy](https://togithub.com/etolstoy) ([Kotlin/dokka#2511)
-   Remove an unused runner parameter, thanks to [@&#8203;3flex](https://togithub.com/3flex) ([Kotlin/dokka#2498)
-   Correct typos, thanks to [@&#8203;PaladiRka](https://togithub.com/PaladiRka) ([Kotlin/dokka#2504) and [@&#8203;mahozad](https://togithub.com/mahozad) ([Kotlin/dokka#2506)!

Thanks to all the contributors!

### [`v1.6.21`](https://togithub.com/Kotlin/dokka/releases/tag/v1.6.21)

This is a bugfix release that mostly enables building documentation for multiplatform projects that utilize `.klib` libraries.

##### Changes

-   Support Kotlin 1.6.21
-   Update `jsoup` dependency to avoid [CVE-2021-37714](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-37714) ([#&#8203;2448](https://togithub.com/Kotlin/dokka/issues/2448))

##### Bugfixes

-   Support `KLIB` libraries for common platform, previously led to `ERROR CLASS` instead of references in documentation ([#&#8203;2441](https://togithub.com/Kotlin/dokka/issues/2441))
-   Fixed a maven plugin build problem related to coroutines which only occurred in multi-module builds ([#&#8203;2461](https://togithub.com/Kotlin/dokka/issues/2461))

### [`v1.6.20`](https://togithub.com/Kotlin/dokka/releases/tag/v1.6.20)

#### Features

-   Introduce `documentedVisibilities` setting that allows including/excluding any visibility modifier in documentation. This is a more flexible replacement for `includeNonPublic`, which has now been deprecated ([Kotlin/dokka#2270)
-   Make HTML pages customizable through FreeMarker HTML templates ([Kotlin/dokka#2374)
-   Add global settings to JSON dokka CLI input ([Kotlin/dokka#2292), thanks to [@&#8203;BarkingBad](https://togithub.com/BarkingBad)!

#### HTML format changes

-   Add vertical alignment (wrapping) of signatures when 3 and more parameters are present ([Kotlin/dokka#2309)
-   Enhance primary constructor signature, display `val`/`var` keywords and default values ([Kotlin/dokka#2313)
-   Add a level of indentation to childless items in navigation tree ([Kotlin/dokka#2291)
-   Add horizontal margin to breadcrumbs delimiter ([Kotlin/dokka#2285)
-   Fixed various CSS rendering issues ([Kotlin/dokka#2284, [Kotlin/dokka#2389)

#### Bugfixes

-   Fixed `OutOfMemoryError: Metaspace`-related issues for the majority of cases ([Kotlin/dokka#2216)
-   Fixed classpath issues for HMPP libraries ([Kotlin/dokka#2431)
-   Using `@` symbol within code blocks in `.md` files doesn't lead to cropped documents anymore ([Kotlin/dokka#2418)
-   Fixed incorrect placement of HTML head tags, which led to missing favicon in multi-module projects ([Kotlin/dokka#2365)
-   Fixed resolution of ultralight methods that led to flaky signature generation ([Kotlin/dokka#2400)
-   Coroutines dispatchers are now shut down after each module pass to avoid resource leaks ([Kotlin/dokka#2325)
-   Suppressed property setters are now excluded from documentation ([Kotlin/dokka#2220)
-   Suppressing extensions doesn't fail builds anymore ([Kotlin/dokka#2348), thanks to [@&#8203;BarkingBad](https://togithub.com/BarkingBad)!
-   Fixed java getter / setter name generation for kotlin-java interop, now `isBoolean` instead of `getBoolean` ([Kotlin/dokka#2356), thanks to [@&#8203;CharlesG-Branch](https://togithub.com/CharlesG-Branch)!
-   Fixed MathJax plugin, previously completely broken ([Kotlin/dokka#2342), thanks to [@&#8203;wyskoj](https://togithub.com/wyskoj)!
-   Fixed Input/Output streams to minimize resource leaks ([Kotlin/dokka#2312, [Kotlin/dokka#2319)

#### Plugin API Changes

-   Add an extension point for rendering custom [documentation tags](https://kotlinlang.org/docs/kotlin-doc.html#block-tags) ([Kotlin/dokka#2343)
-   Add an extension point for an external documentable provider ([Kotlin/dokka#2307), thanks to [@&#8203;Kordyjan](https://togithub.com/Kordyjan)!
-   Add filtering stategies extension point and fix constructors in Kotlin-as-Java ([Kotlin/dokka#2277), thanks to [@&#8203;BarkingBad](https://togithub.com/BarkingBad)!
-   Expose Kotlin-as-Java methods that could be used not only as part of transformers ([Kotlin/dokka#2351), thanks to [@&#8203;BarkingBad](https://togithub.com/BarkingBad)!
-   Refactor Ancestry Graphs ([Kotlin/dokka#2326), thanks to [@&#8203;BarkingBad](https://togithub.com/BarkingBad)!
-   Fixed resolving of DRIs for Enum Entries ([Kotlin/dokka#2305), thanks to [@&#8203;BarkingBad](https://togithub.com/BarkingBad)!

#### General Improvements

-   Collect annotations from `package-info.java` ([Kotlin/dokka#2331), thanks  to [@&#8203;ember-rose](https://togithub.com/ember-rose)!
-   Add support for header tags (`<h1>` / `<h2>` / `<h3>`) in Javadoc ([Kotlin/dokka#2345), thanks to [@&#8203;asfalcone](https://togithub.com/asfalcone)!
-   Add an option to merge implicit expect-actual declarations, enables merging of pages for related declarations which are not connected via `expect`-`actual` keywords ([Kotlin/dokka#2316)
-   Add a note about using Dokka in a precompiled script plugin ([Kotlin/dokka#2303), thanks to [@&#8203;chkpnt](https://togithub.com/chkpnt)!
-   Fixed wrong Groovy DSL example ([Kotlin/dokka#2302), thanks to [@&#8203;chkpnt](https://togithub.com/chkpnt)!
-   Various code cleanups ([Kotlin/dokka#2165, [Kotlin/dokka#2360, [Kotlin/dokka#2364, [Kotlin/dokka#2385), thanks to [@&#8203;Goooler](https://togithub.com/Goooler)!

#### Known issues

-   Kotlin Multiplatform projects that use `.klib` libraries may experience problems. There will be a separate `1.6.21` release that will address this issue shortly.

### [`v1.6.10`](https://togithub.com/Kotlin/dokka/releases/tag/v1.6.10)

#### Changes

-   Support Kotlin 1.6.10
-   Add a sample project for versioning multi-module ([Kotlin/dokka#2170)

#### Bugfixes

-   Fix various `java.util.zip.ZipException` for JS dependencies ([Kotlin/dokka#2258)
-   Fix handling of Description Lists (`<dl>`) used in JavaDocs ([Kotlin/dokka#2259)
-   Fix for "repositories not defined" issue in versioning multimodule example ([Kotlin/dokka#2263), thanks [@&#8203;rajdeep1008](https://togithub.com/rajdeep1008)!
-   Fix multiple rendering issues for "See Also" block for html format ([Kotlin/dokka#2267)
-   Fix sample body not being embedded to documentation ([Kotlin/dokka#2216)

#### Maintenance

-   Update npm dependencies ([Kotlin/dokka#2251)
-   Bump `de.undercouch.download` to 4.1.2 ([Kotlin/dokka#2268)
-   Bump `kotlinx.coroutines` to 1.6.0 in integration tests ([Kotlin/dokka#2276)

### [`v1.6.0`](https://togithub.com/Kotlin/dokka/releases/tag/v1.6.0)

Changes:

-   **New UI**
-   Support of version plugin for single module projects
-   Allow package-level suppression ([#&#8203;2209](https://togithub.com/Kotlin/dokka/issues/2209)), thanks [@&#8203;owengray-google](https://togithub.com/owengray-google)
-   GFM: Use Markdown syntax to render lists ([#&#8203;2098](https://togithub.com/Kotlin/dokka/issues/2098)), thanks [@&#8203;sgilson](https://togithub.com/sgilson)
-   Fix names of nested inheritors
-   Fix adding new custom stylesheets in submodules
-   Add keywords `expect` and `actual` in signatures

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] If you want to rebase/retry this PR, click this checkbox.

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/RBusarow/Dispatch).

PR-URL: #488
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.

Description List not handled in docs
2 participants